shineout 3.5.3-beta.2 → 3.5.3-beta.3

package/cjs/index.js

@@ -500,5 +500,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.3-beta.2'
+  version: '3.5.3-beta.3'
 };

package/dist/shineout.js

@@ -12030,7 +12030,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.3-beta.2');
+/* harmony default export */ var version = ('3.5.3-beta.3');
 ;// CONCATENATED MODULE: ../shineout-style/src/jss-style/index.tsx
 
 
@@ -58575,6 +58575,24 @@ var useTableTree = function useTableTree(props) {
 
 
 
+
+// 找出最大的连续数字的个数
+function getMaxRowSpanLength(input) {
+  var map = new Map();
+  var _iterator = createForOfIteratorHelper_default()(input),
+    _step;
+  try {
+    for (_iterator.s(); !(_step = _iterator.n()).done;) {
+      var num = _step.value;
+      map.set(num, (map.get(num) || 0) + 1);
+    }
+  } catch (err) {
+    _iterator.e(err);
+  } finally {
+    _iterator.f();
+  }
+  return Math.max.apply(Math, toConsumableArray_default()(Array.from(map.values())));
+}
 var MAX_ROW_SPAN = 200;
 var useTableVirtual = function useTableVirtual(props) {
   var _useState = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useState)(0),
@@ -58599,11 +58617,11 @@ var useTableVirtual = function useTableVirtual(props) {
     setOffsetY = _useState10[1];
   var rowsInView = props.rowsInView === 0 ? props.data.length : props.rowsInView;
   var sleft = props.scrollLeft !== undefined ? props.scrollLeft : innerLeft;
-  var rowSpanInfos = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useMemo)(function () {
+  var rowSpanInfo = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useMemo)(function () {
     var rowSpanColumns = props.columns.filter(function (col) {
       return typeof col.rowSpan === 'function';
     });
-    if (rowSpanColumns.length === 0) return;
+    if (rowSpanColumns.length === 0) return null;
     var _rowSpanInfos = [];
     var totalLength = props.data.length;
     var _loop = function _loop(i) {
@@ -58644,12 +58662,17 @@ var useTableVirtual = function useTableVirtual(props) {
         }
       }
     }
-    return _rowSpanInfos.map(function (_rowSpanInfo) {
+    var resultArr = _rowSpanInfos.map(function (_rowSpanInfo) {
       var startIndexs = _rowSpanInfo.map(function (arr) {
         return arr[0];
       });
       return Math.min.apply(Math, toConsumableArray_default()(startIndexs));
     });
+    var maxRowSpan = getMaxRowSpanLength(resultArr);
+    return maxRowSpan > 1 ? {
+      rowSpanIndexArray: resultArr,
+      maxRowSpan: maxRowSpan
+    } : null;
   }, [props.data, props.columns]);
   var _useRef = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useRef)({
       cachedHeight: [],
@@ -58710,15 +58733,20 @@ var useTableVirtual = function useTableVirtual(props) {
     var currentIndex = 0;
     var top = 0;
     var maxIndex = Math.max(props.data.length - rowsInView, 0);
+    var maxRowSpanLenth = 0;
+    if (rowSpanInfo) {
+      maxRowSpanLenth = Math.min(rowSpanInfo.rowSpanIndexArray.length,
+      // 根据data计算出实际需要的最大合并行数（rowSpanInfo.maxRowSpan），当rowSpanInfo.maxRowSpan大于外部传的rowsInView时，使用rowSpanInfo.maxRowSpan
+      Math.max(rowSpanInfo.maxRowSpan, props.rowsInView > MAX_ROW_SPAN ? props.rowsInView : props.rowsInView || MAX_ROW_SPAN));
+    }
     for (var i = 0; i <= maxIndex; i++) {
       context.rowSpanRows = 0;
       sum += context.cachedHeight[i] || props.rowHeight;
       var rowSpanHeight = 0;
-      if (rowSpanInfos) {
-        var maxRowSpanLenth = Math.min(rowSpanInfos.length, props.rowsInView > MAX_ROW_SPAN ? props.rowsInView : props.rowsInView || MAX_ROW_SPAN);
+      if (rowSpanInfo) {
         var siblingsIndexs = [];
         for (var k = 0; k < maxRowSpanLenth; k++) {
-          if (rowSpanInfos[k] <= i && k > i) {
+          if (rowSpanInfo.rowSpanIndexArray[k] <= i && k > i) {
             siblingsIndexs.push(k);
           }
         }
@@ -59874,29 +59902,23 @@ var Tr = function Tr(props) {
       });
     }
     if (col.type === 'checkbox') {
-      if (props.radio) {
-        return /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
-          className: tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.iconWrapper,
-          children: /*#__PURE__*/(0,jsx_runtime.jsx)(base_src_radio_radio, {
-            jssStyle: props.jssStyle,
-            style: {
-              margin: 0
-            },
-            checked: props.isSelect,
-            disabled: props.disabled,
-            onChange: function onChange(value) {
-              if (value) {
-                props.datum.add(data);
-              } else {
-                props.datum.remove(data);
-              }
-            }
-          })
-        });
-      }
-      return /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
+      var instance = /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
         className: tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.iconWrapper,
-        children: /*#__PURE__*/(0,jsx_runtime.jsx)(base_src_checkbox_checkbox, {
+        children: props.radio ? /*#__PURE__*/(0,jsx_runtime.jsx)(base_src_radio_radio, {
+          jssStyle: props.jssStyle,
+          style: {
+            margin: 0
+          },
+          checked: props.isSelect,
+          disabled: props.disabled,
+          onChange: function onChange(value) {
+            if (value) {
+              props.datum.add(data);
+            } else {
+              props.datum.remove(data);
+            }
+          }
+        }) : /*#__PURE__*/(0,jsx_runtime.jsx)(base_src_checkbox_checkbox, {
           jssStyle: props.jssStyle,
           disabled: props.disabled,
           style: {
@@ -59916,6 +59938,7 @@ var Tr = function Tr(props) {
           }
         })
       });
+      return typeof col.render === 'function' ? col.render(props.rawData, props.rowIndex, instance) : instance;
     }
     var content = render_render(col.render, data, props.rowIndex);
     if (col.treeColumnsName) {
@@ -66934,7 +66957,7 @@ var upload_interface = __webpack_require__(8821);
 
 
 /* harmony default export */ var src_0 = ({
-  version: '3.5.3-beta.2'
+  version: '3.5.3-beta.3'
 });
 }();
 /******/ 	return __webpack_exports__;