From 9e3858f09d7ce243da053dff58210bb2d72f74f9 Mon Sep 17 00:00:00 2001 From: zhangyu Date: Mon, 15 Nov 2021 16:53:41 +0800 Subject: [PATCH 1/5] =?UTF-8?q?fix=EF=BC=9A=20topo=20=E5=9B=BE=E5=9C=A8pan?= =?UTF-8?q?el=E7=A6=81=E7=94=A8=E7=BC=A9=E6=94=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/common/ChartDiagram/diagram.vue | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/nezha-fronted/src/components/common/ChartDiagram/diagram.vue b/nezha-fronted/src/components/common/ChartDiagram/diagram.vue index 5e39300a8..924e13914 100644 --- a/nezha-fronted/src/components/common/ChartDiagram/diagram.vue +++ b/nezha-fronted/src/components/common/ChartDiagram/diagram.vue @@ -781,7 +781,13 @@ export default { openTopologyData (data) { return new Promise(resolve => { if (!getTopology(this.topologyIndex)) { - const canvas = new Topology('topology-canvas' + this.topologyIndexF, canvasOptions) + const options = { + ...canvasOptions + } + if (this.isPanel) { + options.disableScale = true + } + const canvas = new Topology('topology-canvas' + this.topologyIndexF, options) setTopology(this.topologyIndex, canvas) } else { getTopology(this.topologyIndex).open(data) From 0a717bc0dfa07a58344f5cc7b350d54855135462 Mon Sep 17 00:00:00 2001 From: zhangyu Date: Mon, 15 Nov 2021 16:54:33 +0800 Subject: [PATCH 2/5] =?UTF-8?q?NEZ-1241=20fix=EF=BC=9Adashboard=20explore?= =?UTF-8?q?=20=E9=A2=84=E8=A7=88=E5=86=85=E5=AE=B9=E6=9C=89=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 819863785..14ff9ec26 100644 --- a/nezha-fronted/src/components/page/dashboard/explore/exploreItem.vue +++ b/nezha-fronted/src/components/page/dashboard/explore/exploreItem.vue @@ -615,7 +615,7 @@ export default { const step = bus.getStep(this.filterTime[0], this.filterTime[1]) promqlInputIndexs.push(index) queryExpression.push(item) - requestArr.push(this.$get('/prom/api/v1/query_range?query=' + item + '&start=' + this.$stringTimeParseToUnix(this.filterTime[0]) + '&end=' + this.$stringTimeParseToUnix(this.filterTime[1]) + '&step=' + step)) + requestArr.push(this.$get('/prom/api/v1/query_range?query=' + item + '&start=' + this.$stringTimeParseToUnix(this.filterTime[0]) + '&end=' + this.$stringTimeParseToUnix(this.filterTime[1]) + '&step=' + step + '&nullType=null')) } }) if (requestArr.length > 0) { From 46fcce7de5c5318fbba5fee1c433e6d66a244fa5 Mon Sep 17 00:00:00 2001 From: zhangyu Date: Mon, 15 Nov 2021 17:05:39 +0800 Subject: [PATCH 3/5] =?UTF-8?q?fix=EF=BC=9A=20=E4=BF=AE=E6=94=B9=E5=9B=BE?= =?UTF-8?q?=E8=A1=A8=E5=85=A8=E5=B1=8F=20=E4=B8=8D=E6=98=BE=E7=A4=BAname?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nezha-fronted/src/components/charts/line-chart-block.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nezha-fronted/src/components/charts/line-chart-block.vue b/nezha-fronted/src/components/charts/line-chart-block.vue index f938e07fe..4d19186ef 100644 --- a/nezha-fronted/src/components/charts/line-chart-block.vue +++ b/nezha-fronted/src/components/charts/line-chart-block.vue @@ -149,7 +149,7 @@
- {{data.title}} + {{data.name}}  
From d4c8381c84df8c44c102c84b413d03a4f76b0242 Mon Sep 17 00:00:00 2001 From: "@changcode" Date: Mon, 15 Nov 2021 18:10:20 +0800 Subject: [PATCH 4/5] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=20profileChangePi?= =?UTF-8?q?n=20=E4=BF=AE=E6=94=B9=E5=AF=86=E7=A0=81=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=EF=BC=8CPUT=E8=AF=B7=E6=B1=82=E5=8F=82=E6=95=B0=E4=BC=A0?= =?UTF-8?q?=E9=80=92=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/page/config/profileChangePin.vue | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/nezha-fronted/src/components/page/config/profileChangePin.vue b/nezha-fronted/src/components/page/config/profileChangePin.vue index 058733a3d..ef4b6e6e9 100644 --- a/nezha-fronted/src/components/page/config/profileChangePin.vue +++ b/nezha-fronted/src/components/page/config/profileChangePin.vue @@ -4,7 +4,7 @@
- + @@ -50,13 +50,12 @@ export default { } return { user: { - pin: '', + oldPin: '', newPin: '', confirmPin: '' }, - userId: localStorage.getItem('nz-user-id'), rules: { - pin: [{ required: true, message: this.$t('validate.required'), trigger: 'blur' }], + oldPin: [{ required: true, message: this.$t('validate.required'), trigger: 'blur' }], newPin: [{ required: true, message: this.$t('validate.required'), trigger: 'blur' }, { validator: validatePass, trigger: 'blur' }], confirmPin: [{ required: true, message: this.$t('config.user.reinputPin'), trigger: 'blur' }, { validator: validateConfirmPass, trigger: 'blur' }] }, @@ -80,14 +79,13 @@ export default { this.$refs.changePinForm.validate((valid) => { if (valid) { const paramObj = { - pin: this.user.pin, - newPin: this.user.newPin, - id: this.userId + oldPin: this.user.oldPin, + newPin: this.user.newPin } - this.$put('/sys/user/pin?oldPin=' + paramObj.pin + '&newPin=' + paramObj.newPin + '&id=' + paramObj.id).then(response => { + this.$put('/sys/user/pin', paramObj).then(response => { if (response && response.code == 200) { this.$message({ duration: 2000, type: 'success', message: this.$t('tip.saveSuccess') }) - this.user.pin = '' + this.user.oldPin = '' this.user.newPin = '' this.user.confirmPin = '' } else { From bec2d345fce2b0bd43d265132e5aa87bd0a60add Mon Sep 17 00:00:00 2001 From: zhangyu Date: Mon, 15 Nov 2021 18:20:21 +0800 Subject: [PATCH 5/5] =?UTF-8?q?NEZ-1245=20fix=EF=BC=9A=E9=83=A8=E5=88=86?= =?UTF-8?q?=E5=9B=BE=E8=A1=A8=E7=9A=84=E7=BB=9F=E8=AE=A1legend=E4=BD=8D?= =?UTF-8?q?=E7=BD=AE=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nezha-fronted/src/components/charts/line-chart-block.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nezha-fronted/src/components/charts/line-chart-block.vue b/nezha-fronted/src/components/charts/line-chart-block.vue index 4d19186ef..c0bb07d05 100644 --- a/nezha-fronted/src/components/charts/line-chart-block.vue +++ b/nezha-fronted/src/components/charts/line-chart-block.vue @@ -86,7 +86,7 @@