vxe-table 4.20.12 → 4.21.0-beta.0

package/dist/all.esm.js

@@ -44,7 +44,7 @@ function eqEmptyValue(cellValue) {
     return cellValue === '' || XEUtils.eqNull(cellValue);
 }
 
-const version = "4.20.12";
+const version = "4.21.0-beta.0";
 VxeUI.version = version;
 VxeUI.tableVersion = version;
 VxeUI.setConfig({
@@ -242,9 +242,11 @@ VxeUI.setConfig({
         },
         editConfig: {
             // mode: 'cell',
+            // cache: true,
             showIcon: true,
             showAsterisk: true,
-            autoFocus: true
+            autoFocus: true,
+            isReuseKeep: true
         },
         importConfig: {
             _typeMaps: {
@@ -758,7 +760,7 @@ function wheelScrollTopTo(diffNum, cb) {
 }
 
 const { log } = VxeUI;
-const tableVersion = `table v${"4.20.12"}`;
+const tableVersion = `table v${"4.21.0-beta.0"}`;
 function createComponentLog(name) {
     const uiVersion = VxeUI.uiVersion ? `ui v${VxeUI.uiVersion}` : '';
     const ganttVersion = VxeUI.ganttVersion ? `gantt v${VxeUI.ganttVersion}` : '';
@@ -2344,7 +2346,11 @@ function renderHeaderHandle(params) {
     const { column, $table } = params;
     const tableProps = $table.props;
     const { editConfig } = tableProps;
-    const { type, filters, sortable, editRender } = column;
+    const { type, filters, sortable, editRender, slots } = column;
+    const headerSlot = slots ? slots.header : null;
+    if (headerSlot) {
+        return renderTitleContent(params, $table.callSlot(headerSlot, params));
+    }
     switch (type) {
         case 'seq':
             return Cell.renderSeqHeader(params);
@@ -2403,11 +2409,7 @@ const Cell = {
         const { $table, column } = params;
         const tableProps = $table.props;
         const { editConfig } = tableProps;
-        const { slots, editRender, cellRender } = column;
-        const headerSlot = slots ? slots.header : null;
-        if (headerSlot) {
-            return renderTitleContent(params, $table.callSlot(headerSlot, params));
-        }
+        const { editRender, cellRender } = column;
         const isEnableEdit = editConfig && isEnableConf(editConfig);
         const editRenderOpts = isEnableEdit && isEnableConf(editRender) ? editRender : null;
         const cellRenderOpts = isEnableConf(cellRender) ? cellRender : null;
@@ -2680,9 +2682,7 @@ const Cell = {
      */
     renderSeqHeader(params) {
         const { $table, column } = params;
-        const { slots } = column;
-        const headerSlot = slots ? slots.header : null;
-        return renderHeaderCellBaseVNs(params, renderTitleContent(params, headerSlot ? $table.callSlot(headerSlot, params) : $table.getHeaderCellLabel(column)));
+        return renderHeaderCellBaseVNs(params, renderTitleContent(params, $table.getHeaderCellLabel(column)));
     },
     renderSeqCell(params) {
         const { $table, column } = params;
@@ -2710,15 +2710,12 @@ const Cell = {
     renderRadioHeader(params) {
         const { $table, column } = params;
         const { slots } = column;
-        const headerSlot = slots ? slots.header : null;
         const titleSlot = slots ? slots.title : null;
-        return renderHeaderCellBaseVNs(params, renderTitleContent(params, headerSlot
-            ? $table.callSlot(headerSlot, params)
-            : [
-                h('span', {
-                    class: 'vxe-radio--label'
-                }, titleSlot ? $table.callSlot(titleSlot, params) : $table.getHeaderCellLabel(column))
-            ]));
+        return renderHeaderCellBaseVNs(params, renderTitleContent(params, [
+            h('span', {
+                class: 'vxe-radio--label'
+            }, titleSlot ? $table.callSlot(titleSlot, params) : $table.getHeaderCellLabel(column))
+        ]));
     },
     renderRadioCell(params) {
         const { $table, column, isHidden } = params;
@@ -2782,7 +2779,6 @@ const Cell = {
         const { isAllSelected: isAllCheckboxSelected, isIndeterminate: isAllCheckboxIndeterminate } = tableReactData;
         const isAllCheckboxDisabled = computeIsAllCheckboxDisabled.value;
         const { slots } = column;
-        const headerSlot = slots ? slots.header : null;
         const titleSlot = slots ? slots.title : null;
         const checkboxOpts = computeCheckboxOpts.value;
         const { checkStrictly, showHeader, headerTitle } = checkboxOpts;
@@ -2796,9 +2792,6 @@ const Cell = {
             };
         }
         const checkboxParams = Object.assign(Object.assign({}, params), { checked: isAllCheckboxSelected, disabled: isAllCheckboxDisabled, indeterminate: isAllCheckboxIndeterminate });
-        if (headerSlot) {
-            return renderHeaderCellBaseVNs(params, renderTitleContent(checkboxParams, $table.callSlot(headerSlot, checkboxParams)));
-        }
         if (checkStrictly ? !showHeader : showHeader === false) {
             return renderHeaderCellBaseVNs(params, renderTitleContent(checkboxParams, [
                 h('span', {
@@ -9778,14 +9771,14 @@ hooks$5.add('tableEditModule', {
             const { isFocus, isPos, isClear } = options;
             const cell = (params.cell || $xeTable.getCellElement(row, column));
             const beforeEditMethod = editOpts.beforeEditMethod || editOpts.activeMethod;
-            params.cell = cell;
+            const editParams = Object.assign(Object.assign({}, params), { cell });
             if (cell && isEnableConf(editConfig) && isEnableConf(editRender)) {
                 // 激活编辑
                 if (!$xeTable.isPendingByRow(row) && !$xeTable.isAggregateRecord(row)) {
                     if (actived.row !== row || (mode === 'cell' ? actived.column !== column : false)) {
                         // 判断是否禁用编辑
                         let type = 'edit-disabled';
-                        if (!beforeEditMethod || beforeEditMethod(Object.assign(Object.assign({}, params), { $table: $xeTable, $grid: $xeGrid, $gantt: $xeGantt }))) {
+                        if (!beforeEditMethod || beforeEditMethod(Object.assign(Object.assign({}, editParams), { $table: $xeTable, $grid: $xeGrid, $gantt: $xeGantt }))) {
                             if (mouseConfig) {
                                 $xeTable.clearSelected();
                                 if ($xeTable.clearCellAreas) {
@@ -9799,7 +9792,7 @@ hooks$5.add('tableEditModule', {
                             }
                             type = 'edit-activated';
                             column.renderHeight = cell.offsetHeight;
-                            actived.args = params;
+                            actived.args = editParams;
                             actived.row = row;
                             actived.column = column;
                             $xeTable.handlePushStack();
@@ -9815,10 +9808,10 @@ hooks$5.add('tableEditModule', {
                             const afterEditMethod = editOpts.afterEditMethod;
                             nextTick(() => {
                                 if (isFocus) {
-                                    $xeTable.handleFocus(params, evnt);
+                                    $xeTable.handleFocus(editParams, evnt);
                                 }
                                 if (afterEditMethod) {
-                                    afterEditMethod(Object.assign(Object.assign({}, params), { $table: $xeTable, $grid: $xeGrid, $gantt: $xeGantt }));
+                                    afterEditMethod(Object.assign(Object.assign({}, editParams), { $table: $xeTable, $grid: $xeGrid, $gantt: $xeGantt }));
                                 }
                             });
                         }
@@ -9861,11 +9854,11 @@ hooks$5.add('tableEditModule', {
                             }
                         }
                         column.renderHeight = cell.offsetHeight;
-                        actived.args = params;
+                        actived.args = editParams;
                         actived.column = column;
                         if (isPos) {
                             setTimeout(() => {
-                                $xeTable.handleFocus(params, evnt);
+                                $xeTable.handleFocus(editParams, evnt);
                             });
                         }
                     }
@@ -9887,8 +9880,12 @@ hooks$5.add('tableEditModule', {
                         handleEditActive({
                             row,
                             rowIndex: $xeTable.getRowIndex(row),
+                            $rowIndex: $xeTable.getVMRowIndex(row),
+                            _rowIndex: $xeTable.getVTRowIndex(row),
                             column,
                             columnIndex: $xeTable.getColumnIndex(column),
+                            $columnIndex: $xeTable.getVMColumnIndex(column),
+                            _columnIndex: $xeTable.getVTColumnIndex(column),
                             cell,
                             $table: $xeTable
                         }, null, {
@@ -10298,18 +10295,62 @@ hooks$5.add('tableEditModule', {
                     if (rowIndex > -1 && column) {
                         const cell = $xeTable.getCellElement(row, column);
                         const params = {
+                            $table: $xeTable,
                             row,
                             rowIndex,
+                            $rowIndex: $xeTable.getVMRowIndex(row),
+                            _rowIndex: $xeTable.getVTRowIndex(row),
                             column,
                             columnIndex: $xeTable.getColumnIndex(column),
+                            $columnIndex: $xeTable.getVMColumnIndex(column),
+                            _columnIndex: $xeTable.getVTColumnIndex(column),
                             cell
                         };
-                        $xeTable.handleSelected(params, {});
+                        $xeTable.handleSelected(params, null);
                     }
                 }
                 return nextTick();
             }
         };
+        const handleCellFocus = (cell, params) => {
+            const { editConfig } = props;
+            const { column } = params;
+            const { editRender } = column;
+            const editOpts = computeEditOpts.value;
+            if (editConfig && isEnableConf(editRender)) {
+                const compRender = renderer$4.get(editRender.name);
+                let autoFocus = editRender.autofocus || editRender.autoFocus;
+                let autoSelect = editRender.autoSelect || editRender.autoselect;
+                let inputElem = null;
+                // 是否启用聚焦
+                if (editOpts.autoFocus) {
+                    if (!autoFocus && compRender) {
+                        autoFocus = compRender.tableAutoFocus || compRender.tableAutofocus || compRender.autofocus;
+                    }
+                    if (!autoSelect && compRender) {
+                        autoSelect = compRender.tableAutoSelect || compRender.autoselect;
+                    }
+                    // 如果指定了聚焦 class
+                    if (XEUtils.isFunction(autoFocus)) {
+                        inputElem = autoFocus(params);
+                    }
+                    else if (autoFocus) {
+                        if (autoFocus === true) {
+                            // 自动匹配模式，会自动匹配第一个可输入元素
+                            inputElem = cell.querySelector('input,textarea');
+                        }
+                        else {
+                            inputElem = cell.querySelector(autoFocus);
+                        }
+                        if (inputElem) {
+                            inputElem.focus();
+                        }
+                    }
+                }
+                return inputElem;
+            }
+            return null;
+        };
         editPrivateMethods = {
             /**
              * 处理激活编辑
@@ -10332,6 +10373,7 @@ hooks$5.add('tableEditModule', {
              * @returns
              */
             handleClearEdit,
+            handleCellFocus,
             /**
              * 处理聚焦
              */
@@ -10340,35 +10382,8 @@ hooks$5.add('tableEditModule', {
                 const { editRender } = column;
                 const editOpts = computeEditOpts.value;
                 if (isEnableConf(editRender)) {
-                    const compRender = renderer$4.get(editRender.name);
-                    let autoFocus = editRender.autofocus || editRender.autoFocus;
-                    let autoSelect = editRender.autoSelect || editRender.autoselect;
-                    let inputElem;
-                    // 是否启用聚焦
-                    if (editOpts.autoFocus) {
-                        if (!autoFocus && compRender) {
-                            autoFocus = compRender.tableAutoFocus || compRender.tableAutofocus || compRender.autofocus;
-                        }
-                        if (!autoSelect && compRender) {
-                            autoSelect = compRender.tableAutoSelect || compRender.autoselect;
-                        }
-                        // 如果指定了聚焦 class
-                        if (XEUtils.isFunction(autoFocus)) {
-                            inputElem = autoFocus(params);
-                        }
-                        else if (autoFocus) {
-                            if (autoFocus === true) {
-                                // 自动匹配模式，会自动匹配第一个可输入元素
-                                inputElem = cell.querySelector('input,textarea');
-                            }
-                            else {
-                                inputElem = cell.querySelector(autoFocus);
-                            }
-                            if (inputElem) {
-                                inputElem.focus();
-                            }
-                        }
-                    }
+                    const autoSelect = editRender.autoSelect || editRender.autoselect;
+                    const inputElem = handleCellFocus(cell, params);
                     if (inputElem) {
                         if (autoSelect) {
                             inputElem.select();
@@ -10397,7 +10412,7 @@ hooks$5.add('tableEditModule', {
              * 处理选中源
              */
             handleSelected(params, evnt) {
-                const { mouseConfig } = props;
+                const { mouseConfig, editConfig } = props;
                 const { editStore } = reactData;
                 const mouseOpts = computeMouseOpts.value;
                 const editOpts = computeEditOpts.value;
@@ -10420,6 +10435,18 @@ hooks$5.add('tableEditModule', {
                                 editPrivateMethods.addCellSelectedClass();
                             }
                             $xeTable.focus();
+                            // 如果是支持可复用控件
+                            if (editConfig && editOpts.isReuseKeep && isEnableConf(editOpts) && isEnableConf(column.editRender)) {
+                                setTimeout(() => {
+                                    const cell = $xeTable.getCellElement(row, column);
+                                    if (cell) {
+                                        const hasReusekeep = cell.querySelector('.vxe-reusekeep-control');
+                                        if (hasReusekeep) {
+                                            handleCellFocus(cell, params);
+                                        }
+                                    }
+                                }, 0);
+                            }
                             if (evnt) {
                                 $xeTable.dispatchEvent('cell-selected', params, evnt);
                             }
@@ -12616,8 +12643,8 @@ hooks$3.add('tableKeyboardModule', {
             const checkboxOpts = computeCheckboxOpts.value;
             const mouseOpts = computeMouseOpts.value;
             const editOpts = computeEditOpts.value;
-            if (mouseConfig && mouseOpts.area && $xeTable.triggerCelllAreaMnEvent) {
-                return $xeTable.triggerCelllAreaMnEvent(evnt, params);
+            if (mouseConfig && mouseOpts.area && $xeTable.triggerClAreaMnEvent) {
+                return $xeTable.triggerClAreaMnEvent(evnt, params);
             }
             else {
                 if (checkboxConfig && checkboxOpts.range) {
@@ -14032,6 +14059,7 @@ function getCellLabelVNs(renderOpts, params, cellLabel, opts) {
     const { placeholder } = renderOpts;
     return [
         h('span', {
+            key: 1,
             class: ['vxe-cell--label', opts ? opts.class : '']
         }, placeholder && isEmptyValue(cellLabel)
             ? [
@@ -14297,16 +14325,26 @@ function getNativeFilterOns(renderOpts, params, option) {
         }
     });
 }
+function nativeInputCellRender(renderOpts, renderParams) {
+    const { row, column } = renderParams;
+    const cellValue = XEUtils.get(row, column.field);
+    const cellVNs = [
+        h('span', {
+            key: 1
+        }, cellValue)
+    ];
+    return getNativeInputRenderCellVNs(cellValue, cellVNs, renderOpts, renderParams);
+}
 /**
  * 单元格可编辑渲染-原生的标签
- * input、textarea、select
+ * input、textarea
  */
-function nativeEditRender(renderOpts, params) {
-    const { row, column } = params;
+function nativeInputEditRender(renderOpts, renderParams) {
+    const { row, column } = renderParams;
     const { name } = renderOpts;
-    const cellValue = isImmediateCell(renderOpts, params) ? getCellValue(row, column) : column.model.value;
+    const cellValue = isImmediateCell(renderOpts, renderParams) ? getCellValue(row, column) : column.model.value;
     return [
-        h(`${name}`, Object.assign(Object.assign(Object.assign({ class: `vxe-default-${name}` }, getNativeAttrs(renderOpts)), { value: cellValue }), getNativeEditOns(renderOpts, params)))
+        h('' + name, Object.assign(Object.assign(Object.assign({ key: 2, class: `vxe-default-${name}` }, getNativeAttrs(renderOpts)), { value: cellValue }), getNativeEditOns(renderOpts, renderParams)))
     ];
 }
 function buttonCellRender(renderOpts, params) {
@@ -14314,6 +14352,13 @@ function buttonCellRender(renderOpts, params) {
         h(getDefaultComponent(renderOpts), Object.assign(Object.assign({}, getCellEditProps(renderOpts, params, null)), getComponentOns(renderOpts, params)))
     ];
 }
+function defaultInputEditRender(renderOpts, params) {
+    const { row, column } = params;
+    const cellValue = getCellValue(row, column);
+    return [
+        h(getDefaultComponent(renderOpts), Object.assign(Object.assign({ key: 2 }, getCellEditProps(renderOpts, params, cellValue)), getEditOns(renderOpts, params)))
+    ];
+}
 function defaultEditRender(renderOpts, params) {
     const { row, column } = params;
     const cellValue = getCellValue(row, column);
@@ -14555,11 +14600,9 @@ function handleExportTreeSelectMethod(params) {
     const { row, column, options } = params;
     return options.original ? getCellValue(row, column) : getTreeSelectCellValue(column.editRender || column.cellRender, params);
 }
-function handleNumberCell(renderOpts, params) {
+function handleNumberCell(cellValue, renderOpts, params) {
     const { props = {}, showNegativeStatus } = renderOpts;
-    const { row, column } = params;
     const { type } = props;
-    let cellValue = XEUtils.get(row, column.field);
     let isNegative = false;
     if (!isEmptyValue(cellValue)) {
         const numberInputConfig = getConfig$3().numberInput || {};
@@ -14710,21 +14753,79 @@ function handleSetTreeSelectValue(renderOpts, params) {
         XEUtils.set(row, field, cellValue);
     }
 }
+function getNativeInputRenderCellVNs(cellValue, labelVNs, renderOpts, renderParams) {
+    const { $table, row, column } = renderParams;
+    const { name } = renderOpts;
+    const tableProps = $table.props;
+    const { editConfig, mouseConfig } = tableProps;
+    let isColSelected = false;
+    let isActiveCellArea = false;
+    if (editConfig && mouseConfig) {
+        const tableReactData = $table.reactData;
+        const { editStore } = tableReactData;
+        const { selected } = editStore;
+        isColSelected = row === selected.row && column === selected.column;
+        if ($table.getActiveCellArea) {
+            const activeCellArea = $table.getActiveCellArea();
+            if (activeCellArea) {
+                isActiveCellArea = row === activeCellArea.row && column === activeCellArea.column;
+            }
+        }
+    }
+    const cellVNs = labelVNs;
+    if (isActiveCellArea || isColSelected) {
+        cellVNs.push(h('' + name, Object.assign(Object.assign({ key: 2, class: `vxe-default-${name} vxe-reusekeep-control`, value: cellValue }, getNativeAttrs(renderOpts)), getNativeEditOns(renderOpts, renderParams))));
+    }
+    return cellVNs;
+}
+function getInputRenderCellVNs(cellValue, labelVNs, renderOpts, renderParams) {
+    const { $table, row, column } = renderParams;
+    const tableProps = $table.props;
+    const { editConfig, mouseConfig } = tableProps;
+    let isColSelected = false;
+    let isActiveCellArea = false;
+    if (editConfig && mouseConfig) {
+        const tableReactData = $table.reactData;
+        const { editStore } = tableReactData;
+        const { computeEditOpts } = $table.getComputeMaps();
+        const editOpts = computeEditOpts.value;
+        if (editOpts.isReuseKeep) {
+            const { selected } = editStore;
+            isColSelected = row === selected.row && column === selected.column;
+            if ($table.getActiveCellArea) {
+                const activeCellArea = $table.getActiveCellArea();
+                if (activeCellArea) {
+                    isActiveCellArea = row === activeCellArea.row && column === activeCellArea.column;
+                }
+            }
+        }
+    }
+    const cellVNs = labelVNs;
+    if (isActiveCellArea || isColSelected) {
+        const compProps = getCellEditProps(renderOpts, renderParams, cellValue);
+        const { className, inputClassName } = compProps;
+        cellVNs.push(h(getDefaultComponent(renderOpts), Object.assign(Object.assign(Object.assign({ key: 2 }, compProps), { className: 'vxe-reusekeep-control' + (className ? (' ' + className) : ''), inputClassName: 'vxe-reusekeep-control' + (inputClassName ? (' ' + inputClassName) : '') }), getEditOns(renderOpts, renderParams))));
+    }
+    return cellVNs;
+}
 /**
  * 表格 - 渲染器
  */
 renderer$2.mixin({
     input: {
         tableAutoFocus: true,
-        renderTableEdit: nativeEditRender,
-        renderTableDefault: nativeEditRender,
+        renderTableEdit: nativeInputEditRender,
+        renderTableCell: nativeInputCellRender,
+        renderTableDefault: nativeInputEditRender,
         createTableFilterOptions: defaultFilterOptions,
         renderTableFilter: nativeFilterRender,
         tableFilterDefaultMethod: handleInputFilterMethod
     },
     textarea: {
         tableAutoFocus: true,
-        renderTableEdit: nativeEditRender
+        renderTableEdit: nativeInputEditRender,
+        renderTableCell: nativeInputCellRender,
+        renderTableDefault: nativeInputEditRender
     },
     select: {
         renderTableEdit: nativeSelectEditRender,
@@ -14764,10 +14865,10 @@ renderer$2.mixin({
     },
     VxeInput: {
         tableAutoFocus: true,
-        renderTableEdit: defaultEditRender,
-        renderTableCell(renderOpts, params) {
+        renderTableEdit: defaultInputEditRender,
+        renderTableCell(renderOpts, renderParams) {
             const { props = {} } = renderOpts;
-            const { row, column } = params;
+            const { row, column } = renderParams;
             const inputConfig = getConfig$3().input || {};
             const digits = props.digits || inputConfig.digits || 2;
             let cellValue = XEUtils.get(row, column.field);
@@ -14785,16 +14886,21 @@ renderer$2.mixin({
                         break;
                 }
             }
-            return getCellLabelVNs(renderOpts, params, cellValue);
+            const cellVNs = getCellLabelVNs(renderOpts, renderParams, cellValue);
+            return getInputRenderCellVNs(cellValue, cellVNs, renderOpts, renderParams);
         },
-        renderTableDefault: defaultEditRender,
+        renderTableDefault: defaultInputEditRender,
         createTableFilterOptions: defaultFilterOptions,
         renderTableFilter: defaultFilterRender,
         renderTableFloatingFilter: defaultFloatingFilterRender,
         tableFilterDefaultMethod: handleInputFilterMethod
     },
     FormatNumberInput: {
-        renderTableDefault: handleNumberCell,
+        renderTableDefault(renderOpts, renderParams) {
+            const { row, column } = renderParams;
+            const cellValue = XEUtils.get(row, column.field);
+            return handleNumberCell(cellValue, renderOpts, renderParams);
+        },
         tableFilterDefaultMethod({ option, row, column }) {
             const { data } = option;
             const cellValue = XEUtils.get(row, column.field);
@@ -14809,8 +14915,13 @@ renderer$2.mixin({
     },
     VxeNumberInput: {
         tableAutoFocus: true,
-        renderTableEdit: defaultEditRender,
-        renderTableCell: handleNumberCell,
+        renderTableEdit: defaultInputEditRender,
+        renderTableCell(renderOpts, renderParams) {
+            const { row, column } = renderParams;
+            const cellValue = XEUtils.get(row, column.field);
+            const cellVNs = handleNumberCell(cellValue, renderOpts, renderParams);
+            return getInputRenderCellVNs(cellValue, cellVNs, renderOpts, renderParams);
+        },
         renderTableFooter(renderOpts, params) {
             const { props = {} } = renderOpts;
             const { row, column, _columnIndex } = params;
@@ -14848,7 +14959,7 @@ renderer$2.mixin({
             }
             return getFuncText(itemValue, 1);
         },
-        renderTableDefault: defaultEditRender,
+        renderTableDefault: defaultInputEditRender,
         createTableFilterOptions: defaultFilterOptions,
         renderTableFilter: defaultFilterRender,
         renderTableFloatingFilter: defaultFloatingFilterRender,
@@ -14992,13 +15103,14 @@ renderer$2.mixin({
     },
     VxeTextarea: {
         tableAutoFocus: true,
-        renderTableDefault: defaultEditRender,
-        renderTableEdit: defaultEditRender,
-        renderTableCell(renderOpts, params) {
-            const { row, column } = params;
+        renderTableDefault: defaultInputEditRender,
+        renderTableCell(renderOpts, renderParams) {
+            const { row, column } = renderParams;
             const cellValue = XEUtils.get(row, column.field);
-            return getCellLabelVNs(renderOpts, params, cellValue);
-        }
+            const cellVNs = getCellLabelVNs(renderOpts, renderParams, cellValue);
+            return getInputRenderCellVNs(cellValue, cellVNs, renderOpts, renderParams);
+        },
+        renderTableEdit: defaultInputEditRender
     },
     VxeButton: {
         renderTableDefault: buttonCellRender
@@ -23773,8 +23885,8 @@ var VxeTableComponent = defineVxeComponent({
             if (isEsc) {
                 $xeTable.preventEvent(evnt, 'event.keydown', null, () => {
                     dispatchEvent('keydown-start', {}, evnt);
-                    if (keyboardConfig && mouseConfig && mouseOpts.area && $xeTable.handleKeyboardCellAreaEvent) {
-                        $xeTable.handleKeyboardCellAreaEvent(evnt);
+                    if (keyboardConfig && mouseConfig && mouseOpts.area && $xeTable.handleKdClAreaEvent) {
+                        $xeTable.handleKdClAreaEvent(evnt);
                     }
                     else if (actived.row || filterStore.visible || ctxMenuStore.visible) {
                         evnt.stopPropagation();
@@ -23826,6 +23938,7 @@ var VxeTableComponent = defineVxeComponent({
                     const { selected, actived } = editStore;
                     const childrenField = treeOpts.children || treeOpts.childrenField;
                     const keyCode = evnt.keyCode;
+                    const isProcess = globalEvents$1.hasKey(evnt, GLOBAL_EVENT_KEYS$1.PROCESS);
                     const isEsc = globalEvents$1.hasKey(evnt, GLOBAL_EVENT_KEYS$1.ESCAPE);
                     const hasBackspaceKey = globalEvents$1.hasKey(evnt, GLOBAL_EVENT_KEYS$1.BACKSPACE);
                     const isTab = globalEvents$1.hasKey(evnt, GLOBAL_EVENT_KEYS$1.TAB);
@@ -23847,6 +23960,7 @@ var VxeTableComponent = defineVxeComponent({
                     const operCtxMenu = isContentMenu && ctxMenuStore.visible && (isEnter || isSpacebar || operArrow);
                     const isEditStatus = isEnableConf(editConfig) && actived.column && actived.row;
                     const beforeEditMethod = editOpts.beforeEditMethod || editOpts.activeMethod;
+                    const selectRow = selected.row;
                     const selectColumn = selected.column;
                     if (operCtxMenu) {
                         // 如果配置了右键菜单; 支持方向键操作、回车
@@ -23858,8 +23972,8 @@ var VxeTableComponent = defineVxeComponent({
                             $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 键，关闭快捷菜单、筛选
@@ -23879,7 +23993,7 @@ var VxeTableComponent = defineVxeComponent({
                             }
                         }
                     }
-                    else if (isSpacebar && keyboardConfig && keyboardOpts.isChecked && selected.row && selectColumn && (selectColumn.type === 'checkbox' || selectColumn.type === 'radio')) {
+                    else if (isSpacebar && keyboardConfig && keyboardOpts.isChecked && selectRow && selectColumn && (selectColumn.type === 'checkbox' || selectColumn.type === 'radio')) {
                         // 空格键支持选中复选框
                         evnt.preventDefault();
                         if (selectColumn.type === 'checkbox') {
@@ -23892,7 +24006,7 @@ var VxeTableComponent = defineVxeComponent({
                     else if (isF2 && isEnableConf(editConfig)) {
                         if (!isEditStatus) {
                             // 如果按下了 F2 键
-                            if (selected.row && selectColumn) {
+                            if (selectRow && selectColumn) {
                                 evnt.preventDefault();
                                 $xeTable.handleEdit(selected.args, evnt);
                             }
@@ -23900,13 +24014,13 @@ var VxeTableComponent = defineVxeComponent({
                     }
                     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 && !isAltKey && keyboardConfig && keyboardOpts.isEnter && (selected.row || actived.row || (treeConfig && (rowOpts.isCurrent || highlightCurrentRow) && currentRow))) {
+                    else if (isEnter && !isAltKey && keyboardConfig && keyboardOpts.isEnter && (selectRow || actived.row || (treeConfig && (rowOpts.isCurrent || highlightCurrentRow) && currentRow))) {
                         // 退出选中
                         if (isControlKey) {
                             // 如果是激活编辑状态，则取消编辑
@@ -23923,11 +24037,11 @@ var VxeTableComponent = defineVxeComponent({
                         }
                         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);
@@ -24037,7 +24151,7 @@ var VxeTableComponent = defineVxeComponent({
                     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 {
@@ -24054,11 +24168,11 @@ var VxeTableComponent = defineVxeComponent({
                     }
                     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 = {
@@ -24102,13 +24216,13 @@ var VxeTableComponent = defineVxeComponent({
                             }
                         }
                     }
-                    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,
@@ -24121,10 +24235,10 @@ var VxeTableComponent = defineVxeComponent({
                                     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 键，更新表尾数据
@@ -24133,16 +24247,20 @@ var VxeTableComponent = defineVxeComponent({
                             }
                         }
                     }
-                    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
@@ -24194,20 +24312,24 @@ var VxeTableComponent = defineVxeComponent({
                             }
                         }
                     }
-                    else if (keyboardConfig && isEnableConf(editConfig) && 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 && 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))) {
                         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
@@ -29852,7 +29974,7 @@ var VxeTableComponent = defineVxeComponent({
             if (rowOpts.height && !props.showOverflow) {
                 warnLog$2('vxe.error.notProp', ['table.show-overflow']);
             }
-            if (!$xeTable.triggerCelllAreaMnEvent) {
+            if (!$xeTable.triggerClAreaMnEvent) {
                 if (props.areaConfig) {
                     warnLog$2('vxe.error.notProp', ['area-config']);
                 }