NEZ-2480 fix：下拉框无内容样式问题

nezha-fronted/src/assets/css/common.scss

@@ -641,3 +641,29 @@ 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;
+  > div {
+    padding: 0px !important;
+  }
+  .nz-el-dropdown-item-del{
+    display: inline-block;
+    width: 100%;
+    padding: 0 17px;
+    box-sizing: border-box;
+  }
+}

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 {

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{

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;
+        }
+      }
     }
   }
 }

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{

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'"

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'"

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>

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'"

nezha-fronted/src/components/common/mixin/table.js

@@ -51,6 +51,19 @@ export default {
           }
           break
         }
+        case 'delete-rel': {
+          // this.$emit('deleteRel', {
+          //   row: row,
+          //   url: this.api,
+          //   ...param
+          // })
+          this.$store.dispatch('deleteTableRel', {
+            row: row,
+            url: this.api,
+            ...param
+          })
+          break
+        }
         case 'ack': {
           this.$emit('acknowledge', row)
           break

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">

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" v-has="['main_edit', 'main_delete']">
                     <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">
+                    <el-dropdown-menu class="right-box-select-top nz-el-dropdown-menu" slot="dropdown">
                       <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>

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" v-has="'main_edit'">
           <div @click="editPanel" id="edit-bottom-panel"><i class="nz-icon nz-icon-edit"></i>{{$t('dashboard.panel.editPanelTitle')}}</div>
         </el-dropdown-item>

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>

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'"

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'"

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-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="'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-menu>
         </el-dropdown>
       </div>

nezha-fronted/src/components/common/table/asset/assetTable.vue

@@ -164,24 +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_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]">
+              <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>
-                  <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="'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>

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 () {

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'"

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'"

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"

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'"

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'"

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'"

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'"

nezha-fronted/src/components/common/table/settings/dcTable.vue

@@ -1,73 +1,74 @@
 <template>
-  <el-table
+  <div>
-    id="dcTable"
+    <el-table
-    ref="dataTable"
+      id="dcTable"
-    :data="tableData"
+      ref="dataTable"
-    :height="height"
+      :data="tableData"
-    border
+      :height="height"
-    :default-sort="orderBy"
+      border
-    @cell-mouse-enter="cellMouseEnter"
+      :default-sort="orderBy"
-    @header-dragend="dragend"
+      @cell-mouse-enter="cellMouseEnter"
-    @sort-change="tableDataSort"
+      @header-dragend="dragend"
-    @selection-change="selectionChange"
+      @sort-change="tableDataSort"
-    @row-dblclick="(row)=>{showBottomBox('cabinet', row)}"
+      @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"
     >
-      <template slot="header">
+      <el-table-column
-        <span class="data-column__span">{{item.label}}</span>
+        :resizable="false"
-        <div class="col-resize-area"></div>
+        align="center"
-      </template>
+        type="selection"
-      <template slot-scope="scope" :column="item">
+        width="55">
-        <template v-if="item.prop === 'principal'">
+      </el-table-column>
-          <template v-if="scope.row.adminUser">
+      <el-table-column
-            {{scope.row.adminUser.name}}
+        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 v-else-if="item.prop === 'state'">
-        </template>
+            <div v-if="scope.row[item.prop] === 'ON'">
-        <template v-else-if="item.prop === 'state'">
+              <div class="active-icon green-bg inline-block"></div>
-          <div v-if="scope.row[item.prop] === 'ON'">
+              {{ $t('overall.enabled') }}
-            <div class="active-icon green-bg inline-block"></div>
+            </div>
-            {{ $t('overall.enabled') }}
+            <div v-else-if="scope.row[item.prop] === 'OFF'">
-          </div>
+              <div class="active-icon gray-bg inline-block"></div>
-          <div v-else-if="scope.row[item.prop] === 'OFF'">
+              {{ $t('overall.disabled') }}
-            <div class="active-icon gray-bg inline-block"></div>
+            </div>
-            {{ $t('overall.disabled') }}
+          </template>
-          </div>
+          <template v-else-if="item.prop === 'longitude'">
-        </template>
+            <template v-if="regNumTest(scope.row.longitude)">{{scope.row.longitude}}</template>
-        <template v-else-if="item.prop === 'longitude'">
+            <template v-else>-</template>
-          <template v-if="regNumTest(scope.row.longitude)">{{scope.row.longitude}}</template>
+          </template>
-          <template v-else>-</template>
+          <template v-else-if="item.prop === 'latitude'">
-        </template>
+            <template v-if="regNumTest(scope.row.latitude)">{{scope.row.latitude}}</template>
-        <template v-else-if="item.prop === 'latitude'">
+            <template v-else>-</template>
-          <template v-if="regNumTest(scope.row.latitude)">{{scope.row.latitude}}</template>
+          </template>
-          <template v-else>-</template>
+          <template v-else-if="item.prop === 'assetNum'">
-        </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>
-        <template v-else-if="item.prop === 'alertNum'">
+          <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"
+              v-show="!scope.row.trendLoading"
-                    :alertDaysData="scope.row.alertDaysData"
+              :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="item.prop === 'name'">
-        <template v-else-if="scope.row[item.prop]">{{scope.row[item.prop]}}</template>
+            <copy :copyData='scope.row[item.prop]' :showInfo='scope.row[item.prop]'>
-        <template v-else>-</template>
+              <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" @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>
-    <el-table-column
+  </div>
-      :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_view'" @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>
 </template>
 
 <script>

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-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_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_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>

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'"

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'"

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'"

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'"

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'"

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'"

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'"

nezha-fronted/src/components/common/table/settings/modelTable.vue

@@ -85,7 +85,7 @@
       <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="'model_edit'" @click="$emit('edit', scope.row)" :title="$t('overall.edit')"><i class="nz-icon nz-icon-edit"></i></button> -->
-       <button v-has="'model_edit'" class="table-operation-item" @click="showBottomBox('asset', scope.row)" :title="$t('overall.view')"><i class="nz-icon nz-icon-view1"></i></button>
+       <button class="table-operation-item" @click="showBottomBox('asset', scope.row)" :title="$t('overall.view')"><i class="nz-icon nz-icon-view1"></i></button>
         <el-dropdown size="medium" v-has="['model_delete','main_edit','model_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>
@@ -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-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="'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="'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>

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-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_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_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>

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-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 :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 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>

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'"

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'"

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'"

nezha-fronted/src/components/page/alert/alertMessage.vue

@@ -35,7 +35,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"
@@ -53,7 +53,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>

nezha-fronted/src/components/page/alert/alertRule.vue

@@ -100,7 +100,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"

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'"
@@ -116,7 +116,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"

nezha-fronted/src/components/page/config/dc.vue

@@ -106,7 +106,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"

nezha-fronted/src/components/page/config/ipam.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="false"

nezha-fronted/src/components/page/config/model.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="false"

nezha-fronted/src/components/page/config/recordRule.vue

@@ -32,7 +32,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"

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'"

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"

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"

nezha-fronted/src/components/page/config/template/dashboardTemp.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"

nezha-fronted/src/components/page/config/template/exprTemp.vue

@@ -28,7 +28,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"

nezha-fronted/src/components/page/monitor/endpoint/endpointList.vue

@@ -112,7 +112,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"

nezha-fronted/src/components/page/monitor/module/moduleList.vue

@@ -102,7 +102,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"

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">

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">

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)
+    }
   }
 })