vxe-table 3.22.11 → 3.23.0-beta.0

package/es/table/src/methods.js

@@ -7634,8 +7634,8 @@ const tableMethods = {
         if (isEsc) {
             this.preventEvent(evnt, 'event.keydown', null, () => {
                 $xeTable.dispatchEvent('keydown-start', {}, evnt);
-                if (keyboardConfig && mouseConfig && mouseOpts.area && this.handleKeyboardCellAreaEvent) {
-                    this.handleKeyboardCellAreaEvent(evnt);
+                if (keyboardConfig && mouseConfig && mouseOpts.area && $xeTable.handleKdClAreaEvent) {
+                    $xeTable.handleKdClAreaEvent(evnt);
                 }
                 else if (actived.row || filterStore.visible || ctxMenuStore.visible) {
                     evnt.stopPropagation();
@@ -7691,6 +7691,7 @@ const tableMethods = {
                 const { isLastEnterAppendRow, beforeEnterMethod, enterMethod, isLastTabAppendRow, beforeTabMethod, tabMethod } = keyboardOpts;
                 const { selected, actived } = editStore;
                 const { keyCode } = evnt;
+                const isProcess = globalEvents.hasKey(evnt, GLOBAL_EVENT_KEYS.PROCESS);
                 const isEsc = globalEvents.hasKey(evnt, GLOBAL_EVENT_KEYS.ESCAPE);
                 const hasBackspaceKey = globalEvents.hasKey(evnt, GLOBAL_EVENT_KEYS.BACKSPACE);
                 const isTab = globalEvents.hasKey(evnt, GLOBAL_EVENT_KEYS.TAB);
@@ -7713,6 +7714,7 @@ const tableMethods = {
                 const isEditStatus = isEnableConf(editConfig) && actived.column && actived.row;
                 const childrenField = treeOpts.children || treeOpts.childrenField;
                 const beforeEditMethod = editOpts.beforeEditMethod || editOpts.activeMethod;
+                const selectRow = selected.row;
                 const selectColumn = selected.column;
                 if (operCtxMenu) {
                     // 如果配置了右键菜单; 支持方向键操作、回车
@@ -7724,8 +7726,8 @@ const tableMethods = {
                         $xeTable.moveCtxMenu(evnt, ctxMenuStore, 'selected', isRightArrow, true, menuList);
                     }
                 }
-                else if (keyboardConfig && mouseConfig && mouseOpts.area && $xeTable.handleKeyboardCellAreaEvent) {
-                    $xeTable.handleKeyboardCellAreaEvent(evnt);
+                else if (keyboardConfig && mouseConfig && mouseOpts.area && $xeTable.handleKdClAreaEvent) {
+                    $xeTable.handleKdClAreaEvent(evnt);
                 }
                 else if (isEsc) {
                     // 如果按下了 Esc 键，关闭快捷菜单、筛选
@@ -7745,7 +7747,7 @@ const tableMethods = {
                         }
                     }
                 }
-                else if (keyboardConfig && isSpacebar && keyboardOpts.isChecked && selected.row && selectColumn && (selectColumn.type === 'checkbox' || selectColumn.type === 'radio')) {
+                else if (keyboardConfig && isSpacebar && keyboardOpts.isChecked && selectRow && selectColumn && (selectColumn.type === 'checkbox' || selectColumn.type === 'radio')) {
                     // 空格键支持选中复选框
                     evnt.preventDefault();
                     if (selectColumn.type === 'checkbox') {
@@ -7758,7 +7760,7 @@ const tableMethods = {
                 else if (isF2 && isEnableConf(editConfig)) {
                     if (!isEditStatus) {
                         // 如果按下了 F2 键
-                        if (selected.row && selectColumn) {
+                        if (selectRow && selectColumn) {
                             evnt.preventDefault();
                             $xeTable.handleEdit(selected.args, evnt);
                         }
@@ -7766,13 +7768,13 @@ const tableMethods = {
                 }
                 else if (isContextMenu) {
                     // 如果按下上下文键
-                    internalData._keyCtx = selected.row && selectColumn && bodyMenu.length;
+                    internalData._keyCtx = selectRow && selectColumn && bodyMenu.length;
                     clearTimeout(internalData.keyCtxTimeout);
                     internalData.keyCtxTimeout = setTimeout(() => {
                         internalData._keyCtx = false;
                     }, 1000);
                 }
-                else if (isEnter && !hasAltKey && keyboardConfig && keyboardOpts.isEnter && (selected.row || actived.row || (treeConfig && (rowOpts.isCurrent || highlightCurrentRow) && currentRow))) {
+                else if (isEnter && !hasAltKey && keyboardConfig && keyboardOpts.isEnter && (selectRow || actived.row || (treeConfig && (rowOpts.isCurrent || highlightCurrentRow) && currentRow))) {
                     // 退出选中
                     if (isControlKey) {
                         // 如果是激活编辑状态，则取消编辑
@@ -7787,11 +7789,11 @@ const tableMethods = {
                     }
                     else {
                         // 如果是激活状态，退则出到上一行/下一行
-                        if (selected.row || actived.row) {
-                            const activeRow = selected.row || actived.row;
+                        if (selectRow || actived.row) {
+                            const activeRow = selectRow || actived.row;
                             const activeColumn = selectColumn || actived.column;
                             if (activeColumn) {
-                                const activeParams = selected.row ? selected.args : actived.args;
+                                const activeParams = selectRow ? selected.args : actived.args;
                                 if (hasShiftKey) {
                                     if (keyboardOpts.enterToTab) {
                                         $xeTable.moveTabSelected(activeParams, hasShiftKey, evnt);
@@ -7901,7 +7903,7 @@ const tableMethods = {
                 else if (operArrow && keyboardConfig && keyboardOpts.isArrow) {
                     if (!isEditStatus) {
                         // 如果按下了方向键
-                        if (mouseOpts.selected && selected.row && selectColumn) {
+                        if (mouseOpts.selected && selectRow && selectColumn) {
                             $xeTable.moveArrowSelected(selected.args, isLeftArrow, isUpArrow, isRightArrow, isDwArrow, evnt);
                         }
                         else {
@@ -7918,11 +7920,11 @@ const tableMethods = {
                 }
                 else if (isTab && keyboardConfig && keyboardOpts.isTab) {
                     // 如果按下了 Tab 键切换
-                    if (selected.row || actived.row) {
-                        const activeRow = selected.row || actived.row;
+                    if (selectRow || actived.row) {
+                        const activeRow = selectRow || actived.row;
                         const activeColumn = selectColumn || actived.column;
                         if (activeColumn) {
-                            const activeParams = selected.row ? selected.args : actived.args;
+                            const activeParams = selectRow ? selected.args : actived.args;
                             const _rowIndex = $xeTable.getVTRowIndex(activeRow);
                             const _columnIndex = $xeTable.getVTColumnIndex(activeColumn);
                             const ttrParams = {
@@ -7966,13 +7968,13 @@ const tableMethods = {
                         }
                     }
                 }
-                else if (keyboardConfig && keyboardOpts.isDel && hasDeleteKey && isEnableConf(editConfig) && (selected.row || selectColumn)) {
+                else if (keyboardConfig && keyboardOpts.isDel && hasDeleteKey && isEnableConf(editConfig) && (selectRow || selectColumn)) {
                     // 如果是删除键
                     if (!isEditStatus) {
                         const { delMethod } = keyboardOpts;
                         const params = {
-                            row: selected.row,
-                            rowIndex: $xeTable.getRowIndex(selected.row),
+                            row: selectRow,
+                            rowIndex: $xeTable.getRowIndex(selectRow),
                             column: selectColumn,
                             columnIndex: $xeTable.getColumnIndex(selectColumn),
                             $table: $xeTable,
@@ -7985,10 +7987,10 @@ const tableMethods = {
                                 delMethod(params);
                             }
                             else {
-                                const selectCellValue = getCellValue(selected.row, selectColumn);
+                                const selectCellValue = getCellValue(selectRow, selectColumn);
                                 if (selectCellValue !== null) {
                                     $xeTable.handlePushStack();
-                                    setCellValue(selected.row, selectColumn, null);
+                                    setCellValue(selectRow, selectColumn, null);
                                 }
                             }
                             // 如果按下 del 键，更新表尾数据
@@ -7997,16 +7999,20 @@ const tableMethods = {
                         }
                     }
                 }
-                else if (hasBackspaceKey && keyboardConfig && keyboardOpts.isBack && isEnableConf(editConfig) && (selected.row || selectColumn)) {
+                else if (hasBackspaceKey && keyboardConfig && keyboardOpts.isBack && isEnableConf(editConfig) && (selectRow || selectColumn)) {
                     if (!isEditStatus) {
                         const { backMethod } = keyboardOpts;
                         // 如果是删除键
-                        if (keyboardOpts.isDel && isEnableConf(editConfig) && (selected.row || selectColumn)) {
+                        if (keyboardOpts.isDel && isEnableConf(editConfig) && (selectRow || selectColumn)) {
                             const params = {
-                                row: selected.row,
-                                rowIndex: $xeTable.getRowIndex(selected.row),
+                                row: selectRow,
+                                rowIndex: $xeTable.getRowIndex(selectRow),
+                                $rowIndex: $xeTable.getVMRowIndex(selectRow),
+                                _rowIndex: $xeTable.getVTRowIndex(selectRow),
                                 column: selectColumn,
                                 columnIndex: $xeTable.getColumnIndex(selectColumn),
+                                $columnIndex: $xeTable.getVMColumnIndex(selectColumn),
+                                _columnIndex: $xeTable.getVTColumnIndex(selectColumn),
                                 $table: $xeTable,
                                 $grid: $xeGrid,
                                 $gantt: $xeGantt
@@ -8056,20 +8062,24 @@ const tableMethods = {
                         $xeTable.handleUndoStackEvent(evnt);
                     }
                 }
-                else if (keyboardConfig && keyboardOpts.isEdit && !isControlKey && (isSpacebar || (keyCode >= 48 && keyCode <= 57) || (keyCode >= 65 && keyCode <= 90) || (keyCode >= 96 && keyCode <= 111) || (keyCode >= 186 && keyCode <= 192) || (keyCode >= 219 && keyCode <= 222))) {
+                else if (keyboardConfig && keyboardOpts.isEdit && !isControlKey && (isSpacebar || isProcess || (keyCode >= 48 && keyCode <= 57) || (keyCode >= 65 && keyCode <= 90) || (keyCode >= 96 && keyCode <= 111) || (keyCode >= 186 && keyCode <= 192) || (keyCode >= 219 && keyCode <= 222))) {
                     const { editMode, editMethod } = keyboardOpts;
                     // 启用编辑后，空格键功能将失效
                     // if (isSpacebar) {
                     //   evnt.preventDefault()
                     // }
                     // 如果是按下非功能键之外允许直接编辑
-                    if (selectColumn && selected.row && isEnableConf(selectColumn.editRender)) {
+                    if (selectColumn && selectRow && isEnableConf(selectColumn.editRender)) {
                         const beforeEditMethod = editOpts.beforeEditMethod || editOpts.activeMethod;
                         const params = {
-                            row: selected.row,
-                            rowIndex: $xeTable.getRowIndex(selected.row),
+                            row: selectRow,
+                            rowIndex: $xeTable.getRowIndex(selectRow),
+                            $rowIndex: $xeTable.getVMRowIndex(selectRow),
+                            _rowIndex: $xeTable.getVTRowIndex(selectRow),
                             column: selectColumn,
                             columnIndex: $xeTable.getColumnIndex(selectColumn),
+                            $columnIndex: $xeTable.getVMColumnIndex(selectColumn),
+                            _columnIndex: $xeTable.getVTColumnIndex(selectColumn),
                             $table: $xeTable,
                             $grid: $xeGrid,
                             $gantt: $xeGantt

package/es/table/src/table.js

@@ -1697,7 +1697,7 @@ export default {
         if (rowOpts.height && !this.showOverflow) {
             warnLog('vxe.error.notProp', ['table.show-overflow']);
         }
-        if (!$xeTable.triggerCelllAreaMnEvent) {
+        if (!$xeTable.triggerClAreaMnEvent) {
             if (props.areaConfig) {
                 warnLog('vxe.error.notProp', ['area-config']);
             }

package/es/table/style.css

@@ -4011,6 +4011,15 @@
 .vxe-table--render-default.vxe-editable .vxe-body--column {
   padding: 0;
 }
+.vxe-table--render-default .vxe-body--row .vxe-table--column .vxe-cell .vxe-cell--wrapper > .vxe-reusekeep-control {
+  position: absolute;
+  width: 0;
+  height: 0;
+  opacity: 0;
+  border: 0;
+  padding: 0;
+  outline: none;
+}
 
 /*valid error*/
 div.vxe-table--tooltip-wrapper.vxe-table--valid-error {