@sheinx/hooks 3.9.6-beta.7 → 3.9.6-beta.9

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 (7) hide show
  1. package/cjs/components/use-table/use-table-row.d.ts +2 -0
  2. package/cjs/components/use-table/use-table-row.d.ts.map +1 -1
  3. package/cjs/components/use-table/use-table-row.js +60 -17
  4. package/esm/components/use-table/use-table-row.d.ts +2 -0
  5. package/esm/components/use-table/use-table-row.d.ts.map +1 -1
  6. package/esm/components/use-table/use-table-row.js +60 -17
  7. package/package.json +1 -1
package/cjs/components/use-table/use-table-row.d.ts CHANGED
@@ -5,6 +5,8 @@ export interface TableRowProps extends Pick<BaseTableProps<any>, 'data'> {
5
5
  columns: TableFormatColumn<any>[];
6
6
  currentIndex: number;
7
7
  hover: boolean;
8
+ originData?: any[];
9
+ rowSpanIndexArray?: number[];
8
10
  }
9
11
  export interface Row {
10
12
  index: number;
package/cjs/components/use-table/use-table-row.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"use-table-row.d.ts","sourceRoot":"","sources":["use-table-row.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,iBAAiB,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AACrE,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAKjD,MAAM,WAAW,aAAc,SAAQ,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC;IACtE,OAAO,EAAE,iBAAiB,CAAC,GAAG,CAAC,EAAE,CAAC;IAClC,YAAY,EAAE,MAAM,CAAC;IACrB,KAAK,EAAE,OAAO,CAAC;CAChB;AAED,MAAM,WAAW,GAAG;IAClB,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,GAAG,CAAC;IACV,UAAU,CAAC,EAAE,YAAY,EAAE,CAAC;IAC5B,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;IAC1B,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,YAAY,CAAC,EAAE,OAAO,CAAC;CACxB;AA4CD;;;;GAIG;AACH,QAAA,MAAM,WAAW,UAAW,aAAa;;gCASS,MAAM;;;CAgDvD,CAAC;AAEF,eAAe,WAAW,CAAC"}
1
+ {"version":3,"file":"use-table-row.d.ts","sourceRoot":"","sources":["use-table-row.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,iBAAiB,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AACrE,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAKjD,MAAM,WAAW,aAAc,SAAQ,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC;IACtE,OAAO,EAAE,iBAAiB,CAAC,GAAG,CAAC,EAAE,CAAC;IAClC,YAAY,EAAE,MAAM,CAAC;IACrB,KAAK,EAAE,OAAO,CAAC;IACf,UAAU,CAAC,EAAE,GAAG,EAAE,CAAC;IACnB,iBAAiB,CAAC,EAAE,MAAM,EAAE,CAAC;CAC9B;AAED,MAAM,WAAW,GAAG;IAClB,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,GAAG,CAAC;IACV,UAAU,CAAC,EAAE,YAAY,EAAE,CAAC;IAC5B,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;IAC1B,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,YAAY,CAAC,EAAE,OAAO,CAAC;CACxB;AA4CD;;;;GAIG;AACH,QAAA,MAAM,WAAW,UAAW,aAAa;;gCASS,MAAM;;;CA2FvD,CAAC;AAEF,eAAe,WAAW,CAAC"}
package/cjs/components/use-table/use-table-row.js CHANGED
@@ -71,6 +71,32 @@ var useTableRow = function useTableRow(props) {
71
71
  }
72
72
  setHoverIndex(hoverIndex);
73
73
  });
74
+
75
+ // 为虚拟滚动场景预计算 checkbox 列的 rowSpan 索引数组（缓存以提升性能）
76
+ var checkboxRowSpanIndexArray = (0, _react.useMemo)(function () {
77
+ var columns = props.columns || [];
78
+ var checkCol = columns.find(function (col) {
79
+ return col.type === 'checkbox';
80
+ });
81
+
82
+ // 只在虚拟滚动 + checkbox 有 rowSpan 时才需要计算
83
+ if (!(checkCol !== null && checkCol !== void 0 && checkCol.rowSpan) || !props.rowSpanIndexArray || !props.originData) {
84
+ return null;
85
+ }
86
+ var originData = props.originData;
87
+ var indexArray = [];
88
+ for (var i = 0; i < originData.length; i++) {
89
+ if (indexArray[i] === undefined) {
90
+ indexArray[i] = i;
91
+ }
92
+ // 检查当前行是否应该和下一行合并
93
+ if (i < originData.length - 1 && checkCol.rowSpan(originData[i], originData[i + 1])) {
94
+ // 下一行应该指向当前行的起始索引
95
+ indexArray[i + 1] = indexArray[i];
96
+ }
97
+ }
98
+ return indexArray;
99
+ }, [props.columns, props.originData, props.rowSpanIndexArray]);
74
100
  var rowData = (0, _react.useMemo)(function () {
75
101
  var rows = [];
76
102
  context.rowSelectMergeStartData = [];
@@ -79,28 +105,45 @@ var useTableRow = function useTableRow(props) {
79
105
  var checkCol = columns.find(function (col) {
80
106
  return col.type === 'checkbox';
81
107
  });
82
- for (var i = data.length - 1; i >= 0; i--) {
83
- var d = data[i];
84
- rows.unshift(format(columns, d, rows[0], currentIndex + i).map(function (col) {
108
+
109
+ // 计算 rowSelectMergeStartData
110
+ if (checkboxRowSpanIndexArray && props.originData) {
111
+ // 虚拟滚动 + checkbox 有 rowSpan：使用预计算的 checkbox 专属索引数组
112
+ var originData = props.originData;
113
+ for (var i = 0; i < data.length; i++) {
114
+ var globalIndex = currentIndex + i;
115
+ var startIndex = checkboxRowSpanIndexArray[globalIndex];
116
+ context.rowSelectMergeStartData[i] = originData[startIndex] || data[i];
117
+ }
118
+ } else if (checkCol !== null && checkCol !== void 0 && checkCol.rowSpan) {
119
+ // 非虚拟滚动 + checkbox 有 rowSpan：基于当前数据计算
120
+ for (var _i = 0; _i < data.length; _i++) {
121
+ var currentData = data[_i];
122
+ // 如果当前行还没有被设置起始数据，说明它是一个新的合并组的起始
123
+ if (context.rowSelectMergeStartData[_i] === undefined) {
124
+ context.rowSelectMergeStartData[_i] = currentData;
125
+ }
126
+ // 检查当前行是否应该和下一行合并
127
+ if (_i < data.length - 1 && checkCol.rowSpan(currentData, data[_i + 1])) {
128
+ // 下一行应该指向当前行的起始数据
129
+ context.rowSelectMergeStartData[_i + 1] = context.rowSelectMergeStartData[_i];
130
+ }
131
+ }
132
+ } else {
133
+ // checkbox 列无 rowSpan，每行都是自己的起始数据
134
+ for (var _i2 = 0; _i2 < data.length; _i2++) {
135
+ context.rowSelectMergeStartData[_i2] = data[_i2];
136
+ }
137
+ }
138
+ for (var _i3 = data.length - 1; _i3 >= 0; _i3--) {
139
+ var d = data[_i3];
140
+ rows.unshift(format(columns, d, rows[0], currentIndex + _i3).map(function (col) {
85
141
  delete col.content;
86
142
  return col;
87
143
  }));
88
- {
89
- //记录合并行合并到的数据需要从0 开始
90
- var i0 = data.length - 1 - i;
91
- var d0 = data[i0];
92
- context.rowSelectMergeStartData[i0] = d0;
93
- if (i0 > 0 && checkCol && typeof checkCol.rowSpan === 'function') {
94
- var beforeData = data[i0 - 1];
95
- if (beforeData !== null && checkCol.rowSpan(beforeData, d0)) {
96
- var _context$rowSelectMer;
97
- context.rowSelectMergeStartData[i0] = (_context$rowSelectMer = context.rowSelectMergeStartData[i0 - 1]) !== null && _context$rowSelectMer !== void 0 ? _context$rowSelectMer : beforeData;
98
- }
99
- }
100
- }
101
144
  }
102
145
  return rows;
103
- }, [props.columns, props.data]);
146
+ }, [props.columns, props.data, props.originData, props.rowSpanIndexArray, currentIndex, checkboxRowSpanIndexArray]);
104
147
  return {
105
148
  rowData: rowData,
106
149
  handleCellHover: handleCellHover,
package/esm/components/use-table/use-table-row.d.ts CHANGED
@@ -5,6 +5,8 @@ export interface TableRowProps extends Pick<BaseTableProps<any>, 'data'> {
5
5
  columns: TableFormatColumn<any>[];
6
6
  currentIndex: number;
7
7
  hover: boolean;
8
+ originData?: any[];
9
+ rowSpanIndexArray?: number[];
8
10
  }
9
11
  export interface Row {
10
12
  index: number;
package/esm/components/use-table/use-table-row.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"use-table-row.d.ts","sourceRoot":"","sources":["use-table-row.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,iBAAiB,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AACrE,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAKjD,MAAM,WAAW,aAAc,SAAQ,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC;IACtE,OAAO,EAAE,iBAAiB,CAAC,GAAG,CAAC,EAAE,CAAC;IAClC,YAAY,EAAE,MAAM,CAAC;IACrB,KAAK,EAAE,OAAO,CAAC;CAChB;AAED,MAAM,WAAW,GAAG;IAClB,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,GAAG,CAAC;IACV,UAAU,CAAC,EAAE,YAAY,EAAE,CAAC;IAC5B,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;IAC1B,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,YAAY,CAAC,EAAE,OAAO,CAAC;CACxB;AA4CD;;;;GAIG;AACH,QAAA,MAAM,WAAW,UAAW,aAAa;;gCASS,MAAM;;;CAgDvD,CAAC;AAEF,eAAe,WAAW,CAAC"}
1
+ {"version":3,"file":"use-table-row.d.ts","sourceRoot":"","sources":["use-table-row.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,iBAAiB,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AACrE,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAKjD,MAAM,WAAW,aAAc,SAAQ,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC;IACtE,OAAO,EAAE,iBAAiB,CAAC,GAAG,CAAC,EAAE,CAAC;IAClC,YAAY,EAAE,MAAM,CAAC;IACrB,KAAK,EAAE,OAAO,CAAC;IACf,UAAU,CAAC,EAAE,GAAG,EAAE,CAAC;IACnB,iBAAiB,CAAC,EAAE,MAAM,EAAE,CAAC;CAC9B;AAED,MAAM,WAAW,GAAG;IAClB,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,GAAG,CAAC;IACV,UAAU,CAAC,EAAE,YAAY,EAAE,CAAC;IAC5B,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;IAC1B,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,YAAY,CAAC,EAAE,OAAO,CAAC;CACxB;AA4CD;;;;GAIG;AACH,QAAA,MAAM,WAAW,UAAW,aAAa;;gCASS,MAAM;;;CA2FvD,CAAC;AAEF,eAAe,WAAW,CAAC"}
package/esm/components/use-table/use-table-row.js CHANGED
@@ -65,6 +65,32 @@ var useTableRow = function useTableRow(props) {
65
65
  }
66
66
  setHoverIndex(hoverIndex);
67
67
  });
68
+
69
+ // 为虚拟滚动场景预计算 checkbox 列的 rowSpan 索引数组（缓存以提升性能）
70
+ var checkboxRowSpanIndexArray = useMemo(function () {
71
+ var columns = props.columns || [];
72
+ var checkCol = columns.find(function (col) {
73
+ return col.type === 'checkbox';
74
+ });
75
+
76
+ // 只在虚拟滚动 + checkbox 有 rowSpan 时才需要计算
77
+ if (!(checkCol !== null && checkCol !== void 0 && checkCol.rowSpan) || !props.rowSpanIndexArray || !props.originData) {
78
+ return null;
79
+ }
80
+ var originData = props.originData;
81
+ var indexArray = [];
82
+ for (var i = 0; i < originData.length; i++) {
83
+ if (indexArray[i] === undefined) {
84
+ indexArray[i] = i;
85
+ }
86
+ // 检查当前行是否应该和下一行合并
87
+ if (i < originData.length - 1 && checkCol.rowSpan(originData[i], originData[i + 1])) {
88
+ // 下一行应该指向当前行的起始索引
89
+ indexArray[i + 1] = indexArray[i];
90
+ }
91
+ }
92
+ return indexArray;
93
+ }, [props.columns, props.originData, props.rowSpanIndexArray]);
68
94
  var rowData = useMemo(function () {
69
95
  var rows = [];
70
96
  context.rowSelectMergeStartData = [];
@@ -73,28 +99,45 @@ var useTableRow = function useTableRow(props) {
73
99
  var checkCol = columns.find(function (col) {
74
100
  return col.type === 'checkbox';
75
101
  });
76
- for (var i = data.length - 1; i >= 0; i--) {
77
- var d = data[i];
78
- rows.unshift(format(columns, d, rows[0], currentIndex + i).map(function (col) {
102
+
103
+ // 计算 rowSelectMergeStartData
104
+ if (checkboxRowSpanIndexArray && props.originData) {
105
+ // 虚拟滚动 + checkbox 有 rowSpan：使用预计算的 checkbox 专属索引数组
106
+ var originData = props.originData;
107
+ for (var i = 0; i < data.length; i++) {
108
+ var globalIndex = currentIndex + i;
109
+ var startIndex = checkboxRowSpanIndexArray[globalIndex];
110
+ context.rowSelectMergeStartData[i] = originData[startIndex] || data[i];
111
+ }
112
+ } else if (checkCol !== null && checkCol !== void 0 && checkCol.rowSpan) {
113
+ // 非虚拟滚动 + checkbox 有 rowSpan：基于当前数据计算
114
+ for (var _i = 0; _i < data.length; _i++) {
115
+ var currentData = data[_i];
116
+ // 如果当前行还没有被设置起始数据，说明它是一个新的合并组的起始
117
+ if (context.rowSelectMergeStartData[_i] === undefined) {
118
+ context.rowSelectMergeStartData[_i] = currentData;
119
+ }
120
+ // 检查当前行是否应该和下一行合并
121
+ if (_i < data.length - 1 && checkCol.rowSpan(currentData, data[_i + 1])) {
122
+ // 下一行应该指向当前行的起始数据
123
+ context.rowSelectMergeStartData[_i + 1] = context.rowSelectMergeStartData[_i];
124
+ }
125
+ }
126
+ } else {
127
+ // checkbox 列无 rowSpan，每行都是自己的起始数据
128
+ for (var _i2 = 0; _i2 < data.length; _i2++) {
129
+ context.rowSelectMergeStartData[_i2] = data[_i2];
130
+ }
131
+ }
132
+ for (var _i3 = data.length - 1; _i3 >= 0; _i3--) {
133
+ var d = data[_i3];
134
+ rows.unshift(format(columns, d, rows[0], currentIndex + _i3).map(function (col) {
79
135
  delete col.content;
80
136
  return col;
81
137
  }));
82
- {
83
- //记录合并行合并到的数据需要从0 开始
84
- var i0 = data.length - 1 - i;
85
- var d0 = data[i0];
86
- context.rowSelectMergeStartData[i0] = d0;
87
- if (i0 > 0 && checkCol && typeof checkCol.rowSpan === 'function') {
88
- var beforeData = data[i0 - 1];
89
- if (beforeData !== null && checkCol.rowSpan(beforeData, d0)) {
90
- var _context$rowSelectMer;
91
- context.rowSelectMergeStartData[i0] = (_context$rowSelectMer = context.rowSelectMergeStartData[i0 - 1]) !== null && _context$rowSelectMer !== void 0 ? _context$rowSelectMer : beforeData;
92
- }
93
- }
94
- }
95
138
  }
96
139
  return rows;
97
- }, [props.columns, props.data]);
140
+ }, [props.columns, props.data, props.originData, props.rowSpanIndexArray, currentIndex, checkboxRowSpanIndexArray]);
98
141
  return {
99
142
  rowData: rowData,
100
143
  handleCellHover: handleCellHover,
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@sheinx/hooks",
3
- "version": "3.9.6-beta.7",
3
+ "version": "3.9.6-beta.9",
4
4
  "description": "",
5
5
  "keywords": [],
6
6
  "license": "MIT",