vxe-table 3.16.0 → 3.16.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 +0 -88
  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/mixin.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/mixin.js +3 -13
  21. package/lib/table/module/edit/mixin.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/mixin.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.1751975474036.ttf → iconfont.1752196450144.ttf} +0 -0
  38. /package/es/{iconfont.1751975474036.woff → iconfont.1752196450144.woff} +0 -0
  39. /package/es/{iconfont.1751975474036.woff2 → iconfont.1752196450144.woff2} +0 -0
  40. /package/lib/{iconfont.1751975474036.ttf → iconfont.1752196450144.ttf} +0 -0
  41. /package/lib/{iconfont.1751975474036.woff → iconfont.1752196450144.woff} +0 -0
  42. /package/lib/{iconfont.1751975474036.woff2 → iconfont.1752196450144.woff2} +0 -0
package/lib/index.umd.js CHANGED
@@ -2002,7 +2002,7 @@ function getClass(property, params) {
2002
2002
  ;// CONCATENATED MODULE: ./packages/ui/index.ts
2003
2003
 
2004
2004
 
2005
- const version = "3.16.0";
2005
+ const version = "3.16.2";
2006
2006
  core_.VxeUI.version = version;
2007
2007
  core_.VxeUI.tableVersion = version;
2008
2008
  core_.VxeUI.setConfig({
@@ -2667,7 +2667,7 @@ function isNodeElement(elem) {
2667
2667
  const {
2668
2668
  log: log_log
2669
2669
  } = core_.VxeUI;
2670
- const log_version = `table v${"3.16.0"}`;
2670
+ const log_version = `table v${"3.16.2"}`;
2671
2671
  const warnLog = log_log.create('warn', log_version);
2672
2672
  const errLog = log_log.create('error', log_version);
2673
2673
  ;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
@@ -17857,7 +17857,7 @@ function renderTdColumn(h, $xeTable, seq, rowid, fixedType, isOptimizeMode, rowL
17857
17857
  colspan
17858
17858
  } = spanRest;
17859
17859
  if (!rowspan || !colspan) {
17860
- return null;
17860
+ return body_renderEmptyElement($xeTable);
17861
17861
  }
17862
17862
  if (rowspan > 1) {
17863
17863
  isMergeCell = true;
@@ -17877,7 +17877,7 @@ function renderTdColumn(h, $xeTable, seq, rowid, fixedType, isOptimizeMode, rowL
17877
17877
  colspan = 1
17878
17878
  } = spanMethod(cellParams) || {};
17879
17879
  if (!rowspan || !colspan) {
17880
- return null;
17880
+ return body_renderEmptyElement($xeTable);
17881
17881
  }
17882
17882
  if (rowspan > 1) {
17883
17883
  isMergeCell = true;
@@ -17997,10 +17997,8 @@ function renderTdColumn(h, $xeTable, seq, rowid, fixedType, isOptimizeMode, rowL
17997
17997
  }
17998
17998
  }
17999
17999
  let showAreaRowStatus = false;
18000
- if (mouseConfig && mouseOpts.area && selectCellToRow) {
18001
- if (!_columnIndex && selectCellToRow === true || selectCellToRow === column.field) {
18002
- showAreaRowStatus = true;
18003
- }
18000
+ if (mouseConfig && mouseOpts.area && !_columnIndex && selectCellToRow) {
18001
+ showAreaRowStatus = true;
18004
18002
  }
18005
18003
  if (!fixedHiddenColumn && showResizable && isAllColumnDrag) {
18006
18004
  tdVNs.push(h('div', {
@@ -23185,7 +23183,7 @@ function handleInsertRowAt($xeTable, records, targetRow, isInsertNextRow) {
23185
23183
  const {
23186
23184
  row: mergeRowIndex
23187
23185
  } = mergeItem;
23188
- if (mergeRowIndex > 0) {
23186
+ if (mergeRowIndex >= 0) {
23189
23187
  mergeItem.row = mergeRowIndex + newRecords.length;
23190
23188
  }
23191
23189
  });
@@ -23226,16 +23224,6 @@ function handleInsertRowAt($xeTable, records, targetRow, isInsertNextRow) {
23226
23224
  afterFullData.push(item);
23227
23225
  tableFullData.push(item);
23228
23226
  });
23229
- // 刷新单元格合并
23230
- mergeBodyList.forEach(mergeItem => {
23231
- const {
23232
- row: mergeRowIndex,
23233
- rowspan: mergeRowspan
23234
- } = mergeItem;
23235
- if (mergeRowIndex + mergeRowspan > afterFullData.length) {
23236
- mergeItem.rowspan = mergeRowspan + newRecords.length;
23237
- }
23238
- });
23239
23227
  }
23240
23228
  } else {
23241
23229
  // 如果为虚拟树
@@ -23341,9 +23329,9 @@ function handleInsertRowAt($xeTable, records, targetRow, isInsertNextRow) {
23341
23329
  row: mergeRowIndex,
23342
23330
  rowspan: mergeRowspan
23343
23331
  } = mergeItem;
23344
- if (mergeRowIndex > afIndex) {
23332
+ if (mergeRowIndex >= afIndex) {
23345
23333
  mergeItem.row = mergeRowIndex + newRecords.length;
23346
- } else if (mergeRowIndex + mergeRowspan > afIndex) {
23334
+ } else if (isInsertNextRow ? mergeRowIndex + mergeRowspan >= afIndex : mergeRowIndex + mergeRowspan > afIndex) {
23347
23335
  mergeItem.rowspan = mergeRowspan + newRecords.length;
23348
23336
  }
23349
23337
  });