From e09cae512ee5b97de92a56610fa8263a1778a018 Mon Sep 17 00:00:00 2001
From: chenjinsong <523037378@qq.com>
Date: Wed, 13 Nov 2019 11:39:02 +0800
Subject: 修复元数据字典的小bug
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/templates/js/modules/detect/addType.js | 15 ++++++++++-----
 .../templates/modules/detect/addTypeTemplate.html         |  8 +++++---
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/nezha-admin/src/main/resources/templates/js/modules/detect/addType.js b/nezha-admin/src/main/resources/templates/js/modules/detect/addType.js
index bc8551d1..eee1973f 100644
--- a/nezha-admin/src/main/resources/templates/js/modules/detect/addType.js
+++ b/nezha-admin/src/main/resources/templates/js/modules/detect/addType.js
@@ -232,12 +232,18 @@ var meta=Vue.extend({
         removeShadow:function(){
             $(this.metaDetailDomSelector+">.shadow").hide();
         },
-        mouseAt: function(id) {
-            layer.tips($("#r-dictype-option-detail-"+id+'-'+this.index).html(),"#r-dictype-option-"+id+'-'+this.index,{
+        mouseAt: function(id, event) {
+            layer.tips($("#r-dictype-option-detail-"+id+'-'+this.index).html(), $(event.currentTarget).prev(), {
                 tips: [4, "#41B883"],
-                closeBtn: 0,
-                shade: 0
+                success: function(layi, i) {
+                	$(layi).css("z-index", "99999999")
+                }
             });
+            /*layer.tips($("#r-dictype-option-detail-"+id+'-'+this.index).html(),"#r-dictype-option-"+id+'-'+iii,{
+            	tips: [4, "#41B883"],
+            	closeBtn: 0,
+            	shade: 0
+            });*/
         },
         mouseout: function(){
             layer.closeAll("tips");
@@ -542,7 +548,6 @@ var addParam=Vue.extend({
             //重置背景色
             event.target.style.backgroundColor='';
             this.submitSelf();
-            console.log('swap')
             if(!this.$v.deteParam.$error){
                 this.$emit("ask-for-swap",index,this.index);
             }
diff --git a/nezha-admin/src/main/resources/templates/modules/detect/addTypeTemplate.html b/nezha-admin/src/main/resources/templates/modules/detect/addTypeTemplate.html
index 72e7c259..d781f9c0 100644
--- a/nezha-admin/src/main/resources/templates/modules/detect/addTypeTemplate.html
+++ b/nezha-admin/src/main/resources/templates/modules/detect/addTypeTemplate.html
@@ -319,11 +319,13 @@
                                         v-model="$v.deteMeta.dicType.$model"
                                         :show-labels="false">
                                     <template slot="option" slot-scope="props">
-<!--                                            <div :id="'position'+props.option.type+index" style="position:absolute;top:20%;left:0;width:1px;height:1px;"></div>-->
-                                            <div style="line-height: 30px" :id="'r-dictype-option-'+props.option.type+'-'+index" @mouseenter="mouseAt(props.option.type)" @mouseleave="mouseout">{{props.option.type}}</div>
+                                            <div style="position:absolute;top:20%;left:0;width:1px;height:1px;"></div>
+                                            <div style="line-height: 30px" :id="'r-dictype-option-'+props.option.type+'-'+index" @mouseenter="mouseAt(props.option.type, $event)" @mouseleave="mouseout">{{props.option.type}}</div>
                                                 <div :id="'r-dictype-option-detail-'+props.option.type+'-'+index" style="display: none;">
                                                     <div style="color: white;" v-for="mapping in props.option.mappings">
-                                                        {{mapping.val}}:{{mapping.mapping}}
+														<span style="display:inline-block; min-width:35px;">{{mapping.val}}</span>
+														<span style="display:inline-block; width:15px;">:</span>
+														<span style="display:inline-block; min-width:35px;">{{mapping.mapping}}</span>
                                                     </div>
                                                 </div>
 <!--                                            </div>-->
-- 
cgit v1.2.3