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/es/table/module/edit/mixin.js CHANGED
@@ -127,7 +127,7 @@ function handleInsertRowAt($xeTable, records, targetRow, isInsertNextRow) {
127
127
  // 刷新单元格合并
128
128
  mergeBodyList.forEach((mergeItem) => {
129
129
  const { row: mergeRowIndex } = mergeItem;
130
- if (mergeRowIndex > 0) {
130
+ if (mergeRowIndex >= 0) {
131
131
  mergeItem.row = mergeRowIndex + newRecords.length;
132
132
  }
133
133
  });
@@ -156,13 +156,6 @@ function handleInsertRowAt($xeTable, records, targetRow, isInsertNextRow) {
156
156
  afterFullData.push(item);
157
157
  tableFullData.push(item);
158
158
  });
159
- // 刷新单元格合并
160
- mergeBodyList.forEach((mergeItem) => {
161
- const { row: mergeRowIndex, rowspan: mergeRowspan } = mergeItem;
162
- if (mergeRowIndex + mergeRowspan > afterFullData.length) {
163
- mergeItem.rowspan = mergeRowspan + newRecords.length;
164
- }
165
- });
166
159
  }
167
160
  }
168
161
  else {
@@ -250,10 +243,10 @@ function handleInsertRowAt($xeTable, records, targetRow, isInsertNextRow) {
250
243
  // 刷新单元格合并
251
244
  mergeBodyList.forEach((mergeItem) => {
252
245
  const { row: mergeRowIndex, rowspan: mergeRowspan } = mergeItem;
253
- if (mergeRowIndex > afIndex) {
246
+ if (mergeRowIndex >= afIndex) {
254
247
  mergeItem.row = mergeRowIndex + newRecords.length;
255
248
  }
256
- else if (mergeRowIndex + mergeRowspan > afIndex) {
249
+ else if (isInsertNextRow ? (mergeRowIndex + mergeRowspan >= afIndex) : (mergeRowIndex + mergeRowspan > afIndex)) {
257
250
  mergeItem.rowspan = mergeRowspan + newRecords.length;
258
251
  }
259
252
  });
package/es/table/src/body.js CHANGED
@@ -198,7 +198,7 @@ function renderTdColumn(h, $xeTable, seq, rowid, fixedType, isOptimizeMode, rowL
198
198
  if (spanRest) {
199
199
  const { rowspan, colspan } = spanRest;
200
200
  if (!rowspan || !colspan) {
201
- return null;
201
+ return renderEmptyElement($xeTable);
202
202
  }
203
203
  if (rowspan > 1) {
204
204
  isMergeCell = true;
@@ -216,7 +216,7 @@ function renderTdColumn(h, $xeTable, seq, rowid, fixedType, isOptimizeMode, rowL
216
216
  // 自定义合并行或列的方法
217
217
  const { rowspan = 1, colspan = 1 } = spanMethod(cellParams) || {};
218
218
  if (!rowspan || !colspan) {
219
- return null;
219
+ return renderEmptyElement($xeTable);
220
220
  }
221
221
  if (rowspan > 1) {
222
222
  isMergeCell = true;
@@ -349,11 +349,8 @@ function renderTdColumn(h, $xeTable, seq, rowid, fixedType, isOptimizeMode, rowL
349
349
  }
350
350
  }
351
351
  let showAreaRowStatus = false;
352
- if (mouseConfig && mouseOpts.area && selectCellToRow) {
353
- if ((!_columnIndex && selectCellToRow === true) ||
354
- (selectCellToRow === column.field)) {
355
- showAreaRowStatus = true;
356
- }
352
+ if (mouseConfig && mouseOpts.area && !_columnIndex && selectCellToRow) {
353
+ showAreaRowStatus = true;
357
354
  }
358
355
  if (!fixedHiddenColumn && showResizable && isAllColumnDrag) {
359
356
  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 {