shineout 3.7.0-beta.13 → 3.7.0-beta.15

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.13'
+  version: '3.7.0-beta.15'
 };

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.13');
+/* harmony default export */ var version = ('3.7.0-beta.15');
 ;// 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: {
@@ -25877,6 +25874,11 @@ var tableStyle = objectSpread2_default()(objectSpread2_default()({
       background: 'transparent'
     }))
   },
+  scrollX: {
+    '&$headWrapper, &$footWrapper': {
+      overflowX: 'hidden'
+    }
+  },
   emptyWrapper: {
     minHeight: '170px',
     width: '100%',
@@ -62723,7 +62725,7 @@ var useTableRow = function useTableRow(props) {
 /* harmony default export */ var use_table_row = (useTableRow);
 ;// CONCATENATED MODULE: ../hooks/src/common/use-component-memo/use-memo.ts
 
-function useMemo(getValue, condition, shouldUpdate) {
+function useComponentMemo(getValue, condition, shouldUpdate) {
   var cacheRef = external_root_React_commonjs2_react_commonjs_react_amd_react_.useRef({});
   if (!shouldUpdate) return getValue();
   if (!('value' in cacheRef.current) || shouldUpdate(cacheRef.current.condition, condition)) {
@@ -62737,8 +62739,6 @@ function useMemo(getValue, condition, shouldUpdate) {
 
 
 
-
-
 function Td(props) {
   var _React$useState = external_root_React_commonjs2_react_commonjs_react_amd_react_default().useState(),
     _React$useState2 = slicedToArray_default()(_React$useState, 2),
@@ -62762,9 +62762,7 @@ function Td(props) {
     onMouseEnter = props.onMouseEnter,
     onMouseLeave = props.onMouseLeave,
     renderContent = props.renderContent;
-  var externalDependencies = typeof_default()(props.shouldCellUpdate) === 'object' && props.shouldCellUpdate.dependencies ? props.shouldCellUpdate.dependencies : [];
-  var updateFn = typeof_default()(props.shouldCellUpdate) === 'object' && 'update' in props.shouldCellUpdate ? props.shouldCellUpdate.update : props.shouldCellUpdate;
-  var $td = useMemo(function () {
+  var $td = useComponentMemo(function () {
     var content = renderContent(props.col, props.data);
     return /*#__PURE__*/(0,jsx_runtime.jsx)("td", {
       colSpan: colSpan,
@@ -62778,16 +62776,13 @@ function Td(props) {
       onClick: onClick,
       children: content
     }, col.key);
-  }, [data, className, style, col.type, col.treeColumnsName].concat(toConsumableArray_default()(externalDependencies)), updateFn ? function (prev, next) {
+  }, [data, className, style, col.type, col.treeColumnsName], props.virtual === 'lazy' ? function (prev, next) {
     if (col.type || col.treeColumnsName) {
       return true;
     }
     return prev.some(function (_, index) {
-      if (index === 0) {
-        return updateFn(prev[index], next[index]);
-      }
-      return !shallowEqual(prev[index], next[index]);
-    });
+      return !shallowEqual(prev === null || prev === void 0 ? void 0 : prev[index], next === null || next === void 0 ? void 0 : next[index]);
+    }) || !props.scrolling;
   } : undefined);
   return $td;
 }
@@ -63075,8 +63070,9 @@ var Tr = function Tr(props) {
           onClick: props.onCellClick ? function () {
             return handleCellClick(data[i].data, i);
           } : undefined,
-          shouldCellUpdate: col.shouldCellUpdate || props.shouldCellUpdate,
-          renderContent: renderContent
+          renderContent: renderContent,
+          virtual: props.virtual,
+          scrolling: props.scrolling
         }, "".concat(col.key, "-").concat(props.rowIndex, "-").concat(i));
         tds.push(td);
         if (data[i].colSpan) skip = data[i].colSpan - 1;
@@ -63174,8 +63170,6 @@ var Tr = function Tr(props) {
 
 
 
-
-
 /* harmony default export */ var tbody = (function (props) {
   var _props$columns = props.columns,
     columns = _props$columns === void 0 ? [] : _props$columns,
@@ -63248,25 +63242,19 @@ var Tr = function Tr(props) {
       resizeFlag: props.resizeFlag,
       treeCheckAll: props.treeCheckAll,
       onCellClick: props.onCellClick,
-      shouldCellUpdate: props.shouldCellUpdate
+      virtual: props.virtual,
+      scrolling: props.scrolling
     }, trRenderKey);
   };
-  var externalDependencies = typeof_default()(props.shouldCellUpdate) === 'object' && props.shouldCellUpdate.dependencies ? props.shouldCellUpdate.dependencies : [];
-  var updateFn = typeof_default()(props.shouldCellUpdate) === 'object' && 'update' in props.shouldCellUpdate ? props.shouldCellUpdate.update : props.shouldCellUpdate;
-  var $tbody = useMemo(function () {
+  var $tbody = useComponentMemo(function () {
     return /*#__PURE__*/(0,jsx_runtime.jsx)("tbody", {
       children: (props.data || []).map(function (item, index) {
         return renderRow(item, index);
       })
     });
-  }, [props.data, currentIndex].concat(toConsumableArray_default()(externalDependencies)), updateFn || props.virtual ? function (prev, next) {
+  }, [props.data, currentIndex], props.virtual === 'lazy' ? function (prev, next) {
     return prev.some(function (_, index) {
-      if (updateFn && index === 0) {
-        return prev[index].some(function (item, idx) {
-          return updateFn(item, next[index][idx]);
-        });
-      }
-      return !shallowEqual(prev[index], next[index]);
+      return !shallowEqual(prev === null || prev === void 0 ? void 0 : prev[index], next === null || next === void 0 ? void 0 : next[index]);
     }) || !props.scrolling;
   } : undefined);
   return $tbody;
@@ -63589,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,
@@ -63711,8 +63705,7 @@ var emptyRef = {
       bodyScrollWidth: scrollWidth,
       resizeFlag: resizeFlag,
       treeCheckAll: props.treeCheckAll,
-      onCellClick: props.onCellClick,
-      shouldCellUpdate: props.shouldCellUpdate
+      onCellClick: props.onCellClick
     };
     var headCommonProps = {
       disabled: props.disabled,
@@ -63755,7 +63748,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;
@@ -64114,7 +64107,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 () {
@@ -64123,7 +64117,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) {
@@ -64152,7 +64146,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;
   }
@@ -70377,7 +70371,7 @@ var upload_interface = __webpack_require__(8821);
 
 
 /* harmony default export */ var src_0 = ({
-  version: '3.7.0-beta.13'
+  version: '3.7.0-beta.15'
 });
 }();
 /******/ 	return __webpack_exports__;