From a898220c55f64edb6c185f780749d5f29f559c76 Mon Sep 17 00:00:00 2001
From: wangwenrui <wangwenrui@zdjizhi.com>
Date: Wed, 20 Jan 2021 17:43:41 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix:v-clickoutsize=E6=8C=87=E4=BB=A4?=
 =?UTF-8?q?=E5=85=BC=E5=AE=B9=E6=97=A7=E7=9A=84=E8=B0=83=E7=94=A8=E6=96=B9?=
 =?UTF-8?q?=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/common/js/tools.js         | 44 ++++++++++++-------
 1 file changed, 29 insertions(+), 15 deletions(-)

diff --git a/nezha-fronted/src/components/common/js/tools.js b/nezha-fronted/src/components/common/js/tools.js
index fffca3ccd..24d6e842e 100644
--- a/nezha-fronted/src/components/common/js/tools.js
+++ b/nezha-fronted/src/components/common/js/tools.js
@@ -7,8 +7,13 @@ const exceptClassName = ["config-dropdown", "nz-pop", "el-picker", "chart-box-dr
 export const clickoutside = {
   // 初始化指令
   bind(el, binding, vnode) {
-    if(!binding.value||!binding.value.obj) return;
-    let oldValue = JSON.parse(JSON.stringify(binding.value.obj));
+    if(!binding.expression) return;
+    let oldValue;
+    try{
+      oldValue= JSON.parse(JSON.stringify(binding.value.obj));
+    }catch (e) {
+
+    }
     function documentHandler(e) {
       if (el.contains(e.target)) {
         return false;
@@ -26,20 +31,29 @@ export const clickoutside = {
         if (!flag) {
           return false;
         }
-
-        let newValue = JSON.parse(JSON.stringify(binding.value.obj));
-        if(!isEqual(oldValue,newValue)){
-          MessageBox.confirm(i18n.t("tip.confirmCancel"), {
-            confirmButtonText: i18n.t("tip.yes"),
-            cancelButtonText: i18n.t("tip.no"),
-            type: 'warning'
-          }).then(() => {
-            if(binding.value.func){
-              binding.value.func();
-            }
-          })
+        if(oldValue){
+          let newValue = JSON.parse(JSON.stringify(binding.value.obj));
+          if(!isEqual(oldValue,newValue)){
+            MessageBox.confirm(i18n.t("tip.confirmCancel"), {
+              confirmButtonText: i18n.t("tip.yes"),
+              cancelButtonText: i18n.t("tip.no"),
+              type: 'warning'
+            }).then(() => {
+              if(binding.value.func){
+                binding.value.func();
+              }
+            })
+          }else{
+            binding.value.func();
+          }
         }else{
-          binding.value.func();
+          if (binding.arg) {
+            binding.value(e, binding.arg);
+          } else {
+            if(binding.value){
+              binding.value(e);
+            }
+          }
         }
       }
     }

From 0966334b78dff4584ee2c7e32fc2c93c5b291516 Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Thu, 21 Jan 2021 11:06:12 +0800
Subject: [PATCH 2/2] =?UTF-8?q?feat=EF=BC=9Adashboard=20overview=20?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=20module=20tooltip=E6=9B=BF=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/common/overView/messageAsset.vue | 13 ++++++++-----
 .../page/dashboard/overview/overview2.vue           |  4 ++--
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/nezha-fronted/src/components/common/overView/messageAsset.vue b/nezha-fronted/src/components/common/overView/messageAsset.vue
index 9ffbfc4c8..56958bf96 100644
--- a/nezha-fronted/src/components/common/overView/messageAsset.vue
+++ b/nezha-fronted/src/components/common/overView/messageAsset.vue
@@ -24,7 +24,7 @@
       ref="alertLabel"
       :id="assetData.id"
       :that="assetData"
-      :type="'asset'"
+      :type="fromType"
       :LRTriangle="LRTriangle"
       :style="{
         'transform-origin': `0px 300px`,
@@ -59,12 +59,14 @@
       from:{},
       hexagonSvgID:{
         type:String,
-        default:'hexagonSvg'
       },
       showTooltip:{
         type:Boolean,
         default:false,
       },
+      fromType:{
+        type:String,
+      },
     },
     watch:{
       data:{
@@ -270,11 +272,12 @@
       },
       calcPosition(e){
         let boxWidth=this.boxWidth;
-        let minus=(e.pageY-300)+this.$refs.alertLabel.$el.offsetHeight-window.innerHeight;
+        let distance=this.fromType==='asset'?300:50;
+        let minus=(e.pageY-distance)+this.$refs.alertLabel.$el.offsetHeight-window.innerHeight;
         // window.innerHeight
         if(minus<=0){
-          this.assetData.position.top=e.pageY-300;
-          this.assetData.position.mt=300;
+          this.assetData.position.top=e.pageY-distance;
+          this.assetData.position.mt=distance;
         } else if(minus>0){
           this.assetData.position.top=window.innerHeight-this.$refs.alertLabel.$el.offsetHeight;
           this.assetData.position.mt=e.pageY-(window.innerHeight-this.$refs.alertLabel.$el.offsetHeight);
diff --git a/nezha-fronted/src/components/page/dashboard/overview/overview2.vue b/nezha-fronted/src/components/page/dashboard/overview/overview2.vue
index 9b5b28c93..afd1a30a0 100644
--- a/nezha-fronted/src/components/page/dashboard/overview/overview2.vue
+++ b/nezha-fronted/src/components/page/dashboard/overview/overview2.vue
@@ -191,7 +191,7 @@
           <div class="content-col-content" style="overflow: hidden">
             <!--<chart-box axis-tooltip="y" v-show="alertMessageShow == 'asset'" :tooltip-formatter="simpleFormatter" chart-type="ruleBar" ref="assetMessage" name="assetMessage" :show-toolbox="false" @is-loading="(isLoading)=>{this.assetMessageLoading = isLoading}"></chart-box>-->
             <!--<chart-box axis-tooltip="y" v-show="alertMessageShow == 'module'" :tooltip-formatter="simpleFormatter" chart-type="bar" ref="moduleMessage" name="moduleMessage" :show-toolbox="false" @is-loading="(isLoading)=>{this.moduleMessageLoading = isLoading}"></chart-box>-->
-            <messageAsset v-show="messageAssetData.length>0" :data="messageAssetData" :col="col" :length="length" ref="assetHexagon" :from="'asset'" :hexagonSvgID="'hexagonSvg1'" :show-tooltip="true"/>
+            <messageAsset v-show="messageAssetData.length>0" :data="messageAssetData" :col="col" :length="length" ref="assetHexagon" :from="'asset'" :hexagonSvgID="'hexagonSvg1'" :show-tooltip="true" :from-type="'asset'"/>
             <div class="chart-no-data" v-if="messageAssetData.length===0">No Data</div>
           </div>
         </div>
@@ -211,7 +211,7 @@
           <div class="content-col-content" style="overflow: hidden">
             <!--<chart-box axis-tooltip="y" chart-type="ruleBar" ref="ruleMessage" :tooltip-formatter="simpleFormatter" :show-toolbox="false" name="ruleMessage" @is-loading="(isLoading)=>{this.ruleMessageLoading = isLoading}"></chart-box>-->
             <!--                <div class="no-data-tip" v-if="!ruleMessageLoading && ((!messageByRuleSeries.data && !messageByRuleSeries.category) || (messageByRuleSeries.data.length == 0 && messageByRuleSeries.category.length == 0))">N/A</div>-->
-            <messageAsset v-show="messageModuleData.length>0" :data="messageModuleData" :col="col" :length="length" ref="moduleHexagon" :from="'module'" :hexagonSvgID="'hexagonSvg2'"/>
+            <messageAsset v-show="messageModuleData.length>0" :data="messageModuleData" :col="col" :length="length" ref="moduleHexagon" :from="'module'" :hexagonSvgID="'hexagonSvg2'" :show-tooltip="true" :from-type="'module'"/>
             <div class="chart-no-data" v-if="messageModuleData.length===0">No Data</div>
           </div>
         </div>