gfwleak/nezha-nezha-fronted
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev-3.7' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.8

Browse Source
This commit is contained in:
zhangyu
2023-06-27 14:45:38 +08:00
parent dc07a09bf2 654952e489
commit 3086e5e6c4
4 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
nezha-fronted/src/components/chart/chartList.vue
View File

@@ -77,6 +77,7 @@
v-if="fullscreen.visible" v-if="fullscreen.visible"
:visible.sync="fullscreen.visible" :visible.sync="fullscreen.visible"
:show-close="false" :show-close="false"
:class="fullscreen.chartInfo.type === 'map' ? 'no-transform-dialog' : ''"
destroy-on-close destroy-on-close
fullscreen fullscreen
:append-to-body="true" :append-to-body="true"

2
nezha-fronted/src/components/common/login.vue
View File

@@ -318,6 +318,7 @@ export default {
localStorage.setItem('nz-username', this.loginData.username) localStorage.setItem('nz-username', this.loginData.username)
localStorage.setItem('nz-prometheus-federation-enabled', res.data.prometheusFederationEnabled) localStorage.setItem('nz-prometheus-federation-enabled', res.data.prometheusFederationEnabled)
localStorage.setItem('nz-language', this.lang) localStorage.setItem('nz-language', this.lang)
this.$store.commit('setLanguage', this.lang)
this.loginSuccess(res) this.loginSuccess(res)
} }
} else { } else {
@@ -339,6 +340,7 @@ export default {
localStorage.setItem('nz-username', this.loginData.username) localStorage.setItem('nz-username', this.loginData.username)
localStorage.setItem('nz-prometheus-federation-enabled', res.data.prometheusFederationEnabled) localStorage.setItem('nz-prometheus-federation-enabled', res.data.prometheusFederationEnabled)
localStorage.setItem('nz-language', this.lang) localStorage.setItem('nz-language', this.lang)
this.$store.commit('setLanguage', this.lang)
res.data.user = { res.data.user = {
...this.userInfo ...this.userInfo
} }

1
nezha-fronted/src/components/common/rightBox/profileBox.vue
View File

@@ -138,6 +138,7 @@ export default {
this.esc(true) this.esc(true)
if (this.editProfile.lang !== localStorage.getItem('nz-language')) { if (this.editProfile.lang !== localStorage.getItem('nz-language')) {
localStorage.setItem('nz-language', this.editProfile.lang) localStorage.setItem('nz-language', this.editProfile.lang)
this.$store.commit('setLanguage', this.editProfile.lang)
this.$i18n.locale = this.editProfile.lang this.$i18n.locale = this.editProfile.lang
this.$emit('clickProfile', true) this.$emit('clickProfile', true)
} else { } else {

3
nezha-fronted/src/components/layout/header.vue
View File

@@ -221,6 +221,9 @@ export default {
if (this.username != localStorage.getItem('nz-username')) { if (this.username != localStorage.getItem('nz-username')) {
this.$router.go(0) 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 () { mounted () {