@hi-ui/table 5.0.0-experimental.3 → 5.0.0-rc.0

package/CHANGELOG.md

@@ -1,57 +1,6 @@
 # @hi-ui/table
 
-## 5.0.0-experimental.3
-
-### Patch Changes
-
-- 96aeb5a9a: fix(table): fix sorter ui bug (5.0)
-
-## 5.0.0-experimental.2
-
-### Minor Changes
-
-- 59cef699f: feat: 组件语义化样式改造，增加 styles 和 classNames 属性 (5.0)
-
-### Patch Changes
-
-- eb17c4697: style: 修复 UI/样式问题 (5.0)
-- Updated dependencies [7f204c892]
-- Updated dependencies [eb17c4697]
-- Updated dependencies [eb17c4697]
-- Updated dependencies [c407744fe]
-- Updated dependencies [ec647a5ee]
-- Updated dependencies [59cef699f]
-  - @hi-ui/icons@5.0.0-experimental.1
-  - @hi-ui/core@5.0.0-experimental.1
-  - @hi-ui/button@5.0.0-experimental.1
-  - @hi-ui/checkbox@5.0.0-experimental.1
-  - @hi-ui/drawer@5.0.0-experimental.1
-  - @hi-ui/empty-state@5.0.0-experimental.1
-  - @hi-ui/icon-button@5.0.0-experimental.1
-  - @hi-ui/loading@5.0.0-experimental.1
-  - @hi-ui/pagination@5.0.0-experimental.1
-  - @hi-ui/popper@5.0.0-experimental.1
-  - @hi-ui/radio@5.0.0-experimental.1
-  - @hi-ui/scrollbar@5.0.0-experimental.1
-  - @hi-ui/select@5.0.0-experimental.2
-  - @hi-ui/use-merge-semantic@5.0.0-experimental.0
-  - @hi-ui/spinner@5.0.0-experimental.1
-
-## 5.0.0-experimental.1
-
-### Patch Changes
-
-- dad50a380: style(table): 修改斑马纹颜色为 bgColor token (5.0)
-- 18a876ca6: style(table): 扩大排序按钮点击区域 (5.0)
-- 发布 hiui experimental 版本
-- 3d84a04aa: fix(table): 修复 stretchHeight+bordered 模式下数据为空时左右边框未显示问题 (5.0)
-- cfdc94dbc: fix(table): 计算每列 top 值优化，只有在需要 sticky 的场景下才设置该值 (5.0)
-- Updated dependencies [8f23e9322]
-- Updated dependencies [b27483796]
-- Updated dependencies
-  - @hi-ui/select@5.0.0-experimental.1
-
-## 5.0.0-experimental.0
+## 5.0.0-rc.0
 
 ### Major Changes
 
@@ -64,32 +13,34 @@
 - aebefd73e: feat(table): add onScroll api (5.0)
 - 9f4268ee3: feat(table): TableColumnItem 支持泛型 (5.0)
 - d51de8acc: feat(table): add stretchHeight api (5.0)
+- 59cef699f: feat: 组件语义化样式改造，增加 styles 和 classNames 属性 (5.0)
 
 ### Patch Changes
 
 - 4a31cea53: style: 统一调整组件 shadow (5.0)
 - 9b34d99bc: chore: 将代码中 v4 改为 v5 (5.0)
-- 1662753e0: style: fix ui bug (5.0)
 - e5964c571: style(table): 修复虚拟表格中多选列没有居中问题 (5.0)
 - d2cdb2537: fix(table): 修复在 stretchHeight 模式下，冻结列表头和单元格层级问题 (5.0)
+- dad50a380: style(table): 修改斑马纹颜色为 bgColor token (5.0)
 - 619e031ab: style(table): update hover and striped row background colors for improved visibility (5.0)
 - 76cfe571b: style(table): 修复虚拟表格下 align 设置无效问题 (5.0)
 - 8c0ee78f0: perf: 优化全局 size 配置,对于组件中没有的 size 值,取最接近的尺寸展示 (5.0)
 - 9b34d99bc: fix: 修复 5.0 UI 问题 (5.0)
+- ebd1a6e7a: fix(table): 修复 stretchHeight 模式下冻结列阴影样式问题 (5.0)
 - ea9d00628: fix(table): 修复表头分组数据为空时表头显示异常问题，当 data 为空时，使用双表格 (5.0)
-- be5a59325: style: 修改样式问题 (5.0)
 - fc7f381ff: perf(table): add cell class prefix to TbodyContent and adjust useColWidth debounce timing (5.0)
-- 71fc15e5c: style: 修改样式问题 (5.0)
 - b6a389ac1: perf(table): 优化表格列宽更新逻辑，当内容宽度没有超出时再更新列宽 (5.0)
 - 79ea480f3: feat(global-context): 增加 size api 全局配置 (5.0)
+- 18a876ca6: style(table): 扩大排序按钮点击区域 (5.0)
 - e2f69cb62: refactor(table): stretchHeight 模式不再使用双表格结构，使用 sticky 实现 (5.0)
 - 2e56529f7: styles: 主题定制功能完善&&样式变量化写法改造&&兼容 RTL (5.0)
 - eb718e940: fix: 修改组件问题 (5.0)
 - 150e813bf: fix(table): 优化 useColSorter 钩子，移除不必要的 columnsLatestRef 引用，直接使用 columns 进行排序计算 (5.0)
+- eb17c4697: style: 修复 UI/样式问题 (5.0)
+- 96aeb5a9a: fix(table): fix sorter ui bug (5.0)
 - ac15c6141: <br />
   - fix(table): 修改表格在外层是 scale 时导致列宽计算有误的问题 (5.0)
   - fix(loading): 修改 loading size 类型，移除 xs 尺寸 (5.0)
-- e2d184e74: style: 修改 UI 问题 (5.0)
 - 6ac7e8eb2: chore(table): export SettingDrawer types (5.0)
 - ded9bb6d6: <br>
   - perf(table): 优化列宽更新逻辑，当 columns 长度和 dataKey、width 发生变化时，重新计算列宽 (5.0)
@@ -99,22 +50,23 @@
   - fix(table): 标题去掉背景，头部加上边框 (5.0)
   - fix(table): 单元格间距调整 & 设置最小高度 (5.0)
   - fix(table): 不同尺寸修改 (5.0)
+- 3d84a04aa: fix(table): 修复 stretchHeight+bordered 模式下数据为空时左右边框未显示问题 (5.0)
 - 33da3144e: build: 将 package.json 中 exports 配置中的 types 配置放在最上面 (5.0)
-- 7f3abee55: style: fix ui bug (5.0)
 - 478b51050: fix(table): 修复标题过长时，列头宽度拉宽后无法缩小的问题 (5.0)
-- a0f0c9d6b: style: 修改 UI 问题 (5.0)
 - e3a854122: refactor(table): 调整列宽计算逻辑，兼容表头分组和单元格合并场景 (5.0)
+- cfdc94dbc: fix(table): 计算每列 top 值优化，只有在需要 sticky 的场景下才设置该值 (5.0)
+- 6ae564d44: fix(table): 修复 SettingDrawer 打开时会触发 onReset 问题 (5.0)
 - Updated dependencies [20aac2a2f]
-- Updated dependencies [6fb223e3a]
 - Updated dependencies [4a31cea53]
 - Updated dependencies [0f7aac2f3]
 - Updated dependencies [1e226cd66]
 - Updated dependencies [eea29eade]
 - Updated dependencies [b9989e482]
+- Updated dependencies [7f204c892]
 - Updated dependencies [6167ad50b]
-- Updated dependencies [1662753e0]
 - Updated dependencies [122d1d859]
 - Updated dependencies [f1ab51725]
+- Updated dependencies [eb17c4697]
 - Updated dependencies [cf89262c7]
 - Updated dependencies [8c0ee78f0]
 - Updated dependencies [9b34d99bc]
@@ -123,18 +75,20 @@
 - Updated dependencies [423aab762]
 - Updated dependencies [fd4c20bbd]
 - Updated dependencies [08b9d0ecf]
-- Updated dependencies [be5a59325]
-- Updated dependencies [71fc15e5c]
 - Updated dependencies [b6a389ac1]
 - Updated dependencies [f8acad4e1]
 - Updated dependencies [79ea480f3]
 - Updated dependencies [2e56529f7]
 - Updated dependencies [eb718e940]
+- Updated dependencies [3a7186e4b]
 - Updated dependencies [277c5033a]
 - Updated dependencies [4e0ed3a31]
 - Updated dependencies [95abba983]
+- Updated dependencies [8f23e9322]
 - Updated dependencies [8a92ec660]
+- Updated dependencies [b27483796]
 - Updated dependencies [1429eced2]
+- Updated dependencies [eb17c4697]
 - Updated dependencies [ac15c6141]
 - Updated dependencies [976ec929d]
 - Updated dependencies [f1ab51725]
@@ -142,57 +96,59 @@
 - Updated dependencies [de8d058dc]
 - Updated dependencies [5210770d9]
 - Updated dependencies [4006b2c8c]
+- Updated dependencies [c407744fe]
+- Updated dependencies [d91a8bb0f]
 - Updated dependencies [77d969c2e]
 - Updated dependencies [2f850ad84]
 - Updated dependencies [3457a6f7d]
 - Updated dependencies [4006b2c8c]
 - Updated dependencies [e42e2badf]
+- Updated dependencies [ec647a5ee]
 - Updated dependencies [33da3144e]
-- Updated dependencies [0a8cc07a7]
-- Updated dependencies [7f3abee55]
 - Updated dependencies [0a4e90dbd]
 - Updated dependencies [58ad82e94]
-- Updated dependencies [a0f0c9d6b]
 - Updated dependencies [4a31cea53]
+- Updated dependencies [95d930354]
 - Updated dependencies [f2be367e9]
 - Updated dependencies [1972fd16a]
+- Updated dependencies [59cef699f]
 - Updated dependencies [99801c2d1]
-- Updated dependencies [86910f5e2]
 - Updated dependencies [cb7b794d0]
 - Updated dependencies [dd60555d3]
 - Updated dependencies [f9c4afd14]
-  - @hi-ui/radio@5.0.0-experimental.0
-  - @hi-ui/pagination@5.0.0-experimental.0
-  - @hi-ui/drawer@5.0.0-experimental.0
-  - @hi-ui/loading@5.0.0-experimental.0
-  - @hi-ui/popper@5.0.0-experimental.0
-  - @hi-ui/button@5.0.0-experimental.0
-  - @hi-ui/select@5.0.0-experimental.0
-  - @hi-ui/empty-state@5.0.0-experimental.0
-  - @hi-ui/icons@5.0.0-experimental.0
-  - @hi-ui/icon-button@5.0.0-experimental.0
-  - @hi-ui/core@5.0.0-experimental.0
-  - @hi-ui/use-cache@5.0.0-experimental.0
-  - @hi-ui/use-check@5.0.0-experimental.0
-  - @hi-ui/use-check-state@5.0.0-experimental.0
-  - @hi-ui/use-drag-sorter@5.0.0-experimental.0
-  - @hi-ui/use-latest@5.0.0-experimental.0
-  - @hi-ui/use-toggle@5.0.0-experimental.0
-  - @hi-ui/use-uncontrolled-state@5.0.0-experimental.0
-  - @hi-ui/use-update-effect@5.0.0-experimental.0
-  - @hi-ui/checkbox@5.0.0-experimental.0
-  - @hi-ui/scrollbar@5.0.0-experimental.0
-  - @hi-ui/spinner@5.0.0-experimental.0
-  - @hi-ui/array-utils@5.0.0-experimental.0
-  - @hi-ui/classname@5.0.0-experimental.0
-  - @hi-ui/dom-utils@5.0.0-experimental.0
-  - @hi-ui/env@5.0.0-experimental.0
-  - @hi-ui/func-utils@5.0.0-experimental.0
-  - @hi-ui/object-utils@5.0.0-experimental.0
-  - @hi-ui/react-utils@5.0.0-experimental.0
-  - @hi-ui/times@5.0.0-experimental.0
-  - @hi-ui/tree-utils@5.0.0-experimental.0
-  - @hi-ui/type-assertion@5.0.0-experimental.0
+  - @hi-ui/radio@5.0.0-rc.0
+  - @hi-ui/drawer@5.0.0-rc.0
+  - @hi-ui/loading@5.0.0-rc.0
+  - @hi-ui/popper@5.0.0-rc.0
+  - @hi-ui/button@5.0.0-rc.0
+  - @hi-ui/select@5.0.0-rc.0
+  - @hi-ui/icons@5.0.0-rc.0
+  - @hi-ui/empty-state@5.0.0-rc.0
+  - @hi-ui/core@5.0.0-rc.0
+  - @hi-ui/pagination@5.0.0-rc.0
+  - @hi-ui/use-cache@5.0.0-rc.0
+  - @hi-ui/use-check@5.0.0-rc.0
+  - @hi-ui/use-check-state@5.0.0-rc.0
+  - @hi-ui/use-drag-sorter@5.0.0-rc.0
+  - @hi-ui/use-latest@5.0.0-rc.0
+  - @hi-ui/use-toggle@5.0.0-rc.0
+  - @hi-ui/use-uncontrolled-state@5.0.0-rc.0
+  - @hi-ui/use-update-effect@5.0.0-rc.0
+  - @hi-ui/checkbox@5.0.0-rc.0
+  - @hi-ui/icon-button@5.0.0-rc.0
+  - @hi-ui/scrollbar@5.0.0-rc.0
+  - @hi-ui/spinner@5.0.0-rc.0
+  - @hi-ui/array-utils@5.0.0-rc.0
+  - @hi-ui/classname@5.0.0-rc.0
+  - @hi-ui/dom-utils@5.0.0-rc.0
+  - @hi-ui/env@5.0.0-rc.0
+  - @hi-ui/func-utils@5.0.0-rc.0
+  - @hi-ui/object-utils@5.0.0-rc.0
+  - @hi-ui/react-utils@5.0.0-rc.0
+  - @hi-ui/times@5.0.0-rc.0
+  - @hi-ui/tree-utils@5.0.0-rc.0
+  - @hi-ui/type-assertion@5.0.0-rc.0
+  - @hi-ui/use-merge-semantic@5.0.0-rc.0
 
 ## 4.12.3
 

package/lib/cjs/BaseTable.js

@@ -46,7 +46,7 @@ var EMBED_DATA_KEY = "TABLE_EMBED_DATA_KEY_" + index.uuid();
 var DEFAULT_COLUMNS = [];
 var DEFAULT_DATA = [];
 var BaseTable = /*#__PURE__*/React.forwardRef(function (_a, ref) {
-  var _b;
+  var _b, _c, _d, _e, _f;
   var _a$prefixCls = _a.prefixCls,
     prefixCls = _a$prefixCls === void 0 ? _prefix : _a$prefixCls,
     _a$role = _a.role,
@@ -243,6 +243,14 @@ var BaseTable = /*#__PURE__*/React.forwardRef(function (_a, ref) {
   var alwaysFixedColumn = fixedColumnTrigger === 'always';
   var wrapperRef = React__default["default"].useRef(null);
   var isTableContentExceedWrapperHeight = bodyTableRef.current && wrapperRef.current && bodyTableRef.current.offsetHeight > wrapperRef.current.offsetHeight;
+  var tableHeaderHeight = 0;
+  var freezeShadowHeightStyle = null;
+  if (stretchHeight && rest.fixedToColumn) {
+    tableHeaderHeight = (_f = (_e = (_d = (_c = wrapperRef.current) === null || _c === void 0 ? void 0 : _c.querySelector("." + prefixCls + "-header")) === null || _d === void 0 ? void 0 : _d.getBoundingClientRect) === null || _e === void 0 ? void 0 : _e.call(_d).height) !== null && _f !== void 0 ? _f : 0;
+    freezeShadowHeightStyle = !isTableContentExceedWrapperHeight && bodyTableRef.current ? {
+      height: bodyTableRef.current.offsetHeight + tableHeaderHeight + "px"
+    } : null;
+  }
   var renderTable = function renderTable() {
     if (needDoubleTable) {
       var _a2 = getTableHeaderProps(),
@@ -293,14 +301,14 @@ var BaseTable = /*#__PURE__*/React.forwardRef(function (_a, ref) {
   var renderFreezeShadow = function renderFreezeShadow() {
     return /*#__PURE__*/React__default["default"].createElement(React__default["default"].Fragment, null, (alwaysFixedColumn || scrollSize.scrollLeft > 0) && leftFrozenColKeys.length > 0 ? ( /*#__PURE__*/React__default["default"].createElement("div", {
       className: classname.cx(prefixCls + "-freeze-shadow", prefixCls + "-freeze-shadow--left", classNames === null || classNames === void 0 ? void 0 : classNames.freezeShadowLeft),
-      style: Object.assign({
+      style: Object.assign(Object.assign({
         width: leftFixedColumnsWidth + 'px'
-      }, styles === null || styles === void 0 ? void 0 : styles.freezeShadowLeft)
+      }, freezeShadowHeightStyle), styles === null || styles === void 0 ? void 0 : styles.freezeShadowLeft)
     })) : null, (alwaysFixedColumn || scrollSize.scrollRight > 0) && rightFrozenColKeys.length > 0 ? ( /*#__PURE__*/React__default["default"].createElement("div", {
       className: classname.cx(prefixCls + "-freeze-shadow", prefixCls + "-freeze-shadow--right", classNames === null || classNames === void 0 ? void 0 : classNames.freezeShadowRight),
-      style: Object.assign({
+      style: Object.assign(Object.assign({
         width: rightFixedColumnsWidth + 'px'
-      }, styles === null || styles === void 0 ? void 0 : styles.freezeShadowRight)
+      }, freezeShadowHeightStyle), styles === null || styles === void 0 ? void 0 : styles.freezeShadowRight)
     })) : null);
   };
   var tableFooter = /*#__PURE__*/React__default["default"].createElement("div", {

package/lib/cjs/SettingDrawer.js

@@ -122,19 +122,22 @@ var SettingDrawer = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
   var _useUncontrolledState = useUncontrolledState.useUncontrolledState(false, visibleProp, _onClose),
     visible = _useUncontrolledState[0],
     setVisible = _useUncontrolledState[1];
-  var resetLatest = useLatest.useLatestCallback(function () {
+  var syncCacheLatest = useLatest.useLatestCallback(function () {
     setCacheHiddenColKeys(hiddenColKeys);
     setCacheSortedCols(sortedCols);
-    onReset === null || onReset === void 0 ? void 0 : onReset();
   });
-  // 当 visible 由 false 变为 true 时触发
-  var prevShowPopperRef = React.useRef(!visible);
+  // 仅在 visible 真正由 false -> true 时触发，避免首次 visible=true 误触发
+  var prevVisibleRef = React.useRef(visible);
   React.useEffect(function () {
-    if (!prevShowPopperRef.current && visible) {
-      resetLatest();
+    if (!prevVisibleRef.current && visible) {
+      syncCacheLatest();
     }
-    prevShowPopperRef.current = visible;
-  }, [visible, resetLatest]);
+    prevVisibleRef.current = visible;
+  }, [visible, syncCacheLatest]);
+  var handleReset = useLatest.useLatestCallback(function () {
+    syncCacheLatest();
+    onReset === null || onReset === void 0 ? void 0 : onReset();
+  });
   var onConfirm = function onConfirm() {
     var newSortKeys = cacheSortedCols.map(function (col) {
       return col.dataKey;
@@ -184,7 +187,7 @@ var SettingDrawer = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
     }, showCheckAll && CheckAllContent), /*#__PURE__*/React__default["default"].createElement("div", {
       className: prefixCls + "-footer__action"
     }, /*#__PURE__*/React__default["default"].createElement(button.Button, {
-      onClick: resetLatest
+      onClick: handleReset
     }, i18n.get('table.reset')), /*#__PURE__*/React__default["default"].createElement(button.Button, {
       onClick: onConfirm,
       type: "primary"

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

@@ -64,56 +64,53 @@ var useAsyncSwitch = function useAsyncSwitch(_ref) {
     addLoadingIds = _useCheckState.add,
     removeLoadingIds = _useCheckState.remove;
   var onExpandLatest = useLatest.useLatestCallback(onExpand);
-  var onNodeSwitch = React.useCallback(function (node_1) {
-    for (var _len = arguments.length, args_1 = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
-      args_1[_key - 1] = arguments[_key];
+  var onNodeSwitch = React.useCallback(function (node, onlyExpand) {
+    if (onlyExpand === void 0) {
+      onlyExpand = false;
     }
-    return tslib.__awaiter(void 0, [node_1].concat(args_1), void 0, /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee2(node, onlyExpand) {
+    return tslib.__awaiter(void 0, void 0, void 0, /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee2() {
       var id, children, isLeaf;
       return _regeneratorRuntime__default["default"].wrap(function _callee2$(_context2) {
         while (1) {
           switch (_context2.prev = _context2.next) {
             case 0:
-              if (onlyExpand === void 0) {
-                onlyExpand = false;
-              }
               // 直接触发选中该节点
               onExpandLatest(node, onlyExpand);
               id = node.id, children = node.children, isLeaf = node.isLeaf;
               if (!children) {
-                _context2.next = 5;
+                _context2.next = 4;
                 break;
               }
               return _context2.abrupt("return");
-            case 5:
+            case 4:
               if (!isLeaf) {
-                _context2.next = 7;
+                _context2.next = 6;
                 break;
               }
               return _context2.abrupt("return");
-            case 7:
+            case 6:
               if (!onLoadChildren) {
-                _context2.next = 18;
+                _context2.next = 17;
                 break;
               }
               addLoadingIds(id);
-              _context2.prev = 9;
-              _context2.next = 12;
+              _context2.prev = 8;
+              _context2.next = 11;
               return loadChildren(node);
-            case 12:
+            case 11:
               removeLoadingIds(id);
-              _context2.next = 18;
+              _context2.next = 17;
               break;
-            case 15:
-              _context2.prev = 15;
-              _context2.t0 = _context2["catch"](9);
+            case 14:
+              _context2.prev = 14;
+              _context2.t0 = _context2["catch"](8);
               removeLoadingIds(id);
-            case 18:
+            case 17:
             case "end":
               return _context2.stop();
           }
         }
-      }, _callee2, null, [[9, 15]]);
+      }, _callee2, null, [[8, 14]]);
     }));
   }, [loadChildren, onLoadChildren, onExpandLatest, addLoadingIds, removeLoadingIds]);
   var isLoadingId = function isLoadingId(id) {

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

@@ -187,6 +187,7 @@ var useColWidth = function useColWidth(_ref) {
     if (headerTableElement) {
       resizeObserver = new ResizeObserver(function () {
         var calcMinColWidths = Array.from(headerTableElement.childNodes).map(function (th, index$1) {
+          var _a;
           var _getGroupItemWidth2 = index.getGroupItemWidth(columns),
             colWidths = _getGroupItemWidth2.colWidths,
             minColWidths = _getGroupItemWidth2.minColWidths;
@@ -199,7 +200,7 @@ var useColWidth = function useColWidth(_ref) {
           var thPaddingLeft = parseFloat(window.getComputedStyle(th).getPropertyValue('padding-left'));
           var childNode = Array.from(th.childNodes)[0];
           // 计算真实标题内容宽度
-          var childNodeWidth = (childNode === null || childNode === void 0 ? void 0 : childNode.offsetWidth) + thPaddingLeft * 2;
+          var childNodeWidth = ((_a = childNode) === null || _a === void 0 ? void 0 : _a.offsetWidth) + thPaddingLeft * 2;
           // 如果设置的标题宽度小于真实内容宽度，则使用设置的宽度，否则使用真实内容宽度
           if (colWidth && colWidth < childNodeWidth) {
             return colWidth;

package/lib/cjs/node_modules/rc-resize-observer/node_modules/rc-util/es/Children/toArray.js

@@ -14,7 +14,7 @@ Object.defineProperty(exports, '__esModule', {
   value: true
 });
 var React = require('react');
-require('../../../react-is/index.js');
+require('../../../../../react-is/index.js');
 var index = require('../../../../../../_virtual/index2.js');
 function _interopDefaultCompat(e) {
   return e && _typeof(e) === 'object' && 'default' in e ? e : {

package/lib/cjs/node_modules/rc-resize-observer/node_modules/rc-util/es/ref.js

@@ -14,7 +14,7 @@ Object.defineProperty(exports, '__esModule', {
   value: true
 });
 var _typeof = require('@babel/runtime/helpers/esm/typeof');
-require('../../react-is/index.js');
+require('../../../../react-is/index.js');
 var index = require('../../../../../_virtual/index2.js');
 function _interopDefaultCompat(e) {
   return e && _typeof2(e) === 'object' && 'default' in e ? e : {

package/lib/cjs/node_modules/{rc-resize-observer/node_modules/react-is → react-is}/cjs/react-is.development.js

@@ -13,7 +13,7 @@ var _typeof = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, '__esModule', {
   value: true
 });
-var reactIs_development = require('../../../../../_virtual/react-is.development.js');
+var reactIs_development = require('../../../_virtual/react-is.development.js');
 
 /** @license React v16.13.1
  * react-is.development.js

package/lib/cjs/node_modules/{rc-resize-observer/node_modules/react-is → react-is}/cjs/react-is.production.min.js

@@ -13,7 +13,7 @@ var _typeof = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, '__esModule', {
   value: true
 });
-var reactIs_production_min = require('../../../../../_virtual/react-is.production.min.js');
+var reactIs_production_min = require('../../../_virtual/react-is.production.min.js');
 
 /** @license React v16.13.1
  * react-is.production.min.js

package/lib/cjs/node_modules/{rc-resize-observer/node_modules/react-is → react-is}/index.js

@@ -9,11 +9,11 @@
  */
 'use strict';
 
-var index = require('../../../../_virtual/index2.js');
+var index = require('../../_virtual/index2.js');
 require('./cjs/react-is.production.min.js');
 require('./cjs/react-is.development.js');
-var reactIs_production_min = require('../../../../_virtual/react-is.production.min.js');
-var reactIs_development = require('../../../../_virtual/react-is.development.js');
+var reactIs_production_min = require('../../_virtual/react-is.production.min.js');
+var reactIs_development = require('../../_virtual/react-is.development.js');
 if (process.env.NODE_ENV === 'production') {
   index.reactIs.exports = reactIs_production_min.__exports;
 } else {

package/lib/esm/BaseTable.js

@@ -33,7 +33,7 @@ var EMBED_DATA_KEY = "TABLE_EMBED_DATA_KEY_" + uuid();
 var DEFAULT_COLUMNS = [];
 var DEFAULT_DATA = [];
 var BaseTable = /*#__PURE__*/forwardRef(function (_a, ref) {
-  var _b;
+  var _b, _c, _d, _e, _f;
   var _a$prefixCls = _a.prefixCls,
     prefixCls = _a$prefixCls === void 0 ? _prefix : _a$prefixCls,
     _a$role = _a.role,
@@ -230,6 +230,14 @@ var BaseTable = /*#__PURE__*/forwardRef(function (_a, ref) {
   var alwaysFixedColumn = fixedColumnTrigger === 'always';
   var wrapperRef = React__default.useRef(null);
   var isTableContentExceedWrapperHeight = bodyTableRef.current && wrapperRef.current && bodyTableRef.current.offsetHeight > wrapperRef.current.offsetHeight;
+  var tableHeaderHeight = 0;
+  var freezeShadowHeightStyle = null;
+  if (stretchHeight && rest.fixedToColumn) {
+    tableHeaderHeight = (_f = (_e = (_d = (_c = wrapperRef.current) === null || _c === void 0 ? void 0 : _c.querySelector("." + prefixCls + "-header")) === null || _d === void 0 ? void 0 : _d.getBoundingClientRect) === null || _e === void 0 ? void 0 : _e.call(_d).height) !== null && _f !== void 0 ? _f : 0;
+    freezeShadowHeightStyle = !isTableContentExceedWrapperHeight && bodyTableRef.current ? {
+      height: bodyTableRef.current.offsetHeight + tableHeaderHeight + "px"
+    } : null;
+  }
   var renderTable = function renderTable() {
     if (needDoubleTable) {
       var _a2 = getTableHeaderProps(),
@@ -280,14 +288,14 @@ var BaseTable = /*#__PURE__*/forwardRef(function (_a, ref) {
   var renderFreezeShadow = function renderFreezeShadow() {
     return /*#__PURE__*/React__default.createElement(React__default.Fragment, null, (alwaysFixedColumn || scrollSize.scrollLeft > 0) && leftFrozenColKeys.length > 0 ? ( /*#__PURE__*/React__default.createElement("div", {
       className: cx(prefixCls + "-freeze-shadow", prefixCls + "-freeze-shadow--left", classNames === null || classNames === void 0 ? void 0 : classNames.freezeShadowLeft),
-      style: Object.assign({
+      style: Object.assign(Object.assign({
         width: leftFixedColumnsWidth + 'px'
-      }, styles === null || styles === void 0 ? void 0 : styles.freezeShadowLeft)
+      }, freezeShadowHeightStyle), styles === null || styles === void 0 ? void 0 : styles.freezeShadowLeft)
     })) : null, (alwaysFixedColumn || scrollSize.scrollRight > 0) && rightFrozenColKeys.length > 0 ? ( /*#__PURE__*/React__default.createElement("div", {
       className: cx(prefixCls + "-freeze-shadow", prefixCls + "-freeze-shadow--right", classNames === null || classNames === void 0 ? void 0 : classNames.freezeShadowRight),
-      style: Object.assign({
+      style: Object.assign(Object.assign({
         width: rightFixedColumnsWidth + 'px'
-      }, styles === null || styles === void 0 ? void 0 : styles.freezeShadowRight)
+      }, freezeShadowHeightStyle), styles === null || styles === void 0 ? void 0 : styles.freezeShadowRight)
     })) : null);
   };
   var tableFooter = /*#__PURE__*/React__default.createElement("div", {

package/lib/esm/SettingDrawer.js

@@ -109,19 +109,22 @@ var SettingDrawer = /*#__PURE__*/forwardRef(function (_ref, ref) {
   var _useUncontrolledState = useUncontrolledState(false, visibleProp, _onClose),
     visible = _useUncontrolledState[0],
     setVisible = _useUncontrolledState[1];
-  var resetLatest = useLatestCallback(function () {
+  var syncCacheLatest = useLatestCallback(function () {
     setCacheHiddenColKeys(hiddenColKeys);
     setCacheSortedCols(sortedCols);
-    onReset === null || onReset === void 0 ? void 0 : onReset();
   });
-  // 当 visible 由 false 变为 true 时触发
-  var prevShowPopperRef = useRef(!visible);
+  // 仅在 visible 真正由 false -> true 时触发，避免首次 visible=true 误触发
+  var prevVisibleRef = useRef(visible);
   useEffect(function () {
-    if (!prevShowPopperRef.current && visible) {
-      resetLatest();
+    if (!prevVisibleRef.current && visible) {
+      syncCacheLatest();
     }
-    prevShowPopperRef.current = visible;
-  }, [visible, resetLatest]);
+    prevVisibleRef.current = visible;
+  }, [visible, syncCacheLatest]);
+  var handleReset = useLatestCallback(function () {
+    syncCacheLatest();
+    onReset === null || onReset === void 0 ? void 0 : onReset();
+  });
   var onConfirm = function onConfirm() {
     var newSortKeys = cacheSortedCols.map(function (col) {
       return col.dataKey;
@@ -171,7 +174,7 @@ var SettingDrawer = /*#__PURE__*/forwardRef(function (_ref, ref) {
     }, showCheckAll && CheckAllContent), /*#__PURE__*/React__default.createElement("div", {
       className: prefixCls + "-footer__action"
     }, /*#__PURE__*/React__default.createElement(Button, {
-      onClick: resetLatest
+      onClick: handleReset
     }, i18n.get('table.reset')), /*#__PURE__*/React__default.createElement(Button, {
       onClick: onConfirm,
       type: "primary"

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

@@ -52,56 +52,53 @@ var useAsyncSwitch = function useAsyncSwitch(_ref) {
     addLoadingIds = _useCheckState.add,
     removeLoadingIds = _useCheckState.remove;
   var onExpandLatest = useLatestCallback(onExpand);
-  var onNodeSwitch = useCallback(function (node_1) {
-    for (var _len = arguments.length, args_1 = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
-      args_1[_key - 1] = arguments[_key];
+  var onNodeSwitch = useCallback(function (node, onlyExpand) {
+    if (onlyExpand === void 0) {
+      onlyExpand = false;
     }
-    return __awaiter(void 0, [node_1].concat(args_1), void 0, /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(node, onlyExpand) {
+    return __awaiter(void 0, void 0, void 0, /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
       var id, children, isLeaf;
       return _regeneratorRuntime.wrap(function _callee2$(_context2) {
         while (1) {
           switch (_context2.prev = _context2.next) {
             case 0:
-              if (onlyExpand === void 0) {
-                onlyExpand = false;
-              }
               // 直接触发选中该节点
               onExpandLatest(node, onlyExpand);
               id = node.id, children = node.children, isLeaf = node.isLeaf;
               if (!children) {
-                _context2.next = 5;
+                _context2.next = 4;
                 break;
               }
               return _context2.abrupt("return");
-            case 5:
+            case 4:
               if (!isLeaf) {
-                _context2.next = 7;
+                _context2.next = 6;
                 break;
               }
               return _context2.abrupt("return");
-            case 7:
+            case 6:
               if (!onLoadChildren) {
-                _context2.next = 18;
+                _context2.next = 17;
                 break;
               }
               addLoadingIds(id);
-              _context2.prev = 9;
-              _context2.next = 12;
+              _context2.prev = 8;
+              _context2.next = 11;
               return loadChildren(node);
-            case 12:
+            case 11:
               removeLoadingIds(id);
-              _context2.next = 18;
+              _context2.next = 17;
               break;
-            case 15:
-              _context2.prev = 15;
-              _context2.t0 = _context2["catch"](9);
+            case 14:
+              _context2.prev = 14;
+              _context2.t0 = _context2["catch"](8);
               removeLoadingIds(id);
-            case 18:
+            case 17:
             case "end":
               return _context2.stop();
           }
         }
-      }, _callee2, null, [[9, 15]]);
+      }, _callee2, null, [[8, 14]]);
     }));
   }, [loadChildren, onLoadChildren, onExpandLatest, addLoadingIds, removeLoadingIds]);
   var isLoadingId = function isLoadingId(id) {