shineout 3.9.6-beta.7 → 3.9.6-beta.8

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

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.7');
+/* harmony default export */ var version = ('3.9.6-beta.8');
 ;// CONCATENATED MODULE: ../shineout-style/src/jss-style/index.tsx
 
 
@@ -66895,28 +66895,48 @@ var useTableRow = function useTableRow(props) {
     var checkCol = columns.find(function (col) {
       return col.type === 'checkbox';
     });
-    for (var i = data.length - 1; i >= 0; i--) {
-      var d = data[i];
-      rows.unshift(use_table_row_format(columns, d, rows[0], currentIndex + i).map(function (col) {
-        delete col.content;
-        return col;
-      }));
-      {
-        //记录合并行合并到的数据需要从0 开始
-        var i0 = data.length - 1 - i;
-        var d0 = data[i0];
-        context.rowSelectMergeStartData[i0] = d0;
-        if (i0 > 0 && checkCol && typeof checkCol.rowSpan === 'function') {
-          var beforeData = data[i0 - 1];
-          if (beforeData !== null && checkCol.rowSpan(beforeData, d0)) {
-            var _context$rowSelectMer;
-            context.rowSelectMergeStartData[i0] = (_context$rowSelectMer = context.rowSelectMergeStartData[i0 - 1]) !== null && _context$rowSelectMer !== void 0 ? _context$rowSelectMer : beforeData;
+
+    // 计算 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];
+        }
+      } 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];
           }
         }
       }
+    } else {
+      // checkbox 列无 rowSpan，每行都是自己的起始数据
+      for (var _i2 = 0; _i2 < data.length; _i2++) {
+        context.rowSelectMergeStartData[_i2] = data[_i2];
+      }
+    }
+    for (var _i3 = data.length - 1; _i3 >= 0; _i3--) {
+      var d = data[_i3];
+      rows.unshift(use_table_row_format(columns, d, rows[0], currentIndex + _i3).map(function (col) {
+        delete col.content;
+        return col;
+      }));
     }
     return rows;
-  }, [props.columns, props.data]);
+  }, [props.columns, props.data, props.originData, props.rowSpanIndexArray, currentIndex]);
   return {
     rowData: rowData,
     handleCellHover: handleCellHover,
@@ -67161,7 +67181,8 @@ var Tr = function Tr(props) {
       return expandInstance;
     }
     if (col.type === 'checkbox') {
-      var selectData = props.selectData || data;
+      // 对于合并行，使用合并起始数据进行选择操作
+      var selectData = props.rowSelectMergeStartData || data;
       var instance = /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
         className: tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.iconWrapper,
         children: props.radio ? /*#__PURE__*/(0,jsx_runtime.jsx)(base_src_radio_radio, {
@@ -67379,7 +67400,9 @@ var Tr = function Tr(props) {
       columns: props.columns,
       data: props.data,
       currentIndex: currentRowIndex,
-      hover: hover
+      hover: hover,
+      originData: props.originData,
+      rowSpanIndexArray: props.rowSpanIndexArray
     }),
     rowData = _useTableRow.rowData,
     handleCellHover = _useTableRow.handleCellHover,
@@ -67393,17 +67416,6 @@ var Tr = function Tr(props) {
     var rowIndex = index + currentRowIndex;
     var originKey = getKey(props.keygen, item, rowIndex);
     var trRenderKey = props.loader || (_props$rowEvents = props.rowEvents) !== null && _props$rowEvents !== void 0 && _props$rowEvents.draggable ? originKey : "".concat(originKey, "-").concat(rowIndex);
-
-    // 在虚拟列表模式下，使用 virtualRowSpanInfo 来获取正确的选择数据
-    var selectData = item;
-    if (props.virtualRowSpanInfo && props.fullData) {
-      // rowSpanIndexArray[rowIndex] 表示第 rowIndex 行所属合并组的起始行索引
-      var selectIndex = props.virtualRowSpanInfo.rowSpanIndexArray[rowIndex];
-      selectData = props.fullData[selectIndex];
-    } else {
-      // 非虚拟列表模式使用原有逻辑
-      selectData = rowSelectMergeStartData[index];
-    }
     return /*#__PURE__*/(0,jsx_runtime.jsx)(tr, {
       originKey: originKey,
       row: rowData[index],
@@ -67431,11 +67443,9 @@ var Tr = function Tr(props) {
       striped: props.striped,
       radio: props.radio,
       hover: hover,
-      isSelect: props.datum.check(selectData),
-      selectData: selectData,
-      handleCellHover: handleCellHover
-      // to update
-      ,
+      isSelect: props.datum.check(rowSelectMergeStartData[index]),
+      rowSelectMergeStartData: rowSelectMergeStartData[index],
+      handleCellHover: handleCellHover,
       hoverIndex: hoverIndex,
       rowClickAttr: props.rowClickAttr,
       onRowClick: props.onRowClick,
@@ -68137,7 +68147,7 @@ function Table(props) {
       })
     }));
     if (isRenderVirtualTable) {
-      var _props$data3;
+      var _props$data3, _virtualInfo$rowSpanI;
       var showStickyHeader = !props.hideHeader && props.sticky;
       return /*#__PURE__*/(0,jsx_runtime.jsxs)(jsx_runtime.Fragment, {
         children: [renderHeadMirrorScroller(), showStickyHeader && /*#__PURE__*/(0,jsx_runtime.jsx)(StickyWrapper, objectSpread2_default()(objectSpread2_default()({}, stickyProps), {}, {
@@ -68168,10 +68178,10 @@ function Table(props) {
               currentRowIndex: virtualInfo.startIndex,
               currentColIndex: currentColIndex,
               data: virtualInfo.data,
+              originData: treeData,
+              rowSpanIndexArray: (_virtualInfo$rowSpanI = virtualInfo.rowSpanInfo) === null || _virtualInfo$rowSpanI === void 0 ? void 0 : _virtualInfo$rowSpanI.rowSpanIndexArray,
               setRowHeight: virtualInfo.setRowHeight,
-              scrolling: scrolling,
-              virtualRowSpanInfo: virtualInfo.rowSpanInfo,
-              fullData: treeData
+              scrolling: scrolling
             }))]
           }), showFoot ? /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
             className: footWrapperClass,
@@ -74845,7 +74855,7 @@ var upload_interface = __webpack_require__(8821);
 
 
 /* harmony default export */ var src_0 = ({
-  version: '3.9.6-beta.7'
+  version: '3.9.6-beta.8'
 });
 }();
 /******/ 	return __webpack_exports__;