center/dataease-dm
center/dataease-dm
13
0
Fork 0
forked from github/dataease
Code Pull Requests Activity

Merge pull request #13174 from dataease/pr@dev-v2@fix_table_info_merge_index_calc

Browse Source 
fix(图表): 修复明细表合并单元格序号列计算错误
This commit is contained in:
wisonic-s 2024-11-06 16:49:57 +08:00 committed by GitHub
commit c59b2e9c64
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1505,7 +1505,10 @@ export function configMergeCells(chart: Chart, options: S2Options, dataConfig: S
}
export function getRowIndex(mergedCellsInfo: MergedCellInfo[][], meta: ViewMeta): number {
let curRangeStartIndex = 0
if (!mergedCellsInfo?.length) {
return meta.rowIndex + 1
}
let curRangeStartIndex = meta.rowIndex
const lostCells = mergedCellsInfo.reduce((p, n) => {
if (n[0].colIndex !== 0) {
return p