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(图表): 修复明细表合并单元格计算错误 #13283

Browse Source
This commit is contained in:
wisonic
2024-12-03 22:45:38 +08:00
parent f0434d638f
commit 93d39e333c
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/core-frontend/src/views/chart/components/js/panel/common/common_table.ts
View File

@@ -1505,7 +1505,7 @@ export function configMergeCells(chart: Chart, options: S2Options, dataConfig: S
showText: j === textIndex
})
}
if (index === end) {
if (index === end && lastVal === curVal) {
tmpMergeCells.push({
colIndex: showIndex ? i + 1 : i,
rowIndex: index,
@@ -1513,7 +1513,7 @@ export function configMergeCells(chart: Chart, options: S2Options, dataConfig: S
})
}
mergedCellsInfo.push(tmpMergeCells)
curMergedColInfo.push([lastIndex, index === end ? index : index - 1])
curMergedColInfo.push([lastIndex, index === end && lastVal === curVal ? index : index - 1])
}
lastVal = curVal
lastIndex = index