Merge branch 'codeCheck' of https://git.mesalab.cn/nezha/nezha-fronted into codeCheck

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,7 +31,7 @@ export const clickoutside = {
         if (!flag) {
           return false;
         }
-
+        if(oldValue){
           let newValue = JSON.parse(JSON.stringify(binding.value.obj));
           if(!isEqual(oldValue,newValue)){
             MessageBox.confirm(i18n.t("tip.confirmCancel"), {
@@ -41,6 +46,15 @@ export const clickoutside = {
           }else{
             binding.value.func();
           }
+        }else{
+          if (binding.arg) {
+            binding.value(e, binding.arg);
+          } else {
+            if(binding.value){
+              binding.value(e);
+            }
+          }
+        }
       }
     }
 

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);

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>