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

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

Browse Source
This commit is contained in:
zhangyu
2022-03-24 09:55:20 +08:00
parent a2cd704d14 e2e7eaec2a
commit f636b2ed5e
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
nezha-fronted/src/components/common/mixin/dataList.js
View File

@@ -336,7 +336,10 @@ export default {
}
},
created () {
const path = this.$route.fullPath.match(/\/(\S*)\?/)[1]
let path = ''
if (this.$route.fullPath.match(/\/(\S*)\?/)) {
path = this.$route.fullPath.match(/\/(\S*)\?/)[1]
}
if (this.$route.query.orderBy && !this.isSubList) {
this.orderBy = this.$route.query.orderBy
}

2
nezha-fronted/src/components/page/dashboard/explore/exploreItem.vue
View File

@@ -444,7 +444,7 @@ export default {
this.tableData = this.filterShowData(this.storedTableData, this.pageObj)
},
filterShowData (source, pageObj) {
return source.slice((pageObj.pageNo - 1) * pageObj.pageSize, pageObj.pageNo * pageObj.pageSize)
if (source) return source.slice((pageObj.pageNo - 1) * pageObj.pageSize, pageObj.pageNo * pageObj.pageSize)
},
chartUnitChange (unit) {
this.chartUnit = unit