@sheinx/base 3.7.9-beta.2 → 3.7.9-beta.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (21) hide show
  1. package/cjs/sticky/sticky.js +2 -1
  2. package/cjs/table/table.d.ts.map +1 -1
  3. package/cjs/table/table.js +3 -1
  4. package/cjs/table/tbody.d.ts.map +1 -1
  5. package/cjs/table/tbody.js +13 -1
  6. package/cjs/table/tbody.type.d.ts +5 -0
  7. package/cjs/table/tbody.type.d.ts.map +1 -1
  8. package/cjs/table/tr.d.ts +1 -0
  9. package/cjs/table/tr.d.ts.map +1 -1
  10. package/cjs/table/tr.js +5 -4
  11. package/esm/sticky/sticky.js +2 -1
  12. package/esm/table/table.d.ts.map +1 -1
  13. package/esm/table/table.js +3 -1
  14. package/esm/table/tbody.d.ts.map +1 -1
  15. package/esm/table/tbody.js +13 -1
  16. package/esm/table/tbody.type.d.ts +5 -0
  17. package/esm/table/tbody.type.d.ts.map +1 -1
  18. package/esm/table/tr.d.ts +1 -0
  19. package/esm/table/tr.d.ts.map +1 -1
  20. package/esm/table/tr.js +5 -4
  21. package/package.json +2 -2
package/cjs/sticky/sticky.js CHANGED
@@ -45,6 +45,7 @@ var events = ['scroll', 'pageshow', 'load', 'resize'];
45
45
  // };
46
46
 
47
47
  var Sticky = function Sticky(props) {
48
+ var _props$style;
48
49
  if (props.target) {
49
50
  devUseWarning.deprecated('target', 'scrollContainer', 'Sticky');
50
51
  }
@@ -400,7 +401,7 @@ var Sticky = function Sticky(props) {
400
401
  }
401
402
  var StickyEl = show && parentVisible ? /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
402
403
  style: _objectSpread(_objectSpread({
403
- zIndex: defaultZIndex
404
+ zIndex: ((_props$style = props.style) === null || _props$style === void 0 ? void 0 : _props$style.zIndex) || defaultZIndex
404
405
  }, style), elementSize),
405
406
  children: /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
406
407
  className: props.className,
package/cjs/table/table.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"table.d.ts","sourceRoot":"","sources":["table.tsx"],"names":[],"mappings":"AA0BA,OAAO,EAAgB,UAAU,EAAE,MAAM,cAAc,CAAC;;AAexD,wBAgsBE"}
1
+ {"version":3,"file":"table.d.ts","sourceRoot":"","sources":["table.tsx"],"names":[],"mappings":"AA0BA,OAAO,EAAgB,UAAU,EAAE,MAAM,cAAc,CAAC;;AAexD,wBAksBE"}
package/cjs/table/table.js CHANGED
@@ -558,7 +558,9 @@ var _default = exports.default = function _default(props) {
558
558
  currentIndex: virtualInfo.startIndex,
559
559
  data: virtualInfo.data,
560
560
  setRowHeight: virtualInfo.setRowHeight,
561
- scrolling: scrolling
561
+ scrolling: scrolling,
562
+ virtualRowSpanInfo: virtualInfo.rowSpanInfo,
563
+ fullData: treeData
562
564
  }))]
563
565
  }), showFoot ? /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
564
566
  className: footWrapperClass,
package/cjs/table/tbody.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"tbody.d.ts","sourceRoot":"","sources":["tbody.tsx"],"names":[],"mappings":"AAGA,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;gCAEnB,UAAU;AAAjC,wBAsFE"}
1
+ {"version":3,"file":"tbody.d.ts","sourceRoot":"","sources":["tbody.tsx"],"names":[],"mappings":"AAGA,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;gCAEnB,UAAU;AAAjC,wBAmGE"}
package/cjs/table/tbody.js CHANGED
@@ -41,6 +41,17 @@ var _default = exports.default = function _default(props) {
41
41
  var rowIndex = index + currentIndex;
42
42
  var originKey = _hooks.util.getKey(props.keygen, item, rowIndex);
43
43
  var trRenderKey = props.loader || (_props$rowEvents = props.rowEvents) !== null && _props$rowEvents !== void 0 && _props$rowEvents.draggable ? originKey : "".concat(originKey, "-").concat(rowIndex);
44
+
45
+ // 在虚拟列表模式下，使用 virtualRowSpanInfo 来获取正确的选择数据
46
+ var selectData = item;
47
+ if (props.virtualRowSpanInfo && props.fullData) {
48
+ // rowSpanIndexArray[rowIndex] 表示第 rowIndex 行所属合并组的起始行索引
49
+ var selectIndex = props.virtualRowSpanInfo.rowSpanIndexArray[rowIndex];
50
+ selectData = props.fullData[selectIndex];
51
+ } else {
52
+ // 非虚拟列表模式使用原有逻辑
53
+ selectData = rowSelectMergeStartData[index];
54
+ }
44
55
  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_tr.default, {
45
56
  originKey: originKey,
46
57
  row: rowData[index],
@@ -68,7 +79,8 @@ var _default = exports.default = function _default(props) {
68
79
  striped: props.striped,
69
80
  radio: props.radio,
70
81
  hover: hover,
71
- isSelect: props.datum.check(rowSelectMergeStartData[index]),
82
+ isSelect: props.datum.check(selectData),
83
+ selectData: selectData,
72
84
  handleCellHover: handleCellHover
73
85
  // to update
74
86
  ,
package/cjs/table/tbody.type.d.ts CHANGED
@@ -19,5 +19,10 @@ export interface TbodyProps extends Pick<OptionalToRequired<TableProps<any, any>
19
19
  bodyScrollWidth?: number;
20
20
  resizeFlag?: number;
21
21
  scrolling?: boolean;
22
+ virtualRowSpanInfo?: {
23
+ rowSpanIndexArray: number[];
24
+ maxRowSpan: number;
25
+ } | null;
26
+ fullData?: any[];
22
27
  }
23
28
  //# sourceMappingURL=tbody.type.d.ts.map
package/cjs/table/tbody.type.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"tbody.type.d.ts","sourceRoot":"","sources":["tbody.type.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC7D,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AACpE,OAAO,KAAK,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;AAE3E,MAAM,MAAM,gBAAgB,GAAG,UAAU,CAAC,OAAO,eAAe,CAAC,CAAC;AAClE,MAAM,MAAM,iBAAiB,GAAG,UAAU,CAAC,OAAO,WAAW,CAAC,CAAC;AAE/D,MAAM,WAAW,UACf,SAAQ,IAAI,CACV,kBAAkB,CAAC,UAAU,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,EACtC,MAAM,GACN,UAAU,GACV,cAAc,GACd,YAAY,GACZ,QAAQ,GACR,iBAAiB,GACjB,YAAY,GACZ,gBAAgB,GAChB,QAAQ,GACR,SAAS,GACT,OAAO,GACP,YAAY,GACZ,cAAc,GACd,WAAW,GACX,UAAU,GACV,OAAO,GACP,cAAc,GACd,aAAa,GACb,SAAS,CACZ;IACD,OAAO,EAAE,iBAAiB,CAAC,GAAG,CAAC,EAAE,CAAC;IAClC,IAAI,EAAE,GAAG,EAAE,CAAC;IACZ,QAAQ,EAAE,CAAC,MAAM,GAAG,MAAM,GAAG,SAAS,CAAC,EAAE,CAAC;IAC1C,SAAS,EAAE,OAAO,CAAC;IACnB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,aAAa,EAAE,gBAAgB,CAAC,eAAe,CAAC,CAAC;IACjD,KAAK,EAAE,SAAS,CAAC;IACjB,QAAQ,EAAE,aAAa,CAAC,MAAM,CAAC,CAAC;IAChC,eAAe,EAAE,aAAa,CAAC,iBAAiB,CAAC,CAAC;IAClD,WAAW,EAAE,OAAO,GAAG,SAAS,CAAC;IACjC,eAAe,EAAE,MAAM,GAAG,SAAS,CAAC;IACpC,YAAY,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,KAAK,IAAI,CAAC;IACvD,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB"}
1
+ {"version":3,"file":"tbody.type.d.ts","sourceRoot":"","sources":["tbody.type.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC7D,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AACpE,OAAO,KAAK,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;AAE3E,MAAM,MAAM,gBAAgB,GAAG,UAAU,CAAC,OAAO,eAAe,CAAC,CAAC;AAClE,MAAM,MAAM,iBAAiB,GAAG,UAAU,CAAC,OAAO,WAAW,CAAC,CAAC;AAE/D,MAAM,WAAW,UACf,SAAQ,IAAI,CACV,kBAAkB,CAAC,UAAU,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,EACtC,MAAM,GACN,UAAU,GACV,cAAc,GACd,YAAY,GACZ,QAAQ,GACR,iBAAiB,GACjB,YAAY,GACZ,gBAAgB,GAChB,QAAQ,GACR,SAAS,GACT,OAAO,GACP,YAAY,GACZ,cAAc,GACd,WAAW,GACX,UAAU,GACV,OAAO,GACP,cAAc,GACd,aAAa,GACb,SAAS,CACZ;IACD,OAAO,EAAE,iBAAiB,CAAC,GAAG,CAAC,EAAE,CAAC;IAClC,IAAI,EAAE,GAAG,EAAE,CAAC;IACZ,QAAQ,EAAE,CAAC,MAAM,GAAG,MAAM,GAAG,SAAS,CAAC,EAAE,CAAC;IAC1C,SAAS,EAAE,OAAO,CAAC;IACnB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,aAAa,EAAE,gBAAgB,CAAC,eAAe,CAAC,CAAC;IACjD,KAAK,EAAE,SAAS,CAAC;IACjB,QAAQ,EAAE,aAAa,CAAC,MAAM,CAAC,CAAC;IAChC,eAAe,EAAE,aAAa,CAAC,iBAAiB,CAAC,CAAC;IAClD,WAAW,EAAE,OAAO,GAAG,SAAS,CAAC;IACjC,eAAe,EAAE,MAAM,GAAG,SAAS,CAAC;IACpC,YAAY,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,KAAK,IAAI,CAAC;IACvD,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,kBAAkB,CAAC,EAAE;QACnB,iBAAiB,EAAE,MAAM,EAAE,CAAC;QAC5B,UAAU,EAAE,MAAM,CAAC;KACpB,GAAG,IAAI,CAAC;IACT,QAAQ,CAAC,EAAE,GAAG,EAAE,CAAC;CAClB"}
package/cjs/table/tr.d.ts CHANGED
@@ -23,6 +23,7 @@ interface TrProps extends Pick<TbodyProps, 'jssStyle' | 'rowClassName' | 'datum'
23
23
  isSelect: boolean;
24
24
  disabled?: boolean;
25
25
  scrolling?: boolean;
26
+ selectData?: any;
26
27
  }
27
28
  declare const Tr: (props: TrProps) => import("react/jsx-runtime").JSX.Element;
28
29
  export default Tr;
package/cjs/table/tr.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"tr.d.ts","sourceRoot":"","sources":["tr.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAC;AAQvD,OAAO,EAAE,UAAU,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AAI7D,UAAU,OACR,SAAQ,IAAI,CACV,UAAU,EACR,UAAU,GACV,cAAc,GACd,OAAO,GACP,UAAU,GACV,iBAAiB,GACjB,iBAAiB,GACjB,YAAY,GACZ,gBAAgB,GAChB,QAAQ,GACR,aAAa,GACb,cAAc,GACd,SAAS,GACT,OAAO,GACP,YAAY,GACZ,cAAc,GACd,WAAW,GACX,iBAAiB,GACjB,YAAY,GACZ,cAAc,GACd,aAAa,GACb,SAAS,CACZ;IACD,GAAG,EAAE;QACH,IAAI,EAAE,GAAG,EAAE,CAAC;QACZ,OAAO,EAAE,MAAM,CAAC;QAChB,OAAO,EAAE,MAAM,CAAC;KACjB,EAAE,CAAC;IACJ,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,iBAAiB,CAAC,GAAG,CAAC,EAAE,CAAC;IAClC,SAAS,EAAE,OAAO,CAAC;IACnB,QAAQ,EAAE,CAAC,MAAM,GAAG,MAAM,GAAG,SAAS,CAAC,EAAE,CAAC;IAC1C,OAAO,EAAE,GAAG,CAAC;IACb,QAAQ,EAAE,OAAO,CAAC;IAClB,SAAS,EAAE,UAAU,CAAC,eAAe,CAAC,GAAG,SAAS,CAAC;IACnD,cAAc,EAAE,OAAO,CAAC;IACxB,iBAAiB,EAAE,CAAC,GAAG,EAAE,iBAAiB,CAAC,GAAG,CAAC,EAAE,IAAI,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IACnF,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,SAAS,EAAE,MAAM,GAAG,MAAM,CAAC;IAC3B,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,eAAe,EAAE,iBAAiB,CAAC,iBAAiB,CAAC,CAAC;IACtD,UAAU,EAAE,iBAAiB,CAAC,YAAY,CAAC,CAAC;IAC5C,QAAQ,EAAE,OAAO,CAAC;IAClB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB;AAED,QAAA,MAAM,EAAE,UAAW,OAAO,4CAqazB,CAAC;AAEF,eAAe,EAAE,CAAC"}
1
+ {"version":3,"file":"tr.d.ts","sourceRoot":"","sources":["tr.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAC;AAQvD,OAAO,EAAE,UAAU,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AAI7D,UAAU,OACR,SAAQ,IAAI,CACV,UAAU,EACR,UAAU,GACV,cAAc,GACd,OAAO,GACP,UAAU,GACV,iBAAiB,GACjB,iBAAiB,GACjB,YAAY,GACZ,gBAAgB,GAChB,QAAQ,GACR,aAAa,GACb,cAAc,GACd,SAAS,GACT,OAAO,GACP,YAAY,GACZ,cAAc,GACd,WAAW,GACX,iBAAiB,GACjB,YAAY,GACZ,cAAc,GACd,aAAa,GACb,SAAS,CACZ;IACD,GAAG,EAAE;QACH,IAAI,EAAE,GAAG,EAAE,CAAC;QACZ,OAAO,EAAE,MAAM,CAAC;QAChB,OAAO,EAAE,MAAM,CAAC;KACjB,EAAE,CAAC;IACJ,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,iBAAiB,CAAC,GAAG,CAAC,EAAE,CAAC;IAClC,SAAS,EAAE,OAAO,CAAC;IACnB,QAAQ,EAAE,CAAC,MAAM,GAAG,MAAM,GAAG,SAAS,CAAC,EAAE,CAAC;IAC1C,OAAO,EAAE,GAAG,CAAC;IACb,QAAQ,EAAE,OAAO,CAAC;IAClB,SAAS,EAAE,UAAU,CAAC,eAAe,CAAC,GAAG,SAAS,CAAC;IACnD,cAAc,EAAE,OAAO,CAAC;IACxB,iBAAiB,EAAE,CAAC,GAAG,EAAE,iBAAiB,CAAC,GAAG,CAAC,EAAE,IAAI,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IACnF,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,SAAS,EAAE,MAAM,GAAG,MAAM,CAAC;IAC3B,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,eAAe,EAAE,iBAAiB,CAAC,iBAAiB,CAAC,CAAC;IACtD,UAAU,EAAE,iBAAiB,CAAC,YAAY,CAAC,CAAC;IAC5C,QAAQ,EAAE,OAAO,CAAC;IAClB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,UAAU,CAAC,EAAE,GAAG,CAAC;CAClB;AAED,QAAA,MAAM,EAAE,UAAW,OAAO,4CAsazB,CAAC;AAEF,eAAe,EAAE,CAAC"}
package/cjs/table/tr.js CHANGED
@@ -211,6 +211,7 @@ var Tr = function Tr(props) {
211
211
  return expandInstance;
212
212
  }
213
213
  if (col.type === 'checkbox') {
214
+ var selectData = props.selectData || data;
214
215
  var instance = /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
215
216
  className: tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.iconWrapper,
216
217
  children: props.radio ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_radio.default, {
@@ -222,9 +223,9 @@ var Tr = function Tr(props) {
222
223
  disabled: props.disabled,
223
224
  onChange: function onChange(value) {
224
225
  if (value) {
225
- props.datum.add(data);
226
+ props.datum.add(selectData);
226
227
  } else {
227
- props.datum.remove(data);
228
+ props.datum.remove(selectData);
228
229
  }
229
230
  }
230
231
  }) : /*#__PURE__*/(0, _jsxRuntime.jsx)(_checkbox.default, {
@@ -236,11 +237,11 @@ var Tr = function Tr(props) {
236
237
  checked: props.isSelect,
237
238
  onChange: function onChange(_value, check) {
238
239
  if (check) {
239
- props.datum.add(data, props.treeCheckAll ? {
240
+ props.datum.add(selectData, props.treeCheckAll ? {
240
241
  childrenKey: props.treeColumnsName
241
242
  } : undefined);
242
243
  } else {
243
- props.datum.remove(data, props.treeCheckAll ? {
244
+ props.datum.remove(selectData, props.treeCheckAll ? {
244
245
  childrenKey: props.treeColumnsName
245
246
  } : undefined);
246
247
  }
package/esm/sticky/sticky.js CHANGED
@@ -39,6 +39,7 @@ var events = ['scroll', 'pageshow', 'load', 'resize'];
39
39
  // };
40
40
 
41
41
  var Sticky = function Sticky(props) {
42
+ var _props$style;
42
43
  if (props.target) {
43
44
  devUseWarning.deprecated('target', 'scrollContainer', 'Sticky');
44
45
  }
@@ -394,7 +395,7 @@ var Sticky = function Sticky(props) {
394
395
  }
395
396
  var StickyEl = show && parentVisible ? /*#__PURE__*/_jsx("div", {
396
397
  style: _objectSpread(_objectSpread({
397
- zIndex: defaultZIndex
398
+ zIndex: ((_props$style = props.style) === null || _props$style === void 0 ? void 0 : _props$style.zIndex) || defaultZIndex
398
399
  }, style), elementSize),
399
400
  children: /*#__PURE__*/_jsx("div", {
400
401
  className: props.className,
package/esm/table/table.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"table.d.ts","sourceRoot":"","sources":["table.tsx"],"names":[],"mappings":"AA0BA,OAAO,EAAgB,UAAU,EAAE,MAAM,cAAc,CAAC;;AAexD,wBAgsBE"}
1
+ {"version":3,"file":"table.d.ts","sourceRoot":"","sources":["table.tsx"],"names":[],"mappings":"AA0BA,OAAO,EAAgB,UAAU,EAAE,MAAM,cAAc,CAAC;;AAexD,wBAksBE"}
package/esm/table/table.js CHANGED
@@ -551,7 +551,9 @@ export default (function (props) {
551
551
  currentIndex: virtualInfo.startIndex,
552
552
  data: virtualInfo.data,
553
553
  setRowHeight: virtualInfo.setRowHeight,
554
- scrolling: scrolling
554
+ scrolling: scrolling,
555
+ virtualRowSpanInfo: virtualInfo.rowSpanInfo,
556
+ fullData: treeData
555
557
  }))]
556
558
  }), showFoot ? /*#__PURE__*/_jsx("div", {
557
559
  className: footWrapperClass,
package/esm/table/tbody.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"tbody.d.ts","sourceRoot":"","sources":["tbody.tsx"],"names":[],"mappings":"AAGA,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;gCAEnB,UAAU;AAAjC,wBAsFE"}
1
+ {"version":3,"file":"tbody.d.ts","sourceRoot":"","sources":["tbody.tsx"],"names":[],"mappings":"AAGA,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;gCAEnB,UAAU;AAAjC,wBAmGE"}
package/esm/table/tbody.js CHANGED
@@ -34,6 +34,17 @@ export default (function (props) {
34
34
  var rowIndex = index + currentIndex;
35
35
  var originKey = util.getKey(props.keygen, item, rowIndex);
36
36
  var trRenderKey = props.loader || (_props$rowEvents = props.rowEvents) !== null && _props$rowEvents !== void 0 && _props$rowEvents.draggable ? originKey : "".concat(originKey, "-").concat(rowIndex);
37
+
38
+ // 在虚拟列表模式下，使用 virtualRowSpanInfo 来获取正确的选择数据
39
+ var selectData = item;
40
+ if (props.virtualRowSpanInfo && props.fullData) {
41
+ // rowSpanIndexArray[rowIndex] 表示第 rowIndex 行所属合并组的起始行索引
42
+ var selectIndex = props.virtualRowSpanInfo.rowSpanIndexArray[rowIndex];
43
+ selectData = props.fullData[selectIndex];
44
+ } else {
45
+ // 非虚拟列表模式使用原有逻辑
46
+ selectData = rowSelectMergeStartData[index];
47
+ }
37
48
  return /*#__PURE__*/_jsx(Tr, {
38
49
  originKey: originKey,
39
50
  row: rowData[index],
@@ -61,7 +72,8 @@ export default (function (props) {
61
72
  striped: props.striped,
62
73
  radio: props.radio,
63
74
  hover: hover,
64
- isSelect: props.datum.check(rowSelectMergeStartData[index]),
75
+ isSelect: props.datum.check(selectData),
76
+ selectData: selectData,
65
77
  handleCellHover: handleCellHover
66
78
  // to update
67
79
  ,
package/esm/table/tbody.type.d.ts CHANGED
@@ -19,5 +19,10 @@ export interface TbodyProps extends Pick<OptionalToRequired<TableProps<any, any>
19
19
  bodyScrollWidth?: number;
20
20
  resizeFlag?: number;
21
21
  scrolling?: boolean;
22
+ virtualRowSpanInfo?: {
23
+ rowSpanIndexArray: number[];
24
+ maxRowSpan: number;
25
+ } | null;
26
+ fullData?: any[];
22
27
  }
23
28
  //# sourceMappingURL=tbody.type.d.ts.map
package/esm/table/tbody.type.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"tbody.type.d.ts","sourceRoot":"","sources":["tbody.type.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC7D,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AACpE,OAAO,KAAK,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;AAE3E,MAAM,MAAM,gBAAgB,GAAG,UAAU,CAAC,OAAO,eAAe,CAAC,CAAC;AAClE,MAAM,MAAM,iBAAiB,GAAG,UAAU,CAAC,OAAO,WAAW,CAAC,CAAC;AAE/D,MAAM,WAAW,UACf,SAAQ,IAAI,CACV,kBAAkB,CAAC,UAAU,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,EACtC,MAAM,GACN,UAAU,GACV,cAAc,GACd,YAAY,GACZ,QAAQ,GACR,iBAAiB,GACjB,YAAY,GACZ,gBAAgB,GAChB,QAAQ,GACR,SAAS,GACT,OAAO,GACP,YAAY,GACZ,cAAc,GACd,WAAW,GACX,UAAU,GACV,OAAO,GACP,cAAc,GACd,aAAa,GACb,SAAS,CACZ;IACD,OAAO,EAAE,iBAAiB,CAAC,GAAG,CAAC,EAAE,CAAC;IAClC,IAAI,EAAE,GAAG,EAAE,CAAC;IACZ,QAAQ,EAAE,CAAC,MAAM,GAAG,MAAM,GAAG,SAAS,CAAC,EAAE,CAAC;IAC1C,SAAS,EAAE,OAAO,CAAC;IACnB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,aAAa,EAAE,gBAAgB,CAAC,eAAe,CAAC,CAAC;IACjD,KAAK,EAAE,SAAS,CAAC;IACjB,QAAQ,EAAE,aAAa,CAAC,MAAM,CAAC,CAAC;IAChC,eAAe,EAAE,aAAa,CAAC,iBAAiB,CAAC,CAAC;IAClD,WAAW,EAAE,OAAO,GAAG,SAAS,CAAC;IACjC,eAAe,EAAE,MAAM,GAAG,SAAS,CAAC;IACpC,YAAY,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,KAAK,IAAI,CAAC;IACvD,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB"}
1
+ {"version":3,"file":"tbody.type.d.ts","sourceRoot":"","sources":["tbody.type.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC7D,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AACpE,OAAO,KAAK,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;AAE3E,MAAM,MAAM,gBAAgB,GAAG,UAAU,CAAC,OAAO,eAAe,CAAC,CAAC;AAClE,MAAM,MAAM,iBAAiB,GAAG,UAAU,CAAC,OAAO,WAAW,CAAC,CAAC;AAE/D,MAAM,WAAW,UACf,SAAQ,IAAI,CACV,kBAAkB,CAAC,UAAU,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,EACtC,MAAM,GACN,UAAU,GACV,cAAc,GACd,YAAY,GACZ,QAAQ,GACR,iBAAiB,GACjB,YAAY,GACZ,gBAAgB,GAChB,QAAQ,GACR,SAAS,GACT,OAAO,GACP,YAAY,GACZ,cAAc,GACd,WAAW,GACX,UAAU,GACV,OAAO,GACP,cAAc,GACd,aAAa,GACb,SAAS,CACZ;IACD,OAAO,EAAE,iBAAiB,CAAC,GAAG,CAAC,EAAE,CAAC;IAClC,IAAI,EAAE,GAAG,EAAE,CAAC;IACZ,QAAQ,EAAE,CAAC,MAAM,GAAG,MAAM,GAAG,SAAS,CAAC,EAAE,CAAC;IAC1C,SAAS,EAAE,OAAO,CAAC;IACnB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,aAAa,EAAE,gBAAgB,CAAC,eAAe,CAAC,CAAC;IACjD,KAAK,EAAE,SAAS,CAAC;IACjB,QAAQ,EAAE,aAAa,CAAC,MAAM,CAAC,CAAC;IAChC,eAAe,EAAE,aAAa,CAAC,iBAAiB,CAAC,CAAC;IAClD,WAAW,EAAE,OAAO,GAAG,SAAS,CAAC;IACjC,eAAe,EAAE,MAAM,GAAG,SAAS,CAAC;IACpC,YAAY,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,KAAK,IAAI,CAAC;IACvD,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,kBAAkB,CAAC,EAAE;QACnB,iBAAiB,EAAE,MAAM,EAAE,CAAC;QAC5B,UAAU,EAAE,MAAM,CAAC;KACpB,GAAG,IAAI,CAAC;IACT,QAAQ,CAAC,EAAE,GAAG,EAAE,CAAC;CAClB"}
package/esm/table/tr.d.ts CHANGED
@@ -23,6 +23,7 @@ interface TrProps extends Pick<TbodyProps, 'jssStyle' | 'rowClassName' | 'datum'
23
23
  isSelect: boolean;
24
24
  disabled?: boolean;
25
25
  scrolling?: boolean;
26
+ selectData?: any;
26
27
  }
27
28
  declare const Tr: (props: TrProps) => import("react/jsx-runtime").JSX.Element;
28
29
  export default Tr;
package/esm/table/tr.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"tr.d.ts","sourceRoot":"","sources":["tr.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAC;AAQvD,OAAO,EAAE,UAAU,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AAI7D,UAAU,OACR,SAAQ,IAAI,CACV,UAAU,EACR,UAAU,GACV,cAAc,GACd,OAAO,GACP,UAAU,GACV,iBAAiB,GACjB,iBAAiB,GACjB,YAAY,GACZ,gBAAgB,GAChB,QAAQ,GACR,aAAa,GACb,cAAc,GACd,SAAS,GACT,OAAO,GACP,YAAY,GACZ,cAAc,GACd,WAAW,GACX,iBAAiB,GACjB,YAAY,GACZ,cAAc,GACd,aAAa,GACb,SAAS,CACZ;IACD,GAAG,EAAE;QACH,IAAI,EAAE,GAAG,EAAE,CAAC;QACZ,OAAO,EAAE,MAAM,CAAC;QAChB,OAAO,EAAE,MAAM,CAAC;KACjB,EAAE,CAAC;IACJ,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,iBAAiB,CAAC,GAAG,CAAC,EAAE,CAAC;IAClC,SAAS,EAAE,OAAO,CAAC;IACnB,QAAQ,EAAE,CAAC,MAAM,GAAG,MAAM,GAAG,SAAS,CAAC,EAAE,CAAC;IAC1C,OAAO,EAAE,GAAG,CAAC;IACb,QAAQ,EAAE,OAAO,CAAC;IAClB,SAAS,EAAE,UAAU,CAAC,eAAe,CAAC,GAAG,SAAS,CAAC;IACnD,cAAc,EAAE,OAAO,CAAC;IACxB,iBAAiB,EAAE,CAAC,GAAG,EAAE,iBAAiB,CAAC,GAAG,CAAC,EAAE,IAAI,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IACnF,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,SAAS,EAAE,MAAM,GAAG,MAAM,CAAC;IAC3B,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,eAAe,EAAE,iBAAiB,CAAC,iBAAiB,CAAC,CAAC;IACtD,UAAU,EAAE,iBAAiB,CAAC,YAAY,CAAC,CAAC;IAC5C,QAAQ,EAAE,OAAO,CAAC;IAClB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB;AAED,QAAA,MAAM,EAAE,UAAW,OAAO,4CAqazB,CAAC;AAEF,eAAe,EAAE,CAAC"}
1
+ {"version":3,"file":"tr.d.ts","sourceRoot":"","sources":["tr.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAC;AAQvD,OAAO,EAAE,UAAU,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AAI7D,UAAU,OACR,SAAQ,IAAI,CACV,UAAU,EACR,UAAU,GACV,cAAc,GACd,OAAO,GACP,UAAU,GACV,iBAAiB,GACjB,iBAAiB,GACjB,YAAY,GACZ,gBAAgB,GAChB,QAAQ,GACR,aAAa,GACb,cAAc,GACd,SAAS,GACT,OAAO,GACP,YAAY,GACZ,cAAc,GACd,WAAW,GACX,iBAAiB,GACjB,YAAY,GACZ,cAAc,GACd,aAAa,GACb,SAAS,CACZ;IACD,GAAG,EAAE;QACH,IAAI,EAAE,GAAG,EAAE,CAAC;QACZ,OAAO,EAAE,MAAM,CAAC;QAChB,OAAO,EAAE,MAAM,CAAC;KACjB,EAAE,CAAC;IACJ,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,iBAAiB,CAAC,GAAG,CAAC,EAAE,CAAC;IAClC,SAAS,EAAE,OAAO,CAAC;IACnB,QAAQ,EAAE,CAAC,MAAM,GAAG,MAAM,GAAG,SAAS,CAAC,EAAE,CAAC;IAC1C,OAAO,EAAE,GAAG,CAAC;IACb,QAAQ,EAAE,OAAO,CAAC;IAClB,SAAS,EAAE,UAAU,CAAC,eAAe,CAAC,GAAG,SAAS,CAAC;IACnD,cAAc,EAAE,OAAO,CAAC;IACxB,iBAAiB,EAAE,CAAC,GAAG,EAAE,iBAAiB,CAAC,GAAG,CAAC,EAAE,IAAI,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IACnF,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,SAAS,EAAE,MAAM,GAAG,MAAM,CAAC;IAC3B,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,eAAe,EAAE,iBAAiB,CAAC,iBAAiB,CAAC,CAAC;IACtD,UAAU,EAAE,iBAAiB,CAAC,YAAY,CAAC,CAAC;IAC5C,QAAQ,EAAE,OAAO,CAAC;IAClB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,UAAU,CAAC,EAAE,GAAG,CAAC;CAClB;AAED,QAAA,MAAM,EAAE,UAAW,OAAO,4CAsazB,CAAC;AAEF,eAAe,EAAE,CAAC"}
package/esm/table/tr.js CHANGED
@@ -205,6 +205,7 @@ var Tr = function Tr(props) {
205
205
  return expandInstance;
206
206
  }
207
207
  if (col.type === 'checkbox') {
208
+ var selectData = props.selectData || data;
208
209
  var instance = /*#__PURE__*/_jsx("div", {
209
210
  className: tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.iconWrapper,
210
211
  children: props.radio ? /*#__PURE__*/_jsx(Radio, {
@@ -216,9 +217,9 @@ var Tr = function Tr(props) {
216
217
  disabled: props.disabled,
217
218
  onChange: function onChange(value) {
218
219
  if (value) {
219
- props.datum.add(data);
220
+ props.datum.add(selectData);
220
221
  } else {
221
- props.datum.remove(data);
222
+ props.datum.remove(selectData);
222
223
  }
223
224
  }
224
225
  }) : /*#__PURE__*/_jsx(Checkbox, {
@@ -230,11 +231,11 @@ var Tr = function Tr(props) {
230
231
  checked: props.isSelect,
231
232
  onChange: function onChange(_value, check) {
232
233
  if (check) {
233
- props.datum.add(data, props.treeCheckAll ? {
234
+ props.datum.add(selectData, props.treeCheckAll ? {
234
235
  childrenKey: props.treeColumnsName
235
236
  } : undefined);
236
237
  } else {
237
- props.datum.remove(data, props.treeCheckAll ? {
238
+ props.datum.remove(selectData, props.treeCheckAll ? {
238
239
  childrenKey: props.treeColumnsName
239
240
  } : undefined);
240
241
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@sheinx/base",
3
- "version": "3.7.9-beta.2",
3
+ "version": "3.7.9-beta.4",
4
4
  "description": "",
5
5
  "keywords": [],
6
6
  "license": "MIT",
@@ -10,7 +10,7 @@
10
10
  "module": "./esm/index.js",
11
11
  "typings": "./cjs/index.d.ts",
12
12
  "dependencies": {
13
- "@sheinx/hooks": "3.7.9-beta.2",
13
+ "@sheinx/hooks": "3.7.9-beta.4",
14
14
  "immer": "^10.0.0",
15
15
  "classnames": "^2.0.0",
16
16
  "@shined/reactive": "^0.1.3-alpha.0"