From 9330b63674df7f299c3d66b58e88a00a26e88c4e Mon Sep 17 00:00:00 2001
From: likexuan <likexuan@geedgenetworks.com>
Date: Tue, 27 Dec 2022 11:29:03 +0800
Subject: [PATCH 1/6] =?UTF-8?q?NEZ-2476=20fix=20:=20=E9=BB=91=E8=89=B2?=
 =?UTF-8?q?=E4=B8=BB=E9=A2=98=20=E6=A0=B7=E5=BC=8F=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E7=BB=9F=E8=AE=A1=206?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nezha-fronted/src/assets/css/components/page/tool/ping.scss | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/nezha-fronted/src/assets/css/components/page/tool/ping.scss b/nezha-fronted/src/assets/css/components/page/tool/ping.scss
index 183708970..40555355a 100644
--- a/nezha-fronted/src/assets/css/components/page/tool/ping.scss
+++ b/nezha-fronted/src/assets/css/components/page/tool/ping.scss
@@ -169,7 +169,10 @@
     height: 100%;
   }
   .el-input-group__append{
-    color: $--color-text-primary;
+    color: $--color-text-secondary !important;
+    background-color: $--right-box-sub-title-background-color;
+    border: 1px solid $--border-color-light;
+    border-left: none;
   }
 }
 .pop-tit{

From 379f1c0ae4590dff9ba6320a8aafef7bfe821099 Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Tue, 27 Dec 2022 13:46:56 +0800
Subject: [PATCH 2/6] =?UTF-8?q?NEZ-2479=20fix=EF=BC=9A=E9=80=89=E4=B8=AD?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA=E8=8C=83=E5=9B=B4=E4=B8=8E=E5=AE=9E=E9=99=85?=
 =?UTF-8?q?=E7=82=B9=E5=87=BB=E7=94=9F=E6=95=88=E8=8C=83=E5=9B=B4=E4=B8=8D?=
 =?UTF-8?q?=E4=B8=80=E8=87=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nezha-fronted/src/assets/css/common.scss      | 22 +++++++++++++
 .../common/rightBox/locationCascader.scss     |  4 +++
 .../common/detailView/detailViewTopSearch.vue |  2 +-
 .../src/components/common/mixin/table.js      |  5 +++
 .../common/panel/panelVariables.vue           |  2 +-
 .../common/popBox/topToolMoreOptions.vue      |  4 +--
 .../common/table/asset/assetTable.vue         | 33 +++++++++----------
 .../common/table/settings/endpointTable.vue   | 32 +++++++++---------
 .../src/components/page/asset/asset.vue       |  2 +-
 9 files changed, 67 insertions(+), 39 deletions(-)

diff --git a/nezha-fronted/src/assets/css/common.scss b/nezha-fronted/src/assets/css/common.scss
index 7b9b98832..11ba55ed2 100644
--- a/nezha-fronted/src/assets/css/common.scss
+++ b/nezha-fronted/src/assets/css/common.scss
@@ -641,3 +641,25 @@ textarea {
     transform: unset !important;
   }
 }
+.nz-el-dropdown-menu{
+  .el-dropdown-menu__item{
+    padding: 0;
+    > div {
+      padding: 0 17px;
+    }
+    .el-checkbox{
+      display: inline-block;
+      width: 100%;
+      box-sizing: border-box;
+      padding: 0 5px 0 20px;
+    }
+  }
+}
+.nz-el-dropdown-menu-item{
+  padding: 0 !important;
+  .asset-list-delete{
+    width: 100%;
+    box-sizing: border-box;
+    //padding: 0 17px;
+  }
+}
diff --git a/nezha-fronted/src/assets/css/components/common/rightBox/locationCascader.scss b/nezha-fronted/src/assets/css/components/common/rightBox/locationCascader.scss
index 6f7e6cca1..ae17903b3 100644
--- a/nezha-fronted/src/assets/css/components/common/rightBox/locationCascader.scss
+++ b/nezha-fronted/src/assets/css/components/common/rightBox/locationCascader.scss
@@ -28,6 +28,10 @@
   flex: 1;
   width: 0;
   border-right: 1px solid $--border-color-light;
+  .el-checkbox{
+    width: 100% !important;
+    margin-right: 0;
+  }
   //padding-left: 5px;
 }
 .container-item-content{
diff --git a/nezha-fronted/src/components/common/detailView/detailViewTopSearch.vue b/nezha-fronted/src/components/common/detailView/detailViewTopSearch.vue
index eb4819018..46839adf9 100644
--- a/nezha-fronted/src/components/common/detailView/detailViewTopSearch.vue
+++ b/nezha-fronted/src/components/common/detailView/detailViewTopSearch.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="detail-view-top-search" style="line-height: 32px;">
-    <div class="search-detail-box" :class="[selectValue[item.key].length?'select-dropdown':'',detailSearchListCopy[key].dropShow?'show-my-dropdpwn':'']" v-for="(item,key) in detailSearchListCopy" :key='key' v-show="item.children.length">
+    <div class="search-detail-box" :class="[selectValue[item.key].length?'select-dropdown':'',detailSearchListCopy[key].dropShow?'show-my-dropdpwn':'']" v-for="(item,key) in detailSearchListCopy" :key='key' v-show="item.oldChildren.length">
       <span v-if="item.type === 'checkBox'">
             <el-dropdown
               :placement="'bottom-start'"
diff --git a/nezha-fronted/src/components/common/mixin/table.js b/nezha-fronted/src/components/common/mixin/table.js
index 4418bb739..79aad77c1 100644
--- a/nezha-fronted/src/components/common/mixin/table.js
+++ b/nezha-fronted/src/components/common/mixin/table.js
@@ -51,6 +51,11 @@ export default {
           }
           break
         }
+        case 'delete-rel': {
+          this.singleDelete = [row]
+          this.$refs.deleteButton.batchDelete()
+          break
+        }
         case 'ack': {
           this.$emit('acknowledge', row)
           break
diff --git a/nezha-fronted/src/components/common/panel/panelVariables.vue b/nezha-fronted/src/components/common/panel/panelVariables.vue
index c1eb1a76f..a444e6e9f 100644
--- a/nezha-fronted/src/components/common/panel/panelVariables.vue
+++ b/nezha-fronted/src/components/common/panel/panelVariables.vue
@@ -7,7 +7,7 @@
         placement="bottom-start"
         v-model="item.visible"
         v-clickoutside="close"
-        popper-class="no-style-class ping-popover panel-variables"
+        popper-class="no-style-class ping-popover panel-variables nz-el-dropdown-menu"
       >
         <ul class="pop-list-wrap">
           <li class="el-dropdown-menu__item" v-if="item.allOption">
diff --git a/nezha-fronted/src/components/common/popBox/topToolMoreOptions.vue b/nezha-fronted/src/components/common/popBox/topToolMoreOptions.vue
index 2e1bd3a8c..d798608ec 100644
--- a/nezha-fronted/src/components/common/popBox/topToolMoreOptions.vue
+++ b/nezha-fronted/src/components/common/popBox/topToolMoreOptions.vue
@@ -1,10 +1,10 @@
 <template>
   <div>
-    <el-dropdown trigger="click" :size="size">
+    <el-dropdown trigger="click" :size="size" class="nz-el-dropdown">
       <button id="more" :class="triggerButtonClass" :title="$t('overall.more')">
         <i class="nz-icon nz-icon-more2"></i>
       </button>
-      <el-dropdown-menu slot="dropdown" class="right-box-select-top right-public-box-dropdown-top">
+      <el-dropdown-menu slot="dropdown" class="right-box-select-top right-public-box-dropdown-top nz-el-dropdown-menu">
         <el-dropdown-item  v-if="showLock">
           <div @click="editPanel" id="edit-bottom-panel"><i class="nz-icon nz-icon-edit"></i>{{$t('dashboard.panel.editPanelTitle')}}</div>
         </el-dropdown-item>
diff --git a/nezha-fronted/src/components/common/table/asset/assetTable.vue b/nezha-fronted/src/components/common/table/asset/assetTable.vue
index 76afb31bd..3bc88c7ab 100644
--- a/nezha-fronted/src/components/common/table/asset/assetTable.vue
+++ b/nezha-fronted/src/components/common/table/asset/assetTable.vue
@@ -165,23 +165,7 @@
               <el-dropdown-item v-if="!assetTab" v-has="'asset_edit'" :command="['edit', scope.row]"><i class="nz-icon nz-icon-edit"></i><span class="operation-dropdown-text">{{$t('overall.edit')}}</span></el-dropdown-item>
               <el-dropdown-item v-has="'asset_connect'" :command="['cli', scope.row]" :disabled="!scope.row.authUsername"><i class="nz-icon nz-icon-cli"></i><span class="operation-dropdown-text">{{$t('config.system.terminal.terminal')}}</span></el-dropdown-item>
               <el-dropdown-item v-has="'asset_add'" :command="['duplicate', scope.row]"><i class="nz-icon nz-icon-override"></i><span class="operation-dropdown-text">{{$t('overall.duplicate')}}</span></el-dropdown-item>
-              <el-dropdown-item v-has="'asset_delete'" :command="['delete', scope.row]">
-                  <delete-button
-                  ref="deleteButton"
-                  :from="'asset'"
-                  :forceDeleteShow="true"
-                  :deleteTitle="'overall.asset'"
-                  :type="'link'"
-                  :title="$t('overall.delete')"
-                  id="asset-list-delete"
-                  v-has="'asset_delete'"
-                  :api="api"
-                  :single="true"
-                  :delete-objs="singleDelete"
-                  @before="delFlag=true"
-                  ></delete-button>
-              </el-dropdown-item>
-              <!-- <el-dropdown-item v-has="'asset_delete'" :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="'asset_delete'" :command="['delete-rel', 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="'alertSilence_add'" :command="['fastSilence', scope.row, 'asset']"><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="'asset_add'" :command="['topology', scope.row, 'asset']"><i class="nz-icon nz-icon-Topology"></i><span class="operation-dropdown-text">{{$t('overall.topology')}}</span></el-dropdown-item>
             </el-dropdown-menu>
@@ -205,6 +189,21 @@
       :type="alertLabelType"
       @tipHover='tipHover'
     ></alertLabel>
+    <delete-button
+      ref="deleteButton"
+      :from="'asset'"
+      :forceDeleteShow="true"
+      :deleteTitle="'overall.asset'"
+      :type="'hide'"
+      :title="$t('overall.delete')"
+      id="asset-list-delete"
+      class="asset-list-delete"
+      v-has="'asset_delete'"
+      :api="api"
+      :single="true"
+      :delete-objs="singleDelete"
+      @before="delFlag=true"
+    ></delete-button>
   </div>
 </template>
 
diff --git a/nezha-fronted/src/components/common/table/settings/endpointTable.vue b/nezha-fronted/src/components/common/table/settings/endpointTable.vue
index bef72005d..bae2066d2 100644
--- a/nezha-fronted/src/components/common/table/settings/endpointTable.vue
+++ b/nezha-fronted/src/components/common/table/settings/endpointTable.vue
@@ -177,23 +177,7 @@
             <el-dropdown-menu slot="dropdown" class="right-box-select-top right-public-box-dropdown-top">
               <!--            <el-dropdown-item v-if="!endpointTab" :command="['endpointQuery', scope.row]"><i class="nz-icon nz-icon-search"></i><span class="operation-dropdown-text">{{$t('overall.query')}}</span></el-dropdown-item>-->
               <el-dropdown-item v-if="!endpointTab" v-has="'monitor_endpoint_edit'" :command="['edit', scope.row]"><i class="nz-icon nz-icon-edit"></i><span class="operation-dropdown-text">{{$t('overall.edit')}}</span></el-dropdown-item>
-              <!-- <el-dropdown-item v-has="'monitor_endpoint_delete'" :command="['delete', scope.row, `sys/endpoint?ids=${scope.row.id}`]"><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="'monitor_endpoint_delete'" :command="['delete', scope.row, `sys/endpoint?ids=${scope.row.id}`]">
-                  <delete-button
-                  ref="deleteButton"
-                  :from="'endpoint'"
-                  :forceDeleteShow="false"
-                  :deleteTitle="'project.endpoint.endpoint'"
-                  :type="'link'"
-                  :title="$t('overall.delete')"
-                  id="account-list-delete"
-                  v-has="'monitor_endpoint_delete'"
-                  :api="api"
-                  :single="true"
-                  :delete-objs="singleDelete"
-                  @before="delFlag=true"
-                  ></delete-button>
-              </el-dropdown-item>
+              <el-dropdown-item v-has="'monitor_endpoint_delete'" :command="['delete-rel', scope.row, `sys/endpoint?ids=${scope.row.id}`]"><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="'monitor_endpoint_edit'" :command="['copy', scope.row, 'project']"><i class="nz-icon nz-icon-override"></i><span class="operation-dropdown-text">{{$t('overall.duplicate')}}</span></el-dropdown-item>
               <el-dropdown-item v-has="'alertSilence_add'" :command="['fastSilence', scope.row, 'endpoint']"><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="'asset_add'" :command="['topology', scope.row, 'endpoint']"><i class="nz-icon nz-icon-Topology"></i><span class="operation-dropdown-text">{{$t('overall.topology')}}</span></el-dropdown-item>
@@ -218,6 +202,20 @@
       :that="alertLabelObj"
       :type="alertLabelType"
     ></alertLabel>
+    <delete-button
+      ref="deleteButton"
+      :from="'endpoint'"
+      :forceDeleteShow="false"
+      :deleteTitle="'project.endpoint.endpoint'"
+      :type="'link'"
+      :title="$t('overall.delete')"
+      id="account-list-delete"
+      v-has="'monitor_endpoint_delete'"
+      :api="api"
+      :single="true"
+      :delete-objs="singleDelete"
+      @before="delFlag=true"
+    ></delete-button>
   </div>
 </template>
 
diff --git a/nezha-fronted/src/components/page/asset/asset.vue b/nezha-fronted/src/components/page/asset/asset.vue
index 3d9d66228..186c9235c 100644
--- a/nezha-fronted/src/components/page/asset/asset.vue
+++ b/nezha-fronted/src/components/page/asset/asset.vue
@@ -30,7 +30,7 @@
           :permissions="{
             import: 'asset_add',
             export: 'asset_edit'
-          }"
+
           class="top-tool-export margin-l-10 margin-r-10"
           export-file-name="asset"
           export-url="/asset/asset/export"

From baf8177d2f33cffb268dfc32acb30254ec9ae58e Mon Sep 17 00:00:00 2001
From: likexuan <likexuan@geedgenetworks.com>
Date: Tue, 27 Dec 2022 14:26:29 +0800
Subject: [PATCH 3/6] =?UTF-8?q?NEZ-2476=20fix=20:=20=E9=BB=91=E8=89=B2?=
 =?UTF-8?q?=E4=B8=BB=E9=A2=98=20=E6=A0=B7=E5=BC=8F=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E7=BB=9F=E8=AE=A1=207?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../css/components/common/alert/alertMessageInfo.scss     | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/nezha-fronted/src/assets/css/components/common/alert/alertMessageInfo.scss b/nezha-fronted/src/assets/css/components/common/alert/alertMessageInfo.scss
index 728d71228..099500fd7 100644
--- a/nezha-fronted/src/assets/css/components/common/alert/alertMessageInfo.scss
+++ b/nezha-fronted/src/assets/css/components/common/alert/alertMessageInfo.scss
@@ -25,6 +25,14 @@
       }
     }
 
+    .chart-header__tools{
+      .time-picker{
+        .date-range-panel{
+          top: 55px;
+        }
+      }
+    }
+
   }
 
   .alert-message-info-box {

From a9532937da2ce40273728cd0c4b16afdc7e66ebe Mon Sep 17 00:00:00 2001
From: likexuan <likexuan@geedgenetworks.com>
Date: Tue, 27 Dec 2022 15:21:34 +0800
Subject: [PATCH 4/6] =?UTF-8?q?NEZ-2476=20fix=20:=20=E9=BB=91=E8=89=B2?=
 =?UTF-8?q?=E4=B8=BB=E9=A2=98=20=E6=A0=B7=E5=BC=8F=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E7=BB=9F=E8=AE=A1=208?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../assets/css/components/page/monitor/project/project.scss  | 5 +++++
 nezha-fronted/src/components/common/project/topologyL5.vue   | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/nezha-fronted/src/assets/css/components/page/monitor/project/project.scss b/nezha-fronted/src/assets/css/components/page/monitor/project/project.scss
index f5e099619..1ba2dacca 100644
--- a/nezha-fronted/src/assets/css/components/page/monitor/project/project.scss
+++ b/nezha-fronted/src/assets/css/components/page/monitor/project/project.scss
@@ -161,6 +161,11 @@
           }
         }
       }
+      .el-dialog__wrapper{
+        .el-dialog__body>.upload-pic-row.el-row{
+          padding-right: 20px;
+        }
+      }
     }
   }
 }
\ No newline at end of file
diff --git a/nezha-fronted/src/components/common/project/topologyL5.vue b/nezha-fronted/src/components/common/project/topologyL5.vue
index 20557b723..3261200e2 100644
--- a/nezha-fronted/src/components/common/project/topologyL5.vue
+++ b/nezha-fronted/src/components/common/project/topologyL5.vue
@@ -325,7 +325,7 @@
 
               <button class="nz-btn nz-btn-size-normal nz-btn-style-normal" @click="imgUpload" :disabled="prevent_opt.save"
                       :class="{'nz-btn-disabled':prevent_opt.save}"
-                      style="margin-right: 20px">
+                      style="">
              {{$t('overall.save')}}
            </button>
             </span>

From 153268bd5df07c396d57173fcdd1dfc1c1c37fd4 Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Tue, 27 Dec 2022 15:43:38 +0800
Subject: [PATCH 5/6] =?UTF-8?q?NEZ-2479=20fix=EF=BC=9A=E9=80=89=E4=B8=AD?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA=E8=8C=83=E5=9B=B4=E4=B8=8E=E5=AE=9E=E9=99=85?=
 =?UTF-8?q?=E7=82=B9=E5=87=BB=E7=94=9F=E6=95=88=E8=8C=83=E5=9B=B4=E4=B8=8D?=
 =?UTF-8?q?=E4=B8=80=E8=87=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nezha-fronted/src/assets/css/common.scss      |   8 +-
 .../common/bottomBox/tabs/IpDetails.vue       |   2 +-
 .../common/bottomBox/tabs/cabinetTab.vue      |   2 +-
 .../src/components/common/deleteButton.vue    |   9 +-
 .../src/components/common/mixin/table.js      |  12 +-
 .../common/table/alert/alertRuleTable.vue     |   2 +-
 .../common/table/alert/alertSilenceTable.vue  |   2 +-
 .../common/table/asset/assetMetaTable.vue     |  17 +-
 .../common/table/asset/assetTable.vue         |  19 +-
 .../components/common/table/nzDataList.vue    |  39 ++-
 .../common/table/settings/agentTable.vue      |   2 +-
 .../common/table/settings/assetTypeTable.vue  |   2 +-
 .../common/table/settings/backupsTable.vue    |   2 +-
 .../common/table/settings/cabinetTable.vue    |   2 +-
 .../common/table/settings/chartTmplTable.vue  |   2 +-
 .../table/settings/credentialsTable.vue       |   2 +-
 .../table/settings/dashboardTmplTable.vue     |   2 +-
 .../common/table/settings/dcTable.vue         | 234 ++++++++----------
 .../common/table/settings/endpointTable.vue   |  16 +-
 .../common/table/settings/exprTmplTable.vue   |   2 +-
 .../table/settings/globalizationTable.vue     |   2 +-
 .../common/table/settings/ipDetailsTable.vue  |   2 +-
 .../common/table/settings/ipamTable.vue       |   2 +-
 .../common/table/settings/issueTable.vue      |   2 +-
 .../common/table/settings/menuTable.vue       |   2 +-
 .../common/table/settings/mibTable.vue        |   2 +-
 .../common/table/settings/modelTable.vue      |  17 +-
 .../common/table/settings/moduleTable.vue     |  18 +-
 .../common/table/settings/projectTable.vue    |  18 +-
 .../common/table/settings/recordRuleTable.vue |   2 +-
 .../common/table/settings/roleTable.vue       |   2 +-
 .../common/table/settings/userTable.vue       |   2 +-
 .../components/page/alert/alertMessage.vue    |   4 +-
 .../src/components/page/alert/alertRule.vue   |   2 +-
 .../src/components/page/asset/asset.vue       |   6 +-
 .../src/components/page/config/dc.vue         |   2 +-
 .../src/components/page/config/ipam.vue       |   2 +-
 .../src/components/page/config/model.vue      |   2 +-
 .../src/components/page/config/recordRule.vue |   2 +-
 .../page/config/system/notifyMethodTable.vue  |   2 +-
 .../page/config/system/selfApiKeyTable.vue    |   2 +-
 .../page/config/template/chartTemp.vue        |   2 +-
 .../page/config/template/dashboardTemp.vue    |   2 +-
 .../page/config/template/exprTemp.vue         |   2 +-
 .../page/monitor/endpoint/endpointList.vue    |   2 +-
 .../page/monitor/module/moduleList.vue        |   2 +-
 nezha-fronted/src/store/index.js              |  26 +-
 47 files changed, 242 insertions(+), 267 deletions(-)

diff --git a/nezha-fronted/src/assets/css/common.scss b/nezha-fronted/src/assets/css/common.scss
index 11ba55ed2..51f491a29 100644
--- a/nezha-fronted/src/assets/css/common.scss
+++ b/nezha-fronted/src/assets/css/common.scss
@@ -657,9 +657,13 @@ textarea {
 }
 .nz-el-dropdown-menu-item{
   padding: 0 !important;
-  .asset-list-delete{
+  > div {
+    padding: 0px !important;
+  }
+  .nz-el-dropdown-item-del{
+    display: inline-block;
     width: 100%;
+    padding: 0 17px;
     box-sizing: border-box;
-    //padding: 0 17px;
   }
 }
diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/IpDetails.vue b/nezha-fronted/src/components/common/bottomBox/tabs/IpDetails.vue
index ee63b3da8..b0d8223d7 100644
--- a/nezha-fronted/src/components/common/bottomBox/tabs/IpDetails.vue
+++ b/nezha-fronted/src/components/common/bottomBox/tabs/IpDetails.vue
@@ -36,7 +36,7 @@
         >
           <template v-slot:before>
             <div>
-              <el-dropdown-item :disabled="batchDeleteObjs.length==0">
+              <el-dropdown-item :disabled="batchDeleteObjs.length==0" :class="'nz-el-dropdown-menu-item'">
                 <delete-button
                   ref="deleteButton"
                   :from="'ipDetails'"
diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/cabinetTab.vue b/nezha-fronted/src/components/common/bottomBox/tabs/cabinetTab.vue
index 07a3e76ec..a34b6a23b 100644
--- a/nezha-fronted/src/components/common/bottomBox/tabs/cabinetTab.vue
+++ b/nezha-fronted/src/components/common/bottomBox/tabs/cabinetTab.vue
@@ -55,7 +55,7 @@
         >
           <template v-slot:before>
             <div>
-              <el-dropdown-item :disabled="batchDeleteObjs.length==0">
+              <el-dropdown-item :disabled="batchDeleteObjs.length==0" :class="'nz-el-dropdown-menu-item'">
                 <delete-button
                   ref="deleteButton"
                   :from="'cabinetTab'"
diff --git a/nezha-fronted/src/components/common/deleteButton.vue b/nezha-fronted/src/components/common/deleteButton.vue
index b04284fc7..eb9d91400 100644
--- a/nezha-fronted/src/components/common/deleteButton.vue
+++ b/nezha-fronted/src/components/common/deleteButton.vue
@@ -7,7 +7,7 @@
     </div>
     <button v-if="this.type === 'btn'" class="table-operation-item delete-button" :id="id" @click="batchDelete" :title="$t('overall.delete')"><i class="nz-icon nz-icon-delete"></i></button>
     <div v-if="this.type === 'link'" :id="id" @click="batchDelete">
-      <span><i class="nz-icon nz-icon-delete" ></i>{{title}}</span>
+      <span class="nz-el-dropdown-item-del"><i class="nz-icon nz-icon-delete" ></i>{{title}}</span>
     </div>
     <el-dialog
       ref="batchDeleteDialog"
@@ -280,6 +280,13 @@ export default {
       }
       return ' '
     }
+  },
+  watch: {
+    dialogVisible (n) {
+      if (!n) {
+        this.$store.dispatch('dispatchShowDeleteTableRel', false)
+      }
+    }
   }
 }
 </script>
diff --git a/nezha-fronted/src/components/common/mixin/table.js b/nezha-fronted/src/components/common/mixin/table.js
index 79aad77c1..533aba435 100644
--- a/nezha-fronted/src/components/common/mixin/table.js
+++ b/nezha-fronted/src/components/common/mixin/table.js
@@ -52,8 +52,16 @@ export default {
           break
         }
         case 'delete-rel': {
-          this.singleDelete = [row]
-          this.$refs.deleteButton.batchDelete()
+          // this.$emit('deleteRel', {
+          //   row: row,
+          //   url: this.api,
+          //   ...param
+          // })
+          this.$store.dispatch('deleteTableRel', {
+            row: row,
+            url: this.api,
+            ...param
+          })
           break
         }
         case 'ack': {
diff --git a/nezha-fronted/src/components/common/table/alert/alertRuleTable.vue b/nezha-fronted/src/components/common/table/alert/alertRuleTable.vue
index 4f0300d20..bc8869573 100644
--- a/nezha-fronted/src/components/common/table/alert/alertRuleTable.vue
+++ b/nezha-fronted/src/components/common/table/alert/alertRuleTable.vue
@@ -153,7 +153,7 @@
           <el-dropdown-menu slot="dropdown" class="right-box-select-top right-public-box-dropdown-top">
             <el-dropdown-item v-if="!scope.row.buildIn" v-has="'alertRule_edit'" :command="['edit', scope.row]"><i class="nz-icon nz-icon-edit"></i><span class="operation-dropdown-text">{{$t('overall.edit')}}</span></el-dropdown-item>
             <!-- <el-dropdown-item v-if="!scope.row.buildIn" v-has="'alertRule_delete'" :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-if="!scope.row.buildIn" v-has="'alertRule_delete'" :command="['delete', scope.row]">
+            <el-dropdown-item v-if="!scope.row.buildIn" v-has="'alertRule_delete'" :command="['delete', scope.row]" :class="'nz-el-dropdown-menu-item'">
             <delete-button
                   ref="deleteButton"
                   :from="'alertRule'"
diff --git a/nezha-fronted/src/components/common/table/alert/alertSilenceTable.vue b/nezha-fronted/src/components/common/table/alert/alertSilenceTable.vue
index 9376ba69c..940c2ae03 100644
--- a/nezha-fronted/src/components/common/table/alert/alertSilenceTable.vue
+++ b/nezha-fronted/src/components/common/table/alert/alertSilenceTable.vue
@@ -164,7 +164,7 @@
                 $t("overall.delete")
               }}</span></el-dropdown-item
             > -->
-             <el-dropdown-item v-has="'alertSilence_expire'" :command="['delete', scope.row]">
+             <el-dropdown-item v-has="'alertSilence_expire'" :command="['delete', scope.row]" :class="'nz-el-dropdown-menu-item'">
                   <delete-button
                   ref="deleteButton"
                   :from="'alertSilence'"
diff --git a/nezha-fronted/src/components/common/table/asset/assetMetaTable.vue b/nezha-fronted/src/components/common/table/asset/assetMetaTable.vue
index b0d27392d..b661829ac 100644
--- a/nezha-fronted/src/components/common/table/asset/assetMetaTable.vue
+++ b/nezha-fronted/src/components/common/table/asset/assetMetaTable.vue
@@ -95,22 +95,7 @@
           <el-dropdown-menu slot="dropdown" class="right-box-select-top right-public-box-dropdown-top">
 <!--            <el-dropdown-item v-has="'asset_label_edit'" :command="['edit', scope.row]"><i class="nz-icon nz-icon-edit"></i><span class="operation-dropdown-text">{{$t('overall.edit')}}</span></el-dropdown-item>-->
             <el-dropdown-item v-has="'asset_label_edit'" :command="['copy', scope.row]"><i class="nz-icon nz-icon-override"></i><span class="operation-dropdown-text">{{$t('overall.duplicate')}}</span></el-dropdown-item>
-            <!-- <el-dropdown-item v-has="'asset_label_delete'" :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="'asset_label_delete'" :command="['delete', scope.row]">
-                  <delete-button
-                  ref="deleteButton"
-                  :from="'assetMeta'"
-                  :forceDeleteShow="false"
-                  :type="'link'"
-                  :title="$t('overall.delete')"
-                  id="asset-meta-delete"
-                  v-has="'asset_label_delete'"
-                  :api="api"
-                  :single="true"
-                  :delete-objs="singleDelete"
-                  @before="delFlag=true"
-                  ></delete-button>
-              </el-dropdown-item>
+            <el-dropdown-item v-has="'asset_label_delete'" :command="['delete-rel', scope.row, {forceDeleteShow:false, single:true}]"><i class="nz-icon nz-icon-delete"></i><span class="operation-dropdown-text">{{$t('overall.delete')}}</span></el-dropdown-item>
           </el-dropdown-menu>
         </el-dropdown>
       </div>
diff --git a/nezha-fronted/src/components/common/table/asset/assetTable.vue b/nezha-fronted/src/components/common/table/asset/assetTable.vue
index 3bc88c7ab..0616a35fc 100644
--- a/nezha-fronted/src/components/common/table/asset/assetTable.vue
+++ b/nezha-fronted/src/components/common/table/asset/assetTable.vue
@@ -164,8 +164,8 @@
             <el-dropdown-menu slot="dropdown" class="right-box-select-top right-public-box-dropdown-top">
               <el-dropdown-item v-if="!assetTab" v-has="'asset_edit'" :command="['edit', scope.row]"><i class="nz-icon nz-icon-edit"></i><span class="operation-dropdown-text">{{$t('overall.edit')}}</span></el-dropdown-item>
               <el-dropdown-item v-has="'asset_connect'" :command="['cli', scope.row]" :disabled="!scope.row.authUsername"><i class="nz-icon nz-icon-cli"></i><span class="operation-dropdown-text">{{$t('config.system.terminal.terminal')}}</span></el-dropdown-item>
-              <el-dropdown-item v-has="'asset_add'" :command="['duplicate', scope.row]"><i class="nz-icon nz-icon-override"></i><span class="operation-dropdown-text">{{$t('overall.duplicate')}}</span></el-dropdown-item>
-              <el-dropdown-item v-has="'asset_delete'" :command="['delete-rel', 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="'asset_add'" :command="['duplicate', scope.row, ]"><i class="nz-icon nz-icon-override"></i><span class="operation-dropdown-text">{{$t('overall.duplicate')}}</span></el-dropdown-item>
+              <el-dropdown-item v-has="'asset_delete'" :command="['delete-rel', scope.row, {forceDeleteShow:true, single:true}]"><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="'alertSilence_add'" :command="['fastSilence', scope.row, 'asset']"><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="'asset_add'" :command="['topology', scope.row, 'asset']"><i class="nz-icon nz-icon-Topology"></i><span class="operation-dropdown-text">{{$t('overall.topology')}}</span></el-dropdown-item>
             </el-dropdown-menu>
@@ -189,21 +189,6 @@
       :type="alertLabelType"
       @tipHover='tipHover'
     ></alertLabel>
-    <delete-button
-      ref="deleteButton"
-      :from="'asset'"
-      :forceDeleteShow="true"
-      :deleteTitle="'overall.asset'"
-      :type="'hide'"
-      :title="$t('overall.delete')"
-      id="asset-list-delete"
-      class="asset-list-delete"
-      v-has="'asset_delete'"
-      :api="api"
-      :single="true"
-      :delete-objs="singleDelete"
-      @before="delFlag=true"
-    ></delete-button>
   </div>
 </template>
 
diff --git a/nezha-fronted/src/components/common/table/nzDataList.vue b/nezha-fronted/src/components/common/table/nzDataList.vue
index f3d7f072c..262dcaeba 100644
--- a/nezha-fronted/src/components/common/table/nzDataList.vue
+++ b/nezha-fronted/src/components/common/table/nzDataList.vue
@@ -100,6 +100,18 @@
         @showFullscreen="showFullscreen"
       ></panel-chart>
     </el-dialog>
+    <delete-button
+      ref="deleteButton"
+      :from="'endpoint'"
+      :forceDeleteShow="forceDeleteShow"
+      :deleteTitle="'project.endpoint.endpoint'"
+      :type="'hide'"
+      :title="$t('overall.delete')"
+      :api="api"
+      :single="single"
+      :delete-objs="singleDelete"
+      @before="delFlag=true"
+    ></delete-button>
   </div>
 </template>
 
@@ -112,13 +124,15 @@ import bus from '@/libs/bus'
 import routerPathParams from '@/components/common/mixin/routerPathParams'
 import lodash from 'lodash'
 import SearchBox from '@/components/common/searchBox/searchBox'
+import deleteButton from '@/components/common/deleteButton'
 export default {
   name: 'nzDataList',
   mixins: [routerPathParams],
   components: {
     SearchBox,
     bottomBox,
-    panelChart
+    panelChart,
+    deleteButton
   },
   props: {
     from: {
@@ -160,11 +174,22 @@ export default {
     },
     topologyChartInfo () {
       return this.$store.getters.getTopologyChartInfo
+    },
+    showDeleteTableRel () {
+      return this.$store.getters.getShowDeleteTableRel
+    },
+    deleteTableRel () {
+      return this.$store.getters.getDeleteTableRel
     }
   },
   data () {
     return {
       sign: '',
+      singleDelete: [],
+      api: '',
+      single: true,
+      forceDeleteShow: false,
+      delFlag: false,
       fromRoute: fromRoute,
       /* 二级页面相关 */
       bottomBox: {
@@ -189,6 +214,13 @@ export default {
     bus.$on('delTableRow', this.delTableRow)
   },
   methods: {
+    delTableRelRow (url, row, forceDeleteShow = false, single = false) {
+      this.api = url
+      this.singleDelete = [row]
+      this.forceDeleteShow = forceDeleteShow
+      this.single = single
+      this.$refs.deleteButton.batchDelete()
+    },
     delTableRow (ids) { // 接收一个 删除的id数组 判断当前底部弹窗id 是否包含 包含则关闭当前弹窗
       if (ids.indexOf(this.bottomBox.object.id) !== -1) {
         this.bottomBox = {
@@ -256,6 +288,11 @@ export default {
       handler (n) {
         this.showLayout = [...n]
       }
+    },
+    showDeleteTableRel (n) {
+      if (n) {
+        this.delTableRelRow(this.deleteTableRel.url, this.deleteTableRel.row, this.deleteTableRel.forceDeleteShow, this.deleteTableRel.single)
+      }
     }
   },
   beforeDestroy () {
diff --git a/nezha-fronted/src/components/common/table/settings/agentTable.vue b/nezha-fronted/src/components/common/table/settings/agentTable.vue
index 85b9dff8a..53abc39db 100644
--- a/nezha-fronted/src/components/common/table/settings/agentTable.vue
+++ b/nezha-fronted/src/components/common/table/settings/agentTable.vue
@@ -86,7 +86,7 @@
             <el-dropdown-item v-has="'agent_edit'" :command="['edit', scope.row]"><i class="nz-icon nz-icon-edit"></i><span class="operation-dropdown-text">{{$t('overall.edit')}}</span></el-dropdown-item>
             <el-dropdown-item v-has="'agent_edit'" :command="['copy', scope.row]"><i class="nz-icon nz-icon-override"></i><span class="operation-dropdown-text">{{$t('overall.duplicate')}}</span></el-dropdown-item>
             <!-- <el-dropdown-item v-has="'agent_delete'" :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="'agent_delete'" :command="['delete', scope.row]">
+            <el-dropdown-item v-has="'agent_delete'" :command="['delete', scope.row]" :class="'nz-el-dropdown-menu-item'">
                   <delete-button
                   ref="deleteButton"
                   :from="'agent'"
diff --git a/nezha-fronted/src/components/common/table/settings/assetTypeTable.vue b/nezha-fronted/src/components/common/table/settings/assetTypeTable.vue
index cadf3c3e9..f66a0b92a 100644
--- a/nezha-fronted/src/components/common/table/settings/assetTypeTable.vue
+++ b/nezha-fronted/src/components/common/table/settings/assetTypeTable.vue
@@ -79,7 +79,7 @@
           <el-dropdown-menu slot="dropdown" class="right-box-select-top right-public-box-dropdown-top">
             <el-dropdown-item v-has="'assetType_edit'" :command="['edit', scope.row]"><i class="nz-icon nz-icon-edit"></i><span class="operation-dropdown-text">{{$t('overall.edit')}}</span></el-dropdown-item>
             <!-- <el-dropdown-item v-has="'assetType_delete'" :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="'assetType_delete'" :command="['delete', scope.row]">
+            <el-dropdown-item v-has="'assetType_delete'" :command="['delete', scope.row]" :class="'nz-el-dropdown-menu-item'">
                   <delete-button
                   ref="deleteButton"
                   :from="'assetType'"
diff --git a/nezha-fronted/src/components/common/table/settings/backupsTable.vue b/nezha-fronted/src/components/common/table/settings/backupsTable.vue
index c2de8a009..35feb7edf 100644
--- a/nezha-fronted/src/components/common/table/settings/backupsTable.vue
+++ b/nezha-fronted/src/components/common/table/settings/backupsTable.vue
@@ -57,7 +57,7 @@
           </div>
           <el-dropdown-menu slot="dropdown" class="right-box-select-top right-public-box-dropdown-top">
             <el-dropdown-item v-has="'backup_restore'" :command="['restore', scope.row]" disabled><i class="nz-icon-shujubeifenhuifu nz-icon"></i><span>{{$t('backup.RestoreNow')}}</span></el-dropdown-item>
-            <el-dropdown-item v-has="'backup_del'" :command="['delete', scope.row]">
+            <el-dropdown-item v-has="'backup_del'" :command="['delete', scope.row]" :class="'nz-el-dropdown-menu-item'">
                   <delete-button
                     ref="deleteButton"
                     :forceDeleteShow="false"
diff --git a/nezha-fronted/src/components/common/table/settings/cabinetTable.vue b/nezha-fronted/src/components/common/table/settings/cabinetTable.vue
index c3bf74737..303e70514 100644
--- a/nezha-fronted/src/components/common/table/settings/cabinetTable.vue
+++ b/nezha-fronted/src/components/common/table/settings/cabinetTable.vue
@@ -40,7 +40,7 @@
           <el-dropdown-menu slot="dropdown" class="right-box-select-top right-public-box-dropdown-top">
             <el-dropdown-item v-has="'dc_add'" :command="['copy', scope.row]"><i class="nz-icon nz-icon-override"></i><span class="operation-dropdown-text">{{$t('overall.duplicate')}}</span></el-dropdown-item>
             <!-- <el-dropdown-item :command="['delete', scope.row]" v-has="'dc_delete'"><i class="nz-icon nz-icon-delete"></i><span class="operation-dropdown-text">{{$t('overall.delete')}}</span></el-dropdown-item> -->
-            <el-dropdown-item :command="['delete', scope.row]" v-has="'dc_delete'">
+            <el-dropdown-item :command="['delete', scope.row]" v-has="'dc_delete'" :class="'nz-el-dropdown-menu-item'">
                   <delete-button
                   ref="deleteButton"
                   :from="'cabinet'"
diff --git a/nezha-fronted/src/components/common/table/settings/chartTmplTable.vue b/nezha-fronted/src/components/common/table/settings/chartTmplTable.vue
index 639a8ba7d..1993bfbb0 100644
--- a/nezha-fronted/src/components/common/table/settings/chartTmplTable.vue
+++ b/nezha-fronted/src/components/common/table/settings/chartTmplTable.vue
@@ -66,7 +66,7 @@
           <el-dropdown-menu slot="dropdown" class="right-box-select-top right-public-box-dropdown-top">
             <el-dropdown-item v-has="'chartTemplate_edit'" :command="['edit', scope.row]"><i class="nz-icon nz-icon-edit"></i><span class="operation-dropdown-text">{{$t('overall.edit')}}</span></el-dropdown-item>
             <!-- <el-dropdown-item v-has="'chartTemplate_delete'" :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="'chartTemplate_delete'" :command="['delete', scope.row]">
+            <el-dropdown-item v-has="'chartTemplate_delete'" :command="['delete', scope.row]" :class="'nz-el-dropdown-menu-item'">
                   <delete-button
                   ref="deleteButton"
                   :from="'chartTemp'"
diff --git a/nezha-fronted/src/components/common/table/settings/credentialsTable.vue b/nezha-fronted/src/components/common/table/settings/credentialsTable.vue
index 4cfe8867a..6122526b3 100644
--- a/nezha-fronted/src/components/common/table/settings/credentialsTable.vue
+++ b/nezha-fronted/src/components/common/table/settings/credentialsTable.vue
@@ -81,7 +81,7 @@
           </div>
           <el-dropdown-menu slot="dropdown" class="right-box-select-top right-public-box-dropdown-top">
             <!-- <el-dropdown-item v-has="'credential_delete'" :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="'credential_delete'" :command="['delete', scope.row]">
+            <el-dropdown-item v-has="'credential_delete'" :command="['delete', scope.row]" :class="'nz-el-dropdown-menu-item'">
                   <delete-button
                   ref="deleteButton"
                   :from="'credentials'"
diff --git a/nezha-fronted/src/components/common/table/settings/dashboardTmplTable.vue b/nezha-fronted/src/components/common/table/settings/dashboardTmplTable.vue
index ff9548828..f83ae6f41 100644
--- a/nezha-fronted/src/components/common/table/settings/dashboardTmplTable.vue
+++ b/nezha-fronted/src/components/common/table/settings/dashboardTmplTable.vue
@@ -65,7 +65,7 @@
           </div>
           <el-dropdown-menu slot="dropdown" class="right-box-select-top right-public-box-dropdown-top">
             <el-dropdown-item v-has="'dashboard_temp_edit'" :command="['edit', scope.row]"><i class="nz-icon nz-icon-edit"></i><span class="operation-dropdown-text">{{$t('overall.edit')}}</span></el-dropdown-item>
-            <el-dropdown-item v-has="'dashboard_temp_delete'" :command="['delete', scope.row]">
+            <el-dropdown-item v-has="'dashboard_temp_delete'" :command="['delete', scope.row]" :class="'nz-el-dropdown-menu-item'">
               <delete-button
                 ref="deleteButton"
                 :from="'dashboardTemp'"
diff --git a/nezha-fronted/src/components/common/table/settings/dcTable.vue b/nezha-fronted/src/components/common/table/settings/dcTable.vue
index edd19d162..e227603bc 100644
--- a/nezha-fronted/src/components/common/table/settings/dcTable.vue
+++ b/nezha-fronted/src/components/common/table/settings/dcTable.vue
@@ -1,73 +1,74 @@
 <template>
-  <el-table
-    id="dcTable"
-    ref="dataTable"
-    :data="tableData"
-    :height="height"
-    border
-    :default-sort="orderBy"
-    @cell-mouse-enter="cellMouseEnter"
-    @header-dragend="dragend"
-    @sort-change="tableDataSort"
-    @selection-change="selectionChange"
-    @row-dblclick="(row)=>{showBottomBox('cabinet', row)}"
-  >
-    <el-table-column
-      :resizable="false"
-      align="center"
-      type="selection"
-      width="55">
-    </el-table-column>
-    <el-table-column
-      v-for="(item, index) in customTableTitle"
-      v-if="item.show"
-      :key="`col-${index}`"
-      :fixed="item.fixed"
-      :label="item.label"
-      :min-width="`${item.minWidth}`"
-      :prop="item.prop"
-      :resizable="true"
-      :sort-orders="['ascending', 'descending']"
-      :sortable="item.sortable"
-      :width="`${item.width}`"
-      class="data-column"
+  <div>
+    <el-table
+      id="dcTable"
+      ref="dataTable"
+      :data="tableData"
+      :height="height"
+      border
+      :default-sort="orderBy"
+      @cell-mouse-enter="cellMouseEnter"
+      @header-dragend="dragend"
+      @sort-change="tableDataSort"
+      @selection-change="selectionChange"
+      @row-dblclick="(row)=>{showBottomBox('cabinet', row)}"
     >
-      <template slot="header">
-        <span class="data-column__span">{{item.label}}</span>
-        <div class="col-resize-area"></div>
-      </template>
-      <template slot-scope="scope" :column="item">
-        <template v-if="item.prop === 'principal'">
-          <template v-if="scope.row.adminUser">
-            {{scope.row.adminUser.name}}
+      <el-table-column
+        :resizable="false"
+        align="center"
+        type="selection"
+        width="55">
+      </el-table-column>
+      <el-table-column
+        v-for="(item, index) in customTableTitle"
+        v-if="item.show"
+        :key="`col-${index}`"
+        :fixed="item.fixed"
+        :label="item.label"
+        :min-width="`${item.minWidth}`"
+        :prop="item.prop"
+        :resizable="true"
+        :sort-orders="['ascending', 'descending']"
+        :sortable="item.sortable"
+        :width="`${item.width}`"
+        class="data-column"
+      >
+        <template slot="header">
+          <span class="data-column__span">{{item.label}}</span>
+          <div class="col-resize-area"></div>
+        </template>
+        <template slot-scope="scope" :column="item">
+          <template v-if="item.prop === 'principal'">
+            <template v-if="scope.row.adminUser">
+              {{scope.row.adminUser.name}}
+            </template>
+            <template v-else>-</template>
           </template>
-          <template v-else>-</template>
-        </template>
-        <template v-else-if="item.prop === 'state'">
-          <div v-if="scope.row[item.prop] === 'ON'">
-            <div class="active-icon green-bg inline-block"></div>
-            {{ $t('overall.enabled') }}
-          </div>
-          <div v-else-if="scope.row[item.prop] === 'OFF'">
-            <div class="active-icon gray-bg inline-block"></div>
-            {{ $t('overall.disabled') }}
-          </div>
-        </template>
-        <template v-else-if="item.prop === 'longitude'">
-          <template v-if="regNumTest(scope.row.longitude)">{{scope.row.longitude}}</template>
-          <template v-else>-</template>
-        </template>
-        <template v-else-if="item.prop === 'latitude'">
-          <template v-if="regNumTest(scope.row.latitude)">{{scope.row.latitude}}</template>
-          <template v-else>-</template>
-        </template>
-        <template v-else-if="item.prop === 'assetNum'">
+          <template v-else-if="item.prop === 'state'">
+            <div v-if="scope.row[item.prop] === 'ON'">
+              <div class="active-icon green-bg inline-block"></div>
+              {{ $t('overall.enabled') }}
+            </div>
+            <div v-else-if="scope.row[item.prop] === 'OFF'">
+              <div class="active-icon gray-bg inline-block"></div>
+              {{ $t('overall.disabled') }}
+            </div>
+          </template>
+          <template v-else-if="item.prop === 'longitude'">
+            <template v-if="regNumTest(scope.row.longitude)">{{scope.row.longitude}}</template>
+            <template v-else>-</template>
+          </template>
+          <template v-else-if="item.prop === 'latitude'">
+            <template v-if="regNumTest(scope.row.latitude)">{{scope.row.latitude}}</template>
+            <template v-else>-</template>
+          </template>
+          <template v-else-if="item.prop === 'assetNum'">
           <span style="cursor: pointer" class="asset-num"  @click.stop="showBottomBox('asset', scope.row)" @dblclick.stop="">
              <i class="nz-icon nz-icon-overview-project monitorColor" :class="scope.row[item.prop]>0?'color23BF9A':'color23BF9A'"/>
           {{scope.row[item.prop]}}
           </span>
-        </template>
-        <template v-else-if="item.prop === 'alertNum'">
+          </template>
+          <template v-else-if="item.prop === 'alertNum'">
            <span style="cursor: pointer" @click.stop="$emit('showBottomBox', 'alertMessageTab', scope.row)" @dblclick.stop="">
             <i :class="scope.row.alertNum ? 'red' : 'green'" class="nz-icon nz-icon-overview-alert vertical-align-top;"  @mouseenter="tooltipHover(scope.row,true, $event)" @mouseleave="tooltipHover(scope.row,false, $event)"></i>
             <div v-if="scope.row.alertNumtooltipShow" class="alert-days-info-tooltip" :style="{left: scope.row.left + 'px',top:scope.row.top + 'px'}">
@@ -78,76 +79,61 @@
               </div>
             </div>
             <alertDaysInfo
-                    v-show="!scope.row.trendLoading"
-                    :alertDaysData="scope.row.alertDaysData"
+              v-show="!scope.row.trendLoading"
+              :alertDaysData="scope.row.alertDaysData"
             />
           </span>
-        </template>
+          </template>
 
-        <template v-else-if="item.prop === 'cabinetNum'">
+          <template v-else-if="item.prop === 'cabinetNum'">
           <span style="cursor: pointer" class="cabinet-num" @click.stop="showBottomBox('cabinet', scope.row)" @dblclick.stop="">
             <i class="nz-icon nz-icon-cabinet monitorColor" :class="scope.row[item.prop]>0?'color23BF9A':'colorEF7458'"/>
             {{scope.row[item.prop]}}
           </span>
-        </template>
-        <template v-else-if="item.prop === 'name'">
-          <copy :copyData='scope.row[item.prop]' :showInfo='scope.row[item.prop]'>
-                  <template slot="copy-text">
-                     {{scope.row[item.prop]?scope.row[item.prop]:'-'}}
-                  </template>
-          </copy>
           </template>
-        <span v-else-if="item.prop === 'id'" :id="'globalSearch' + scope.row.id">{{scope.row[item.prop]}}</span>
-        <template v-else-if="scope.row[item.prop]">{{scope.row[item.prop]}}</template>
-        <template v-else>-</template>
+          <template v-else-if="item.prop === 'name'">
+            <copy :copyData='scope.row[item.prop]' :showInfo='scope.row[item.prop]'>
+              <template slot="copy-text">
+                {{scope.row[item.prop]?scope.row[item.prop]:'-'}}
+              </template>
+            </copy>
+          </template>
+          <span v-else-if="item.prop === 'id'" :id="'globalSearch' + scope.row.id">{{scope.row[item.prop]}}</span>
+          <template v-else-if="scope.row[item.prop]">{{scope.row[item.prop]}}</template>
+          <template v-else>-</template>
+        </template>
+      </el-table-column>
+      <el-table-column
+        :resizable="false"
+        :width="operationWidth"
+        fixed="right">
+        <div slot="header" class="table-operation-title">{{$t('overall.option')}}</div>
+        <div slot-scope="scope" class="table-operation-items">
+          <button class="table-operation-item" v-has="'dc_edit'" @click="showBottomBox('cabinet', scope.row)" :title="$t('overall.view')"><i class="nz-icon nz-icon-view1"></i></button>
+          <el-dropdown size="medium" v-has="['dc_delete','dc_edit']" trigger="click" @command="tableOperation">
+            <div class="table-operation-item table-operation-item--more" :title="$t('overall.moreOperations')">
+              <i class="nz-icon nz-icon-more3"></i>
+            </div>
+            <el-dropdown-menu slot="dropdown" class="right-box-select-top right-public-box-dropdown-top">
+              <el-dropdown-item v-has="'dc_edit'" :command="['edit', scope.row]"><i class="nz-icon nz-icon-edit"></i><span class="operation-dropdown-text">{{$t('overall.edit')}}</span></el-dropdown-item>
+              <el-dropdown-item v-has="'dc_edit'" :command="['copy', scope.row]"><i class="nz-icon nz-icon-override"></i><span class="operation-dropdown-text">{{$t('overall.duplicate')}}</span></el-dropdown-item>
+              <el-dropdown-item v-has="'dc_delete'" :command="['delete-rel', scope.row, {forceDeleteShow:true, single:true}]"><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="'asset_add'" :command="['topology', scope.row, 'datacenter']"><i class="nz-icon nz-icon-Topology"></i><span class="operation-dropdown-text">{{$t('overall.topology')}}</span></el-dropdown-item>
+            </el-dropdown-menu>
+          </el-dropdown>
+        </div>
+      </el-table-column>
+      <template  slot="empty">
+        <div v-if="!loading" class="table-no-data">
+          <svg class="icon" aria-hidden="true">
+            <use xlink:href="#nz-icon-no-data-list"></use>
+          </svg>
+          <div class="table-no-data__title">No results found</div>
+        </div>
+        <div v-else>&nbsp;</div>
       </template>
-    </el-table-column>
-    <el-table-column
-      :resizable="false"
-      :width="operationWidth"
-      fixed="right">
-      <div slot="header" class="table-operation-title">{{$t('overall.option')}}</div>
-      <div slot-scope="scope" class="table-operation-items">
-        <button class="table-operation-item" v-has="'dc_edit'" @click="showBottomBox('cabinet', scope.row)" :title="$t('overall.view')"><i class="nz-icon nz-icon-view1"></i></button>
-        <el-dropdown size="medium" v-has="['dc_delete','dc_edit']" trigger="click" @command="tableOperation">
-          <div class="table-operation-item table-operation-item--more" :title="$t('overall.moreOperations')">
-            <i class="nz-icon nz-icon-more3"></i>
-          </div>
-          <el-dropdown-menu slot="dropdown" class="right-box-select-top right-public-box-dropdown-top">
-            <el-dropdown-item v-has="'dc_edit'" :command="['edit', scope.row]"><i class="nz-icon nz-icon-edit"></i><span class="operation-dropdown-text">{{$t('overall.edit')}}</span></el-dropdown-item>
-            <el-dropdown-item v-has="'dc_edit'" :command="['copy', scope.row]"><i class="nz-icon nz-icon-override"></i><span class="operation-dropdown-text">{{$t('overall.duplicate')}}</span></el-dropdown-item>
-            <!-- <el-dropdown-item v-has="'dc_delete'" :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="'dc_delete'" :command="['delete', scope.row]">
-                  <delete-button
-                  ref="deleteButton"
-                  :from="'datacenter'"
-                  :forceDeleteShow="true"
-                  :deleteTitle="'overall.dc'"
-                  :type="'link'"
-                  :title="$t('overall.delete')"
-                  id="account-list-delete"
-                  v-has="'dc_delete'"
-                  :api="api"
-                  :single="true"
-                  :delete-objs="singleDelete"
-                  @before="delFlag=true"
-                  ></delete-button>
-              </el-dropdown-item>
-            <el-dropdown-item v-has="'asset_add'" :command="['topology', scope.row, 'datacenter']"><i class="nz-icon nz-icon-Topology"></i><span class="operation-dropdown-text">{{$t('overall.topology')}}</span></el-dropdown-item>
-          </el-dropdown-menu>
-        </el-dropdown>
-      </div>
-    </el-table-column>
-    <template  slot="empty">
-      <div v-if="!loading" class="table-no-data">
-        <svg class="icon" aria-hidden="true">
-          <use xlink:href="#nz-icon-no-data-list"></use>
-        </svg>
-        <div class="table-no-data__title">No results found</div>
-      </div>
-      <div v-else>&nbsp;</div>
-    </template>
-  </el-table>
+    </el-table>
+  </div>
 </template>
 
 <script>
diff --git a/nezha-fronted/src/components/common/table/settings/endpointTable.vue b/nezha-fronted/src/components/common/table/settings/endpointTable.vue
index bae2066d2..a9b5fc68f 100644
--- a/nezha-fronted/src/components/common/table/settings/endpointTable.vue
+++ b/nezha-fronted/src/components/common/table/settings/endpointTable.vue
@@ -177,7 +177,7 @@
             <el-dropdown-menu slot="dropdown" class="right-box-select-top right-public-box-dropdown-top">
               <!--            <el-dropdown-item v-if="!endpointTab" :command="['endpointQuery', scope.row]"><i class="nz-icon nz-icon-search"></i><span class="operation-dropdown-text">{{$t('overall.query')}}</span></el-dropdown-item>-->
               <el-dropdown-item v-if="!endpointTab" v-has="'monitor_endpoint_edit'" :command="['edit', scope.row]"><i class="nz-icon nz-icon-edit"></i><span class="operation-dropdown-text">{{$t('overall.edit')}}</span></el-dropdown-item>
-              <el-dropdown-item v-has="'monitor_endpoint_delete'" :command="['delete-rel', scope.row, `sys/endpoint?ids=${scope.row.id}`]"><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="'monitor_endpoint_delete'" :command="['delete-rel', scope.row, {forceDeleteShow:false, single:true}]"><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="'monitor_endpoint_edit'" :command="['copy', scope.row, 'project']"><i class="nz-icon nz-icon-override"></i><span class="operation-dropdown-text">{{$t('overall.duplicate')}}</span></el-dropdown-item>
               <el-dropdown-item v-has="'alertSilence_add'" :command="['fastSilence', scope.row, 'endpoint']"><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="'asset_add'" :command="['topology', scope.row, 'endpoint']"><i class="nz-icon nz-icon-Topology"></i><span class="operation-dropdown-text">{{$t('overall.topology')}}</span></el-dropdown-item>
@@ -202,20 +202,6 @@
       :that="alertLabelObj"
       :type="alertLabelType"
     ></alertLabel>
-    <delete-button
-      ref="deleteButton"
-      :from="'endpoint'"
-      :forceDeleteShow="false"
-      :deleteTitle="'project.endpoint.endpoint'"
-      :type="'link'"
-      :title="$t('overall.delete')"
-      id="account-list-delete"
-      v-has="'monitor_endpoint_delete'"
-      :api="api"
-      :single="true"
-      :delete-objs="singleDelete"
-      @before="delFlag=true"
-    ></delete-button>
   </div>
 </template>
 
diff --git a/nezha-fronted/src/components/common/table/settings/exprTmplTable.vue b/nezha-fronted/src/components/common/table/settings/exprTmplTable.vue
index a69adc7c6..c7cf33c80 100644
--- a/nezha-fronted/src/components/common/table/settings/exprTmplTable.vue
+++ b/nezha-fronted/src/components/common/table/settings/exprTmplTable.vue
@@ -67,7 +67,7 @@
           <el-dropdown-menu slot="dropdown" class="right-box-select-top right-public-box-dropdown-top">
             <el-dropdown-item v-has="'expressionTemplate_add'" :command="['copy', scope.row]"><i class="nz-icon nz-icon-override"></i><span class="operation-dropdown-text">{{$t('overall.duplicate')}}</span></el-dropdown-item>
             <!-- <el-dropdown-item v-has="'expressionTemplate_delete'" :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="'expressionTemplate_delete'" :command="['delete', scope.row]">
+            <el-dropdown-item v-has="'expressionTemplate_delete'" :command="['delete', scope.row]" :class="'nz-el-dropdown-menu-item'">
                   <delete-button
                   ref="deleteButton"
                   :from="'exprTemp'"
diff --git a/nezha-fronted/src/components/common/table/settings/globalizationTable.vue b/nezha-fronted/src/components/common/table/settings/globalizationTable.vue
index c1347192f..12f86d6ea 100644
--- a/nezha-fronted/src/components/common/table/settings/globalizationTable.vue
+++ b/nezha-fronted/src/components/common/table/settings/globalizationTable.vue
@@ -57,7 +57,7 @@
           <el-dropdown-menu slot="dropdown" class="right-box-select-top right-public-box-dropdown-top">
             <!-- <el-dropdown-item v-has="'i18n_delete'" :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 :command="['copy', scope.row]"><i class="nz-icon nz-icon-override"></i><span class="operation-dropdown-text">{{$t('overall.duplicate')}}</span></el-dropdown-item>
-            <el-dropdown-item v-has="'i18n_delete'" :command="['delete', scope.row]">
+            <el-dropdown-item v-has="'i18n_delete'" :command="['delete', scope.row]" :class="'nz-el-dropdown-menu-item'">
                   <delete-button
                   ref="deleteButton"
                   :from="'globalization'"
diff --git a/nezha-fronted/src/components/common/table/settings/ipDetailsTable.vue b/nezha-fronted/src/components/common/table/settings/ipDetailsTable.vue
index ac02258a9..529a350c0 100644
--- a/nezha-fronted/src/components/common/table/settings/ipDetailsTable.vue
+++ b/nezha-fronted/src/components/common/table/settings/ipDetailsTable.vue
@@ -66,7 +66,7 @@
           </div>
           <el-dropdown-menu slot="dropdown" class="right-box-select-top right-public-box-dropdown-top">
             <!-- <el-dropdown-item v-has="'ipam_delete'" :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="'ipam_delete'" :command="['delete', scope.row]">
+            <el-dropdown-item v-has="'ipam_delete'" :command="['delete', scope.row]" :class="'nz-el-dropdown-menu-item'">
                   <delete-button
                   ref="deleteButton"
                   :from="'ipDetails'"
diff --git a/nezha-fronted/src/components/common/table/settings/ipamTable.vue b/nezha-fronted/src/components/common/table/settings/ipamTable.vue
index d75572aa9..785064899 100644
--- a/nezha-fronted/src/components/common/table/settings/ipamTable.vue
+++ b/nezha-fronted/src/components/common/table/settings/ipamTable.vue
@@ -72,7 +72,7 @@
             <el-dropdown-item v-has="'ipam_edit'" :command="['edit', scope.row]"><i class="nz-icon nz-icon-edit"></i><span class="operation-dropdown-text">{{$t('overall.edit')}}</span></el-dropdown-item>
             <el-dropdown-item v-has="'ipam_edit'" :command="['copy', scope.row]"><i class="nz-icon nz-icon-override"></i><span class="operation-dropdown-text">{{$t('overall.duplicate')}}</span></el-dropdown-item>
             <!-- <el-dropdown-item v-has="'ipam_delete'" :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="'ipam_delete'" :command="['delete', scope.row]">
+            <el-dropdown-item v-has="'ipam_delete'" :command="['delete', scope.row]" :class="'nz-el-dropdown-menu-item'">
                   <delete-button
                   ref="deleteButton"
                   :from="'ipam'"
diff --git a/nezha-fronted/src/components/common/table/settings/issueTable.vue b/nezha-fronted/src/components/common/table/settings/issueTable.vue
index 0f12a3dbf..7f3ef14ed 100644
--- a/nezha-fronted/src/components/common/table/settings/issueTable.vue
+++ b/nezha-fronted/src/components/common/table/settings/issueTable.vue
@@ -104,7 +104,7 @@
             <el-dropdown-item v-if="!scope.row.buildIn" v-has="'record_rule_edit'" :command="['edit', scope.row]"><i class="nz-icon nz-icon-edit"></i><span class="operation-dropdown-text">{{$t('overall.edit')}}</span></el-dropdown-item>
             <el-dropdown-item v-if="!scope.row.buildIn" v-has="'record_rule_edit'" :command="['copy', scope.row]"><i class="nz-icon nz-icon-override"></i><span class="operation-dropdown-text">{{$t('overall.duplicate')}}</span></el-dropdown-item>
             <!-- <el-dropdown-item v-if="!scope.row.buildIn" v-has="'record_rule_delete'" :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-if="!scope.row.buildIn" v-has="'record_rule_delete'" :command="['delete', scope.row]">
+            <el-dropdown-item v-if="!scope.row.buildIn" v-has="'record_rule_delete'" :command="['delete', scope.row]" :class="'nz-el-dropdown-menu-item'">
                   <delete-button
                   ref="deleteButton"
                   :from="'issue'"
diff --git a/nezha-fronted/src/components/common/table/settings/menuTable.vue b/nezha-fronted/src/components/common/table/settings/menuTable.vue
index aa412f1ec..df2f8d8e0 100644
--- a/nezha-fronted/src/components/common/table/settings/menuTable.vue
+++ b/nezha-fronted/src/components/common/table/settings/menuTable.vue
@@ -68,7 +68,7 @@
           </div>
           <el-dropdown-menu slot="dropdown" class="right-box-select-top right-public-box-dropdown-top">
             <!-- <el-dropdown-item  v-has="'monitor_module_delete'" :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="'monitor_module_delete'" :command="['delete', scope.row]">
+            <el-dropdown-item v-has="'monitor_module_delete'" :command="['delete', scope.row]" :class="'nz-el-dropdown-menu-item'">
                   <delete-button
                   ref="deleteButton"
                   :from="'menus'"
diff --git a/nezha-fronted/src/components/common/table/settings/mibTable.vue b/nezha-fronted/src/components/common/table/settings/mibTable.vue
index 5c95ab0fb..f55304ea6 100644
--- a/nezha-fronted/src/components/common/table/settings/mibTable.vue
+++ b/nezha-fronted/src/components/common/table/settings/mibTable.vue
@@ -96,7 +96,7 @@
           <el-dropdown-menu slot="dropdown" class="right-box-select-top right-public-box-dropdown-top">
             <el-dropdown-item v-has="'snmp_mibFile_edit'" :command="['edit', scope.row]"><i class="nz-icon nz-icon-edit"></i><span class="operation-dropdown-text">{{$t('overall.edit')}}</span></el-dropdown-item>
             <!-- <el-dropdown-item v-has="'snmp_mibFile_delete'" :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="'snmp_mibFile_delete'" :command="['delete', scope.row]">
+            <el-dropdown-item v-has="'snmp_mibFile_delete'" :command="['delete', scope.row]" :class="'nz-el-dropdown-menu-item'">
                   <delete-button
                   ref="deleteButton"
                   :from="'mib'"
diff --git a/nezha-fronted/src/components/common/table/settings/modelTable.vue b/nezha-fronted/src/components/common/table/settings/modelTable.vue
index a288ecf3f..18bc5a513 100644
--- a/nezha-fronted/src/components/common/table/settings/modelTable.vue
+++ b/nezha-fronted/src/components/common/table/settings/modelTable.vue
@@ -93,22 +93,7 @@
           <el-dropdown-menu slot="dropdown" class="right-box-select-top right-public-box-dropdown-top">
             <el-dropdown-item v-has="'model_edit'" :command="['edit', scope.row]"><i class="nz-icon nz-icon-edit"></i><span class="operation-dropdown-text">{{$t('overall.edit')}}</span></el-dropdown-item>
             <el-dropdown-item v-has="'model_edit'" :command="['copy', scope.row]"><i class="nz-icon nz-icon-override"></i><span class="operation-dropdown-text">{{$t('overall.duplicate')}}</span></el-dropdown-item>
-            <!-- <el-dropdown-item v-has="'model_delete'" :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="'model_delete'" :command="['delete', scope.row]">
-                  <delete-button
-                  ref="deleteButton"
-                  :from="'model'"
-                  :forceDeleteShow="true"
-                  :type="'link'"
-                  :title="$t('overall.delete')"
-                  id="account-list-delete"
-                  v-has="'model_delete'"
-                  :api="api"
-                  :single="true"
-                  :delete-objs="singleDelete"
-                  @before="delFlag=true"
-                  ></delete-button>
-              </el-dropdown-item>
+            <el-dropdown-item v-has="'model_delete'" :command="['delete-rel', scope.row, {forceDeleteShow:true, single:true}]"><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="'main_edit'" :command="['sync', scope.row]"><i class="nz-icon nz-icon-sync"></i><span class="operation-dropdown-text">{{$t('overall.syncChart')}}</span></el-dropdown-item>
           </el-dropdown-menu>
         </el-dropdown>
diff --git a/nezha-fronted/src/components/common/table/settings/moduleTable.vue b/nezha-fronted/src/components/common/table/settings/moduleTable.vue
index 33b6ab4c9..69558300b 100644
--- a/nezha-fronted/src/components/common/table/settings/moduleTable.vue
+++ b/nezha-fronted/src/components/common/table/settings/moduleTable.vue
@@ -97,23 +97,7 @@
           </div>
           <el-dropdown-menu slot="dropdown" class="right-box-select-top right-public-box-dropdown-top">
             <el-dropdown-item v-has="'monitor_module_edit'" :command="['edit', scope.row]"><i class="nz-icon nz-icon-edit"></i><span class="operation-dropdown-text">{{$t('overall.edit')}}</span></el-dropdown-item>
-            <!-- <el-dropdown-item v-has="'monitor_module_delete'" :command="['delete', scope.row, `sys/user?ids=${scope.row.id}`]"><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="'monitor_module_delete'" :command="['delete', scope.row, `sys/user?ids=${scope.row.id}`]">
-                  <delete-button
-                  ref="deleteButton"
-                  :from="'module'"
-                  :forceDeleteShow="true"
-                  :type="'link'"
-                  :deleteTitle="'project.module.module'"
-                  :title="$t('overall.delete')"
-                  id="account-list-delete"
-                  v-has="'monitor_module_delete'"
-                  :api="api"
-                  :single="true"
-                  :delete-objs="singleDelete"
-                  @before="delFlag=true"
-                  ></delete-button>
-              </el-dropdown-item>
+            <el-dropdown-item v-has="'monitor_module_delete'" :command="['delete-rel', scope.row, {forceDeleteShow:true, single:true}]"><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="'monitor_module_edit'" :command="['copy', scope.row, 'module']"><i class="nz-icon nz-icon-override"></i><span class="operation-dropdown-text">{{$t('overall.duplicate')}}</span></el-dropdown-item>
             <el-dropdown-item v-has="'main_edit'" :command="['sync', scope.row]"><i class="nz-icon nz-icon-sync"></i><span class="operation-dropdown-text">{{$t('overall.syncChart')}}</span></el-dropdown-item>
             <el-dropdown-item v-has="'alertSilence_add'" :command="['fastSilence', scope.row, 'module']"><i class="nz-icon nz-icon-fast-silence"></i><span class="operation-dropdown-text">{{$t('overall.silenceAlert')}}</span></el-dropdown-item>
diff --git a/nezha-fronted/src/components/common/table/settings/projectTable.vue b/nezha-fronted/src/components/common/table/settings/projectTable.vue
index 1f630d0b1..8e4a04b3c 100644
--- a/nezha-fronted/src/components/common/table/settings/projectTable.vue
+++ b/nezha-fronted/src/components/common/table/settings/projectTable.vue
@@ -91,23 +91,7 @@
           </div>
           <el-dropdown-menu slot="dropdown" class="right-box-select-top right-public-box-dropdown-top">
             <el-dropdown-item :command="['edit', scope.row]" v-has="'project_edit'"><i class="nz-icon nz-icon-edit"></i><span class="operation-dropdown-text">{{$t('overall.edit')}}</span></el-dropdown-item>
-            <!-- <el-dropdown-item :command="['delete', scope.row, `sys/user?ids=${scope.row.id}`]" v-has="'project_delete'"><i class="nz-icon nz-icon-delete"></i><span class="operation-dropdown-text">{{$t('overall.delete')}}</span></el-dropdown-item> -->
-            <el-dropdown-item :command="['delete', scope.row, `sys/user?ids=${scope.row.id}`]" v-has="'project_delete'">
-                  <delete-button
-                  ref="deleteButton"
-                  :from="'project'"
-                  :forceDeleteShow="true"
-                  :type="'link'"
-                  :deleteTitle="'overall.project'"
-                  :title="$t('overall.delete')"
-                  id="account-list-delete"
-                  v-has="'project_delete'"
-                  :api="api"
-                  :single="true"
-                  :delete-objs="singleDelete"
-                  @before="delFlag=true"
-                  ></delete-button>
-              </el-dropdown-item>
+            <el-dropdown-item :command="['delete-rel', scope.row, {forceDeleteShow:true, single:true}]" v-has="'project_delete'"><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="'project_edit'" :command="['copy', scope.row, 'project']"><i class="nz-icon nz-icon-override"></i><span class="operation-dropdown-text">{{$t('overall.duplicate')}}</span></el-dropdown-item>
             <el-dropdown-item v-has="'alertSilence_add'" :command="['fastSilence', scope.row, 'project']"><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="'asset_add'" :command="['topology', scope.row, 'project']"><i class="nz-icon nz-icon-Topology"></i><span class="operation-dropdown-text">{{$t('overall.topology')}}</span></el-dropdown-item>
diff --git a/nezha-fronted/src/components/common/table/settings/recordRuleTable.vue b/nezha-fronted/src/components/common/table/settings/recordRuleTable.vue
index eebec88a6..7cc4d126a 100644
--- a/nezha-fronted/src/components/common/table/settings/recordRuleTable.vue
+++ b/nezha-fronted/src/components/common/table/settings/recordRuleTable.vue
@@ -117,7 +117,7 @@
             <el-dropdown-item v-if="!scope.row.buildIn" v-has="'record_rule_edit'" :command="['edit', scope.row]"><i class="nz-icon nz-icon-edit"></i><span class="operation-dropdown-text">{{$t('overall.edit')}}</span></el-dropdown-item>
             <el-dropdown-item v-if="!scope.row.buildIn" v-has="'record_rule_edit'" :command="['copy', scope.row, {copyName: '_copy'}]"><i class="nz-icon nz-icon-override"></i><span class="operation-dropdown-text">{{$t('overall.duplicate')}}</span></el-dropdown-item>
             <!-- <el-dropdown-item v-if="!scope.row.buildIn" v-has="'record_rule_delete'" :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-if="!scope.row.buildIn" v-has="'record_rule_delete'" :command="['delete', scope.row]">
+            <el-dropdown-item v-if="!scope.row.buildIn" v-has="'record_rule_delete'" :command="['delete', scope.row]" :class="'nz-el-dropdown-menu-item'">
                   <delete-button
                   ref="deleteButton"
                   :from="'recordRule'"
diff --git a/nezha-fronted/src/components/common/table/settings/roleTable.vue b/nezha-fronted/src/components/common/table/settings/roleTable.vue
index 98426efff..2748f3988 100644
--- a/nezha-fronted/src/components/common/table/settings/roleTable.vue
+++ b/nezha-fronted/src/components/common/table/settings/roleTable.vue
@@ -69,7 +69,7 @@
           <el-dropdown-menu slot="dropdown" class="right-box-select-top right-public-box-dropdown-top">
             <el-dropdown-item v-has="'role_edit'" :command="['copy', scope.row]"><i class="nz-icon nz-icon-override"></i><span class="operation-dropdown-text">{{$t('overall.duplicate')}}</span></el-dropdown-item>
             <!-- <el-dropdown-item v-has="'role_delete'" :command="['delete', scope.row]" :disabled="isBuiltIn(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="'role_delete'" :command="['delete', scope.row]" :disabled="isBuiltIn(scope.row)">
+            <el-dropdown-item v-has="'role_delete'" :command="['delete', scope.row]" :disabled="isBuiltIn(scope.row)" :class="'nz-el-dropdown-menu-item'">
                   <delete-button
                   ref="deleteButton"
                   :from="'roles'"
diff --git a/nezha-fronted/src/components/common/table/settings/userTable.vue b/nezha-fronted/src/components/common/table/settings/userTable.vue
index ab8175cd3..f7eb26bdd 100644
--- a/nezha-fronted/src/components/common/table/settings/userTable.vue
+++ b/nezha-fronted/src/components/common/table/settings/userTable.vue
@@ -104,7 +104,7 @@
             <el-dropdown-item v-has="'user_edit'" :command="['edit', scope.row]"><i class="nz-icon nz-icon-edit"></i><span class="operation-dropdown-text">{{$t('overall.edit')}}</span></el-dropdown-item>
             <el-dropdown-item v-has="'user_edit'" :command="['copy', scope.row]"><i class="nz-icon nz-icon-override"></i><span class="operation-dropdown-text">{{$t('overall.duplicate')}}</span></el-dropdown-item>
             <!-- <el-dropdown-item v-has="'user_delete'" :command="['delete', scope.row]" :disabled="scope.row.id === 1"><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="'user_delete'" :command="['delete', scope.row]" :disabled="scope.row.id === 1">
+            <el-dropdown-item v-has="'user_delete'" :command="['delete', scope.row]" :disabled="scope.row.id === 1" :class="'nz-el-dropdown-menu-item'">
                   <delete-button
                   ref="deleteButton"
                   :from="'user'"
diff --git a/nezha-fronted/src/components/page/alert/alertMessage.vue b/nezha-fronted/src/components/page/alert/alertMessage.vue
index 2c6a89da4..3471eac6b 100644
--- a/nezha-fronted/src/components/page/alert/alertMessage.vue
+++ b/nezha-fronted/src/components/page/alert/alertMessage.vue
@@ -34,7 +34,7 @@
         >
           <template v-slot:before>
             <div>
-              <el-dropdown-item :disabled="batchDeleteObjs.length==0">
+              <el-dropdown-item :disabled="batchDeleteObjs.length==0" :class="'nz-el-dropdown-menu-item'">
                 <delete-button
                   ref="deleteButton"
                   :single="false"
@@ -52,7 +52,7 @@
                   :type="'link'"
                 ></delete-button>
               </el-dropdown-item>
-              <el-dropdown-item :disabled="batchDeleteObjs.length==0">
+              <el-dropdown-item :disabled="batchDeleteObjs.length==0" :class="'nz-el-dropdown-menu-item'">
                 <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>
diff --git a/nezha-fronted/src/components/page/alert/alertRule.vue b/nezha-fronted/src/components/page/alert/alertRule.vue
index 63f4618c3..2f916f299 100644
--- a/nezha-fronted/src/components/page/alert/alertRule.vue
+++ b/nezha-fronted/src/components/page/alert/alertRule.vue
@@ -98,7 +98,7 @@
         >
           <template v-slot:before>
             <div>
-              <el-dropdown-item :disabled="batchDeleteObjs.length==0">
+              <el-dropdown-item :disabled="batchDeleteObjs.length==0" :class="'nz-el-dropdown-menu-item'">
                 <delete-button
                   ref="deleteButton"
                   :single="false"
diff --git a/nezha-fronted/src/components/page/asset/asset.vue b/nezha-fronted/src/components/page/asset/asset.vue
index 186c9235c..33b5e1462 100644
--- a/nezha-fronted/src/components/page/asset/asset.vue
+++ b/nezha-fronted/src/components/page/asset/asset.vue
@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div style="height: 100%">
     <nzDetailView
       v-my-loading="detailViewLoading || tools.loading"
       v-if="detailType !== 'list'"
@@ -30,7 +30,7 @@
           :permissions="{
             import: 'asset_add',
             export: 'asset_edit'
-
+          }"
           class="top-tool-export margin-l-10 margin-r-10"
           export-file-name="asset"
           export-url="/asset/asset/export"
@@ -114,7 +114,7 @@
               <el-dropdown-item>
                 <div id="asset-batch-asset" v-has="'asset_edit'" @click="batchEdit"><i class="nz-icon nz-icon-batch-edit"></i>{{$t('overall.batchEdit')}}</div>
               </el-dropdown-item>
-              <el-dropdown-item :disabled="batchDeleteObjs.length==0">
+              <el-dropdown-item :disabled="batchDeleteObjs.length==0" :class="'nz-el-dropdown-menu-item'">
                 <delete-button
                   ref="deleteButton"
                   :single="false"
diff --git a/nezha-fronted/src/components/page/config/dc.vue b/nezha-fronted/src/components/page/config/dc.vue
index c73fde544..eb2c0112a 100644
--- a/nezha-fronted/src/components/page/config/dc.vue
+++ b/nezha-fronted/src/components/page/config/dc.vue
@@ -104,7 +104,7 @@
         >
           <template v-slot:before>
             <div>
-              <el-dropdown-item :disabled="batchDeleteObjs.length==0">
+              <el-dropdown-item :disabled="batchDeleteObjs.length==0" :class="'nz-el-dropdown-menu-item'">
                 <delete-button
                   ref="deleteButton"
                   :single="false"
diff --git a/nezha-fronted/src/components/page/config/ipam.vue b/nezha-fronted/src/components/page/config/ipam.vue
index b84b8efb3..db45e6fe4 100644
--- a/nezha-fronted/src/components/page/config/ipam.vue
+++ b/nezha-fronted/src/components/page/config/ipam.vue
@@ -30,7 +30,7 @@
         >
           <template v-slot:before>
             <div>
-              <el-dropdown-item :disabled="batchDeleteObjs.length==0">
+              <el-dropdown-item :disabled="batchDeleteObjs.length==0" :class="'nz-el-dropdown-menu-item'">
                 <delete-button
                   ref="deleteButton"
                   :single="false"
diff --git a/nezha-fronted/src/components/page/config/model.vue b/nezha-fronted/src/components/page/config/model.vue
index a6fd57f31..53dc01c4e 100644
--- a/nezha-fronted/src/components/page/config/model.vue
+++ b/nezha-fronted/src/components/page/config/model.vue
@@ -30,7 +30,7 @@
         >
           <template v-slot:before>
             <div>
-              <el-dropdown-item :disabled="batchDeleteObjs.length==0">
+              <el-dropdown-item :disabled="batchDeleteObjs.length==0" :class="'nz-el-dropdown-menu-item'">
                 <delete-button
                   ref="deleteButton"
                   :single="false"
diff --git a/nezha-fronted/src/components/page/config/recordRule.vue b/nezha-fronted/src/components/page/config/recordRule.vue
index 51781b1a2..5ae0b9f14 100644
--- a/nezha-fronted/src/components/page/config/recordRule.vue
+++ b/nezha-fronted/src/components/page/config/recordRule.vue
@@ -31,7 +31,7 @@
         >
           <template v-slot:before>
             <div>
-              <el-dropdown-item :disabled="batchDeleteObjs.length==0">
+              <el-dropdown-item :disabled="batchDeleteObjs.length==0" :class="'nz-el-dropdown-menu-item'">
                 <delete-button
                   ref="deleteButton"
                   :single="true"
diff --git a/nezha-fronted/src/components/page/config/system/notifyMethodTable.vue b/nezha-fronted/src/components/page/config/system/notifyMethodTable.vue
index 7a9f88915..3b01a2838 100644
--- a/nezha-fronted/src/components/page/config/system/notifyMethodTable.vue
+++ b/nezha-fronted/src/components/page/config/system/notifyMethodTable.vue
@@ -82,7 +82,7 @@
               </div>
               <el-dropdown-menu slot="dropdown" class="right-box-select-top right-public-box-dropdown-top">
                 <!-- <el-dropdown-item v-has="'system_notification_delete'" :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="'system_notification_delete'" :command="['delete', scope.row]">
+                <el-dropdown-item v-has="'system_notification_delete'" :command="['delete', scope.row]" :class="'nz-el-dropdown-menu-item'">
                   <delete-button
                   ref="deleteButton"
                   :from="'notifyMethod'"
diff --git a/nezha-fronted/src/components/page/config/system/selfApiKeyTable.vue b/nezha-fronted/src/components/page/config/system/selfApiKeyTable.vue
index 7127d9824..1ae6abade 100644
--- a/nezha-fronted/src/components/page/config/system/selfApiKeyTable.vue
+++ b/nezha-fronted/src/components/page/config/system/selfApiKeyTable.vue
@@ -69,7 +69,7 @@
           </template>
           <template v-else>
             <!-- <button class="table-operation-item" @click="$emit('del',scope.row)" v-has="'system_apiKey_delete'"><i class="nz-icon nz-icon-delete"></i></button> -->
-           <div @click="tableOperation(scope.row)" v-has="'system_apiKey_delete'">
+           <div @click="tableOperation(scope.row)" v-has="'system_apiKey_delete'" >
               <delete-button
               ref="deleteButton"
               :forceDeleteShow="false"
diff --git a/nezha-fronted/src/components/page/config/template/chartTemp.vue b/nezha-fronted/src/components/page/config/template/chartTemp.vue
index 8f1a4dee1..c601479ff 100644
--- a/nezha-fronted/src/components/page/config/template/chartTemp.vue
+++ b/nezha-fronted/src/components/page/config/template/chartTemp.vue
@@ -34,7 +34,7 @@
         >
           <template v-slot:before>
             <div>
-              <el-dropdown-item :disabled="batchDeleteObjs.length==0">
+              <el-dropdown-item :disabled="batchDeleteObjs.length==0" :class="'nz-el-dropdown-menu-item'">
                 <delete-button
                   ref="deleteButton"
                   :single="false"
diff --git a/nezha-fronted/src/components/page/config/template/dashboardTemp.vue b/nezha-fronted/src/components/page/config/template/dashboardTemp.vue
index 5d430320a..37eb2e419 100644
--- a/nezha-fronted/src/components/page/config/template/dashboardTemp.vue
+++ b/nezha-fronted/src/components/page/config/template/dashboardTemp.vue
@@ -29,7 +29,7 @@
         >
           <template v-slot:before>
             <div>
-              <el-dropdown-item :disabled="batchDeleteObjs.length==0">
+              <el-dropdown-item :disabled="batchDeleteObjs.length==0" :class="'nz-el-dropdown-menu-item'">
                 <delete-button
                   ref="deleteButton"
                   :single="false"
diff --git a/nezha-fronted/src/components/page/config/template/exprTemp.vue b/nezha-fronted/src/components/page/config/template/exprTemp.vue
index d79ae24d0..d076ffc87 100644
--- a/nezha-fronted/src/components/page/config/template/exprTemp.vue
+++ b/nezha-fronted/src/components/page/config/template/exprTemp.vue
@@ -27,7 +27,7 @@
         >
           <template v-slot:before>
             <div>
-              <el-dropdown-item :disabled="batchDeleteObjs.length==0">
+              <el-dropdown-item :disabled="batchDeleteObjs.length==0" :class="'nz-el-dropdown-menu-item'">
                 <delete-button
                   ref="deleteButton"
                   :single="false"
diff --git a/nezha-fronted/src/components/page/monitor/endpoint/endpointList.vue b/nezha-fronted/src/components/page/monitor/endpoint/endpointList.vue
index 687bcd356..b427ddbce 100644
--- a/nezha-fronted/src/components/page/monitor/endpoint/endpointList.vue
+++ b/nezha-fronted/src/components/page/monitor/endpoint/endpointList.vue
@@ -110,7 +110,7 @@
               <el-dropdown-item>
                 <div id="asset-batch-asset" v-has="'asset_edit'" @click="batchEdit"><i class="nz-icon nz-icon-batch-edit"></i>{{$t('overall.batchEdit')}}</div>
               </el-dropdown-item>
-              <el-dropdown-item :disabled="batchDeleteObjs.length==0">
+              <el-dropdown-item :disabled="batchDeleteObjs.length==0" :class="'nz-el-dropdown-menu-item'">
                 <delete-button
                   ref="deleteButton"
                   :single="false"
diff --git a/nezha-fronted/src/components/page/monitor/module/moduleList.vue b/nezha-fronted/src/components/page/monitor/module/moduleList.vue
index 9adce7d57..340875d7b 100644
--- a/nezha-fronted/src/components/page/monitor/module/moduleList.vue
+++ b/nezha-fronted/src/components/page/monitor/module/moduleList.vue
@@ -101,7 +101,7 @@
         >
           <template v-slot:before>
             <div>
-              <el-dropdown-item :disabled="batchDeleteObjs.length==0">
+              <el-dropdown-item :disabled="batchDeleteObjs.length==0" :class="'nz-el-dropdown-menu-item'">
                 <delete-button
                   ref="deleteButton"
                   :single="false"
diff --git a/nezha-fronted/src/store/index.js b/nezha-fronted/src/store/index.js
index e8bc0852e..5485c4a11 100644
--- a/nezha-fronted/src/store/index.js
+++ b/nezha-fronted/src/store/index.js
@@ -48,7 +48,9 @@ const store = new Vuex.Store({
     globalSearchId: '',
     isRouteLive: true,
     nowPath: '',
-    myEvent: new Event('resize')
+    myEvent: new Event('resize'),
+    deleteTableRel: {},
+    showDeleteTableRel: false
   },
   getters: {
     getGlobalSearchId (state) {
@@ -104,6 +106,12 @@ const store = new Vuex.Store({
     },
     i18nIsReady (state) {
       return state.i18nReady
+    },
+    getDeleteTableRel (state) {
+      return state.deleteTableRel
+    },
+    getShowDeleteTableRel (state) {
+      return state.showDeleteTableRel
     }
   },
   mutations: {
@@ -211,9 +219,25 @@ const store = new Vuex.Store({
     },
     i18nReady (state, ready) {
       state.i18nReady = ready
+    },
+    setDeleteTableRel (state, payload) {
+      state.deleteTableRel = payload
+    },
+    setShowDeleteTableRel (state, flag) {
+      state.showDeleteTableRel = flag
+      if (!flag) {
+        state.deleteTableRel = {}
+      }
     }
   },
   actions: {
+    deleteTableRel (store, payload) { // 删除列表行
+      store.commit('setDeleteTableRel', payload)
+      store.commit('setShowDeleteTableRel', true)
+    },
+    dispatchShowDeleteTableRel (store, flag) {
+      store.commit('setShowDeleteTableRel', flag)
+    }
   }
 })
 

From 45ee332599228b893f3ef0f3ef2f2557a511bb16 Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Tue, 27 Dec 2022 15:49:56 +0800
Subject: [PATCH 6/6] =?UTF-8?q?NEZ-2479=20fix=EF=BC=9A=E9=80=89=E4=B8=AD?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA=E8=8C=83=E5=9B=B4=E4=B8=8E=E5=AE=9E=E9=99=85?=
 =?UTF-8?q?=E7=82=B9=E5=87=BB=E7=94=9F=E6=95=88=E8=8C=83=E5=9B=B4=E4=B8=8D?=
 =?UTF-8?q?=E4=B8=80=E8=87=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nezha-fronted/src/components/common/popBox/selectDashboard.vue | 2 +-
 nezha-fronted/src/components/page/tool/ping.vue                | 2 +-
 nezha-fronted/src/components/page/tool/trace.vue               | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/nezha-fronted/src/components/common/popBox/selectDashboard.vue b/nezha-fronted/src/components/common/popBox/selectDashboard.vue
index ef205be92..11b08a7c0 100644
--- a/nezha-fronted/src/components/common/popBox/selectDashboard.vue
+++ b/nezha-fronted/src/components/common/popBox/selectDashboard.vue
@@ -77,7 +77,7 @@
                 <el-col>
                   <el-dropdown  placement="bottom-end" trigger="click" style="margin-right:10px">
                     <span class="el-dropdown-link tree--operation" @click.stop><i class="nz-icon nz-icon-more1"></i></span>
-                    <el-dropdown-menu class="right-box-select-top" slot="dropdown"  v-has="['main_edit', 'main_delete']">
+                    <el-dropdown-menu class="right-box-select-top nz-el-dropdown-menu" slot="dropdown"  v-has="['main_edit', 'main_delete']">
                       <el-dropdown-item>
                         <div @click="editPanel(data)" v-has="'main_edit'"><i  class="nz-icon nz-icon-edit"></i>{{$t('overall.edit')}}</div>
                       </el-dropdown-item>
diff --git a/nezha-fronted/src/components/page/tool/ping.vue b/nezha-fronted/src/components/page/tool/ping.vue
index f145e356e..8109ec834 100644
--- a/nezha-fronted/src/components/page/tool/ping.vue
+++ b/nezha-fronted/src/components/page/tool/ping.vue
@@ -40,7 +40,7 @@
                 trigger="manual"
                 v-model="visible"
                 v-clickoutside="close"
-                popper-class="no-style-class ping-popover"
+                popper-class="no-style-class ping-popover nz-el-dropdown-menu"
               >
                 <el-form-item style="margin-bottom:0px">
                   <ul class="pop-list-wrap">
diff --git a/nezha-fronted/src/components/page/tool/trace.vue b/nezha-fronted/src/components/page/tool/trace.vue
index 3b2d03ca4..7d65d61d4 100644
--- a/nezha-fronted/src/components/page/tool/trace.vue
+++ b/nezha-fronted/src/components/page/tool/trace.vue
@@ -39,7 +39,7 @@
                   trigger="manual"
                   v-model="visible"
                   v-clickoutside="close"
-                  popper-class="no-style-class ping-popover"
+                  popper-class="no-style-class ping-popover nz-el-dropdown-menu"
                 >
                   <el-form-item style="margin-bottom:0px">
                     <ul class="pop-list-wrap">