From 06f849fb6627801a5116d5bd0f82bfa973bdc1c3 Mon Sep 17 00:00:00 2001 From: zhangyu Date: Tue, 27 Jun 2023 14:27:53 +0800 Subject: [PATCH 1/2] =?UTF-8?q?NEZ-2928=20fix=EF=BC=9A=E5=BC=80=E5=90=AF?= =?UTF-8?q?=E5=A4=9A=E4=B8=AA=E9=A1=B5=E9=9D=A2=EF=BC=8C=E5=AD=98=E5=9C=A8?= =?UTF-8?q?=E4=B8=8D=E5=90=8C=E8=AF=AD=E8=A8=80=E7=9A=84=E6=83=85=E5=86=B5?= =?UTF-8?q?=E4=B8=8B=EF=BC=8C=E5=9C=A8=E7=95=8C=E9=9D=A2=E5=BC=80=E5=90=AF?= =?UTF-8?q?Rules=E7=9A=84=E5=AE=9A=E6=97=B6=E8=AE=A1=E5=88=92=E6=8F=90?= =?UTF-8?q?=E7=A4=BA=E4=BF=A1=E6=81=AF=E8=AF=AD=E8=A8=80=E4=B8=8D=E4=B8=80?= =?UTF-8?q?=E8=87=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nezha-fronted/src/components/common/login.vue | 2 ++ nezha-fronted/src/components/common/rightBox/profileBox.vue | 1 + nezha-fronted/src/components/layout/header.vue | 3 +++ 3 files changed, 6 insertions(+) diff --git a/nezha-fronted/src/components/common/login.vue b/nezha-fronted/src/components/common/login.vue index 6c60e6135..41eef15e7 100644 --- a/nezha-fronted/src/components/common/login.vue +++ b/nezha-fronted/src/components/common/login.vue @@ -318,6 +318,7 @@ export default { localStorage.setItem('nz-username', this.loginData.username) localStorage.setItem('nz-prometheus-federation-enabled', res.data.prometheusFederationEnabled) localStorage.setItem('nz-language', this.lang) + this.$store.commit('setLanguage', this.lang) this.loginSuccess(res) } } else { @@ -339,6 +340,7 @@ export default { localStorage.setItem('nz-username', this.loginData.username) localStorage.setItem('nz-prometheus-federation-enabled', res.data.prometheusFederationEnabled) localStorage.setItem('nz-language', this.lang) + this.$store.commit('setLanguage', this.lang) res.data.user = { ...this.userInfo } diff --git a/nezha-fronted/src/components/common/rightBox/profileBox.vue b/nezha-fronted/src/components/common/rightBox/profileBox.vue index 3d35a4ebd..f4bf89f76 100644 --- a/nezha-fronted/src/components/common/rightBox/profileBox.vue +++ b/nezha-fronted/src/components/common/rightBox/profileBox.vue @@ -138,6 +138,7 @@ export default { this.esc(true) if (this.editProfile.lang !== localStorage.getItem('nz-language')) { localStorage.setItem('nz-language', this.editProfile.lang) + this.$store.commit('setLanguage', this.editProfile.lang) this.$i18n.locale = this.editProfile.lang this.$emit('clickProfile', true) } else { diff --git a/nezha-fronted/src/components/layout/header.vue b/nezha-fronted/src/components/layout/header.vue index 6c6742271..bbf41a929 100644 --- a/nezha-fronted/src/components/layout/header.vue +++ b/nezha-fronted/src/components/layout/header.vue @@ -221,6 +221,9 @@ export default { if (this.username != localStorage.getItem('nz-username')) { this.$router.go(0) } + if (this.$store.getters.getLanguage && (this.$store.getters.getLanguage !== localStorage.getItem('nz-language'))) { + localStorage.setItem('nz-language', this.$store.getters.getLanguage) + } } }, mounted () { From 245c737b2c1ea0201131f87830dcaabbeb629859 Mon Sep 17 00:00:00 2001 From: zhangyu Date: Tue, 27 Jun 2023 14:39:44 +0800 Subject: [PATCH 2/2] =?UTF-8?q?NEZ-2932=20fix=EF=BC=9AMap=20of=20datacente?= =?UTF-8?q?r=20=E5=85=A8=E5=B1=8F=E5=90=8ETooltip=E4=BD=8D=E7=BD=AE?= =?UTF-8?q?=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nezha-fronted/src/assets/css/common.scss | 11 +++++++++++ nezha-fronted/src/components/chart/chart/chartMap.vue | 2 +- nezha-fronted/src/components/chart/chartList.vue | 1 + 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/nezha-fronted/src/assets/css/common.scss b/nezha-fronted/src/assets/css/common.scss index b0ce70510..7b9b98832 100644 --- a/nezha-fronted/src/assets/css/common.scss +++ b/nezha-fronted/src/assets/css/common.scss @@ -630,3 +630,14 @@ textarea { background-position: 100% 0%; } } +.no-transform-dialog{ + display: flex; + align-items: center; + justify-content: center; + height: 100vh; + width: 100vw; + .el-dialog{ + position: unset !important; + transform: unset !important; + } +} diff --git a/nezha-fronted/src/components/chart/chart/chartMap.vue b/nezha-fronted/src/components/chart/chart/chartMap.vue index 63804daaa..ae58f5ebc 100644 --- a/nezha-fronted/src/components/chart/chart/chartMap.vue +++ b/nezha-fronted/src/components/chart/chart/chartMap.vue @@ -31,7 +31,7 @@
-
{{$t('overall.agent')}} {{$t('config.agent.up')}}}
+
{{$t('overall.agent')}} {{$t('config.agent.up')}}
diff --git a/nezha-fronted/src/components/chart/chartList.vue b/nezha-fronted/src/components/chart/chartList.vue index a38c848ff..cc83f504c 100644 --- a/nezha-fronted/src/components/chart/chartList.vue +++ b/nezha-fronted/src/components/chart/chartList.vue @@ -72,6 +72,7 @@ :visible.sync="fullscreen.visible" :show-close="false" class="nz-dialog chart-fullscreen" + :class="fullscreen.chartInfo.type === 'map' ? 'no-transform-dialog' : ''" destroy-on-close fullscreen :modal-append-to-body="false"