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

fix(图表): 修复透视表指标在第一个字段时排序不生效

Browse Source
This commit is contained in:
wisonic-s
2025-06-24 08:54:37 +08:00
committed by GitHub
parent c81c98dc65
commit fd89d12366
1 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -301,7 +301,14 @@ export class TablePivot extends S2ChartView<PivotSheet> {
if (sortMethod === 'CUSTOM_SORT') {
sort.sortBy = valueFieldMap[f].customSort
} else {
if (i === 0) {
if ([2, 3, 4].includes(valueFieldMap[f]?.deType)) {
const fieldValues = newData.map(item => item[f])
const uniqueValues = [...new Set(fieldValues)]
uniqueValues.sort((a, b) => {
return sortMethod === 'ASC' ? a - b : b - a
})
sort.sortBy = uniqueValues
} else if (i === 0) {
sort.sortMethod = sortMethod
} else {
const fieldValues = newData.map(item => item[f])
@@ -309,9 +316,6 @@ export class TablePivot extends S2ChartView<PivotSheet> {
// 根据配置动态决定排序顺序
uniqueValues.sort((a, b) => {
if ([2, 3, 4].includes(valueFieldMap[f]?.deType)) {
return sortMethod === 'ASC' ? a - b : b - a
}
if (!a && !b) {
return 0
}
@@ -341,16 +345,20 @@ export class TablePivot extends S2ChartView<PivotSheet> {
if (sortMethod === 'CUSTOM_SORT') {
sort.sortBy = valueFieldMap[f].customSort
} else {
if (i === 0) {
if ([2, 3, 4].includes(valueFieldMap[f]?.deType)) {
const fieldValues = newData.map(item => item[f])
const uniqueValues = [...new Set(fieldValues)]
uniqueValues.sort((a, b) => {
return sortMethod === 'ASC' ? a - b : b - a
})
sort.sortBy = uniqueValues
} else if (i === 0) {
sort.sortMethod = sortMethod
} else {
const fieldValues = newData.map(item => item[f])
const uniqueValues = [...new Set(fieldValues)]
// 根据配置动态决定排序顺序
uniqueValues.sort((a, b) => {
if ([2, 3, 4].includes(valueFieldMap[f]?.deType)) {
return sortMethod === 'ASC' ? a - b : b - a
}
if (!a && !b) {
return 0
}