From a27c1fcabd88c7e6d875e9215c5dd12354c15bed Mon Sep 17 00:00:00 2001 From: zhangyu Date: Tue, 7 Mar 2023 16:05:22 +0800 Subject: [PATCH 1/3] =?UTF-8?q?NEZ-2644=20fix=EF=BC=9A=20chart=E9=A2=91?= =?UTF-8?q?=E7=B9=81=E5=87=BA=E7=8E=B0=E8=AE=BE=E7=BD=AE=E8=87=AA=E5=AE=9A?= =?UTF-8?q?=E4=B9=89=E6=97=B6=E9=97=B4=E7=82=B9=E5=87=BB=E6=97=A0=E6=95=88?= =?UTF-8?q?=E6=9E=9C=E7=8E=B0=E8=B1=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/assets/css/components/common/multipleTime.scss | 3 +++ 1 file changed, 3 insertions(+) diff --git a/nezha-fronted/src/assets/css/components/common/multipleTime.scss b/nezha-fronted/src/assets/css/components/common/multipleTime.scss index 108734a3e..dc7220d73 100644 --- a/nezha-fronted/src/assets/css/components/common/multipleTime.scss +++ b/nezha-fronted/src/assets/css/components/common/multipleTime.scss @@ -91,6 +91,9 @@ } } } +.panel-time-picker-popper { + z-index: 9999999 !important; +} .panel-time-picker-popper[x-placement^=bottom] .popper__arrow { left: 85% !important; } From b2650f6675be59d896cc06135a0c999e5c77decb Mon Sep 17 00:00:00 2001 From: zhangyu Date: Tue, 7 Mar 2023 16:06:28 +0800 Subject: [PATCH 2/3] =?UTF-8?q?NEZ-2646=20fix=EF=BC=9A=E5=BC=80=E5=90=AFRe?= =?UTF-8?q?peat=E5=8B=BE=E9=80=89=E6=A0=B7=E5=BC=8F=E9=94=99=E8=AF=AF,?= =?UTF-8?q?=E9=A6=96=E6=AC=A1=E6=89=93=E5=BC=80=E6=97=B6=E5=8D=8A=E9=80=89?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E6=B2=A1=E5=9B=9E=E6=98=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nezha-fronted/src/components/common/panel/panelVariables.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nezha-fronted/src/components/common/panel/panelVariables.vue b/nezha-fronted/src/components/common/panel/panelVariables.vue index a444e6e9f..cf09685ba 100644 --- a/nezha-fronted/src/components/common/panel/panelVariables.vue +++ b/nezha-fronted/src/components/common/panel/panelVariables.vue @@ -76,7 +76,7 @@ export default { checked: [], checkAll: false, visible: false, - isIndeterminate: false + isIndeterminate: true } }) this.getLabelData() From 8c80cce062fca06d7dbb8c6159cbec923c61756d Mon Sep 17 00:00:00 2001 From: zyh Date: Tue, 7 Mar 2023 16:42:03 +0800 Subject: [PATCH 3/3] =?UTF-8?q?NEZ-2648=20fix=EF=BC=9A=E5=BC=80=E5=85=B3?= =?UTF-8?q?=E6=89=A9=E5=B1=95=E8=8F=9C=E5=8D=95=E5=AF=BC=E8=87=B4chart?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nezha-fronted/src/components/chart/chart/chartStat.vue | 2 +- nezha-fronted/src/components/chart/chartList.vue | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/nezha-fronted/src/components/chart/chart/chartStat.vue b/nezha-fronted/src/components/chart/chart/chartStat.vue index 5ff0691f1..8b7e0e467 100644 --- a/nezha-fronted/src/components/chart/chart/chartStat.vue +++ b/nezha-fronted/src/components/chart/chart/chartStat.vue @@ -336,7 +336,7 @@ export default { this.getLayout().then(layout => { this.renderStat(layout) }) - }, 50) + }, 100) }, setFontSize (item) { let fontSize = '' diff --git a/nezha-fronted/src/components/chart/chartList.vue b/nezha-fronted/src/components/chart/chartList.vue index 1be4a84ff..e6760bada 100644 --- a/nezha-fronted/src/components/chart/chartList.vue +++ b/nezha-fronted/src/components/chart/chartList.vue @@ -152,6 +152,9 @@ export default { }, variablesArr () { return this.$store.state.panel.variablesArr + }, + isShrink () { + return this.$store.getters.getIsShrink } }, data () { @@ -704,6 +707,13 @@ export default { window.removeEventListener('resize', this.resize) }, watch: { + isShrink: { + handler () { + setTimeout(() => { + this.resize() + }, 200) + } + }, // 监听查看模式变化 '$store.state.panel.mode': { immediate: true,