vxe-table 4.7.30 → 4.7.31

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.
@@ -21,6 +21,7 @@ export default [
21
21
  'cell-mouseleave',
22
22
  'cell-selected',
23
23
  'cell-delete-value',
24
+ 'cell-backspace-value',
24
25
  'header-cell-click',
25
26
  'header-cell-dblclick',
26
27
  'header-cell-menu',
@@ -4816,7 +4816,7 @@ export default defineComponent({
4816
4816
  const childrenField = treeOpts.children || treeOpts.childrenField;
4817
4817
  const keyCode = evnt.keyCode;
4818
4818
  const isEsc = globalEvents.hasKey(evnt, GLOBAL_EVENT_KEYS.ESCAPE);
4819
- const isBack = globalEvents.hasKey(evnt, GLOBAL_EVENT_KEYS.BACKSPACE);
4819
+ const hasBackspaceKey = globalEvents.hasKey(evnt, GLOBAL_EVENT_KEYS.BACKSPACE);
4820
4820
  const isTab = globalEvents.hasKey(evnt, GLOBAL_EVENT_KEYS.TAB);
4821
4821
  const isEnter = globalEvents.hasKey(evnt, GLOBAL_EVENT_KEYS.ENTER);
4822
4822
  const isSpacebar = globalEvents.hasKey(evnt, GLOBAL_EVENT_KEYS.SPACEBAR);
@@ -4824,7 +4824,7 @@ export default defineComponent({
4824
4824
  const isUpArrow = globalEvents.hasKey(evnt, GLOBAL_EVENT_KEYS.ARROW_UP);
4825
4825
  const isRightArrow = globalEvents.hasKey(evnt, GLOBAL_EVENT_KEYS.ARROW_RIGHT);
4826
4826
  const isDwArrow = globalEvents.hasKey(evnt, GLOBAL_EVENT_KEYS.ARROW_DOWN);
4827
- const isDel = globalEvents.hasKey(evnt, GLOBAL_EVENT_KEYS.DELETE);
4827
+ const hasDeleteKey = globalEvents.hasKey(evnt, GLOBAL_EVENT_KEYS.DELETE);
4828
4828
  const isF2 = globalEvents.hasKey(evnt, GLOBAL_EVENT_KEYS.F2);
4829
4829
  const isContextMenu = globalEvents.hasKey(evnt, GLOBAL_EVENT_KEYS.CONTEXT_MENU);
4830
4830
  const hasMetaKey = evnt.metaKey;
@@ -4967,11 +4967,33 @@ export default defineComponent({
4967
4967
  $xeTable.moveTabSelected(actived.args, hasShiftKey, evnt);
4968
4968
  }
4969
4969
  }
4970
- else if (keyboardConfig && isEnableConf(editConfig) && (isDel || (treeConfig && (rowOpts.isCurrent || highlightCurrentRow) && currentRow ? isBack && keyboardOpts.isArrow : isBack))) {
4970
+ else if (keyboardConfig && keyboardOpts.isDel && hasDeleteKey && isEnableConf(editConfig) && (selected.row || selected.column)) {
4971
+ // 如果是删除键
4972
+ if (!isEditStatus) {
4973
+ const { delMethod } = keyboardOpts;
4974
+ const delPaqrams = {
4975
+ row: selected.row,
4976
+ rowIndex: tableMethods.getRowIndex(selected.row),
4977
+ column: selected.column,
4978
+ columnIndex: tableMethods.getColumnIndex(selected.column),
4979
+ $table: $xeTable
4980
+ };
4981
+ if (delMethod) {
4982
+ delMethod(delPaqrams);
4983
+ }
4984
+ else {
4985
+ setCellValue(selected.row, selected.column, null);
4986
+ }
4987
+ // 如果按下 del 键,更新表尾数据
4988
+ tableMethods.updateFooter();
4989
+ $xeTable.dispatchEvent('cell-delete-value', delPaqrams, evnt);
4990
+ }
4991
+ }
4992
+ else if (hasBackspaceKey && keyboardConfig && keyboardOpts.isBack && isEnableConf(editConfig) && (selected.row || selected.column)) {
4971
4993
  if (!isEditStatus) {
4972
4994
  const { delMethod, backMethod } = keyboardOpts;
4973
4995
  // 如果是删除键
4974
- if (keyboardOpts.isDel && (selected.row || selected.column)) {
4996
+ if (keyboardOpts.isDel && isEnableConf(editConfig) && (selected.row || selected.column)) {
4975
4997
  const delPaqrams = {
4976
4998
  row: selected.row,
4977
4999
  rowIndex: tableMethods.getRowIndex(selected.row),
@@ -4985,44 +5007,38 @@ export default defineComponent({
4985
5007
  else {
4986
5008
  setCellValue(selected.row, selected.column, null);
4987
5009
  }
4988
- if (isBack) {
4989
- if (backMethod) {
4990
- backMethod({
4991
- row: selected.row,
4992
- rowIndex: tableMethods.getRowIndex(selected.row),
4993
- column: selected.column,
4994
- columnIndex: tableMethods.getColumnIndex(selected.column),
4995
- $table: $xeTable
4996
- });
4997
- }
4998
- else {
4999
- $xeTable.handleActived(selected.args, evnt);
5000
- }
5001
- }
5002
- else if (isDel) {
5003
- // 如果按下 del 键,更新表尾数据
5004
- tableMethods.updateFooter();
5010
+ if (backMethod) {
5011
+ backMethod({
5012
+ row: selected.row,
5013
+ rowIndex: tableMethods.getRowIndex(selected.row),
5014
+ column: selected.column,
5015
+ columnIndex: tableMethods.getColumnIndex(selected.column),
5016
+ $table: $xeTable
5017
+ });
5005
5018
  }
5006
- $xeTable.dispatchEvent('cell-delete-value', delPaqrams, evnt);
5007
- }
5008
- else if (isBack && keyboardOpts.isArrow && treeConfig && (rowOpts.isCurrent || highlightCurrentRow) && currentRow) {
5009
- // 如果树形表格回退键关闭当前行返回父节点
5010
- const { parent: parentRow } = XEUtils.findTree(internalData.afterFullData, item => item === currentRow, { children: childrenField });
5011
- if (parentRow) {
5012
- evnt.preventDefault();
5013
- params = {
5014
- $table: $xeTable,
5015
- row: parentRow,
5016
- rowIndex: tableMethods.getRowIndex(parentRow),
5017
- $rowIndex: tableMethods.getVMRowIndex(parentRow)
5018
- };
5019
- tableMethods.setTreeExpand(parentRow, false)
5020
- .then(() => tableMethods.scrollToRow(parentRow))
5021
- .then(() => tablePrivateMethods.triggerCurrentRowEvent(evnt, params));
5019
+ else {
5020
+ $xeTable.handleActived(selected.args, evnt);
5022
5021
  }
5022
+ $xeTable.dispatchEvent('cell-backspace-value', delPaqrams, evnt);
5023
5023
  }
5024
5024
  }
5025
5025
  }
5026
+ else if (hasBackspaceKey && keyboardConfig && treeConfig && keyboardOpts.isBack && (rowOpts.isCurrent || highlightCurrentRow) && currentRow) {
5027
+ // 如果树形表格回退键关闭当前行返回父节点
5028
+ const { parent: parentRow } = XEUtils.findTree(internalData.afterTreeFullData, item => item === currentRow, { children: childrenField });
5029
+ if (parentRow) {
5030
+ evnt.preventDefault();
5031
+ params = {
5032
+ $table: $xeTable,
5033
+ row: parentRow,
5034
+ rowIndex: tableMethods.getRowIndex(parentRow),
5035
+ $rowIndex: tableMethods.getVMRowIndex(parentRow)
5036
+ };
5037
+ tableMethods.setTreeExpand(parentRow, false)
5038
+ .then(() => tableMethods.scrollToRow(parentRow))
5039
+ .then(() => tablePrivateMethods.triggerCurrentRowEvent(evnt, params));
5040
+ }
5041
+ }
5026
5042
  else if (keyboardConfig && isEnableConf(editConfig) && keyboardOpts.isEdit && !hasCtrlKey && !hasMetaKey && (isSpacebar || (keyCode >= 48 && keyCode <= 57) || (keyCode >= 65 && keyCode <= 90) || (keyCode >= 96 && keyCode <= 111) || (keyCode >= 186 && keyCode <= 192) || (keyCode >= 219 && keyCode <= 222))) {
5027
5043
  const { editMethod } = keyboardOpts;
5028
5044
  // 启用编辑后,空格键功能将失效
package/es/ui/index.js CHANGED
@@ -1,8 +1,8 @@
1
1
  import { VxeUI } from '@vxe-ui/core';
2
2
  import { getFuncText } from './src/utils';
3
- export const version = "4.7.30";
3
+ export const version = "4.7.31";
4
4
  VxeUI.version = version;
5
- VxeUI.tableVersion = "4.7.30";
5
+ VxeUI.tableVersion = "4.7.31";
6
6
  VxeUI.setConfig({
7
7
  emptyCell: ' ',
8
8
  table: {
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.7.30"}`;
3
+ const version = `table v${"4.7.31"}`;
4
4
  export const warnLog = log.create('warn', version);
5
5
  export const errLog = log.create('error', version);
package/lib/index.umd.js CHANGED
@@ -1951,9 +1951,9 @@ function eqEmptyValue(cellValue) {
1951
1951
  ;// CONCATENATED MODULE: ./packages/ui/index.ts
1952
1952
 
1953
1953
 
1954
- const version = "4.7.30";
1954
+ const version = "4.7.31";
1955
1955
  core_.VxeUI.version = version;
1956
- core_.VxeUI.tableVersion = "4.7.30";
1956
+ core_.VxeUI.tableVersion = "4.7.31";
1957
1957
  core_.VxeUI.setConfig({
1958
1958
  emptyCell: ' ',
1959
1959
  table: {
@@ -2254,7 +2254,7 @@ var es_array_push = __webpack_require__(4114);
2254
2254
  const {
2255
2255
  log: log_log
2256
2256
  } = core_.VxeUI;
2257
- const log_version = `table v${"4.7.30"}`;
2257
+ const log_version = `table v${"4.7.31"}`;
2258
2258
  const warnLog = log_log.create('warn', log_version);
2259
2259
  const errLog = log_log.create('error', log_version);
2260
2260
  ;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
@@ -6417,7 +6417,7 @@ const {
6417
6417
  params: Object
6418
6418
  });
6419
6419
  ;// CONCATENATED MODULE: ./packages/table/src/emits.ts
6420
- /* harmony default export */ var emits = (['update:data', 'keydown-start', 'keydown', 'keydown-end', 'paste', 'copy', 'cut', 'current-change', 'radio-change', 'checkbox-change', 'checkbox-all', 'checkbox-range-start', 'checkbox-range-change', 'checkbox-range-end', 'checkbox-range-select', 'cell-click', 'cell-dblclick', 'cell-menu', 'cell-mouseenter', 'cell-mouseleave', 'cell-selected', 'cell-delete-value', 'header-cell-click', 'header-cell-dblclick', 'header-cell-menu', 'footer-cell-click', 'footer-cell-dblclick', 'footer-cell-menu', 'clear-merge', 'sort-change', 'clear-sort', 'filter-change', 'filter-visible', 'clear-filter', 'resizable-change', 'toggle-row-expand', 'toggle-tree-expand', 'menu-click', 'edit-closed', 'edit-actived', 'edit-activated', 'edit-disabled', 'valid-error', 'scroll', 'custom', 'change-fnr', 'open-fnr', 'show-fnr', 'hide-fnr', 'fnr-change', 'fnr-find', 'fnr-find-all', 'fnr-replace', 'fnr-replace-all', 'cell-area-copy', 'cell-area-cut', 'cell-area-paste', 'cell-area-merge', 'clear-cell-area-merge', 'header-cell-area-selection', 'cell-area-selection-invalid', 'cell-area-selection-start', 'cell-area-selection-drag', 'cell-area-selection-end', 'cell-area-extension-start', 'cell-area-extension-drag', 'cell-area-extension-end', 'cell-area-selection-all-start', 'cell-area-selection-all-end', 'cell-area-arrows-start', 'cell-area-arrows-end', 'active-cell-change-start', 'active-cell-change-end']);
6420
+ /* harmony default export */ var emits = (['update:data', 'keydown-start', 'keydown', 'keydown-end', 'paste', 'copy', 'cut', 'current-change', 'radio-change', 'checkbox-change', 'checkbox-all', 'checkbox-range-start', 'checkbox-range-change', 'checkbox-range-end', 'checkbox-range-select', 'cell-click', 'cell-dblclick', 'cell-menu', 'cell-mouseenter', 'cell-mouseleave', 'cell-selected', 'cell-delete-value', 'cell-backspace-value', 'header-cell-click', 'header-cell-dblclick', 'header-cell-menu', 'footer-cell-click', 'footer-cell-dblclick', 'footer-cell-menu', 'clear-merge', 'sort-change', 'clear-sort', 'filter-change', 'filter-visible', 'clear-filter', 'resizable-change', 'toggle-row-expand', 'toggle-tree-expand', 'menu-click', 'edit-closed', 'edit-actived', 'edit-activated', 'edit-disabled', 'valid-error', 'scroll', 'custom', 'change-fnr', 'open-fnr', 'show-fnr', 'hide-fnr', 'fnr-change', 'fnr-find', 'fnr-find-all', 'fnr-replace', 'fnr-replace-all', 'cell-area-copy', 'cell-area-cut', 'cell-area-paste', 'cell-area-merge', 'clear-cell-area-merge', 'header-cell-area-selection', 'cell-area-selection-invalid', 'cell-area-selection-start', 'cell-area-selection-drag', 'cell-area-selection-end', 'cell-area-extension-start', 'cell-area-extension-drag', 'cell-area-extension-end', 'cell-area-selection-all-start', 'cell-area-selection-all-end', 'cell-area-arrows-start', 'cell-area-arrows-end', 'active-cell-change-start', 'active-cell-change-end']);
6421
6421
  ;// CONCATENATED MODULE: ./packages/table/module/custom/panel.ts
6422
6422
 
6423
6423
 
@@ -13643,7 +13643,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
13643
13643
  const childrenField = treeOpts.children || treeOpts.childrenField;
13644
13644
  const keyCode = evnt.keyCode;
13645
13645
  const isEsc = table_globalEvents.hasKey(evnt, GLOBAL_EVENT_KEYS.ESCAPE);
13646
- const isBack = table_globalEvents.hasKey(evnt, GLOBAL_EVENT_KEYS.BACKSPACE);
13646
+ const hasBackspaceKey = table_globalEvents.hasKey(evnt, GLOBAL_EVENT_KEYS.BACKSPACE);
13647
13647
  const isTab = table_globalEvents.hasKey(evnt, GLOBAL_EVENT_KEYS.TAB);
13648
13648
  const isEnter = table_globalEvents.hasKey(evnt, GLOBAL_EVENT_KEYS.ENTER);
13649
13649
  const isSpacebar = table_globalEvents.hasKey(evnt, GLOBAL_EVENT_KEYS.SPACEBAR);
@@ -13651,7 +13651,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
13651
13651
  const isUpArrow = table_globalEvents.hasKey(evnt, GLOBAL_EVENT_KEYS.ARROW_UP);
13652
13652
  const isRightArrow = table_globalEvents.hasKey(evnt, GLOBAL_EVENT_KEYS.ARROW_RIGHT);
13653
13653
  const isDwArrow = table_globalEvents.hasKey(evnt, GLOBAL_EVENT_KEYS.ARROW_DOWN);
13654
- const isDel = table_globalEvents.hasKey(evnt, GLOBAL_EVENT_KEYS.DELETE);
13654
+ const hasDeleteKey = table_globalEvents.hasKey(evnt, GLOBAL_EVENT_KEYS.DELETE);
13655
13655
  const isF2 = table_globalEvents.hasKey(evnt, GLOBAL_EVENT_KEYS.F2);
13656
13656
  const isContextMenu = table_globalEvents.hasKey(evnt, GLOBAL_EVENT_KEYS.CONTEXT_MENU);
13657
13657
  const hasMetaKey = evnt.metaKey;
@@ -13774,14 +13774,36 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
13774
13774
  } else if (actived.row || actived.column) {
13775
13775
  $xeTable.moveTabSelected(actived.args, hasShiftKey, evnt);
13776
13776
  }
13777
- } else if (keyboardConfig && isEnableConf(editConfig) && (isDel || (treeConfig && (rowOpts.isCurrent || highlightCurrentRow) && currentRow ? isBack && keyboardOpts.isArrow : isBack))) {
13777
+ } else if (keyboardConfig && keyboardOpts.isDel && hasDeleteKey && isEnableConf(editConfig) && (selected.row || selected.column)) {
13778
+ // 如果是删除键
13779
+ if (!isEditStatus) {
13780
+ const {
13781
+ delMethod
13782
+ } = keyboardOpts;
13783
+ const delPaqrams = {
13784
+ row: selected.row,
13785
+ rowIndex: tableMethods.getRowIndex(selected.row),
13786
+ column: selected.column,
13787
+ columnIndex: tableMethods.getColumnIndex(selected.column),
13788
+ $table: $xeTable
13789
+ };
13790
+ if (delMethod) {
13791
+ delMethod(delPaqrams);
13792
+ } else {
13793
+ setCellValue(selected.row, selected.column, null);
13794
+ }
13795
+ // 如果按下 del 键,更新表尾数据
13796
+ tableMethods.updateFooter();
13797
+ $xeTable.dispatchEvent('cell-delete-value', delPaqrams, evnt);
13798
+ }
13799
+ } else if (hasBackspaceKey && keyboardConfig && keyboardOpts.isBack && isEnableConf(editConfig) && (selected.row || selected.column)) {
13778
13800
  if (!isEditStatus) {
13779
13801
  const {
13780
13802
  delMethod,
13781
13803
  backMethod
13782
13804
  } = keyboardOpts;
13783
13805
  // 如果是删除键
13784
- if (keyboardOpts.isDel && (selected.row || selected.column)) {
13806
+ if (keyboardOpts.isDel && isEnableConf(editConfig) && (selected.row || selected.column)) {
13785
13807
  const delPaqrams = {
13786
13808
  row: selected.row,
13787
13809
  rowIndex: tableMethods.getRowIndex(selected.row),
@@ -13794,42 +13816,37 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
13794
13816
  } else {
13795
13817
  setCellValue(selected.row, selected.column, null);
13796
13818
  }
13797
- if (isBack) {
13798
- if (backMethod) {
13799
- backMethod({
13800
- row: selected.row,
13801
- rowIndex: tableMethods.getRowIndex(selected.row),
13802
- column: selected.column,
13803
- columnIndex: tableMethods.getColumnIndex(selected.column),
13804
- $table: $xeTable
13805
- });
13806
- } else {
13807
- $xeTable.handleActived(selected.args, evnt);
13808
- }
13809
- } else if (isDel) {
13810
- // 如果按下 del 键,更新表尾数据
13811
- tableMethods.updateFooter();
13812
- }
13813
- $xeTable.dispatchEvent('cell-delete-value', delPaqrams, evnt);
13814
- } else if (isBack && keyboardOpts.isArrow && treeConfig && (rowOpts.isCurrent || highlightCurrentRow) && currentRow) {
13815
- // 如果树形表格回退键关闭当前行返回父节点
13816
- const {
13817
- parent: parentRow
13818
- } = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().findTree(internalData.afterFullData, item => item === currentRow, {
13819
- children: childrenField
13820
- });
13821
- if (parentRow) {
13822
- evnt.preventDefault();
13823
- params = {
13824
- $table: $xeTable,
13825
- row: parentRow,
13826
- rowIndex: tableMethods.getRowIndex(parentRow),
13827
- $rowIndex: tableMethods.getVMRowIndex(parentRow)
13828
- };
13829
- tableMethods.setTreeExpand(parentRow, false).then(() => tableMethods.scrollToRow(parentRow)).then(() => tablePrivateMethods.triggerCurrentRowEvent(evnt, params));
13819
+ if (backMethod) {
13820
+ backMethod({
13821
+ row: selected.row,
13822
+ rowIndex: tableMethods.getRowIndex(selected.row),
13823
+ column: selected.column,
13824
+ columnIndex: tableMethods.getColumnIndex(selected.column),
13825
+ $table: $xeTable
13826
+ });
13827
+ } else {
13828
+ $xeTable.handleActived(selected.args, evnt);
13830
13829
  }
13830
+ $xeTable.dispatchEvent('cell-backspace-value', delPaqrams, evnt);
13831
13831
  }
13832
13832
  }
13833
+ } else if (hasBackspaceKey && keyboardConfig && treeConfig && keyboardOpts.isBack && (rowOpts.isCurrent || highlightCurrentRow) && currentRow) {
13834
+ // 如果树形表格回退键关闭当前行返回父节点
13835
+ const {
13836
+ parent: parentRow
13837
+ } = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().findTree(internalData.afterTreeFullData, item => item === currentRow, {
13838
+ children: childrenField
13839
+ });
13840
+ if (parentRow) {
13841
+ evnt.preventDefault();
13842
+ params = {
13843
+ $table: $xeTable,
13844
+ row: parentRow,
13845
+ rowIndex: tableMethods.getRowIndex(parentRow),
13846
+ $rowIndex: tableMethods.getVMRowIndex(parentRow)
13847
+ };
13848
+ tableMethods.setTreeExpand(parentRow, false).then(() => tableMethods.scrollToRow(parentRow)).then(() => tablePrivateMethods.triggerCurrentRowEvent(evnt, params));
13849
+ }
13833
13850
  } else if (keyboardConfig && isEnableConf(editConfig) && keyboardOpts.isEdit && !hasCtrlKey && !hasMetaKey && (isSpacebar || keyCode >= 48 && keyCode <= 57 || keyCode >= 65 && keyCode <= 90 || keyCode >= 96 && keyCode <= 111 || keyCode >= 186 && keyCode <= 192 || keyCode >= 219 && keyCode <= 222)) {
13834
13851
  const {
13835
13852
  editMethod