@sheinx/base 3.8.7-beta.1 → 3.8.7-beta.2

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 (13) hide show
  1. package/cjs/table/td.d.ts.map +1 -1
  2. package/cjs/table/td.js +19 -17
  3. package/cjs/table/tr.d.ts.map +1 -1
  4. package/cjs/table/tr.js +11 -12
  5. package/cjs/virtual-scroll/scroll-table.d.ts.map +1 -1
  6. package/cjs/virtual-scroll/scroll-table.js +1 -0
  7. package/esm/table/td.d.ts.map +1 -1
  8. package/esm/table/td.js +19 -17
  9. package/esm/table/tr.d.ts.map +1 -1
  10. package/esm/table/tr.js +11 -12
  11. package/esm/virtual-scroll/scroll-table.d.ts.map +1 -1
  12. package/esm/virtual-scroll/scroll-table.js +1 -0
  13. package/package.json +2 -2
package/cjs/table/td.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"td.d.ts","sourceRoot":"","sources":["td.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAC;AACvD,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAE1C,UAAU,OAAQ,SAAQ,IAAI,CAAC,UAAU,EAAI,SAAS,CAAC;IACrD,GAAG,EAAE,iBAAiB,CAAC,GAAG,CAAC,CAAC;IAC5B,IAAI,EAAE,GAAG,EAAE,CAAC;IACZ,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,CAAC,EAAE,KAAK,CAAC,aAAa,CAAC;IAC5B,SAAS,EAAE,KAAK,GAAG,KAAK,CAAC;IACzB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,YAAY,CAAC,EAAE,MAAM,IAAI,CAAC;IAC1B,YAAY,CAAC,EAAE,MAAM,IAAI,CAAC;IAC1B,OAAO,CAAC,EAAE,MAAM,IAAI,CAAC;IACrB,aAAa,EAAE,CAAC,GAAG,EAAE,iBAAiB,CAAC,GAAG,CAAC,EAAE,IAAI,EAAE,GAAG,EAAE,KAAK,KAAK,CAAC,SAAS,CAAC;IAC7E,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB;AAED,MAAM,CAAC,OAAO,UAAU,EAAE,CAAC,KAAK,EAAE,OAAO,GAAG,GAAG,CAAC,OAAO,CAwDtD"}
1
+ {"version":3,"file":"td.d.ts","sourceRoot":"","sources":["td.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAC;AACvD,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAE1C,UAAU,OAAQ,SAAQ,IAAI,CAAC,UAAU,EAAE,SAAS,CAAC;IACnD,GAAG,EAAE,iBAAiB,CAAC,GAAG,CAAC,CAAC;IAC5B,IAAI,EAAE,GAAG,EAAE,CAAC;IACZ,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,CAAC,EAAE,KAAK,CAAC,aAAa,CAAC;IAC5B,SAAS,EAAE,KAAK,GAAG,KAAK,CAAC;IACzB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,YAAY,CAAC,EAAE,MAAM,IAAI,CAAC;IAC1B,YAAY,CAAC,EAAE,MAAM,IAAI,CAAC;IAC1B,OAAO,CAAC,EAAE,MAAM,IAAI,CAAC;IACrB,aAAa,EAAE,CAAC,GAAG,EAAE,iBAAiB,CAAC,GAAG,CAAC,EAAE,IAAI,EAAE,GAAG,EAAE,KAAK,KAAK,CAAC,SAAS,CAAC;IAC7E,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB;AAED,MAAM,CAAC,OAAO,UAAU,EAAE,CAAC,KAAK,EAAE,OAAO,GAAG,GAAG,CAAC,OAAO,CAkDtD"}
package/cjs/table/td.js CHANGED
@@ -21,27 +21,29 @@ function Td(props) {
21
21
  onMouseEnter = props.onMouseEnter,
22
22
  onMouseLeave = props.onMouseLeave,
23
23
  renderContent = props.renderContent;
24
- var $td = (0, _hooks.useComponentMemo)(function () {
25
- var content = renderContent(props.col, props.data);
26
- return /*#__PURE__*/(0, _jsxRuntime.jsx)("td", {
27
- colSpan: colSpan,
28
- rowSpan: rowSpan,
29
- onMouseEnter: onMouseEnter,
30
- onMouseLeave: onMouseLeave,
31
- className: className,
32
- style: props.style,
33
- dir: direction,
34
- "data-role": role,
35
- onClick: onClick,
36
- children: content
37
- }, col.key);
38
- }, [data, className, (_props$style = props.style) === null || _props$style === void 0 ? void 0 : _props$style.left, (_props$style2 = props.style) === null || _props$style2 === void 0 ? void 0 : _props$style2.right, col.type, col.treeColumnsName], props.virtual === 'lazy' ? function (prev, next) {
24
+ var $td = /*#__PURE__*/(0, _jsxRuntime.jsx)("td", {
25
+ colSpan: colSpan,
26
+ rowSpan: rowSpan,
27
+ onMouseEnter: onMouseEnter,
28
+ onMouseLeave: onMouseLeave,
29
+ className: className,
30
+ style: props.style,
31
+ dir: direction,
32
+ "data-role": role,
33
+ onClick: onClick,
34
+ children: renderContent(props.col, props.data)
35
+ }, col.key);
36
+ if (props.virtual !== 'lazy') {
37
+ return $td;
38
+ }
39
+ return (0, _hooks.useComponentMemo)(function () {
40
+ return $td;
41
+ }, [data, className, (_props$style = props.style) === null || _props$style === void 0 ? void 0 : _props$style.left, (_props$style2 = props.style) === null || _props$style2 === void 0 ? void 0 : _props$style2.right, col.type, col.treeColumnsName], function (prev, next) {
39
42
  if (col.type || col.treeColumnsName) {
40
43
  return true;
41
44
  }
42
45
  return prev.some(function (_, index) {
43
46
  return !_hooks.util.shallowEqual(prev === null || prev === void 0 ? void 0 : prev[index], next === null || next === void 0 ? void 0 : next[index]);
44
47
  }) || !props.scrolling;
45
- } : undefined);
46
- return $td;
48
+ });
47
49
  }
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;IACpB,UAAU,CAAC,EAAE,GAAG,CAAC;CAClB;AAED,QAAA,MAAM,EAAE,UAAW,OAAO,4CAsazB,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,4CAqazB,CAAC;AAEF,eAAe,EAAE,CAAC"}
package/cjs/table/tr.js CHANGED
@@ -64,12 +64,12 @@ var Tr = function Tr(props) {
64
64
  }
65
65
  return undefined;
66
66
  };
67
- var getTdStyle = (0, _hooks.usePersistFn)(function (column, colSpan) {
67
+ var getTdStyle = function getTdStyle(column, colSpan) {
68
68
  var index = column.index;
69
69
  var fixedStyle = getFixedStyle(column.fixed, index, colSpan);
70
70
  if (!fixedStyle && !column.style) return;
71
71
  return _objectSpread(_objectSpread({}, column.style), fixedStyle);
72
- });
72
+ };
73
73
  var handleCellClick = (0, _hooks.usePersistFn)(function (data, colIndex) {
74
74
  if (!props.onCellClick) return;
75
75
  props.onCellClick(data, {
@@ -80,15 +80,14 @@ var Tr = function Tr(props) {
80
80
  });
81
81
  var setVirtualRowHeight = (0, _hooks.usePersistFn)(function () {
82
82
  if (props.setRowHeight && trRef.current) {
83
- // 祖先元素不可见时（display: none）
84
- if (!trRef.current.offsetParent) return;
85
83
  var expandHeight = expandRef.current ? expandRef.current.getBoundingClientRect().height : 0;
86
84
  props.setRowHeight(props.rowIndex, trRef.current.getBoundingClientRect().height + expandHeight);
87
85
  }
88
86
  });
89
87
  (0, _react.useEffect)(setVirtualRowHeight, [props.expanded, props.rowIndex, props.bodyScrollWidth, props.resizeFlag]);
90
88
  (0, _react.useEffect)(function () {
91
- if (!trRef.current) return;
89
+ // 祖先元素不可见时（display: none）
90
+ if (!trRef.current || !trRef.current.offsetParent) return;
92
91
  var cancelObserver = (0, _hooks.addResizeObserver)(trRef.current, setVirtualRowHeight, {
93
92
  direction: 'y'
94
93
  });
@@ -134,7 +133,7 @@ var Tr = function Tr(props) {
134
133
  return _ref.apply(this, arguments);
135
134
  };
136
135
  }());
137
- var renderTreeExpand = (0, _hooks.usePersistFn)(function (content) {
136
+ var renderTreeExpand = function renderTreeExpand(content) {
138
137
  var treeIndent = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 22;
139
138
  var level = props.treeExpandLevel.get(props.originKey) || 0;
140
139
  var className = tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.expandWrapper;
@@ -187,8 +186,8 @@ var Tr = function Tr(props) {
187
186
  },
188
187
  children: [$expandIconWrapper, content]
189
188
  });
190
- });
191
- var renderContent = (0, _hooks.usePersistFn)(function (col, data) {
189
+ };
190
+ var renderContent = function renderContent(col, data) {
192
191
  if (col.type === 'expand' || col.type === 'row-expand') {
193
192
  var renderResult = typeof col.render === 'function' ? col.render(props.rawData, props.rowIndex) : undefined;
194
193
  if (typeof renderResult !== 'function') return null;
@@ -256,8 +255,8 @@ var Tr = function Tr(props) {
256
255
  }
257
256
  if (col.render === undefined) return null;
258
257
  return content;
259
- });
260
- var renderTds = (0, _hooks.usePersistFn)(function (cols, data) {
258
+ };
259
+ var renderTds = function renderTds(cols, data) {
261
260
  var tds = [];
262
261
  var skip = 0;
263
262
  var lastRowIndex = data.length - 1;
@@ -274,7 +273,7 @@ var Tr = function Tr(props) {
274
273
  var last = cols[i + (data[i].colSpan || 1) - 1] || {};
275
274
  var isRowSpanTd = data[i].rowSpan > 1;
276
275
  var shouldBindMouseEvent = props.hover && hasSiblingRowSpan || isRowSpanTd;
277
- var showCellHover = props.hoverIndex.has(props.rowIndex);
276
+ var showCellHover = props.hover && props.hoverIndex.has(props.rowIndex);
278
277
  if (!showCellHover && data[i].rowSpan > 1) {
279
278
  for (var j = 0; j < data[i].rowSpan; j++) {
280
279
  if (props.hoverIndex.has(props.rowIndex + j)) {
@@ -313,7 +312,7 @@ var Tr = function Tr(props) {
313
312
  if (_loop(i)) continue;
314
313
  }
315
314
  return tds;
316
- });
315
+ };
317
316
  var renderExpand = function renderExpand() {
318
317
  if (!props.expanded) return null;
319
318
  var expandCol = props.expandCol;
package/cjs/virtual-scroll/scroll-table.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"scroll-table.d.ts","sourceRoot":"","sources":["scroll-table.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAkC,MAAM,OAAO,CAAC;AAIvD,UAAU,WAAW;IACnB,KAAK,CAAC,EAAE,KAAK,CAAC,aAAa,CAAC;IAC5B,YAAY,EAAE,MAAM,CAAC;IACrB,WAAW,EAAE,MAAM,GAAG,MAAM,CAAC;IAC7B,MAAM,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IACzB,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAC;IAC1B,UAAU,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC,cAAc,CAAC,CAAC;IAC7C,QAAQ,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC,gBAAgB,CAAC,CAAC;IAC7C,QAAQ,CAAC,EAAE,CAAC,IAAI,EAAE;QAChB,UAAU,EAAE,MAAM,CAAC;QACnB,SAAS,EAAE,MAAM,CAAC;QAClB,CAAC,EAAE,MAAM,CAAC;QACV,CAAC,EAAE,MAAM,CAAC;QACV,QAAQ,EAAE,OAAO,CAAC;QAClB,MAAM,EAAE,MAAM,CAAC;QACf,KAAK,EAAE,MAAM,CAAC;KACf,KAAK,IAAI,CAAC;IACX,gBAAgB,CAAC,EAAE,CAAC,OAAO,CAAC,EAAE,GAAG,KAAK,IAAI,CAAC;IAC3C,cAAc,CAAC,EAAE,CAAC,CAAC,EAAE,OAAO,KAAK,IAAI,CAAC;IACtC,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAC,cAAc,CAAC,CAAC;IAC1C,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,aAAa,CAAC,EAAE,KAAK,CAAC,aAAa,CAAC;IACpC,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAWD,QAAA,MAAM,MAAM,UAAW,WAAW,4CAwJjC,CAAC;AAEF,eAAe,MAAM,CAAC"}
1
+ {"version":3,"file":"scroll-table.d.ts","sourceRoot":"","sources":["scroll-table.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAkC,MAAM,OAAO,CAAC;AAIvD,UAAU,WAAW;IACnB,KAAK,CAAC,EAAE,KAAK,CAAC,aAAa,CAAC;IAC5B,YAAY,EAAE,MAAM,CAAC;IACrB,WAAW,EAAE,MAAM,GAAG,MAAM,CAAC;IAC7B,MAAM,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IACzB,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAC;IAC1B,UAAU,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC,cAAc,CAAC,CAAC;IAC7C,QAAQ,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC,gBAAgB,CAAC,CAAC;IAC7C,QAAQ,CAAC,EAAE,CAAC,IAAI,EAAE;QAChB,UAAU,EAAE,MAAM,CAAC;QACnB,SAAS,EAAE,MAAM,CAAC;QAClB,CAAC,EAAE,MAAM,CAAC;QACV,CAAC,EAAE,MAAM,CAAC;QACV,QAAQ,EAAE,OAAO,CAAC;QAClB,MAAM,EAAE,MAAM,CAAC;QACf,KAAK,EAAE,MAAM,CAAC;KACf,KAAK,IAAI,CAAC;IACX,gBAAgB,CAAC,EAAE,CAAC,OAAO,CAAC,EAAE,GAAG,KAAK,IAAI,CAAC;IAC3C,cAAc,CAAC,EAAE,CAAC,CAAC,EAAE,OAAO,KAAK,IAAI,CAAC;IACtC,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAC,cAAc,CAAC,CAAC;IAC1C,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,aAAa,CAAC,EAAE,KAAK,CAAC,aAAa,CAAC;IACpC,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAWD,QAAA,MAAM,MAAM,UAAW,WAAW,4CA0JjC,CAAC;AAEF,eAAe,MAAM,CAAC"}
package/cjs/virtual-scroll/scroll-table.js CHANGED
@@ -140,6 +140,7 @@ var Scroll = function Scroll(props) {
140
140
  // 非定高的Table但依旧采用了virtual渲染方式，需要渲染出全部的data
141
141
  (0, _react.useLayoutEffect)(function () {
142
142
  if (!props.tableRef.current || !props.setFakeVirtual) return;
143
+ if (props.tableRef.current.style.height || props.tableRef.current.style.flex) return;
143
144
  var container = containerRef.current;
144
145
  var isContainerVisible = (container === null || container === void 0 ? void 0 : container.offsetParent) !== null;
145
146
  if (!isContainerVisible) return;
package/esm/table/td.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"td.d.ts","sourceRoot":"","sources":["td.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAC;AACvD,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAE1C,UAAU,OAAQ,SAAQ,IAAI,CAAC,UAAU,EAAI,SAAS,CAAC;IACrD,GAAG,EAAE,iBAAiB,CAAC,GAAG,CAAC,CAAC;IAC5B,IAAI,EAAE,GAAG,EAAE,CAAC;IACZ,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,CAAC,EAAE,KAAK,CAAC,aAAa,CAAC;IAC5B,SAAS,EAAE,KAAK,GAAG,KAAK,CAAC;IACzB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,YAAY,CAAC,EAAE,MAAM,IAAI,CAAC;IAC1B,YAAY,CAAC,EAAE,MAAM,IAAI,CAAC;IAC1B,OAAO,CAAC,EAAE,MAAM,IAAI,CAAC;IACrB,aAAa,EAAE,CAAC,GAAG,EAAE,iBAAiB,CAAC,GAAG,CAAC,EAAE,IAAI,EAAE,GAAG,EAAE,KAAK,KAAK,CAAC,SAAS,CAAC;IAC7E,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB;AAED,MAAM,CAAC,OAAO,UAAU,EAAE,CAAC,KAAK,EAAE,OAAO,GAAG,GAAG,CAAC,OAAO,CAwDtD"}
1
+ {"version":3,"file":"td.d.ts","sourceRoot":"","sources":["td.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAC;AACvD,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAE1C,UAAU,OAAQ,SAAQ,IAAI,CAAC,UAAU,EAAE,SAAS,CAAC;IACnD,GAAG,EAAE,iBAAiB,CAAC,GAAG,CAAC,CAAC;IAC5B,IAAI,EAAE,GAAG,EAAE,CAAC;IACZ,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,CAAC,EAAE,KAAK,CAAC,aAAa,CAAC;IAC5B,SAAS,EAAE,KAAK,GAAG,KAAK,CAAC;IACzB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,YAAY,CAAC,EAAE,MAAM,IAAI,CAAC;IAC1B,YAAY,CAAC,EAAE,MAAM,IAAI,CAAC;IAC1B,OAAO,CAAC,EAAE,MAAM,IAAI,CAAC;IACrB,aAAa,EAAE,CAAC,GAAG,EAAE,iBAAiB,CAAC,GAAG,CAAC,EAAE,IAAI,EAAE,GAAG,EAAE,KAAK,KAAK,CAAC,SAAS,CAAC;IAC7E,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB;AAED,MAAM,CAAC,OAAO,UAAU,EAAE,CAAC,KAAK,EAAE,OAAO,GAAG,GAAG,CAAC,OAAO,CAkDtD"}
package/esm/table/td.js CHANGED
@@ -14,27 +14,29 @@ export default function Td(props) {
14
14
  onMouseEnter = props.onMouseEnter,
15
15
  onMouseLeave = props.onMouseLeave,
16
16
  renderContent = props.renderContent;
17
- var $td = useComponentMemo(function () {
18
- var content = renderContent(props.col, props.data);
19
- return /*#__PURE__*/_jsx("td", {
20
- colSpan: colSpan,
21
- rowSpan: rowSpan,
22
- onMouseEnter: onMouseEnter,
23
- onMouseLeave: onMouseLeave,
24
- className: className,
25
- style: props.style,
26
- dir: direction,
27
- "data-role": role,
28
- onClick: onClick,
29
- children: content
30
- }, col.key);
31
- }, [data, className, (_props$style = props.style) === null || _props$style === void 0 ? void 0 : _props$style.left, (_props$style2 = props.style) === null || _props$style2 === void 0 ? void 0 : _props$style2.right, col.type, col.treeColumnsName], props.virtual === 'lazy' ? function (prev, next) {
17
+ var $td = /*#__PURE__*/_jsx("td", {
18
+ colSpan: colSpan,
19
+ rowSpan: rowSpan,
20
+ onMouseEnter: onMouseEnter,
21
+ onMouseLeave: onMouseLeave,
22
+ className: className,
23
+ style: props.style,
24
+ dir: direction,
25
+ "data-role": role,
26
+ onClick: onClick,
27
+ children: renderContent(props.col, props.data)
28
+ }, col.key);
29
+ if (props.virtual !== 'lazy') {
30
+ return $td;
31
+ }
32
+ return useComponentMemo(function () {
33
+ return $td;
34
+ }, [data, className, (_props$style = props.style) === null || _props$style === void 0 ? void 0 : _props$style.left, (_props$style2 = props.style) === null || _props$style2 === void 0 ? void 0 : _props$style2.right, col.type, col.treeColumnsName], function (prev, next) {
32
35
  if (col.type || col.treeColumnsName) {
33
36
  return true;
34
37
  }
35
38
  return prev.some(function (_, index) {
36
39
  return !util.shallowEqual(prev === null || prev === void 0 ? void 0 : prev[index], next === null || next === void 0 ? void 0 : next[index]);
37
40
  }) || !props.scrolling;
38
- } : undefined);
39
- return $td;
41
+ });
40
42
  }
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;IACpB,UAAU,CAAC,EAAE,GAAG,CAAC;CAClB;AAED,QAAA,MAAM,EAAE,UAAW,OAAO,4CAsazB,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,4CAqazB,CAAC;AAEF,eAAe,EAAE,CAAC"}
package/esm/table/tr.js CHANGED
@@ -58,12 +58,12 @@ var Tr = function Tr(props) {
58
58
  }
59
59
  return undefined;
60
60
  };
61
- var getTdStyle = usePersistFn(function (column, colSpan) {
61
+ var getTdStyle = function getTdStyle(column, colSpan) {
62
62
  var index = column.index;
63
63
  var fixedStyle = getFixedStyle(column.fixed, index, colSpan);
64
64
  if (!fixedStyle && !column.style) return;
65
65
  return _objectSpread(_objectSpread({}, column.style), fixedStyle);
66
- });
66
+ };
67
67
  var handleCellClick = usePersistFn(function (data, colIndex) {
68
68
  if (!props.onCellClick) return;
69
69
  props.onCellClick(data, {
@@ -74,15 +74,14 @@ var Tr = function Tr(props) {
74
74
  });
75
75
  var setVirtualRowHeight = usePersistFn(function () {
76
76
  if (props.setRowHeight && trRef.current) {
77
- // 祖先元素不可见时（display: none）
78
- if (!trRef.current.offsetParent) return;
79
77
  var expandHeight = expandRef.current ? expandRef.current.getBoundingClientRect().height : 0;
80
78
  props.setRowHeight(props.rowIndex, trRef.current.getBoundingClientRect().height + expandHeight);
81
79
  }
82
80
  });
83
81
  useEffect(setVirtualRowHeight, [props.expanded, props.rowIndex, props.bodyScrollWidth, props.resizeFlag]);
84
82
  useEffect(function () {
85
- if (!trRef.current) return;
83
+ // 祖先元素不可见时（display: none）
84
+ if (!trRef.current || !trRef.current.offsetParent) return;
86
85
  var cancelObserver = addResizeObserver(trRef.current, setVirtualRowHeight, {
87
86
  direction: 'y'
88
87
  });
@@ -128,7 +127,7 @@ var Tr = function Tr(props) {
128
127
  return _ref.apply(this, arguments);
129
128
  };
130
129
  }());
131
- var renderTreeExpand = usePersistFn(function (content) {
130
+ var renderTreeExpand = function renderTreeExpand(content) {
132
131
  var treeIndent = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 22;
133
132
  var level = props.treeExpandLevel.get(props.originKey) || 0;
134
133
  var className = tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.expandWrapper;
@@ -181,8 +180,8 @@ var Tr = function Tr(props) {
181
180
  },
182
181
  children: [$expandIconWrapper, content]
183
182
  });
184
- });
185
- var renderContent = usePersistFn(function (col, data) {
183
+ };
184
+ var renderContent = function renderContent(col, data) {
186
185
  if (col.type === 'expand' || col.type === 'row-expand') {
187
186
  var renderResult = typeof col.render === 'function' ? col.render(props.rawData, props.rowIndex) : undefined;
188
187
  if (typeof renderResult !== 'function') return null;
@@ -250,8 +249,8 @@ var Tr = function Tr(props) {
250
249
  }
251
250
  if (col.render === undefined) return null;
252
251
  return content;
253
- });
254
- var renderTds = usePersistFn(function (cols, data) {
252
+ };
253
+ var renderTds = function renderTds(cols, data) {
255
254
  var tds = [];
256
255
  var skip = 0;
257
256
  var lastRowIndex = data.length - 1;
@@ -268,7 +267,7 @@ var Tr = function Tr(props) {
268
267
  var last = cols[i + (data[i].colSpan || 1) - 1] || {};
269
268
  var isRowSpanTd = data[i].rowSpan > 1;
270
269
  var shouldBindMouseEvent = props.hover && hasSiblingRowSpan || isRowSpanTd;
271
- var showCellHover = props.hoverIndex.has(props.rowIndex);
270
+ var showCellHover = props.hover && props.hoverIndex.has(props.rowIndex);
272
271
  if (!showCellHover && data[i].rowSpan > 1) {
273
272
  for (var j = 0; j < data[i].rowSpan; j++) {
274
273
  if (props.hoverIndex.has(props.rowIndex + j)) {
@@ -307,7 +306,7 @@ var Tr = function Tr(props) {
307
306
  if (_loop(i)) continue;
308
307
  }
309
308
  return tds;
310
- });
309
+ };
311
310
  var renderExpand = function renderExpand() {
312
311
  if (!props.expanded) return null;
313
312
  var expandCol = props.expandCol;
package/esm/virtual-scroll/scroll-table.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"scroll-table.d.ts","sourceRoot":"","sources":["scroll-table.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAkC,MAAM,OAAO,CAAC;AAIvD,UAAU,WAAW;IACnB,KAAK,CAAC,EAAE,KAAK,CAAC,aAAa,CAAC;IAC5B,YAAY,EAAE,MAAM,CAAC;IACrB,WAAW,EAAE,MAAM,GAAG,MAAM,CAAC;IAC7B,MAAM,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IACzB,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAC;IAC1B,UAAU,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC,cAAc,CAAC,CAAC;IAC7C,QAAQ,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC,gBAAgB,CAAC,CAAC;IAC7C,QAAQ,CAAC,EAAE,CAAC,IAAI,EAAE;QAChB,UAAU,EAAE,MAAM,CAAC;QACnB,SAAS,EAAE,MAAM,CAAC;QAClB,CAAC,EAAE,MAAM,CAAC;QACV,CAAC,EAAE,MAAM,CAAC;QACV,QAAQ,EAAE,OAAO,CAAC;QAClB,MAAM,EAAE,MAAM,CAAC;QACf,KAAK,EAAE,MAAM,CAAC;KACf,KAAK,IAAI,CAAC;IACX,gBAAgB,CAAC,EAAE,CAAC,OAAO,CAAC,EAAE,GAAG,KAAK,IAAI,CAAC;IAC3C,cAAc,CAAC,EAAE,CAAC,CAAC,EAAE,OAAO,KAAK,IAAI,CAAC;IACtC,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAC,cAAc,CAAC,CAAC;IAC1C,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,aAAa,CAAC,EAAE,KAAK,CAAC,aAAa,CAAC;IACpC,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAWD,QAAA,MAAM,MAAM,UAAW,WAAW,4CAwJjC,CAAC;AAEF,eAAe,MAAM,CAAC"}
1
+ {"version":3,"file":"scroll-table.d.ts","sourceRoot":"","sources":["scroll-table.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAkC,MAAM,OAAO,CAAC;AAIvD,UAAU,WAAW;IACnB,KAAK,CAAC,EAAE,KAAK,CAAC,aAAa,CAAC;IAC5B,YAAY,EAAE,MAAM,CAAC;IACrB,WAAW,EAAE,MAAM,GAAG,MAAM,CAAC;IAC7B,MAAM,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IACzB,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAC;IAC1B,UAAU,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC,cAAc,CAAC,CAAC;IAC7C,QAAQ,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC,gBAAgB,CAAC,CAAC;IAC7C,QAAQ,CAAC,EAAE,CAAC,IAAI,EAAE;QAChB,UAAU,EAAE,MAAM,CAAC;QACnB,SAAS,EAAE,MAAM,CAAC;QAClB,CAAC,EAAE,MAAM,CAAC;QACV,CAAC,EAAE,MAAM,CAAC;QACV,QAAQ,EAAE,OAAO,CAAC;QAClB,MAAM,EAAE,MAAM,CAAC;QACf,KAAK,EAAE,MAAM,CAAC;KACf,KAAK,IAAI,CAAC;IACX,gBAAgB,CAAC,EAAE,CAAC,OAAO,CAAC,EAAE,GAAG,KAAK,IAAI,CAAC;IAC3C,cAAc,CAAC,EAAE,CAAC,CAAC,EAAE,OAAO,KAAK,IAAI,CAAC;IACtC,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAC,cAAc,CAAC,CAAC;IAC1C,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,aAAa,CAAC,EAAE,KAAK,CAAC,aAAa,CAAC;IACpC,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAWD,QAAA,MAAM,MAAM,UAAW,WAAW,4CA0JjC,CAAC;AAEF,eAAe,MAAM,CAAC"}
package/esm/virtual-scroll/scroll-table.js CHANGED
@@ -133,6 +133,7 @@ var Scroll = function Scroll(props) {
133
133
  // 非定高的Table但依旧采用了virtual渲染方式，需要渲染出全部的data
134
134
  useLayoutEffect(function () {
135
135
  if (!props.tableRef.current || !props.setFakeVirtual) return;
136
+ if (props.tableRef.current.style.height || props.tableRef.current.style.flex) return;
136
137
  var container = containerRef.current;
137
138
  var isContainerVisible = (container === null || container === void 0 ? void 0 : container.offsetParent) !== null;
138
139
  if (!isContainerVisible) return;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@sheinx/base",
3
- "version": "3.8.7-beta.1",
3
+ "version": "3.8.7-beta.2",
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.8.7-beta.1",
13
+ "@sheinx/hooks": "3.8.7-beta.2",
14
14
  "immer": "^10.0.0",
15
15
  "classnames": "^2.0.0",
16
16
  "@shined/reactive": "^0.1.3-alpha.0"