public/dataease
1
0
Fork 0
mirror of https://github.com/dataease/dataease.git synced 2026-05-16 22:41:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(图表): 修复透视表多维度总计组内排序未生效 #15159 (#15313)

Browse Source
This commit is contained in:
wisonic-s
2025-03-12 15:23:13 +08:00
committed by GitHub
parent a7c29ad3bc
commit 5ff543f5ab
1 changed files with 20 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
core/core-frontend/src/views/chart/components/js/panel/charts/table/table-pivot.ts
View File

@@ -191,15 +191,17 @@ export class TablePivot extends S2ChartView<PivotSheet> {
tableTotal.row.showGrandTotals &&
v.indexOf(tableTotal.row.totalSortField) > -1
) {
const sort = {
sortFieldId: c[0],
sortMethod: tableTotal.row.totalSort.toUpperCase(),
sortByMeasure: TOTAL_VALUE,
query: {
[EXTRA_FIELD]: tableTotal.row.totalSortField
c.forEach(i => {
const sort = {
sortFieldId: i,
sortMethod: tableTotal.row.totalSort.toUpperCase(),
sortByMeasure: TOTAL_VALUE,
query: {
[EXTRA_FIELD]: tableTotal.row.totalSortField
}
}
}
sortParams.push(sort)
sortParams.push(sort)
})
}
if (
tableTotal.col.totalSort &&
@@ -208,15 +210,17 @@ export class TablePivot extends S2ChartView<PivotSheet> {
tableTotal.col.showGrandTotals &&
v.indexOf(tableTotal.col.totalSortField) > -1
) {
const sort = {
sortFieldId: r[0],
sortMethod: tableTotal.col.totalSort.toUpperCase(),
sortByMeasure: TOTAL_VALUE,
query: {
[EXTRA_FIELD]: tableTotal.col.totalSortField
r.forEach(i => {
const sort = {
sortFieldId: i,
sortMethod: tableTotal.col.totalSort.toUpperCase(),
sortByMeasure: TOTAL_VALUE,
query: {
[EXTRA_FIELD]: tableTotal.col.totalSortField
}
}
}
sortParams.push(sort)
sortParams.push(sort)
})
}
//列维度为空，行排序按照指标列来排序，取第一个有排序设置的指标
if (!columnFields?.length) {