center/dataease-dm
center/dataease-dm
13
0
Fork 0
forked from github/dataease
Code Pull Requests Activity

fix(视图): 修复表格下钻后下钻列位置偏移的问题

Browse Source
This commit is contained in:
junjun 2022-12-22 23:53:31 +08:00
parent 17390e7396
commit c8ab0b3de8
1 changed files with 46 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
frontend/src/views/chart/chart/table/table-info.js
View File

@ -32,6 +32,21 @@ export function baseTableInfo(s2, container, chart, action, tableData, pageInfo)
const drillFilters = JSON.parse(JSON.stringify(chart.drillFilters))
const drillExp = drillFilters[drillFilters.length - 1].datasetTableField
// 记录下钻起始字段的index
let xAxis = []
try {
xAxis = JSON.parse(chart.xaxis)
} catch (err) {
xAxis = JSON.parse(JSON.stringify(chart.xaxis))
}
let index = 0
for (let i = 0; i < xAxis.length; i++) {
if (xAxis[i].id === drillFilters[0].fieldId) {
index = i
break
}
}
// 移除所有下钻字段
const removeField = []
for (let i = 0; i < chart.drillFilters.length; i++) {
@ -78,6 +93,11 @@ export function baseTableInfo(s2, container, chart, action, tableData, pageInfo)
}
}
})
// 修正下钻字段的index，获取下钻位置元素添加到index位置，并删除
const ele = columns[columns.length - 1]
columns.splice(index, 0, ele)
columns.splice(columns.length - 1, 1)
} else {
fields.forEach(ele => {
const f = getCurrentField(chart.xaxis, ele)
@ -190,6 +210,21 @@ export function baseTableNormal(s2, container, chart, action, tableData) {
const drillFilters = JSON.parse(JSON.stringify(chart.drillFilters))
const drillExp = drillFilters[drillFilters.length - 1].datasetTableField
// 记录下钻起始字段的index
let xAxis
try {
xAxis = JSON.parse(chart.xaxis)
} catch (err) {
xAxis = JSON.parse(JSON.stringify(chart.xaxis))
}
let index = 0
for (let i = 0; i < xAxis.length; i++) {
if (xAxis[i].id === drillFilters[0].fieldId) {
index = i
break
}
}
// 移除所有下钻字段
const removeField = []
for (let i = 0; i < chart.drillFilters.length; i++) {
@ -230,6 +265,17 @@ export function baseTableNormal(s2, container, chart, action, tableData) {
}
}
})
// 修正下钻字段的index，获取下钻位置元素添加到index位置，并删除
let yAxis
try {
yAxis = JSON.parse(chart.yaxis)
} catch (err) {
yAxis = JSON.parse(JSON.stringify(chart.yaxis))
}
const ele = columns[columns.length - 1 - yAxis.length]
columns.splice(index, 0, ele)
columns.splice(columns.length - 1 - yAxis.length, 1)
} else {
fields.forEach(ele => {
const f = getCurrentField(chart.yaxis, ele)