@hi-ui/table 4.2.0 → 4.3.1

package/CHANGELOG.md

@@ -1,5 +1,31 @@
 # @hi-ui/table
 
+## 4.3.1
+
+### Patch Changes
+
+- [#2654](https://github.com/XiaoMi/hiui/pull/2654) [`dc002a32a`](https://github.com/XiaoMi/hiui/commit/dc002a32a2c6f538b0df37c63d34f603647d9b70) Thanks [@zyprepare](https://github.com/zyprepare)! - feat: 增加 scrollbar 参数,用于在 Windows 环境下优化滚动条样式
+
+- Updated dependencies [[`b477d91db`](https://github.com/XiaoMi/hiui/commit/b477d91db15bbc92c8712a9a771af5b332779315)]:
+  - @hi-ui/button@4.0.6
+  - @hi-ui/icon-button@4.0.5
+  - @hi-ui/pagination@4.0.11
+
+## 4.3.0
+
+### Minor Changes
+
+- [#2642](https://github.com/XiaoMi/hiui/pull/2642) [`74d8c5148`](https://github.com/XiaoMi/hiui/commit/74d8c51489ae7a88c90b1426e9da118125579b97) Thanks [@zyprepare](https://github.com/zyprepare)! - perf: 将之前的双表格结构优化成单表格,冻结列和表头吸顶等场景依然采用双表格结构
+
+- [#2647](https://github.com/XiaoMi/hiui/pull/2647) [`8767c9470`](https://github.com/XiaoMi/hiui/commit/8767c94702fdc697207001f639508907e20fc6a5) Thanks [@zyprepare](https://github.com/zyprepare)! - feat: add footerRender api
+
+### Patch Changes
+
+- [#2648](https://github.com/XiaoMi/hiui/pull/2648) [`54387a81e`](https://github.com/XiaoMi/hiui/commit/54387a81e1c6add77e791af8d849a6518077afd5) Thanks [@zyprepare](https://github.com/zyprepare)! - perf: 优化 resizable 模式下可调整的最小宽度
+
+- Updated dependencies [[`4f7c8c906`](https://github.com/XiaoMi/hiui/commit/4f7c8c9063d9b72068a2db5fa614eed130aafd0f)]:
+  - @hi-ui/select@4.2.2
+
 ## 4.2.0
 
 ### Minor Changes

package/lib/cjs/BaseTable.js

@@ -45,6 +45,12 @@ var useTable = require('./use-table.js');
 
 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) {
   return e && _typeof(e) === 'object' && 'default' in e ? e : {
     'default': e
@@ -61,7 +67,6 @@ 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 _a$prefixCls = _a.prefixCls,
       prefixCls = _a$prefixCls === void 0 ? _prefix : _a$prefixCls,
       _a$role = _a.role,
@@ -90,7 +95,9 @@ var BaseTable = /*#__PURE__*/React.forwardRef(function (_a, ref) {
       fixedColumnTrigger = _a$fixedColumnTrigger === void 0 ? 'auto' : _a$fixedColumnTrigger,
       emptyContent = _a.emptyContent,
       virtual = _a.virtual,
-      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 = _a.needDoubleTable,
+      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"]); // ********************** 内嵌式面板 *********************** //
+
 
   var _useEmbedExpand = useEmbedExpand.useEmbedExpand({
     defaultExpandedEmbedRowKeys: defaultExpandedEmbedRowKeys,
@@ -146,48 +153,70 @@ var BaseTable = /*#__PURE__*/React.forwardRef(function (_a, ref) {
 
     return columns;
   }, [embedExpandable, getEmbedPanelColumn, columns]);
-  var i18n = core.useLocaleContext(); // 确保包含 avg 属性，且值为数字类型的字符串
-
-  var avgRow = {
-    id: 'avg',
-    raw: {
-      key: 'avg'
-    }
-  };
-  var hasAvgColumn = false;
-  columns.forEach(function (column, index$1) {
-    if (index$1 === 0) {
-      // @ts-ignore
-      avgRow.raw[column.dataKey] = i18n.get('table.average');
-    }
+  var i18n = core.useLocaleContext();
+
+  var _useMemo = React.useMemo(function () {
+    // 确保包含 avg 属性，且值为数字类型的字符串
+    var avgRow = {
+      id: 'avg',
+      raw: {
+        key: 'avg'
+      }
+    };
+    var hasAvgColumn = false;
+    columns.forEach(function (column, index$1) {
+      if (index$1 === 0) {
+        // @ts-ignore
+        avgRow.raw[column.dataKey] = i18n.get('table.average');
+      }
 
-    if (index.checkNeedTotalOrEvg(data, column, 'avg')) {
-      hasAvgColumn = true; // @ts-ignore
+      if (index.checkNeedTotalOrEvg(data, column, 'avg')) {
+        hasAvgColumn = true; // @ts-ignore
+        // @ts-ignore
 
-      avgRow.raw[column.dataKey] = index.getTotalOrEvgRowData(data, column, true);
-    }
-  }); // 确保包含total属性，且值为数字类型的字符串
+        avgRow.raw[column.dataKey] = index.getTotalOrEvgRowData(data, column, true);
+      }
+    });
+    return {
+      avgRow: avgRow,
+      hasAvgColumn: hasAvgColumn
+    };
+  }, [columns, data, i18n]),
+      avgRow = _useMemo.avgRow,
+      hasAvgColumn = _useMemo.hasAvgColumn;
+
+  var _useMemo2 = React.useMemo(function () {
+    // 确保包含total属性，且值为数字类型的字符串
+    var sumRow = {
+      id: 'sum',
+      raw: {
+        key: 'sum'
+      }
+    };
+    var hasSumColumn = false;
+    columns.forEach(function (column, index$1) {
+      if (index$1 === 0) {
+        // @ts-ignore
+        sumRow.raw[column.dataKey] = i18n.get('table.total');
+      }
 
-  var sumRow = {
-    id: 'sum',
-    raw: {
-      key: 'sum'
-    }
-  };
-  var hasSumColumn = false;
-  columns.forEach(function (column, index$1) {
-    if (index$1 === 0) {
-      // @ts-ignore
-      sumRow.raw[column.dataKey] = i18n.get('table.total');
-    }
+      if (index.checkNeedTotalOrEvg(data, column, 'total')) {
+        hasSumColumn = true; // 获取当前数据最大小数点个数，并设置最后总和值小数点
+        // @ts-ignore
+        // 获取当前数据最大小数点个数，并设置最后总和值小数点
+        // @ts-ignore
 
-    if (index.checkNeedTotalOrEvg(data, column, 'total')) {
-      hasSumColumn = true; // 获取当前数据最大小数点个数，并设置最后总和值小数点
-      // @ts-ignore
+        sumRow.raw[column.dataKey] = index.getTotalOrEvgRowData(data, column, false);
+      }
+    });
+    return {
+      sumRow: sumRow,
+      hasSumColumn: hasSumColumn
+    };
+  }, [columns, data, i18n]),
+      sumRow = _useMemo2.sumRow,
+      hasSumColumn = _useMemo2.hasSumColumn;
 
-      sumRow.raw[column.dataKey] = index.getTotalOrEvgRowData(data, column, false);
-    }
-  });
   var providedValue = useTable.useTable(Object.assign(Object.assign({}, rest), {
     columns: mergedColumns,
     data: data,
@@ -200,11 +229,68 @@ var BaseTable = /*#__PURE__*/React.forwardRef(function (_a, ref) {
       leftFixedColumnsWidth = providedValue.leftFixedColumnsWidth,
       rightFixedColumnsWidth = providedValue.rightFixedColumnsWidth,
       scrollSize = providedValue.scrollSize,
-      getTableHeaderProps = providedValue.getTableHeaderProps;
+      getTableHeaderProps = providedValue.getTableHeaderProps,
+      scrollBodyElementRef = providedValue.scrollBodyElementRef,
+      onTableBodyScroll = providedValue.onTableBodyScroll,
+      canScroll = providedValue.canScroll,
+      bodyTableRef = providedValue.bodyTableRef,
+      scrollWidth = providedValue.scrollWidth,
+      footerRender = providedValue.footerRender;
   var hasBorder = borderedProp !== null && borderedProp !== void 0 ? borderedProp : bordered;
   var extraHeader = extra && extra.header;
   var extraFooter = extra && extra.footer;
   var alwaysFixedColumn = fixedColumnTrigger === 'always';
+
+  var renderTable = function renderTable() {
+    return needDoubleTable ? /*#__PURE__*/React__default["default"].createElement(React__default["default"].Fragment, null, /*#__PURE__*/React__default["default"].createElement("div", Object.assign({}, getTableHeaderProps()), /*#__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
+    })) : /*#__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", {
+      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 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: prefixCls + "-freeze-shadow  " + prefixCls + "-freeze-shadow--left",
+      style: {
+        width: leftFixedColumnsWidth + 'px'
+      }
+    }) : null, (alwaysFixedColumn || scrollSize.scrollRight > 0) && rightFrozenColKeys.length > 0 ? /*#__PURE__*/React__default["default"].createElement("div", {
+      className: prefixCls + "-freeze-shadow " + prefixCls + "-freeze-shadow--right",
+      style: {
+        width: rightFixedColumnsWidth + 'px'
+      }
+    }) : null);
+  };
+
+  var tableFooter = /*#__PURE__*/React__default["default"].createElement("div", {
+    className: prefixCls + "-footer",
+    style: stickyFooter ? {
+      position: 'sticky',
+      bottom: stickyFooterBottom
+    } : undefined
+  }, typeAssertion.isFunction(footerRender) ? footerRender( /*#__PURE__*/React__default["default"].createElement(React__default["default"].Fragment, null, extraFooter)) : extraFooter);
   var cls = classname.cx(prefixCls, className, hasBorder && prefixCls + "--bordered", striped && prefixCls + "--striped", size && prefixCls + "--size-" + size, virtual && prefixCls + "--virtual");
   return /*#__PURE__*/React__default["default"].createElement("div", Object.assign({
     ref: ref,
@@ -228,37 +314,7 @@ var BaseTable = /*#__PURE__*/React.forwardRef(function (_a, ref) {
       hasSumColumn: hasSumColumn,
       virtual: virtual
     })
-  }, /*#__PURE__*/React__default["default"].createElement("div", Object.assign({}, getTableHeaderProps()), /*#__PURE__*/React__default["default"].createElement(TableHeader.TableHeader, {
-    prefixCls: prefixCls + "-header"
-  }), 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, {
-    prefixCls: prefixCls,
-    emptyContent: emptyContent
-  })), (alwaysFixedColumn || scrollSize.scrollLeft > 0) && leftFrozenColKeys.length > 0 ? /*#__PURE__*/React__default["default"].createElement("div", {
-    className: prefixCls + "-freeze-shadow  " + prefixCls + "-freeze-shadow--left",
-    style: {
-      width: leftFixedColumnsWidth + 'px'
-    }
-  }) : null, (alwaysFixedColumn || scrollSize.scrollRight > 0) && rightFrozenColKeys.length > 0 ? /*#__PURE__*/React__default["default"].createElement("div", {
-    className: prefixCls + "-freeze-shadow " + prefixCls + "-freeze-shadow--right",
-    style: {
-      width: rightFixedColumnsWidth + 'px'
-    }
-  }) : null), /*#__PURE__*/React__default["default"].createElement("div", {
-    className: prefixCls + "-footer",
-    style: stickyFooter ? {
-      position: 'sticky',
-      bottom: stickyFooterBottom // boxShadow: '0 5px 15px 0 rgba(0, 0, 0, 0.1)'
-
-    } : undefined
-  }, extraFooter));
+  }, renderTable()), renderFreezeShadow()), tableFooter);
 });
 
 if (env.__DEV__) {

package/lib/cjs/ColGroupContent.js

@@ -0,0 +1,56 @@
+/** @LICENSE
+ * @hi-ui/table
+ * https://github.com/XiaoMi/hiui/tree/master/packages/ui/table#readme
+ *
+ * Copyright (c) HiUI <mi-hiui@xiaomi.com>.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+'use strict';
+
+var _typeof = require("@babel/runtime/helpers/typeof");
+
+Object.defineProperty(exports, '__esModule', {
+  value: true
+});
+
+var React = require('react');
+
+var classname = require('@hi-ui/classname');
+
+var env = require('@hi-ui/env');
+
+var context = require('./context.js');
+
+function _interopDefaultLegacy(e) {
+  return e && _typeof(e) === 'object' && 'default' in e ? e : {
+    'default': e
+  };
+}
+
+var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
+
+var _prefix = classname.getPrefixCls('table-colgroup');
+
+var ColGroupContent = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
+  var _ref$prefixCls = _ref.prefixCls,
+      prefixCls = _ref$prefixCls === void 0 ? _prefix : _ref$prefixCls;
+
+  var _useTableContext = context.useTableContext(),
+      getColgroupProps = _useTableContext.getColgroupProps,
+      leafColumns = _useTableContext.leafColumns;
+
+  return /*#__PURE__*/React__default["default"].createElement("colgroup", null, leafColumns.map(function (col, idx) {
+    return /*#__PURE__*/React__default["default"].createElement("col", Object.assign({
+      key: idx,
+      className: prefixCls + "-col"
+    }, getColgroupProps(col, idx)));
+  }));
+});
+
+if (env.__DEV__) {
+  ColGroupContent.displayName = 'ColGroupContent';
+}
+
+exports.ColGroupContent = ColGroupContent;

package/lib/cjs/Table.js

@@ -66,7 +66,13 @@ var Loading__default = /*#__PURE__*/_interopDefaultLegacy(Loading);
 var Checkbox__default = /*#__PURE__*/_interopDefaultLegacy(Checkbox);
 
 var _prefix = classname.getPrefixCls('table');
+/**
+ * 需要使用双表格的场景对应的 API
+ * 这些场景下的功能无法通过单表格实现，故而设计成双表格，即表头和表体分别用一个 table 实现
+ */
+
 
+var DOUBLE_TABLE_SCENE = ['maxHeight', 'sticky', 'stickyTop', 'setting', 'virtual'];
 var STANDARD_PRESET = {
   striped: true,
   bordered: true,
@@ -85,7 +91,6 @@ var DEFAULT_PAGINATION = {
  */
 
 var Table = /*#__PURE__*/React.forwardRef(function (_a, ref) {
-  // ************************ 预置标准模式 ************************ //
   var _a$prefixCls = _a.prefixCls,
       prefixCls = _a$prefixCls === void 0 ? _prefix : _a$prefixCls,
       _a$standard = _a.standard,
@@ -108,8 +113,13 @@ var Table = /*#__PURE__*/React.forwardRef(function (_a, ref) {
       extra = _a.extra,
       _a$data = _a.data,
       data = _a$data === void 0 ? DEFAULT_DATA : _a$data,
-      virtual = _a.virtual,
-      rest = tslib.__rest(_a, ["prefixCls", "standard", "loading", "dataSource", "pagination", "uniqueId", "columns", "hiddenColKeys", "onHiddenColKeysChange", "sortedColKeys", "onSortedColKeysChange", "checkDisabledColKeys", "onSetColKeysChange", "rowSelection", "fieldKey", "extra", "data", "virtual"]);
+      rest = tslib.__rest(_a, ["prefixCls", "standard", "loading", "dataSource", "pagination", "uniqueId", "columns", "hiddenColKeys", "onHiddenColKeysChange", "sortedColKeys", "onSortedColKeysChange", "checkDisabledColKeys", "onSetColKeysChange", "rowSelection", "fieldKey", "extra", "data"]); // 是否需要双表格
+
+
+  var needDoubleTable = DOUBLE_TABLE_SCENE.some(function (prop) {
+    return !!rest[prop];
+  });
+  var virtual = rest.virtual; // ************************ 预置标准模式 ************************ //
 
   var tableProps = reactUtils.withDefaultProps(rest, standard ? STANDARD_PRESET : undefined);
 
@@ -321,6 +331,7 @@ var Table = /*#__PURE__*/React.forwardRef(function (_a, ref) {
     data: mergedData,
     fieldKey: fieldKey,
     virtual: virtual,
+    needDoubleTable: needDoubleTable,
     extra: Object.assign({
       header: setting ? /*#__PURE__*/React__default["default"].createElement(TableSettingMenu.TableSettingMenu, {
         prefixCls: prefixCls + "-setting",

package/lib/cjs/TableBody.js

@@ -27,12 +27,18 @@ var useLatest = require('@hi-ui/use-latest');
 
 var typeAssertion = require('@hi-ui/type-assertion');
 
-var emptyState = require('@hi-ui/empty-state');
+require('./packages/ui/scrollbar/lib/esm/styles/index.scss.js');
+
+var Scrollbar = require('./packages/ui/scrollbar/lib/esm/Scrollbar.js');
 
 var TableRow = require('./TableRow.js');
 
 var context = require('./context.js');
 
+var ColGroupContent = require('./ColGroupContent.js');
+
+var TbodyContent = require('./TbodyContent.js');
+
 function _interopDefaultLegacy(e) {
   return e && _typeof(e) === 'object' && 'default' in e ? e : {
     'default': e
@@ -54,10 +60,8 @@ var TableBody = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
 
   var _useTableContext = context.useTableContext(),
       columns = _useTableContext.columns,
-      leafColumns = _useTableContext.leafColumns,
       isExpandTreeRows = _useTableContext.isExpandTreeRows,
       transitionData = _useTableContext.transitionData,
-      getColgroupProps = _useTableContext.getColgroupProps,
       bodyTableRef = _useTableContext.bodyTableRef,
       scrollBodyElementRef = _useTableContext.scrollBodyElementRef,
       onTableBodyScroll = _useTableContext.onTableBodyScroll,
@@ -65,13 +69,10 @@ var TableBody = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
       maxHeight = _useTableContext.maxHeight,
       canScroll = _useTableContext.canScroll,
       scrollWidth = _useTableContext.scrollWidth,
-      hasAvgColumn = _useTableContext.hasAvgColumn,
-      avgRow = _useTableContext.avgRow,
-      hasSumColumn = _useTableContext.hasSumColumn,
-      sumRow = _useTableContext.sumRow,
       colWidths = _useTableContext.colWidths,
       virtual = _useTableContext.virtual,
-      measureRowElementRef = _useTableContext.measureRowElementRef;
+      measureRowElementRef = _useTableContext.measureRowElementRef,
+      scrollbar = _useTableContext.scrollbar;
 
   var cls = classname.cx(prefixCls + "-body");
   var getRequiredProps = useLatest.useLatestCallback(function (id) {
@@ -157,89 +158,35 @@ var TableBody = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
           rowData: row
         }, getRequiredProps(row.id))));
       }
-    })) : renderEmptyContent(Object.assign({
+    })) : TbodyContent.renderEmptyContent(Object.assign({
       className: prefixCls + "-empty-content",
       colSpan: columns.length,
       emptyContent: emptyContent
     }, scrollBodyElementRef.current ? {
       scrollBodyWidth: window.getComputedStyle(scrollBodyElementRef.current).getPropertyValue('width')
     } : {})));
-  } // 外层增加 div 作为滚动容器
+  }
 
-
-  return /*#__PURE__*/React__default["default"].createElement("div", {
+  var bodyContent = /*#__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(TbodyContent.TbodyContent, null));
+  var scrollBodyProps = {
     ref: scrollBodyElementRef,
     className: cls,
     onScroll: onTableBodyScroll,
     style: {
-      maxHeight: maxHeight !== undefined ? maxHeight : undefined,
-      // 表格宽度大于div宽度才出现横向滚动条
-      overflowX: canScroll ? 'scroll' : undefined
+      maxHeight: maxHeight
     }
-  }, /*#__PURE__*/React__default["default"].createElement("table", {
-    ref: bodyTableRef,
-    style: {
-      width: canScroll && scrollWidth !== undefined ? scrollWidth : '100%'
-    }
-  }, /*#__PURE__*/React__default["default"].createElement("colgroup", null, leafColumns.map(function (col, idx) {
-    return /*#__PURE__*/React__default["default"].createElement("col", Object.assign({
-      key: idx,
-      className: prefixCls + "-col"
-    }, getColgroupProps(col, idx)));
-  })), /*#__PURE__*/React__default["default"].createElement("tbody", null, typeAssertion.isArrayNonEmpty(transitionData) ? /*#__PURE__*/React__default["default"].createElement(React__default["default"].Fragment, null, transitionData.map(function (row, index) {
-    return /*#__PURE__*/React__default["default"].createElement(TableRow.TableRow, Object.assign({
-      ref: index === 0 ? measureRowElementRef : null,
-      // key={depth + index}
-      key: row.id,
-      // @ts-ignore
-      rowIndex: index,
-      rowData: row
-    }, getRequiredProps(row.id)));
-  }), hasSumColumn ? /*#__PURE__*/React__default["default"].createElement(TableRow.TableRow, {
-    key: sumRow.id,
-    rowIndex: transitionData.length,
-    rowData: sumRow,
-    isSumRow: true
-  }) : null, hasAvgColumn ? /*#__PURE__*/React__default["default"].createElement(TableRow.TableRow, {
-    key: avgRow.id,
-    rowIndex: transitionData.length + 1,
-    rowData: avgRow,
-    isAvgRow: true
-  }) : null) : // 空状态，colSpan 占满表格整行
-  renderEmptyContent(Object.assign({
-    className: prefixCls + "-empty-content",
-    colSpan: columns.length,
-    emptyContent: emptyContent
-  }, scrollBodyElementRef.current ? {
-    scrollBodyWidth: window.getComputedStyle(scrollBodyElementRef.current).getPropertyValue('width')
-  } : {})))));
+  }; // 外层增加 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);
 });
 
 if (env.__DEV__) {
   TableBody.displayName = 'TableBody';
 }
-/**
- * 负责空状态渲染
- */
-
-
-var renderEmptyContent = function renderEmptyContent(_ref2) {
-  var className = _ref2.className,
-      colSpan = _ref2.colSpan,
-      emptyContent = _ref2.emptyContent,
-      scrollBodyWidth = _ref2.scrollBodyWidth;
-  return /*#__PURE__*/React__default["default"].createElement("tr", {
-    className: className
-  }, /*#__PURE__*/React__default["default"].createElement("td", {
-    colSpan: colSpan
-  }, /*#__PURE__*/React__default["default"].createElement("div", {
-    style: {
-      position: 'sticky',
-      left: 0,
-      width: scrollBodyWidth !== null && scrollBodyWidth !== void 0 ? scrollBodyWidth : '100%',
-      overflow: 'hidden'
-    }
-  }, emptyContent || /*#__PURE__*/React__default["default"].createElement(emptyState.EmptyState, null))));
-};
 
 exports.TableBody = TableBody;

package/lib/cjs/TableHeader.js

@@ -17,19 +17,15 @@ Object.defineProperty(exports, '__esModule', {
 
 var React = require('react');
 
-var reactResizable = require('react-resizable');
-
 var classname = require('@hi-ui/classname');
 
 var env = require('@hi-ui/env');
 
-var typeAssertion = require('@hi-ui/type-assertion');
-
 var context = require('./context.js');
 
-var TableAdvancedFilter = require('./TableAdvancedFilter.js');
+var ColGroupContent = require('./ColGroupContent.js');
 
-var useCheckState = require('@hi-ui/use-check-state');
+var TheadContent = require('./TheadContent.js');
 
 function _interopDefaultLegacy(e) {
   return e && _typeof(e) === 'object' && 'default' in e ? e : {
@@ -47,21 +43,10 @@ var TableHeader = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
       className = _ref.className;
 
   var _useTableContext = context.useTableContext(),
-      groupedColumns = _useTableContext.groupedColumns,
-      resizable = _useTableContext.resizable,
-      colWidths = _useTableContext.colWidths,
-      isHoveredHighlightCol = _useTableContext.isHoveredHighlightCol,
-      isHighlightedCol = _useTableContext.isHighlightedCol,
-      getColgroupProps = _useTableContext.getColgroupProps,
-      onColumnResizable = _useTableContext.onColumnResizable,
-      getStickyColProps = _useTableContext.getStickyColProps,
       onTableBodyScrollMock = _useTableContext.onTableBodyScrollMock,
       scrollHeaderElementRef = _useTableContext.scrollHeaderElementRef,
-      leafColumns = _useTableContext.leafColumns,
-      getTableHeaderProps = _useTableContext.getTableHeaderProps,
-      showColMenu = _useTableContext.showColMenu;
+      getTableHeaderProps = _useTableContext.getTableHeaderProps;
 
-  var activeColumnKeysAction = useCheckState.useCheckState();
   var cls = classname.cx(prefixCls, className);
   return /*#__PURE__*/React__default["default"].createElement("div", Object.assign({
     className: cls,
@@ -71,60 +56,9 @@ var TableHeader = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
       width: '100%',
       position: 'relative'
     }
-  }, /*#__PURE__*/React__default["default"].createElement("colgroup", null, leafColumns.map(function (col, idx) {
-    return /*#__PURE__*/React__default["default"].createElement("col", Object.assign({
-      key: idx,
-      className: prefixCls + "-col"
-    }, getColgroupProps(col, idx)));
-  })), /*#__PURE__*/React__default["default"].createElement("thead", {
+  }, /*#__PURE__*/React__default["default"].createElement(ColGroupContent.ColGroupContent, null), /*#__PURE__*/React__default["default"].createElement(TheadContent.TheadContent, {
     onWheel: onTableBodyScrollMock
-  }, groupedColumns.map(function (cols, colsIndex) {
-    return /*#__PURE__*/React__default["default"].createElement("tr", {
-      key: colsIndex
-    }, cols.map(function (col, colIndex) {
-      var _ref2 = col || {},
-          dataKey = _ref2.dataKey,
-          title = _ref2.title,
-          raw = _ref2.raw;
-
-      var titleContent = typeAssertion.isFunction(title) ? title(col) : title;
-      var cell = /*#__PURE__*/React__default["default"].createElement("th", Object.assign({
-        key: dataKey
-      }, getStickyColProps(col), {
-        className: classname.cx(prefixCls + "-cell", raw.className, isHighlightedCol(dataKey) && prefixCls + "-cell__col--highlight", isHoveredHighlightCol(dataKey) && prefixCls + "-cell__col--hovered-highlight", activeColumnKeysAction.has(dataKey) && prefixCls + "-cell__col--active"),
-        // @ts-ignore
-        colSpan: col.colSpan,
-        // @ts-ignore
-        rowSpan: col.rowSpan
-      }), titleContent, TableAdvancedFilter.renderFilter({
-        prefixCls: prefixCls + "-filter",
-        columnKey: dataKey,
-        showColMenu: showColMenu,
-        column: col,
-        onOpen: function onOpen() {
-          return activeColumnKeysAction.add(dataKey);
-        },
-        onClose: function onClose() {
-          return activeColumnKeysAction.remove(dataKey);
-        }
-      }));
-      return resizable && colIndex !== colWidths.length - 1 ? /*#__PURE__*/React__default["default"].createElement(reactResizable.Resizable, {
-        key: colIndex,
-        className: prefixCls + "__resizable",
-        draggableOpts: {
-          enableUserSelectHack: false
-        },
-        handle: /*#__PURE__*/React__default["default"].createElement("span", {
-          className: prefixCls + "__resizable-handle"
-        }),
-        height: 0,
-        width: colWidths[colIndex],
-        onResize: function onResize(evt, options) {
-          onColumnResizable(evt, options, colIndex);
-        }
-      }, cell) : cell;
-    }));
-  }))));
+  })));
 });
 
 if (env.__DEV__) {