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/es/table/module/edit/hook.js CHANGED
@@ -131,7 +131,7 @@ hooks.add('tableEditModule', {
131
131
  // 刷新单元格合并
132
132
  mergeBodyList.forEach((mergeItem) => {
133
133
  const { row: mergeRowIndex } = mergeItem;
134
- if (mergeRowIndex > 0) {
134
+ if (mergeRowIndex >= 0) {
135
135
  mergeItem.row = mergeRowIndex + newRecords.length;
136
136
  }
137
137
  });
@@ -160,13 +160,6 @@ hooks.add('tableEditModule', {
160
160
  afterFullData.push(item);
161
161
  tableFullData.push(item);
162
162
  });
163
- // 刷新单元格合并
164
- mergeBodyList.forEach((mergeItem) => {
165
- const { row: mergeRowIndex, rowspan: mergeRowspan } = mergeItem;
166
- if (mergeRowIndex + mergeRowspan > afterFullData.length) {
167
- mergeItem.rowspan = mergeRowspan + newRecords.length;
168
- }
169
- });
170
163
  }
171
164
  }
172
165
  else {
@@ -254,10 +247,10 @@ hooks.add('tableEditModule', {
254
247
  // 刷新单元格合并
255
248
  mergeBodyList.forEach((mergeItem) => {
256
249
  const { row: mergeRowIndex, rowspan: mergeRowspan } = mergeItem;
257
- if (mergeRowIndex > afIndex) {
250
+ if (mergeRowIndex >= afIndex) {
258
251
  mergeItem.row = mergeRowIndex + newRecords.length;
259
252
  }
260
- else if (mergeRowIndex + mergeRowspan > afIndex) {
253
+ else if (isInsertNextRow ? (mergeRowIndex + mergeRowspan >= afIndex) : (mergeRowIndex + mergeRowspan > afIndex)) {
261
254
  mergeItem.rowspan = mergeRowspan + newRecords.length;
262
255
  }
263
256
  });
package/es/table/src/body.js CHANGED
@@ -217,7 +217,7 @@ export default defineVxeComponent({
217
217
  if (spanRest) {
218
218
  const { rowspan, colspan } = spanRest;
219
219
  if (!rowspan || !colspan) {
220
- return null;
220
+ return renderEmptyElement($xeTable);
221
221
  }
222
222
  if (rowspan > 1) {
223
223
  isMergeCell = true;
@@ -235,7 +235,7 @@ export default defineVxeComponent({
235
235
  // 自定义合并行或列的方法
236
236
  const { rowspan = 1, colspan = 1 } = spanMethod(cellParams) || {};
237
237
  if (!rowspan || !colspan) {
238
- return null;
238
+ return renderEmptyElement($xeTable);
239
239
  }
240
240
  if (rowspan > 1) {
241
241
  isMergeCell = true;
@@ -365,11 +365,8 @@ export default defineVxeComponent({
365
365
  }
366
366
  }
367
367
  let showAreaRowStatus = false;
368
- if (mouseConfig && mouseOpts.area && selectCellToRow) {
369
- if ((!_columnIndex && selectCellToRow === true) ||
370
- (selectCellToRow === column.field)) {
371
- showAreaRowStatus = true;
372
- }
368
+ if (mouseConfig && mouseOpts.area && !_columnIndex && selectCellToRow) {
369
+ showAreaRowStatus = true;
373
370
  }
374
371
  if (!fixedHiddenColumn && showResizable && isAllColumnDrag) {
375
372
  tdVNs.push(h('div', {
package/es/table/style.css CHANGED
@@ -2105,7 +2105,13 @@
2105
2105
  }
2106
2106
  .vxe-table--cell-area .vxe-table--cell-col-status-area,
2107
2107
  .vxe-table--cell-area .vxe-table--cell-row-status-area {
2108
- background-color: var(--vxe-ui-table-checkbox-range-background-color);
2108
+ background-color: var(--vxe-ui-table-cell-area-status-background-color);
2109
+ }
2110
+ .vxe-table--cell-area .vxe-table--cell-col-status-area {
2111
+ border-bottom: var(--vxe-ui-table-cell-area-border-width) solid var(--vxe-ui-table-cell-area-border-color);
2112
+ }
2113
+ .vxe-table--cell-area .vxe-table--cell-row-status-area {
2114
+ border-right: var(--vxe-ui-table-cell-area-border-width) solid var(--vxe-ui-table-cell-area-border-color);
2109
2115
  }
2110
2116
 
2111
2117
  @keyframes moveCopyCellBorder {