shineout 3.9.0-beta.4 → 3.9.0-beta.5

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.9.0-beta.4'
+  version: '3.9.0-beta.5'
 };

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.9.0-beta.4');
+/* harmony default export */ var version = ('3.9.0-beta.5');
 ;// 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类名添加命名空间
@@ -55058,7 +55062,8 @@ var InputNumber = function InputNumber(props) {
     value: numberFormatProps.value || '',
     className: classnames_default()(forwardProps.className, inputStyle === null || inputStyle === void 0 ? void 0 : inputStyle.wrapperNumber),
     onKeyDown: onKeyDown,
-    addEnd: addEnd
+    addEnd: addEnd,
+    showClear: props.showClear
   }));
 };
 /* harmony default export */ var input_number = (/*#__PURE__*/external_root_React_commonjs2_react_commonjs_react_amd_react_default().memo(InputNumber));
@@ -63263,6 +63268,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;
@@ -64072,7 +64078,9 @@ var useTableVirtual = function useTableVirtual(props) {
     _useState2 = slicedToArray_default()(_useState, 2),
     innerTop = _useState2[0],
     setTop = _useState2[1];
-  var _useState3 = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useState)(props.data.length * props.rowHeight),
+  var strictRowHeight = props.strictRowHeight ? props.strictRowHeight : 0;
+  var defaultScrollHeight = strictRowHeight ? props.data.length * strictRowHeight : props.data.length * props.rowHeight;
+  var _useState3 = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useState)(defaultScrollHeight),
     _useState4 = slicedToArray_default()(_useState3, 2),
     scrollHeight = _useState4[0],
     setHeight = _useState4[1];
@@ -64158,6 +64166,9 @@ var useTableVirtual = function useTableVirtual(props) {
     context = _useRef.current;
   var getContentHeight = function getContentHeight(index) {
     if (props.disabled) return 0;
+    if (strictRowHeight) {
+      return strictRowHeight * (index + 1) + props.theadHeight + props.tfootHeight;
+    }
     var sum = 0;
     for (var i = 0; i <= index; i++) {
       sum += context.cachedHeight[i] || props.rowHeight;
@@ -64193,7 +64204,7 @@ var useTableVirtual = function useTableVirtual(props) {
     var scrollContainerHeight = Math.max(((_props$scrollRef$curr = props.scrollRef.current) === null || _props$scrollRef$curr === void 0 ? void 0 : _props$scrollRef$curr.clientHeight) || 0, 200);
     for (var i = 0; i <= maxIndex; i++) {
       context.rowSpanRows = 0;
-      var currentRowHeight = context.cachedHeight[i] || props.rowHeight;
+      var currentRowHeight = strictRowHeight || context.cachedHeight[i] || props.rowHeight;
       sum += currentRowHeight;
       var rowSpanHeight = 0;
       if (rowSpanInfo) {
@@ -64208,13 +64219,13 @@ var useTableVirtual = function useTableVirtual(props) {
           if (rowSpanHeight < scrollContainerHeight) {
             var index = siblingsIndexs[j];
             context.rowSpanRows += 1;
-            rowSpanHeight += context.cachedHeight[index] || props.rowHeight;
+            rowSpanHeight += strictRowHeight || context.cachedHeight[index] || props.rowHeight;
           }
         }
       }
       if (scrollTop < sum + rowSpanHeight || i === maxIndex) {
         currentIndex = i;
-        var beforeHeight = i === 0 ? 0 : sum - (context.cachedHeight[i] || props.rowHeight);
+        var beforeHeight = i === 0 ? 0 : sum - (strictRowHeight || context.cachedHeight[i] || props.rowHeight);
         top = scrollTop - beforeHeight;
         break;
       }
@@ -64347,10 +64358,10 @@ var useTableVirtual = function useTableVirtual(props) {
       var addonHeight = 0;
       var addonCount = 0;
       for (var i = startIndex + rowsInView; i < props.data.length; i++) {
-        var height = context.cachedHeight[i] || props.rowHeight;
+        var height = strictRowHeight || context.cachedHeight[i] || props.rowHeight;
         addonHeight += height;
         addonCount += 1;
-        if (addonHeight >= remainHeight + context.cachedHeight[0]) break;
+        if (addonHeight >= remainHeight + (strictRowHeight || context.cachedHeight[0])) break;
       }
       if (addonCount > 0) {
         context.autoAddRows = addonCount;
@@ -65495,7 +65506,6 @@ function useComponentMemo(getValue, condition, shouldUpdate) {
 
 
 function Td(props) {
-  var _props$style, _props$style2;
   var col = props.col,
     colSpan = props.colSpan,
     rowSpan = props.rowSpan,
@@ -65507,28 +65517,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) {
-    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);
+  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') {
+    var _props$style, _props$style2;
+    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;
+    });
+  }
   return $td;
 }
 ;// CONCATENATED MODULE: ../base/src/table/tr.tsx
@@ -65582,12 +65595,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, {
@@ -65597,16 +65610,16 @@ var Tr = function Tr(props) {
     });
   });
   var setVirtualRowHeight = usePersistFn(function () {
+    if (props.strictRowHeight) return;
     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 (props.strictRowHeight || !trRef.current || !trRef.current.offsetParent) return;
     var cancelObserver = addResizeObserver(trRef.current, setVirtualRowHeight, {
       direction: 'y'
     });
@@ -65652,7 +65665,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;
@@ -65705,8 +65718,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;
@@ -65774,8 +65787,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;
@@ -65792,7 +65805,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)) {
@@ -65831,7 +65844,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;
@@ -65906,7 +65919,10 @@ var Tr = function Tr(props) {
   return /*#__PURE__*/(0,jsx_runtime.jsxs)(jsx_runtime.Fragment, {
     children: [/*#__PURE__*/(0,jsx_runtime.jsx)("tr", objectSpread2_default()(objectSpread2_default()({
       ref: trRef,
-      className: classnames_default()(props === null || props === void 0 || (_props$rowClassName = props.rowClassName) === null || _props$rowClassName === void 0 ? void 0 : _props$rowClassName.call(props, props.rawData, props.rowIndex), props.striped && props.rowIndex % 2 === 1 && (tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.rowStriped), props.isSelect && (tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.rowChecked), props.hover && (tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.rowHover))
+      className: classnames_default()(props === null || props === void 0 || (_props$rowClassName = props.rowClassName) === null || _props$rowClassName === void 0 ? void 0 : _props$rowClassName.call(props, props.rawData, props.rowIndex), props.striped && props.rowIndex % 2 === 1 && (tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.rowStriped), props.isSelect && (tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.rowChecked), props.hover && (tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.rowHover)),
+      style: {
+        height: props.strictRowHeight ? props.strictRowHeight : undefined
+      }
     }, props.rowEvents), {}, {
       onClick: handleRowClick,
       children: renderTds(props.columns, props.row)
@@ -66004,20 +66020,24 @@ var Tr = function Tr(props) {
       treeCheckAll: props.treeCheckAll,
       onCellClick: props.onCellClick,
       virtual: props.virtual,
-      scrolling: props.scrolling
+      scrolling: props.scrolling,
+      strictRowHeight: props.strictRowHeight
     }, trRenderKey);
   };
-  var $tbody = useComponentMemo(function () {
-    return /*#__PURE__*/(0,jsx_runtime.jsx)("tbody", {
-      children: (props.data || []).map(function (item, index) {
-        return renderRow(item, index);
-      })
+  var $tbody = /*#__PURE__*/(0,jsx_runtime.jsx)("tbody", {
+    children: (props.data || []).map(function (item, index) {
+      return renderRow(item, index);
+    })
+  });
+  if (props.virtual === 'lazy') {
+    return useComponentMemo(function () {
+      return $tbody;
+    }, [props.data, currentIndex], function (prev, next) {
+      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;
     });
-  }, [props.data, currentIndex], props.virtual === 'lazy' ? function (prev, next) {
-    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 $tbody;
 });
 ;// CONCATENATED MODULE: ../base/src/table/tfoot.tsx
@@ -66398,6 +66418,7 @@ var emptyRef = {
     colgroup: colgroup,
     rowsInView: props.rowsInView || 20,
     rowHeight: props.rowHeight || 40,
+    strictRowHeight: props.strictRowHeight,
     scrollRef: scrollRef,
     innerRef: tbodyRef,
     scrollLeft: props.scrollLeft,
@@ -66520,7 +66541,8 @@ var emptyRef = {
       bodyScrollWidth: scrollWidth,
       resizeFlag: resizeFlag,
       treeCheckAll: props.treeCheckAll,
-      onCellClick: props.onCellClick
+      onCellClick: props.onCellClick,
+      strictRowHeight: props.strictRowHeight
     };
     var headCommonProps = {
       disabled: props.disabled,
@@ -73345,7 +73367,7 @@ var upload_interface = __webpack_require__(8821);
 
 
 /* harmony default export */ var src_0 = ({
-  version: '3.9.0-beta.4'
+  version: '3.9.0-beta.5'
 });
 }();
 /******/ 	return __webpack_exports__;