Merge pull request #2951 from VisActor/2948-refactor-columnwidthconfig

2948 refactor columnwidthconfig
VisActor · Nov 28, 2024 · 3254a8a · 3254a8a
2 parents 5a10926 + 82b7810
commit 3254a8a
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 4 deletions.
diff --git a/common/changes/@visactor/vtable/2948-refactor-columnwidthconfig_2024-11-28-10-24.json b/common/changes/@visactor/vtable/2948-refactor-columnwidthconfig_2024-11-28-10-24.json
@@ -0,0 +1,11 @@
+{
+  "changes": [
+    {
+      "comment": "refactor: when columnWidthConfig set wrong dimensions should judge this case #2948\n\n",
+      "type": "none",
+      "packageName": "@visactor/vtable"
+    }
+  ],
+  "packageName": "@visactor/vtable",
+  "email": "[email protected]"
+}
diff --git a/packages/vtable/src/PivotTable.ts b/packages/vtable/src/PivotTable.ts
@@ -1112,9 +1112,14 @@ export class PivotTable extends BaseTable implements PivotTableAPI {
       const dimensions = item.dimensions;
       const width = item.width;
       const cell = this.getCellAddressByHeaderPaths(dimensions);
-      if (cell && !this.internalProps._widthResizedColMap.has(cell.col)) {
-        this._setColWidth(cell.col, width);
-        this.internalProps._widthResizedColMap.add(cell.col); // add resize tag
+      if (cell.col >= this.rowHeaderLevelCount) {
+        const cellPath = this.getCellHeaderPaths(cell.col, this.columnHeaderLevelCount - 1);
+        if (cellPath.colHeaderPaths.length === dimensions.length) {
+          if (cell && !this.internalProps._widthResizedColMap.has(cell.col)) {
+            this._setColWidth(cell.col, width);
+            this.internalProps._widthResizedColMap.add(cell.col); // add resize tag
+          }
+        }
       }
     }
   }

diff --git a/packages/vtable/src/event/event.ts b/packages/vtable/src/event/event.ts
@@ -301,7 +301,7 @@ export class EventManager {
         eventArgs.event.shiftKey,
         eventArgs.event.ctrlKey || eventArgs.event.metaKey,
         false,
-        this.table.options.select?.makeSelectCellVisible ?? true
+        isSelectMoving ? false : this.table.options.select?.makeSelectCellVisible ?? true
       );
 
       return true;