shineout 3.7.9-beta.2 → 3.7.9-beta.4

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.7.9-beta.2'
+  version: '3.7.9-beta.4'
 };

package/dist/shineout.js

@@ -12234,7 +12234,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.7.9-beta.2');
+/* harmony default export */ var version = ('3.7.9-beta.4');
 ;// CONCATENATED MODULE: ../shineout-style/src/jss-style/index.tsx
 
 
@@ -61306,6 +61306,7 @@ var events = ['scroll', 'pageshow', 'load', 'resize'];
 // };
 
 var Sticky = function Sticky(props) {
+  var _props$style;
   if (props.target) {
     sticky_devUseWarning.deprecated('target', 'scrollContainer', 'Sticky');
   }
@@ -61661,7 +61662,7 @@ var Sticky = function Sticky(props) {
   }
   var StickyEl = show && parentVisible ? /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
     style: objectSpread2_default()(objectSpread2_default()({
-      zIndex: defaultZIndex
+      zIndex: ((_props$style = props.style) === null || _props$style === void 0 ? void 0 : _props$style.zIndex) || defaultZIndex
     }, style), elementSize),
     children: /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
       className: props.className,
@@ -63097,7 +63098,8 @@ var useTableVirtual = function useTableVirtual(props) {
     setRowHeight: setRowHeight,
     scrollToIndex: scrollToIndex,
     scrollColumnByLeft: scrollColumnByLeft,
-    scrollColumnIntoView: scrollColumnIntoView
+    scrollColumnIntoView: scrollColumnIntoView,
+    rowSpanInfo: rowSpanInfo
   };
 };
 /* harmony default export */ var use_table_virtual = (useTableVirtual);
@@ -64385,6 +64387,7 @@ var Tr = function Tr(props) {
       return expandInstance;
     }
     if (col.type === 'checkbox') {
+      var selectData = props.selectData || 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, {
@@ -64396,9 +64399,9 @@ var Tr = function Tr(props) {
           disabled: props.disabled,
           onChange: function onChange(value) {
             if (value) {
-              props.datum.add(data);
+              props.datum.add(selectData);
             } else {
-              props.datum.remove(data);
+              props.datum.remove(selectData);
             }
           }
         }) : /*#__PURE__*/(0,jsx_runtime.jsx)(base_src_checkbox_checkbox, {
@@ -64410,11 +64413,11 @@ var Tr = function Tr(props) {
           checked: props.isSelect,
           onChange: function onChange(_value, check) {
             if (check) {
-              props.datum.add(data, props.treeCheckAll ? {
+              props.datum.add(selectData, props.treeCheckAll ? {
                 childrenKey: props.treeColumnsName
               } : undefined);
             } else {
-              props.datum.remove(data, props.treeCheckAll ? {
+              props.datum.remove(selectData, props.treeCheckAll ? {
                 childrenKey: props.treeColumnsName
               } : undefined);
             }
@@ -64606,6 +64609,17 @@ var Tr = function Tr(props) {
     var rowIndex = index + currentIndex;
     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],
@@ -64633,7 +64647,8 @@ var Tr = function Tr(props) {
       striped: props.striped,
       radio: props.radio,
       hover: hover,
-      isSelect: props.datum.check(rowSelectMergeStartData[index]),
+      isSelect: props.datum.check(selectData),
+      selectData: selectData,
       handleCellHover: handleCellHover
       // to update
       ,
@@ -65320,7 +65335,9 @@ var emptyRef = {
               currentIndex: virtualInfo.startIndex,
               data: virtualInfo.data,
               setRowHeight: virtualInfo.setRowHeight,
-              scrolling: scrolling
+              scrolling: scrolling,
+              virtualRowSpanInfo: virtualInfo.rowSpanInfo,
+              fullData: treeData
             }))]
           }), showFoot ? /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
             className: footWrapperClass,
@@ -71888,7 +71905,7 @@ var upload_interface = __webpack_require__(8821);
 
 
 /* harmony default export */ var src_0 = ({
-  version: '3.7.9-beta.2'
+  version: '3.7.9-beta.4'
 });
 }();
 /******/ 	return __webpack_exports__;