From 8495e2f8b472ca9f651c14b5e8fa72f9e80f2180 Mon Sep 17 00:00:00 2001 From: zhangyu Date: Fri, 24 Mar 2023 15:10:02 +0800 Subject: [PATCH 1/3] =?UTF-8?q?NEZ-2704=20=20fix=EF=BC=9A=20Endpoints?= =?UTF-8?q?=E5=88=87=E6=8D=A2Detail=20view=E5=90=8E=E4=BA=8C=E7=BA=A7?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2Dashboard=E9=80=89=E9=A1=B9=E8=A2=AB=E5=88=87?= =?UTF-8?q?=E6=8D=A2=E4=B8=BADetail?= 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 7f2786ff7..c717b8c4b 100644 --- a/nezha-fronted/src/components/common/detailView/view/detailViewRight.vue +++ b/nezha-fronted/src/components/common/detailView/view/detailViewRight.vue @@ -253,7 +253,7 @@ export default { const config = this.obj.configs.find(c => c.type === 'logs') const hasLog = config && config.enable === 1 const tabs = [ - { 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.metrics') } ] From ca470d5b131715b98bacc5d08e1730262150e4f7 Mon Sep 17 00:00:00 2001 From: zhangyu Date: Fri, 24 Mar 2023 15:24:29 +0800 Subject: [PATCH 2/3] =?UTF-8?q?NEZ-2716=20fix=EF=BC=9A=E5=BB=BA=E8=AE=AERu?= =?UTF-8?q?les=E4=BA=8C=E7=BA=A7=E9=A1=B5=E9=9D=A2=E7=9A=84Acknowledge?= =?UTF-8?q?=E9=80=89=E9=A1=B9=E7=82=B9=E5=87=BB=E4=BF=AE=E6=94=B9=E6=97=B6?= =?UTF-8?q?=E5=B1=95=E7=A4=BA=E9=80=89=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/common/bottomBox/tabs/alertMessageTabNew.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTabNew.vue b/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTabNew.vue index 9145dff3a..506b8af90 100644 --- a/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTabNew.vue +++ b/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTabNew.vue @@ -236,7 +236,7 @@ export default { disabled: false }, { name: this.$t('overall.acknowledge'), - type: 'selectString', + type: 'select', label: 'ack', readonly: true, disabled: false From efd85c0cf0f11715c922c99a1a435704bf3078db Mon Sep 17 00:00:00 2001 From: zhangyu Date: Fri, 24 Mar 2023 15:43:34 +0800 Subject: [PATCH 3/3] =?UTF-8?q?NEZ-2712=20fix=EF=BC=9A=20=E7=82=B9?= =?UTF-8?q?=E5=87=BBchart=E7=BC=96=E8=BE=91=E6=8C=89=E9=92=AE=E6=9C=AA?= =?UTF-8?q?=E5=AF=B9=E5=86=85=E5=AE=B9=E6=93=8D=E4=BD=9C=E7=9A=84=E6=83=85?= =?UTF-8?q?=E5=86=B5=E4=B8=8B=E9=80=80=E5=87=BA=E5=87=BA=E7=8E=B0=E6=9B=B4?= =?UTF-8?q?=E6=94=B9=E4=BF=9D=E5=AD=98=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/common/rightBox/chart/chartRightBox.vue | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/nezha-fronted/src/components/common/rightBox/chart/chartRightBox.vue b/nezha-fronted/src/components/common/rightBox/chart/chartRightBox.vue index fc2893112..4e3a63e17 100644 --- a/nezha-fronted/src/components/common/rightBox/chart/chartRightBox.vue +++ b/nezha-fronted/src/components/common/rightBox/chart/chartRightBox.vue @@ -601,7 +601,15 @@ export default { }) } } - this.editChart = obj + if (obj.elements && obj.elements.length) { + obj.elements.forEach((item, index) => { + item.orderNum = index + delete item.seq + delete item.buildIn + delete item.chartId + }) + } + this.editChart = this.$loadsh.cloneDeep(obj) this.oldData = this.$loadsh.cloneDeep(obj) if (this.stableTime) { clearTimeout(this.stableTime)