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

# Conflicts:
#	nezha-fronted/src/assets/css/components/common/bottomBox/bottomBox.scss
#	nezha-fronted/src/components/common/mixin/routerPathParams.js
This commit is contained in:
zhangyu
2022-11-15 13:57:25 +08:00
61 changed files with 810 additions and 4093 deletions

View File

@@ -1321,6 +1321,9 @@ export default {
} else if (this.$refs.dataDetail) {
tableTitle = this.$refs.dataDetail.tableTitle
}
if (!tableTitle || !this.tableId) {
return
}
let localStorageTableTitle = localStorage.getItem('nz-tableTitle-' + localStorage.getItem('nz-username') + '-' + this.tableId)
localStorageTableTitle = localStorageTableTitle ? JSON.parse(localStorageTableTitle) : tableTitle
if (tableTitle) {