@kdcloudjs/table 1.1.5 → 1.1.6-0

package/es/table/base/table.js

@@ -394,13 +394,13 @@ export var BaseTable = /*#__PURE__*/function (_React$Component) {
           last: footerDataSource.length - 1,
           limit: Infinity
         }
-      }), /*#__PURE__*/React.createElement("div", {
+      }), footerDataSource.length > 0 ? /*#__PURE__*/React.createElement("div", {
         className: Classes.verticalScrollPlaceholder,
         style: this.hasScrollY ? {
           width: this.getScrollBarWidth(),
           visibility: 'initial'
         } : undefined
-      }));
+      }) : null);
     }
   }, {
     key: "renderLockShadows",

package/es/table/pipeline/features/autoFill.js

@@ -1,70 +1,170 @@
+import _Symbol from "@babel/runtime-corejs3/core-js-stable/symbol";
+import _Number$MAX_SAFE_INTEGER from "@babel/runtime-corejs3/core-js-stable/number/max-safe-integer";
 import _findInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/find";
 import _sliceInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/slice";
 import _spliceInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/splice";
+import _Map from "@babel/runtime-corejs3/core-js-stable/map";
+import _findIndexInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/find-index";
 import { getLeftNestedLockCount } from '../../base/calculations';
 import { isLeafNode, makeRecursiveMapper } from '../../utils';
 import { Classes } from '../../base/styles';
-import { COLUMN_RESIZE_KEY } from './columnResizeWidth';
+import { COLUMN_SIZE_KEY, LAST_RESIZED_COLUMN_KEY, RESIZED_COLUMN_KEY } from './columnResizeWidth';
 export var FILL_COLUMN_CODE = '$_fill_column_&';
 export var tableWidthKey = 'tableWidth';
-var fillColumnWidthKey = 'fillColumnWidth';
+
+var FLEX_COLUMN_COUNT = _Symbol('flexCount');
+
 export var autoFillTableWidth = function autoFillTableWidth() {
   return function (pipeline) {
-    var width = pipeline.getStateAtKey(fillColumnWidthKey, 0);
-    var columns = pipeline.getColumns();
+    var flexColumnResult = findFlexColumns(pipeline);
+    var flexCount = flexColumnResult.get(FLEX_COLUMN_COUNT);
+
+    if (flexCount) {
+      // 设置了flex宽度，flex列平分剩余宽度
+      var remainingWidth = getTableRemainingWidth(pipeline) || 0;
+
+      if (remainingWidth > 0) {
+        // 保存剩余的flex总和和剩余宽度总和宽度
+        var residualFlexCount = flexCount;
+        var residualFlexWidth = remainingWidth;
+        var columnSize = pipeline.getFeatureOptions(COLUMN_SIZE_KEY) || {};
+        pipeline.mapColumns(makeRecursiveMapper(function (col, recursiveFlatMapInfo) {
+          var isLeaf = recursiveFlatMapInfo.isLeaf;
 
-    var fillColumns = _findInstanceProperty(columns).call(columns, function (col) {
-      return col.code === FILL_COLUMN_CODE;
-    });
+          if (isLeaf && isValidFlexColumn(col, pipeline)) {
+            var code = col.code,
+                _col$features = col.features,
+                features = _col$features === void 0 ? {} : _col$features;
+            var flex = features.flex,
+                _features$minWidth = features.minWidth,
+                minWidth = _features$minWidth === void 0 ? 0 : _features$minWidth,
+                _features$maxWidth = features.maxWidth,
+                maxWidth = _features$maxWidth === void 0 ? _Number$MAX_SAFE_INTEGER : _features$maxWidth;
+            var usedRemainingWidth = Math.floor(remainingWidth * flex / flexCount);
+            var preColWidth = col.width; // 如果当前已经是最后一个flex列，将剩余的宽度添加到该列，其他计算相应的列
 
-    if (fillColumns) {
-      fillColumns.width = width;
+            col.width = clamp(minWidth, preColWidth + (residualFlexCount === flex ? residualFlexWidth : usedRemainingWidth), maxWidth);
+            residualFlexCount -= flex;
+            residualFlexWidth -= col.width - preColWidth;
+            columnSize[code] = col.width;
+          }
+
+          return col;
+        }));
+        pipeline.setFeatureOptions(COLUMN_SIZE_KEY, columnSize);
+      }
     } else {
-      var rightNestedLockCount = getLeftNestedLockCount(_sliceInstanceProperty(columns).call(columns).reverse());
-      var spliceIndex = columns.length - rightNestedLockCount;
-      var _fillColumns = {
-        name: '',
-        code: FILL_COLUMN_CODE,
-        width: width,
-        features: {
-          resizeable: false
-        },
-        getCellProps: function getCellProps(value, record, rowIndex) {
-          return {
-            className: Classes.emptyColCell
-          };
-        }
-      };
-
-      _spliceInstanceProperty(columns).call(columns, spliceIndex || columns.length, 0, _fillColumns);
+      // 未设置了flex宽度，创建占位列
+      var columns = pipeline.getColumns();
+
+      var fillColumns = _findInstanceProperty(columns).call(columns, function (col) {
+        return col.code === FILL_COLUMN_CODE;
+      });
+
+      var width = getTableRemainingWidth(pipeline) || 0;
+
+      if (fillColumns) {
+        fillColumns.width = width;
+      } else {
+        var rightNestedLockCount = getLeftNestedLockCount(_sliceInstanceProperty(columns).call(columns).reverse());
+        var spliceIndex = columns.length - rightNestedLockCount;
+        var _fillColumns = {
+          name: '',
+          code: FILL_COLUMN_CODE,
+          width: width,
+          features: {
+            resizeable: false
+          },
+          getCellProps: function getCellProps(value, record, rowIndex) {
+            return {
+              className: Classes.emptyColCell
+            };
+          }
+        };
+
+        _spliceInstanceProperty(columns).call(columns, spliceIndex || columns.length, 0, _fillColumns);
+      }
+
+      pipeline.columns(columns);
     }
 
-    pipeline.columns(columns);
-    setAutoFillWidth(pipeline);
     return pipeline;
+
+    function findFlexColumns(pipeline) {
+      var result = new _Map([[FLEX_COLUMN_COUNT, 0]]);
+      dfs(pipeline.getColumns(), result);
+      return result;
+
+      function dfs(columns, result) {
+        columns.forEach(function (col) {
+          if (isLeafNode(col)) {
+            if (isValidFlexColumn(col, pipeline)) {
+              result.set(FLEX_COLUMN_COUNT, result.get(FLEX_COLUMN_COUNT) + col.features.flex);
+            }
+          } else {
+            dfs(col.children, result);
+          }
+        });
+      }
+    }
   };
 };
 
-var setAutoFillWidth = function setAutoFillWidth(pipeline) {
+function getColumnWidthSum(pipeline) {
+  return dfs(pipeline.getColumns());
+
+  function dfs(columns) {
+    return columns.reduce(function (acc, col) {
+      var width = col.width,
+          code = col.code;
+
+      if (isLeafNode(col) && code !== FILL_COLUMN_CODE) {
+        var resizeColumn = pipeline.getFeatureOptions(COLUMN_SIZE_KEY);
+        return acc + (resizeColumn && resizeColumn[code] || width);
+      } else {
+        return acc + dfs(col.children);
+      }
+    }, 0);
+  }
+}
+
+function getTableRemainingWidth(pipeline) {
   var tableWidth = pipeline.getStateAtKey(tableWidthKey);
   if (!tableWidth) return;
-  var columnWidthSum = 0;
-  pipeline.mapColumns(makeRecursiveMapper(function (col) {
-    var width = col.width,
-        code = col.code;
-
-    if (isLeafNode(col) && code !== FILL_COLUMN_CODE) {
-      var resizeColumn = pipeline.getFeatureOptions(COLUMN_RESIZE_KEY);
-      columnWidthSum += resizeColumn && resizeColumn[code] || width;
-    }
+  var remainingWidth = Math.floor(tableWidth - getColumnWidthSum(pipeline));
+  return remainingWidth > 0 ? remainingWidth : 0;
+}
+
+function isAfterLastResizeCol(column, pipeline) {
+  var _context, _context2;
+
+  var lastResizedColumnCode = pipeline.getFeatureOptions(LAST_RESIZED_COLUMN_KEY);
+  if (lastResizedColumnCode === undefined) return true;
 
-    return col;
-  }));
-  var fillColumnWidth = Math.floor(tableWidth - columnWidthSum);
-  fillColumnWidth = fillColumnWidth > 0 ? fillColumnWidth : 0;
-  var preWidth = pipeline.getStateAtKey(fillColumnWidthKey, 0);
+  var lastResizedColumnIndex = _findIndexInstanceProperty(_context = pipeline.getColumns()).call(_context, function (col) {
+    return col.code === lastResizedColumnCode;
+  });
 
-  if (preWidth !== fillColumnWidth) {
-    pipeline.setStateAtKey('fillColumnWidth', fillColumnWidth);
+  var colIndex = _findIndexInstanceProperty(_context2 = pipeline.getColumns()).call(_context2, function (col) {
+    return col.code === column.code;
+  });
+
+  return colIndex > lastResizedColumnIndex;
+}
+
+function isValidFlexColumn(col, pipeline) {
+  var _a;
+
+  var resizeColumn = pipeline.getFeatureOptions(RESIZED_COLUMN_KEY); // 拖拽列自动禁止flex
+
+  if (resizeColumn === null || resizeColumn === void 0 ? void 0 : resizeColumn.has(col.code)) {
+    return false;
   }
-};
+
+  var flex = (_a = col.features) === null || _a === void 0 ? void 0 : _a.flex;
+  return typeof flex === 'number' && flex > 0 && isAfterLastResizeCol(col, pipeline);
+}
+
+function clamp(min, x, max) {
+  return Math.max(min, Math.min(max, x));
+}

package/es/table/pipeline/features/columnResizeWidth.d.ts

@@ -20,6 +20,8 @@ export interface ColumnResizeOptions {
     onChangeSize?(nextSize: ColumnSize): void;
     afterChangeSize?(nextSize: ColumnSize, changedColumnSize: ChangedColumnSize[]): void;
 }
-export declare const COLUMN_RESIZE_KEY = "columnResize";
+export declare const COLUMN_SIZE_KEY = "columnResize";
+export declare const RESIZED_COLUMN_KEY = "resizedColumn";
+export declare const LAST_RESIZED_COLUMN_KEY = "lastResizedColumn";
 export declare function columnResize(opts?: ColumnResizeOptions): (pipeline: TablePipeline) => TablePipeline;
 export {};

package/es/table/pipeline/features/columnResizeWidth.js

@@ -3,8 +3,9 @@ import _taggedTemplateLiteral from "@babel/runtime-corejs3/helpers/taggedTemplat
 
 var _templateObject, _templateObject2;
 
-import _mapInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/map";
+import _Set from "@babel/runtime-corejs3/core-js-stable/set";
 import _Object$keys from "@babel/runtime-corejs3/core-js-stable/object/keys";
+import _mapInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/map";
 import React from 'react';
 import styled from 'styled-components';
 import { fromEvent } from 'rxjs';
@@ -24,7 +25,9 @@ function disableSelect(event) {
 }
 
 var stateKey = 'columnResize';
-export var COLUMN_RESIZE_KEY = 'columnResize';
+export var COLUMN_SIZE_KEY = 'columnResize';
+export var RESIZED_COLUMN_KEY = 'resizedColumn';
+export var LAST_RESIZED_COLUMN_KEY = 'lastResizedColumn';
 export function columnResize() {
   var opts = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
 
@@ -49,10 +52,10 @@ export function columnResize() {
           columnSize[code] = fallbackSize;
         }
       }
-    }); // 为了autofill时能取到最新值，实时存储一份最新的columnSize
+    }); // 实时存储一份最新的columnSize，与autoFill共用一份数据
     // 存在state里可能存到取不到最新的
 
-    pipeline.setFeatureOptions(COLUMN_RESIZE_KEY, columnSize);
+    pipeline.setFeatureOptions(COLUMN_SIZE_KEY, columnSize);
 
     var onChangeSize = function onChangeSize(nextColumnSize) {
       window.requestAnimationFrame(function () {
@@ -64,7 +67,9 @@ export function columnResize() {
     };
 
     var handleDoubleClick = function handleDoubleClick(e, col) {
-      opts === null || opts === void 0 ? void 0 : opts.doubleClickCallback(e, col);
+      var _a;
+
+      (_a = opts.doubleClickCallback) === null || _a === void 0 ? void 0 : _a.call(opts, e, col);
     };
 
     var handleMouseDown = function handleMouseDown(e, col) {
@@ -72,7 +77,14 @@ export function columnResize() {
       var changedColumnSize = {};
       var startX = e.clientX;
       var children = col.children,
-          code = col.code;
+          code = col.code,
+          _col$features = col.features,
+          features = _col$features === void 0 ? {} : _col$features;
+      var minWidth = features.minWidth,
+          maxWidth = features.maxWidth;
+      var realMinSize = typeof minWidth === 'number' ? minWidth : minSize;
+      var realMaxSize = typeof maxWidth === 'number' ? maxWidth : maxSize;
+      var columnSize = pipeline.getFeatureOptions(COLUMN_SIZE_KEY);
       var recordColumnSize = columnSize;
       e.stopPropagation();
       var nextSize$ = fromEvent(window, 'mousemove').pipe(op.takeUntil(fromEvent(window, 'mouseup')), op.map(function (e) {
@@ -95,17 +107,17 @@ export function columnResize() {
             var currentDeltaWidth = Math.round(deltaSum * startSize / childrenWidthSum);
 
             if (index < leafChildColumns.length - 1) {
-              nextColumnSize[code] = clamp(minSize, startSize + currentDeltaWidth, maxSize);
+              nextColumnSize[code] = clamp(realMinSize, startSize + currentDeltaWidth, realMaxSize);
               changedColumnSize[code] = nextColumnSize[code];
               deltaRemaining -= currentDeltaWidth;
             } else {
-              nextColumnSize[code] = clamp(minSize, startSize + deltaRemaining, maxSize);
+              nextColumnSize[code] = clamp(realMinSize, startSize + deltaRemaining, realMaxSize);
               changedColumnSize[code] = nextColumnSize[code];
             }
           });
         } else {
           var startSize = columnSize[code];
-          nextColumnSize[code] = clamp(minSize, startSize + deltaSum, maxSize);
+          nextColumnSize[code] = clamp(realMinSize, startSize + deltaSum, realMaxSize);
           changedColumnSize[code] = nextColumnSize[code];
         }
 
@@ -113,7 +125,18 @@ export function columnResize() {
         return nextColumnSize;
       }));
       nextSize$.subscribe({
-        next: onChangeSize,
+        next: function next(nextColumnSize) {
+          onChangeSize(nextColumnSize); // 由于COLUMN_RESIZE_KEY记录的是全量的列宽，此处记录被改变过的列宽
+
+          var resizedColumnSet = pipeline.getFeatureOptions(RESIZED_COLUMN_KEY) || new _Set();
+
+          _Object$keys(changedColumnSize).forEach(function (code) {
+            resizedColumnSet.add(code, changedColumnSize[code]);
+          });
+
+          pipeline.setFeatureOptions(RESIZED_COLUMN_KEY, resizedColumnSet);
+          pipeline.setFeatureOptions(LAST_RESIZED_COLUMN_KEY, code);
+        },
         complete: function complete() {
           var _context;
 

package/es/table/pipeline/pipeline.js

@@ -300,8 +300,9 @@ export function useTablePipeline(ctx) {
       state = _useState2[0],
       setState = _useState2[1];
 
-  var ref = useRef({});
-  ref.current.featureOptions = {};
+  var ref = useRef({
+    featureOptions: {}
+  });
   return new TablePipeline({
     state: state,
     setState: setState,

package/lib/table/base/table.js

@@ -443,13 +443,13 @@ var BaseTable = /*#__PURE__*/function (_React$Component) {
           last: footerDataSource.length - 1,
           limit: Infinity
         }
-      }), /*#__PURE__*/_react.default.createElement("div", {
+      }), footerDataSource.length > 0 ? /*#__PURE__*/_react.default.createElement("div", {
         className: _styles.Classes.verticalScrollPlaceholder,
         style: this.hasScrollY ? {
           width: this.getScrollBarWidth(),
           visibility: 'initial'
         } : undefined
-      }));
+      }) : null);
     }
   }, {
     key: "renderLockShadows",

package/lib/table/pipeline/features/autoFill.js

@@ -7,12 +7,20 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.tableWidthKey = exports.autoFillTableWidth = exports.FILL_COLUMN_CODE = void 0;
 
+var _symbol = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/symbol"));
+
+var _maxSafeInteger = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/number/max-safe-integer"));
+
 var _find = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/find"));
 
 var _slice = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/slice"));
 
 var _splice = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/splice"));
 
+var _map = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/map"));
+
+var _findIndex = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/find-index"));
+
 var _calculations = require("../../base/calculations");
 
 var _utils = require("../../utils");
@@ -25,65 +33,155 @@ var FILL_COLUMN_CODE = '$_fill_column_&';
 exports.FILL_COLUMN_CODE = FILL_COLUMN_CODE;
 var tableWidthKey = 'tableWidth';
 exports.tableWidthKey = tableWidthKey;
-var fillColumnWidthKey = 'fillColumnWidth';
+var FLEX_COLUMN_COUNT = (0, _symbol.default)('flexCount');
 
 var autoFillTableWidth = function autoFillTableWidth() {
   return function (pipeline) {
-    var width = pipeline.getStateAtKey(fillColumnWidthKey, 0);
-    var columns = pipeline.getColumns();
-    var fillColumns = (0, _find.default)(columns).call(columns, function (col) {
-      return col.code === FILL_COLUMN_CODE;
-    });
-
-    if (fillColumns) {
-      fillColumns.width = width;
+    var flexColumnResult = findFlexColumns(pipeline);
+    var flexCount = flexColumnResult.get(FLEX_COLUMN_COUNT);
+
+    if (flexCount) {
+      // 设置了flex宽度，flex列平分剩余宽度
+      var remainingWidth = getTableRemainingWidth(pipeline) || 0;
+
+      if (remainingWidth > 0) {
+        // 保存剩余的flex总和和剩余宽度总和宽度
+        var residualFlexCount = flexCount;
+        var residualFlexWidth = remainingWidth;
+        var columnSize = pipeline.getFeatureOptions(_columnResizeWidth.COLUMN_SIZE_KEY) || {};
+        pipeline.mapColumns((0, _utils.makeRecursiveMapper)(function (col, recursiveFlatMapInfo) {
+          var isLeaf = recursiveFlatMapInfo.isLeaf;
+
+          if (isLeaf && isValidFlexColumn(col, pipeline)) {
+            var code = col.code,
+                _col$features = col.features,
+                features = _col$features === void 0 ? {} : _col$features;
+            var flex = features.flex,
+                _features$minWidth = features.minWidth,
+                minWidth = _features$minWidth === void 0 ? 0 : _features$minWidth,
+                _features$maxWidth = features.maxWidth,
+                maxWidth = _features$maxWidth === void 0 ? _maxSafeInteger.default : _features$maxWidth;
+            var usedRemainingWidth = Math.floor(remainingWidth * flex / flexCount);
+            var preColWidth = col.width; // 如果当前已经是最后一个flex列，将剩余的宽度添加到该列，其他计算相应的列
+
+            col.width = clamp(minWidth, preColWidth + (residualFlexCount === flex ? residualFlexWidth : usedRemainingWidth), maxWidth);
+            residualFlexCount -= flex;
+            residualFlexWidth -= col.width - preColWidth;
+            columnSize[code] = col.width;
+          }
+
+          return col;
+        }));
+        pipeline.setFeatureOptions(_columnResizeWidth.COLUMN_SIZE_KEY, columnSize);
+      }
     } else {
-      var rightNestedLockCount = (0, _calculations.getLeftNestedLockCount)((0, _slice.default)(columns).call(columns).reverse());
-      var spliceIndex = columns.length - rightNestedLockCount;
-      var _fillColumns = {
-        name: '',
-        code: FILL_COLUMN_CODE,
-        width: width,
-        features: {
-          resizeable: false
-        },
-        getCellProps: function getCellProps(value, record, rowIndex) {
-          return {
-            className: _styles.Classes.emptyColCell
-          };
-        }
-      };
-      (0, _splice.default)(columns).call(columns, spliceIndex || columns.length, 0, _fillColumns);
+      // 未设置了flex宽度，创建占位列
+      var columns = pipeline.getColumns();
+      var fillColumns = (0, _find.default)(columns).call(columns, function (col) {
+        return col.code === FILL_COLUMN_CODE;
+      });
+      var width = getTableRemainingWidth(pipeline) || 0;
+
+      if (fillColumns) {
+        fillColumns.width = width;
+      } else {
+        var rightNestedLockCount = (0, _calculations.getLeftNestedLockCount)((0, _slice.default)(columns).call(columns).reverse());
+        var spliceIndex = columns.length - rightNestedLockCount;
+        var _fillColumns = {
+          name: '',
+          code: FILL_COLUMN_CODE,
+          width: width,
+          features: {
+            resizeable: false
+          },
+          getCellProps: function getCellProps(value, record, rowIndex) {
+            return {
+              className: _styles.Classes.emptyColCell
+            };
+          }
+        };
+        (0, _splice.default)(columns).call(columns, spliceIndex || columns.length, 0, _fillColumns);
+      }
+
+      pipeline.columns(columns);
     }
 
-    pipeline.columns(columns);
-    setAutoFillWidth(pipeline);
     return pipeline;
+
+    function findFlexColumns(pipeline) {
+      var result = new _map.default([[FLEX_COLUMN_COUNT, 0]]);
+      dfs(pipeline.getColumns(), result);
+      return result;
+
+      function dfs(columns, result) {
+        columns.forEach(function (col) {
+          if ((0, _utils.isLeafNode)(col)) {
+            if (isValidFlexColumn(col, pipeline)) {
+              result.set(FLEX_COLUMN_COUNT, result.get(FLEX_COLUMN_COUNT) + col.features.flex);
+            }
+          } else {
+            dfs(col.children, result);
+          }
+        });
+      }
+    }
   };
 };
 
 exports.autoFillTableWidth = autoFillTableWidth;
 
-var setAutoFillWidth = function setAutoFillWidth(pipeline) {
+function getColumnWidthSum(pipeline) {
+  return dfs(pipeline.getColumns());
+
+  function dfs(columns) {
+    return columns.reduce(function (acc, col) {
+      var width = col.width,
+          code = col.code;
+
+      if ((0, _utils.isLeafNode)(col) && code !== FILL_COLUMN_CODE) {
+        var resizeColumn = pipeline.getFeatureOptions(_columnResizeWidth.COLUMN_SIZE_KEY);
+        return acc + (resizeColumn && resizeColumn[code] || width);
+      } else {
+        return acc + dfs(col.children);
+      }
+    }, 0);
+  }
+}
+
+function getTableRemainingWidth(pipeline) {
   var tableWidth = pipeline.getStateAtKey(tableWidthKey);
   if (!tableWidth) return;
-  var columnWidthSum = 0;
-  pipeline.mapColumns((0, _utils.makeRecursiveMapper)(function (col) {
-    var width = col.width,
-        code = col.code;
-
-    if ((0, _utils.isLeafNode)(col) && code !== FILL_COLUMN_CODE) {
-      var resizeColumn = pipeline.getFeatureOptions(_columnResizeWidth.COLUMN_RESIZE_KEY);
-      columnWidthSum += resizeColumn && resizeColumn[code] || width;
-    }
+  var remainingWidth = Math.floor(tableWidth - getColumnWidthSum(pipeline));
+  return remainingWidth > 0 ? remainingWidth : 0;
+}
+
+function isAfterLastResizeCol(column, pipeline) {
+  var _context, _context2;
+
+  var lastResizedColumnCode = pipeline.getFeatureOptions(_columnResizeWidth.LAST_RESIZED_COLUMN_KEY);
+  if (lastResizedColumnCode === undefined) return true;
+  var lastResizedColumnIndex = (0, _findIndex.default)(_context = pipeline.getColumns()).call(_context, function (col) {
+    return col.code === lastResizedColumnCode;
+  });
+  var colIndex = (0, _findIndex.default)(_context2 = pipeline.getColumns()).call(_context2, function (col) {
+    return col.code === column.code;
+  });
+  return colIndex > lastResizedColumnIndex;
+}
+
+function isValidFlexColumn(col, pipeline) {
+  var _a;
+
+  var resizeColumn = pipeline.getFeatureOptions(_columnResizeWidth.RESIZED_COLUMN_KEY); // 拖拽列自动禁止flex
+
+  if (resizeColumn === null || resizeColumn === void 0 ? void 0 : resizeColumn.has(col.code)) {
+    return false;
+  }
 
-    return col;
-  }));
-  var fillColumnWidth = Math.floor(tableWidth - columnWidthSum);
-  fillColumnWidth = fillColumnWidth > 0 ? fillColumnWidth : 0;
-  var preWidth = pipeline.getStateAtKey(fillColumnWidthKey, 0);
+  var flex = (_a = col.features) === null || _a === void 0 ? void 0 : _a.flex;
+  return typeof flex === 'number' && flex > 0 && isAfterLastResizeCol(col, pipeline);
+}
 
-  if (preWidth !== fillColumnWidth) {
-    pipeline.setStateAtKey('fillColumnWidth', fillColumnWidth);
-  }
-};
+function clamp(min, x, max) {
+  return Math.max(min, Math.min(max, x));
+}

package/lib/table/pipeline/features/columnResizeWidth.d.ts

@@ -20,6 +20,8 @@ export interface ColumnResizeOptions {
     onChangeSize?(nextSize: ColumnSize): void;
     afterChangeSize?(nextSize: ColumnSize, changedColumnSize: ChangedColumnSize[]): void;
 }
-export declare const COLUMN_RESIZE_KEY = "columnResize";
+export declare const COLUMN_SIZE_KEY = "columnResize";
+export declare const RESIZED_COLUMN_KEY = "resizedColumn";
+export declare const LAST_RESIZED_COLUMN_KEY = "lastResizedColumn";
 export declare function columnResize(opts?: ColumnResizeOptions): (pipeline: TablePipeline) => TablePipeline;
 export {};