From d56025d2402f4c611a549723b35a1602cc2836a8 Mon Sep 17 00:00:00 2001 From: zyh Date: Wed, 8 Mar 2023 14:43:28 +0800 Subject: [PATCH 1/5] =?UTF-8?q?NEZ-2651=20fix=EF=BC=9Agroup=20=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E7=BC=96=E8=BE=91=E6=97=B6=EF=BC=8C=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E4=B8=8D=E5=85=81=E8=AE=B8=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/common/rightBox/chart/otherChartConfig.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nezha-fronted/src/components/common/rightBox/chart/otherChartConfig.vue b/nezha-fronted/src/components/common/rightBox/chart/otherChartConfig.vue index 3ed9642d7..894c2ab24 100644 --- a/nezha-fronted/src/components/common/rightBox/chart/otherChartConfig.vue +++ b/nezha-fronted/src/components/common/rightBox/chart/otherChartConfig.vue @@ -18,10 +18,11 @@ class="form-item--half-width" prop="type" > + Date: Wed, 8 Mar 2023 16:13:08 +0800 Subject: [PATCH 2/5] =?UTF-8?q?NEZ-2657=20Asset=20list=E6=89=B9=E9=87=8F?= =?UTF-8?q?=E4=BF=AE=E6=94=B9SNMP=E6=97=B6=20=E8=B5=84=E4=BA=A7=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E5=8F=82=E6=95=B0snmpEnable=E4=B8=BA1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../rightBox/asset/assetBatchEditBox.vue | 29 +++++++++++-------- 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/nezha-fronted/src/components/common/rightBox/asset/assetBatchEditBox.vue b/nezha-fronted/src/components/common/rightBox/asset/assetBatchEditBox.vue index 0c055a02c..d50afdbf0 100644 --- a/nezha-fronted/src/components/common/rightBox/asset/assetBatchEditBox.vue +++ b/nezha-fronted/src/components/common/rightBox/asset/assetBatchEditBox.vue @@ -194,17 +194,18 @@
{{$t('overall.select')}}
- +
{{$t('validate.required')}}
@@ -446,6 +447,10 @@ export default { if (this.editData.editType === assetConstants.editTypeData.account) { searchLabel.authProtocol = this.editData.authProtocol } + // type为SNMP时 筛选掉不支持SNMP的资产 + if (this.editData.editType === assetConstants.editTypeData.snmpCredential) { + searchLabel.snmpEnable = 1 + } this.$get(this.url, { ...searchLabel, ...this.transfer.pageObj }).then(response => { this.$refs.transfer.endLoading() if (response.code === 200) { @@ -489,7 +494,7 @@ export default { if (n !== assetConstants.editTypeData.account) { this.editData.authProtocol = 1 } else { - this.getTableData() + // this.getTableData() } } } From 95918356ebf4f618961fc4bccfba47b57a2c504b Mon Sep 17 00:00:00 2001 From: zyh Date: Wed, 8 Mar 2023 16:46:35 +0800 Subject: [PATCH 3/5] =?UTF-8?q?NEZ-2658=20fix=EF=BC=9Aexplore=20=E6=97=B6?= =?UTF-8?q?=E9=97=B4=E9=80=89=E6=8B=A9=E5=99=A8z-index=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/page/dashboard/explore/exploreItem.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nezha-fronted/src/components/page/dashboard/explore/exploreItem.vue b/nezha-fronted/src/components/page/dashboard/explore/exploreItem.vue index f0b5b0744..f10991a84 100644 --- a/nezha-fronted/src/components/page/dashboard/explore/exploreItem.vue +++ b/nezha-fronted/src/components/page/dashboard/explore/exploreItem.vue @@ -7,7 +7,7 @@
-
+
From 531683ac1c350762143d37eb8b275d50a297594e Mon Sep 17 00:00:00 2001 From: zyh Date: Wed, 8 Mar 2023 17:29:25 +0800 Subject: [PATCH 4/5] =?UTF-8?q?NEZ-2662=20asset=EF=BC=8Cendpoint=20dashboa?= =?UTF-8?q?rd=E5=AF=BC=E5=87=BA=E9=80=89=E9=A1=B9=E4=B8=8D=E6=94=AF?= =?UTF-8?q?=E6=8C=81=20all=20data?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/common/popBox/topToolMoreOptions.vue | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/nezha-fronted/src/components/common/popBox/topToolMoreOptions.vue b/nezha-fronted/src/components/common/popBox/topToolMoreOptions.vue index c2dda5323..ac8043999 100644 --- a/nezha-fronted/src/components/common/popBox/topToolMoreOptions.vue +++ b/nezha-fronted/src/components/common/popBox/topToolMoreOptions.vue @@ -105,7 +105,7 @@
{{$t('export.records')}} - + {{item.name}} ({{deleteObjs.length}}) @@ -281,6 +281,10 @@ export default { isDashboard () { return this.importUrl === '/visual/panel/import' }, + // asset，endpoint dashboard导出选项不支持 all data + assetOrEndpoint () { + return this.paramsType === 'asset' || this.paramsType === 'endpoint' + }, // 是否同步更新关联的dashboard showSyncDashboard () { // asset endpoint model @@ -645,7 +649,7 @@ export default { if (this.paramsType) { params.type = this.paramsType } - if (params.from == 'asset') { + if (this.assetOrEndpoint) { delete params.type delete params.from } @@ -699,6 +703,10 @@ export default { showImportBox (type) { this.importBox.show = true this.importBox.type = type + + if (this.assetOrEndpoint) { + this.importBox.record = 'current' + } // isDashboard 只支持JSON if (this.isDashboard) { this.importBox.format = 3 From 221deef8a0a8b0ee2ea90b6383232a973f5c9112 Mon Sep 17 00:00:00 2001 From: zyh Date: Wed, 8 Mar 2023 17:56:28 +0800 Subject: [PATCH 5/5] =?UTF-8?q?NEZ-2663=20fix=EF=BC=9A=E7=BB=9F=E4=B8=80?= =?UTF-8?q?=E5=BF=AB=E7=85=A7=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/common/bottomBox/tabs/panelTabNew.vue | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/panelTabNew.vue b/nezha-fronted/src/components/common/bottomBox/tabs/panelTabNew.vue index ae4694cdd..e5965c938 100644 --- a/nezha-fronted/src/components/common/bottomBox/tabs/panelTabNew.vue +++ b/nezha-fronted/src/components/common/bottomBox/tabs/panelTabNew.vue @@ -158,6 +158,8 @@ + +
@@ -178,6 +180,8 @@ import { randomcolor } from '@/components/common/js/radomcolor/randomcolor' import htmlToPdfMixin from '@/components/common/mixin/htmlToPdfMixin' import exportHtmlMixin from '@/components/common/mixin/exportHtml' import panelVariables from '@/components/common/panel/panelVariables' +import snapshotProgress from '@/components/common/snapshotProgress/snapshotProgress.vue' + export default { name: 'panelTabNew', mixins: [subDataListMixin, detailViewRightMixin, htmlToPdfMixin, exportHtmlMixin], @@ -307,7 +311,8 @@ export default { nowTimeType: {}, chartDetailInfo: {}, variables: [], - variablesInit: false + variablesInit: false, + snapshotVisible: false } }, components: { @@ -316,7 +321,8 @@ export default { nzBottomDataList, topToolMoreOptions, chartTempBox, - panelVariables // 处理panel变量的组件 + panelVariables, // 处理panel变量的组件 + snapshotProgress // 快照进度 }, methods: { // 刷新 @@ -851,7 +857,7 @@ export default { if (type === 'PDF') { this.htmlToPdf() } else { - this.exportToHtml(this.obj.name) + this.snapshotVisible = true } }, getPanelData () {