vxe-table 4.23.17 → 4.23.19

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 (39) hide show
  1. package/dist/all.esm.js +163 -123
  2. package/dist/all.esm.min.js +3 -3
  3. package/es/grid/src/grid.js +0 -8
  4. package/es/table/module/edit/hook.js +85 -85
  5. package/es/table/module/export/export-panel.js +5 -5
  6. package/es/table/module/export/hook.js +8 -10
  7. package/es/table/module/export/import-panel.js +5 -5
  8. package/es/table/src/table.js +58 -8
  9. package/es/ui/index.d.ts +1 -0
  10. package/es/ui/index.js +2 -1
  11. package/es/ui/src/log.js +1 -1
  12. package/lib/grid/src/grid.js +0 -8
  13. package/lib/index.umd.js +163 -123
  14. package/lib/index.umd.min.js +3 -3
  15. package/lib/table/module/edit/hook.js +85 -85
  16. package/lib/table/module/export/export-panel.js +5 -5
  17. package/lib/table/module/export/hook.js +8 -10
  18. package/lib/table/module/export/import-panel.js +5 -5
  19. package/lib/table/src/table.js +58 -8
  20. package/lib/ui/index.d.ts +1 -0
  21. package/lib/ui/index.js +2 -1
  22. package/lib/ui/src/log.js +1 -1
  23. package/package.json +2 -2
  24. package/packages/grid/src/grid.ts +0 -9
  25. package/packages/table/module/edit/hook.ts +97 -89
  26. package/packages/table/module/export/export-panel.ts +5 -5
  27. package/packages/table/module/export/hook.ts +8 -10
  28. package/packages/table/module/export/import-panel.ts +5 -5
  29. package/packages/table/src/table.ts +64 -11
  30. package/packages/ui/index.ts +4 -0
  31. /package/dist/{iconfont.1794294436168.ttf → iconfont.1794474448348.ttf} +0 -0
  32. /package/dist/{iconfont.1794294436168.woff → iconfont.1794474448348.woff} +0 -0
  33. /package/dist/{iconfont.1794294436168.woff2 → iconfont.1794474448348.woff2} +0 -0
  34. /package/es/{iconfont.1794294436168.ttf → iconfont.1794474448348.ttf} +0 -0
  35. /package/es/{iconfont.1794294436168.woff → iconfont.1794474448348.woff} +0 -0
  36. /package/es/{iconfont.1794294436168.woff2 → iconfont.1794474448348.woff2} +0 -0
  37. /package/lib/{iconfont.1794294436168.ttf → iconfont.1794474448348.ttf} +0 -0
  38. /package/lib/{iconfont.1794294436168.woff → iconfont.1794474448348.woff} +0 -0
  39. /package/lib/{iconfont.1794294436168.woff2 → iconfont.1794474448348.woff2} +0 -0
package/dist/all.esm.js CHANGED
@@ -123,7 +123,7 @@ function getDefaultConfig(val1, def1) {
123
123
  }
124
124
 
125
125
  // packages_temp/ui/index.ts
126
- var version = "4.23.17";
126
+ var version = "4.23.18";
127
127
  VxeUI2.version = version;
128
128
  VxeUI2.tableVersion = version;
129
129
  VxeUI2.setConfig({
@@ -952,7 +952,7 @@ function getPopupAppendElement(appendTo) {
952
952
  // packages_temp/ui/src/log.ts
953
953
  import { VxeUI as VxeUI3 } from "@vxe-ui/core";
954
954
  var { log } = VxeUI3;
955
- var tableVersion = `table v${"4.23.17"}`;
955
+ var tableVersion = `table v${"4.23.18"}`;
956
956
  function createComponentLog(name) {
957
957
  const uiVersion = VxeUI3.uiVersion ? `ui v${VxeUI3.uiVersion}` : "";
958
958
  const ganttVersion = VxeUI3.ganttVersion ? `gantt v${VxeUI3.ganttVersion}` : "";
@@ -8685,17 +8685,17 @@ var import_panel_default = (
8685
8685
  {
8686
8686
  id: "VXE_IMPORT_MODAL",
8687
8687
  modelValue: storeData.visible,
8688
- title: modelOptions.title || getI18n6("vxe.import.impTitle"),
8689
- className: "vxe-table-export-popup-wrapper",
8688
+ title: getDefaultConfig(modelOptions.title, getI18n6("vxe.import.impTitle")),
8689
+ className: "vxe-table-import-popup-wrapper" + (modelOptions.className ? ` ${modelOptions.className}` : ""),
8690
8690
  width: modelOptions.width || 540,
8691
8691
  height: modelOptions.height,
8692
8692
  minWidth: modelOptions.minWidth || 360,
8693
8693
  minHeight: modelOptions.minHeight || 240,
8694
8694
  mask: getDefaultConfig(modelOptions.mask, true),
8695
8695
  lockView: getDefaultConfig(modelOptions.lockView, true),
8696
- showFooter: true,
8697
- escClosable: true,
8698
- maskClosable: true,
8696
+ showFooter: getDefaultConfig(modelOptions.showFooter, true),
8697
+ escClosable: getDefaultConfig(modelOptions.escClosable, true),
8698
+ maskClosable: getDefaultConfig(modelOptions.maskClosable, true),
8699
8699
  position: modelOptions.position,
8700
8700
  fullscreen: modelOptions.fullscreen,
8701
8701
  remember: modelOptions.remember,
@@ -9081,17 +9081,17 @@ var export_panel_default = (
9081
9081
  {
9082
9082
  id: "VXE_EXPORT_MODAL",
9083
9083
  modelValue: storeData.visible,
9084
- title: modelOptions.title || getI18n7(isPrint ? "vxe.export.printTitle" : "vxe.export.expTitle"),
9085
- className: "vxe-table-export-popup-wrapper",
9084
+ title: getDefaultConfig(modelOptions.title, getI18n7(isPrint ? "vxe.export.printTitle" : "vxe.export.expTitle")),
9085
+ className: "vxe-table-export-popup-wrapper" + (modelOptions.className ? ` ${modelOptions.className}` : ""),
9086
9086
  width: modelOptions.width || 660,
9087
9087
  height: modelOptions.height,
9088
9088
  minWidth: modelOptions.minWidth || 500,
9089
9089
  minHeight: modelOptions.minHeight || 400,
9090
9090
  mask: getDefaultConfig(modelOptions.mask, true),
9091
9091
  lockView: getDefaultConfig(modelOptions.lockView, true),
9092
- showFooter: true,
9093
- escClosable: true,
9094
- maskClosable: true,
9092
+ showFooter: getDefaultConfig(modelOptions.showFooter, true),
9093
+ escClosable: getDefaultConfig(modelOptions.escClosable, true),
9094
+ maskClosable: getDefaultConfig(modelOptions.maskClosable, true),
9095
9095
  position: modelOptions.position,
9096
9096
  fullscreen: modelOptions.fullscreen,
9097
9097
  remember: modelOptions.remember,
@@ -10530,8 +10530,6 @@ hooks3.add("tableEditModule", {
10530
10530
  const { refElem } = $xeTable.getRefMaps();
10531
10531
  const { computeMouseOpts, computeEditOpts, computeCheckboxOpts, computeTreeOpts, computeValidOpts, computeRendererOpts } = $xeTable.getComputeMaps();
10532
10532
  const browseObj = XEUtils18.browse();
10533
- let editMethods = {};
10534
- let editPrivateMethods = {};
10535
10533
  const getEditColumnModel = (row, column) => {
10536
10534
  const { model, editRender } = column;
10537
10535
  if (editRender) {
@@ -10891,76 +10889,26 @@ hooks3.add("tableEditModule", {
10891
10889
  const { editRender } = column;
10892
10890
  const { isFocus, isPos, isClear } = options;
10893
10891
  const cell = params.cell || $xeTable.getCellElement(row, column);
10894
- const beforeEditMethod = editOpts.beforeEditMethod || editOpts.activeMethod;
10892
+ const beforeEditFn = editOpts.beforeEditMethod || editOpts.activeMethod;
10893
+ const beforeEditAsyncFn = editOpts.beforeEditAsyncMethod;
10895
10894
  const editParams = { ...params, cell };
10896
- if (cell && isEnableConf(editConfig) && isEnableConf(editRender)) {
10897
- if (!$xeTable.isPendingByRow(row) && !$xeTable.isAggregateRecord(row)) {
10898
- if (actived.row !== row || (mode === "cell" ? actived.column !== column : false)) {
10899
- let type = "edit-disabled";
10900
- if (!beforeEditMethod || beforeEditMethod({ ...editParams, $table: $xeTable, $grid: $xeGrid, $gantt: $xeGantt })) {
10901
- if (hasEnableConf(mouseConfig, mouseOpts)) {
10902
- $xeTable.clearSelected();
10903
- if ($xeTable.clearCellAreas) {
10904
- $xeTable.clearCellAreas();
10905
- $xeTable.clearCopyCellArea();
10906
- }
10907
- }
10908
- $xeTable.closeTooltip();
10909
- if (actived.column) {
10910
- handleClearEdit(evnt);
10911
- }
10912
- type = "edit-activated";
10913
- column.renderHeight = cell.offsetHeight;
10914
- actived.args = editParams;
10915
- actived.row = row;
10916
- actived.column = column;
10917
- $xeTable.handlePushStack();
10918
- if (isClear) {
10919
- setCellValue(row, column, null);
10920
- }
10921
- if (mode === "row") {
10922
- tableColumn.forEach((column2) => getEditColumnModel(row, column2));
10923
- } else {
10924
- getEditColumnModel(row, column);
10925
- }
10926
- const afterEditMethod = editOpts.afterEditMethod;
10927
- nextTick9(() => {
10928
- if (isFocus) {
10929
- $xeTable.handleFocus(editParams, evnt);
10930
- }
10931
- if (afterEditMethod) {
10932
- afterEditMethod({ ...editParams, $table: $xeTable, $grid: $xeGrid, $gantt: $xeGantt });
10933
- }
10934
- });
10935
- }
10936
- $xeTable.dispatchEvent(
10937
- type,
10938
- {
10939
- row,
10940
- rowIndex: $xeTable.getRowIndex(row),
10941
- $rowIndex: $xeTable.getVMRowIndex(row),
10942
- column,
10943
- columnIndex: $xeTable.getColumnIndex(column),
10944
- $columnIndex: $xeTable.getVMColumnIndex(column)
10945
- },
10946
- evnt
10947
- );
10948
- if (type === "edit-activated") {
10949
- $xeTable.dispatchEvent(
10950
- "edit-actived",
10951
- {
10952
- row,
10953
- rowIndex: $xeTable.getRowIndex(row),
10954
- $rowIndex: $xeTable.getVMRowIndex(row),
10955
- column,
10956
- columnIndex: $xeTable.getColumnIndex(column),
10957
- $columnIndex: $xeTable.getVMColumnIndex(column)
10958
- },
10959
- evnt
10960
- );
10961
- }
10962
- } else {
10963
- const { column: oldColumn } = actived;
10895
+ if (!cell || !isEnableConf(editConfig) || !isEnableConf(editRender)) {
10896
+ return nextTick9();
10897
+ }
10898
+ if ($xeTable.isPendingByRow(row) || $xeTable.isAggregateRecord(row)) {
10899
+ return nextTick9();
10900
+ }
10901
+ if (actived.row !== row || (mode === "cell" ? actived.column !== column : false)) {
10902
+ const evntParams = {
10903
+ row,
10904
+ rowIndex: $xeTable.getRowIndex(row),
10905
+ $rowIndex: $xeTable.getVMRowIndex(row),
10906
+ column,
10907
+ columnIndex: $xeTable.getColumnIndex(column),
10908
+ $columnIndex: $xeTable.getVMColumnIndex(column)
10909
+ };
10910
+ const handleCellEdit = (status) => {
10911
+ if (status) {
10964
10912
  if (hasEnableConf(mouseConfig, mouseOpts)) {
10965
10913
  $xeTable.clearSelected();
10966
10914
  if ($xeTable.clearCellAreas) {
@@ -10968,29 +10916,81 @@ hooks3.add("tableEditModule", {
10968
10916
  $xeTable.clearCopyCellArea();
10969
10917
  }
10970
10918
  }
10971
- if (oldColumn && oldColumn !== column) {
10972
- const { model: oldModel } = oldColumn;
10973
- if (oldModel.update) {
10974
- setCellValue(row, oldColumn, oldModel.value);
10975
- }
10976
- if ($xeTable.clearValidate) {
10977
- $xeTable.clearValidate(row, column);
10978
- }
10919
+ $xeTable.closeTooltip();
10920
+ if (actived.column) {
10921
+ handleClearEdit(evnt);
10979
10922
  }
10980
10923
  column.renderHeight = cell.offsetHeight;
10981
10924
  actived.args = editParams;
10925
+ actived.row = row;
10982
10926
  actived.column = column;
10983
- if (isPos) {
10984
- setTimeout(() => {
10985
- $xeTable.handleFocus(editParams, evnt);
10986
- });
10927
+ $xeTable.handlePushStack();
10928
+ if (isClear) {
10929
+ setCellValue(row, column, null);
10930
+ }
10931
+ if (mode === "row") {
10932
+ tableColumn.forEach((column2) => getEditColumnModel(row, column2));
10933
+ } else {
10934
+ getEditColumnModel(row, column);
10987
10935
  }
10936
+ const afterEditMethod = editOpts.afterEditMethod;
10937
+ nextTick9(() => {
10938
+ if (isFocus) {
10939
+ $xeTable.handleFocus(editParams, evnt);
10940
+ }
10941
+ if (afterEditMethod) {
10942
+ afterEditMethod({ ...editParams, $table: $xeTable, $grid: $xeGrid, $gantt: $xeGantt });
10943
+ }
10944
+ });
10945
+ $xeTable.dispatchEvent("edit-activated", evntParams, evnt);
10946
+ $xeTable.dispatchEvent("edit-actived", evntParams, evnt);
10947
+ } else {
10948
+ $xeTable.dispatchEvent("edit-disabled", evntParams, evnt);
10988
10949
  }
10989
10950
  focused.column = null;
10990
10951
  focused.row = null;
10991
10952
  $xeTable.focus();
10953
+ };
10954
+ const eFnParams = { ...editParams, $table: $xeTable, $grid: $xeGrid, $gantt: $xeGantt };
10955
+ if (beforeEditFn) {
10956
+ handleCellEdit(!!beforeEditFn(eFnParams));
10957
+ } else if (beforeEditAsyncFn) {
10958
+ return Promise.resolve().then(() => beforeEditAsyncFn(eFnParams)).catch(() => false).then((status) => {
10959
+ handleCellEdit(!!status);
10960
+ });
10961
+ } else {
10962
+ handleCellEdit(true);
10963
+ }
10964
+ return nextTick9();
10965
+ }
10966
+ const { column: oldColumn } = actived;
10967
+ if (hasEnableConf(mouseConfig, mouseOpts)) {
10968
+ $xeTable.clearSelected();
10969
+ if ($xeTable.clearCellAreas) {
10970
+ $xeTable.clearCellAreas();
10971
+ $xeTable.clearCopyCellArea();
10972
+ }
10973
+ }
10974
+ if (oldColumn && oldColumn !== column) {
10975
+ const { model: oldModel } = oldColumn;
10976
+ if (oldModel.update) {
10977
+ setCellValue(row, oldColumn, oldModel.value);
10978
+ }
10979
+ if ($xeTable.clearValidate) {
10980
+ $xeTable.clearValidate(row, column);
10992
10981
  }
10993
10982
  }
10983
+ column.renderHeight = cell.offsetHeight;
10984
+ actived.args = editParams;
10985
+ actived.column = column;
10986
+ if (isPos) {
10987
+ setTimeout(() => {
10988
+ $xeTable.handleFocus(editParams, evnt);
10989
+ });
10990
+ }
10991
+ focused.column = null;
10992
+ focused.row = null;
10993
+ $xeTable.focus();
10994
10994
  return nextTick9();
10995
10995
  };
10996
10996
  const handleEditCell = (row, fieldOrColumn, options) => {
@@ -11027,7 +11027,7 @@ hooks3.add("tableEditModule", {
11027
11027
  }
11028
11028
  return nextTick9();
11029
11029
  };
11030
- editMethods = {
11030
+ const editMethods = {
11031
11031
  /**
11032
11032
  * 往表格中插入临时数据
11033
11033
  *
@@ -11475,7 +11475,7 @@ hooks3.add("tableEditModule", {
11475
11475
  }
11476
11476
  return null;
11477
11477
  };
11478
- editPrivateMethods = {
11478
+ const editPrivateMethods = {
11479
11479
  /**
11480
11480
  * 处理激活编辑
11481
11481
  */
@@ -12697,9 +12697,11 @@ hooks4.add("tableExportModule", {
12697
12697
  }
12698
12698
  });
12699
12699
  });
12700
- } else if (opts.message !== false) {
12701
- if (VxeUI21.modal) {
12702
- VxeUI21.modal.message({ content: getI18n10("vxe.error.impFields"), status: "error" });
12700
+ } else {
12701
+ if (opts.message !== false) {
12702
+ if (VxeUI21.modal) {
12703
+ VxeUI21.modal.message({ content: getI18n10("vxe.error.impFields"), status: "error" });
12704
+ }
12703
12705
  }
12704
12706
  if (_importReject) {
12705
12707
  _importReject({ status: false, msg: "field mismatching" });
@@ -12916,13 +12918,9 @@ hooks4.add("tableExportModule", {
12916
12918
  exportStore.isPrint = !!isPrint;
12917
12919
  exportStore.hasColgroup = isGroup;
12918
12920
  exportStore.visible = true;
12919
- Object.assign(
12920
- exportParams,
12921
- {
12922
- mode: selectRecords.length ? "selected" : "current"
12923
- },
12924
- defOpts
12925
- );
12921
+ Object.assign(exportParams, {
12922
+ mode: selectRecords.length ? "selected" : "current"
12923
+ }, defOpts);
12926
12924
  const { filename, sheetName, mode, type } = exportParams;
12927
12925
  if (filename) {
12928
12926
  if (XEUtils19.isFunction(filename)) {
@@ -24925,7 +24923,8 @@ var table_default = (
24925
24923
  const operArrow = isLeftArrow || isUpArrow || isRightArrow || isDwArrow;
24926
24924
  const operCtxMenu = isContentMenu && ctxMenuStore.visible && (isEnter || isSpacebar || operArrow);
24927
24925
  const isEditStatus = isEnableConf(editConfig) && actived.column && actived.row;
24928
- const beforeEditMethod = editOpts.beforeEditMethod || editOpts.activeMethod;
24926
+ const beforeEditFn = editOpts.beforeEditMethod || editOpts.activeMethod;
24927
+ const beforeEditAsyncFn = editOpts.beforeEditAsyncMethod;
24929
24928
  const selectRow = selected.row;
24930
24929
  const selectColumn = selected.column;
24931
24930
  if (operCtxMenu) {
@@ -25153,7 +25152,7 @@ var table_default = (
25153
25152
  $grid: $xeGrid,
25154
25153
  $gantt: $xeGantt
25155
25154
  };
25156
- if (!beforeEditMethod || beforeEditMethod(params)) {
25155
+ const handleEdit = () => {
25157
25156
  if (delMethod) {
25158
25157
  delMethod(params);
25159
25158
  } else {
@@ -25165,6 +25164,20 @@ var table_default = (
25165
25164
  }
25166
25165
  $xeTable.updateFooter();
25167
25166
  dispatchEvent("cell-delete-value", params, evnt);
25167
+ };
25168
+ if (beforeEditFn) {
25169
+ if (beforeEditFn(params)) {
25170
+ handleEdit();
25171
+ }
25172
+ } else if (beforeEditAsyncFn) {
25173
+ Promise.resolve(beforeEditAsyncFn(params)).then((status) => {
25174
+ if (status) {
25175
+ handleEdit();
25176
+ }
25177
+ }).catch(() => {
25178
+ });
25179
+ } else {
25180
+ handleEdit();
25168
25181
  }
25169
25182
  }
25170
25183
  } else if (hasBackspaceKey && hasEnableConf(keyboardConfig, keyboardOpts) && keyboardOpts.isBack && isEnableConf(editConfig) && (selectRow || selectColumn)) {
@@ -25184,7 +25197,7 @@ var table_default = (
25184
25197
  $grid: $xeGrid,
25185
25198
  $gantt: $xeGantt
25186
25199
  };
25187
- if (!beforeEditMethod || beforeEditMethod(params)) {
25200
+ const handleEdit = () => {
25188
25201
  if (backMethod) {
25189
25202
  backMethod(params);
25190
25203
  } else {
@@ -25193,6 +25206,20 @@ var table_default = (
25193
25206
  });
25194
25207
  }
25195
25208
  dispatchEvent("cell-backspace-value", params, evnt);
25209
+ };
25210
+ if (beforeEditFn) {
25211
+ if (beforeEditFn(params)) {
25212
+ handleEdit();
25213
+ }
25214
+ } else if (beforeEditAsyncFn) {
25215
+ Promise.resolve(beforeEditAsyncFn(params)).then((status) => {
25216
+ if (status) {
25217
+ handleEdit();
25218
+ }
25219
+ }).catch(() => {
25220
+ });
25221
+ } else {
25222
+ handleEdit();
25196
25223
  }
25197
25224
  }
25198
25225
  }
@@ -25223,7 +25250,6 @@ var table_default = (
25223
25250
  } else if (hasEnableConf(keyboardConfig, keyboardOpts) && isEnableConf(editConfig) && keyboardOpts.isEdit && !isControlKey && (isSpacebar || isProcess || evnt.key === "Process" || keyCode >= 48 && keyCode <= 57 || keyCode >= 65 && keyCode <= 90 || keyCode >= 96 && keyCode <= 111 || keyCode >= 186 && keyCode <= 192 || keyCode >= 219 && keyCode <= 222)) {
25224
25251
  const { editMode, editMethod } = keyboardOpts;
25225
25252
  if (selectColumn && selectRow && isEnableConf(selectColumn.editRender)) {
25226
- const beforeEditMethod2 = editOpts.beforeEditMethod || editOpts.activeMethod;
25227
25253
  const params = {
25228
25254
  row: selectRow,
25229
25255
  rowIndex: $xeTable.getRowIndex(selectRow),
@@ -25237,7 +25263,7 @@ var table_default = (
25237
25263
  $grid: $xeGrid,
25238
25264
  $gantt: $xeGantt
25239
25265
  };
25240
- if (!beforeEditMethod2 || beforeEditMethod2(params)) {
25266
+ const handleEdit = () => {
25241
25267
  if (editMethod) {
25242
25268
  editMethod(params);
25243
25269
  } else {
@@ -25249,6 +25275,20 @@ var table_default = (
25249
25275
  isClear: isClearValue
25250
25276
  });
25251
25277
  }
25278
+ };
25279
+ if (beforeEditFn) {
25280
+ if (beforeEditFn(params)) {
25281
+ handleEdit();
25282
+ }
25283
+ } else if (beforeEditAsyncFn) {
25284
+ Promise.resolve(beforeEditAsyncFn(params)).then((status) => {
25285
+ if (status) {
25286
+ handleEdit();
25287
+ }
25288
+ }).catch(() => {
25289
+ });
25290
+ } else {
25291
+ handleEdit();
25252
25292
  }
25253
25293
  }
25254
25294
  }
@@ -25946,7 +25986,6 @@ var table_default = (
25946
25986
  if (rowExpandedMaps[rowid]) {
25947
25987
  rowExpandedMaps[rowid] = row;
25948
25988
  }
25949
- rowNum++;
25950
25989
  idMaps[rowid] = true;
25951
25990
  fullDataRowIdMaps[rowid] = rowRest;
25952
25991
  fullAllDataRowIdMaps[rowid] = rowRest;
@@ -31014,6 +31053,7 @@ var table_default = (
31014
31053
  const mouseOpts = computeMouseOpts.value;
31015
31054
  const exportOpts = computeExportOpts.value;
31016
31055
  const importOpts = computeImportOpts.value;
31056
+ const keyboardOpts = computeKeyboardOpts.value;
31017
31057
  const rowDragOpts = computeRowDragOpts.value;
31018
31058
  const areaOpts = computeAreaOpts.value;
31019
31059
  const sortOpts = computeSortOpts.value;
@@ -31172,8 +31212,16 @@ var table_default = (
31172
31212
  if (mouseOpts.area && props.treeConfig && !treeOpts.transform) {
31173
31213
  errLog10("vxe.error.notSupportProp", ["mouse-config.area", "tree-config.transform=false", "tree-config.transform=true"]);
31174
31214
  }
31175
- if (props.editConfig && editOpts.activeMethod) {
31176
- warnLog7("vxe.error.delProp", ["edit-config.activeMethod", "edit-config.beforeEditMethod"]);
31215
+ if (props.editConfig) {
31216
+ if (editOpts.activeMethod) {
31217
+ warnLog7("vxe.error.delProp", ["edit-config.activeMethod", "edit-config.beforeEditMethod"]);
31218
+ }
31219
+ if (editOpts.beforeEditMethod && editOpts.beforeEditAsyncMethod) {
31220
+ errLog10("vxe.error.errConflicts", ["edit-config.beforeEditMethod", "edit-config.beforeEditAsyncMethod"]);
31221
+ }
31222
+ if (keyboardOpts.isEdit && editOpts.beforeEditAsyncMethod) {
31223
+ warnLog7("vxe.error.errConflicts", ["keyboard-config.isEdit", "edit-config.beforeEditAsyncMethod"]);
31224
+ }
31177
31225
  }
31178
31226
  if (checkboxOpts.halfField) {
31179
31227
  warnLog7("vxe.error.delProp", ["checkbox-config.halfField", "checkbox-config.indeterminateField"]);
@@ -32339,14 +32387,6 @@ var grid_default = (
32339
32387
  return funcs;
32340
32388
  };
32341
32389
  const gridExtendTableMethods = extendTableMethods(tableComponentMethodKeys);
32342
- tableComponentMethodKeys.forEach((name) => {
32343
- gridExtendTableMethods[name] = (...args) => {
32344
- const $xeTable = refTable.value;
32345
- if ($xeTable && $xeTable[name]) {
32346
- return $xeTable && $xeTable[name](...args);
32347
- }
32348
- };
32349
- });
32350
32390
  const computeProxyOpts = computed7(() => {
32351
32391
  return XEUtils27.merge({}, XEUtils27.clone(getConfig10().grid.proxyConfig, true), props.proxyConfig);
32352
32392
  });