vxe-table 4.11.0-beta.4 → 4.11.0-beta.6

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 (25) hide show
  1. package/es/style.css +1 -1
  2. package/es/table/src/header.js +2 -2
  3. package/es/table/src/table.js +15 -15
  4. package/es/ui/index.js +1 -1
  5. package/es/ui/src/log.js +1 -1
  6. package/lib/index.umd.js +27 -19
  7. package/lib/index.umd.min.js +1 -1
  8. package/lib/style.css +1 -1
  9. package/lib/table/src/header.js +2 -2
  10. package/lib/table/src/header.min.js +1 -1
  11. package/lib/table/src/table.js +23 -15
  12. package/lib/table/src/table.min.js +1 -1
  13. package/lib/ui/index.js +1 -1
  14. package/lib/ui/index.min.js +1 -1
  15. package/lib/ui/src/log.js +1 -1
  16. package/lib/ui/src/log.min.js +1 -1
  17. package/package.json +2 -2
  18. package/packages/table/src/header.ts +2 -2
  19. package/packages/table/src/table.ts +17 -15
  20. /package/es/{iconfont.1739527666244.ttf → iconfont.1739677682610.ttf} +0 -0
  21. /package/es/{iconfont.1739527666244.woff → iconfont.1739677682610.woff} +0 -0
  22. /package/es/{iconfont.1739527666244.woff2 → iconfont.1739677682610.woff2} +0 -0
  23. /package/lib/{iconfont.1739527666244.ttf → iconfont.1739677682610.ttf} +0 -0
  24. /package/lib/{iconfont.1739527666244.woff → iconfont.1739677682610.woff} +0 -0
  25. /package/lib/{iconfont.1739527666244.woff2 → iconfont.1739677682610.woff2} +0 -0
package/lib/table/src/table.js CHANGED
@@ -1298,7 +1298,8 @@ var _default = exports.default = (0, _vue.defineComponent)({
1298
1298
  } = internalData;
1299
1299
  const fullColumnIdData = internalData.fullColumnIdData = {};
1300
1300
  const fullColumnFieldData = internalData.fullColumnFieldData = {};
1301
- // const mouseOpts = computeMouseOpts.value
1301
+ const mouseOpts = computeMouseOpts.value;
1302
+ const expandOpts = computeExpandOpts.value;
1302
1303
  const columnOpts = computeColumnOpts.value;
1303
1304
  const columnDragOpts = computeColumnDragOpts.value;
1304
1305
  const {
@@ -1404,11 +1405,9 @@ var _default = exports.default = (0, _vue.defineComponent)({
1404
1405
  } else {
1405
1406
  tableFullColumn.forEach(handleFunc);
1406
1407
  }
1407
- // if (process.env.NODE_ENV === 'development') {
1408
- // if (expandColumn && mouseOpts.area) {
1409
- // errLog('vxe.error.errConflicts', ['mouse-config.area', 'column.type=expand'])
1410
- // }
1411
- // }
1408
+ if (expandColumn && expandOpts.mode !== 'fixed' && mouseOpts.area) {
1409
+ (0, _log.errLog)('vxe.error.errConflicts', ['mouse-config.area', 'column.type=expand']);
1410
+ }
1412
1411
  if (process.env.NODE_ENV === 'development') {
1413
1412
  if (htmlColumn) {
1414
1413
  if (!columnOpts.useKey) {
@@ -3449,6 +3448,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
3449
3448
  });
3450
3449
  };
3451
3450
  const handleColumn = collectColumn => {
3451
+ const expandOpts = computeExpandOpts.value;
3452
3452
  internalData.collectColumn = collectColumn;
3453
3453
  const tableFullColumn = getColumnList(collectColumn);
3454
3454
  internalData.tableFullColumn = tableFullColumn;
@@ -3456,6 +3456,11 @@ var _default = exports.default = (0, _vue.defineComponent)({
3456
3456
  reactData.isDragColMove = false;
3457
3457
  initColumnSort();
3458
3458
  return Promise.resolve(restoreCustomStorage()).then(() => {
3459
+ const {
3460
+ scrollXLoad,
3461
+ scrollYLoad,
3462
+ expandColumn
3463
+ } = reactData;
3459
3464
  cacheColumnMap();
3460
3465
  parseColumns(true).then(() => {
3461
3466
  if (reactData.scrollXLoad) {
@@ -3465,11 +3470,9 @@ var _default = exports.default = (0, _vue.defineComponent)({
3465
3470
  $xeTable.clearMergeCells();
3466
3471
  $xeTable.clearMergeFooterItems();
3467
3472
  $xeTable.handleTableData(true);
3468
- // if (process.env.NODE_ENV === 'development') {
3469
- // if ((reactData.scrollXLoad || reactData.scrollYLoad) && reactData.expandColumn) {
3470
- // warnLog('vxe.error.scrollErrProp', ['column.type=expand'])
3471
- // }
3472
- // }
3473
+ if ((scrollXLoad || scrollYLoad) && expandColumn && expandOpts.mode !== 'fixed') {
3474
+ (0, _log.warnLog)('vxe.error.scrollErrProp', ['column.type=expand']);
3475
+ }
3473
3476
  return (0, _vue.nextTick)().then(() => {
3474
3477
  if ($xeToolbar) {
3475
3478
  $xeToolbar.syncUpdate({
@@ -11214,7 +11217,12 @@ var _default = exports.default = (0, _vue.defineComponent)({
11214
11217
  (0, _log.warnLog)('vxe.error.errLargeData', ['loadData(data), reloadData(data)']);
11215
11218
  }
11216
11219
  loadTableData(value, true).then(() => {
11217
- // const { scrollXLoad, scrollYLoad, expandColumn } = reactData
11220
+ const {
11221
+ scrollXLoad,
11222
+ scrollYLoad,
11223
+ expandColumn
11224
+ } = reactData;
11225
+ const expandOpts = computeExpandOpts.value;
11218
11226
  internalData.inited = true;
11219
11227
  internalData.initStatus = true;
11220
11228
  if (!initStatus) {
@@ -11225,9 +11233,9 @@ var _default = exports.default = (0, _vue.defineComponent)({
11225
11233
  // if (checkboxColumn && internalData.tableFullData.length > 300 && !checkboxOpts.checkField) {
11226
11234
  // warnLog('vxe.error.checkProp', ['checkbox-config.checkField'])
11227
11235
  // }
11228
- // if ((scrollXLoad || scrollYLoad) && expandColumn) {
11229
- // warnLog('vxe.error.scrollErrProp', ['column.type=expand'])
11230
- // }
11236
+ if ((scrollXLoad || scrollYLoad) && expandColumn && expandOpts.mode !== 'fixed') {
11237
+ (0, _log.warnLog)('vxe.error.scrollErrProp', ['column.type=expand']);
11238
+ }
11231
11239
  return tableMethods.recalculate();
11232
11240
  });
11233
11241
  });