From 8a266fe78d6f0ee82f8c71f239666dfdc065e2d0 Mon Sep 17 00:00:00 2001 From: likexuan Date: Thu, 17 Nov 2022 11:41:49 +0800 Subject: [PATCH 1/8] =?UTF-8?q?NEZ-2402=20fix=20:=20=E6=96=B0=E5=BB=BAIPAM?= =?UTF-8?q?=E9=80=89=E6=8B=A9=E6=95=B0=E6=8D=AE=E5=90=8E=E5=BF=85=E5=A1=AB?= =?UTF-8?q?=E9=A1=B9=E6=8F=90=E7=A4=BA=E6=A1=86=E6=9C=AA=E6=B6=88=E5=A4=B1?= =?UTF-8?q?=EF=BC=8C=E6=95=B0=E6=8D=AE=E5=8F=AF=E4=BB=A5=E4=BF=9D=E5=AD=98?= =?UTF-8?q?=E6=88=90=E5=8A=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nezha-fronted/src/components/common/rightBox/ipamBox.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nezha-fronted/src/components/common/rightBox/ipamBox.vue b/nezha-fronted/src/components/common/rightBox/ipamBox.vue index 198fc6006..f71b70cf4 100644 --- a/nezha-fronted/src/components/common/rightBox/ipamBox.vue +++ b/nezha-fronted/src/components/common/rightBox/ipamBox.vue @@ -132,7 +132,7 @@ export default { { required: true, message: this.$t('validate.required'), trigger: 'blur' } ], 'dc.name': [ - { required: true, message: this.$t('validate.required'), trigger: 'blur' } + { required: true, message: this.$t('validate.required'), trigger: 'change' } ] }, dcData: [] From 77b27c9c9238d3a60563dcd21f7c7a88ac33fd11 Mon Sep 17 00:00:00 2001 From: likexuan Date: Thu, 17 Nov 2022 13:36:09 +0800 Subject: [PATCH 2/8] =?UTF-8?q?NEZ-2403=20fix=20:=20=E5=BB=BA=E8=AE=AEAgen?= =?UTF-8?q?t=E6=96=B0=E5=BB=BA=E6=97=B6Token=E5=8F=AF=E4=BB=A5=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E5=BF=85=E5=A1=AB=E9=A1=B9=E6=A0=87=E8=AF=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nezha-fronted/src/components/common/rightBox/agentBox.vue | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/nezha-fronted/src/components/common/rightBox/agentBox.vue b/nezha-fronted/src/components/common/rightBox/agentBox.vue index 517cb84aa..d624de58b 100644 --- a/nezha-fronted/src/components/common/rightBox/agentBox.vue +++ b/nezha-fronted/src/components/common/rightBox/agentBox.vue @@ -119,6 +119,12 @@ export default { ], type: [ { required: true, message: this.$t('validate.required'), trigger: 'change' } + ], + token: [ + { required: true, message: this.$t('validate.required'), trigger: 'blur' } + ], + protocol: [ + { required: true, message: this.$t('validate.required'), trigger: 'change' } ] }, editPromServer: {}, From b64174070a9af1be092e9f401d8d696c7a64d993 Mon Sep 17 00:00:00 2001 From: likexuan Date: Fri, 18 Nov 2022 09:12:47 +0800 Subject: [PATCH 3/8] =?UTF-8?q?fix=20:=20APM=20setting=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20interface=20name=20=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nezha-fronted/src/assets/css/components/page/config/system.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nezha-fronted/src/assets/css/components/page/config/system.scss b/nezha-fronted/src/assets/css/components/page/config/system.scss index 217d15af0..030fc7b8c 100644 --- a/nezha-fronted/src/assets/css/components/page/config/system.scss +++ b/nezha-fronted/src/assets/css/components/page/config/system.scss @@ -62,7 +62,7 @@ margin: 0; } .vue-tags-input.interface-name .ti-input .ti-new-tag-input-wrapper { - padding-left: 7px; + padding: 5px 0px 5px 7px; } } .system-config-form { From 3d8bb2c52619f2a3df8beeb00481dcbd7b46aed0 Mon Sep 17 00:00:00 2001 From: zyh Date: Fri, 18 Nov 2022 09:28:48 +0800 Subject: [PATCH 4/8] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E5=A4=8D=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E9=9D=A2=E6=9D=BF=E6=95=B0=E6=8D=AE=20group=20repeat?= =?UTF-8?q?=E6=9C=AA=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nezha-fronted/src/components/chart/chartList.vue | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/nezha-fronted/src/components/chart/chartList.vue b/nezha-fronted/src/components/chart/chartList.vue index 8e8a06182..1a0c5ba61 100644 --- a/nezha-fronted/src/components/chart/chartList.vue +++ b/nezha-fronted/src/components/chart/chartList.vue @@ -570,6 +570,10 @@ export default { if (item.repeatIndex > 0) { this.copyDataList.splice(index, 1) index-- + } else { + // 置为原来的数据 + const temp = this.tempList.find(subItem => item.id == subItem.id) + this.copyDataList[index] = this.$loadsh.cloneDeep(temp) } } this.$nextTick(() => { From b93c5b08111f607b3d6c49932c5143188aeade4e Mon Sep 17 00:00:00 2001 From: zhangshuai Date: Fri, 18 Nov 2022 10:09:15 +0800 Subject: [PATCH 5/8] =?UTF-8?q?fix:=20=E5=88=A0=E9=99=A4dist=E4=B8=8B?= =?UTF-8?q?=E6=97=A0=E7=94=A8js=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nezha-fronted/build/webpack.prod.conf.js | 1 + 1 file changed, 1 insertion(+) diff --git a/nezha-fronted/build/webpack.prod.conf.js b/nezha-fronted/build/webpack.prod.conf.js index e0f678577..24144ddff 100644 --- a/nezha-fronted/build/webpack.prod.conf.js +++ b/nezha-fronted/build/webpack.prod.conf.js @@ -367,6 +367,7 @@ if (process.env.NODE_ENV == 'development') { { delete: [ path.join(__dirname, '../dist', '/config.json'), + path.join(__dirname, '../dist', '/*.js'), path.join(__dirname, '../.cache/') ] }, From b2a4b4b9469aec0a6bc2070cf673296de68c3fb5 Mon Sep 17 00:00:00 2001 From: zyh Date: Fri, 18 Nov 2022 13:57:11 +0800 Subject: [PATCH 6/8] =?UTF-8?q?fix=EF=BC=9A=E5=8A=9F=E8=83=BD=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nezha-fronted/src/components/chart/chartList.vue | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/nezha-fronted/src/components/chart/chartList.vue b/nezha-fronted/src/components/chart/chartList.vue index 1a0c5ba61..545ef4234 100644 --- a/nezha-fronted/src/components/chart/chartList.vue +++ b/nezha-fronted/src/components/chart/chartList.vue @@ -570,10 +570,16 @@ export default { if (item.repeatIndex > 0) { this.copyDataList.splice(index, 1) index-- - } else { + } else if (item.repeatIndex == 0) { // 置为原来的数据 - const temp = this.tempList.find(subItem => item.id == subItem.id) - this.copyDataList[index] = this.$loadsh.cloneDeep(temp) + delete item.repeatIndex + delete item.repeatVariable + delete item.repeatValue + item.children.forEach(children => { + delete children.repeatIndex + delete children.repeatVariable + delete children.repeatValue + }) } } this.$nextTick(() => { From 0c603c01a430bf3f635db6d0513ac25b08b795f1 Mon Sep 17 00:00:00 2001 From: likexuan Date: Fri, 18 Nov 2022 15:27:52 +0800 Subject: [PATCH 7/8] =?UTF-8?q?fix=20:=20=E6=A0=A1=E9=AA=8C=E6=96=B9?= =?UTF-8?q?=E5=BC=8F=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/chartConfig.vue | 2 +- .../src/components/common/rightBox/editEndpointBoxNew.vue | 2 +- nezha-fronted/src/components/common/rightBox/moduleBox.vue | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/nezha-fronted/src/components/common/rightBox/chart/chartConfig.vue b/nezha-fronted/src/components/common/rightBox/chart/chartConfig.vue index 50a350491..6318ea178 100644 --- a/nezha-fronted/src/components/common/rightBox/chart/chartConfig.vue +++ b/nezha-fronted/src/components/common/rightBox/chart/chartConfig.vue @@ -76,7 +76,7 @@ - + diff --git a/nezha-fronted/src/components/common/rightBox/moduleBox.vue b/nezha-fronted/src/components/common/rightBox/moduleBox.vue index 590f4bd48..475cd05b7 100644 --- a/nezha-fronted/src/components/common/rightBox/moduleBox.vue +++ b/nezha-fronted/src/components/common/rightBox/moduleBox.vue @@ -609,7 +609,7 @@ From 913118c5df7f13378a71a8be1b0ab4a603c1822e Mon Sep 17 00:00:00 2001 From: likexuan Date: Fri, 18 Nov 2022 16:06:46 +0800 Subject: [PATCH 8/8] =?UTF-8?q?fix=20:=20alert=20silence=20=E5=81=B6?= =?UTF-8?q?=E5=B0=94=E9=BB=98=E8=AE=A41=E5=B0=8F=E6=97=B6=E6=9C=AA?= =?UTF-8?q?=E9=80=89=E4=B8=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/common/rightBox/alertSilenceBox.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nezha-fronted/src/components/common/rightBox/alertSilenceBox.vue b/nezha-fronted/src/components/common/rightBox/alertSilenceBox.vue index e971cc1c4..b0a6056a0 100644 --- a/nezha-fronted/src/components/common/rightBox/alertSilenceBox.vue +++ b/nezha-fronted/src/components/common/rightBox/alertSilenceBox.vue @@ -311,7 +311,7 @@ export default { rangeTimeCallback () { if (this.editAlertSilence.time) { const num = new Date(this.editAlertSilence.endAt).getTime() - new Date(this.editAlertSilence.startAt).getTime() - this.rangeTime = num / (60 * 60 * 1000)// 以小时为单位 + this.rangeTime = parseInt(num / (60 * 60 * 1000))// 以小时为单位 } else { this.rangeTime = null }