vxe-table 4.14.0 → 4.14.1

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 (22) hide show
  1. package/README.md +16 -16
  2. package/es/style.css +1 -1
  3. package/es/table/module/edit/hook.js +3 -10
  4. package/es/ui/index.js +1 -1
  5. package/es/ui/src/log.js +1 -1
  6. package/lib/index.umd.js +5 -15
  7. package/lib/index.umd.min.js +1 -1
  8. package/lib/style.css +1 -1
  9. package/lib/table/module/edit/hook.js +3 -13
  10. package/lib/table/module/edit/hook.min.js +1 -1
  11. package/lib/ui/index.js +1 -1
  12. package/lib/ui/index.min.js +1 -1
  13. package/lib/ui/src/log.js +1 -1
  14. package/lib/ui/src/log.min.js +1 -1
  15. package/package.json +1 -1
  16. package/packages/table/module/edit/hook.ts +3 -10
  17. /package/es/{iconfont.1751975497083.ttf → iconfont.1752051052938.ttf} +0 -0
  18. /package/es/{iconfont.1751975497083.woff → iconfont.1752051052938.woff} +0 -0
  19. /package/es/{iconfont.1751975497083.woff2 → iconfont.1752051052938.woff2} +0 -0
  20. /package/lib/{iconfont.1751975497083.ttf → iconfont.1752051052938.ttf} +0 -0
  21. /package/lib/{iconfont.1751975497083.woff → iconfont.1752051052938.woff} +0 -0
  22. /package/lib/{iconfont.1751975497083.woff2 → iconfont.1752051052938.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/ui/index.js CHANGED
@@ -1,6 +1,6 @@
1
1
  import { VxeUI } from '@vxe-ui/core';
2
2
  import { getFuncText } from './src/utils';
3
- export const version = "4.14.0";
3
+ export const version = "4.14.1";
4
4
  VxeUI.version = version;
5
5
  VxeUI.tableVersion = version;
6
6
  VxeUI.setConfig({
package/es/ui/src/log.js CHANGED
@@ -1,5 +1,5 @@
1
1
  import { VxeUI } from '@vxe-ui/core';
2
2
  const { log } = VxeUI;
3
- const version = `table v${"4.14.0"}`;
3
+ const version = `table v${"4.14.1"}`;
4
4
  export const warnLog = log.create('warn', version);
5
5
  export const errLog = log.create('error', version);
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.1";
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.1"}`;
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
@@ -15394,7 +15394,7 @@ edit_hook_hooks.add('tableEditModule', {
15394
15394
  const {
15395
15395
  row: mergeRowIndex
15396
15396
  } = mergeItem;
15397
- if (mergeRowIndex > 0) {
15397
+ if (mergeRowIndex >= 0) {
15398
15398
  mergeItem.row = mergeRowIndex + newRecords.length;
15399
15399
  }
15400
15400
  });
@@ -15435,16 +15435,6 @@ edit_hook_hooks.add('tableEditModule', {
15435
15435
  afterFullData.push(item);
15436
15436
  tableFullData.push(item);
15437
15437
  });
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
15438
  }
15449
15439
  } else {
15450
15440
  // 如果为虚拟树
@@ -15550,9 +15540,9 @@ edit_hook_hooks.add('tableEditModule', {
15550
15540
  row: mergeRowIndex,
15551
15541
  rowspan: mergeRowspan
15552
15542
  } = mergeItem;
15553
- if (mergeRowIndex > afIndex) {
15543
+ if (mergeRowIndex >= afIndex) {
15554
15544
  mergeItem.row = mergeRowIndex + newRecords.length;
15555
- } else if (mergeRowIndex + mergeRowspan > afIndex) {
15545
+ } else if (isInsertNextRow ? mergeRowIndex + mergeRowspan >= afIndex : mergeRowIndex + mergeRowspan > afIndex) {
15556
15546
  mergeItem.rowspan = mergeRowspan + newRecords.length;
15557
15547
  }
15558
15548
  });