@hi-ui/table 4.3.4 → 4.4.0-alpha.1

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @hi-ui/table
 
+## 4.4.0-alpha.0
+
+### Minor Changes
+
+- 02ef793ee: feat: add fixed and rowClassName api
+
 ## 4.3.4
 
 ### Patch Changes

package/lib/cjs/BaseTable.js

@@ -31,12 +31,12 @@ var useEmbedExpand = require('./hooks/use-embed-expand.js');
 var TheadContent = require('./TheadContent.js');
 var ColGroupContent = require('./ColGroupContent.js');
 var TbodyContent = require('./TbodyContent.js');
-function _interopDefaultLegacy(e) {
+function _interopDefaultCompat(e) {
   return e && _typeof(e) === 'object' && 'default' in e ? e : {
     'default': e
   };
 }
-var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
+var React__default = /*#__PURE__*/_interopDefaultCompat(React);
 var _role = 'table';
 var _prefix = classname.getPrefixCls('table');
 var EMBED_DATA_KEY = "TABLE_EMBED_DATA_KEY_" + index.uuid();

package/lib/cjs/ColGroupContent.js

@@ -17,12 +17,12 @@ var React = require('react');
 var classname = require('@hi-ui/classname');
 var env = require('@hi-ui/env');
 var context = require('./context.js');
-function _interopDefaultLegacy(e) {
+function _interopDefaultCompat(e) {
   return e && _typeof(e) === 'object' && 'default' in e ? e : {
     'default': e
   };
 }
-var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
+var React__default = /*#__PURE__*/_interopDefaultCompat(React);
 var _prefix = classname.getPrefixCls('table-colgroup');
 var ColGroupContent = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
   var _ref$prefixCls = _ref.prefixCls,

package/lib/cjs/SettingDrawer.js

@@ -23,20 +23,21 @@ var useLatest = require('@hi-ui/use-latest');
 var core = require('@hi-ui/core');
 var funcUtils = require('@hi-ui/func-utils');
 var useDragSorter = require('@hi-ui/use-drag-sorter');
+var typeAssertion = require('@hi-ui/type-assertion');
 var useUncontrolledState = require('@hi-ui/use-uncontrolled-state');
-var useColSorter = require('./hooks/use-col-sorter.js');
-var useColHidden = require('./hooks/use-col-hidden.js');
 var drawer = require('@hi-ui/drawer');
 var button = require('@hi-ui/button');
 var Checkbox = require('@hi-ui/checkbox');
 var useColSet = require('./hooks/use-col-set.js');
-function _interopDefaultLegacy(e) {
+var useColSorter = require('./hooks/use-col-sorter.js');
+var useColHidden = require('./hooks/use-col-hidden.js');
+function _interopDefaultCompat(e) {
   return e && _typeof(e) === 'object' && 'default' in e ? e : {
     'default': e
   };
 }
-var _regeneratorRuntime__default = /*#__PURE__*/_interopDefaultLegacy(_regeneratorRuntime);
-var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
+var _regeneratorRuntime__default = /*#__PURE__*/_interopDefaultCompat(_regeneratorRuntime);
+var React__default = /*#__PURE__*/_interopDefaultCompat(React);
 var _prefix = classname.getPrefixCls('setting');
 /**
  * 设置抽屉
@@ -54,10 +55,18 @@ var SettingDrawer = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
     sortedColKeysPropBeforeVerify = _ref.sortedColKeys,
     onSortedColKeysChange = _ref.onSortedColKeysChange,
     onSetColKeysChange = _ref.onSetColKeysChange,
+    cacheHiddenColKeysProp = _ref.cacheHiddenColKeys,
+    onCacheHiddenColKeysChange = _ref.onCacheHiddenColKeysChange,
     _ref$checkDisabledCol = _ref.checkDisabledColKeys,
     checkDisabledColKeys = _ref$checkDisabledCol === void 0 ? [] : _ref$checkDisabledCol,
+    extraHeader = _ref.extraHeader,
+    extraFooter = _ref.extraFooter,
+    itemRender = _ref.itemRender,
     drawerProps = _ref.drawerProps;
   var i18n = core.useLocaleContext();
+  var _useUncontrolledState = useUncontrolledState.useUncontrolledState(hiddenColKeysPropBeforeVerify !== null && hiddenColKeysPropBeforeVerify !== void 0 ? hiddenColKeysPropBeforeVerify : [], cacheHiddenColKeysProp, onCacheHiddenColKeysChange),
+    cacheHiddenColKeys = _useUncontrolledState[0],
+    setCacheHiddenColKeys = _useUncontrolledState[1];
   // 根据列字段合并 sortedColKeys、hiddenColKeys
   var _useColSet = useColSet.useColSet({
       columns: columnsProp,
@@ -84,9 +93,7 @@ var SettingDrawer = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
       onHiddenColKeysChange: onHiddenColKeysChange
     }),
     hiddenColKeys = _useColHidden.hiddenColKeys,
-    setHiddenColKeys = _useColHidden.setHiddenColKeys,
-    cacheHiddenColKeys = _useColHidden.cacheHiddenColKeys,
-    setCacheHiddenColKeys = _useColHidden.setCacheHiddenColKeys;
+    setHiddenColKeys = _useColHidden.setHiddenColKeys;
   var dropProps = useDragSorter.useDrop({
     draggable: true,
     idFieldName: 'dataKey',
@@ -113,9 +120,9 @@ var SettingDrawer = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
       }));
     }
   });
-  var _useUncontrolledState = useUncontrolledState.useUncontrolledState(false, visibleProp, _onClose),
-    visible = _useUncontrolledState[0],
-    setVisible = _useUncontrolledState[1];
+  var _useUncontrolledState2 = useUncontrolledState.useUncontrolledState(false, visibleProp, _onClose),
+    visible = _useUncontrolledState2[0],
+    setVisible = _useUncontrolledState2[1];
   var resetLatest = useLatest.useLatestCallback(function () {
     setCacheHiddenColKeys(hiddenColKeys);
     setCacheSortedCols(sortedCols);
@@ -152,25 +159,26 @@ var SettingDrawer = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
     },
     width: 304,
     footer: /*#__PURE__*/React__default["default"].createElement("div", {
-      className: prefixCls + "__btn-group"
+      className: prefixCls + "-footer"
+    }, /*#__PURE__*/React__default["default"].createElement("div", {
+      className: prefixCls + "-footer__extra"
+    }, extraFooter), /*#__PURE__*/React__default["default"].createElement("div", {
+      className: prefixCls + "-footer__action"
     }, /*#__PURE__*/React__default["default"].createElement(button.Button, {
-      key: 0,
-      className: prefixCls + "__btn-cancel",
       onClick: resetLatest
     }, i18n.get('table.reset')), /*#__PURE__*/React__default["default"].createElement(button.Button, {
-      key: 1,
-      className: prefixCls + "__btn-confirm",
       onClick: onConfirm,
       type: "primary"
-    }, i18n.get('table.confirm')))
+    }, i18n.get('table.confirm'))))
   }, drawerProps), /*#__PURE__*/React__default["default"].createElement("div", {
     className: prefixCls + "__content"
-  }, cacheSortedCols.map(function (col, index) {
+  }, extraHeader, cacheSortedCols.map(function (col, index) {
     return /*#__PURE__*/React__default["default"].createElement(SettingItem, {
       key: col.dataKey,
       prefixCls: prefixCls,
       column: col,
       index: index,
+      render: itemRender,
       dropProps: dropProps,
       cacheHiddenColKeys: cacheHiddenColKeys,
       setCacheHiddenColKeys: setCacheHiddenColKeys,
@@ -188,7 +196,8 @@ function SettingItem(_ref2) {
     setCacheHiddenColKeys = _ref2.setCacheHiddenColKeys,
     dropProps = _ref2.dropProps,
     index = _ref2.index,
-    checkDisabled = _ref2.checkDisabled;
+    checkDisabled = _ref2.checkDisabled,
+    render = _ref2.render;
   var dataKey = column.dataKey,
     title = column.title;
   var _useDrag = useDragSorter.useDrag(Object.assign(Object.assign({}, dropProps), {
@@ -215,6 +224,6 @@ function SettingItem(_ref2) {
       }) : cacheHiddenColKeys.concat(dataKey);
       setCacheHiddenColKeys(nextCacheHiddenColKeys);
     }
-  }, /*#__PURE__*/React__default["default"].createElement("span", null, funcUtils.runIfFunc(title))), /*#__PURE__*/React__default["default"].createElement(icons.MoveOutlined, null)));
+  }, /*#__PURE__*/React__default["default"].createElement("span", null, typeAssertion.isFunction(render) ? render(column) : funcUtils.runIfFunc(title))), /*#__PURE__*/React__default["default"].createElement(icons.MoveOutlined, null)));
 }
 exports.SettingDrawer = SettingDrawer;

package/lib/cjs/Table.js

@@ -31,15 +31,15 @@ var treeUtils = require('@hi-ui/tree-utils');
 var BaseTable = require('./BaseTable.js');
 var index = require('./utils/index.js');
 var useColSet = require('./hooks/use-col-set.js');
-function _interopDefaultLegacy(e) {
+function _interopDefaultCompat(e) {
   return e && _typeof(e) === 'object' && 'default' in e ? e : {
     'default': e
   };
 }
-var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
-var Pagination__default = /*#__PURE__*/_interopDefaultLegacy(Pagination);
-var Loading__default = /*#__PURE__*/_interopDefaultLegacy(Loading);
-var Checkbox__default = /*#__PURE__*/_interopDefaultLegacy(Checkbox);
+var React__default = /*#__PURE__*/_interopDefaultCompat(React);
+var Pagination__default = /*#__PURE__*/_interopDefaultCompat(Pagination);
+var Loading__default = /*#__PURE__*/_interopDefaultCompat(Loading);
+var Checkbox__default = /*#__PURE__*/_interopDefaultCompat(Checkbox);
 var _prefix = classname.getPrefixCls('table');
 /**
  * 需要使用双表格的场景对应的 API
@@ -258,6 +258,8 @@ var Table = /*#__PURE__*/React.forwardRef(function (_a, ref) {
     var selectionColumn = {
       dataKey: SELECTION_DATA_KEY,
       width: checkboxColWidth,
+      // selectionColumn 宽度固定，防止自动被拉伸
+      fixed: true,
       className: prefixCls + "__selection-col",
       title: renderSelectionTitleCell,
       // @ts-ignore

package/lib/cjs/TableAdvancedFilter.js

@@ -22,14 +22,14 @@ var icons = require('@hi-ui/icons');
 var Popper = require('@hi-ui/popper');
 var useToggle = require('@hi-ui/use-toggle');
 var typeAssertion = require('@hi-ui/type-assertion');
-function _interopDefaultLegacy(e) {
+function _interopDefaultCompat(e) {
   return e && _typeof(e) === 'object' && 'default' in e ? e : {
     'default': e
   };
 }
-var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
-var Select__default = /*#__PURE__*/_interopDefaultLegacy(Select);
-var Popper__default = /*#__PURE__*/_interopDefaultLegacy(Popper);
+var React__default = /*#__PURE__*/_interopDefaultCompat(React);
+var Select__default = /*#__PURE__*/_interopDefaultCompat(Select);
+var Popper__default = /*#__PURE__*/_interopDefaultCompat(Popper);
 var renderFilter = function renderFilter(_ref) {
   var prefixCls = _ref.prefixCls,
     column = _ref.column,

package/lib/cjs/TableBody.js

@@ -19,18 +19,18 @@ var classname = require('@hi-ui/classname');
 var env = require('@hi-ui/env');
 var useLatest = require('@hi-ui/use-latest');
 var typeAssertion = require('@hi-ui/type-assertion');
-require('./packages/ui/scrollbar/lib/esm/styles/index.scss.js');
-var Scrollbar = require('./packages/ui/scrollbar/lib/esm/Scrollbar.js');
+var Scrollbar = require('@hi-ui/scrollbar');
 var TableRow = require('./TableRow.js');
 var context = require('./context.js');
 var ColGroupContent = require('./ColGroupContent.js');
 var TbodyContent = require('./TbodyContent.js');
-function _interopDefaultLegacy(e) {
+function _interopDefaultCompat(e) {
   return e && _typeof(e) === 'object' && 'default' in e ? e : {
     'default': e
   };
 }
-var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
+var React__default = /*#__PURE__*/_interopDefaultCompat(React);
+var Scrollbar__default = /*#__PURE__*/_interopDefaultCompat(Scrollbar);
 var _role = 'table';
 var _prefix = classname.getPrefixCls(_role);
 var TableBody = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
@@ -158,7 +158,7 @@ var TableBody = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
     }
   };
   // 外层增加 div 作为滚动容器
-  return !scrollbar ? ( /*#__PURE__*/React__default["default"].createElement("div", Object.assign({}, scrollBodyProps), bodyContent)) : ( /*#__PURE__*/React__default["default"].createElement(Scrollbar.Scrollbar, Object.assign({}, scrollBodyProps, typeAssertion.isObject(scrollbar) ? scrollbar : null), bodyContent));
+  return !scrollbar ? ( /*#__PURE__*/React__default["default"].createElement("div", Object.assign({}, scrollBodyProps), bodyContent)) : ( /*#__PURE__*/React__default["default"].createElement(Scrollbar__default["default"], Object.assign({}, scrollBodyProps, typeAssertion.isObject(scrollbar) ? scrollbar : null), bodyContent));
 });
 if (env.__DEV__) {
   TableBody.displayName = 'TableBody';

package/lib/cjs/TableCell.js

@@ -22,12 +22,12 @@ var iconButton = require('@hi-ui/icon-button');
 var context = require('./context.js');
 var index = require('./icons/index.js');
 var BaseTable = require('./BaseTable.js');
-function _interopDefaultLegacy(e) {
+function _interopDefaultCompat(e) {
   return e && _typeof(e) === 'object' && 'default' in e ? e : {
     'default': e
   };
 }
-var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
+var React__default = /*#__PURE__*/_interopDefaultCompat(React);
 var _prefix = classname.getPrefixCls('table-cell');
 /**
  * 表格 body 单元格渲染

package/lib/cjs/TableColumnMenu.js

@@ -22,13 +22,13 @@ var Popper = require('@hi-ui/popper');
 var useToggle = require('@hi-ui/use-toggle');
 var context = require('./context.js');
 var core = require('@hi-ui/core');
-function _interopDefaultLegacy(e) {
+function _interopDefaultCompat(e) {
   return e && _typeof(e) === 'object' && 'default' in e ? e : {
     'default': e
   };
 }
-var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
-var Popper__default = /*#__PURE__*/_interopDefaultLegacy(Popper);
+var React__default = /*#__PURE__*/_interopDefaultCompat(React);
+var Popper__default = /*#__PURE__*/_interopDefaultCompat(Popper);
 var _prefix = classname.getPrefixCls('table-column-menu');
 /**
  * 表头每列下拉式菜单，包含冻结、高亮、递增、递减操作

package/lib/cjs/TableEmbedRow.js

@@ -18,13 +18,13 @@ var classname = require('@hi-ui/classname');
 var env = require('@hi-ui/env');
 var context = require('./context.js');
 var Loading = require('@hi-ui/loading');
-function _interopDefaultLegacy(e) {
+function _interopDefaultCompat(e) {
   return e && _typeof(e) === 'object' && 'default' in e ? e : {
     'default': e
   };
 }
-var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
-var Loading__default = /*#__PURE__*/_interopDefaultLegacy(Loading);
+var React__default = /*#__PURE__*/_interopDefaultCompat(React);
+var Loading__default = /*#__PURE__*/_interopDefaultCompat(Loading);
 var _prefix = classname.getPrefixCls('table-embed-row');
 /**
  *  可展开的内嵌面板

package/lib/cjs/TableHeader.js

@@ -19,12 +19,12 @@ var env = require('@hi-ui/env');
 var context = require('./context.js');
 var ColGroupContent = require('./ColGroupContent.js');
 var TheadContent = require('./TheadContent.js');
-function _interopDefaultLegacy(e) {
+function _interopDefaultCompat(e) {
   return e && _typeof(e) === 'object' && 'default' in e ? e : {
     'default': e
   };
 }
-var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
+var React__default = /*#__PURE__*/_interopDefaultCompat(React);
 var _prefix = classname.getPrefixCls('table-header');
 var TableHeader = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
   var _ref$prefixCls = _ref.prefixCls,

package/lib/cjs/TableRow.js

@@ -24,18 +24,19 @@ var domUtils = require('@hi-ui/dom-utils');
 var Table = require('./Table.js');
 var BaseTable = require('./BaseTable.js');
 var typeAssertion = require('@hi-ui/type-assertion');
-function _interopDefaultLegacy(e) {
+function _interopDefaultCompat(e) {
   return e && _typeof(e) === 'object' && 'default' in e ? e : {
     'default': e
   };
 }
-var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
+var React__default = /*#__PURE__*/_interopDefaultCompat(React);
 var _role = 'table';
 var _prefix = classname.getPrefixCls(_role);
 var EMBED_ON_ROW_PROPS = {};
 var TableRow = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
   var _ref$prefixCls = _ref.prefixCls,
     prefixCls = _ref$prefixCls === void 0 ? _prefix : _ref$prefixCls,
+    className = _ref.className,
     rowDataProp = _ref.rowData,
     rowIndex = _ref.rowIndex,
     expandedTree = _ref.expandedTree,
@@ -58,7 +59,8 @@ var TableRow = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
     dragRowRef = _useTableContext.dragRowRef,
     onRow = _useTableContext.onRow,
     colWidths = _useTableContext.colWidths,
-    virtual = _useTableContext.virtual;
+    virtual = _useTableContext.virtual,
+    cellClassName = _useTableContext.cellClassName;
   var rowData = rowDataProp.raw,
     rowId = rowDataProp.id;
   // ** ************** 拖拽管理 *************** *//
@@ -144,7 +146,7 @@ var TableRow = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
   // ** ************** 行状态管理 *************** *//
   var highlighted = isHighlightedRow(rowId);
   var hasError = isErrorRow(rowId);
-  var cls = classname.cx(prefixCls + "-row", showRowHighlight && prefixCls + "-row--hover", striped && (rowIndex & 1) === 1 && prefixCls + "-row--striped", hasError && prefixCls + "-row--error", highlighted && prefixCls + "-row--highlight", draggable && prefixCls + "-row--draggable", draggable && dragging && prefixCls + "-row--dragging", draggable && dragDirection && prefixCls + "-row--drag-" + dragDirection, isSumRow && prefixCls + "-row--total", isAvgRow && prefixCls + "-row--avg", virtual && prefixCls + "-row--virtual");
+  var cls = classname.cx(prefixCls + "-row", showRowHighlight && prefixCls + "-row--hover", striped && (rowIndex & 1) === 1 && prefixCls + "-row--striped", hasError && prefixCls + "-row--error", highlighted && prefixCls + "-row--highlight", draggable && prefixCls + "-row--draggable", draggable && dragging && prefixCls + "-row--dragging", draggable && dragDirection && prefixCls + "-row--drag-" + dragDirection, isSumRow && prefixCls + "-row--total", isAvgRow && prefixCls + "-row--avg", virtual && prefixCls + "-row--virtual", className);
   var firstColumn = flattedColumnsWithoutChildren.find(function (item) {
     return item.dataKey !== Table.SELECTION_DATA_KEY && item.dataKey !== BaseTable.EMBED_DATA_KEY;
   });
@@ -203,6 +205,7 @@ var TableRow = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
   }), flattedColumnsWithoutChildren.map(function (column, idx) {
     return /*#__PURE__*/React__default["default"].createElement(TableCell.TableCell, {
       key: idx,
+      className: cellClassName === null || cellClassName === void 0 ? void 0 : cellClassName(rowDataProp, column, idx),
       column: column,
       isSwitcherCol: firstColumn ? firstColumn.id === column.id : false,
       rowData: rowDataProp,

package/lib/cjs/TableSettingMenu.js

@@ -28,13 +28,13 @@ var useDragSorter = require('@hi-ui/use-drag-sorter');
 var drawer = require('@hi-ui/drawer');
 var button = require('@hi-ui/button');
 var Checkbox = require('@hi-ui/checkbox');
-function _interopDefaultLegacy(e) {
+function _interopDefaultCompat(e) {
   return e && _typeof(e) === 'object' && 'default' in e ? e : {
     'default': e
   };
 }
-var _regeneratorRuntime__default = /*#__PURE__*/_interopDefaultLegacy(_regeneratorRuntime);
-var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
+var _regeneratorRuntime__default = /*#__PURE__*/_interopDefaultCompat(_regeneratorRuntime);
+var React__default = /*#__PURE__*/_interopDefaultCompat(React);
 var _prefix = classname.getPrefixCls('table-setting');
 /**
  * 表头右侧高级设置菜单（抽屉式）

package/lib/cjs/TbodyContent.js

@@ -21,12 +21,12 @@ var typeAssertion = require('@hi-ui/type-assertion');
 var emptyState = require('@hi-ui/empty-state');
 var TableRow = require('./TableRow.js');
 var context = require('./context.js');
-function _interopDefaultLegacy(e) {
+function _interopDefaultCompat(e) {
   return e && _typeof(e) === 'object' && 'default' in e ? e : {
     'default': e
   };
 }
-var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
+var React__default = /*#__PURE__*/_interopDefaultCompat(React);
 var _prefix = classname.getPrefixCls('table-body');
 var TbodyContent = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
   var _ref$prefixCls = _ref.prefixCls,
@@ -41,7 +41,8 @@ var TbodyContent = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
     avgRow = _useTableContext.avgRow,
     hasSumColumn = _useTableContext.hasSumColumn,
     sumRow = _useTableContext.sumRow,
-    measureRowElementRef = _useTableContext.measureRowElementRef;
+    measureRowElementRef = _useTableContext.measureRowElementRef,
+    rowClassName = _useTableContext.rowClassName;
   var getRequiredProps = useLatest.useLatestCallback(function (id) {
     return {
       // @ts-ignore
@@ -59,6 +60,7 @@ var TbodyContent = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
       ref: index === 0 ? measureRowElementRef : null,
       // key={depth + index}
       key: row.id,
+      className: rowClassName === null || rowClassName === void 0 ? void 0 : rowClassName(row, index),
       // @ts-ignore
       rowIndex: index,
       rowData: row

package/lib/cjs/TheadContent.js

@@ -22,12 +22,12 @@ var typeAssertion = require('@hi-ui/type-assertion');
 var useCheckState = require('@hi-ui/use-check-state');
 var context = require('./context.js');
 var TableAdvancedFilter = require('./TableAdvancedFilter.js');
-function _interopDefaultLegacy(e) {
+function _interopDefaultCompat(e) {
   return e && _typeof(e) === 'object' && 'default' in e ? e : {
     'default': e
   };
 }
-var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
+var React__default = /*#__PURE__*/_interopDefaultCompat(React);
 var _prefix = classname.getPrefixCls('table-header');
 var TheadContent = /*#__PURE__*/React.forwardRef(function (_a, ref) {
   var _a$prefixCls = _a.prefixCls,

package/lib/cjs/hooks/use-async-switch.js

@@ -19,12 +19,12 @@ var React = require('react');
 var useLatest = require('@hi-ui/use-latest');
 var treeUtils = require('@hi-ui/tree-utils');
 var useCheckState = require('@hi-ui/use-check-state');
-function _interopDefaultLegacy(e) {
+function _interopDefaultCompat(e) {
   return e && _typeof(e) === 'object' && 'default' in e ? e : {
     'default': e
   };
 }
-var _regeneratorRuntime__default = /*#__PURE__*/_interopDefaultLegacy(_regeneratorRuntime);
+var _regeneratorRuntime__default = /*#__PURE__*/_interopDefaultCompat(_regeneratorRuntime);
 var useAsyncSwitch = function useAsyncSwitch(_ref) {
   var setCascaderData = _ref.setCascaderData,
     onExpand = _ref.onExpand,

package/lib/cjs/hooks/use-check.js

@@ -16,12 +16,12 @@ Object.defineProperty(exports, '__esModule', {
 var useCheck = require('@hi-ui/use-check');
 var React = require('react');
 var useUncontrolledState = require('@hi-ui/use-uncontrolled-state');
-function _interopDefaultLegacy(e) {
+function _interopDefaultCompat(e) {
   return e && _typeof(e) === 'object' && 'default' in e ? e : {
     'default': e
   };
 }
-var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
+var React__default = /*#__PURE__*/_interopDefaultCompat(React);
 var DEFAULT_CHECKED_ROW_KEYS = [];
 var useTableCheck = function useTableCheck(_ref) {
   var rowSelection = _ref.rowSelection,

package/lib/cjs/hooks/use-col-width.js

@@ -16,17 +16,19 @@ Object.defineProperty(exports, '__esModule', {
 var React = require('react');
 var index = require('../utils/index.js');
 var useUpdateEffect = require('@hi-ui/use-update-effect');
-function _interopDefaultLegacy(e) {
+function _interopDefaultCompat(e) {
   return e && _typeof(e) === 'object' && 'default' in e ? e : {
     'default': e
   };
 }
-var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
+var React__default = /*#__PURE__*/_interopDefaultCompat(React);
 var useColWidth = function useColWidth(_ref) {
   var resizable = _ref.resizable,
     columns = _ref.columns,
     virtual = _ref.virtual;
   var measureRowElementRef = React__default["default"].useRef(null);
+  // 是否重新设置过表格每列宽度
+  var hasResetWidths = React__default["default"].useRef(false);
   var _React$useState = React__default["default"].useState(function () {
       return index.getGroupItemWidth(columns);
     }),
@@ -59,7 +61,7 @@ var useColWidth = function useColWidth(_ref) {
   }, [columns]);
   useUpdateEffect.useUpdateEffect(function () {
     if (virtual) {
-      // 虚拟滚动的计算需要根据容器来做分配，不能使用没有witdh默认设置为0的方式来做表格平均分配
+      // 虚拟滚动的计算需要根据容器来做分配，不能使用没有width默认设置为0的方式来做表格平均分配
       setColWidths(getVirtualWidths());
     }
   }, [getVirtualWidths, virtual]);
@@ -75,24 +77,51 @@ var useColWidth = function useColWidth(_ref) {
       var _resizeObserver = new ResizeObserver(function () {
         if (virtual) {
           setColWidths(getVirtualWidths());
+        } else {
+          // 当第一行有内容时并且没有重新设置列宽时，在去设置列宽
+          // todo 临时方案：hasResetWidths.current 作用是防止某些浏览器下，下面逻辑死循环
+          if ((measureRowElement === null || measureRowElement === void 0 ? void 0 : measureRowElement.childNodes) && hasResetWidths.current === false) {
+            hasResetWidths.current = true;
+            // 超出的宽度，真实的表格宽度超出的每列总和的宽度
+            var exceedWidth = 0;
+            var _realColumnsWidth = Array.from(measureRowElement.childNodes).map(function (node, index) {
+              var _a;
+              var realWidth = node.getBoundingClientRect().width || 0;
+              var _ref2 = (_a = columns[index]) !== null && _a !== void 0 ? _a : {},
+                width = _ref2.width,
+                fixed = _ref2.fixed;
+              // 如果该列设置了 fixed 并且真实宽度大于设置的 width 则设置为 width
+              if (fixed && width && width < realWidth) {
+                exceedWidth += realWidth - width;
+                return width;
+              }
+              return realWidth;
+            });
+            // 如果有多余的宽度，则将多余的宽度平分到没有设置 maxWidth 的列上
+            if (exceedWidth > 0) {
+              var noFixedColumns = columns.filter(function (item) {
+                return !item.fixed;
+              });
+              _realColumnsWidth.map(function (item, index) {
+                if (!columns[index].fixed) {
+                  return item + Math.floor(exceedWidth / noFixedColumns.length);
+                }
+                return item;
+              });
+            }
+            if (_realColumnsWidth.some(function (width) {
+              return width && width > 0;
+            })) {
+              setColWidths(_realColumnsWidth);
+            }
+          }
         }
-        // else {
-        //   if (measureRowElement.childNodes) {
-        //     const _realColumnsWidth = Array.from(measureRowElement.childNodes).map((node) => {
-        //       return (node as HTMLElement).getBoundingClientRect().width || 0
-        //     })
-        //     if (_realColumnsWidth.some((width) => width && width > 0)) {
-        //       setColWidths(_realColumnsWidth)
-        //     }
-        //   }
-        // }
       });
-
       _resizeObserver.observe(measureRowElement);
     }
     return function () {};
     // 测量元素在内容列为空时会是空，切换会使测量元素变化，导致后续的resize时间无法响应,此处测量元素变化时需要重新绑定
-  }, [getVirtualWidths, virtual]);
+  }, [columns, getVirtualWidths, virtual]);
   var _React$useState2 = React__default["default"].useState(null),
     headerTableElement = _React$useState2[0],
     setHeaderTableElement = _React$useState2[1];
@@ -118,8 +147,8 @@ var useColWidth = function useColWidth(_ref) {
   /**
    * 列宽拖拽 resize，只处理拖拽线两边的列宽度
    */
-  var onColumnResizable = React__default["default"].useCallback(function (_, _ref2, index) {
-    var size = _ref2.size;
+  var onColumnResizable = React__default["default"].useCallback(function (_, _ref3, index) {
+    var size = _ref3.size;
     var minWidth = minColWidth[index];
     var anotherMinWidth = minColWidth[index + 1];
     var nextWidth = size.width > minWidth ? size.width : minWidth;

package/lib/cjs/hooks/use-colgroup.js

@@ -16,12 +16,12 @@ Object.defineProperty(exports, '__esModule', {
 var React = require('react');
 var treeUtils = require('@hi-ui/tree-utils');
 var typeAssertion = require('@hi-ui/type-assertion');
-function _interopDefaultLegacy(e) {
+function _interopDefaultCompat(e) {
   return e && _typeof(e) === 'object' && 'default' in e ? e : {
     'default': e
   };
 }
-var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
+var React__default = /*#__PURE__*/_interopDefaultCompat(React);
 var useColumns = function useColumns(_ref) {
   var columns = _ref.columns;
   // 拉平后的数据

package/lib/cjs/hooks/use-drag.js

@@ -17,12 +17,12 @@ var React = require('react');
 var useLatest = require('@hi-ui/use-latest');
 var treeUtils = require('@hi-ui/tree-utils');
 var typeAssertion = require('@hi-ui/type-assertion');
-function _interopDefaultLegacy(e) {
+function _interopDefaultCompat(e) {
   return e && _typeof(e) === 'object' && 'default' in e ? e : {
     'default': e
   };
 }
-var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
+var React__default = /*#__PURE__*/_interopDefaultCompat(React);
 var useTableDrag = function useTableDrag(_ref) {
   var cacheData = _ref.cacheData,
     setCacheData = _ref.setCacheData,

package/lib/cjs/hooks/use-embed-expand.js

@@ -20,13 +20,13 @@ var typeAssertion = require('@hi-ui/type-assertion');
 var useUncontrolledState = require('@hi-ui/use-uncontrolled-state');
 var useCheck = require('@hi-ui/use-check');
 var useCheckState = require('@hi-ui/use-check-state');
-function _interopDefaultLegacy(e) {
+function _interopDefaultCompat(e) {
   return e && _typeof(e) === 'object' && 'default' in e ? e : {
     'default': e
   };
 }
-var _regeneratorRuntime__default = /*#__PURE__*/_interopDefaultLegacy(_regeneratorRuntime);
-var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
+var _regeneratorRuntime__default = /*#__PURE__*/_interopDefaultCompat(_regeneratorRuntime);
+var React__default = /*#__PURE__*/_interopDefaultCompat(React);
 var DEFAULT_EXPAND_EMBED_ROW_KEYS = [];
 /**
  * 行内嵌面板展开

package/lib/cjs/hooks/use-pagination.js

@@ -17,13 +17,13 @@ var React = require('react');
 var useUncontrolledState = require('@hi-ui/use-uncontrolled-state');
 var useLatest = require('@hi-ui/use-latest');
 var axios = require('axios');
-function _interopDefaultLegacy(e) {
+function _interopDefaultCompat(e) {
   return e && _typeof(e) === 'object' && 'default' in e ? e : {
     'default': e
   };
 }
-var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
-var axios__default = /*#__PURE__*/_interopDefaultLegacy(axios);
+var React__default = /*#__PURE__*/_interopDefaultCompat(React);
+var axios__default = /*#__PURE__*/_interopDefaultCompat(axios);
 var useTablePagination = function useTablePagination(_ref) {
   var pagination = _ref.pagination,
     loadingProp = _ref.loadingProp,