vxe-table 4.7.29 → 4.7.31

package/es/table/src/emits.js

@@ -21,6 +21,7 @@ export default [
     'cell-mouseleave',
     'cell-selected',
     'cell-delete-value',
+    'cell-backspace-value',
     'header-cell-click',
     'header-cell-dblclick',
     'header-cell-menu',

package/es/table/src/table.js

@@ -4816,7 +4816,7 @@ export default defineComponent({
                     const childrenField = treeOpts.children || treeOpts.childrenField;
                     const keyCode = evnt.keyCode;
                     const isEsc = globalEvents.hasKey(evnt, GLOBAL_EVENT_KEYS.ESCAPE);
-                    const isBack = globalEvents.hasKey(evnt, GLOBAL_EVENT_KEYS.BACKSPACE);
+                    const hasBackspaceKey = globalEvents.hasKey(evnt, GLOBAL_EVENT_KEYS.BACKSPACE);
                     const isTab = globalEvents.hasKey(evnt, GLOBAL_EVENT_KEYS.TAB);
                     const isEnter = globalEvents.hasKey(evnt, GLOBAL_EVENT_KEYS.ENTER);
                     const isSpacebar = globalEvents.hasKey(evnt, GLOBAL_EVENT_KEYS.SPACEBAR);
@@ -4824,7 +4824,7 @@ export default defineComponent({
                     const isUpArrow = globalEvents.hasKey(evnt, GLOBAL_EVENT_KEYS.ARROW_UP);
                     const isRightArrow = globalEvents.hasKey(evnt, GLOBAL_EVENT_KEYS.ARROW_RIGHT);
                     const isDwArrow = globalEvents.hasKey(evnt, GLOBAL_EVENT_KEYS.ARROW_DOWN);
-                    const isDel = globalEvents.hasKey(evnt, GLOBAL_EVENT_KEYS.DELETE);
+                    const hasDeleteKey = globalEvents.hasKey(evnt, GLOBAL_EVENT_KEYS.DELETE);
                     const isF2 = globalEvents.hasKey(evnt, GLOBAL_EVENT_KEYS.F2);
                     const isContextMenu = globalEvents.hasKey(evnt, GLOBAL_EVENT_KEYS.CONTEXT_MENU);
                     const hasMetaKey = evnt.metaKey;
@@ -4967,11 +4967,33 @@ export default defineComponent({
                             $xeTable.moveTabSelected(actived.args, hasShiftKey, evnt);
                         }
                     }
-                    else if (keyboardConfig && isEnableConf(editConfig) && (isDel || (treeConfig && (rowOpts.isCurrent || highlightCurrentRow) && currentRow ? isBack && keyboardOpts.isArrow : isBack))) {
+                    else if (keyboardConfig && keyboardOpts.isDel && hasDeleteKey && isEnableConf(editConfig) && (selected.row || selected.column)) {
+                        // 如果是删除键
+                        if (!isEditStatus) {
+                            const { delMethod } = keyboardOpts;
+                            const delPaqrams = {
+                                row: selected.row,
+                                rowIndex: tableMethods.getRowIndex(selected.row),
+                                column: selected.column,
+                                columnIndex: tableMethods.getColumnIndex(selected.column),
+                                $table: $xeTable
+                            };
+                            if (delMethod) {
+                                delMethod(delPaqrams);
+                            }
+                            else {
+                                setCellValue(selected.row, selected.column, null);
+                            }
+                            // 如果按下 del 键，更新表尾数据
+                            tableMethods.updateFooter();
+                            $xeTable.dispatchEvent('cell-delete-value', delPaqrams, evnt);
+                        }
+                    }
+                    else if (hasBackspaceKey && keyboardConfig && keyboardOpts.isBack && isEnableConf(editConfig) && (selected.row || selected.column)) {
                         if (!isEditStatus) {
                             const { delMethod, backMethod } = keyboardOpts;
                             // 如果是删除键
-                            if (keyboardOpts.isDel && (selected.row || selected.column)) {
+                            if (keyboardOpts.isDel && isEnableConf(editConfig) && (selected.row || selected.column)) {
                                 const delPaqrams = {
                                     row: selected.row,
                                     rowIndex: tableMethods.getRowIndex(selected.row),
@@ -4985,44 +5007,38 @@ export default defineComponent({
                                 else {
                                     setCellValue(selected.row, selected.column, null);
                                 }
-                                if (isBack) {
-                                    if (backMethod) {
-                                        backMethod({
-                                            row: selected.row,
-                                            rowIndex: tableMethods.getRowIndex(selected.row),
-                                            column: selected.column,
-                                            columnIndex: tableMethods.getColumnIndex(selected.column),
-                                            $table: $xeTable
-                                        });
-                                    }
-                                    else {
-                                        $xeTable.handleActived(selected.args, evnt);
-                                    }
-                                }
-                                else if (isDel) {
-                                    // 如果按下 del 键，更新表尾数据
-                                    tableMethods.updateFooter();
+                                if (backMethod) {
+                                    backMethod({
+                                        row: selected.row,
+                                        rowIndex: tableMethods.getRowIndex(selected.row),
+                                        column: selected.column,
+                                        columnIndex: tableMethods.getColumnIndex(selected.column),
+                                        $table: $xeTable
+                                    });
                                 }
-                                $xeTable.dispatchEvent('cell-delete-value', delPaqrams, evnt);
-                            }
-                            else if (isBack && keyboardOpts.isArrow && treeConfig && (rowOpts.isCurrent || highlightCurrentRow) && currentRow) {
-                                // 如果树形表格回退键关闭当前行返回父节点
-                                const { parent: parentRow } = XEUtils.findTree(internalData.afterFullData, item => item === currentRow, { children: childrenField });
-                                if (parentRow) {
-                                    evnt.preventDefault();
-                                    params = {
-                                        $table: $xeTable,
-                                        row: parentRow,
-                                        rowIndex: tableMethods.getRowIndex(parentRow),
-                                        $rowIndex: tableMethods.getVMRowIndex(parentRow)
-                                    };
-                                    tableMethods.setTreeExpand(parentRow, false)
-                                        .then(() => tableMethods.scrollToRow(parentRow))
-                                        .then(() => tablePrivateMethods.triggerCurrentRowEvent(evnt, params));
+                                else {
+                                    $xeTable.handleActived(selected.args, evnt);
                                 }
+                                $xeTable.dispatchEvent('cell-backspace-value', delPaqrams, evnt);
                             }
                         }
                     }
+                    else if (hasBackspaceKey && keyboardConfig && treeConfig && keyboardOpts.isBack && (rowOpts.isCurrent || highlightCurrentRow) && currentRow) {
+                        // 如果树形表格回退键关闭当前行返回父节点
+                        const { parent: parentRow } = XEUtils.findTree(internalData.afterTreeFullData, item => item === currentRow, { children: childrenField });
+                        if (parentRow) {
+                            evnt.preventDefault();
+                            params = {
+                                $table: $xeTable,
+                                row: parentRow,
+                                rowIndex: tableMethods.getRowIndex(parentRow),
+                                $rowIndex: tableMethods.getVMRowIndex(parentRow)
+                            };
+                            tableMethods.setTreeExpand(parentRow, false)
+                                .then(() => tableMethods.scrollToRow(parentRow))
+                                .then(() => tablePrivateMethods.triggerCurrentRowEvent(evnt, params));
+                        }
+                    }
                     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))) {
                         const { editMethod } = keyboardOpts;
                         // 启用编辑后，空格键功能将失效

package/es/ui/index.js

@@ -1,8 +1,8 @@
 import { VxeUI } from '@vxe-ui/core';
 import { getFuncText } from './src/utils';
-export const version = "4.7.29";
+export const version = "4.7.31";
 VxeUI.version = version;
-VxeUI.tableVersion = "4.7.29";
+VxeUI.tableVersion = "4.7.31";
 VxeUI.setConfig({
     emptyCell: '　',
     table: {

package/es/ui/src/log.js

@@ -1,5 +1,5 @@
 import { VxeUI } from '@vxe-ui/core';
 const { log } = VxeUI;
-const version = `table v${"4.7.29"}`;
+const version = `table v${"4.7.31"}`;
 export const warnLog = log.create('warn', version);
 export const errLog = log.create('error', version);

package/lib/index.umd.js

@@ -1951,9 +1951,9 @@ function eqEmptyValue(cellValue) {
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
 
 
-const version = "4.7.29";
+const version = "4.7.31";
 core_.VxeUI.version = version;
-core_.VxeUI.tableVersion = "4.7.29";
+core_.VxeUI.tableVersion = "4.7.31";
 core_.VxeUI.setConfig({
   emptyCell: '　',
   table: {
@@ -2254,7 +2254,7 @@ var es_array_push = __webpack_require__(4114);
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"4.7.29"}`;
+const log_version = `table v${"4.7.31"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
@@ -6417,7 +6417,7 @@ const {
   params: Object
 });
 ;// CONCATENATED MODULE: ./packages/table/src/emits.ts
-/* 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']);
+/* 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']);
 ;// CONCATENATED MODULE: ./packages/table/module/custom/panel.ts
 
 
@@ -13643,7 +13643,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
           const childrenField = treeOpts.children || treeOpts.childrenField;
           const keyCode = evnt.keyCode;
           const isEsc = table_globalEvents.hasKey(evnt, GLOBAL_EVENT_KEYS.ESCAPE);
-          const isBack = table_globalEvents.hasKey(evnt, GLOBAL_EVENT_KEYS.BACKSPACE);
+          const hasBackspaceKey = table_globalEvents.hasKey(evnt, GLOBAL_EVENT_KEYS.BACKSPACE);
           const isTab = table_globalEvents.hasKey(evnt, GLOBAL_EVENT_KEYS.TAB);
           const isEnter = table_globalEvents.hasKey(evnt, GLOBAL_EVENT_KEYS.ENTER);
           const isSpacebar = table_globalEvents.hasKey(evnt, GLOBAL_EVENT_KEYS.SPACEBAR);
@@ -13651,7 +13651,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
           const isUpArrow = table_globalEvents.hasKey(evnt, GLOBAL_EVENT_KEYS.ARROW_UP);
           const isRightArrow = table_globalEvents.hasKey(evnt, GLOBAL_EVENT_KEYS.ARROW_RIGHT);
           const isDwArrow = table_globalEvents.hasKey(evnt, GLOBAL_EVENT_KEYS.ARROW_DOWN);
-          const isDel = table_globalEvents.hasKey(evnt, GLOBAL_EVENT_KEYS.DELETE);
+          const hasDeleteKey = table_globalEvents.hasKey(evnt, GLOBAL_EVENT_KEYS.DELETE);
           const isF2 = table_globalEvents.hasKey(evnt, GLOBAL_EVENT_KEYS.F2);
           const isContextMenu = table_globalEvents.hasKey(evnt, GLOBAL_EVENT_KEYS.CONTEXT_MENU);
           const hasMetaKey = evnt.metaKey;
@@ -13774,14 +13774,36 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
             } else if (actived.row || actived.column) {
               $xeTable.moveTabSelected(actived.args, hasShiftKey, evnt);
             }
-          } else if (keyboardConfig && isEnableConf(editConfig) && (isDel || (treeConfig && (rowOpts.isCurrent || highlightCurrentRow) && currentRow ? isBack && keyboardOpts.isArrow : isBack))) {
+          } else if (keyboardConfig && keyboardOpts.isDel && hasDeleteKey && isEnableConf(editConfig) && (selected.row || selected.column)) {
+            // 如果是删除键
+            if (!isEditStatus) {
+              const {
+                delMethod
+              } = keyboardOpts;
+              const delPaqrams = {
+                row: selected.row,
+                rowIndex: tableMethods.getRowIndex(selected.row),
+                column: selected.column,
+                columnIndex: tableMethods.getColumnIndex(selected.column),
+                $table: $xeTable
+              };
+              if (delMethod) {
+                delMethod(delPaqrams);
+              } else {
+                setCellValue(selected.row, selected.column, null);
+              }
+              // 如果按下 del 键，更新表尾数据
+              tableMethods.updateFooter();
+              $xeTable.dispatchEvent('cell-delete-value', delPaqrams, evnt);
+            }
+          } else if (hasBackspaceKey && keyboardConfig && keyboardOpts.isBack && isEnableConf(editConfig) && (selected.row || selected.column)) {
             if (!isEditStatus) {
               const {
                 delMethod,
                 backMethod
               } = keyboardOpts;
               // 如果是删除键
-              if (keyboardOpts.isDel && (selected.row || selected.column)) {
+              if (keyboardOpts.isDel && isEnableConf(editConfig) && (selected.row || selected.column)) {
                 const delPaqrams = {
                   row: selected.row,
                   rowIndex: tableMethods.getRowIndex(selected.row),
@@ -13794,42 +13816,37 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
                 } else {
                   setCellValue(selected.row, selected.column, null);
                 }
-                if (isBack) {
-                  if (backMethod) {
-                    backMethod({
-                      row: selected.row,
-                      rowIndex: tableMethods.getRowIndex(selected.row),
-                      column: selected.column,
-                      columnIndex: tableMethods.getColumnIndex(selected.column),
-                      $table: $xeTable
-                    });
-                  } else {
-                    $xeTable.handleActived(selected.args, evnt);
-                  }
-                } else if (isDel) {
-                  // 如果按下 del 键，更新表尾数据
-                  tableMethods.updateFooter();
-                }
-                $xeTable.dispatchEvent('cell-delete-value', delPaqrams, evnt);
-              } else if (isBack && keyboardOpts.isArrow && treeConfig && (rowOpts.isCurrent || highlightCurrentRow) && currentRow) {
-                // 如果树形表格回退键关闭当前行返回父节点
-                const {
-                  parent: parentRow
-                } = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().findTree(internalData.afterFullData, item => item === currentRow, {
-                  children: childrenField
-                });
-                if (parentRow) {
-                  evnt.preventDefault();
-                  params = {
-                    $table: $xeTable,
-                    row: parentRow,
-                    rowIndex: tableMethods.getRowIndex(parentRow),
-                    $rowIndex: tableMethods.getVMRowIndex(parentRow)
-                  };
-                  tableMethods.setTreeExpand(parentRow, false).then(() => tableMethods.scrollToRow(parentRow)).then(() => tablePrivateMethods.triggerCurrentRowEvent(evnt, params));
+                if (backMethod) {
+                  backMethod({
+                    row: selected.row,
+                    rowIndex: tableMethods.getRowIndex(selected.row),
+                    column: selected.column,
+                    columnIndex: tableMethods.getColumnIndex(selected.column),
+                    $table: $xeTable
+                  });
+                } else {
+                  $xeTable.handleActived(selected.args, evnt);
                 }
+                $xeTable.dispatchEvent('cell-backspace-value', delPaqrams, evnt);
               }
             }
+          } else if (hasBackspaceKey && keyboardConfig && treeConfig && keyboardOpts.isBack && (rowOpts.isCurrent || highlightCurrentRow) && currentRow) {
+            // 如果树形表格回退键关闭当前行返回父节点
+            const {
+              parent: parentRow
+            } = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().findTree(internalData.afterTreeFullData, item => item === currentRow, {
+              children: childrenField
+            });
+            if (parentRow) {
+              evnt.preventDefault();
+              params = {
+                $table: $xeTable,
+                row: parentRow,
+                rowIndex: tableMethods.getRowIndex(parentRow),
+                $rowIndex: tableMethods.getVMRowIndex(parentRow)
+              };
+              tableMethods.setTreeExpand(parentRow, false).then(() => tableMethods.scrollToRow(parentRow)).then(() => tablePrivateMethods.triggerCurrentRowEvent(evnt, params));
+            }
           } 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)) {
             const {
               editMethod