Merge remote-tracking branch 'origin/dev-3.1' into dev-3.1.1_theme

# Conflicts:
#	nezha-fronted/src/components/common/i18n.js
#	nezha-fronted/src/components/common/pagination.vue
#	nezha-fronted/src/components/common/searchInput.vue
#	nezha-fronted/src/components/common/table/settings/endpointTable.vue
#	nezha-fronted/src/components/page/dashboard/overview/overview2.vue
This commit is contained in:
chenjinsong
2021-11-15 14:06:42 +08:00
25 changed files with 2178 additions and 122 deletions

View File

@@ -127,7 +127,7 @@ export default {
license: {
warnInfo: '',
token: '',
valid: false
valid: true
},
uploadFileList: [],
uploadFile: { file: '', path: '', uuid: '' },
@@ -148,7 +148,7 @@ export default {
methods: {
...mapActions(['loginSuccess']),
login () {
if (this.loading || !this.license.valid) {
if (this.loading || !this.license.valid || !this.license.token) {
return
}
if (this.validateLogin() && (this.$route.path == '/' || this.$route.path == '/login')) {
@@ -214,6 +214,9 @@ export default {
localStorage.setItem('nz-username', this.loginData.username)
localStorage.setItem('nz-prometheus-federation-enabled', res.data.prometheusFederationEnabled)
localStorage.setItem('nz-language', this.lang)
res.data.user = {
lang: this.lang
}
this.loginSuccess(res)
} else {
this.authToken = res.data.authToken