fix: fix enableTreeNodeMerge judgement in getCellMergeInfo()

VisActor · Jul 11, 2024 · 66510ef · 66510ef
1 parent 7bb1cc2
commit 66510ef
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/packages/vtable/src/scenegraph/utils/get-cell-merge.ts b/packages/vtable/src/scenegraph/utils/get-cell-merge.ts
@@ -16,7 +16,11 @@ export function getCellMergeInfo(table: BaseTableAPI, col: number, row: number):
       return customMerge.range;
     }
   }
-  if (!table.isHeader(col, row) && !(table.getBodyColumnDefine(col, row) as ColumnDefine)?.mergeCell) {
+  if (
+    !table.internalProps.enableTreeNodeMerge &&
+    !table.isHeader(col, row) &&
+    !(table.getBodyColumnDefine(col, row) as ColumnDefine)?.mergeCell
+  ) {
     return false;
   }
   const range = table.getCellRange(col, row);