@hi-ui/table 4.3.0 → 4.3.1

package/CHANGELOG.md

@@ -1,5 +1,16 @@
 # @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

package/lib/cjs/TableBody.js

@@ -27,6 +27,10 @@ var useLatest = require('@hi-ui/use-latest');
 
 var typeAssertion = require('@hi-ui/type-assertion');
 
+require('./packages/ui/scrollbar/lib/esm/styles/index.scss.js');
+
+var Scrollbar = require('./packages/ui/scrollbar/lib/esm/Scrollbar.js');
+
 var TableRow = require('./TableRow.js');
 
 var context = require('./context.js');
@@ -67,7 +71,8 @@ var TableBody = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
       scrollWidth = _useTableContext.scrollWidth,
       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) {
@@ -160,24 +165,24 @@ var TableBody = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
     }, 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
-    }
-  }, /*#__PURE__*/React__default["default"].createElement("table", {
-    ref: bodyTableRef,
-    style: {
-      width: canScroll && scrollWidth !== undefined ? scrollWidth : '100%'
+      maxHeight: maxHeight
     }
-  }, /*#__PURE__*/React__default["default"].createElement(ColGroupContent.ColGroupContent, null), /*#__PURE__*/React__default["default"].createElement(TbodyContent.TbodyContent, null)));
+  }; // 外层增加 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__) {