From b848f5a3e2914121fd0d794ef4b67807c230f8f9 Mon Sep 17 00:00:00 2001
From: likexuan <likexuan@geedgenetworks.com>
Date: Mon, 17 Oct 2022 10:13:37 +0800
Subject: [PATCH] =?UTF-8?q?fix=20:=20alertMessage=20=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nezha-fronted/src/components/common/mixin/table.js          | 4 ++++
 .../src/components/common/table/alert/alertMessageTable.vue | 6 +++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/nezha-fronted/src/components/common/mixin/table.js b/nezha-fronted/src/components/common/mixin/table.js
index db6efc6d4..5b9604bde 100644
--- a/nezha-fronted/src/components/common/mixin/table.js
+++ b/nezha-fronted/src/components/common/mixin/table.js
@@ -39,6 +39,10 @@ export default {
         //   break
         // }
         case 'delete': {
+          if (param == 'singleDel') {
+            this.$emit('del', row)
+            break
+          }
           if (this.singleDelete.length === 0) {
             this.singleDelete.push(row)
           } else {
diff --git a/nezha-fronted/src/components/common/table/alert/alertMessageTable.vue b/nezha-fronted/src/components/common/table/alert/alertMessageTable.vue
index cc7f4248c..dc2bfa2c3 100644
--- a/nezha-fronted/src/components/common/table/alert/alertMessageTable.vue
+++ b/nezha-fronted/src/components/common/table/alert/alertMessageTable.vue
@@ -112,8 +112,8 @@
             </div>
             <el-dropdown-menu slot="dropdown" class="right-box-select-top right-public-box-dropdown-top">
               <!--            <el-dropdown-item :command="['showText', scope.row]"><i class="nz-icon nz-icon-guzhangshuju"></i><span class="operation-dropdown-text">{{$t('alert.config.trbShot')}}</span></el-dropdown-item>-->
-              <!-- <el-dropdown-item v-has="'alertMessage_view'" :command="['delete', scope.row]"><i class="nz-icon nz-icon-delete"></i><span class="operation-dropdown-text">{{$t('overall.delete')}}</span></el-dropdown-item> -->
-              <el-dropdown-item v-has="'alertMessage_view'" :command="['delete', scope.row]">
+              <el-dropdown-item v-has="'alertMessage_view'" :command="['delete', scope.row, 'singleDel']"><i class="nz-icon nz-icon-delete"></i><span class="operation-dropdown-text">{{$t('overall.delete')}}</span></el-dropdown-item>
+              <!-- <el-dropdown-item v-has="'alertMessage_view'" :command="['delete', scope.row]">
                   <delete-button
                   ref="deleteButton"
                   :from="'alertMessage'"
@@ -128,7 +128,7 @@
                   :delete-objs="singleDelete"
                   @before="delFlag=true"
                   ></delete-button>
-              </el-dropdown-item>
+              </el-dropdown-item> -->
               <el-dropdown-item v-has="'alertSilence_add'" :command="['fastSilence', scope.row, 'alertMessage']"><i class="nz-icon nz-icon-fast-silence"></i><span class="operation-dropdown-text">{{$t('overall.silenceAlert')}}</span></el-dropdown-item>
               <el-dropdown-item v-has="'alertMessage_expired'" :disabled="scope.row.ack === 1" :command="['ack', scope.row]"><i class="nz-icon nz-icon-queren"></i><span class="operation-dropdown-text">{{$t('overall.acknowledge')}}</span></el-dropdown-item>
             </el-dropdown-menu>