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

fix(图表): 修复明细表单元格合并字段为单一字段时计算错误 #17472

Browse Source
This commit is contained in:
wisonic
2026-01-19 18:28:16 +08:00
committed by wisonic-s
parent 367bd18cfe
commit 1911a78f80
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2067,6 +2067,9 @@ export function configMergeCells(chart: Chart, options: S2Options, dataConfig: S
const mergedCellsInfo = []
const axisToMerge = dataConfig.meta.filter((_, i) => i < quotaIndex || quotaIndex === -1)
axisToMerge.forEach((a, i) => {
if (mergedColInfo[i - 1]) {
mergedColInfo[i - 1] = []
}
const preMergedColInfo = mergedColInfo[i]
const curMergedColInfo = []
mergedColInfo.push(curMergedColInfo)
@@ -2080,7 +2083,10 @@ export function configMergeCells(chart: Chart, options: S2Options, dataConfig: S
const curRange = index - lastIndex
if (curRange > 1 || (index === end && curRange === 1 && lastVal === curVal)) {
const tmpMergeCells = []
const textIndex = curRange % 2 === 1 ? (curRange - 1) / 2 : curRange / 2 - 1
let textIndex = curRange % 2 === 1 ? (curRange - 1) / 2 : curRange / 2 - 1
if (index === end && lastVal === curVal) {
textIndex = curRange % 2 === 1 ? (curRange - 1) / 2 : curRange / 2
}
for (let j = 0; j < curRange; j++) {
tmpMergeCells.push({
colIndex: showIndex ? i + 1 : i,