github/dataease
github/dataease
3
0
Fork 1
mirror of https://github.com/dataease/dataease.git synced 2025-02-24 19:42:56 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #13059 from dataease/pr@dev-v2@refactor_table_info_merge_cells_index

Browse Source 
refactor(图表): 明细表合并单元格序号列处理
This commit is contained in:
wisonic-s 2024-11-01 14:36:05 +08:00 committed by GitHub
commit 8b7da76ed5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1464,6 +1464,16 @@ export function configMergeCells(chart: Chart, options: S2Options) {
}
})
})
if (showIndex) {
const indexMergedCells = mergedCellsInfo.filter(cells => cells[0].colIndex === 1)
indexMergedCells.forEach(cells => {
const tmpCells = cloneDeep(cells)
tmpCells.forEach(cell => {
cell.colIndex = 0
})
mergedCellsInfo.unshift(tmpCells)
})
}
options.mergedCellsInfo = mergedCellsInfo
options.mergedCell = (sheet, cells, meta) => {
return new CustomMergedCell(sheet, cells, meta)
@ -1486,4 +1496,4 @@ class CustomMergedCell extends MergedCell {
lineHeight: cellTheme.horizontalBorderWidth,
})
}
}
}