Merge pull request #3806 from VisActor/3796-bug-adaptive-with-setting-maxwidth

3796 bug adaptive with setting maxwidth

Author: fangsmile

common/changes/@visactor/vtable/3796-bug-adaptive-with-setting-maxwidth_2025-04-25-08-53.json

@@ -0,0 +1,11 @@
+{
+  "changes": [
+    {
+      "comment": "fix: supplement adaptive widthAdaptiveMode logic #3796\n\n",
+      "type": "none",
+      "packageName": "@visactor/vtable"
+    }
+  ],
+  "packageName": "@visactor/vtable",
+  "email": "892739385@qq.com"
+}

packages/vtable/examples/cell-move/column-move.ts

@@ -213,11 +213,11 @@ export function createTable() {
       }
     ],
     dragOrder: {
-      dragHeaderMode: 'column',
-      validateDragOrderOnEnd(source, target) {
-        console.log(source, target);
-        return false;
-      }
+      dragHeaderMode: 'column'
+      // validateDragOrderOnEnd(source, target) {
+      //   console.log(source, target);
+      //   return false;
+      // }
     }
     // theme: VTable.themes.SIMPLIFY,
     // defaultRowHeight: 100,

packages/vtable/src/scenegraph/layout/compute-col-width.ts

@@ -25,6 +25,13 @@ import { breakString } from '../utils/break-string';
 import { emptyCustomLayout } from '../../components/react/react-custom-layout';
 import { getOrApply } from '../../tools/helper';
 
+/**
+ * @description: 计算列宽
+ * @param {BaseTableAPI} table
+ * @param {number} colStart
+ * @param {number} colEnd
+ * @param {boolean} update 是否执行更新场景树
+ */
 export function computeColsWidth(table: BaseTableAPI, colStart?: number, colEnd?: number, update?: boolean): void {
   // const time = typeof window !== 'undefined' ? window.performance.now() : 0;
   (table as PivotTableAPI | ListTableAPI).internalProps.columnWidthConfig &&

packages/vtable/src/scenegraph/scenegraph.ts

@@ -1373,17 +1373,22 @@ export class Scenegraph {
       table._clearColRangeWidthsMap();
       const canvasWidth = table.tableNoFrameWidth;
       let actualHeaderWidth = 0;
-      for (let col = 0; col < table.colCount; col++) {
-        if (
-          col < table.rowHeaderLevelCount ||
-          (table.isPivotChart() && col >= table.colCount - table.rightFrozenColCount)
-        ) {
-          const colWidth = table.getColWidth(col);
-          actualHeaderWidth += colWidth;
+      let startCol = 0;
+      let endCol = table.colCount;
+      if (table.widthAdaptiveMode === 'only-body') {
+        for (let col = 0; col < table.colCount; col++) {
+          if (
+            col < table.rowHeaderLevelCount ||
+            (table.isPivotChart() && col >= table.colCount - table.rightFrozenColCount)
+          ) {
+            const colWidth = table.getColWidth(col);
+            actualHeaderWidth += colWidth;
+          }
         }
+        startCol = table.rowHeaderLevelCount;
+        endCol = table.isPivotChart() ? table.colCount - table.rightFrozenColCount : table.colCount;
       }
-      const startCol = table.rowHeaderLevelCount;
-      const endCol = table.isPivotChart() ? table.colCount - table.rightFrozenColCount : table.colCount;
+
       getAdaptiveWidth(canvasWidth - actualHeaderWidth, startCol, endCol, false, [], table, true);
     } else if (table.autoFillWidth) {
       table._clearColRangeWidthsMap();