From e6c83ba0de8de6affa8d1ffbfbbf90c6f9ea5945 Mon Sep 17 00:00:00 2001 From: zhangyu Date: Thu, 16 Mar 2023 11:10:30 +0800 Subject: [PATCH 1/4] =?UTF-8?q?NEZ-2704=20fix=EF=BC=9A=20detail=20?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=20=E5=92=8C=20=E4=BA=8C=E7=BA=A7=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=20=E9=A1=B5=E7=AD=BE=E5=90=8D=E7=A7=B0=E4=B8=8D?= =?UTF-8?q?=E7=BB=9F=E4=B8=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/common/detailView/view/detailViewRight.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nezha-fronted/src/components/common/detailView/view/detailViewRight.vue b/nezha-fronted/src/components/common/detailView/view/detailViewRight.vue index 8e5bfe4ce..4bbe29cfd 100644 --- a/nezha-fronted/src/components/common/detailView/view/detailViewRight.vue +++ b/nezha-fronted/src/components/common/detailView/view/detailViewRight.vue @@ -169,7 +169,7 @@ export default { }, endpoint: { endpointTabTitle: [ - { prop: 'dashboardTab', name: this.$t('overall.detail') }, + { prop: 'dashboardTab', name: this.$t('overall.dashboard') }, { prop: 'endpointAlertMessage', name: this.$t('overall.alert') }, { prop: 'endpointQuery', name: this.$t('overall.metric') }, { prop: 'log', name: this.$t('dashboard.panel.chartForm.typeVal.log.label') } From 804aaba7c47c992f668f7f16d20635ca24356c40 Mon Sep 17 00:00:00 2001 From: zhangyu Date: Thu, 16 Mar 2023 11:11:53 +0800 Subject: [PATCH 2/4] =?UTF-8?q?NEZ-2703=20fix=EF=BC=9AAssets=E3=80=81Endpo?= =?UTF-8?q?ints=E5=88=87=E6=8D=A2=E8=A7=86=E5=9B=BE=E4=B8=BADetail=20view?= =?UTF-8?q?=E5=90=8E=E5=88=87=E6=8D=A2=E6=95=B0=E6=8D=AEdashboard=E5=9B=BE?= =?UTF-8?q?=E8=A1=A8=E9=95=BF=E6=97=B6=E9=97=B4=E5=A4=84=E4=BA=8E=E5=8A=A0?= =?UTF-8?q?=E8=BD=BD=E7=8A=B6=E6=80=81=E6=97=A0=E6=95=B0=E6=8D=AE=E5=8A=A0?= =?UTF-8?q?=E8=BD=BD=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/common/bottomBox/tabs/dashboardTab.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/dashboardTab.vue b/nezha-fronted/src/components/common/bottomBox/tabs/dashboardTab.vue index bad7cbf7e..2a1ab5da7 100644 --- a/nezha-fronted/src/components/common/bottomBox/tabs/dashboardTab.vue +++ b/nezha-fronted/src/components/common/bottomBox/tabs/dashboardTab.vue @@ -617,7 +617,7 @@ export default { if (this.panelData.length > 0) { this.filter.dashboardId = this.panelData[0].id this.showPanel = this.$loadsh.cloneDeep(this.panelData[0]) - this.variables = this.$loadsh.get(this.panelData, '[0].param.variables') + this.variables = this.$loadsh.cloneDeep(this.$loadsh.get(this, 'showPanel.param.variables', []) || []) this.getData(this.filter) } } @@ -635,7 +635,7 @@ export default { // this.showPanel.id = this.filter.dashboardId = this.panelData[0].id this.filter.dashboardId = this.panelData[0].id this.showPanel = this.$loadsh.cloneDeep(this.panelData[0]) - this.variables = this.$loadsh.get(this.panelData, '[0].param.variables') + this.variables = this.$loadsh.cloneDeep(this.$loadsh.get(this, 'showPanel.param.variables', []) || []) this.getData(this.filter) } else { this.chartListLoading = false From a5c8d3958afdb3b3658e49b631352d30cd1822cf Mon Sep 17 00:00:00 2001 From: zhangyu Date: Thu, 16 Mar 2023 13:56:24 +0800 Subject: [PATCH 3/4] =?UTF-8?q?NEZ-2706=20=20fix=EF=BC=9A=20Endpoints?= =?UTF-8?q?=E4=BF=9D=E5=AD=98=E4=BA=8C=E7=BA=A7=E9=A1=B5=E9=9D=A2Metric?= =?UTF-8?q?=E5=9B=BE=E8=A1=A8=E6=97=B6Group=E5=87=BA=E7=8E=B0=E6=84=8F?= =?UTF-8?q?=E5=A4=96=E5=AD=97=E7=AC=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/common/table/special/endpointQueryTab.vue | 3 +++ 1 file changed, 3 insertions(+) diff --git a/nezha-fronted/src/components/common/table/special/endpointQueryTab.vue b/nezha-fronted/src/components/common/table/special/endpointQueryTab.vue index 7e04c572f..042da9a2f 100644 --- a/nezha-fronted/src/components/common/table/special/endpointQueryTab.vue +++ b/nezha-fronted/src/components/common/table/special/endpointQueryTab.vue @@ -376,6 +376,9 @@ export default { chart.panelName = '' this.chart = chart this.graphShow = false + if (!this.chart.groupId) { + this.chart.groupId = undefined + } this.$store.dispatch('dispatchEditChart', { chart: this.chart, type: 'add' From e6270e066b64192ed57995e8536fceae182e9fc6 Mon Sep 17 00:00:00 2001 From: zyh Date: Fri, 17 Mar 2023 12:46:56 +0800 Subject: [PATCH 4/4] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E6=94=B9=E5=9B=BD?= =?UTF-8?q?=E9=99=85=E5=8C=96panel=E4=B8=BAdashboard?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/chart/ChartScreenHeader.vue | 2 +- .../components/chart/chart/chart-table.vue | 4 +- .../chart/chart/chartTimeSeries.vue | 2 +- .../chart/chart/line-chart-block.vue | 14 +-- .../src/components/chart/chartHeader.vue | 2 +- .../src/components/cli/fileDirectory.vue | 4 +- nezha-fronted/src/components/cli/webSSH.vue | 2 +- .../components/common/bottomBox/bottomBox.vue | 8 +- .../bottomBox/tabs/alertMessageTabNew.vue | 2 +- .../bottomBox/tabs/endpointQueryTab.vue | 6 +- .../src/components/common/chartUnit.vue | 2 +- .../detailView/view/detailViewRight.vue | 8 +- .../src/components/common/js/constants.js | 76 ++++++++-------- .../src/components/common/language/cn.js | 2 +- .../src/components/common/language/en.js | 2 +- .../src/components/common/multipleTime.vue | 46 +++++----- .../src/components/common/popBox/guide.vue | 2 +- .../common/popBox/topToolMoreOptions.vue | 2 +- .../common/project/L5/CanvasProps.vue | 28 +++--- .../common/project/L5/topoTooltip.vue | 2 +- .../common/rightBox/alertRuleBox.vue | 4 +- .../common/rightBox/assetMetaBox.vue | 2 +- .../common/rightBox/chart/chartConfig.vue | 88 +++++++++---------- .../common/rightBox/chart/chartRightBox.vue | 10 +-- .../rightBox/chart/otherChartConfig.vue | 36 ++++---- .../common/rightBox/chart/publicConfig.js | 64 +++++++------- .../rightBox/chart/systemChartConfig.vue | 68 +++++++------- .../common/rightBox/chartTempBox.vue | 8 +- .../common/rightBox/dashboardTempBox.vue | 4 +- .../common/rightBox/editEndpointBoxNew.vue | 8 +- .../common/rightBox/exprTmplBox.vue | 2 +- .../components/common/rightBox/issueBox.vue | 2 +- .../components/common/rightBox/moduleBox.vue | 6 +- .../components/common/rightBox/panelBox.vue | 58 ++++++------ .../common/searchBox/searchBoxInfo.js | 22 ++--- .../src/components/common/searchSelectInfo.js | 22 ++--- .../common/table/alert/alertRuleTable.vue | 2 +- .../common/table/asset/assetMetaTable.vue | 2 +- .../common/table/asset/assetProcessTable.vue | 2 +- .../common/table/settings/agentTable.vue | 2 +- .../common/table/settings/chartTmplTable.vue | 2 +- .../table/settings/dashboardTmplTable.vue | 2 +- .../common/table/settings/endpointTable.vue | 2 +- .../common/table/settings/exprTmplTable.vue | 2 +- .../common/table/settings/issueTable.vue | 2 +- .../common/table/special/endpointQueryTab.vue | 2 +- .../table/special/recordRulesQueryTab.vue | 2 +- .../src/components/common/timePicker.vue | 50 +++++------ .../components/page/alert/alertMessage.vue | 4 +- .../src/components/page/asset/asset.vue | 2 +- .../page/asset/components/assetTagEx.vue | 6 +- .../src/components/page/config/assetMeta.vue | 4 +- .../src/components/page/config/mibBrowser.vue | 2 +- .../page/config/template/chartTemp.vue | 2 +- .../page/config/template/dashboardTemp.vue | 2 +- .../page/config/template/exprTemp.vue | 2 +- .../components/page/dashboard/dashboard.vue | 4 +- .../page/dashboard/explore/exploreItem.vue | 4 +- .../dashboard/explore/exploreItemHtml.vue | 2 +- .../page/dashboard/overview/chart.vue | 2 +- .../page/monitor/endpoint/endpointList.vue | 2 +- .../src/components/page/tool/ping.vue | 2 +- .../src/components/page/tool/trace.vue | 2 +- .../src/entrance/exportHtml/i18nData.js | 2 +- 64 files changed, 368 insertions(+), 368 deletions(-) diff --git a/nezha-fronted/src/components/chart/ChartScreenHeader.vue b/nezha-fronted/src/components/chart/ChartScreenHeader.vue index d7f31ae0c..05f6a28d7 100644 --- a/nezha-fronted/src/components/chart/ChartScreenHeader.vue +++ b/nezha-fronted/src/components/chart/ChartScreenHeader.vue @@ -20,7 +20,7 @@ :close-delay=10 trigger="hover" popper-class="chart-warring-popper"> -
{{$t('dashboard.panel.moreTitle')}}{{$t('dashboard.panel.showAll')}}{{allDataLength}}
+
{{$t('dashboard.dashboard.moreTitle')}}{{$t('dashboard.dashboard.showAll')}}{{allDataLength}}
diff --git a/nezha-fronted/src/components/chart/chart/chart-table.vue b/nezha-fronted/src/components/chart/chart/chart-table.vue index c0b01298b..24be1e71b 100644 --- a/nezha-fronted/src/components/chart/chart/chart-table.vue +++ b/nezha-fronted/src/components/chart/chart/chart-table.vue @@ -60,7 +60,7 @@