shineout 3.8.7-beta.1 → 3.8.7-beta.3

package/cjs/index.js

@@ -522,5 +522,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.8.7-beta.1'
+  version: '3.8.7-beta.3'
 };

package/dist/shineout.js

@@ -12386,7 +12386,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.8.7-beta.1');
+/* harmony default export */ var version = ('3.8.7-beta.3');
 ;// CONCATENATED MODULE: ../shineout-style/src/jss-style/index.tsx
 
 
@@ -12434,9 +12434,13 @@ var styled = function styled(style, ns) {
     name: ns,
     generateId: createClassname
   });
+  var styledCacheMap = {};
   var getClassName = function getClassName() {
     var classes = hoc();
-    return Object.keys(classes).reduce(function (acc, key) {
+    if (styledCacheMap[ns]) {
+      return styledCacheMap[ns];
+    }
+    return styledCacheMap[ns] = Object.keys(classes).reduce(function (acc, key) {
       var k = key;
       var value = '';
       // 给每个组件的root类名添加命名空间
@@ -43576,7 +43580,7 @@ function getRule(rule, props) {
         return;
       }
       if (reg.global) reg.lastIndex = 0;
-      if (typeof value === 'string' && reg.test(value)) {
+      if (reg.test(value)) {
         callback(true);
       } else {
         callback(new FormError(po.message, po));
@@ -63252,6 +63256,7 @@ var scroll_table_Scroll = function Scroll(props) {
   // 非定高的Table但依旧采用了virtual渲染方式，需要渲染出全部的data
   (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useLayoutEffect)(function () {
     if (!props.tableRef.current || !props.setFakeVirtual) return;
+    if (props.tableRef.current.style.height || props.tableRef.current.style.flex) return;
     var container = containerRef.current;
     var isContainerVisible = (container === null || container === void 0 ? void 0 : container.offsetParent) !== null;
     if (!isContainerVisible) return;
@@ -65496,29 +65501,31 @@ function Td(props) {
     onMouseEnter = props.onMouseEnter,
     onMouseLeave = props.onMouseLeave,
     renderContent = props.renderContent;
-  var $td = useComponentMemo(function () {
-    var content = renderContent(props.col, props.data);
-    return /*#__PURE__*/(0,jsx_runtime.jsx)("td", {
-      colSpan: colSpan,
-      rowSpan: rowSpan,
-      onMouseEnter: onMouseEnter,
-      onMouseLeave: onMouseLeave,
-      className: className,
-      style: props.style,
-      dir: direction,
-      "data-role": role,
-      onClick: onClick,
-      children: content
-    }, col.key);
-  }, [data, className, (_props$style = props.style) === null || _props$style === void 0 ? void 0 : _props$style.left, (_props$style2 = props.style) === null || _props$style2 === void 0 ? void 0 : _props$style2.right, col.type, col.treeColumnsName], props.virtual === 'lazy' ? function (prev, next) {
+  var $td = /*#__PURE__*/(0,jsx_runtime.jsx)("td", {
+    colSpan: colSpan,
+    rowSpan: rowSpan,
+    onMouseEnter: onMouseEnter,
+    onMouseLeave: onMouseLeave,
+    className: className,
+    style: props.style,
+    dir: direction,
+    "data-role": role,
+    onClick: onClick,
+    children: renderContent(props.col, props.data)
+  }, col.key);
+  if (props.virtual !== 'lazy') {
+    return $td;
+  }
+  return useComponentMemo(function () {
+    return $td;
+  }, [data, className, (_props$style = props.style) === null || _props$style === void 0 ? void 0 : _props$style.left, (_props$style2 = props.style) === null || _props$style2 === void 0 ? void 0 : _props$style2.right, col.type, col.treeColumnsName], function (prev, next) {
     if (col.type || col.treeColumnsName) {
       return true;
     }
     return prev.some(function (_, 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;
+  });
 }
 ;// CONCATENATED MODULE: ../base/src/table/tr.tsx
 
@@ -65571,12 +65578,12 @@ var Tr = function Tr(props) {
     }
     return undefined;
   };
-  var getTdStyle = usePersistFn(function (column, colSpan) {
+  var getTdStyle = function getTdStyle(column, colSpan) {
     var index = column.index;
     var fixedStyle = getFixedStyle(column.fixed, index, colSpan);
     if (!fixedStyle && !column.style) return;
     return objectSpread2_default()(objectSpread2_default()({}, column.style), fixedStyle);
-  });
+  };
   var handleCellClick = usePersistFn(function (data, colIndex) {
     if (!props.onCellClick) return;
     props.onCellClick(data, {
@@ -65587,15 +65594,14 @@ var Tr = function Tr(props) {
   });
   var setVirtualRowHeight = usePersistFn(function () {
     if (props.setRowHeight && trRef.current) {
-      // 祖先元素不可见时（display: none）
-      if (!trRef.current.offsetParent) return;
       var expandHeight = expandRef.current ? expandRef.current.getBoundingClientRect().height : 0;
       props.setRowHeight(props.rowIndex, trRef.current.getBoundingClientRect().height + expandHeight);
     }
   });
   (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useEffect)(setVirtualRowHeight, [props.expanded, props.rowIndex, props.bodyScrollWidth, props.resizeFlag]);
   (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useEffect)(function () {
-    if (!trRef.current) return;
+    // 祖先元素不可见时（display: none）
+    if (!trRef.current || !trRef.current.offsetParent) return;
     var cancelObserver = addResizeObserver(trRef.current, setVirtualRowHeight, {
       direction: 'y'
     });
@@ -65641,7 +65647,7 @@ var Tr = function Tr(props) {
       return _ref.apply(this, arguments);
     };
   }());
-  var renderTreeExpand = usePersistFn(function (content) {
+  var renderTreeExpand = function renderTreeExpand(content) {
     var treeIndent = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 22;
     var level = props.treeExpandLevel.get(props.originKey) || 0;
     var className = tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.expandWrapper;
@@ -65694,8 +65700,8 @@ var Tr = function Tr(props) {
       },
       children: [$expandIconWrapper, content]
     });
-  });
-  var renderContent = usePersistFn(function (col, data) {
+  };
+  var renderContent = function renderContent(col, data) {
     if (col.type === 'expand' || col.type === 'row-expand') {
       var renderResult = typeof col.render === 'function' ? col.render(props.rawData, props.rowIndex) : undefined;
       if (typeof renderResult !== 'function') return null;
@@ -65763,8 +65769,8 @@ var Tr = function Tr(props) {
     }
     if (col.render === undefined) return null;
     return content;
-  });
-  var renderTds = usePersistFn(function (cols, data) {
+  };
+  var renderTds = function renderTds(cols, data) {
     var tds = [];
     var skip = 0;
     var lastRowIndex = data.length - 1;
@@ -65781,7 +65787,7 @@ var Tr = function Tr(props) {
         var last = cols[i + (data[i].colSpan || 1) - 1] || {};
         var isRowSpanTd = data[i].rowSpan > 1;
         var shouldBindMouseEvent = props.hover && hasSiblingRowSpan || isRowSpanTd;
-        var showCellHover = props.hoverIndex.has(props.rowIndex);
+        var showCellHover = props.hover && props.hoverIndex.has(props.rowIndex);
         if (!showCellHover && data[i].rowSpan > 1) {
           for (var j = 0; j < data[i].rowSpan; j++) {
             if (props.hoverIndex.has(props.rowIndex + j)) {
@@ -65820,7 +65826,7 @@ var Tr = function Tr(props) {
       if (_loop(i)) continue;
     }
     return tds;
-  });
+  };
   var renderExpand = function renderExpand() {
     if (!props.expanded) return null;
     var expandCol = props.expandCol;
@@ -73333,7 +73339,7 @@ var upload_interface = __webpack_require__(8821);
 
 
 /* harmony default export */ var src_0 = ({
-  version: '3.8.7-beta.1'
+  version: '3.8.7-beta.3'
 });
 }();
 /******/ 	return __webpack_exports__;