From 1cf6fdbeb3c3a4933acc21aebda9006bafed6dd0 Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Mon, 9 Jan 2023 17:15:10 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E6=94=B9=20=E9=BC=A0?=
 =?UTF-8?q?=E6=A0=87=E6=82=AC=E6=B5=AE=E9=9D=9E=E5=86=85=E7=BD=AE=E6=A0=87?=
 =?UTF-8?q?=E7=AD=BE=20alertLabel=20=E4=B8=8D=E6=B6=88=E5=A4=B1=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nezha-fronted/src/components/common/alert/alertLabel.vue | 9 ++++++++-
 .../src/components/common/mixin/alertLabelMixin.js       | 2 +-
 nezha-fronted/src/components/page/alert/alertMessage.vue | 2 +-
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/nezha-fronted/src/components/common/alert/alertLabel.vue b/nezha-fronted/src/components/common/alert/alertLabel.vue
index 7f90b0bda..086cdb773 100644
--- a/nezha-fronted/src/components/common/alert/alertLabel.vue
+++ b/nezha-fronted/src/components/common/alert/alertLabel.vue
@@ -451,7 +451,7 @@
           ></i
           >&nbsp;
           <span>{{
-            alertLabelData && alertLabelData.asset.name
+            alertLabelData && alertLabelData.asset
               ? alertLabelData.asset.name
               : "--"
           }}</span>
@@ -763,6 +763,13 @@ export default {
   computed: {
     calcPosition () {
       return function (position) {
+        if (this.$refs.alertLabels) {
+          this.heightList = this.$refs.alertLabels.getBoundingClientRect().height
+          this.boxWidth = this.$refs.alertLabels.getBoundingClientRect().width
+        } else {
+          this.heightList = 0
+          this.boxWidth = 0
+        }
         const clientHeight =
           document.body.clientHeight < document.documentElement.clientHeight
             ? document.body.clientHeight
diff --git a/nezha-fronted/src/components/common/mixin/alertLabelMixin.js b/nezha-fronted/src/components/common/mixin/alertLabelMixin.js
index ea03f866f..73a46d1ef 100644
--- a/nezha-fronted/src/components/common/mixin/alertLabelMixin.js
+++ b/nezha-fronted/src/components/common/mixin/alertLabelMixin.js
@@ -16,10 +16,10 @@ export default {
   methods: {
     // label 鼠标划入
     labelHover (item, type, loading, isUseType = true, e) {
-      clearTimeout(this.timer)
       if (this.labelToolTipDis(type)) {
         return
       }
+      clearTimeout(this.timer)
       if (isUseType) {
         if (e) {
           const dom = e.currentTarget
diff --git a/nezha-fronted/src/components/page/alert/alertMessage.vue b/nezha-fronted/src/components/page/alert/alertMessage.vue
index 93f056989..2d095eca2 100644
--- a/nezha-fronted/src/components/page/alert/alertMessage.vue
+++ b/nezha-fronted/src/components/page/alert/alertMessage.vue
@@ -53,7 +53,7 @@
                   :type="'link'"
                 ></delete-button>
               </el-dropdown-item>
-              <el-dropdown-item :disabled="batchDeleteObjs.length==0" :class="'nz-el-dropdown-menu-item'">
+              <el-dropdown-item :disabled="batchDeleteObjs.length==0">
                 <div id="alert-msg-batch-ack" v-has="'alertMessage_expired'" @click="batchAck"><i class="nz-icon nz-icon-queren"></i>{{$t('overall.batchAck')}}</div>
               </el-dropdown-item>
             </div>