shineout 3.9.6-beta.8 → 3.9.6-beta.9

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.6-beta.8'
+  version: '3.9.6-beta.9'
 };

package/dist/shineout.js

@@ -12401,7 +12401,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.6-beta.8');
+/* harmony default export */ var version = ('3.9.6-beta.9');
 ;// CONCATENATED MODULE: ../shineout-style/src/jss-style/index.tsx
 
 
@@ -66887,6 +66887,32 @@ var useTableRow = function useTableRow(props) {
     }
     setHoverIndex(hoverIndex);
   });
+
+  // 为虚拟滚动场景预计算 checkbox 列的 rowSpan 索引数组（缓存以提升性能）
+  var checkboxRowSpanIndexArray = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useMemo)(function () {
+    var columns = props.columns || [];
+    var checkCol = columns.find(function (col) {
+      return col.type === 'checkbox';
+    });
+
+    // 只在虚拟滚动 + checkbox 有 rowSpan 时才需要计算
+    if (!(checkCol !== null && checkCol !== void 0 && checkCol.rowSpan) || !props.rowSpanIndexArray || !props.originData) {
+      return null;
+    }
+    var originData = props.originData;
+    var indexArray = [];
+    for (var i = 0; i < originData.length; i++) {
+      if (indexArray[i] === undefined) {
+        indexArray[i] = i;
+      }
+      // 检查当前行是否应该和下一行合并
+      if (i < originData.length - 1 && checkCol.rowSpan(originData[i], originData[i + 1])) {
+        // 下一行应该指向当前行的起始索引
+        indexArray[i + 1] = indexArray[i];
+      }
+    }
+    return indexArray;
+  }, [props.columns, props.originData, props.rowSpanIndexArray]);
   var rowData = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useMemo)(function () {
     var rows = [];
     context.rowSelectMergeStartData = [];
@@ -66897,29 +66923,26 @@ var useTableRow = function useTableRow(props) {
     });
 
     // 计算 rowSelectMergeStartData
-    if (checkCol !== null && checkCol !== void 0 && checkCol.rowSpan) {
-      // checkbox 列有 rowSpan，需要计算合并起始数据
-      if (props.rowSpanIndexArray && props.originData) {
-        // 虚拟滚动：使用 rowSpanIndexArray（由 useTableVirtual 预计算）
-        var originData = props.originData;
-        for (var i = 0; i < data.length; i++) {
-          var globalIndex = currentIndex + i;
-          var startIndex = props.rowSpanIndexArray[globalIndex];
-          context.rowSelectMergeStartData[i] = originData[startIndex] || data[i];
+    if (checkboxRowSpanIndexArray && props.originData) {
+      // 虚拟滚动 + checkbox 有 rowSpan：使用预计算的 checkbox 专属索引数组
+      var originData = props.originData;
+      for (var i = 0; i < data.length; i++) {
+        var globalIndex = currentIndex + i;
+        var startIndex = checkboxRowSpanIndexArray[globalIndex];
+        context.rowSelectMergeStartData[i] = originData[startIndex] || data[i];
+      }
+    } else if (checkCol !== null && checkCol !== void 0 && checkCol.rowSpan) {
+      // 非虚拟滚动 + checkbox 有 rowSpan：基于当前数据计算
+      for (var _i = 0; _i < data.length; _i++) {
+        var currentData = data[_i];
+        // 如果当前行还没有被设置起始数据，说明它是一个新的合并组的起始
+        if (context.rowSelectMergeStartData[_i] === undefined) {
+          context.rowSelectMergeStartData[_i] = currentData;
         }
-      } else {
-        // 非虚拟滚动：基于当前数据计算
-        for (var _i = 0; _i < data.length; _i++) {
-          var currentData = data[_i];
-          // 如果当前行还没有被设置起始数据，说明它是一个新的合并组的起始
-          if (context.rowSelectMergeStartData[_i] === undefined) {
-            context.rowSelectMergeStartData[_i] = currentData;
-          }
-          // 检查当前行是否应该和下一行合并
-          if (_i < data.length - 1 && checkCol.rowSpan(currentData, data[_i + 1])) {
-            // 下一行应该指向当前行的起始数据
-            context.rowSelectMergeStartData[_i + 1] = context.rowSelectMergeStartData[_i];
-          }
+        // 检查当前行是否应该和下一行合并
+        if (_i < data.length - 1 && checkCol.rowSpan(currentData, data[_i + 1])) {
+          // 下一行应该指向当前行的起始数据
+          context.rowSelectMergeStartData[_i + 1] = context.rowSelectMergeStartData[_i];
         }
       }
     } else {
@@ -66936,7 +66959,7 @@ var useTableRow = function useTableRow(props) {
       }));
     }
     return rows;
-  }, [props.columns, props.data, props.originData, props.rowSpanIndexArray, currentIndex]);
+  }, [props.columns, props.data, props.originData, props.rowSpanIndexArray, currentIndex, checkboxRowSpanIndexArray]);
   return {
     rowData: rowData,
     handleCellHover: handleCellHover,
@@ -74855,7 +74878,7 @@ var upload_interface = __webpack_require__(8821);
 
 
 /* harmony default export */ var src_0 = ({
-  version: '3.9.6-beta.8'
+  version: '3.9.6-beta.9'
 });
 }();
 /******/ 	return __webpack_exports__;