@hi-ui/table 4.1.3-alpha.1 → 4.2.0

package/CHANGELOG.md

@@ -1,5 +1,18 @@
 # @hi-ui/table
 
+## 4.2.0
+
+### Minor Changes
+
+- [#2597](https://github.com/XiaoMi/hiui/pull/2597) [`0ddf24960`](https://github.com/XiaoMi/hiui/commit/0ddf24960194fdd15653e34e0a6cef54b1586748) Thanks [@zyprepare](https://github.com/zyprepare)! - chore: axios 升级为 1.5.0
+
+### Patch Changes
+
+- [#2608](https://github.com/XiaoMi/hiui/pull/2608) [`fb9b1281d`](https://github.com/XiaoMi/hiui/commit/fb9b1281d99ba0d21b5cb32c87b5e671272c1c8e) Thanks [@zyprepare](https://github.com/zyprepare)! - fix: 修复紧凑模式下多选项间距问题
+
+- Updated dependencies [[`b3b36813a`](https://github.com/XiaoMi/hiui/commit/b3b36813a6968c5c96c39d1100935372e3aa5b4d)]:
+  - @hi-ui/select@4.2.0
+
 ## 4.1.2
 
 ### Patch Changes

package/lib/cjs/BaseTable.js

@@ -45,12 +45,6 @@ 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
@@ -67,6 +61,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 _a$prefixCls = _a.prefixCls,
       prefixCls = _a$prefixCls === void 0 ? _prefix : _a$prefixCls,
       _a$role = _a.role,
@@ -84,7 +79,8 @@ var BaseTable = /*#__PURE__*/React.forwardRef(function (_a, ref) {
       expandedEmbedRowKeys = _a.expandedEmbedRowKeys,
       onEmbedExpand = _a.onEmbedExpand,
       expandedRender = _a.expandedRender,
-      size = _a.size,
+      _a$size = _a.size,
+      size = _a$size === void 0 ? 'md' : _a$size,
       extra = _a.extra,
       onRow = _a.onRow,
       stickyFooter = _a.stickyFooter,
@@ -94,9 +90,7 @@ var BaseTable = /*#__PURE__*/React.forwardRef(function (_a, ref) {
       fixedColumnTrigger = _a$fixedColumnTrigger === void 0 ? 'auto' : _a$fixedColumnTrigger,
       emptyContent = _a.emptyContent,
       virtual = _a.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"]); // ********************** 内嵌式面板 *********************** //
-
+      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"]);
 
   var _useEmbedExpand = useEmbedExpand.useEmbedExpand({
     defaultExpandedEmbedRowKeys: defaultExpandedEmbedRowKeys,
@@ -152,70 +146,48 @@ var BaseTable = /*#__PURE__*/React.forwardRef(function (_a, ref) {
 
     return columns;
   }, [embedExpandable, getEmbedPanelColumn, columns]);
-  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');
-      }
+  var i18n = core.useLocaleContext(); // 确保包含 avg 属性，且值为数字类型的字符串
 
-      if (index.checkNeedTotalOrEvg(data, column, 'avg')) {
-        hasAvgColumn = true; // @ts-ignore
-        // @ts-ignore
+  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');
+    }
 
-        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');
-      }
+    if (index.checkNeedTotalOrEvg(data, column, 'avg')) {
+      hasAvgColumn = true; // @ts-ignore
 
-      if (index.checkNeedTotalOrEvg(data, column, 'total')) {
-        hasSumColumn = true; // 获取当前数据最大小数点个数，并设置最后总和值小数点
-        // @ts-ignore
-        // 获取当前数据最大小数点个数，并设置最后总和值小数点
-        // @ts-ignore
+      avgRow.raw[column.dataKey] = index.getTotalOrEvgRowData(data, column, true);
+    }
+  }); // 确保包含total属性，且值为数字类型的字符串
 
-        sumRow.raw[column.dataKey] = index.getTotalOrEvgRowData(data, column, false);
-      }
-    });
-    return {
-      sumRow: sumRow,
-      hasSumColumn: hasSumColumn
-    };
-  }, [columns, data, i18n]),
-      sumRow = _useMemo2.sumRow,
-      hasSumColumn = _useMemo2.hasSumColumn;
+  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
+
+      sumRow.raw[column.dataKey] = index.getTotalOrEvgRowData(data, column, false);
+    }
+  });
   var providedValue = useTable.useTable(Object.assign(Object.assign({}, rest), {
     columns: mergedColumns,
     data: data,
@@ -228,67 +200,11 @@ var BaseTable = /*#__PURE__*/React.forwardRef(function (_a, ref) {
       leftFixedColumnsWidth = providedValue.leftFixedColumnsWidth,
       rightFixedColumnsWidth = providedValue.rightFixedColumnsWidth,
       scrollSize = providedValue.scrollSize,
-      getTableHeaderProps = providedValue.getTableHeaderProps,
-      scrollBodyElementRef = providedValue.scrollBodyElementRef,
-      onTableBodyScroll = providedValue.onTableBodyScroll,
-      canScroll = providedValue.canScroll,
-      bodyTableRef = providedValue.bodyTableRef,
-      scrollWidth = providedValue.scrollWidth;
+      getTableHeaderProps = providedValue.getTableHeaderProps;
   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
-  }, 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,
@@ -312,7 +228,37 @@ var BaseTable = /*#__PURE__*/React.forwardRef(function (_a, ref) {
       hasSumColumn: hasSumColumn,
       virtual: virtual
     })
-  }, renderTable()), renderFreezeShadow()), tableFooter);
+  }, /*#__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));
 });
 
 if (env.__DEV__) {

package/lib/cjs/Table.js

@@ -66,13 +66,7 @@ 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,
@@ -91,6 +85,7 @@ 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,
@@ -113,13 +108,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"]); // 是否需要双表格
-
-
-  var needDoubleTable = DOUBLE_TABLE_SCENE.some(function (prop) {
-    return !!rest[prop];
-  });
-  var virtual = rest.virtual; // ************************ 预置标准模式 ************************ //
+      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"]);
 
   var tableProps = reactUtils.withDefaultProps(rest, standard ? STANDARD_PRESET : undefined);
 
@@ -331,7 +321,6 @@ 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,14 +27,12 @@ var useLatest = require('@hi-ui/use-latest');
 
 var typeAssertion = require('@hi-ui/type-assertion');
 
+var emptyState = require('@hi-ui/empty-state');
+
 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
@@ -56,8 +54,10 @@ 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,6 +65,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;
@@ -153,7 +157,7 @@ var TableBody = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
           rowData: row
         }, getRequiredProps(row.id))));
       }
-    })) : TbodyContent.renderEmptyContent(Object.assign({
+    })) : renderEmptyContent(Object.assign({
       className: prefixCls + "-empty-content",
       colSpan: columns.length,
       emptyContent: emptyContent
@@ -177,11 +181,65 @@ var TableBody = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
     style: {
       width: canScroll && scrollWidth !== undefined ? scrollWidth : '100%'
     }
-  }, /*#__PURE__*/React__default["default"].createElement(ColGroupContent.ColGroupContent, null), /*#__PURE__*/React__default["default"].createElement(TbodyContent.TbodyContent, null)));
+  }, /*#__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')
+  } : {})))));
 });
 
 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,15 +17,19 @@ 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 ColGroupContent = require('./ColGroupContent.js');
+var TableAdvancedFilter = require('./TableAdvancedFilter.js');
 
-var TheadContent = require('./TheadContent.js');
+var useCheckState = require('@hi-ui/use-check-state');
 
 function _interopDefaultLegacy(e) {
   return e && _typeof(e) === 'object' && 'default' in e ? e : {
@@ -43,10 +47,21 @@ 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,
-      getTableHeaderProps = _useTableContext.getTableHeaderProps;
+      leafColumns = _useTableContext.leafColumns,
+      getTableHeaderProps = _useTableContext.getTableHeaderProps,
+      showColMenu = _useTableContext.showColMenu;
 
+  var activeColumnKeysAction = useCheckState.useCheckState();
   var cls = classname.cx(prefixCls, className);
   return /*#__PURE__*/React__default["default"].createElement("div", Object.assign({
     className: cls,
@@ -56,9 +71,60 @@ var TableHeader = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
       width: '100%',
       position: 'relative'
     }
-  }, /*#__PURE__*/React__default["default"].createElement(ColGroupContent.ColGroupContent, null), /*#__PURE__*/React__default["default"].createElement(TheadContent.TheadContent, {
+  }, /*#__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", {
     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__) {

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

@@ -90,17 +90,19 @@ var useColWidth = function useColWidth(_ref) {
       var _resizeObserver = new ResizeObserver(function () {
         if (virtual) {
           setColWidths(getVirtualWidths());
-        } // 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)
-        //     }
-        //   }
-        // }
-
+        } else {
+          if (measureRowElement.childNodes) {
+            var _realColumnsWidth = Array.from(measureRowElement.childNodes).map(function (node) {
+              return node.getBoundingClientRect().width || 0;
+            });
+
+            if (_realColumnsWidth.some(function (width) {
+              return width && width > 0;
+            })) {
+              setColWidths(_realColumnsWidth);
+            }
+          }
+        }
       });
 
       _resizeObserver.observe(measureRowElement);