vxe-table 4.11.16 → 4.11.17

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 (61) hide show
  1. package/es/grid/src/grid.js +15 -29
  2. package/es/style.css +1 -1
  3. package/es/table/module/custom/panel.js +19 -21
  4. package/es/table/module/edit/hook.js +3 -5
  5. package/es/table/module/export/export-panel.js +17 -19
  6. package/es/table/module/export/hook.js +5 -11
  7. package/es/table/module/export/import-panel.js +11 -13
  8. package/es/table/module/validator/hook.js +1 -3
  9. package/es/table/render/index.js +2 -4
  10. package/es/table/src/columnInfo.js +26 -28
  11. package/es/table/src/table.js +112 -78
  12. package/es/toolbar/src/toolbar.js +16 -24
  13. package/es/ui/index.js +1 -1
  14. package/es/ui/src/log.js +1 -1
  15. package/lib/grid/src/grid.js +15 -29
  16. package/lib/grid/src/grid.min.js +1 -1
  17. package/lib/index.umd.js +246 -240
  18. package/lib/index.umd.min.js +1 -1
  19. package/lib/style.css +1 -1
  20. package/lib/table/module/custom/panel.js +21 -23
  21. package/lib/table/module/custom/panel.min.js +1 -1
  22. package/lib/table/module/edit/hook.js +3 -5
  23. package/lib/table/module/edit/hook.min.js +1 -1
  24. package/lib/table/module/export/export-panel.js +17 -19
  25. package/lib/table/module/export/export-panel.min.js +1 -1
  26. package/lib/table/module/export/hook.js +5 -11
  27. package/lib/table/module/export/hook.min.js +1 -1
  28. package/lib/table/module/export/import-panel.js +11 -13
  29. package/lib/table/module/export/import-panel.min.js +1 -1
  30. package/lib/table/module/validator/hook.js +1 -3
  31. package/lib/table/module/validator/hook.min.js +1 -1
  32. package/lib/table/render/index.js +2 -4
  33. package/lib/table/render/index.min.js +1 -1
  34. package/lib/table/src/columnInfo.js +30 -32
  35. package/lib/table/src/columnInfo.min.js +1 -1
  36. package/lib/table/src/table.js +119 -75
  37. package/lib/table/src/table.min.js +1 -1
  38. package/lib/toolbar/src/toolbar.js +16 -24
  39. package/lib/toolbar/src/toolbar.min.js +1 -1
  40. package/lib/ui/index.js +1 -1
  41. package/lib/ui/index.min.js +1 -1
  42. package/lib/ui/src/log.js +1 -1
  43. package/lib/ui/src/log.min.js +1 -1
  44. package/package.json +2 -2
  45. package/packages/grid/src/grid.ts +16 -29
  46. package/packages/table/module/custom/panel.ts +19 -21
  47. package/packages/table/module/edit/hook.ts +3 -5
  48. package/packages/table/module/export/export-panel.ts +17 -19
  49. package/packages/table/module/export/hook.ts +5 -11
  50. package/packages/table/module/export/import-panel.ts +11 -13
  51. package/packages/table/module/validator/hook.ts +1 -3
  52. package/packages/table/render/index.ts +2 -4
  53. package/packages/table/src/columnInfo.ts +26 -28
  54. package/packages/table/src/table.ts +110 -75
  55. package/packages/toolbar/src/toolbar.ts +16 -24
  56. /package/es/{iconfont.1741051544689.ttf → iconfont.1741140593243.ttf} +0 -0
  57. /package/es/{iconfont.1741051544689.woff → iconfont.1741140593243.woff} +0 -0
  58. /package/es/{iconfont.1741051544689.woff2 → iconfont.1741140593243.woff2} +0 -0
  59. /package/lib/{iconfont.1741051544689.ttf → iconfont.1741140593243.ttf} +0 -0
  60. /package/lib/{iconfont.1741051544689.woff → iconfont.1741140593243.woff} +0 -0
  61. /package/lib/{iconfont.1741051544689.woff2 → iconfont.1741140593243.woff2} +0 -0
package/lib/index.umd.js CHANGED
@@ -3051,7 +3051,7 @@ function eqEmptyValue(cellValue) {
3051
3051
  ;// ./packages/ui/index.ts
3052
3052
 
3053
3053
 
3054
- const version = "4.11.15";
3054
+ const version = "4.11.17";
3055
3055
  core_.VxeUI.version = version;
3056
3056
  core_.VxeUI.tableVersion = version;
3057
3057
  core_.VxeUI.setConfig({
@@ -3499,7 +3499,7 @@ var es_iterator_some = __webpack_require__(3579);
3499
3499
  const {
3500
3500
  log: log_log
3501
3501
  } = core_.VxeUI;
3502
- const log_version = `table v${"4.11.15"}`;
3502
+ const log_version = `table v${"4.11.17"}`;
3503
3503
  const warnLog = log_log.create('warn', log_version);
3504
3504
  const errLog = log_log.create('error', log_version);
3505
3505
  ;// ./packages/table/src/columnInfo.ts
@@ -3526,40 +3526,38 @@ class ColumnInfo {
3526
3526
  const {
3527
3527
  props: tableProps
3528
3528
  } = $xeTable;
3529
- if (true) {
3530
- const types = ['seq', 'checkbox', 'radio', 'expand', 'html'];
3531
- if (_vm.type && types.indexOf(_vm.type) === -1) {
3532
- warnLog('vxe.error.errProp', [`type=${_vm.type}`, types.join(', ')]);
3533
- }
3534
- if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isBoolean(_vm.cellRender) || _vm.cellRender && !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isObject(_vm.cellRender)) {
3535
- warnLog('vxe.error.errProp', [`column.cell-render=${_vm.cellRender}`, 'column.cell-render={}']);
3536
- }
3537
- if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isBoolean(_vm.editRender) || _vm.editRender && !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isObject(_vm.editRender)) {
3538
- warnLog('vxe.error.errProp', [`column.edit-render=${_vm.editRender}`, 'column.edit-render={}']);
3529
+ const types = ['seq', 'checkbox', 'radio', 'expand', 'html'];
3530
+ if (_vm.type && types.indexOf(_vm.type) === -1) {
3531
+ warnLog('vxe.error.errProp', [`type=${_vm.type}`, types.join(', ')]);
3532
+ }
3533
+ if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isBoolean(_vm.cellRender) || _vm.cellRender && !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isObject(_vm.cellRender)) {
3534
+ warnLog('vxe.error.errProp', [`column.cell-render=${_vm.cellRender}`, 'column.cell-render={}']);
3535
+ }
3536
+ if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isBoolean(_vm.editRender) || _vm.editRender && !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isObject(_vm.editRender)) {
3537
+ warnLog('vxe.error.errProp', [`column.edit-render=${_vm.editRender}`, 'column.edit-render={}']);
3538
+ }
3539
+ if (_vm.type === 'expand') {
3540
+ const {
3541
+ treeConfig
3542
+ } = tableProps;
3543
+ const {
3544
+ computeTreeOpts
3545
+ } = $xeTable.getComputeMaps();
3546
+ const treeOpts = computeTreeOpts.value;
3547
+ if (treeConfig && (treeOpts.showLine || treeOpts.line)) {
3548
+ errLog('vxe.error.errConflicts', ['tree-config.showLine', 'column.type=expand']);
3539
3549
  }
3540
- if (_vm.type === 'expand') {
3541
- const {
3542
- treeConfig
3543
- } = tableProps;
3544
- const {
3545
- computeTreeOpts
3546
- } = $xeTable.getComputeMaps();
3547
- const treeOpts = computeTreeOpts.value;
3548
- if (treeConfig && (treeOpts.showLine || treeOpts.line)) {
3549
- errLog('vxe.error.errConflicts', ['tree-config.showLine', 'column.type=expand']);
3550
+ }
3551
+ if (formatter) {
3552
+ if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isString(formatter)) {
3553
+ const gFormatOpts = columnInfo_formats.get(formatter) || (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default())[formatter];
3554
+ if (!gFormatOpts || !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(gFormatOpts.tableCellFormatMethod || gFormatOpts.cellFormatMethod)) {
3555
+ errLog('vxe.error.notFormats', [formatter]);
3550
3556
  }
3551
- }
3552
- if (formatter) {
3553
- if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isString(formatter)) {
3554
- const gFormatOpts = columnInfo_formats.get(formatter) || (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default())[formatter];
3555
- if (!gFormatOpts || !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(gFormatOpts.tableCellFormatMethod || gFormatOpts.cellFormatMethod)) {
3556
- errLog('vxe.error.notFormats', [formatter]);
3557
- }
3558
- } else if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(formatter)) {
3559
- const gFormatOpts = columnInfo_formats.get(formatter[0]) || (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default())[formatter[0]];
3560
- if (!gFormatOpts || !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(gFormatOpts.tableCellFormatMethod || gFormatOpts.cellFormatMethod)) {
3561
- errLog('vxe.error.notFormats', [formatter[0]]);
3562
- }
3557
+ } else if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(formatter)) {
3558
+ const gFormatOpts = columnInfo_formats.get(formatter[0]) || (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default())[formatter[0]];
3559
+ if (!gFormatOpts || !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(gFormatOpts.tableCellFormatMethod || gFormatOpts.cellFormatMethod)) {
3560
+ errLog('vxe.error.notFormats', [formatter[0]]);
3563
3561
  }
3564
3562
  }
3565
3563
  }
@@ -9164,29 +9162,27 @@ const {
9164
9162
  }
9165
9163
  return renderSimplePanel();
9166
9164
  };
9167
- if (true) {
9168
- (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)(() => {
9169
- const customOpts = computeCustomOpts.value;
9170
- const {
9171
- mode
9172
- } = customOpts;
9173
- if (!VxeUIModalComponent) {
9174
- errLog('vxe.error.reqComp', ['vxe-modal']);
9175
- }
9176
- if (!VxeUIDrawerComponent && mode === 'drawer') {
9177
- errLog('vxe.error.reqComp', ['vxe-drawer']);
9178
- }
9179
- if (!VxeUIButtonComponent) {
9180
- errLog('vxe.error.reqComp', ['vxe-button']);
9181
- }
9182
- if (!VxeUINumberInputComponent) {
9183
- errLog('vxe.error.reqComp', ['vxe-number-input']);
9184
- }
9185
- if (!VxeUIRadioGroupComponent) {
9186
- errLog('vxe.error.reqComp', ['vxe-radio-group']);
9187
- }
9188
- });
9189
- }
9165
+ (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)(() => {
9166
+ const customOpts = computeCustomOpts.value;
9167
+ const {
9168
+ mode
9169
+ } = customOpts;
9170
+ if (!VxeUIModalComponent) {
9171
+ errLog('vxe.error.reqComp', ['vxe-modal']);
9172
+ }
9173
+ if (!VxeUIDrawerComponent && mode === 'drawer') {
9174
+ errLog('vxe.error.reqComp', ['vxe-drawer']);
9175
+ }
9176
+ if (!VxeUIButtonComponent) {
9177
+ errLog('vxe.error.reqComp', ['vxe-button']);
9178
+ }
9179
+ if (!VxeUINumberInputComponent) {
9180
+ errLog('vxe.error.reqComp', ['vxe-number-input']);
9181
+ }
9182
+ if (!VxeUIRadioGroupComponent) {
9183
+ errLog('vxe.error.reqComp', ['vxe-radio-group']);
9184
+ }
9185
+ });
9190
9186
  return renderVN;
9191
9187
  }
9192
9188
  }));
@@ -9618,19 +9614,17 @@ const {
9618
9614
  }
9619
9615
  }) : (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createCommentVNode)();
9620
9616
  };
9621
- if (true) {
9622
- (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)(() => {
9623
- if (!VxeUIModalComponent) {
9624
- errLog('vxe.error.reqComp', ['vxe-modal']);
9625
- }
9626
- if (!VxeUIButtonComponent) {
9627
- errLog('vxe.error.reqComp', ['vxe-button']);
9628
- }
9629
- if (!VxeUISelectComponent) {
9630
- errLog('vxe.error.reqComp', ['vxe-select']);
9631
- }
9632
- });
9633
- }
9617
+ (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)(() => {
9618
+ if (!VxeUIModalComponent) {
9619
+ errLog('vxe.error.reqComp', ['vxe-modal']);
9620
+ }
9621
+ if (!VxeUIButtonComponent) {
9622
+ errLog('vxe.error.reqComp', ['vxe-button']);
9623
+ }
9624
+ if (!VxeUISelectComponent) {
9625
+ errLog('vxe.error.reqComp', ['vxe-select']);
9626
+ }
9627
+ });
9634
9628
  return renderVN;
9635
9629
  }
9636
9630
  }));
@@ -10068,25 +10062,23 @@ const {
10068
10062
  }
10069
10063
  }) : (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createCommentVNode)();
10070
10064
  };
10071
- if (true) {
10072
- (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)(() => {
10073
- if (!VxeUIModalComponent) {
10074
- errLog('vxe.error.reqComp', ['vxe-modal']);
10075
- }
10076
- if (!VxeUIButtonComponent) {
10077
- errLog('vxe.error.reqComp', ['vxe-button']);
10078
- }
10079
- if (!VxeUISelectComponent) {
10080
- errLog('vxe.error.reqComp', ['vxe-select']);
10081
- }
10082
- if (!VxeUIInputComponent) {
10083
- errLog('vxe.error.reqComp', ['vxe-input']);
10084
- }
10085
- if (!VxeUICheckboxComponent) {
10086
- errLog('vxe.error.reqComp', ['vxe-checkbox']);
10087
- }
10088
- });
10089
- }
10065
+ (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)(() => {
10066
+ if (!VxeUIModalComponent) {
10067
+ errLog('vxe.error.reqComp', ['vxe-modal']);
10068
+ }
10069
+ if (!VxeUIButtonComponent) {
10070
+ errLog('vxe.error.reqComp', ['vxe-button']);
10071
+ }
10072
+ if (!VxeUISelectComponent) {
10073
+ errLog('vxe.error.reqComp', ['vxe-select']);
10074
+ }
10075
+ if (!VxeUIInputComponent) {
10076
+ errLog('vxe.error.reqComp', ['vxe-input']);
10077
+ }
10078
+ if (!VxeUICheckboxComponent) {
10079
+ errLog('vxe.error.reqComp', ['vxe-checkbox']);
10080
+ }
10081
+ });
10090
10082
  return renderVN;
10091
10083
  }
10092
10084
  }));
@@ -11639,14 +11631,12 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
11639
11631
  if (expandColumn && expandOpts.mode !== 'fixed' && mouseOpts.area) {
11640
11632
  errLog('vxe.error.errConflicts', ['mouse-config.area', 'column.type=expand']);
11641
11633
  }
11642
- if (true) {
11643
- if (htmlColumn) {
11644
- if (!columnOpts.useKey) {
11645
- errLog('vxe.error.reqProp', ['column-config.useKey & column.type=html']);
11646
- }
11647
- if (!rowOpts.useKey) {
11648
- errLog('vxe.error.reqProp', ['row-config.useKey & column.type=html']);
11649
- }
11634
+ if (htmlColumn) {
11635
+ if (!columnOpts.useKey) {
11636
+ errLog('vxe.error.reqProp', ['column-config.useKey & column.type=html']);
11637
+ }
11638
+ if (!rowOpts.useKey) {
11639
+ errLog('vxe.error.reqProp', ['row-config.useKey & column.type=html']);
11650
11640
  }
11651
11641
  }
11652
11642
  reactData.isGroup = isGroup;
@@ -13325,28 +13315,26 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
13325
13315
  if (treeConfig) {
13326
13316
  if (transform) {
13327
13317
  // 树结构自动转换
13328
- if (true) {
13329
- if (!treeOpts.rowField) {
13330
- errLog('vxe.error.reqProp', ['tree-config.rowField']);
13331
- }
13332
- if (!treeOpts.parentField) {
13333
- errLog('vxe.error.reqProp', ['tree-config.parentField']);
13334
- }
13335
- if (!childrenField) {
13336
- errLog('vxe.error.reqProp', ['tree-config.childrenField']);
13337
- }
13338
- if (!treeOpts.mapChildrenField) {
13339
- errLog('vxe.error.reqProp', ['tree-config.mapChildrenField']);
13340
- }
13341
- if (childrenField === treeOpts.mapChildrenField) {
13342
- errLog('vxe.error.errConflicts', ['tree-config.childrenField', 'tree-config.mapChildrenField']);
13343
- }
13344
- // fullData.forEach(row => {
13345
- // if (row[treeOpts.children] && row[treeOpts.children].length) {
13346
- // warnLog('vxe.error.errConflicts', ['tree-config.transform', `row.${treeOpts.children}`])
13347
- // }
13348
- // })
13318
+ if (!treeOpts.rowField) {
13319
+ errLog('vxe.error.reqProp', ['tree-config.rowField']);
13349
13320
  }
13321
+ if (!treeOpts.parentField) {
13322
+ errLog('vxe.error.reqProp', ['tree-config.parentField']);
13323
+ }
13324
+ if (!childrenField) {
13325
+ errLog('vxe.error.reqProp', ['tree-config.childrenField']);
13326
+ }
13327
+ if (!treeOpts.mapChildrenField) {
13328
+ errLog('vxe.error.reqProp', ['tree-config.mapChildrenField']);
13329
+ }
13330
+ if (childrenField === treeOpts.mapChildrenField) {
13331
+ errLog('vxe.error.errConflicts', ['tree-config.childrenField', 'tree-config.mapChildrenField']);
13332
+ }
13333
+ // fullData.forEach(row => {
13334
+ // if (row[treeOpts.children] && row[treeOpts.children].length) {
13335
+ // warnLog('vxe.error.errConflicts', ['tree-config.transform', `row.${treeOpts.children}`])
13336
+ // }
13337
+ // })
13350
13338
  treeData = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toArrayTree(fullData, {
13351
13339
  key: treeOpts.rowField,
13352
13340
  parentKey: treeOpts.parentField,
@@ -13410,16 +13398,14 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
13410
13398
  // }
13411
13399
  // }
13412
13400
  // }
13413
- if (true) {
13414
- if (!(props.height || props.maxHeight)) {
13415
- errLog('vxe.error.reqProp', ['table.height | table.max-height | table.scroll-y={enabled: false}']);
13416
- }
13417
- // if (!props.showOverflow) {
13418
- // warnLog('vxe.error.reqProp', ['table.show-overflow'])
13419
- // }
13420
- if (props.spanMethod) {
13421
- warnLog('vxe.error.scrollErrProp', ['table.span-method']);
13422
- }
13401
+ if (!(props.height || props.maxHeight)) {
13402
+ errLog('vxe.error.reqProp', ['table.height | table.max-height | table.scroll-y={enabled: false}']);
13403
+ }
13404
+ // if (!props.showOverflow) {
13405
+ // warnLog('vxe.error.reqProp', ['table.show-overflow'])
13406
+ // }
13407
+ if (props.spanMethod) {
13408
+ warnLog('vxe.error.scrollErrProp', ['table.span-method']);
13423
13409
  }
13424
13410
  }
13425
13411
  handleReserveStatus();
@@ -14542,12 +14528,20 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
14542
14528
  */
14543
14529
  revertData(rows, field) {
14544
14530
  const {
14545
- keepSource
14531
+ keepSource,
14532
+ treeConfig
14546
14533
  } = props;
14547
14534
  const {
14535
+ fullAllDataRowIdData,
14548
14536
  tableSourceData,
14549
- sourceDataRowIdData
14537
+ sourceDataRowIdData,
14538
+ tableFullData,
14539
+ afterFullData
14550
14540
  } = internalData;
14541
+ const treeOpts = computeTreeOpts.value;
14542
+ const {
14543
+ transform
14544
+ } = treeOpts;
14551
14545
  if (!keepSource) {
14552
14546
  if (true) {
14553
14547
  warnLog('vxe.error.reqProp', ['keep-source']);
@@ -14562,9 +14556,10 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
14562
14556
  } else {
14563
14557
  targetRows = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toArray($xeTable.getUpdateRecords());
14564
14558
  }
14559
+ let reDelFlag = false;
14565
14560
  if (targetRows.length) {
14566
14561
  targetRows.forEach(row => {
14567
- if (!tableMethods.isInsertByRow(row)) {
14562
+ if (!$xeTable.isInsertByRow(row)) {
14568
14563
  const rowid = getRowid($xeTable, row);
14569
14564
  const oRow = sourceDataRowIdData[rowid];
14570
14565
  if (oRow && row) {
@@ -14573,14 +14568,38 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
14573
14568
  } else {
14574
14569
  external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().destructuring(row, external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().clone(oRow, true));
14575
14570
  }
14571
+ if ($xeTable.isRemoveByRow(row)) {
14572
+ const rowRest = fullAllDataRowIdData[rowid];
14573
+ if (rowRest) {
14574
+ const reRow = rowRest.row;
14575
+ tableFullData.unshift(reRow);
14576
+ afterFullData.unshift(reRow);
14577
+ reDelFlag = true;
14578
+ }
14579
+ }
14576
14580
  }
14577
14581
  }
14578
14582
  });
14579
14583
  }
14580
14584
  if (rows) {
14581
- return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)();
14585
+ if (reDelFlag) {
14586
+ $xeTable.updateFooter();
14587
+ $xeTable.cacheRowMap(false);
14588
+ $xeTable.handleTableData(treeConfig && transform);
14589
+ if (!(treeConfig && transform)) {
14590
+ $xeTable.updateAfterDataIndex();
14591
+ }
14592
+ $xeTable.checkSelectionStatus();
14593
+ if (reactData.scrollYLoad) {
14594
+ $xeTable.updateScrollYSpace();
14595
+ }
14596
+ }
14597
+ return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)().then(() => {
14598
+ $xeTable.updateCellAreas();
14599
+ return $xeTable.recalculate();
14600
+ });
14582
14601
  }
14583
- return tableMethods.reloadData(tableSourceData);
14602
+ return $xeTable.reloadData(tableSourceData);
14584
14603
  },
14585
14604
  /**
14586
14605
  * 清空单元格内容
@@ -14713,6 +14732,13 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
14713
14732
  const rowid = getRowid($xeTable, row);
14714
14733
  return !!editStore.insertMaps[rowid];
14715
14734
  },
14735
+ isRemoveByRow(row) {
14736
+ const {
14737
+ editStore
14738
+ } = reactData;
14739
+ const rowid = getRowid($xeTable, row);
14740
+ return !!editStore.removeMaps[rowid];
14741
+ },
14716
14742
  /**
14717
14743
  * 删除所有新增的临时数据
14718
14744
  * @returns
@@ -17894,18 +17920,25 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
17894
17920
  const {
17895
17921
  treeConfig
17896
17922
  } = props;
17897
- const treeOpts = computeTreeOpts.value;
17923
+ const {
17924
+ treeExpandedMaps
17925
+ } = reactData;
17898
17926
  const {
17899
17927
  fullAllDataRowIdData,
17900
17928
  tableFullData,
17901
17929
  tableFullTreeData
17902
17930
  } = internalData;
17931
+ const treeOpts = computeTreeOpts.value;
17903
17932
  const childrenField = treeOpts.children || treeOpts.childrenField;
17904
17933
  const hasChildField = treeOpts.hasChild || treeOpts.hasChildField;
17905
17934
  const rowkey = getRowkey($xeTable);
17906
- const isLazy = treeConfig && treeOpts.lazy;
17907
- const fullAllDataRowIdMaps = {};
17935
+ const fullAllDataRowIdMaps = {
17936
+ ...fullAllDataRowIdData
17937
+ }; // 存在已删除数据
17908
17938
  const fullDataRowIdMaps = {};
17939
+ const treeTempExpandedMaps = {
17940
+ ...treeExpandedMaps
17941
+ };
17909
17942
  const handleRow = (row, index, items, path, parentRow, nodes) => {
17910
17943
  let rowid = getRowid($xeTable, row);
17911
17944
  const seq = treeConfig && path ? toTreePathSeq(path) : index + 1;
@@ -17914,8 +17947,16 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
17914
17947
  rowid = getRowUniqueId();
17915
17948
  external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().set(row, rowkey, rowid);
17916
17949
  }
17917
- if (isLazy && row[hasChildField] && external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isUndefined(row[childrenField])) {
17918
- row[childrenField] = null;
17950
+ if (treeConfig && treeOpts.lazy) {
17951
+ const treeExpRest = treeExpandedMaps[rowid];
17952
+ if (row[hasChildField] && external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isUndefined(row[childrenField])) {
17953
+ row[childrenField] = null;
17954
+ }
17955
+ if (treeExpRest) {
17956
+ if (!row[childrenField] || !row[childrenField].length) {
17957
+ delete treeTempExpandedMaps[rowid];
17958
+ }
17959
+ }
17919
17960
  }
17920
17961
  let rowRest = fullAllDataRowIdData[rowid];
17921
17962
  if (!rowRest) {
@@ -17936,6 +17977,8 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
17936
17977
  expandHeight: 0
17937
17978
  };
17938
17979
  }
17980
+ rowRest.treeLoaded = false;
17981
+ rowRest.expandLoaded = false;
17939
17982
  rowRest.row = row;
17940
17983
  rowRest.items = items;
17941
17984
  rowRest.parent = parentRow;
@@ -17944,8 +17987,6 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
17944
17987
  fullDataRowIdMaps[rowid] = rowRest;
17945
17988
  fullAllDataRowIdMaps[rowid] = rowRest;
17946
17989
  };
17947
- internalData.fullDataRowIdData = fullDataRowIdMaps;
17948
- internalData.fullAllDataRowIdData = fullAllDataRowIdMaps;
17949
17990
  if (treeConfig) {
17950
17991
  external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(tableFullTreeData, handleRow, {
17951
17992
  children: childrenField
@@ -17953,6 +17994,9 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
17953
17994
  } else {
17954
17995
  tableFullData.forEach(handleRow);
17955
17996
  }
17997
+ internalData.fullDataRowIdData = fullDataRowIdMaps;
17998
+ internalData.fullAllDataRowIdData = fullAllDataRowIdMaps;
17999
+ reactData.treeExpandedMaps = treeTempExpandedMaps;
17956
18000
  },
17957
18001
  cacheSourceMap(fullData) {
17958
18002
  const {
@@ -20935,18 +20979,16 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
20935
20979
  }
20936
20980
  };
20937
20981
  // 检测对应模块是否安装
20938
- if (true) {
20939
- 'openExport,openPrint,exportData,openImport,importData,saveFile,readFile,importByFile,print'.split(',').forEach(name => {
20940
- $xeTable[name] = function () {
20941
- errLog('vxe.error.reqModule', ['VxeTableExportModule']);
20942
- };
20943
- });
20944
- 'clearValidate,fullValidate,validate'.split(',').forEach(name => {
20945
- $xeTable[name] = function () {
20946
- errLog('vxe.error.reqModule', ['VxeTableValidatorModule']);
20947
- };
20948
- });
20949
- }
20982
+ 'openExport,openPrint,exportData,openImport,importData,saveFile,readFile,importByFile,print'.split(',').forEach(name => {
20983
+ $xeTable[name] = function () {
20984
+ errLog('vxe.error.reqModule', ['VxeTableExportModule']);
20985
+ };
20986
+ });
20987
+ 'clearValidate,fullValidate,validate'.split(',').forEach(name => {
20988
+ $xeTable[name] = function () {
20989
+ errLog('vxe.error.reqModule', ['VxeTableValidatorModule']);
20990
+ };
20991
+ });
20950
20992
  Object.assign($xeTable, tableMethods, tablePrivateMethods);
20951
20993
  /**
20952
20994
  * 渲染浮固定列
@@ -21925,20 +21967,18 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
21925
21967
  $table: $xeTable
21926
21968
  });
21927
21969
  });
21928
- if (true) {
21929
- (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)(() => {
21930
- if (props.loading) {
21931
- if (!VxeUILoadingComponent && !slots.loading) {
21932
- errLog('vxe.error.reqComp', ['vxe-loading']);
21933
- }
21970
+ (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)(() => {
21971
+ if (props.loading) {
21972
+ if (!VxeUILoadingComponent && !slots.loading) {
21973
+ errLog('vxe.error.reqComp', ['vxe-loading']);
21934
21974
  }
21935
- if (props.showOverflow === true || props.showOverflow === 'tooltip' || props.showHeaderOverflow === true || props.showHeaderOverflow === 'tooltip' || props.showFooterOverflow === true || props.showFooterOverflow === 'tooltip' || props.tooltipConfig || props.editRules) {
21936
- if (!VxeUITooltipComponent) {
21937
- errLog('vxe.error.reqComp', ['vxe-tooltip']);
21938
- }
21975
+ }
21976
+ if (props.showOverflow === true || props.showOverflow === 'tooltip' || props.showHeaderOverflow === true || props.showHeaderOverflow === 'tooltip' || props.showFooterOverflow === true || props.showFooterOverflow === 'tooltip' || props.tooltipConfig || props.editRules) {
21977
+ if (!VxeUITooltipComponent) {
21978
+ errLog('vxe.error.reqComp', ['vxe-tooltip']);
21939
21979
  }
21940
- });
21941
- }
21980
+ }
21981
+ });
21942
21982
  (0,external_commonjs_vue_commonjs2_vue_root_Vue_.provide)('$xeColgroup', null);
21943
21983
  (0,external_commonjs_vue_commonjs2_vue_root_Vue_.provide)('$xeTable', $xeTable);
21944
21984
  $xeTable.renderVN = renderVN;
@@ -23126,11 +23166,9 @@ edit_hook_hooks.add('tableEditModule', {
23126
23166
  const parentLevel = parentRest ? parentRest.level : 0;
23127
23167
  newRecords.forEach((item, i) => {
23128
23168
  const rowid = getRowid($xeTable, item);
23129
- if (true) {
23130
- if (item[treeOpts.parentField]) {
23131
- if (parentRow && item[treeOpts.parentField] !== parentRow[rowField]) {
23132
- errLog('vxe.error.errProp', [`${treeOpts.parentField}=${item[treeOpts.parentField]}`, `${treeOpts.parentField}=${parentRow[rowField]}`]);
23133
- }
23169
+ if (item[treeOpts.parentField]) {
23170
+ if (parentRow && item[treeOpts.parentField] !== parentRow[rowField]) {
23171
+ errLog('vxe.error.errProp', [`${treeOpts.parentField}=${item[treeOpts.parentField]}`, `${treeOpts.parentField}=${parentRow[rowField]}`]);
23134
23172
  }
23135
23173
  }
23136
23174
  if (parentRow) {
@@ -25153,9 +25191,7 @@ export_hook_hooks.add('tableExportModule', {
25153
25191
  }
25154
25192
  } else {
25155
25193
  // 不支持的浏览器
25156
- if (true) {
25157
- errLog('vxe.error.notExp');
25158
- }
25194
+ errLog('vxe.error.notExp');
25159
25195
  _importResolve({
25160
25196
  status: true
25161
25197
  });
@@ -25883,10 +25919,8 @@ export_hook_hooks.add('tableExportModule', {
25883
25919
  message: true,
25884
25920
  types: external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().keys(exportOpts._typeMaps)
25885
25921
  }, exportOpts, options);
25886
- if (true) {
25887
- if (!props.exportConfig) {
25888
- errLog('vxe.error.reqProp', ['export-config']);
25889
- }
25922
+ if (!props.exportConfig) {
25923
+ errLog('vxe.error.reqProp', ['export-config']);
25890
25924
  }
25891
25925
  handleExportAndPrint(defOpts);
25892
25926
  },
@@ -25896,10 +25930,8 @@ export_hook_hooks.add('tableExportModule', {
25896
25930
  const defOpts = Object.assign({
25897
25931
  message: true
25898
25932
  }, printOpts, options);
25899
- if (true) {
25900
- if (!props.printConfig) {
25901
- errLog('vxe.error.reqProp', ['print-config']);
25902
- }
25933
+ if (!props.printConfig) {
25934
+ errLog('vxe.error.reqProp', ['print-config']);
25903
25935
  }
25904
25936
  handleExportAndPrint(defOpts, true);
25905
25937
  }
@@ -26822,9 +26854,7 @@ validator_hook_hooks.add('tableValidatorModule', {
26822
26854
  }
26823
26855
  }
26824
26856
  } else {
26825
- if (true) {
26826
- errLog('vxe.error.notValidators', [validator]);
26827
- }
26857
+ errLog('vxe.error.notValidators', [validator]);
26828
26858
  }
26829
26859
  } else {
26830
26860
  customValid = validator(validParams);
@@ -27541,10 +27571,8 @@ function getComponentOns(renderOpts, params, eFns) {
27541
27571
  const ons = {};
27542
27572
  external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().objectEach(events, (func, key) => {
27543
27573
  ons[getOnName(key)] = function (...args) {
27544
- if (true) {
27545
- if (!external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(func)) {
27546
- errLog('vxe.error.errFunc', [func]);
27547
- }
27574
+ if (!external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(func)) {
27575
+ errLog('vxe.error.errFunc', [func]);
27548
27576
  }
27549
27577
  func(params, ...args);
27550
27578
  };
@@ -28825,9 +28853,7 @@ const {
28825
28853
  if (tCommandMethod) {
28826
28854
  tCommandMethod(params);
28827
28855
  } else {
28828
- if (true) {
28829
- errLog('vxe.error.notCommands', [code]);
28830
- }
28856
+ errLog('vxe.error.notCommands', [code]);
28831
28857
  }
28832
28858
  }
28833
28859
  $xeToolbar.dispatchEvent('button-click', params, evnt);
@@ -28859,9 +28885,7 @@ const {
28859
28885
  if (tCommandMethod) {
28860
28886
  tCommandMethod(params);
28861
28887
  } else {
28862
- if (true) {
28863
- errLog('vxe.error.notCommands', [code]);
28864
- }
28888
+ errLog('vxe.error.notCommands', [code]);
28865
28889
  }
28866
28890
  }
28867
28891
  $xeToolbar.dispatchEvent('tool-click', params, evnt);
@@ -29235,25 +29259,21 @@ const {
29235
29259
  warnLog('vxe.error.notFunc', ['queryMethod']);
29236
29260
  }
29237
29261
  const customOpts = computeCustomOpts.value;
29238
- if (true) {
29239
- if (customOpts.isFooter) {
29240
- warnLog('vxe.error.delProp', ['toolbar.custom.isFooter', 'table.custom-config.showFooter']);
29241
- }
29242
- if (customOpts.showFooter) {
29243
- warnLog('vxe.error.delProp', ['toolbar.custom.showFooter', 'table.custom-config.showFooter']);
29244
- }
29245
- if (customOpts.immediate) {
29246
- warnLog('vxe.error.delProp', ['toolbar.custom.immediate', 'table.custom-config.immediate']);
29247
- }
29248
- if (customOpts.trigger) {
29249
- warnLog('vxe.error.delProp', ['toolbar.custom.trigger', 'table.custom-config.trigger']);
29250
- }
29262
+ if (customOpts.isFooter) {
29263
+ warnLog('vxe.error.delProp', ['toolbar.custom.isFooter', 'table.custom-config.showFooter']);
29251
29264
  }
29252
- if (true) {
29253
- if (props.refresh || props.import || props.export || props.print || props.zoom) {
29254
- if (!VxeUIButtonComponent) {
29255
- errLog('vxe.error.reqComp', ['vxe-button']);
29256
- }
29265
+ if (customOpts.showFooter) {
29266
+ warnLog('vxe.error.delProp', ['toolbar.custom.showFooter', 'table.custom-config.showFooter']);
29267
+ }
29268
+ if (customOpts.immediate) {
29269
+ warnLog('vxe.error.delProp', ['toolbar.custom.immediate', 'table.custom-config.immediate']);
29270
+ }
29271
+ if (customOpts.trigger) {
29272
+ warnLog('vxe.error.delProp', ['toolbar.custom.trigger', 'table.custom-config.trigger']);
29273
+ }
29274
+ if (props.refresh || props.import || props.export || props.print || props.zoom) {
29275
+ if (!VxeUIButtonComponent) {
29276
+ errLog('vxe.error.reqComp', ['vxe-button']);
29257
29277
  }
29258
29278
  }
29259
29279
  });
@@ -29772,9 +29792,7 @@ const gridComponentEmits = [...emits, 'page-change', 'form-submit', 'form-submit
29772
29792
  if (slots[funcSlot]) {
29773
29793
  return slots[funcSlot];
29774
29794
  } else {
29775
- if (true) {
29776
- errLog('vxe.error.notSlot', [funcSlot]);
29777
- }
29795
+ errLog('vxe.error.notSlot', [funcSlot]);
29778
29796
  }
29779
29797
  } else {
29780
29798
  return funcSlot;
@@ -30365,9 +30383,7 @@ const gridComponentEmits = [...emits, 'page-change', 'form-submit', 'form-submit
30365
30383
  };
30366
30384
  });
30367
30385
  } else {
30368
- if (true) {
30369
- errLog('vxe.error.notFunc', ['proxy-config.ajax.query']);
30370
- }
30386
+ errLog('vxe.error.notFunc', ['proxy-config.ajax.query']);
30371
30387
  }
30372
30388
  break;
30373
30389
  }
@@ -30455,9 +30471,7 @@ const gridComponentEmits = [...emits, 'page-change', 'form-submit', 'form-submit
30455
30471
  }
30456
30472
  }
30457
30473
  } else {
30458
- if (true) {
30459
- errLog('vxe.error.notFunc', ['proxy-config.ajax.delete']);
30460
- }
30474
+ errLog('vxe.error.notFunc', ['proxy-config.ajax.delete']);
30461
30475
  }
30462
30476
  break;
30463
30477
  }
@@ -30561,9 +30575,7 @@ const gridComponentEmits = [...emits, 'page-change', 'form-submit', 'form-submit
30561
30575
  }
30562
30576
  });
30563
30577
  } else {
30564
- if (true) {
30565
- errLog('vxe.error.notFunc', ['proxy-config.ajax.save']);
30566
- }
30578
+ errLog('vxe.error.notFunc', ['proxy-config.ajax.save']);
30567
30579
  }
30568
30580
  break;
30569
30581
  }
@@ -30580,9 +30592,7 @@ const gridComponentEmits = [...emits, 'page-change', 'form-submit', 'form-submit
30580
30592
  $table: $xeTable
30581
30593
  }, ...args);
30582
30594
  } else {
30583
- if (true) {
30584
- errLog('vxe.error.notCommands', [code]);
30585
- }
30595
+ errLog('vxe.error.notCommands', [code]);
30586
30596
  }
30587
30597
  }
30588
30598
  }
@@ -30786,24 +30796,20 @@ const gridComponentEmits = [...emits, 'page-change', 'form-submit', 'form-submit
30786
30796
  });
30787
30797
  initPages();
30788
30798
  (0,external_commonjs_vue_commonjs2_vue_root_Vue_.onMounted)(() => {
30789
- if (true) {
30790
- (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)(() => {
30791
- if (props.formConfig) {
30792
- if (!VxeUIFormComponent) {
30793
- errLog('vxe.error.reqComp', ['vxe-form']);
30794
- }
30795
- }
30796
- if (props.pagerConfig) {
30797
- if (!VxeUIPagerComponent) {
30798
- errLog('vxe.error.reqComp', ['vxe-pager']);
30799
- }
30800
- }
30801
- });
30802
- }
30803
30799
  (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)(() => {
30804
30800
  const {
30805
30801
  columns
30806
30802
  } = props;
30803
+ if (props.formConfig) {
30804
+ if (!VxeUIFormComponent) {
30805
+ errLog('vxe.error.reqComp', ['vxe-form']);
30806
+ }
30807
+ }
30808
+ if (props.pagerConfig) {
30809
+ if (!VxeUIPagerComponent) {
30810
+ errLog('vxe.error.reqComp', ['vxe-pager']);
30811
+ }
30812
+ }
30807
30813
  // const { data, columns, proxyConfig } = props
30808
30814
  // const proxyOpts = computeProxyOpts.value
30809
30815
  // const formOpts = computeFormOpts.value