shineout 3.3.0-beta.12 → 3.3.0-beta.13

package/cjs/index.js

@@ -476,5 +476,5 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 // 此文件由脚本自动生成，请勿直接修改。
 // This file was generated automatically by a script. Please do not modify it directly.
 var _default = exports.default = {
-  version: '3.3.0-beta.12'
+  version: '3.3.0-beta.13'
 };

package/dist/shineout.js

@@ -11968,7 +11968,7 @@ var handleStyle = function handleStyle(style) {
 };
 /* harmony default export */ var jss_style_handleStyle = (handleStyle);
 ;// CONCATENATED MODULE: ../shineout-style/src/version.ts
-/* harmony default export */ var version = ('3.3.0-beta.12');
+/* harmony default export */ var version = ('3.3.0-beta.13');
 ;// CONCATENATED MODULE: ../shineout-style/src/jss-style/index.tsx
 
 
@@ -28157,6 +28157,15 @@ var isFirefox = function isFirefox() {
   if (!is_isBrowser()) return false;
   return navigator.userAgent.toLowerCase().indexOf('firefox') > -1;
 };
+var isChromeLowerThan = function isChromeLowerThan(version) {
+  // 服务器端渲染时，不执行版本检查
+  if (typeof window === 'undefined' || typeof navigator === 'undefined') {
+    return false;
+  }
+  var ua = navigator.userAgent;
+  var chrome = ua.match(/chrome\/(\d+)/i);
+  return Boolean(chrome && chrome[1] && parseInt(chrome[1], 10) < version);
+};
 function isDomElement(element) {
   return (typeof HTMLElement === "undefined" ? "undefined" : typeof_default()(HTMLElement)) === 'object' ? element instanceof HTMLElement // DOM2
   : element && typeof_default()(element) === 'object' && element !== null && element.nodeType === 1 && typeof element.nodeName === 'string';
@@ -47820,7 +47829,8 @@ var Scroll = function Scroll(props) {
   var containerRef = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useRef)(null);
   var _useRef = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useRef)({
       timer: null,
-      isMouseDown: false
+      isMouseDown: false,
+      lastPaddingTop: 0
     }),
     context = _useRef.current;
   var _props$scrollHeight = props.scrollHeight,
@@ -47849,10 +47859,17 @@ var Scroll = function Scroll(props) {
     overflow: 'hidden',
     position: 'sticky'
   }, isRtl ? 'right' : 'left', 0), "top", 0);
+  var pd = context.lastPaddingTop;
+  if (height > 0 && scrollHeight > 0) {
+    pd = Math.max(0, Math.floor(scrollHeight - height));
+    context.lastPaddingTop = pd;
+  }
   var placeStyle = {
-    paddingTop: height > 0 && scrollHeight > 0 ? Math.max(0, Math.floor(scrollHeight - height)) : 0,
+    paddingTop: pd,
     width: scrollWidth,
-    overflow: 'hidden',
+    overflow: props.isScrollY ? 'hidden' : 'auto hidden',
+    height: props.isScrollY ? 0 : 1,
+    marginTop: props.isScrollY ? 0 : -1,
     lineHeight: 0
   };
   var handleScroll = usePersistFn(function (e) {
@@ -55113,6 +55130,10 @@ var useTableLayout = function useTableLayout(props) {
     });
   };
   var changeColGroup = function changeColGroup(cols, adjust) {
+    // 修改`Table`被display:none时，表格头样式错乱的问题
+    if (cols && cols.every(function (v) {
+      return v === 0;
+    })) return;
     setColgroup(cols);
     setAdjust(adjust);
     if (!adjust) {
@@ -56039,9 +56060,10 @@ var Colgroup = function Colgroup(props) {
     return /*#__PURE__*/(0,jsx_runtime.jsx)("colgroup", {
       children: colgroup === null || colgroup === void 0 ? void 0 : colgroup.map(function (item, index) {
         var isLast = index === colgroup.length - 1;
+        var width = isLast && props.shouldLastColAuto ? undefined : item;
         return /*#__PURE__*/(0,jsx_runtime.jsx)("col", {
           style: {
-            width: isLast && props.shouldLastColAuto ? undefined : item
+            width: width
           }
         }, columns[index].key);
       })
@@ -57271,8 +57293,8 @@ var emptyRef = {
       parent: tableRef === null || tableRef === void 0 ? void 0 : tableRef.current
     };
     var isRenderBaseTable = !virtual && !isScrollY && !props.sticky && ((_props$data3 = props.data) === null || _props$data3 === void 0 ? void 0 : _props$data3.length);
-    var headWrapperClass = classnames_default()(tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.headWrapper, (isScrollY && scrollBarWidth || isRenderBaseTable) && (tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.scrollY));
-    var footWrapperClass = classnames_default()(tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.footWrapper, (isScrollY && scrollBarWidth || isRenderBaseTable) && (tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.scrollY));
+    var headWrapperClass = classnames_default()(tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.headWrapper, isScrollY && scrollBarWidth && (tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.scrollY));
+    var footWrapperClass = classnames_default()(tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.footWrapper, isScrollY && scrollBarWidth && (tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.scrollY));
     if (isRenderBaseTable) {
       return /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
         ref: scrollRef,
@@ -57311,6 +57333,7 @@ var emptyRef = {
         scrollHeight: virtual ? virtualInfo.scrollHeight : tbodyHeight,
         onScroll: handleVirtualScroll,
         defaultHeight: context.emptyHeight,
+        isScrollY: isScrollY,
         children: /*#__PURE__*/(0,jsx_runtime.jsxs)("table", {
           style: {
             width: width,
@@ -63519,7 +63542,7 @@ var upload_interface = __webpack_require__(8821);
 
 
 /* harmony default export */ var src_0 = ({
-  version: '3.3.0-beta.12'
+  version: '3.3.0-beta.13'
 });
 }();
 /******/ 	return __webpack_exports__;