@hi-ui/table 5.0.0-canary.3 → 5.0.0-canary.30

package/CHANGELOG.md

@@ -1,5 +1,373 @@
 # @hi-ui/table
 
+## 5.0.0-canary.30
+
+### Patch Changes
+
+- dad50a380: style(table): 修改斑马纹颜色为 bgColor token (5.0)
+- 18a876ca6: style(table): 扩大排序按钮点击区域 (5.0)
+- cfdc94dbc: fix(table): 计算每列 top 值优化，只有在需要 sticky 的场景下才设置该值 (5.0)
+- Updated dependencies [8f23e9322]
+- Updated dependencies [b27483796]
+  - @hi-ui/select@5.0.0-canary.16
+
+## 5.0.0-canary.29
+
+### Patch Changes
+
+- 3d84a04aa: fix(table): 修复 stretchHeight+bordered 模式下数据为空时左右边框未显示问题 (5.0)
+
+## 5.0.0-canary.28
+
+### Minor Changes
+
+- df301c0dc: feat(table): 普通表格支持 scrollTo 方法 (5.0)
+- aebefd73e: feat(table): add onScroll api (5.0)
+
+### Patch Changes
+
+- e5964c571: style(table): 修复虚拟表格中多选列没有居中问题 (5.0)
+- 76cfe571b: style(table): 修复虚拟表格下 align 设置无效问题 (5.0)
+
+## 5.0.0-canary.27
+
+### Patch Changes
+
+- ad4a6d87b: style(table): update hover and striped row background colors for improved visibility (5.0)
+- 0a7a9e236: perf(table): add cell class prefix to TbodyContent and adjust useColWidth debounce timing (5.0)
+
+## 5.0.0-canary.26
+
+### Patch Changes
+
+- 56c9f5a2b: fix(table): 修复在 stretchHeight 模式下，冻结列表头和单元格层级问题 (5.0)
+- 50a17ebf2: fix(table): 修复表头分组数据为空时表头显示异常问题，当 data 为空时，使用双表格 (5.0)
+- f95f06844: fix(table): 修复标题过长时，列头宽度拉宽后无法缩小的问题 (5.0)
+- 14fa87a0f: refactor(table): 调整列宽计算逻辑，兼容表头分组和单元格合并场景 (5.0)
+
+## 5.0.0-canary.25
+
+### Patch Changes
+
+- d5092f349: refactor(table): stretchHeight 模式不再使用双表格结构，使用 sticky 实现 (5.0)
+- Updated dependencies [c6c0159c4]
+  - @hi-ui/icons@5.0.0-canary.9
+
+## 5.0.0-canary.24
+
+### Patch Changes
+
+- 732decb61: perf(table): 优化表格列宽更新逻辑，当内容宽度没有超出时再更新列宽 (5.0)
+- Updated dependencies [732decb61]
+  - @hi-ui/empty-state@5.0.0-canary.9
+
+## 5.0.0-canary.23
+
+### Patch Changes
+
+- d1e7ade1e: styles: 主题定制功能完善&&样式变量化写法改造&&兼容 RTL (5.0)
+- Updated dependencies [d1e7ade1e]
+- Updated dependencies [da16450b4]
+  - @hi-ui/button@5.0.0-canary.13
+  - @hi-ui/checkbox@5.0.0-canary.7
+  - @hi-ui/drawer@5.0.0-canary.9
+  - @hi-ui/empty-state@5.0.0-canary.8
+  - @hi-ui/icon-button@5.0.0-canary.8
+  - @hi-ui/loading@5.0.0-canary.9
+  - @hi-ui/pagination@5.0.0-canary.10
+  - @hi-ui/popper@5.0.0-canary.12
+  - @hi-ui/radio@5.0.0-canary.8
+  - @hi-ui/scrollbar@5.0.0-canary.7
+  - @hi-ui/select@5.0.0-canary.15
+  - @hi-ui/icons@5.0.0-canary.8
+
+## 5.0.0-canary.22
+
+### Patch Changes
+
+- 58db39510: style: fix ui bug (5.0)
+- Updated dependencies [627cf6a30]
+- Updated dependencies [58db39510]
+  - @hi-ui/empty-state@5.0.0-canary.7
+  - @hi-ui/icons@5.0.0-canary.7
+  - @hi-ui/icon-button@5.0.0-canary.7
+  - @hi-ui/popper@5.0.0-canary.11
+  - @hi-ui/radio@5.0.0-canary.7
+
+## 5.0.0-canary.21
+
+### Patch Changes
+
+- 0b67f7083: style: 修改 UI 问题 (5.0)
+- Updated dependencies [947edaa7e]
+- Updated dependencies [0b67f7083]
+  - @hi-ui/pagination@5.0.0-canary.9
+  - @hi-ui/icons@5.0.0-canary.6
+  - @hi-ui/icon-button@5.0.0-canary.6
+  - @hi-ui/popper@5.0.0-canary.10
+
+## 5.0.0-canary.20
+
+### Patch Changes
+
+- 1f9c6e335: perf: 优化全局 size 配置,对于组件中没有的 size 值,取最接近的尺寸展示 (5.0)
+- 22db9cf70: style: fix ui bug (5.0)
+- Updated dependencies [d97cc24eb]
+- Updated dependencies [1f9c6e335]
+- Updated dependencies [22db9cf70]
+  - @hi-ui/drawer@5.0.0-canary.8
+  - @hi-ui/loading@5.0.0-canary.8
+  - @hi-ui/popper@5.0.0-canary.9
+  - @hi-ui/core@5.0.0-canary.6
+  - @hi-ui/empty-state@5.0.0-canary.6
+  - @hi-ui/pagination@5.0.0-canary.8
+  - @hi-ui/button@5.0.0-canary.12
+  - @hi-ui/checkbox@5.0.0-canary.6
+  - @hi-ui/icon-button@5.0.0-canary.5
+  - @hi-ui/radio@5.0.0-canary.6
+  - @hi-ui/scrollbar@5.0.0-canary.6
+  - @hi-ui/select@5.0.0-canary.14
+
+## 5.0.0-canary.19
+
+### Minor Changes
+
+- 922686dcc: feat(global-context): 增加 size api 全局配置 (5.0)
+
+### Patch Changes
+
+- 86877b241: style: 修改样式问题 (5.0)
+- Updated dependencies [2b706fc6d]
+- Updated dependencies [86877b241]
+- Updated dependencies [922686dcc]
+- Updated dependencies [8e969ad73]
+  - @hi-ui/select@5.0.0-canary.13
+  - @hi-ui/button@5.0.0-canary.11
+  - @hi-ui/checkbox@5.0.0-canary.5
+  - @hi-ui/drawer@5.0.0-canary.7
+  - @hi-ui/empty-state@5.0.0-canary.5
+  - @hi-ui/icon-button@5.0.0-canary.4
+  - @hi-ui/loading@5.0.0-canary.6
+  - @hi-ui/pagination@5.0.0-canary.7
+  - @hi-ui/popper@5.0.0-canary.8
+  - @hi-ui/radio@5.0.0-canary.5
+  - @hi-ui/scrollbar@5.0.0-canary.5
+  - @hi-ui/core@5.0.0-canary.5
+  - @hi-ui/icons@5.0.0-canary.5
+  - @hi-ui/spinner@5.0.0-canary.5
+
+## 5.0.0-canary.18
+
+### Patch Changes
+
+- b265f3a8d: <br />
+  - fix(table): 修改表格在外层是 scale 时导致列宽计算有误的问题 (5.0)
+  - fix(loading): 修改 loading size 类型，移除 xs 尺寸 (5.0)
+- Updated dependencies [b265f3a8d]
+  - @hi-ui/loading@5.0.0-canary.5
+
+## 5.0.0-canary.17
+
+### Patch Changes
+
+- 399ea1f0e: <br>
+  - perf(table): 优化列宽更新逻辑，当 columns 长度和 dataKey、width 发生变化时，重新计算列宽 (5.0)
+  - fix(table): 用于计算真实列宽的行节点，考虑单元格合并的场景 (5.0)
+  - fix(table): 修复 stretchHeight 模式下高度变化时虚拟表格高度没有更新问题 (5.0)
+- Updated dependencies [13a222d13]
+- Updated dependencies [839ffd6d8]
+  - @hi-ui/select@5.0.0-canary.12
+  - @hi-ui/pagination@5.0.0-canary.6
+
+## 5.0.0-canary.16
+
+### Minor Changes
+
+- 6160bdc73: feat(table): TableColumnItem 支持泛型 (5.0)
+
+### Patch Changes
+
+- Updated dependencies [9fa354f31]
+  - @hi-ui/button@5.0.0-canary.9
+
+## 5.0.0-canary.15
+
+### Patch Changes
+
+- 6e274310f: fix(table): 优化列宽设置逻辑，确保在列变化时准确计算并更新列宽 (#3327)
+- df353062b: fix(table): 修复设置 scrollbar 后冻结列失效问题 (#3329)
+- Updated dependencies [75a3d93a9]
+  - @hi-ui/drawer@5.0.0-canary.6
+
+## 5.0.0-canary.14
+
+### Minor Changes
+
+- 6316a318e: feat(table): 添加 fixedToRow 功能，支持设置行固定到顶部或底部 (#3304)
+
+### Patch Changes
+
+- Updated dependencies [4dc72a186]
+  - @hi-ui/popper@5.0.0-canary.7
+
+## 5.0.0-canary.13
+
+### Patch Changes
+
+- 864c3a54e: fix(table): 优化 useColSorter 钩子，移除不必要的 columnsLatestRef 引用，直接使用 columns 进行排序计算 (5.0)
+
+## 5.0.0-canary.12
+
+### Minor Changes
+
+- a067ee087: feat(table): 支持远程排序 (5.0)
+
+### Patch Changes
+
+- Updated dependencies [efce04a26]
+- Updated dependencies [9106dca82]
+  - @hi-ui/checkbox@5.0.0-canary.3
+  - @hi-ui/popper@5.0.0-canary.6
+  - @hi-ui/radio@5.0.0-canary.4
+  - @hi-ui/select@5.0.0-canary.9
+  - @hi-ui/core@5.0.0-canary.3
+  - @hi-ui/icons@5.0.0-canary.3
+  - @hi-ui/button@5.0.0-canary.8
+  - @hi-ui/drawer@5.0.0-canary.5
+  - @hi-ui/empty-state@5.0.0-canary.3
+  - @hi-ui/icon-button@5.0.0-canary.3
+  - @hi-ui/loading@5.0.0-canary.3
+  - @hi-ui/pagination@5.0.0-canary.5
+  - @hi-ui/scrollbar@5.0.0-canary.4
+  - @hi-ui/spinner@5.0.0-canary.3
+
+## 5.0.0-canary.11
+
+### Patch Changes
+
+- e5b589b86: chore(table): export SettingDrawer types (5.0)
+
+## 5.0.0-canary.10
+
+### Patch Changes
+
+- fc1360986: fix(table): 更新 useTable 逻辑以确保滚动位置不超出表格宽度，并添加 @hi-ui/radio 依赖
+
+## 5.0.0-canary.9
+
+### Patch Changes
+
+- fix(table): 修复 resizable 模式下列宽计算问题 (5.0)
+- Updated dependencies [bf65028e6]
+  - @hi-ui/button@5.0.0-canary.7
+  - @hi-ui/popper@5.0.0-canary.4
+
+## 5.0.0-canary.8
+
+### Minor Changes
+
+- ca7a945fe: feat(table): TableColumnItem 类型增加 minWidth 参数 (#3216)
+
+### Patch Changes
+
+- Updated dependencies [756473045]
+- Updated dependencies [b4cecde83]
+  - @hi-ui/scrollbar@5.0.0-canary.3
+  - @hi-ui/button@5.0.0-canary.6
+
+## 5.0.0-canary.7
+
+### Patch Changes
+
+- chore: rebase master (5.0)
+- Updated dependencies
+  - @hi-ui/core@5.0.0-canary.2
+  - @hi-ui/use-cache@5.0.0-canary.2
+  - @hi-ui/use-check@5.0.0-canary.2
+  - @hi-ui/use-check-state@5.0.0-canary.2
+  - @hi-ui/use-drag-sorter@5.0.0-canary.2
+  - @hi-ui/use-latest@5.0.0-canary.2
+  - @hi-ui/use-toggle@5.0.0-canary.2
+  - @hi-ui/use-uncontrolled-state@5.0.0-canary.2
+  - @hi-ui/use-update-effect@5.0.0-canary.2
+  - @hi-ui/icons@5.0.0-canary.2
+  - @hi-ui/button@5.0.0-canary.5
+  - @hi-ui/checkbox@5.0.0-canary.2
+  - @hi-ui/drawer@5.0.0-canary.4
+  - @hi-ui/empty-state@5.0.0-canary.2
+  - @hi-ui/icon-button@5.0.0-canary.2
+  - @hi-ui/loading@5.0.0-canary.2
+  - @hi-ui/pagination@5.0.0-canary.4
+  - @hi-ui/popper@5.0.0-canary.3
+  - @hi-ui/scrollbar@5.0.0-canary.2
+  - @hi-ui/select@5.0.0-canary.7
+  - @hi-ui/spinner@5.0.0-canary.2
+  - @hi-ui/array-utils@5.0.0-canary.2
+  - @hi-ui/classname@5.0.0-canary.2
+  - @hi-ui/dom-utils@5.0.0-canary.2
+  - @hi-ui/env@5.0.0-canary.2
+  - @hi-ui/func-utils@5.0.0-canary.2
+  - @hi-ui/object-utils@5.0.0-canary.2
+  - @hi-ui/react-utils@5.0.0-canary.2
+  - @hi-ui/times@5.0.0-canary.2
+  - @hi-ui/tree-utils@5.0.0-canary.2
+  - @hi-ui/type-assertion@5.0.0-canary.2
+
+## 5.0.0-canary.6
+
+### Patch Changes
+
+- ba7c324c2: style: 统一调整组件 shadow (5.0)
+- 4b09e728b: build: 将 package.json 中 exports 配置中的 types 配置放在最上面 (5.0)
+- Updated dependencies [ba7c324c2]
+- Updated dependencies [4b09e728b]
+- Updated dependencies [ba7c324c2]
+  - @hi-ui/drawer@5.0.0-canary.3
+  - @hi-ui/core@5.0.0-canary.1
+  - @hi-ui/use-cache@5.0.0-canary.1
+  - @hi-ui/use-check@5.0.0-canary.1
+  - @hi-ui/use-check-state@5.0.0-canary.1
+  - @hi-ui/use-drag-sorter@5.0.0-canary.1
+  - @hi-ui/use-latest@5.0.0-canary.1
+  - @hi-ui/use-toggle@5.0.0-canary.1
+  - @hi-ui/use-uncontrolled-state@5.0.0-canary.1
+  - @hi-ui/use-update-effect@5.0.0-canary.1
+  - @hi-ui/icons@5.0.0-canary.1
+  - @hi-ui/button@5.0.0-canary.4
+  - @hi-ui/checkbox@5.0.0-canary.1
+  - @hi-ui/empty-state@5.0.0-canary.1
+  - @hi-ui/icon-button@5.0.0-canary.1
+  - @hi-ui/loading@5.0.0-canary.1
+  - @hi-ui/pagination@5.0.0-canary.3
+  - @hi-ui/popper@5.0.0-canary.2
+  - @hi-ui/scrollbar@5.0.0-canary.1
+  - @hi-ui/select@5.0.0-canary.6
+  - @hi-ui/spinner@5.0.0-canary.1
+  - @hi-ui/array-utils@5.0.0-canary.1
+  - @hi-ui/classname@5.0.0-canary.1
+  - @hi-ui/dom-utils@5.0.0-canary.1
+  - @hi-ui/env@5.0.0-canary.1
+  - @hi-ui/func-utils@5.0.0-canary.1
+  - @hi-ui/object-utils@5.0.0-canary.1
+  - @hi-ui/react-utils@5.0.0-canary.1
+  - @hi-ui/times@5.0.0-canary.1
+  - @hi-ui/tree-utils@5.0.0-canary.1
+  - @hi-ui/type-assertion@5.0.0-canary.1
+
+## 5.0.0-canary.5
+
+### Patch Changes
+
+- a89b3b3ae: fix: 修改组件问题 (5.0)
+- Updated dependencies [a89b3b3ae]
+  - @hi-ui/select@5.0.0-canary.4
+
+## 5.0.0-canary.4
+
+### Patch Changes
+
+- c3a7005b0: style: 修改 UI 问题 (5.0)
+
 ## 5.0.0-canary.3
 
 ### Minor Changes

package/lib/cjs/BaseTable.js

@@ -46,6 +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 _a$prefixCls = _a.prefixCls,
     prefixCls = _a$prefixCls === void 0 ? _prefix : _a$prefixCls,
     _a$role = _a.role,
@@ -63,8 +64,7 @@ var BaseTable = /*#__PURE__*/React.forwardRef(function (_a, ref) {
     expandedEmbedRowKeys = _a.expandedEmbedRowKeys,
     onEmbedExpand = _a.onEmbedExpand,
     expandedRender = _a.expandedRender,
-    _a$size = _a.size,
-    size = _a$size === void 0 ? 'md' : _a$size,
+    sizeProp = _a.size,
     extra = _a.extra,
     onRow = _a.onRow,
     stickyFooter = _a.stickyFooter,
@@ -76,7 +76,15 @@ var BaseTable = /*#__PURE__*/React.forwardRef(function (_a, ref) {
     virtual = _a.virtual,
     needDoubleTable = _a.needDoubleTable,
     onResizeStop = _a.onResizeStop,
-    rest = tslib.__rest(_a, ["prefixCls", "role", "className", "columns", "data", "striped", "bordered", "rowExpandable", "defaultExpandedEmbedRowKeys", "expandedEmbedRowKeys", "onEmbedExpand", "expandedRender", "size", "extra", "onRow", "onHeaderRow", "stickyFooter", "stickyFooterBottom", "fixedColumnTrigger", "emptyContent", "virtual", "needDoubleTable", "onResizeStop"]);
+    fixedToRow = _a.fixedToRow,
+    onScroll = _a.onScroll,
+    rest = tslib.__rest(_a, ["prefixCls", "role", "className", "columns", "data", "striped", "bordered", "rowExpandable", "defaultExpandedEmbedRowKeys", "expandedEmbedRowKeys", "onEmbedExpand", "expandedRender", "size", "extra", "onRow", "onHeaderRow", "stickyFooter", "stickyFooterBottom", "fixedColumnTrigger", "emptyContent", "virtual", "needDoubleTable", "onResizeStop", "fixedToRow", "onScroll"]);
+  var _useGlobalContext = core.useGlobalContext(),
+    globalSize = _useGlobalContext.size;
+  var size = (_b = sizeProp !== null && sizeProp !== void 0 ? sizeProp : globalSize) !== null && _b !== void 0 ? _b : 'md';
+  if (size === 'xs') {
+    size = 'sm';
+  }
   // ********************** 内嵌式面板 *********************** //
   var _useEmbedExpand = useEmbedExpand.useEmbedExpand({
       defaultExpandedEmbedRowKeys: defaultExpandedEmbedRowKeys,
@@ -99,6 +107,7 @@ var BaseTable = /*#__PURE__*/React.forwardRef(function (_a, ref) {
       dataKey: EMBED_DATA_KEY,
       title: '',
       width: 38,
+      fixed: true,
       className: prefixCls + "__embed-col",
       align: 'center',
       render: function render(_, rowItem) {
@@ -131,6 +140,8 @@ var BaseTable = /*#__PURE__*/React.forwardRef(function (_a, ref) {
   }, [embedExpandable, getEmbedPanelColumn, columns]);
   var i18n = core.useLocaleContext();
   var _useMemo = React.useMemo(function () {
+      var _a;
+      // 确保包含 avg 属性，且值为数字类型的字符串
       // 确保包含 avg 属性，且值为数字类型的字符串
       var avgRow = {
         id: 'avg',
@@ -139,9 +150,15 @@ var BaseTable = /*#__PURE__*/React.forwardRef(function (_a, ref) {
         }
       };
       var hasAvgColumn = false;
-      columns.forEach(function (column, index$1) {
-        // 行选中模式下，index=0是checkbox列，index=1才是第一列 ; fix issue: https://github.com/XiaoMi/hiui/issues/2863
-        if (index$1 === 0 || index$1 === 1 && columns[0].dataKey === Table.SELECTION_DATA_KEY) {
+      var flattenedColumns = index.flattenColumns(columns);
+      // 找第一个非选择框列
+      // 找第一个非选择框列
+      var firstDataColumnIndex = 0;
+      if (((_a = columns[0]) === null || _a === void 0 ? void 0 : _a.dataKey) === Table.SELECTION_DATA_KEY) {
+        firstDataColumnIndex = 1;
+      }
+      flattenedColumns.forEach(function (column, index$1) {
+        if (index$1 === firstDataColumnIndex) {
           // @ts-ignore
           avgRow.raw[column.dataKey] = i18n.get('table.average');
         }
@@ -160,6 +177,8 @@ var BaseTable = /*#__PURE__*/React.forwardRef(function (_a, ref) {
     avgRow = _useMemo.avgRow,
     hasAvgColumn = _useMemo.hasAvgColumn;
   var _useMemo2 = React.useMemo(function () {
+      var _a;
+      // 确保包含total属性，且值为数字类型的字符串
       // 确保包含total属性，且值为数字类型的字符串
       var sumRow = {
         id: 'sum',
@@ -168,16 +187,19 @@ var BaseTable = /*#__PURE__*/React.forwardRef(function (_a, ref) {
         }
       };
       var hasSumColumn = false;
-      columns.forEach(function (column, index$1) {
-        if (index$1 === 0 || index$1 === 1 && columns[0].dataKey === Table.SELECTION_DATA_KEY) {
+      var flattenedColumns = index.flattenColumns(columns);
+      var firstDataColumnIndex = 0;
+      if (((_a = columns[0]) === null || _a === void 0 ? void 0 : _a.dataKey) === Table.SELECTION_DATA_KEY) {
+        firstDataColumnIndex = 1;
+      }
+      flattenedColumns.forEach(function (column, index$1) {
+        if (index$1 === firstDataColumnIndex) {
           // @ts-ignore
           sumRow.raw[column.dataKey] = i18n.get('table.total');
         }
         if (index.checkNeedTotalOrEvg(data, column, 'total')) {
           hasSumColumn = true;
-          // 获取当前数据最大小数点个数，并设置最后总和值小数点
           // @ts-ignore
-          // 获取当前数据最大小数点个数，并设置最后总和值小数点
           // @ts-ignore
           sumRow.raw[column.dataKey] = index.getTotalOrEvgRowData(data, column, false);
         }
@@ -192,7 +214,8 @@ var BaseTable = /*#__PURE__*/React.forwardRef(function (_a, ref) {
   var providedValue = useTable.useTable(Object.assign(Object.assign({}, rest), {
     columns: mergedColumns,
     data: data,
-    virtual: virtual
+    virtual: virtual,
+    onScroll: onScroll
   }));
   var rootProps = providedValue.rootProps,
     bordered = providedValue.bordered,
@@ -216,42 +239,52 @@ var BaseTable = /*#__PURE__*/React.forwardRef(function (_a, ref) {
   var extraHeader = extra && extra.header;
   var extraFooter = extra && extra.footer;
   var alwaysFixedColumn = fixedColumnTrigger === 'always';
+  var wrapperRef = React__default["default"].useRef(null);
+  var isTableContentExceedWrapperHeight = bodyTableRef.current && wrapperRef.current && bodyTableRef.current.offsetHeight > wrapperRef.current.offsetHeight;
   var renderTable = function renderTable() {
-    var singleTableContent = /*#__PURE__*/React__default["default"].createElement("div", {
-      ref: scrollBodyElementRef,
-      className: prefixCls + "-content",
-      onScroll: onTableBodyScroll,
-      style: {
-        // 表格宽度大于div宽度才出现横向滚动条
-        overflowX: canScroll ? 'scroll' : undefined
-      }
-    }, /*#__PURE__*/React__default["default"].createElement("table", {
+    if (needDoubleTable) {
+      var _a2 = getTableHeaderProps(),
+        style = _a2.style,
+        restTableHeaderProps = tslib.__rest(_a2, ["style"]);
+      var doubleTableContent = /*#__PURE__*/React__default["default"].createElement(React__default["default"].Fragment, null, /*#__PURE__*/React__default["default"].createElement("div", Object.assign({}, restTableHeaderProps, {
+        style: Object.assign(Object.assign({}, style), {
+          overflow: undefined
+        })
+      }), /*#__PURE__*/React__default["default"].createElement(TableHeader.TableHeader, null), extraHeader ? ( /*#__PURE__*/React__default["default"].createElement("div", {
+        style: {
+          position: 'absolute',
+          right: 0,
+          zIndex: 11,
+          bottom: 0,
+          top: 0
+        }
+      }, extraHeader)) : null), /*#__PURE__*/React__default["default"].createElement(TableBody.TableBody, {
+        emptyContent: emptyContent
+      }));
+      return doubleTableContent;
+    }
+    var tableContent = /*#__PURE__*/React__default["default"].createElement("table", {
       ref: bodyTableRef,
       style: {
         width: canScroll && scrollWidth !== undefined ? scrollWidth : '100%'
       }
     }, /*#__PURE__*/React__default["default"].createElement(ColGroupContent.ColGroupContent, null), /*#__PURE__*/React__default["default"].createElement(TheadContent.TheadContent, null), /*#__PURE__*/React__default["default"].createElement(TbodyContent.TbodyContent, {
       emptyContent: emptyContent
-    })));
-    var _a = getTableHeaderProps(),
-      style = _a.style,
-      restTableHeaderProps = tslib.__rest(_a, ["style"]);
-    var doubleTableContent = /*#__PURE__*/React__default["default"].createElement(React__default["default"].Fragment, null, /*#__PURE__*/React__default["default"].createElement("div", Object.assign({}, restTableHeaderProps, {
-      style: Object.assign(Object.assign({}, style), {
-        overflow: 'unset'
-      })
-    }), /*#__PURE__*/React__default["default"].createElement(TableHeader.TableHeader, null), extraHeader ? ( /*#__PURE__*/React__default["default"].createElement("div", {
+    }));
+    var singleTableContent = /*#__PURE__*/React__default["default"].createElement("div", Object.assign({
+      className: prefixCls + "-content"
+    }, !scrollbar ? {
+      ref: scrollBodyElementRef,
+      onScroll: onTableBodyScroll,
       style: {
-        position: 'absolute',
-        right: 0,
-        zIndex: 11,
-        bottom: 0,
-        top: 0
+        // 表格宽度大于div宽度才出现横向滚动条
+        overflowX: canScroll ? 'scroll' : undefined
       }
-    }, extraHeader)) : null), /*#__PURE__*/React__default["default"].createElement(TableBody.TableBody, {
-      emptyContent: emptyContent
-    }));
-    return needDoubleTable ? doubleTableContent : !scrollbar ? singleTableContent : ( /*#__PURE__*/React__default["default"].createElement(Scrollbar__default["default"], Object.assign({}, typeAssertion.isObject(scrollbar) ? scrollbar : null), singleTableContent));
+    } : {}), !scrollbar ? tableContent : ( /*#__PURE__*/React__default["default"].createElement(Scrollbar__default["default"], Object.assign({
+      ref: scrollBodyElementRef,
+      onScroll: onTableBodyScroll
+    }, typeAssertion.isObject(scrollbar) ? scrollbar : null), tableContent)));
+    return singleTableContent;
   };
   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", {
@@ -279,7 +312,8 @@ var BaseTable = /*#__PURE__*/React.forwardRef(function (_a, ref) {
     role: role,
     className: cls
   }, rootProps), /*#__PURE__*/React__default["default"].createElement("div", {
-    className: prefixCls + "__wrapper"
+    ref: wrapperRef,
+    className: classname.cx(prefixCls + "__wrapper", isTableContentExceedWrapperHeight && prefixCls + "--exceed-wrapper-height")
   }, /*#__PURE__*/React__default["default"].createElement(context.TableProvider, {
     value: Object.assign(Object.assign({}, providedValue), {
       striped: striped,
@@ -295,7 +329,9 @@ var BaseTable = /*#__PURE__*/React.forwardRef(function (_a, ref) {
       sumRow: sumRow,
       hasSumColumn: hasSumColumn,
       virtual: virtual,
-      onResizeStop: onResizeStop
+      onScroll: onScroll,
+      onResizeStop: onResizeStop,
+      fixedToRow: fixedToRow
     })
   }, renderTable()), renderFreezeShadow()), tableFooter);
 });

package/lib/cjs/Table.js

@@ -25,7 +25,7 @@ var reactUtils = require('@hi-ui/react-utils');
 var TableSettingMenu = require('./TableSettingMenu.js');
 var Loading = require('@hi-ui/loading');
 var Checkbox = require('@hi-ui/checkbox');
-var index$1 = require('./packages/ui/radio/lib/esm/index.js');
+var Radio = require('@hi-ui/radio');
 var useCheck = require('./hooks/use-check.js');
 var typeAssertion = require('@hi-ui/type-assertion');
 var treeUtils = require('@hi-ui/tree-utils');
@@ -41,12 +41,13 @@ 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 Radio__default = /*#__PURE__*/_interopDefaultCompat(Radio);
 var _prefix = classname.getPrefixCls('table');
 /**
  * 需要使用双表格的场景对应的 API
  * 这些场景下的功能无法通过单表格实现，故而设计成双表格，即表头和表体分别用一个 table 实现
  */
-var DOUBLE_TABLE_SCENE = ['needDoubleTable', 'maxHeight', 'sticky', 'stickyTop', 'setting', 'virtual', 'stretchHeight'];
+var DOUBLE_TABLE_SCENE = ['needDoubleTable', 'maxHeight', 'sticky', 'stickyTop', 'setting', 'virtual'];
 var STANDARD_PRESET = {
   striped: true,
   bordered: true,
@@ -86,7 +87,8 @@ var Table = /*#__PURE__*/React.forwardRef(function (_a, ref) {
     extra = _a.extra,
     _a$data = _a.data,
     data = _a$data === void 0 ? DEFAULT_DATA : _a$data,
-    rest = tslib.__rest(_a, ["prefixCls", "standard", "loading", "dataSource", "pagination", "uniqueId", "columns", "hiddenColKeys", "onHiddenColKeysChange", "sortedColKeys", "onSortedColKeysChange", "checkDisabledColKeys", "onSetColKeysChange", "rowSelection", "fieldKey", "extra", "data"]);
+    onScroll = _a.onScroll,
+    rest = tslib.__rest(_a, ["prefixCls", "standard", "loading", "dataSource", "pagination", "uniqueId", "columns", "hiddenColKeys", "onHiddenColKeysChange", "sortedColKeys", "onSortedColKeysChange", "checkDisabledColKeys", "onSetColKeysChange", "rowSelection", "fieldKey", "extra", "data", "onScroll"]);
   // 是否需要双表格
   var needDoubleTable = DOUBLE_TABLE_SCENE.some(function (prop) {
     return !!rest[prop];
@@ -205,6 +207,12 @@ var Table = /*#__PURE__*/React.forwardRef(function (_a, ref) {
       var rowKey = getRowKeyField(rowItem);
       var checked = isCheckedRowKey(rowKey);
       var disabledCheckbox = checkRowIsDisabledCheckbox(rowItem);
+      if (rowItem.key === 'avg' || rowItem.key === 'sum') {
+        return {
+          node: null,
+          checked: false
+        };
+      }
       return {
         node: type === 'checkbox' ? ( /*#__PURE__*/React__default["default"].createElement(Checkbox__default["default"], {
           checked: checked,
@@ -215,7 +223,7 @@ var Table = /*#__PURE__*/React.forwardRef(function (_a, ref) {
           onClick: function onClick(evt) {
             evt.stopPropagation();
           }
-        })) : ( /*#__PURE__*/React__default["default"].createElement(index$1["default"], {
+        })) : ( /*#__PURE__*/React__default["default"].createElement(Radio__default["default"], {
           checked: checked,
           disabled: disabledCheckbox,
           onChange: function onChange(evt) {
@@ -297,6 +305,7 @@ var Table = /*#__PURE__*/React.forwardRef(function (_a, ref) {
     data: mergedData,
     fieldKey: fieldKey,
     virtual: virtual,
+    onScroll: onScroll,
     needDoubleTable: needDoubleTable,
     extra: Object.assign({
       header: setting ? ( /*#__PURE__*/React__default["default"].createElement(TableSettingMenu.TableSettingMenu, {