From 153268bd5df07c396d57173fcdd1dfc1c1c37fd4 Mon Sep 17 00:00:00 2001 From: zhangyu Date: Tue, 27 Dec 2022 15:43:38 +0800 Subject: [PATCH] =?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 @@ > @@ -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 @@ {{$t('overall.edit')}} {{$t('overall.duplicate')}} - + {{$t('overall.edit')}} - + {{$t('backup.RestoreNow')}} - + {{$t('overall.duplicate')}} - + {{$t('overall.edit')}} - + - + {{$t('overall.edit')}} - + - - - - + - -