shineout 3.5.4-beta.13 → 3.5.4-beta.15

package/cjs/index.js

@@ -507,5 +507,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.5.4-beta.13'
+  version: '3.5.4-beta.15'
 };

package/dist/shineout.js

@@ -7053,20 +7053,29 @@ var AlertIcon = function AlertIcon(props) {
 var AlertIconMap = alert_icon_icons;
 /* harmony default export */ var alert_icon = (AlertIcon);
 ;// CONCATENATED MODULE: ../hooks/src/utils/warning.ts
+var shownMessages = new Set();
+var shouldShowMessage = function shouldShowMessage(message) {
+  if (shownMessages.has(message)) {
+    return false;
+  }
+  shownMessages.add(message);
+  return true;
+};
 var deprecated = function deprecated(prop, newProp, component, extraMessage) {
-  if (false) {}
+  if (false) { var msg; }
 };
 var breakingChange = function breakingChange(message) {
-  if (false) {}
+  if (false) { var msg; }
 };
 var devWarn = function devWarn(message) {
   if (false) {}
 };
 var conflictWarning = function conflictWarning(component, prop1, prop2) {
-  if (false) {}
+  if (false) { var msg; }
 };
 var error = function error(message) {
-  console.error(new Error("[shineout] ".concat(message)));
+  var msg = new Error("[shineout] ".concat(message));
+  shouldShowMessage(msg.message) && console.error(msg);
 };
 var devUseWarning = {
   error: error,
@@ -12031,7 +12040,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.5.4-beta.13');
+/* harmony default export */ var version = ('3.5.4-beta.15');
 ;// CONCATENATED MODULE: ../shineout-style/src/jss-style/index.tsx
 
 
@@ -58919,7 +58928,7 @@ var useTableVirtual = function useTableVirtual(props) {
       context.rowSpanRows = 0;
       var currentRowHeight = context.cachedHeight[i] || props.rowHeight;
       sum += currentRowHeight;
-      var rowSpanHeight = currentRowHeight;
+      var rowSpanHeight = 0;
       if (rowSpanInfo) {
         var siblingsIndexs = [];
         for (var k = i; k < rowSpanInfo.maxRowSpan + i; k++) {
@@ -58945,6 +58954,14 @@ var useTableVirtual = function useTableVirtual(props) {
     }
     if (currentIndex !== startIndex) {
       setStartIndex(currentIndex);
+
+      // startIndex处于上方某个合并行的中间一行时，可能引起translate闪烁
+      if (startIndex < currentIndex) {
+        context.autoAddRows = currentIndex - startIndex;
+        setTimeout(function () {
+          context.autoAddRows = 0;
+        }, 300);
+      }
     }
     setTop(top);
   };
@@ -60071,7 +60088,7 @@ var Tr = function Tr(props) {
       var clickEvent = col.type === 'expand' ? function () {
         props.handleExpandClick(col, props.rawData, props.rowIndex);
       } : undefined;
-      return /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
+      var expandInstance = /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
         className: classnames_default()(tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.iconWrapper, tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.expandIconWrapper),
         onClick: clickEvent,
         children: /*#__PURE__*/(0,jsx_runtime.jsx)("span", {
@@ -60080,6 +60097,11 @@ var Tr = function Tr(props) {
           children: props.expanded ? icons_config.table.Expand : icons_config.table.Collapse
         })
       });
+      if (props.expandIcon && typeof props.expandIcon === 'function') {
+        var result = props.expandIcon(props.rawData, props.rowIndex, props.expanded, expandInstance, clickEvent);
+        return result;
+      }
+      return expandInstance;
     }
     if (col.type === 'checkbox') {
       var instance = /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
@@ -60303,6 +60325,7 @@ var Tr = function Tr(props) {
       treeFunc: props.treeFunc,
       treeExpandLevel: props.treeExpandLevel,
       treeEmptyExpand: props.treeEmptyExpand,
+      expandIcon: props.expandIcon,
       treeExpandIcon: props.treeExpandIcon,
       loader: props.loader,
       isEmptyTree: props.isEmptyTree,
@@ -60730,6 +60753,7 @@ var emptyRef = {
       expandKeys: props.expandKeys,
       datum: datum,
       treeEmptyExpand: props.treeEmptyExpand,
+      expandIcon: props.expandIcon,
       treeExpandIcon: props.treeExpandIcon,
       loader: props.loader,
       isEmptyTree: isEmptyTree,
@@ -67144,7 +67168,7 @@ var upload_interface = __webpack_require__(8821);
 
 
 /* harmony default export */ var src_0 = ({
-  version: '3.5.4-beta.13'
+  version: '3.5.4-beta.15'
 });
 }();
 /******/ 	return __webpack_exports__;