fix: fix cellLocation in pivot-table #2694

VisActor · Nov 7, 2024 · f3dde64 · f3dde64
1 parent fb2c1b4
commit f3dde64
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 8 deletions.
diff --git a/common/changes/@visactor/vtable/fix-pivot-frozen-col_2024-11-05-06-26.json b/common/changes/@visactor/vtable/fix-pivot-frozen-col_2024-11-05-06-26.json
@@ -0,0 +1,10 @@
+{
+  "changes": [
+    {
+      "packageName": "@visactor/vtable",
+      "comment": "fix: fix cellLocation in pivot-table #2694",
+      "type": "none"
+    }
+  ],
+  "packageName": "@visactor/vtable"
+}
diff --git a/packages/vtable/src/scenegraph/group-creater/column-helper.ts b/packages/vtable/src/scenegraph/group-creater/column-helper.ts
@@ -42,7 +42,7 @@ export function createComplexColumn(
   mergeMap: MergeMap,
   defaultRowHeight: number | number[],
   table: BaseTableAPI,
-  cellLocation: CellLocation,
+  // cellLocation: CellLocation,
   rowLimit?: number
 ) {
   let padding;
@@ -63,6 +63,7 @@ export function createComplexColumn(
 
   for (let j = rowStart; j <= rowEnd; j++) {
     const row = j;
+    let cellLocation = table.getCellLocation(col, row);
     let value = table.getCellValue(col, row);
 
     // 处理单元格合并

diff --git a/packages/vtable/src/scenegraph/group-creater/column.ts b/packages/vtable/src/scenegraph/group-creater/column.ts
@@ -152,7 +152,7 @@ export function createColGroup(
       table.scenegraph.mergeMap,
       cellLocation === 'columnHeader' && isNumber(defaultHeaderRowHeight) ? defaultHeaderRowHeight : defaultRowHeight,
       table,
-      cellLocation,
+      // cellLocation,
       rowLimit
     );
     x += default2Width;

diff --git a/packages/vtable/src/scenegraph/group-creater/progress/proxy.ts b/packages/vtable/src/scenegraph/group-creater/progress/proxy.ts
@@ -314,8 +314,8 @@ export class SceneProxy {
           endRow,
           this.table.scenegraph.mergeMap,
           this.table.internalProps.defaultRowHeight,
-          this.table,
-          cellLocation
+          this.table
+          // cellLocation
         );
         maxHeight = Math.max(maxHeight, height);
         this.table.scenegraph.rowHeaderGroup.setAttribute('height', maxHeight);
@@ -336,8 +336,8 @@ export class SceneProxy {
           endRow,
           this.table.scenegraph.mergeMap,
           this.table.internalProps.defaultRowHeight,
-          this.table,
-          cellLocation
+          this.table
+          // cellLocation
         );
         maxHeight = Math.max(maxHeight, height);
         this.table.scenegraph.rightFrozenGroup.setAttribute('height', maxHeight);
@@ -360,8 +360,8 @@ export class SceneProxy {
         endRow,
         this.table.scenegraph.mergeMap,
         this.table.internalProps.defaultRowHeight,
-        this.table,
-        cellLocation
+        this.table
+        // cellLocation
       );
       maxHeight = Math.max(maxHeight, height);
     }