vxe-table 4.14.0 → 4.14.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 (42) hide show
  1. package/README.md +18 -18
  2. package/es/index.css +1 -1
  3. package/es/index.min.css +1 -1
  4. package/es/style.css +1 -1
  5. package/es/style.min.css +1 -1
  6. package/es/table/module/edit/hook.js +3 -10
  7. package/es/table/src/body.js +4 -7
  8. package/es/table/style.css +7 -1
  9. package/es/table/style.min.css +1 -1
  10. package/es/ui/index.js +1 -1
  11. package/es/ui/src/log.js +1 -1
  12. package/es/vxe-table/style.css +7 -1
  13. package/es/vxe-table/style.min.css +1 -1
  14. package/lib/index.css +1 -1
  15. package/lib/index.min.css +1 -1
  16. package/lib/index.umd.js +9 -21
  17. package/lib/index.umd.min.js +1 -1
  18. package/lib/style.css +1 -1
  19. package/lib/style.min.css +1 -1
  20. package/lib/table/module/edit/hook.js +3 -13
  21. package/lib/table/module/edit/hook.min.js +1 -1
  22. package/lib/table/src/body.js +4 -6
  23. package/lib/table/src/body.min.js +1 -1
  24. package/lib/table/style/style.css +7 -1
  25. package/lib/table/style/style.min.css +1 -1
  26. package/lib/ui/index.js +1 -1
  27. package/lib/ui/index.min.js +1 -1
  28. package/lib/ui/src/log.js +1 -1
  29. package/lib/ui/src/log.min.js +1 -1
  30. package/lib/vxe-table/style/style.css +7 -1
  31. package/lib/vxe-table/style/style.min.css +1 -1
  32. package/package.json +1 -1
  33. package/packages/table/module/edit/hook.ts +3 -10
  34. package/packages/table/src/body.ts +4 -9
  35. package/styles/components/table.scss +7 -1
  36. package/styles/theme/base.scss +1 -1
  37. /package/es/{iconfont.1751975497083.ttf → iconfont.1752196480453.ttf} +0 -0
  38. /package/es/{iconfont.1751975497083.woff → iconfont.1752196480453.woff} +0 -0
  39. /package/es/{iconfont.1751975497083.woff2 → iconfont.1752196480453.woff2} +0 -0
  40. /package/lib/{iconfont.1751975497083.ttf → iconfont.1752196480453.ttf} +0 -0
  41. /package/lib/{iconfont.1751975497083.woff → iconfont.1752196480453.woff} +0 -0
  42. /package/lib/{iconfont.1751975497083.woff2 → iconfont.1752196480453.woff2} +0 -0
package/lib/index.umd.js CHANGED
@@ -3138,7 +3138,7 @@ function eqEmptyValue(cellValue) {
3138
3138
  ;// ./packages/ui/index.ts
3139
3139
 
3140
3140
 
3141
- const version = "4.14.0";
3141
+ const version = "4.14.2";
3142
3142
  core_.VxeUI.version = version;
3143
3143
  core_.VxeUI.tableVersion = version;
3144
3144
  core_.VxeUI.setConfig({
@@ -3628,7 +3628,7 @@ var esnext_iterator_some = __webpack_require__(7550);
3628
3628
  const {
3629
3629
  log: log_log
3630
3630
  } = core_.VxeUI;
3631
- const log_version = `table v${"4.14.0"}`;
3631
+ const log_version = `table v${"4.14.2"}`;
3632
3632
  const warnLog = log_log.create('warn', log_version);
3633
3633
  const errLog = log_log.create('error', log_version);
3634
3634
  ;// ./packages/table/src/columnInfo.ts
@@ -6845,7 +6845,7 @@ const renderType = 'body';
6845
6845
  colspan
6846
6846
  } = spanRest;
6847
6847
  if (!rowspan || !colspan) {
6848
- return null;
6848
+ return body_renderEmptyElement($xeTable);
6849
6849
  }
6850
6850
  if (rowspan > 1) {
6851
6851
  isMergeCell = true;
@@ -6865,7 +6865,7 @@ const renderType = 'body';
6865
6865
  colspan = 1
6866
6866
  } = spanMethod(cellParams) || {};
6867
6867
  if (!rowspan || !colspan) {
6868
- return null;
6868
+ return body_renderEmptyElement($xeTable);
6869
6869
  }
6870
6870
  if (rowspan > 1) {
6871
6871
  isMergeCell = true;
@@ -6982,10 +6982,8 @@ const renderType = 'body';
6982
6982
  }
6983
6983
  }
6984
6984
  let showAreaRowStatus = false;
6985
- if (mouseConfig && mouseOpts.area && selectCellToRow) {
6986
- if (!_columnIndex && selectCellToRow === true || selectCellToRow === column.field) {
6987
- showAreaRowStatus = true;
6988
- }
6985
+ if (mouseConfig && mouseOpts.area && !_columnIndex && selectCellToRow) {
6986
+ showAreaRowStatus = true;
6989
6987
  }
6990
6988
  if (!fixedHiddenColumn && showResizable && isAllColumnDrag) {
6991
6989
  tdVNs.push((0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
@@ -15394,7 +15392,7 @@ edit_hook_hooks.add('tableEditModule', {
15394
15392
  const {
15395
15393
  row: mergeRowIndex
15396
15394
  } = mergeItem;
15397
- if (mergeRowIndex > 0) {
15395
+ if (mergeRowIndex >= 0) {
15398
15396
  mergeItem.row = mergeRowIndex + newRecords.length;
15399
15397
  }
15400
15398
  });
@@ -15435,16 +15433,6 @@ edit_hook_hooks.add('tableEditModule', {
15435
15433
  afterFullData.push(item);
15436
15434
  tableFullData.push(item);
15437
15435
  });
15438
- // 刷新单元格合并
15439
- mergeBodyList.forEach(mergeItem => {
15440
- const {
15441
- row: mergeRowIndex,
15442
- rowspan: mergeRowspan
15443
- } = mergeItem;
15444
- if (mergeRowIndex + mergeRowspan > afterFullData.length) {
15445
- mergeItem.rowspan = mergeRowspan + newRecords.length;
15446
- }
15447
- });
15448
15436
  }
15449
15437
  } else {
15450
15438
  // 如果为虚拟树
@@ -15550,9 +15538,9 @@ edit_hook_hooks.add('tableEditModule', {
15550
15538
  row: mergeRowIndex,
15551
15539
  rowspan: mergeRowspan
15552
15540
  } = mergeItem;
15553
- if (mergeRowIndex > afIndex) {
15541
+ if (mergeRowIndex >= afIndex) {
15554
15542
  mergeItem.row = mergeRowIndex + newRecords.length;
15555
- } else if (mergeRowIndex + mergeRowspan > afIndex) {
15543
+ } else if (isInsertNextRow ? mergeRowIndex + mergeRowspan >= afIndex : mergeRowIndex + mergeRowspan > afIndex) {
15556
15544
  mergeItem.rowspan = mergeRowspan + newRecords.length;
15557
15545
  }
15558
15546
  });