shineout 3.7.0-beta.14 → 3.7.0-beta.16

package/cjs/index.js

@@ -514,5 +514,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.7.0-beta.14'
+  version: '3.7.0-beta.16'
 };

package/dist/shineout.js

@@ -12217,7 +12217,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.7.0-beta.14');
+/* harmony default export */ var version = ('3.7.0-beta.16');
 ;// CONCATENATED MODULE: ../shineout-style/src/jss-style/index.tsx
 
 
@@ -21765,9 +21765,6 @@ var modalStyle = objectSpread2_default()(objectSpread2_default()({
       height: '100vh',
       width: '100vw',
       overflow: 'auto'
-    },
-    '& $body': {
-      minHeight: 'auto'
     }
   },
   wrapperZoom: {
@@ -25857,7 +25854,7 @@ var tableStyle = objectSpread2_default()(objectSpread2_default()({
     '$wrapper & table > tfoot': {
       position: 'sticky',
       bottom: 0,
-      zIndex: fixedIndex
+      zIndex: fixedFixedIndex + 1
     }
   },
   footWrapper: {
@@ -25877,6 +25874,11 @@ var tableStyle = objectSpread2_default()(objectSpread2_default()({
       background: 'transparent'
     }))
   },
+  scrollX: {
+    '&$headWrapper, &$footWrapper': {
+      overflowX: 'hidden'
+    }
+  },
   emptyWrapper: {
     minHeight: '170px',
     width: '100%',
@@ -63575,7 +63577,13 @@ var emptyRef = {
   });
   (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useEffect)(function () {
     var _theadRef$current, _tfootRef$current;
-    context.theadAndTfootHeight = ((theadRef === null || theadRef === void 0 || (_theadRef$current = theadRef.current) === null || _theadRef$current === void 0 ? void 0 : _theadRef$current.clientHeight) || 0) + (((_tfootRef$current = tfootRef.current) === null || _tfootRef$current === void 0 ? void 0 : _tfootRef$current.clientHeight) || 0);
+    var theadHeight = (theadRef === null || theadRef === void 0 || (_theadRef$current = theadRef.current) === null || _theadRef$current === void 0 ? void 0 : _theadRef$current.clientHeight) || 0;
+    var tfootHeight = ((_tfootRef$current = tfootRef.current) === null || _tfootRef$current === void 0 ? void 0 : _tfootRef$current.clientHeight) || 0;
+    if (props.sticky) {
+      context.theadAndTfootHeight = tfootHeight;
+    } else {
+      context.theadAndTfootHeight = theadHeight + tfootHeight;
+    }
   }, [theadRef.current, tfootRef.current]);
   var virtualInfo = use_table_virtual({
     disabled: !virtual,
@@ -63591,15 +63599,11 @@ var emptyRef = {
     theadAndTfootHeight: context.theadAndTfootHeight
   });
   var syncHeaderScroll = usePersistFn(function (left) {
-    var _tableRef$current;
+    var _theadRef$current2;
     if (props.hideHeader || !props.sticky) return;
-    var headerScrollers = (_tableRef$current = tableRef.current) === null || _tableRef$current === void 0 ? void 0 : _tableRef$current.querySelectorAll(".".concat(tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.headWrapper));
-    headerScrollers === null || headerScrollers === void 0 || headerScrollers.forEach(function (item) {
-      if (!item) return;
-      if (item.scrollLeft !== left) {
-        item.scrollLeft = left;
-      }
-    });
+    if (theadRef && theadRef !== null && theadRef !== void 0 && theadRef.current && theadRef !== null && theadRef !== void 0 && (_theadRef$current2 = theadRef.current) !== null && _theadRef$current2 !== void 0 && _theadRef$current2.parentElement) {
+      theadRef.current.parentElement.scrollLeft = left;
+    }
   });
 
   // 简单表格的滚动事件
@@ -63740,7 +63744,7 @@ var emptyRef = {
       parent: tableRef === null || tableRef === void 0 ? void 0 : tableRef.current
     };
     var isRenderVirtualTable = virtual || props.sticky || !((_props$data3 = props.data) !== null && _props$data3 !== void 0 && _props$data3.length);
-    var headWrapperClass = classnames_default()(tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.headWrapper, props.sticky && isScrollY && tableClasses.scrollY);
+    var headWrapperClass = classnames_default()(tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.headWrapper, props.sticky && isScrollY && tableClasses.scrollY, props.sticky && !isScrollY && tableClasses.scrollX);
     var footWrapperClass = classnames_default()(tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.footWrapper);
     var renderHeadMirrorScroller = function renderHeadMirrorScroller() {
       var _scrollRef$current, _scrollRef$current2, _scrollRef$current3;
@@ -63908,10 +63912,10 @@ var emptyRef = {
 
   // handle head and  foot scroll
   var handleHeaderWheel = usePersistFn(function (e) {
-    var _theadRef$current2;
+    var _theadRef$current3;
     var scrollEl = scrollRef.current;
     if (!scrollEl) return;
-    if (!(theadRef !== null && theadRef !== void 0 && (_theadRef$current2 = theadRef.current) !== null && _theadRef$current2 !== void 0 && _theadRef$current2.parentElement)) return;
+    if (!(theadRef !== null && theadRef !== void 0 && (_theadRef$current3 = theadRef.current) !== null && _theadRef$current3 !== void 0 && _theadRef$current3.parentElement)) return;
     var max = scrollEl.scrollWidth - scrollEl.clientWidth;
     var scrollLeft = scrollEl.scrollLeft + e.deltaX;
     if (scrollLeft === scrollEl.scrollLeft) {
@@ -64099,7 +64103,8 @@ var TabsPanel = function TabsPanel(props) {
     active = _useTabsContext.active,
     lazy = _useTabsContext.lazy,
     setTabs = _useTabsContext.setTabs,
-    color = _useTabsContext.color;
+    color = _useTabsContext.color,
+    shape = _useTabsContext.shape;
   var isActive = active === id;
   var keekAlive = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useRef)(false);
   (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useLayoutEffect)(function () {
@@ -64108,7 +64113,7 @@ var TabsPanel = function TabsPanel(props) {
       tab: tab,
       disabled: props.disabled,
       jssStyle: jssStyle,
-      background: background,
+      background: shape !== 'button' && shape !== 'fill' ? background : undefined,
       color: props.color || (active === id ? color : undefined)
     };
     setTabs(function (prev) {
@@ -64137,7 +64142,7 @@ var TabsPanel = function TabsPanel(props) {
         });
       });
     };
-  }, [id, tab, color, active, props.disabled, props.jssStyle]);
+  }, [id, tab, color, active, shape, props.disabled, props.jssStyle]);
   if (!isActive && lazy && !keekAlive.current) {
     return null;
   }
@@ -70362,7 +70367,7 @@ var upload_interface = __webpack_require__(8821);
 
 
 /* harmony default export */ var src_0 = ({
-  version: '3.7.0-beta.14'
+  version: '3.7.0-beta.16'
 });
 }();
 /******/ 	return __webpack_exports__;