gfwleak/cyber-narrator-cn-ui
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CN-827 解决修改配置后报错的问题

Browse Source
This commit is contained in:
hyx
2022-12-20 16:10:28 +08:00
parent 220e8a602e
commit 1b4a760238
1 changed files with 24 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/utils/tools.js
View File

@@ -976,10 +976,30 @@ export async function combinDrilldownTableWithUserConfig () {
defaultTab.checked = currentUserTab.checked
if (defaultTab && defaultTab.hasMetricSearch === true) {
defaultTab.metrics.forEach(metric => {
if(currentUserTableConfig.columns) {
const sortColumns = []
sortColumns.push(metric.columns[0])
currentUserTableConfig.columns.forEach((column, index) => {
const sortColumn = metric.columns.find(metricColumn => {
if (metricColumn.name) {
return metricColumn.name === column
} else {
return metricColumn === column
}
})
if (sortColumn) {
sortColumns.push(sortColumn)
}
})
metric.columns = sortColumns
}
})
} else {
if(currentUserTableConfig.columns) {
const sortColumns = []
sortColumns.push(metric.columns[0])
sortColumns.push(defaultTab.columns[0])
currentUserTableConfig.columns.forEach((column, index) => {
const sortColumn = metric.columns.find(metricColumn => {
const sortColumn = defaultTab.columns.find(metricColumn => {
if (metricColumn.name) {
return metricColumn.name === column
} else {
@@ -990,24 +1010,8 @@ export async function combinDrilldownTableWithUserConfig () {
sortColumns.push(sortColumn)
}
})
metric.columns = sortColumns
})
} else {
const sortColumns = []
sortColumns.push(defaultTab.columns[0])
currentUserTableConfig.columns.forEach((column, index) => {
const sortColumn = defaultTab.columns.find(metricColumn => {
if (metricColumn.name) {
return metricColumn.name === column
} else {
return metricColumn === column
}
})
if (sortColumn) {
sortColumns.push(sortColumn)
}
})
defaultTab.columns = sortColumns
defaultTab.columns = sortColumns
}
}
sortTabs.push(defaultTab)
}