vxe-table 3.22.11 → 3.23.0-beta.0

package/lib/index.umd.js

@@ -3311,7 +3311,7 @@ function getClass(property, params) {
 /* unused harmony import specifier */ var VxeUI;
 
 
-const version = "3.22.11";
+const version = "3.23.0-beta.0";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -3510,9 +3510,11 @@ core_.VxeUI.setConfig({
     },
     editConfig: {
       // mode: 'cell',
+      // cache: true,
       showIcon: true,
       showAsterisk: true,
-      autoFocus: true
+      autoFocus: true,
+      isReuseKeep: true
     },
     importConfig: {
       _typeMaps: {
@@ -4097,7 +4099,7 @@ function getPopupContainer(appendTo) {
 const {
   log: log_log
 } = core_.VxeUI;
-const tableVersion = `table v${"3.22.11"}`;
+const tableVersion = `table v${"3.23.0-beta.0"}`;
 function createComponentLog(name) {
   const uiVersion = core_.VxeUI.uiVersion ? `ui v${core_.VxeUI.uiVersion}` : '';
   const ganttVersion = core_.VxeUI.ganttVersion ? `gantt v${core_.VxeUI.ganttVersion}` : '';
@@ -5905,8 +5907,13 @@ function renderHeaderHandle(h, params) {
     type,
     filters,
     sortable,
-    editRender
+    editRender,
+    slots
   } = column;
+  const headerSlot = slots ? slots.header : null;
+  if (headerSlot) {
+    return renderTitleContent(h, params, $table.callSlot(headerSlot, params, h));
+  }
   switch (type) {
     case 'seq':
       return Cell.renderSeqHeader(h, params);
@@ -5968,14 +5975,9 @@ const Cell = {
       editConfig
     } = tableProps;
     const {
-      slots,
       editRender,
       cellRender
     } = column;
-    const headerSlot = slots ? slots.header : null;
-    if (headerSlot) {
-      return renderTitleContent(h, params, $table.callSlot(headerSlot, params, h));
-    }
     const isEnableEdit = editConfig && isEnableConf(editConfig);
     const editRenderOpts = isEnableEdit && isEnableConf(editRender) ? editRender : null;
     const cellRenderOpts = isEnableConf(cellRender) ? cellRender : null;
@@ -6314,10 +6316,7 @@ const Cell = {
       $table,
       column
     } = params;
-    const {
-      slots
-    } = column;
-    return renderHeaderCellBaseVNs(h, params, renderTitleContent(h, params, slots && slots.header ? $table.callSlot(slots.header, params, h) : $table.getHeaderCellLabel(column)));
+    return renderHeaderCellBaseVNs(h, params, renderTitleContent(h, params, $table.getHeaderCellLabel(column)));
   },
   renderSeqCell(h, params) {
     const {
@@ -6355,9 +6354,8 @@ const Cell = {
     const {
       slots
     } = column;
-    const headerSlot = slots ? slots.header : null;
     const titleSlot = slots ? slots.title : null;
-    return renderHeaderCellBaseVNs(h, params, renderTitleContent(h, params, headerSlot ? $table.callSlot(headerSlot, params, h) : [h('span', {
+    return renderHeaderCellBaseVNs(h, params, renderTitleContent(h, params, [h('span', {
       class: 'vxe-radio--label'
     }, titleSlot ? $table.callSlot(titleSlot, params, h) : $table.getHeaderCellLabel(column))]));
   },
@@ -6456,7 +6454,6 @@ const Cell = {
     const {
       slots
     } = column;
-    const headerSlot = slots ? slots.header : null;
     const titleSlot = slots ? slots.title : null;
     const checkboxOpts = $table.computeCheckboxOpts;
     const {
@@ -6479,9 +6476,6 @@ const Cell = {
       disabled: isAllCheckboxDisabled,
       indeterminate: isAllCheckboxIndeterminate
     };
-    if (headerSlot) {
-      return renderHeaderCellBaseVNs(h, params, renderTitleContent(h, checkboxParams, $table.callSlot(headerSlot, checkboxParams, h)));
-    }
     if (checkStrictly ? !showHeader : showHeader === false) {
       return renderHeaderCellBaseVNs(h, params, renderTitleContent(h, checkboxParams, [h('span', {
         class: 'vxe-checkbox--label'
@@ -8319,45 +8313,45 @@ internalData.isActivated=isActivated;}},/**
      * 全局滚动事件
      */handleGlobalMousewheelEvent(){const $xeTable=this;$xeTable.closeTooltip();if($xeTable.closeMenu){$xeTable.closeMenu();}},/**
      * 表格键盘事件
-     */keydownEvent(evnt){const $xeTable=this;const{filterStore,ctxMenuStore,editStore,keyboardConfig,mouseConfig,mouseOpts,keyboardOpts}=this;const{actived}=editStore;const{keyCode}=evnt;const isEsc=keyCode===27;if(isEsc){this.preventEvent(evnt,'event.keydown',null,()=>{$xeTable.dispatchEvent('keydown-start',{},evnt);if(keyboardConfig&&mouseConfig&&mouseOpts.area&&this.handleKeyboardCellAreaEvent){this.handleKeyboardCellAreaEvent(evnt);}else if(actived.row||filterStore.visible||ctxMenuStore.visible){evnt.stopPropagation();// 如果按下了 Esc 键，关闭快捷菜单、筛选
+     */keydownEvent(evnt){const $xeTable=this;const{filterStore,ctxMenuStore,editStore,keyboardConfig,mouseConfig,mouseOpts,keyboardOpts}=this;const{actived}=editStore;const{keyCode}=evnt;const isEsc=keyCode===27;if(isEsc){this.preventEvent(evnt,'event.keydown',null,()=>{$xeTable.dispatchEvent('keydown-start',{},evnt);if(keyboardConfig&&mouseConfig&&mouseOpts.area&&$xeTable.handleKdClAreaEvent){$xeTable.handleKdClAreaEvent(evnt);}else if(actived.row||filterStore.visible||ctxMenuStore.visible){evnt.stopPropagation();// 如果按下了 Esc 键，关闭快捷菜单、筛选
 this.closeFilter();this.closeMenu();if(keyboardConfig&&keyboardOpts.isEsc){// 如果是激活编辑状态，则取消编辑
 if(actived.row){const params=actived.args;this.handleClearEdit(evnt);// 如果配置了选中功能，则为选中状态
 if(mouseConfig&&mouseOpts.selected){this.$nextTick(()=>this.handleSelected(params,evnt));}}}}$xeTable.dispatchEvent('keydown',{},evnt);$xeTable.dispatchEvent('keydown-end',{},evnt);});}},contextMenuEvent(evnt){const $xeTable=this;$xeTable.dispatchEvent('context-menu',{},evnt);},/**
      * 全局键盘事件
      */handleGlobalKeydownEvent(evnt){const $xeTable=this;const props=$xeTable;const internalData=$xeTable;const reactData=$xeTable;const $xeGrid=$xeTable.$xeGrid;const $xeGantt=$xeTable.$xeGantt;// 该行为只对当前激活的表格有效
-if(internalData.isActivated){$xeTable.preventEvent(evnt,'event.keydown',null,()=>{const{mouseConfig,keyboardConfig,treeConfig,editConfig,highlightCurrentRow,highlightCurrentColumn}=props;const{ctxMenuStore,editStore}=reactData;const{afterFullData,visibleColumn,currentRow}=internalData;const isContentMenu=$xeTable.computeIsContentMenu;const bodyMenu=$xeTable.computeBodyMenu;const keyboardOpts=$xeTable.computeKeyboardOpts;const mouseOpts=$xeTable.computeMouseOpts;const editOpts=$xeTable.computeEditOpts;const treeOpts=$xeTable.computeTreeOpts;const menuList=$xeTable.computeMenuList;const rowOpts=$xeTable.computeRowOpts;const columnOpts=$xeTable.computeColumnOpts;const{isLastEnterAppendRow,beforeEnterMethod,enterMethod,isLastTabAppendRow,beforeTabMethod,tabMethod}=keyboardOpts;const{selected,actived}=editStore;const{keyCode}=evnt;const isEsc=methods_globalEvents.hasKey(evnt,GLOBAL_EVENT_KEYS.ESCAPE);const hasBackspaceKey=methods_globalEvents.hasKey(evnt,GLOBAL_EVENT_KEYS.BACKSPACE);const isTab=methods_globalEvents.hasKey(evnt,GLOBAL_EVENT_KEYS.TAB);const isEnter=methods_globalEvents.hasKey(evnt,GLOBAL_EVENT_KEYS.ENTER);const isSpacebar=methods_globalEvents.hasKey(evnt,GLOBAL_EVENT_KEYS.SPACEBAR);const isLeftArrow=methods_globalEvents.hasKey(evnt,GLOBAL_EVENT_KEYS.ARROW_LEFT);const isUpArrow=methods_globalEvents.hasKey(evnt,GLOBAL_EVENT_KEYS.ARROW_UP);const isRightArrow=methods_globalEvents.hasKey(evnt,GLOBAL_EVENT_KEYS.ARROW_RIGHT);const isDwArrow=methods_globalEvents.hasKey(evnt,GLOBAL_EVENT_KEYS.ARROW_DOWN);const hasDeleteKey=methods_globalEvents.hasKey(evnt,GLOBAL_EVENT_KEYS.DELETE);const isY=methods_globalEvents.hasKey(evnt,GLOBAL_EVENT_KEYS.Y);const isZ=methods_globalEvents.hasKey(evnt,GLOBAL_EVENT_KEYS.Z);const isF2=methods_globalEvents.hasKey(evnt,GLOBAL_EVENT_KEYS.F2);const isContextMenu=methods_globalEvents.hasKey(evnt,GLOBAL_EVENT_KEYS.CONTEXT_MENU);const isControlKey=hasControlKey(evnt);const hasShiftKey=evnt.shiftKey;const hasAltKey=evnt.altKey;const operArrow=isLeftArrow||isUpArrow||isRightArrow||isDwArrow;const operCtxMenu=isContentMenu&&ctxMenuStore.visible&&(isEnter||isSpacebar||operArrow);const isEditStatus=isEnableConf(editConfig)&&actived.column&&actived.row;const childrenField=treeOpts.children||treeOpts.childrenField;const beforeEditMethod=editOpts.beforeEditMethod||editOpts.activeMethod;const selectColumn=selected.column;if(operCtxMenu){// 如果配置了右键菜单; 支持方向键操作、回车
-evnt.preventDefault();if(ctxMenuStore.showChild&&hasChildrenList(ctxMenuStore.selected)){$xeTable.moveCtxMenu(evnt,ctxMenuStore,'selectChild',isLeftArrow,false,ctxMenuStore.selected.children);}else{$xeTable.moveCtxMenu(evnt,ctxMenuStore,'selected',isRightArrow,true,menuList);}}else if(keyboardConfig&&mouseConfig&&mouseOpts.area&&$xeTable.handleKeyboardCellAreaEvent){$xeTable.handleKeyboardCellAreaEvent(evnt);}else if(isEsc){// 如果按下了 Esc 键，关闭快捷菜单、筛选
+if(internalData.isActivated){$xeTable.preventEvent(evnt,'event.keydown',null,()=>{const{mouseConfig,keyboardConfig,treeConfig,editConfig,highlightCurrentRow,highlightCurrentColumn}=props;const{ctxMenuStore,editStore}=reactData;const{afterFullData,visibleColumn,currentRow}=internalData;const isContentMenu=$xeTable.computeIsContentMenu;const bodyMenu=$xeTable.computeBodyMenu;const keyboardOpts=$xeTable.computeKeyboardOpts;const mouseOpts=$xeTable.computeMouseOpts;const editOpts=$xeTable.computeEditOpts;const treeOpts=$xeTable.computeTreeOpts;const menuList=$xeTable.computeMenuList;const rowOpts=$xeTable.computeRowOpts;const columnOpts=$xeTable.computeColumnOpts;const{isLastEnterAppendRow,beforeEnterMethod,enterMethod,isLastTabAppendRow,beforeTabMethod,tabMethod}=keyboardOpts;const{selected,actived}=editStore;const{keyCode}=evnt;const isProcess=methods_globalEvents.hasKey(evnt,GLOBAL_EVENT_KEYS.PROCESS);const isEsc=methods_globalEvents.hasKey(evnt,GLOBAL_EVENT_KEYS.ESCAPE);const hasBackspaceKey=methods_globalEvents.hasKey(evnt,GLOBAL_EVENT_KEYS.BACKSPACE);const isTab=methods_globalEvents.hasKey(evnt,GLOBAL_EVENT_KEYS.TAB);const isEnter=methods_globalEvents.hasKey(evnt,GLOBAL_EVENT_KEYS.ENTER);const isSpacebar=methods_globalEvents.hasKey(evnt,GLOBAL_EVENT_KEYS.SPACEBAR);const isLeftArrow=methods_globalEvents.hasKey(evnt,GLOBAL_EVENT_KEYS.ARROW_LEFT);const isUpArrow=methods_globalEvents.hasKey(evnt,GLOBAL_EVENT_KEYS.ARROW_UP);const isRightArrow=methods_globalEvents.hasKey(evnt,GLOBAL_EVENT_KEYS.ARROW_RIGHT);const isDwArrow=methods_globalEvents.hasKey(evnt,GLOBAL_EVENT_KEYS.ARROW_DOWN);const hasDeleteKey=methods_globalEvents.hasKey(evnt,GLOBAL_EVENT_KEYS.DELETE);const isY=methods_globalEvents.hasKey(evnt,GLOBAL_EVENT_KEYS.Y);const isZ=methods_globalEvents.hasKey(evnt,GLOBAL_EVENT_KEYS.Z);const isF2=methods_globalEvents.hasKey(evnt,GLOBAL_EVENT_KEYS.F2);const isContextMenu=methods_globalEvents.hasKey(evnt,GLOBAL_EVENT_KEYS.CONTEXT_MENU);const isControlKey=hasControlKey(evnt);const hasShiftKey=evnt.shiftKey;const hasAltKey=evnt.altKey;const operArrow=isLeftArrow||isUpArrow||isRightArrow||isDwArrow;const operCtxMenu=isContentMenu&&ctxMenuStore.visible&&(isEnter||isSpacebar||operArrow);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){// 如果配置了右键菜单; 支持方向键操作、回车
+evnt.preventDefault();if(ctxMenuStore.showChild&&hasChildrenList(ctxMenuStore.selected)){$xeTable.moveCtxMenu(evnt,ctxMenuStore,'selectChild',isLeftArrow,false,ctxMenuStore.selected.children);}else{$xeTable.moveCtxMenu(evnt,ctxMenuStore,'selected',isRightArrow,true,menuList);}}else if(keyboardConfig&&mouseConfig&&mouseOpts.area&&$xeTable.handleKdClAreaEvent){$xeTable.handleKdClAreaEvent(evnt);}else if(isEsc){// 如果按下了 Esc 键，关闭快捷菜单、筛选
 if($xeTable.closeMenu){$xeTable.closeMenu();}$xeTable.closeFilter();if(keyboardConfig&&keyboardOpts.isEsc){// 如果是激活编辑状态，则取消编辑
 if(actived.row){const params=actived.args;$xeTable.handleClearEdit(evnt);// 如果配置了选中功能，则为选中状态
-if(mouseOpts.selected){$xeTable.$nextTick(()=>$xeTable.handleSelected(params,evnt));}}}}else if(keyboardConfig&&isSpacebar&&keyboardOpts.isChecked&&selected.row&&selectColumn&&(selectColumn.type==='checkbox'||selectColumn.type==='radio')){// 空格键支持选中复选框
+if(mouseOpts.selected){$xeTable.$nextTick(()=>$xeTable.handleSelected(params,evnt));}}}}else if(keyboardConfig&&isSpacebar&&keyboardOpts.isChecked&&selectRow&&selectColumn&&(selectColumn.type==='checkbox'||selectColumn.type==='radio')){// 空格键支持选中复选框
 evnt.preventDefault();if(selectColumn.type==='checkbox'){$xeTable.handleToggleCheckRowEvent(evnt,selected.args);}else{$xeTable.triggerRadioRowEvent(evnt,selected.args);}}else if(isF2&&isEnableConf(editConfig)){if(!isEditStatus){// 如果按下了 F2 键
-if(selected.row&&selectColumn){evnt.preventDefault();$xeTable.handleEdit(selected.args,evnt);}}}else if(isContextMenu){// 如果按下上下文键
-internalData._keyCtx=selected.row&&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)){// 退出选中
+if(selectRow&&selectColumn){evnt.preventDefault();$xeTable.handleEdit(selected.args,evnt);}}}else if(isContextMenu){// 如果按下上下文键
+internalData._keyCtx=selectRow&&selectColumn&&bodyMenu.length;clearTimeout(internalData.keyCtxTimeout);internalData.keyCtxTimeout=setTimeout(()=>{internalData._keyCtx=false;},1000);}else if(isEnter&&!hasAltKey&&keyboardConfig&&keyboardOpts.isEnter&&(selectRow||actived.row||treeConfig&&(rowOpts.isCurrent||highlightCurrentRow)&&currentRow)){// 退出选中
 if(isControlKey){// 如果是激活编辑状态，则取消编辑
 if(actived.row){const params=actived.args;$xeTable.handleClearEdit(evnt);// 如果配置了选中功能，则为选中状态
 if(mouseConfig&&mouseOpts.selected){$xeTable.$nextTick(()=>$xeTable.handleSelected(params,evnt));}}}else{// 如果是激活状态，退则出到上一行/下一行
-if(selected.row||actived.row){const activeRow=selected.row||actived.row;const activeColumn=selectColumn||actived.column;if(activeColumn){const activeParams=selected.row?selected.args:actived.args;if(hasShiftKey){if(keyboardOpts.enterToTab){$xeTable.moveTabSelected(activeParams,hasShiftKey,evnt);}else{$xeTable.moveEnterSelected(activeParams,isLeftArrow,true,isRightArrow,false,evnt);}}else{const _rowIndex=$xeTable.getVTRowIndex(activeRow);const _columnIndex=$xeTable.getVTColumnIndex(activeColumn);if(keyboardOpts.enterToTab){const ttrParams={row:activeRow,rowIndex:$xeTable.getRowIndex(activeRow),$rowIndex:$xeTable.getVMRowIndex(activeRow),_rowIndex,column:activeColumn,columnIndex:$xeTable.getColumnIndex(activeColumn),$columnIndex:$xeTable.getVMColumnIndex(activeColumn),_columnIndex,$table:$xeTable};if(!beforeTabMethod||beforeTabMethod(ttrParams)!==false){evnt.preventDefault();// 最后一行按下Tab键，自动追加一行
+if(selectRow||actived.row){const activeRow=selectRow||actived.row;const activeColumn=selectColumn||actived.column;if(activeColumn){const activeParams=selectRow?selected.args:actived.args;if(hasShiftKey){if(keyboardOpts.enterToTab){$xeTable.moveTabSelected(activeParams,hasShiftKey,evnt);}else{$xeTable.moveEnterSelected(activeParams,isLeftArrow,true,isRightArrow,false,evnt);}}else{const _rowIndex=$xeTable.getVTRowIndex(activeRow);const _columnIndex=$xeTable.getVTColumnIndex(activeColumn);if(keyboardOpts.enterToTab){const ttrParams={row:activeRow,rowIndex:$xeTable.getRowIndex(activeRow),$rowIndex:$xeTable.getVMRowIndex(activeRow),_rowIndex,column:activeColumn,columnIndex:$xeTable.getColumnIndex(activeColumn),$columnIndex:$xeTable.getVMColumnIndex(activeColumn),_columnIndex,$table:$xeTable};if(!beforeTabMethod||beforeTabMethod(ttrParams)!==false){evnt.preventDefault();// 最后一行按下Tab键，自动追加一行
 if(isLastTabAppendRow){const newColumn=visibleColumn[0];if(_rowIndex>=afterFullData.length-1&&_columnIndex>=visibleColumn.length-1){if(actived.row){$xeTable.handleClearEdit(evnt);}$xeTable.insertAt({},-1).then(({row:newRow})=>{$xeTable.scrollToRow(newRow,newColumn);$xeTable.handleSelected({...activeParams,row:newRow,column:newColumn},evnt);});$xeTable.dispatchEvent('tab-append-row',ttrParams,evnt);return;}}if(tabMethod){tabMethod(ttrParams);}else{$xeTable.moveTabSelected(activeParams,hasShiftKey,evnt);}}}else{const etrParams={row:activeRow,rowIndex:$xeTable.getRowIndex(activeRow),$rowIndex:$xeTable.getVMRowIndex(activeRow),_rowIndex,column:activeColumn,columnIndex:$xeTable.getColumnIndex(activeColumn),$columnIndex:$xeTable.getVMColumnIndex(activeColumn),_columnIndex,$table:$xeTable};if(!beforeEnterMethod||beforeEnterMethod(etrParams)!==false){evnt.preventDefault();// 最后一行按下回车键，自动追加一行
 if(isLastEnterAppendRow){if(_rowIndex>=afterFullData.length-1){$xeTable.insertAt({},-1).then(({row:newRow})=>{$xeTable.scrollToRow(newRow,selectColumn);$xeTable.handleSelected({...activeParams,row:newRow},evnt);});$xeTable.dispatchEvent('enter-append-row',etrParams,evnt);return;}}if(enterMethod){enterMethod(etrParams);}else{if(actived.row){$xeTable.handleClearEdit(evnt);}$xeTable.moveEnterSelected(activeParams,isLeftArrow,false,isRightArrow,true,evnt);}}}}}}else if(treeConfig&&(rowOpts.isCurrent||highlightCurrentRow)&&currentRow){// 如果是树形表格当前行回车移动到子节点
 const childrens=currentRow[childrenField];if(childrens&&childrens.length){evnt.preventDefault();const targetRow=childrens[0];const params={$table:$xeTable,row:targetRow,rowIndex:$xeTable.getRowIndex(targetRow),$rowIndex:$xeTable.getVMRowIndex(targetRow)};$xeTable.setTreeExpand(currentRow,true).then(()=>$xeTable.scrollToRow(targetRow)).then(()=>$xeTable.triggerCurrentRowEvent(evnt,params));}}}}else if(operArrow&&keyboardConfig&&keyboardOpts.isArrow){if(!isEditStatus){// 如果按下了方向键
-if(mouseOpts.selected&&selected.row&&selectColumn){$xeTable.moveArrowSelected(selected.args,isLeftArrow,isUpArrow,isRightArrow,isDwArrow,evnt);}else{// 当前行按键上下移动
+if(mouseOpts.selected&&selectRow&&selectColumn){$xeTable.moveArrowSelected(selected.args,isLeftArrow,isUpArrow,isRightArrow,isDwArrow,evnt);}else{// 当前行按键上下移动
 if((isUpArrow||isDwArrow)&&(rowOpts.isCurrent||highlightCurrentRow)){$xeTable.moveCurrentRow(isUpArrow,isDwArrow,evnt);}// 当前行按键左右移动
 if((isLeftArrow||isRightArrow)&&(columnOpts.isCurrent||highlightCurrentColumn)){$xeTable.moveCurrentColumn(isLeftArrow,isRightArrow,evnt);}}}}else if(isTab&&keyboardConfig&&keyboardOpts.isTab){// 如果按下了 Tab 键切换
-if(selected.row||actived.row){const activeRow=selected.row||actived.row;const activeColumn=selectColumn||actived.column;if(activeColumn){const activeParams=selected.row?selected.args:actived.args;const _rowIndex=$xeTable.getVTRowIndex(activeRow);const _columnIndex=$xeTable.getVTColumnIndex(activeColumn);const ttrParams={row:activeRow,rowIndex:$xeTable.getRowIndex(activeRow),$rowIndex:$xeTable.getVMRowIndex(activeRow),_rowIndex,column:activeColumn,columnIndex:$xeTable.getColumnIndex(activeColumn),$columnIndex:$xeTable.getVMColumnIndex(activeColumn),_columnIndex,$table:$xeTable};if(!beforeTabMethod||beforeTabMethod(ttrParams)!==false){evnt.preventDefault();// 最后一行按下Tab键，自动追加一行
-if(isLastTabAppendRow){const newColumn=visibleColumn[0];if(_rowIndex>=afterFullData.length-1&&_columnIndex>=visibleColumn.length-1){if(actived.row){$xeTable.handleClearEdit(evnt);}$xeTable.insertAt({},-1).then(({row:newRow})=>{$xeTable.scrollToRow(newRow,newColumn);$xeTable.handleSelected({...activeParams,row:newRow,column:newColumn},evnt);});$xeTable.dispatchEvent('tab-append-row',ttrParams,evnt);return;}}if(tabMethod){tabMethod(ttrParams);}else{if(actived.row){$xeTable.handleClearEdit(evnt);}$xeTable.moveTabSelected(activeParams,hasShiftKey,evnt);}}}}}else if(keyboardConfig&&keyboardOpts.isDel&&hasDeleteKey&&isEnableConf(editConfig)&&(selected.row||selectColumn)){// 如果是删除键
-if(!isEditStatus){const{delMethod}=keyboardOpts;const params={row:selected.row,rowIndex:$xeTable.getRowIndex(selected.row),column:selectColumn,columnIndex:$xeTable.getColumnIndex(selectColumn),$table:$xeTable,$grid:$xeGrid,$gantt:$xeGantt};// 是否被禁用
-if(!beforeEditMethod||beforeEditMethod(params)){if(delMethod){delMethod(params);}else{const selectCellValue=getCellValue(selected.row,selectColumn);if(selectCellValue!==null){$xeTable.handlePushStack();setCellValue(selected.row,selectColumn,null);}}// 如果按下 del 键，更新表尾数据
-$xeTable.updateFooter();$xeTable.dispatchEvent('cell-delete-value',params,evnt);}}}else if(hasBackspaceKey&&keyboardConfig&&keyboardOpts.isBack&&isEnableConf(editConfig)&&(selected.row||selectColumn)){if(!isEditStatus){const{backMethod}=keyboardOpts;// 如果是删除键
-if(keyboardOpts.isDel&&isEnableConf(editConfig)&&(selected.row||selectColumn)){const params={row:selected.row,rowIndex:$xeTable.getRowIndex(selected.row),column:selectColumn,columnIndex:$xeTable.getColumnIndex(selectColumn),$table:$xeTable,$grid:$xeGrid,$gantt:$xeGantt};// 是否被禁用
+if(selectRow||actived.row){const activeRow=selectRow||actived.row;const activeColumn=selectColumn||actived.column;if(activeColumn){const activeParams=selectRow?selected.args:actived.args;const _rowIndex=$xeTable.getVTRowIndex(activeRow);const _columnIndex=$xeTable.getVTColumnIndex(activeColumn);const ttrParams={row:activeRow,rowIndex:$xeTable.getRowIndex(activeRow),$rowIndex:$xeTable.getVMRowIndex(activeRow),_rowIndex,column:activeColumn,columnIndex:$xeTable.getColumnIndex(activeColumn),$columnIndex:$xeTable.getVMColumnIndex(activeColumn),_columnIndex,$table:$xeTable};if(!beforeTabMethod||beforeTabMethod(ttrParams)!==false){evnt.preventDefault();// 最后一行按下Tab键，自动追加一行
+if(isLastTabAppendRow){const newColumn=visibleColumn[0];if(_rowIndex>=afterFullData.length-1&&_columnIndex>=visibleColumn.length-1){if(actived.row){$xeTable.handleClearEdit(evnt);}$xeTable.insertAt({},-1).then(({row:newRow})=>{$xeTable.scrollToRow(newRow,newColumn);$xeTable.handleSelected({...activeParams,row:newRow,column:newColumn},evnt);});$xeTable.dispatchEvent('tab-append-row',ttrParams,evnt);return;}}if(tabMethod){tabMethod(ttrParams);}else{if(actived.row){$xeTable.handleClearEdit(evnt);}$xeTable.moveTabSelected(activeParams,hasShiftKey,evnt);}}}}}else if(keyboardConfig&&keyboardOpts.isDel&&hasDeleteKey&&isEnableConf(editConfig)&&(selectRow||selectColumn)){// 如果是删除键
+if(!isEditStatus){const{delMethod}=keyboardOpts;const params={row:selectRow,rowIndex:$xeTable.getRowIndex(selectRow),column:selectColumn,columnIndex:$xeTable.getColumnIndex(selectColumn),$table:$xeTable,$grid:$xeGrid,$gantt:$xeGantt};// 是否被禁用
+if(!beforeEditMethod||beforeEditMethod(params)){if(delMethod){delMethod(params);}else{const selectCellValue=getCellValue(selectRow,selectColumn);if(selectCellValue!==null){$xeTable.handlePushStack();setCellValue(selectRow,selectColumn,null);}}// 如果按下 del 键，更新表尾数据
+$xeTable.updateFooter();$xeTable.dispatchEvent('cell-delete-value',params,evnt);}}}else if(hasBackspaceKey&&keyboardConfig&&keyboardOpts.isBack&&isEnableConf(editConfig)&&(selectRow||selectColumn)){if(!isEditStatus){const{backMethod}=keyboardOpts;// 如果是删除键
+if(keyboardOpts.isDel&&isEnableConf(editConfig)&&(selectRow||selectColumn)){const params={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};// 是否被禁用
 if(!beforeEditMethod||beforeEditMethod(params)){if(backMethod){backMethod(params);}else{$xeTable.handleEdit(params,evnt,{isClear:true});}$xeTable.dispatchEvent('cell-backspace-value',params,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();const params={row:parentRow,rowIndex:$xeTable.getRowIndex(parentRow),$rowIndex:$xeTable.getVMRowIndex(parentRow),$table:$xeTable,$grid:$xeGrid,$gantt:$xeGantt};$xeTable.setTreeExpand(parentRow,false).then(()=>$xeTable.scrollToRow(parentRow)).then(()=>$xeTable.triggerCurrentRowEvent(evnt,params));}}else if(keyboardConfig&&keyboardOpts.isUndoRedo&&isControlKey&&(isZ||isY)&&!hasEventInputTarget(evnt.target)){if(isY||hasShiftKey&&isZ){// 恢复被撤销的操作：Ctrl + Y 或 Ctrl + Shift + Z
 evnt.preventDefault();$xeTable.handleRedoStackEvent(evnt);}else if(isZ){// ‌撤销上一步操作‌：Ctrl + Z
-evnt.preventDefault();$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)){const{editMode,editMethod}=keyboardOpts;// 启用编辑后，空格键功能将失效
+evnt.preventDefault();$xeTable.handleUndoStackEvent(evnt);}}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)){const beforeEditMethod=editOpts.beforeEditMethod||editOpts.activeMethod;const params={row:selected.row,rowIndex:$xeTable.getRowIndex(selected.row),column:selectColumn,columnIndex:$xeTable.getColumnIndex(selectColumn),$table:$xeTable,$grid:$xeGrid,$gantt:$xeGantt};if(!beforeEditMethod||beforeEditMethod(params)){if(editMethod){editMethod(params);}else{let isClearValue=false;// 追加方式与覆盖式
+if(selectColumn&&selectRow&&isEnableConf(selectColumn.editRender)){const beforeEditMethod=editOpts.beforeEditMethod||editOpts.activeMethod;const params={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};if(!beforeEditMethod||beforeEditMethod(params)){if(editMethod){editMethod(params);}else{let isClearValue=false;// 追加方式与覆盖式
 if(editMode!=='insert'){isClearValue=true;}$xeTable.handleEdit(params,evnt,{isClear:isClearValue});}}}}$xeTable.dispatchEvent('keydown',{},evnt);});}},handleGlobalPasteEvent(evnt){const $xeTable=this;const props=$xeTable;const internalData=$xeTable;const reactData=$xeTable;const{keyboardConfig,mouseConfig}=props;const{editStore,filterStore}=reactData;const{isActivated}=internalData;const mouseOpts=$xeTable.computeMouseOpts;const keyboardOpts=$xeTable.computeKeyboardOpts;const{actived}=editStore;if(isActivated&&!filterStore.visible){if(!(actived.row||actived.column)){if(keyboardConfig&&keyboardOpts.isClip&&mouseConfig&&mouseOpts.area&&$xeTable.handlePeClAreaEvent){$xeTable.handlePeClAreaEvent(evnt);}}$xeTable.dispatchEvent('paste',{},evnt);}},handleGlobalCopyEvent(evnt){const $xeTable=this;const props=$xeTable;const internalData=$xeTable;const reactData=$xeTable;const{keyboardConfig,mouseConfig}=props;const{editStore,filterStore}=reactData;const{isActivated}=internalData;const mouseOpts=$xeTable.computeMouseOpts;const keyboardOpts=$xeTable.computeKeyboardOpts;const{actived}=editStore;if(isActivated&&!filterStore.visible){if(!(actived.row||actived.column)){if(keyboardConfig&&keyboardOpts.isClip&&mouseConfig&&mouseOpts.area&&$xeTable.handleCyClAreaEvent){$xeTable.handleCyClAreaEvent(evnt);}}$xeTable.dispatchEvent('copy',{},evnt);}},handleGlobalCutEvent(evnt){const $xeTable=this;const props=$xeTable;const internalData=$xeTable;const reactData=$xeTable;const{keyboardConfig,mouseConfig}=props;const{editStore,filterStore}=reactData;const{isActivated}=internalData;const mouseOpts=$xeTable.computeMouseOpts;const keyboardOpts=$xeTable.computeKeyboardOpts;const{actived}=editStore;if(isActivated&&!filterStore.visible){if(!(actived.row||actived.column)){if(keyboardConfig&&keyboardOpts.isClip&&mouseConfig&&mouseOpts.area&&$xeTable.handleCutCellAreaEvent){$xeTable.handleCutCellAreaEvent(evnt);}}$xeTable.dispatchEvent('cut',{},evnt);}},handleGlobalResizeEvent(){const $xeTable=this;$xeTable.closeMenu();$xeTable.updateCellAreas();handleResizeEvent($xeTable);$xeTable.updateCellAreas();},handleUpdateHeaderMerge(){const $xeTable=this;const reactData=$xeTable;const internalData=$xeTable;const{mergeHeaderList}=internalData;const{mergeMaps,mergeRowMaps,mergeColMaps}=buildMergeData(mergeHeaderList);internalData.mergeHeaderCellMaps=mergeMaps;internalData.mergeHeaderRowMaps=mergeRowMaps;internalData.mergeHeaderColMaps=mergeColMaps;reactData.mergeHeadFlag++;},/**
      * 处理合并
      */handleUpdateBodyMerge(){const $xeTable=this;const reactData=$xeTable;const internalData=$xeTable;const{mergeBodyList}=internalData;const{mergeMaps,mergeRowMaps,mergeColMaps}=buildMergeData(mergeBodyList);internalData.mergeBodyCellMaps=mergeMaps;internalData.mergeBodyRowMaps=mergeRowMaps;internalData.mergeBodyColMaps=mergeColMaps;reactData.mergeBodyFlag++;},handleUpdateFooterMerge(){const $xeTable=this;const reactData=$xeTable;const internalData=$xeTable;const{mergeFooterList}=internalData;const{mergeMaps,mergeRowMaps,mergeColMaps}=buildMergeData(mergeFooterList);internalData.mergeFooterCellMaps=mergeMaps;internalData.mergeFooterRowMaps=mergeRowMaps;internalData.mergeFooterColMaps=mergeColMaps;reactData.mergeFootFlag++;},handleAggregateSummaryData(){const $xeTable=this;return $xeTable.refreshAggregateCalcValues();},handleTargetLeaveEvent(){const $xeTable=this;const internalData=$xeTable;const tooltipOpts=$xeTable.computeTooltipOpts;let $tooltip=$xeTable.$refs.refTooltip;if($tooltip&&$tooltip.setActived){$tooltip.setActived(false);}if(tooltipOpts.enterable){internalData.tooltipTimeout=setTimeout(()=>{$tooltip=$xeTable.$refs.refTooltip;if($tooltip&&$tooltip.isActived&&!$tooltip.isActived()){$xeTable.closeTooltip();}},tooltipOpts.leaveDelay);}else{$xeTable.closeTooltip();}},triggerHeaderTitleEvent(evnt,iconParams,params){const $xeTable=this;const reactData=$xeTable;const tipContent=iconParams.content||iconParams.message;if(tipContent){const{tooltipStore}=reactData;const{column}=params;const content=getFuncText(tipContent);handleTargetEnterEvent($xeTable,true);tooltipStore.row=null;tooltipStore.column=column;tooltipStore.visible=true;tooltipStore.currOpts=iconParams;$xeTable.$nextTick(()=>{const $tooltip=$xeTable.$refs.refTooltip;if($tooltip&&$tooltip.open){$tooltip.open(evnt.currentTarget,content);}});}},/**
@@ -15597,6 +15591,7 @@ function handleEditActive($xeTable, params, evnt, options) {
   const props = $xeTable;
   const reactData = $xeTable;
   const $xeGrid = $xeTable.$xeGrid;
+  const $xeGantt = $xeTable.$xeGantt;
   const {
     editConfig,
     mouseConfig
@@ -15627,7 +15622,10 @@ function handleEditActive($xeTable, params, evnt, options) {
   } = options;
   const cell = params.cell || $xeTable.getCellElement(row, column);
   const beforeEditMethod = editOpts.beforeEditMethod || editOpts.activeMethod;
-  params.cell = cell;
+  const editParams = {
+    ...params,
+    cell
+  };
   if (cell && isEnableConf(editConfig) && isEnableConf(editRender)) {
     // 激活编辑
     if (!$xeTable.isPendingByRow(row) && !$xeTable.isAggregateRecord(row)) {
@@ -15635,9 +15633,10 @@ function handleEditActive($xeTable, params, evnt, options) {
         // 判断是否禁用编辑
         let type = 'edit-disabled';
         if (!beforeEditMethod || beforeEditMethod({
-          ...params,
+          ...editParams,
           $table: $xeTable,
-          $grid: $xeGrid
+          $grid: $xeGrid,
+          $gantt: $xeGantt
         })) {
           if (mouseConfig) {
             $xeTable.clearSelected();
@@ -15652,7 +15651,7 @@ function handleEditActive($xeTable, params, evnt, options) {
           }
           type = 'edit-activated';
           column.renderHeight = cell.offsetHeight;
-          actived.args = params;
+          actived.args = editParams;
           actived.row = row;
           actived.column = column;
           $xeTable.handlePushStack();
@@ -15667,13 +15666,14 @@ function handleEditActive($xeTable, params, evnt, options) {
           const afterEditMethod = editOpts.afterEditMethod;
           $xeTable.$nextTick(() => {
             if (isFocus) {
-              $xeTable.handleFocus(params, evnt);
+              $xeTable.handleFocus(editParams, evnt);
             }
             if (afterEditMethod) {
               afterEditMethod({
-                ...params,
+                ...editParams,
                 $table: $xeTable,
-                $grid: $xeGrid
+                $grid: $xeGrid,
+                $gantt: $xeGantt
               });
             }
           });
@@ -15720,11 +15720,11 @@ function handleEditActive($xeTable, params, evnt, options) {
           }
         }
         column.renderHeight = cell.offsetHeight;
-        actived.args = params;
+        actived.args = editParams;
         actived.column = column;
         if (isPos) {
           setTimeout(() => {
-            $xeTable.handleFocus(params, evnt);
+            $xeTable.handleFocus(editParams, evnt);
           });
         }
       }
@@ -15752,8 +15752,12 @@ function handleEditCell($xeTable, row, fieldOrColumn, options) {
         handleEditActive($xeTable, {
           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, options);
@@ -16222,37 +16226,35 @@ function handleEditCell($xeTable, row, fieldOrColumn, options) {
       } = reactData;
       return editStore.actived.row === row;
     },
-    /**
-     * 处理聚焦
-     */
-    handleFocus(params) {
+    handleCellFocus(cell, params) {
       const $xeTable = this;
+      const props = $xeTable;
       const {
-        row,
-        column,
-        cell
+        editConfig
+      } = props;
+      const {
+        column
       } = params;
       const {
         editRender
       } = column;
       const editOpts = $xeTable.computeEditOpts;
-      if (isEnableConf(editRender)) {
-        const browseObj = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().browse();
+      if (editConfig && isEnableConf(editRender)) {
         const compRender = edit_mixin_renderer.get(editRender.name);
         let autoFocus = editRender.autofocus || editRender.autoFocus;
         let autoSelect = editRender.autoSelect || editRender.autoselect;
-        let inputElem;
+        let inputElem = null;
         // 是否启用聚焦
         if (editOpts.autoFocus) {
           if (!autoFocus && compRender) {
-            autoFocus = compRender.tableAutoFocus || compRender.tableAutofocus || compRender.autoFocus || compRender.autofocus;
+            autoFocus = compRender.tableAutoFocus || compRender.tableAutofocus || compRender.autofocus;
           }
           if (!autoSelect && compRender) {
-            autoSelect = compRender.tableAutoSelect || compRender.autoSelect || compRender.autoselect;
+            autoSelect = compRender.tableAutoSelect || compRender.autoselect;
           }
           // 如果指定了聚焦 class
           if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(autoFocus)) {
-            inputElem = autoFocus.call($xeTable, params);
+            inputElem = autoFocus(params);
           } else if (autoFocus) {
             if (autoFocus === true) {
               // 自动匹配模式，会自动匹配第一个可输入元素
@@ -16265,6 +16267,28 @@ function handleEditCell($xeTable, row, fieldOrColumn, options) {
             }
           }
         }
+        return inputElem;
+      }
+      return null;
+    },
+    /**
+     * 处理聚焦
+     */
+    handleFocus(params) {
+      const $xeTable = this;
+      const {
+        row,
+        column,
+        cell
+      } = params;
+      const {
+        editRender
+      } = column;
+      const editOpts = $xeTable.computeEditOpts;
+      if (isEnableConf(editRender)) {
+        const browseObj = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().browse();
+        const autoSelect = editRender.autoSelect || editRender.autoselect;
+        const inputElem = $xeTable.handleCellFocus(cell, params);
         if (inputElem) {
           if (autoSelect) {
             inputElem.select();
@@ -16347,13 +16371,18 @@ function handleEditCell($xeTable, row, fieldOrColumn, options) {
         if (rowIndex > -1) {
           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 $xeTable.$nextTick();
@@ -16366,7 +16395,8 @@ function handleEditCell($xeTable, row, fieldOrColumn, options) {
       const props = $xeTable;
       const reactData = $xeTable;
       const {
-        mouseConfig
+        mouseConfig,
+        editConfig
       } = props;
       const {
         editStore
@@ -16398,6 +16428,19 @@ function handleEditCell($xeTable, row, fieldOrColumn, options) {
               $xeTable.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) {
+                    params.cell = cell;
+                    $xeTable.handleCellFocus(cell, params);
+                  }
+                }
+              }, 0);
+            }
             if (evnt) {
               $xeTable.dispatchEvent('cell-selected', params, evnt);
             }
@@ -19310,8 +19353,8 @@ function handleCheckboxRangeEvent($xeTable, evnt, params) {
       const checkboxOpts = $xeTable.computeCheckboxOpts;
       const mouseOpts = $xeTable.computeMouseOpts;
       const editOpts = $xeTable.computeEditOpts;
-      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) {
           handleCheckboxRangeEvent($xeTable, evnt, params);
@@ -22538,7 +22581,7 @@ function renderBody(h, $xeTable) {
     if (rowOpts.height && !this.showOverflow) {
       table_warnLog('vxe.error.notProp', ['table.show-overflow']);
     }
-    if (!$xeTable.triggerCelllAreaMnEvent) {
+    if (!$xeTable.triggerClAreaMnEvent) {
       if (props.areaConfig) {
         table_warnLog('vxe.error.notProp', ['area-config']);
       }
@@ -26409,6 +26452,7 @@ var external_commonjs_vue_commonjs2_vue_root_Vue_default = /*#__PURE__*/__webpac
 
 
 
+
 const {
   errLog: render_errLog
 } = createComponentLog('table');
@@ -26521,6 +26565,7 @@ function getCellLabelVNs(h, renderOpts, params, cellLabel, opts) {
     placeholder
   } = renderOpts;
   return [h('span', {
+    key: 1,
     class: ['vxe-cell--label', opts ? opts.class : '']
   }, placeholder && isEmptyValue(cellLabel) ? [h('span', {
     class: 'vxe-cell--placeholder'
@@ -26806,26 +26851,38 @@ function getNativeFilterOns(renderOpts, params, option) {
     }
   });
 }
+function nativeInputCellRender(h, renderOpts, renderParams) {
+  const {
+    row,
+    column
+  } = renderParams;
+  const cellValue = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, column.field);
+  const cellVNs = [h('span', {
+    key: 1
+  }, cellValue)];
+  return getNativeInputRenderCellVNs(h, cellValue, cellVNs, renderOpts, renderParams);
+}
 /**
  * 单元格可编辑渲染-原生的标签
- * input、textarea、select
+ * input、textarea
  */
-function nativeEditRender(h, renderOpts, params) {
+function nativeInputEditRender(h, renderOpts, renderParams) {
   const {
     row,
     column
-  } = params;
+  } = renderParams;
   const {
     name
   } = renderOpts;
-  const cellValue = isImmediateCell(renderOpts, params) ? getCellValue(row, column) : column.model.value;
-  return [h(`${name}`, {
+  const cellValue = isImmediateCell(renderOpts, renderParams) ? getCellValue(row, column) : column.model.value;
+  return [h('' + name, {
+    key: 2,
     class: `vxe-default-${name}`,
     attrs: getNativeAttrs(renderOpts),
     domProps: {
       value: cellValue
     },
-    on: getNativeEditOns(renderOpts, params)
+    on: getNativeEditOns(renderOpts, renderParams)
   })];
 }
 function buttonCellRender(h, renderOpts, params) {
@@ -26834,6 +26891,18 @@ function buttonCellRender(h, renderOpts, params) {
     on: getComponentOns(renderOpts, params)
   })];
 }
+function defaultInputEditRender(h, renderOpts, params) {
+  const {
+    row,
+    column
+  } = params;
+  const cellValue = getCellValue(row, column);
+  return [h(getDefaultComponent(renderOpts), {
+    key: 2,
+    props: getCellEditProps(renderOpts, params, cellValue),
+    on: getEditOns(renderOpts, params)
+  })];
+}
 function defaultEditRender(h, renderOpts, params) {
   const {
     row,
@@ -27213,19 +27282,14 @@ function handleExportTreeSelectMethod(params) {
   } = params;
   return options.original ? getCellValue(row, column) : getTreeSelectCellValue(column.editRender || column.cellRender, params);
 }
-function handleNumberCell(h, renderOpts, params) {
+function handleNumberCell(h, cellValue, renderOpts, params) {
   const {
     props = {},
     showNegativeStatus
   } = renderOpts;
-  const {
-    row,
-    column
-  } = params;
   const {
     type
   } = props;
-  let cellValue = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, column.field);
   let isNegative = false;
   if (!isEmptyValue(cellValue)) {
     const numberInputConfig = render_getConfig().numberInput || {};
@@ -27399,20 +27463,121 @@ function handleSetTreeSelectValue(renderOpts, params) {
     external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().set(row, field, cellValue);
   }
 }
+function getNativeInputRenderCellVNs(h, cellValue, labelVNs, renderOpts, renderParams) {
+  const {
+    $table,
+    row,
+    column
+  } = renderParams;
+  const {
+    name
+  } = renderOpts;
+  const tableProps = $table;
+  const {
+    editConfig,
+    mouseConfig
+  } = tableProps;
+  let isColSelected = false;
+  let isActiveCellArea = false;
+  if (editConfig && mouseConfig) {
+    const tableReactData = $table;
+    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, {
+      key: 2,
+      class: `vxe-default-${name} vxe-reusekeep-control`,
+      attrs: getNativeAttrs(renderOpts),
+      domProps: {
+        value: cellValue
+      },
+      on: getNativeEditOns(renderOpts, renderParams)
+    }));
+  }
+  return cellVNs;
+}
+function getInputRenderCellVNs(h, cellValue, labelVNs, renderOpts, renderParams) {
+  const {
+    $table,
+    row,
+    column
+  } = renderParams;
+  const tableProps = $table;
+  const {
+    editConfig,
+    mouseConfig
+  } = tableProps;
+  let isColSelected = false;
+  let isActiveCellArea = false;
+  if (editConfig && mouseConfig) {
+    const tableReactData = $table;
+    const {
+      editStore
+    } = tableReactData;
+    const editOpts = $table.computeEditOpts;
+    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), {
+      key: 2,
+      props: {
+        ...compProps,
+        className: 'vxe-reusekeep-control' + (className ? ' ' + className : ''),
+        inputClassName: 'vxe-reusekeep-control' + (inputClassName ? ' ' + inputClassName : '')
+      },
+      on: getEditOns(renderOpts, renderParams)
+    }));
+  }
+  return cellVNs;
+}
 /**
  * 表格 - 渲染器
  */
 render_renderer.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,
@@ -27474,15 +27639,15 @@ render_renderer.mixin({
   },
   VxeInput: {
     tableAutoFocus: true,
-    renderTableEdit: defaultEditRender,
-    renderTableCell(h, renderOpts, params) {
+    renderTableEdit: defaultInputEditRender,
+    renderTableCell(h, renderOpts, renderParams) {
       const {
         props = {}
       } = renderOpts;
       const {
         row,
         column
-      } = params;
+      } = renderParams;
       const inputConfig = render_getConfig().input || {};
       const digits = props.digits || inputConfig.digits || 2;
       let cellValue = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, column.field);
@@ -27500,16 +27665,24 @@ render_renderer.mixin({
             break;
         }
       }
-      return getCellLabelVNs(h, renderOpts, params, cellValue);
+      const cellVNs = getCellLabelVNs(h, renderOpts, renderParams, cellValue);
+      return getInputRenderCellVNs(h, cellValue, cellVNs, renderOpts, renderParams);
     },
-    renderTableDefault: defaultEditRender,
+    renderTableDefault: defaultInputEditRender,
     createTableFilterOptions: defaultFilterOptions,
     renderTableFilter: defaultFilterRender,
     renderTableFloatingFilter: defaultFloatingFilterRender,
     tableFilterDefaultMethod: handleInputFilterMethod
   },
   FormatNumberInput: {
-    renderTableDefault: handleNumberCell,
+    renderTableDefault(h, renderOpts, renderParams) {
+      const {
+        row,
+        column
+      } = renderParams;
+      const cellValue = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, column.field);
+      return handleNumberCell(h, cellValue, renderOpts, renderParams);
+    },
     tableFilterDefaultMethod({
       option,
       row,
@@ -27533,8 +27706,16 @@ render_renderer.mixin({
   },
   VxeNumberInput: {
     tableAutoFocus: true,
-    renderTableEdit: defaultEditRender,
-    renderTableCell: handleNumberCell,
+    renderTableEdit: defaultInputEditRender,
+    renderTableCell(h, renderOpts, renderParams) {
+      const {
+        row,
+        column
+      } = renderParams;
+      const cellValue = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, column.field);
+      const cellVNs = handleNumberCell(h, cellValue, renderOpts, renderParams);
+      return getInputRenderCellVNs(h, cellValue, cellVNs, renderOpts, renderParams);
+    },
     renderTableFooter(h, renderOpts, params) {
       const {
         props = {}
@@ -27581,7 +27762,7 @@ render_renderer.mixin({
       }
       return getFuncText(itemValue, 1);
     },
-    renderTableDefault: defaultEditRender,
+    renderTableDefault: defaultInputEditRender,
     createTableFilterOptions: defaultFilterOptions,
     renderTableFilter: defaultFilterRender,
     renderTableFloatingFilter: defaultFloatingFilterRender,
@@ -27765,8 +27946,17 @@ render_renderer.mixin({
   },
   VxeTextarea: {
     tableAutoFocus: true,
-    renderTableDefault: defaultEditRender,
-    renderTableEdit: defaultEditRender
+    renderTableDefault: defaultInputEditRender,
+    renderTableCell(h, renderOpts, renderParams) {
+      const {
+        row,
+        column
+      } = renderParams;
+      const cellValue = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, column.field);
+      const cellVNs = getCellLabelVNs(h, renderOpts, renderParams, cellValue);
+      return getInputRenderCellVNs(h, cellValue, cellVNs, renderOpts, renderParams);
+    },
+    renderTableEdit: defaultInputEditRender
   },
   VxeButton: {
     renderTableDefault: buttonCellRender
@@ -29060,7 +29250,7 @@ const Toolbar = VxeToolbar;
         quarter: '{yyyy}年第{q}季度',
         month: '{yyyy}年{MM}月',
         week: '{yyyy}年第{W}周',
-        day: '{yyyy}年{MM}月 {E}',
+        day: '{yyyy}年{MM}月 {eLabel}',
         date: '{yyyy}年{MM}月{dd}日',
         hour: '{yyyy}年{MM}月{dd}日{HH}时',
         minute: '{yyyy}年{MM}月{dd}日{HH}时{mm}分',
@@ -29071,12 +29261,23 @@ const Toolbar = VxeToolbar;
         quarter: '{q}季度',
         month: '{M}月',
         week: '{W}周',
-        day: '{d}',
+        day: '{eLabel}',
         date: '{d}',
         hour: '{HH}',
         minute: '{mm}',
         second: '{ss}'
       },
+      stepFormat: {
+        year: '{start.yyyy}~{end.yyyy}年',
+        quarter: '{start.q}~{end.q}季度',
+        month: '{start.M}~{end.M}月',
+        week: '{start.W}~{end.W}周',
+        day: '{eStartLabel}~{eEndLabel}',
+        date: '{start.d}~{end.d}',
+        hour: '{start.HH}~{end.HH}',
+        minute: '{start.mm}~{end.mm}',
+        second: '{start.ss}~{end.ss}'
+      },
       dayss: {
         w0: '日',
         w1: '一',
@@ -29085,6 +29286,15 @@ const Toolbar = VxeToolbar;
         w4: '四',
         w5: '五',
         w6: '六'
+      },
+      days: {
+        w0: '日',
+        w1: '一',
+        w2: '二',
+        w3: '三',
+        w4: '四',
+        w5: '五',
+        w6: '六'
       }
     },
     plugins: {