@sheinx/base 3.9.0-beta.30 → 3.9.0-beta.31

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 (5) hide show
  1. package/cjs/table/thead.d.ts.map +1 -1
  2. package/cjs/table/thead.js +3 -3
  3. package/esm/table/thead.d.ts.map +1 -1
  4. package/esm/table/thead.js +3 -3
  5. package/package.json +2 -2
package/cjs/table/thead.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"thead.d.ts","sourceRoot":"","sources":["thead.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;gCAWnB,UAAU;AAAjC,wBAkVE"}
1
+ {"version":3,"file":"thead.d.ts","sourceRoot":"","sources":["thead.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;gCAWnB,UAAU;AAAjC,wBAmVE"}
package/cjs/table/thead.js CHANGED
@@ -158,7 +158,7 @@ var _default = exports.default = function _default(props) {
158
158
  dir: config.direction
159
159
  });
160
160
  };
161
- var getFixedStyle = function getFixedStyle(fixed, index, level) {
161
+ var getFixedStyle = function getFixedStyle(fixed, index, colSpan, level) {
162
162
  // 累加level 至 0 的所有高度
163
163
  var top = context.trHeights.slice(0, level).reduce(function (a, b) {
164
164
  return toNum(a) + toNum(b);
@@ -174,7 +174,7 @@ var _default = exports.default = function _default(props) {
174
174
  };
175
175
  }
176
176
  if (fixed === 'right') {
177
- var right = colgroup.slice(index + 1).reduce(function (a, b) {
177
+ var right = colgroup.slice(index + (typeof colSpan === 'function' ? 1 : colSpan)).reduce(function (a, b) {
178
178
  return toNum(a) + toNum(b);
179
179
  }, 0);
180
180
  return {
@@ -192,7 +192,7 @@ var _default = exports.default = function _default(props) {
192
192
  var _colTemp2$groupProps, _colTemp2$groupProps2;
193
193
  var colTemp = col;
194
194
  var colTemp2 = col;
195
- var fixedStyle = getFixedStyle(col.fixed, col.index, level);
195
+ var fixedStyle = getFixedStyle(col.fixed, col.index, colTemp2.colSpan || 1, level);
196
196
  var cellClassName = (0, _classnames.default)(colTemp.className, colTemp.type === 'checkbox' && (tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.cellCheckbox), col.fixed === 'left' && (tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.cellFixedLeft), col.fixed === 'right' && (tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.cellFixedRight), colTemp.align === 'center' && (tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.cellAlignCenter), colTemp.align === 'right' && (tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.cellAlignRight), colTemp.align !== 'right' && colTemp.align !== 'center' && (tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.cellAlignLeft), (col.lastFixed || col.firstFixed) && (tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.cellFixedLast), isLast && (tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.cellIgnoreBorder), colTemp.sorter && props.cellSortable && (tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.cellSortable));
197
197
  var isExpand = colTemp.type === 'expand' || colTemp.type === 'row-expand';
198
198
  if (colTemp.title !== undefined || isExpand) {
package/esm/table/thead.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"thead.d.ts","sourceRoot":"","sources":["thead.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;gCAWnB,UAAU;AAAjC,wBAkVE"}
1
+ {"version":3,"file":"thead.d.ts","sourceRoot":"","sources":["thead.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;gCAWnB,UAAU;AAAjC,wBAmVE"}
package/esm/table/thead.js CHANGED
@@ -151,7 +151,7 @@ export default (function (props) {
151
151
  dir: config.direction
152
152
  });
153
153
  };
154
- var getFixedStyle = function getFixedStyle(fixed, index, level) {
154
+ var getFixedStyle = function getFixedStyle(fixed, index, colSpan, level) {
155
155
  // 累加level 至 0 的所有高度
156
156
  var top = context.trHeights.slice(0, level).reduce(function (a, b) {
157
157
  return toNum(a) + toNum(b);
@@ -167,7 +167,7 @@ export default (function (props) {
167
167
  };
168
168
  }
169
169
  if (fixed === 'right') {
170
- var right = colgroup.slice(index + 1).reduce(function (a, b) {
170
+ var right = colgroup.slice(index + (typeof colSpan === 'function' ? 1 : colSpan)).reduce(function (a, b) {
171
171
  return toNum(a) + toNum(b);
172
172
  }, 0);
173
173
  return {
@@ -185,7 +185,7 @@ export default (function (props) {
185
185
  var _colTemp2$groupProps, _colTemp2$groupProps2;
186
186
  var colTemp = col;
187
187
  var colTemp2 = col;
188
- var fixedStyle = getFixedStyle(col.fixed, col.index, level);
188
+ var fixedStyle = getFixedStyle(col.fixed, col.index, colTemp2.colSpan || 1, level);
189
189
  var cellClassName = classNames(colTemp.className, colTemp.type === 'checkbox' && (tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.cellCheckbox), col.fixed === 'left' && (tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.cellFixedLeft), col.fixed === 'right' && (tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.cellFixedRight), colTemp.align === 'center' && (tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.cellAlignCenter), colTemp.align === 'right' && (tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.cellAlignRight), colTemp.align !== 'right' && colTemp.align !== 'center' && (tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.cellAlignLeft), (col.lastFixed || col.firstFixed) && (tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.cellFixedLast), isLast && (tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.cellIgnoreBorder), colTemp.sorter && props.cellSortable && (tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.cellSortable));
190
190
  var isExpand = colTemp.type === 'expand' || colTemp.type === 'row-expand';
191
191
  if (colTemp.title !== undefined || isExpand) {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@sheinx/base",
3
- "version": "3.9.0-beta.30",
3
+ "version": "3.9.0-beta.31",
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.9.0-beta.30",
13
+ "@sheinx/hooks": "3.9.0-beta.31",
14
14
  "immer": "^10.0.0",
15
15
  "classnames": "^2.0.0",
16
16
  "@shined/reactive": "^0.3.3"