vxe-table 4.10.12 → 4.10.14

package/lib/ui/index.js

@@ -13,7 +13,7 @@ Object.defineProperty(exports, "VxeUI", {
 exports.version = exports.validators = exports.use = exports.t = exports.setup = exports.setTheme = exports.setLanguage = exports.setIcon = exports.setI18n = exports.setConfig = exports.saveFile = exports.renderer = exports.readFile = exports.print = exports.modal = exports.menus = exports.log = exports.interceptor = exports.hooks = exports.globalResize = exports.globalEvents = exports.getTheme = exports.getIcon = exports.getI18n = exports.getConfig = exports.formats = exports.default = exports.config = exports.commands = exports.clipboard = exports._t = void 0;
 var _core = require("@vxe-ui/core");
 var _utils = require("./src/utils");
-const version = exports.version = "4.10.12";
+const version = exports.version = "4.10.14";
 _core.VxeUI.version = version;
 _core.VxeUI.tableVersion = version;
 _core.VxeUI.setConfig({

package/lib/ui/index.min.js

@@ -1 +1 @@
-Object.defineProperty(exports,"__esModule",{value:!0}),exports.VXETable=void 0,Object.defineProperty(exports,"VxeUI",{enumerable:!0,get:function(){return _core.VxeUI}}),exports.version=exports.validators=exports.use=exports.t=exports.setup=exports.setTheme=exports.setLanguage=exports.setIcon=exports.setI18n=exports.setConfig=exports.saveFile=exports.renderer=exports.readFile=exports.print=exports.modal=exports.menus=exports.log=exports.interceptor=exports.hooks=exports.globalResize=exports.globalEvents=exports.getTheme=exports.getIcon=exports.getI18n=exports.getConfig=exports.formats=exports.default=exports.config=exports.commands=exports.clipboard=exports._t=void 0;var _core=require("@vxe-ui/core"),_utils=require("./src/utils");let version=exports.version="4.10.12",iconPrefix=(_core.VxeUI.version=version,_core.VxeUI.tableVersion=version,_core.VxeUI.setConfig({emptyCell:"　",table:{fit:!0,showHeader:!0,animat:!0,delayHover:250,autoResize:!0,minHeight:144,resizeConfig:{},resizableConfig:{dragMode:"auto",showDragTip:!0,isSyncAutoHeight:!0,isSyncAutoWidth:!0,minHeight:18},radioConfig:{strict:!0},rowDragConfig:{showIcon:!0,animation:!0,showGuidesStatus:!0,showDragTip:!0},columnDragConfig:{showIcon:!0,animation:!0,showGuidesStatus:!0,showDragTip:!0},checkboxConfig:{strict:!0},tooltipConfig:{enterable:!0},validConfig:{showMessage:!0,autoClear:!0,autoPos:!0,message:"inline",msgMode:"single",theme:"beautify"},columnConfig:{maxFixedSize:4},cellConfig:{padding:!0},headerCellConfig:{height:"unset"},footerCellConfig:{height:"unset"},customConfig:{allowVisible:!0,allowResizable:!0,allowFixed:!0,allowSort:!0,showFooter:!0,placement:"top-right",modalOptions:{showMaximize:!0,mask:!0,lockView:!0,resize:!0,escClosable:!0},drawerOptions:{mask:!0,lockView:!0,escClosable:!0,resize:!0}},sortConfig:{showIcon:!0,allowClear:!0,allowBtn:!0,iconLayout:"vertical"},filterConfig:{showIcon:!0},treeConfig:{rowField:"id",parentField:"parentId",childrenField:"children",hasChildField:"hasChild",mapChildrenField:"_X_ROW_CHILD",indent:20,showIcon:!0},expandConfig:{showIcon:!0},editConfig:{showIcon:!0,showAsterisk:!0,autoFocus:!0},importConfig:{_typeMaps:{csv:1,html:1,xml:1,txt:1}},exportConfig:{_typeMaps:{csv:1,html:1,xml:1,txt:1}},printConfig:{},mouseConfig:{extension:!0},keyboardConfig:{isEsc:!0},areaConfig:{autoClear:!0,selectCellByHeader:!0,selectCellByBody:!0,extendDirection:{top:!0,left:!0,bottom:!0,right:!0}},clipConfig:{isCopy:!0,isCut:!0,isPaste:!0},fnrConfig:{isFind:!0,isReplace:!0},virtualXConfig:{enabled:!0,gt:60,preSize:0,oSize:1},virtualYConfig:{enabled:!0,gt:100,preSize:1,oSize:2},scrollbarConfig:{}},grid:{formConfig:{enabled:!0},pagerConfig:{enabled:!0},toolbarConfig:{enabled:!0},proxyConfig:{enabled:!0,autoLoad:!0,showResponseMsg:!0,showActiveMsg:!0,props:{list:null,result:"result",total:"page.total",message:"message"}}},toolbar:{}}),"vxe-table-icon-"),setTheme=(_core.VxeUI.setIcon({TABLE_SORT_ASC:iconPrefix+"caret-up",TABLE_SORT_DESC:iconPrefix+"caret-down",TABLE_FILTER_NONE:iconPrefix+"funnel",TABLE_FILTER_MATCH:iconPrefix+"funnel",TABLE_EDIT:iconPrefix+"edit",TABLE_TITLE_PREFIX:iconPrefix+"question-circle-fill",TABLE_TITLE_SUFFIX:iconPrefix+"question-circle-fill",TABLE_TREE_LOADED:iconPrefix+"spinner roll",TABLE_TREE_OPEN:iconPrefix+"caret-right rotate90",TABLE_TREE_CLOSE:iconPrefix+"caret-right",TABLE_EXPAND_LOADED:iconPrefix+"spinner roll",TABLE_EXPAND_OPEN:iconPrefix+"arrow-right rotate90",TABLE_EXPAND_CLOSE:iconPrefix+"arrow-right",TABLE_CHECKBOX_CHECKED:iconPrefix+"checkbox-checked-fill",TABLE_CHECKBOX_UNCHECKED:iconPrefix+"checkbox-unchecked",TABLE_CHECKBOX_INDETERMINATE:iconPrefix+"checkbox-indeterminate-fill",TABLE_RADIO_CHECKED:iconPrefix+"radio-checked-fill",TABLE_RADIO_UNCHECKED:iconPrefix+"radio-unchecked",TABLE_CUSTOM_SORT:iconPrefix+"drag-handle",TABLE_MENU_OPTIONS:iconPrefix+"arrow-right",TABLE_DRAG_ROW:iconPrefix+"drag-handle",TABLE_DRAG_COLUMN:iconPrefix+"drag-handle",TABLE_DRAG_STATUS_ROW:iconPrefix+"sort",TABLE_DRAG_STATUS_SUB_ROW:iconPrefix+"add-sub",TABLE_DRAG_STATUS_COLUMN:iconPrefix+"swap",TABLE_DRAG_DISABLED:iconPrefix+"no-drop",TOOLBAR_TOOLS_REFRESH:iconPrefix+"repeat",TOOLBAR_TOOLS_REFRESH_LOADING:iconPrefix+"repeat roll",TOOLBAR_TOOLS_IMPORT:iconPrefix+"upload",TOOLBAR_TOOLS_EXPORT:iconPrefix+"download",TOOLBAR_TOOLS_PRINT:iconPrefix+"print",TOOLBAR_TOOLS_FULLSCREEN:iconPrefix+"fullscreen",TOOLBAR_TOOLS_MINIMIZE:iconPrefix+"minimize",TOOLBAR_TOOLS_CUSTOM:iconPrefix+"custom-column",TOOLBAR_TOOLS_FIXED_LEFT:iconPrefix+"fixed-left",TOOLBAR_TOOLS_FIXED_LEFT_ACTIVE:iconPrefix+"fixed-left-fill",TOOLBAR_TOOLS_FIXED_RIGHT:iconPrefix+"fixed-right",TOOLBAR_TOOLS_FIXED_RIGHT_ACTIVE:iconPrefix+"fixed-right-fill"}),exports.setTheme=_core.VxeUI.setTheme),getTheme=exports.getTheme=_core.VxeUI.getTheme,setConfig=exports.setConfig=_core.VxeUI.setConfig,getConfig=exports.getConfig=_core.VxeUI.getConfig,setIcon=exports.setIcon=_core.VxeUI.setIcon,getIcon=exports.getIcon=_core.VxeUI.getIcon,setLanguage=exports.setLanguage=_core.VxeUI.setLanguage,setI18n=exports.setI18n=_core.VxeUI.setI18n,getI18n=exports.getI18n=_core.VxeUI.getI18n,globalEvents=exports.globalEvents=_core.VxeUI.globalEvents,globalResize=exports.globalResize=_core.VxeUI.globalResize,renderer=exports.renderer=_core.VxeUI.renderer,validators=exports.validators=_core.VxeUI.validators,menus=exports.menus=_core.VxeUI.menus,formats=exports.formats=_core.VxeUI.formats,commands=exports.commands=_core.VxeUI.commands,interceptor=exports.interceptor=_core.VxeUI.interceptor,clipboard=exports.clipboard=_core.VxeUI.clipboard,log=exports.log=_core.VxeUI.log,hooks=exports.hooks=_core.VxeUI.hooks,use=exports.use=_core.VxeUI.use,setup=e=>_core.VxeUI.setConfig(e),config=(exports.setup=setup,_core.VxeUI.setup=setup,e=>_core.VxeUI.setConfig(e)),t=(exports.config=config,_core.VxeUI.config=config,(e,o)=>_core.VxeUI.getI18n(e,o)),_t=(exports.t=t,_core.VxeUI.t=t,(e,o)=>(0,_utils.getFuncText)(e,o)),VXETable=(exports._t=_t,_core.VxeUI._t=_t,exports.VXETable=_core.VxeUI),saveFile=e=>_core.VxeUI.saveFile(e),readFile=(exports.saveFile=saveFile,e=>_core.VxeUI.readFile(e)),print=(exports.readFile=readFile,e=>_core.VxeUI.print(e)),modal=(exports.print=print,exports.modal={get(e){return _core.VxeUI.modal.get(e)},close(e){return _core.VxeUI.modal.close(e)},open(e){return _core.VxeUI.modal.open(e)},alert(e,o,r){return _core.VxeUI.modal.alert(e,o,r)},confirm(e,o,r){return _core.VxeUI.modal.confirm(e,o,r)},message(e,o){return _core.VxeUI.modal.message(e,o)},notification(e,o,r){return _core.VxeUI.modal.notification(e,o,r)}});var _default=exports.default=_core.VxeUI;
+Object.defineProperty(exports,"__esModule",{value:!0}),exports.VXETable=void 0,Object.defineProperty(exports,"VxeUI",{enumerable:!0,get:function(){return _core.VxeUI}}),exports.version=exports.validators=exports.use=exports.t=exports.setup=exports.setTheme=exports.setLanguage=exports.setIcon=exports.setI18n=exports.setConfig=exports.saveFile=exports.renderer=exports.readFile=exports.print=exports.modal=exports.menus=exports.log=exports.interceptor=exports.hooks=exports.globalResize=exports.globalEvents=exports.getTheme=exports.getIcon=exports.getI18n=exports.getConfig=exports.formats=exports.default=exports.config=exports.commands=exports.clipboard=exports._t=void 0;var _core=require("@vxe-ui/core"),_utils=require("./src/utils");let version=exports.version="4.10.14",iconPrefix=(_core.VxeUI.version=version,_core.VxeUI.tableVersion=version,_core.VxeUI.setConfig({emptyCell:"　",table:{fit:!0,showHeader:!0,animat:!0,delayHover:250,autoResize:!0,minHeight:144,resizeConfig:{},resizableConfig:{dragMode:"auto",showDragTip:!0,isSyncAutoHeight:!0,isSyncAutoWidth:!0,minHeight:18},radioConfig:{strict:!0},rowDragConfig:{showIcon:!0,animation:!0,showGuidesStatus:!0,showDragTip:!0},columnDragConfig:{showIcon:!0,animation:!0,showGuidesStatus:!0,showDragTip:!0},checkboxConfig:{strict:!0},tooltipConfig:{enterable:!0},validConfig:{showMessage:!0,autoClear:!0,autoPos:!0,message:"inline",msgMode:"single",theme:"beautify"},columnConfig:{maxFixedSize:4},cellConfig:{padding:!0},headerCellConfig:{height:"unset"},footerCellConfig:{height:"unset"},customConfig:{allowVisible:!0,allowResizable:!0,allowFixed:!0,allowSort:!0,showFooter:!0,placement:"top-right",modalOptions:{showMaximize:!0,mask:!0,lockView:!0,resize:!0,escClosable:!0},drawerOptions:{mask:!0,lockView:!0,escClosable:!0,resize:!0}},sortConfig:{showIcon:!0,allowClear:!0,allowBtn:!0,iconLayout:"vertical"},filterConfig:{showIcon:!0},treeConfig:{rowField:"id",parentField:"parentId",childrenField:"children",hasChildField:"hasChild",mapChildrenField:"_X_ROW_CHILD",indent:20,showIcon:!0},expandConfig:{showIcon:!0},editConfig:{showIcon:!0,showAsterisk:!0,autoFocus:!0},importConfig:{_typeMaps:{csv:1,html:1,xml:1,txt:1}},exportConfig:{_typeMaps:{csv:1,html:1,xml:1,txt:1}},printConfig:{},mouseConfig:{extension:!0},keyboardConfig:{isEsc:!0},areaConfig:{autoClear:!0,selectCellByHeader:!0,selectCellByBody:!0,extendDirection:{top:!0,left:!0,bottom:!0,right:!0}},clipConfig:{isCopy:!0,isCut:!0,isPaste:!0},fnrConfig:{isFind:!0,isReplace:!0},virtualXConfig:{enabled:!0,gt:60,preSize:0,oSize:1},virtualYConfig:{enabled:!0,gt:100,preSize:1,oSize:2},scrollbarConfig:{}},grid:{formConfig:{enabled:!0},pagerConfig:{enabled:!0},toolbarConfig:{enabled:!0},proxyConfig:{enabled:!0,autoLoad:!0,showResponseMsg:!0,showActiveMsg:!0,props:{list:null,result:"result",total:"page.total",message:"message"}}},toolbar:{}}),"vxe-table-icon-"),setTheme=(_core.VxeUI.setIcon({TABLE_SORT_ASC:iconPrefix+"caret-up",TABLE_SORT_DESC:iconPrefix+"caret-down",TABLE_FILTER_NONE:iconPrefix+"funnel",TABLE_FILTER_MATCH:iconPrefix+"funnel",TABLE_EDIT:iconPrefix+"edit",TABLE_TITLE_PREFIX:iconPrefix+"question-circle-fill",TABLE_TITLE_SUFFIX:iconPrefix+"question-circle-fill",TABLE_TREE_LOADED:iconPrefix+"spinner roll",TABLE_TREE_OPEN:iconPrefix+"caret-right rotate90",TABLE_TREE_CLOSE:iconPrefix+"caret-right",TABLE_EXPAND_LOADED:iconPrefix+"spinner roll",TABLE_EXPAND_OPEN:iconPrefix+"arrow-right rotate90",TABLE_EXPAND_CLOSE:iconPrefix+"arrow-right",TABLE_CHECKBOX_CHECKED:iconPrefix+"checkbox-checked-fill",TABLE_CHECKBOX_UNCHECKED:iconPrefix+"checkbox-unchecked",TABLE_CHECKBOX_INDETERMINATE:iconPrefix+"checkbox-indeterminate-fill",TABLE_RADIO_CHECKED:iconPrefix+"radio-checked-fill",TABLE_RADIO_UNCHECKED:iconPrefix+"radio-unchecked",TABLE_CUSTOM_SORT:iconPrefix+"drag-handle",TABLE_MENU_OPTIONS:iconPrefix+"arrow-right",TABLE_DRAG_ROW:iconPrefix+"drag-handle",TABLE_DRAG_COLUMN:iconPrefix+"drag-handle",TABLE_DRAG_STATUS_ROW:iconPrefix+"sort",TABLE_DRAG_STATUS_SUB_ROW:iconPrefix+"add-sub",TABLE_DRAG_STATUS_COLUMN:iconPrefix+"swap",TABLE_DRAG_DISABLED:iconPrefix+"no-drop",TOOLBAR_TOOLS_REFRESH:iconPrefix+"repeat",TOOLBAR_TOOLS_REFRESH_LOADING:iconPrefix+"repeat roll",TOOLBAR_TOOLS_IMPORT:iconPrefix+"upload",TOOLBAR_TOOLS_EXPORT:iconPrefix+"download",TOOLBAR_TOOLS_PRINT:iconPrefix+"print",TOOLBAR_TOOLS_FULLSCREEN:iconPrefix+"fullscreen",TOOLBAR_TOOLS_MINIMIZE:iconPrefix+"minimize",TOOLBAR_TOOLS_CUSTOM:iconPrefix+"custom-column",TOOLBAR_TOOLS_FIXED_LEFT:iconPrefix+"fixed-left",TOOLBAR_TOOLS_FIXED_LEFT_ACTIVE:iconPrefix+"fixed-left-fill",TOOLBAR_TOOLS_FIXED_RIGHT:iconPrefix+"fixed-right",TOOLBAR_TOOLS_FIXED_RIGHT_ACTIVE:iconPrefix+"fixed-right-fill"}),exports.setTheme=_core.VxeUI.setTheme),getTheme=exports.getTheme=_core.VxeUI.getTheme,setConfig=exports.setConfig=_core.VxeUI.setConfig,getConfig=exports.getConfig=_core.VxeUI.getConfig,setIcon=exports.setIcon=_core.VxeUI.setIcon,getIcon=exports.getIcon=_core.VxeUI.getIcon,setLanguage=exports.setLanguage=_core.VxeUI.setLanguage,setI18n=exports.setI18n=_core.VxeUI.setI18n,getI18n=exports.getI18n=_core.VxeUI.getI18n,globalEvents=exports.globalEvents=_core.VxeUI.globalEvents,globalResize=exports.globalResize=_core.VxeUI.globalResize,renderer=exports.renderer=_core.VxeUI.renderer,validators=exports.validators=_core.VxeUI.validators,menus=exports.menus=_core.VxeUI.menus,formats=exports.formats=_core.VxeUI.formats,commands=exports.commands=_core.VxeUI.commands,interceptor=exports.interceptor=_core.VxeUI.interceptor,clipboard=exports.clipboard=_core.VxeUI.clipboard,log=exports.log=_core.VxeUI.log,hooks=exports.hooks=_core.VxeUI.hooks,use=exports.use=_core.VxeUI.use,setup=e=>_core.VxeUI.setConfig(e),config=(exports.setup=setup,_core.VxeUI.setup=setup,e=>_core.VxeUI.setConfig(e)),t=(exports.config=config,_core.VxeUI.config=config,(e,o)=>_core.VxeUI.getI18n(e,o)),_t=(exports.t=t,_core.VxeUI.t=t,(e,o)=>(0,_utils.getFuncText)(e,o)),VXETable=(exports._t=_t,_core.VxeUI._t=_t,exports.VXETable=_core.VxeUI),saveFile=e=>_core.VxeUI.saveFile(e),readFile=(exports.saveFile=saveFile,e=>_core.VxeUI.readFile(e)),print=(exports.readFile=readFile,e=>_core.VxeUI.print(e)),modal=(exports.print=print,exports.modal={get(e){return _core.VxeUI.modal.get(e)},close(e){return _core.VxeUI.modal.close(e)},open(e){return _core.VxeUI.modal.open(e)},alert(e,o,r){return _core.VxeUI.modal.alert(e,o,r)},confirm(e,o,r){return _core.VxeUI.modal.confirm(e,o,r)},message(e,o){return _core.VxeUI.modal.message(e,o)},notification(e,o,r){return _core.VxeUI.modal.notification(e,o,r)}});var _default=exports.default=_core.VxeUI;

package/lib/ui/src/log.js

@@ -8,6 +8,6 @@ var _core = require("@vxe-ui/core");
 const {
   log
 } = _core.VxeUI;
-const version = `table v${"4.10.12"}`;
+const version = `table v${"4.10.14"}`;
 const warnLog = exports.warnLog = log.create('warn', version);
 const errLog = exports.errLog = log.create('error', version);

package/lib/ui/src/log.min.js

@@ -1 +1 @@
-Object.defineProperty(exports,"__esModule",{value:!0}),exports.warnLog=exports.errLog=void 0;var _core=require("@vxe-ui/core");let log=_core.VxeUI.log,version="table v4.10.12",warnLog=exports.warnLog=log.create("warn",version),errLog=exports.errLog=log.create("error",version);
+Object.defineProperty(exports,"__esModule",{value:!0}),exports.warnLog=exports.errLog=void 0;var _core=require("@vxe-ui/core");let log=_core.VxeUI.log,version="table v4.10.14",warnLog=exports.warnLog=log.create("warn",version),errLog=exports.errLog=log.create("error",version);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vxe-table",
-  "version": "4.10.12",
+  "version": "4.10.14",
   "description": "一个基于 vue 的 PC 端表格组件，支持增删改查、虚拟树、拖拽排序，懒加载、快捷菜单、数据校验、树形结构、打印、导入导出、自定义模板、渲染器、JSON 配置式...",
   "scripts": {
     "update": "npm install --legacy-peer-deps",
@@ -28,7 +28,7 @@
   "style": "lib/style.css",
   "typings": "types/index.d.ts",
   "dependencies": {
-    "vxe-pc-ui": "^4.3.82"
+    "vxe-pc-ui": "^4.3.83"
   },
   "devDependencies": {
     "@types/resize-observer-browser": "^0.1.11",

package/packages/table/module/edit/hook.ts

@@ -6,7 +6,7 @@ import { getCellValue, setCellValue, getRowid } from '../../src/util'
 import { browse, removeClass, addClass } from '../../../ui/src/dom'
 import { warnLog, errLog } from '../../../ui/src/log'
 
-import type { TableEditMethods, TableEditPrivateMethods } from '../../../../types'
+import type { TableEditMethods, TableEditPrivateMethods, VxeTableDefines } from '../../../../types'
 
 const { getConfig, renderer, hooks, getI18n } = VxeUI
 
@@ -21,7 +21,7 @@ hooks.add('tableEditModule', {
     let editMethods = {} as TableEditMethods
     let editPrivateMethods = {} as TableEditPrivateMethods
 
-    const getEditColumnModel = (row: any, column: any) => {
+    const getEditColumnModel = (row: any, column: VxeTableDefines.ColumnInfo) => {
       const { model, editRender } = column
       if (editRender) {
         model.value = getCellValue(row, column)
@@ -29,7 +29,7 @@ hooks.add('tableEditModule', {
       }
     }
 
-    const setEditColumnModel = (row: any, column: any) => {
+    const setEditColumnModel = (row: any, column: VxeTableDefines.ColumnInfo) => {
       const { model, editRender } = column
       if (editRender && model.update) {
         setCellValue(row, column, model.value)
@@ -48,21 +48,21 @@ hooks.add('tableEditModule', {
       }
     }
 
-    function syncActivedCell () {
+    const syncActivedCell = () => {
       const { editStore, tableColumn } = reactData
       const editOpts = computeEditOpts.value
       const { actived } = editStore
       const { row, column } = actived
       if (row || column) {
         if (editOpts.mode === 'row') {
-          tableColumn.forEach((column: any) => setEditColumnModel(row, column))
+          tableColumn.forEach((column) => setEditColumnModel(row, column))
         } else {
           setEditColumnModel(row, column)
         }
       }
     }
 
-    function insertTreeRow (newRecords: any[], isAppend: boolean) {
+    const insertTreeRow = (newRecords: any[], isAppend: boolean) => {
       const { tableFullTreeData, afterFullData, fullDataRowIdData, fullAllDataRowIdData } = internalData
       const treeOpts = computeTreeOpts.value
       const { rowField, parentField, mapChildrenField } = treeOpts
@@ -329,6 +329,133 @@ hooks.add('tableEditModule', {
       })
     }
 
+    const handleEditActive = (params: any, evnt: Event | null, isFocus: boolean) => {
+      const { editConfig, mouseConfig } = props
+      const { editStore, tableColumn } = reactData
+      const editOpts = computeEditOpts.value
+      const { mode } = editOpts
+      const { actived, focused } = editStore
+      const { row, column } = params
+      const { editRender } = column
+      const cell = (params.cell || $xeTable.getCellElement(row, column))
+      const beforeEditMethod = editOpts.beforeEditMethod || editOpts.activeMethod
+      params.cell = cell
+      if (cell && isEnableConf(editConfig) && isEnableConf(editRender)) {
+        // 激活编辑
+        if (!$xeTable.isPendingByRow(row)) {
+          if (actived.row !== row || (mode === 'cell' ? actived.column !== column : false)) {
+            // 判断是否禁用编辑
+            let type: 'edit-disabled' | 'edit-activated' = 'edit-disabled'
+            if (!beforeEditMethod || beforeEditMethod({ ...params, $table: $xeTable, $grid: $xeTable.xegrid })) {
+              if (mouseConfig) {
+                $xeTable.clearSelected()
+                if ($xeTable.clearCellAreas) {
+                  $xeTable.clearCellAreas()
+                  $xeTable.clearCopyCellArea()
+                }
+              }
+              $xeTable.closeTooltip()
+              if (actived.column) {
+                handleClearEdit(evnt)
+              }
+              type = 'edit-activated'
+              column.renderHeight = cell.offsetHeight
+              actived.args = params
+              actived.row = row
+              actived.column = column
+              if (mode === 'row') {
+                tableColumn.forEach((column: any) => getEditColumnModel(row, column))
+              } else {
+                getEditColumnModel(row, column)
+              }
+              const afterEditMethod = editOpts.afterEditMethod
+              nextTick(() => {
+                if (isFocus) {
+                  $xeTable.handleFocus(params, evnt)
+                }
+                if (afterEditMethod) {
+                  afterEditMethod({ ...params, $table: $xeTable, $grid: $xeTable.xegrid })
+                }
+              })
+            }
+            $xeTable.dispatchEvent(type, {
+              row,
+              rowIndex: $xeTable.getRowIndex(row),
+              $rowIndex: $xeTable.getVMRowIndex(row),
+              column,
+              columnIndex: $xeTable.getColumnIndex(column),
+              $columnIndex: $xeTable.getVMColumnIndex(column)
+            }, evnt)
+
+            // v4已废弃
+            if (type === 'edit-activated') {
+              $xeTable.dispatchEvent('edit-actived', {
+                row,
+                rowIndex: $xeTable.getRowIndex(row),
+                $rowIndex: $xeTable.getVMRowIndex(row),
+                column,
+                columnIndex: $xeTable.getColumnIndex(column),
+                $columnIndex: $xeTable.getVMColumnIndex(column)
+              }, evnt)
+            }
+          } else {
+            const { column: oldColumn } = actived
+            if (mouseConfig) {
+              $xeTable.clearSelected()
+              if ($xeTable.clearCellAreas) {
+                $xeTable.clearCellAreas()
+                $xeTable.clearCopyCellArea()
+              }
+            }
+            if (oldColumn !== column) {
+              const { model: oldModel } = oldColumn
+              if (oldModel.update) {
+                setCellValue(row, oldColumn, oldModel.value)
+              }
+              if ($xeTable.clearValidate) {
+                $xeTable.clearValidate(row, column)
+              }
+            }
+            column.renderHeight = cell.offsetHeight
+            actived.args = params
+            actived.column = column
+            if (isFocus) {
+              setTimeout(() => {
+                $xeTable.handleFocus(params, evnt)
+              })
+            }
+          }
+          focused.column = null
+          focused.row = null
+          $xeTable.focus()
+        }
+      }
+      return nextTick()
+    }
+
+    const handleEditCell = (row: any, fieldOrColumn: string | VxeTableDefines.ColumnInfo, isPos: boolean) => {
+      const { editConfig } = props
+      const column = XEUtils.isString(fieldOrColumn) ? $xeTable.getColumnByField(fieldOrColumn) : fieldOrColumn
+      if (row && column && isEnableConf(editConfig) && isEnableConf(column.editRender)) {
+        return Promise.resolve(isPos ? $xeTable.scrollToRow(row, column) : null).then(() => {
+          const cell = $xeTable.getCellElement(row, column)
+          if (cell) {
+            handleEditActive({
+              row,
+              rowIndex: $xeTable.getRowIndex(row),
+              column,
+              columnIndex: $xeTable.getColumnIndex(column),
+              cell,
+              $table: $xeTable
+            }, null, false)
+            internalData._lastCallTime = Date.now()
+          }
+          return nextTick()
+        })
+      }
+      return nextTick()
+    }
+
     editMethods = {
       /**
        * 往表格中插入临时数据
@@ -658,7 +785,7 @@ hooks.add('tableEditModule', {
         if (fieldOrColumn) {
           column = XEUtils.isString(fieldOrColumn) ? $xeTable.getColumnByField(fieldOrColumn) : fieldOrColumn
         }
-        return $xeTable.setEditCell(row, column)
+        return handleEditCell(row, column, false)
       },
       setActiveCell (row, fieldOrColumn) {
         if (process.env.VUE_APP_VXE_ENV === 'development') {
@@ -671,26 +798,7 @@ hooks.add('tableEditModule', {
        * 激活单元格编辑
        */
       setEditCell (row, fieldOrColumn) {
-        const { editConfig } = props
-        const column = XEUtils.isString(fieldOrColumn) ? $xeTable.getColumnByField(fieldOrColumn) : fieldOrColumn
-        if (row && column && isEnableConf(editConfig) && isEnableConf(column.editRender)) {
-          return $xeTable.scrollToRow(row, column).then(() => {
-            const cell = $xeTable.getCellElement(row, column)
-            if (cell) {
-              editPrivateMethods.handleEdit({
-                row,
-                rowIndex: $xeTable.getRowIndex(row),
-                column,
-                columnIndex: $xeTable.getColumnIndex(column),
-                cell,
-                $table: $xeTable
-              })
-              internalData._lastCallTime = Date.now()
-            }
-            return nextTick()
-          })
-        }
-        return nextTick()
+        return handleEditCell(row, fieldOrColumn, true)
       },
       /**
        * 只对 trigger=dblclick 有效，选中单元格
@@ -722,103 +830,7 @@ hooks.add('tableEditModule', {
        * 处理激活编辑
        */
       handleEdit (params, evnt) {
-        const { editConfig, mouseConfig } = props
-        const { editStore, tableColumn } = reactData
-        const editOpts = computeEditOpts.value
-        const { mode } = editOpts
-        const { actived, focused } = editStore
-        const { row, column } = params
-        const { editRender } = column
-        const cell = (params.cell || $xeTable.getCellElement(row, column))
-        const beforeEditMethod = editOpts.beforeEditMethod || editOpts.activeMethod
-        params.cell = cell
-        if (cell && isEnableConf(editConfig) && isEnableConf(editRender)) {
-          // 激活编辑
-          if (!$xeTable.isPendingByRow(row)) {
-            if (actived.row !== row || (mode === 'cell' ? actived.column !== column : false)) {
-              // 判断是否禁用编辑
-              let type: 'edit-disabled' | 'edit-activated' = 'edit-disabled'
-              if (!beforeEditMethod || beforeEditMethod({ ...params, $table: $xeTable, $grid: $xeTable.xegrid })) {
-                if (mouseConfig) {
-                  editMethods.clearSelected()
-                  if ($xeTable.clearCellAreas) {
-                    $xeTable.clearCellAreas()
-                    $xeTable.clearCopyCellArea()
-                  }
-                }
-                $xeTable.closeTooltip()
-                if (actived.column) {
-                  handleClearEdit(evnt)
-                }
-                type = 'edit-activated'
-                column.renderHeight = cell.offsetHeight
-                actived.args = params
-                actived.row = row
-                actived.column = column
-                if (mode === 'row') {
-                  tableColumn.forEach((column: any) => getEditColumnModel(row, column))
-                } else {
-                  getEditColumnModel(row, column)
-                }
-                const afterEditMethod = editOpts.afterEditMethod
-                nextTick(() => {
-                  editPrivateMethods.handleFocus(params, evnt)
-                  if (afterEditMethod) {
-                    afterEditMethod({ ...params, $table: $xeTable, $grid: $xeTable.xegrid })
-                  }
-                })
-              }
-              $xeTable.dispatchEvent(type, {
-                row,
-                rowIndex: $xeTable.getRowIndex(row),
-                $rowIndex: $xeTable.getVMRowIndex(row),
-                column,
-                columnIndex: $xeTable.getColumnIndex(column),
-                $columnIndex: $xeTable.getVMColumnIndex(column)
-              }, evnt)
-
-              // v4已废弃
-              if (type === 'edit-activated') {
-                $xeTable.dispatchEvent('edit-actived', {
-                  row,
-                  rowIndex: $xeTable.getRowIndex(row),
-                  $rowIndex: $xeTable.getVMRowIndex(row),
-                  column,
-                  columnIndex: $xeTable.getColumnIndex(column),
-                  $columnIndex: $xeTable.getVMColumnIndex(column)
-                }, evnt)
-              }
-            } else {
-              const { column: oldColumn } = actived
-              if (mouseConfig) {
-                editMethods.clearSelected()
-                if ($xeTable.clearCellAreas) {
-                  $xeTable.clearCellAreas()
-                  $xeTable.clearCopyCellArea()
-                }
-              }
-              if (oldColumn !== column) {
-                const { model: oldModel } = oldColumn
-                if (oldModel.update) {
-                  setCellValue(row, oldColumn, oldModel.value)
-                }
-                if ($xeTable.clearValidate) {
-                  $xeTable.clearValidate(row, column)
-                }
-              }
-              column.renderHeight = cell.offsetHeight
-              actived.args = params
-              actived.column = column
-              setTimeout(() => {
-                editPrivateMethods.handleFocus(params, evnt)
-              })
-            }
-            focused.column = null
-            focused.row = null
-            $xeTable.focus()
-          }
-        }
-        return nextTick()
+        return handleEditActive(params, evnt, true)
       },
       /**
        * @deprecated

package/packages/table/module/export/hook.ts

@@ -3,6 +3,7 @@ import XEUtils from 'xe-utils'
 import { VxeUI } from '../../../ui'
 import { isColumnInfo, mergeBodyMethod, getCellValue } from '../../src/util'
 import { parseFile, formatText, eqEmptyValue } from '../../../ui/src/utils'
+import { hasClass } from '../../../ui/src/dom'
 import { createHtmlPage, getExportBlobByContent } from './util'
 import { warnLog, errLog } from '../../../ui/src/log'
 
@@ -406,7 +407,7 @@ hooks.add('tableExportModule', {
                         cellValue = htmlCellElem.innerText.trim()
                       } else {
                         const cell = $xeTable.getCellElement(row, column)
-                        if (cell) {
+                        if (cell && !hasClass(cell, 'is--progress')) {
                           cellValue = cell.innerText.trim()
                         }
                       }
@@ -464,7 +465,7 @@ hooks.add('tableExportModule', {
                     cellValue = htmlCellElem.innerText.trim()
                   } else {
                     const cell = $xeTable.getCellElement(row, column)
-                    if (cell) {
+                    if (cell && !hasClass(cell, 'is--progress')) {
                       cellValue = cell.innerText.trim()
                     }
                   }

package/packages/table/src/body.ts

@@ -408,6 +408,7 @@ export default defineComponent({
             'fixed--width': !isAutoCellWidth,
             'fixed--hidden': fixedHiddenColumn,
             'is--padding': isCellPadding,
+            'is--progress': (fixedHiddenColumn && isAllOverflow) || isVNPreEmptyStatus,
             'is--drag-cell': isRowDragCell && (isCrossDrag || isPeerDrag || !rowLevel),
             'is--drag-disabled': isDisabledDrag,
             'col--dirty': isDirty,

package/packages/table/src/table.ts

@@ -1648,13 +1648,13 @@ export default defineComponent({
       const sortOpts = computeSortOpts.value
       const treeOpts = computeTreeOpts.value
       const childrenField = treeOpts.children || treeOpts.childrenField
-      const { transform } = treeOpts
+      const { transform, rowField, parentField, mapChildrenField } = treeOpts
       const { remote: allRemoteFilter, filterMethod: allFilterMethod } = filterOpts
       const { remote: allRemoteSort, sortMethod: allSortMethod, multiple: sortMultiple, chronological } = sortOpts
       let tableData: any[] = []
       let tableTree: any[] = []
 
-      // 处理列
+      // 处理数据
       if (!allRemoteFilter || !allRemoteSort) {
         const filterColumns: {
           column: VxeTableDefines.ColumnInfo
@@ -1712,7 +1712,7 @@ export default defineComponent({
             tableTree = XEUtils.searchTree(tableFullTreeData, handleFilter, {
               original: true,
               isEvery: true,
-              children: treeOpts.mapChildrenField,
+              children: mapChildrenField,
               mapChildren: childrenField
             })
             tableData = tableTree
@@ -1726,7 +1726,7 @@ export default defineComponent({
             tableTree = XEUtils.searchTree(tableFullTreeData, () => true, {
               original: true,
               isEvery: true,
-              children: treeOpts.mapChildrenField,
+              children: mapChildrenField,
               mapChildren: childrenField
             })
             tableData = tableTree
@@ -1745,7 +1745,18 @@ export default defineComponent({
               const sortRests = allSortMethod({ data: tableTree, sortList: orderColumns, $table: $xeTable })
               tableTree = XEUtils.isArray(sortRests) ? sortRests : tableTree
             } else {
-              tableTree = XEUtils.orderBy(tableTree, orderColumns.map(({ column, order }) => [getOrderField(column), order]))
+              const treeList = XEUtils.toTreeArray(tableTree, {
+                children: mapChildrenField
+              })
+              tableTree = XEUtils.toArrayTree(
+                XEUtils.orderBy(treeList, orderColumns.map(({ column, order }) => [getOrderField(column), order])),
+                {
+                  key: rowField,
+                  parentKey: parentField,
+                  children: childrenField,
+                  mapChildren: mapChildrenField
+                }
+              )
             }
             tableData = tableTree
           } else {
@@ -8610,6 +8621,7 @@ export default defineComponent({
         }
       },
       triggerBodyScrollEvent (evnt, fixedType) {
+        const { scrollYLoad, scrollXLoad } = reactData
         const { elemStore, intoRunScroll, lastScrollTop, lastScrollLeft, inWheelScroll, inVirtualScroll, inHeaderScroll, inBodyScroll, scrollRenderType, inFooterScroll } = internalData
         const xHandleEl = refScrollXHandleElem.value
         const yHandleEl = refScrollYHandleElem.value
@@ -8664,13 +8676,17 @@ export default defineComponent({
             setScrollTop(rightScrollElem, scrollTop)
           }
           setScrollTop(yHandleEl, scrollTop)
-          $xeTable.triggerScrollYEvent(evnt)
+          if (scrollYLoad) {
+            $xeTable.triggerScrollYEvent(evnt)
+          }
         }
         if (isRollX) {
           setScrollLeft(xHandleEl, scrollLeft)
           setScrollLeft(headerScrollElem, scrollLeft)
           setScrollLeft(footerScrollElem, scrollLeft)
-          $xeTable.triggerScrollXEvent(evnt)
+          if (scrollXLoad) {
+            $xeTable.triggerScrollXEvent(evnt)
+          }
         }
         $xeTable.handleScrollEvent(evnt, isRollY, isRollX, scrollTop, scrollLeft, {
           type: 'body',
@@ -8678,6 +8694,7 @@ export default defineComponent({
         })
       },
       triggerHeaderScrollEvent (evnt, fixedType) {
+        const { scrollXLoad } = reactData
         const { elemStore, intoRunScroll, inWheelScroll, inVirtualScroll, inBodyScroll, inFooterScroll } = internalData
         const yHandleEl = refScrollYHandleElem.value
         const xHandleEl = refScrollXHandleElem.value
@@ -8707,13 +8724,16 @@ export default defineComponent({
         setScrollLeft(xHandleEl, scrollLeft)
         setScrollLeft(footerScrollElem, scrollLeft)
         setScrollLeft(bodyScrollElem, scrollLeft)
-        $xeTable.triggerScrollXEvent(evnt)
+        if (scrollXLoad) {
+          $xeTable.triggerScrollXEvent(evnt)
+        }
         $xeTable.handleScrollEvent(evnt, isRollY, isRollX, scrollTop, scrollLeft, {
           type: 'header',
           fixed: fixedType
         })
       },
       triggerFooterScrollEvent (evnt, fixedType) {
+        const { scrollXLoad } = reactData
         const { elemStore, intoRunScroll, inWheelScroll, inVirtualScroll, inHeaderScroll, inBodyScroll } = internalData
         const yHandleEl = refScrollYHandleElem.value
         const xHandleEl = refScrollXHandleElem.value
@@ -8743,7 +8763,9 @@ export default defineComponent({
         setScrollLeft(xHandleEl, scrollLeft)
         setScrollLeft(headerScrollElem, scrollLeft)
         setScrollLeft(bodyScrollElem, scrollLeft)
-        $xeTable.triggerScrollXEvent(evnt)
+        if (scrollXLoad) {
+          $xeTable.triggerScrollXEvent(evnt)
+        }
         $xeTable.handleScrollEvent(evnt, isRollY, isRollX, scrollTop, scrollLeft, {
           type: 'footer',
           fixed: fixedType
@@ -8755,6 +8777,7 @@ export default defineComponent({
           return
         }
         const { highlightHoverRow } = tableProps
+        const { scrollYLoad } = reactData
         const { elemStore, lastScrollTop, lastScrollLeft } = internalData
         const rowOpts = computeRowOpts.value
         const xHandleEl = refScrollXHandleElem.value
@@ -8802,7 +8825,9 @@ export default defineComponent({
             setScrollTop(bodyScrollElem, currTopNum)
             setScrollTop(leftScrollElem, currTopNum)
             setScrollTop(rightScrollElem, currTopNum)
-            $xeTable.triggerScrollYEvent(evnt)
+            if (scrollYLoad) {
+              $xeTable.triggerScrollYEvent(evnt)
+            }
             $xeTable.handleScrollEvent(evnt, isRollY, isRollX, currTopNum, scrollLeft, {
               type: 'table',
               fixed: ''
@@ -8823,6 +8848,7 @@ export default defineComponent({
         }
       },
       triggerVirtualScrollXEvent (evnt) {
+        const { scrollXLoad } = reactData
         const { elemStore, inWheelScroll, lastScrollTop, inHeaderScroll, inBodyScroll, inFooterScroll } = internalData
         if (inHeaderScroll || inBodyScroll || inFooterScroll) {
           return
@@ -8848,13 +8874,16 @@ export default defineComponent({
         setScrollLeft(bodyScrollElem, scrollLeft)
         setScrollLeft(headerScrollElem, scrollLeft)
         setScrollLeft(footerScrollElem, scrollLeft)
-        $xeTable.triggerScrollXEvent(evnt)
+        if (scrollXLoad) {
+          $xeTable.triggerScrollXEvent(evnt)
+        }
         $xeTable.handleScrollEvent(evnt, isRollY, isRollX, scrollTop, scrollLeft, {
           type: 'table',
           fixed: ''
         })
       },
       triggerVirtualScrollYEvent (evnt) {
+        const { scrollYLoad } = reactData
         const { elemStore, inWheelScroll, lastScrollLeft, inHeaderScroll, inBodyScroll, inFooterScroll } = internalData
         if (inHeaderScroll || inBodyScroll || inFooterScroll) {
           return
@@ -8880,7 +8909,9 @@ export default defineComponent({
         setScrollTop(bodyScrollElem, scrollTop)
         setScrollTop(leftScrollElem, scrollTop)
         setScrollTop(rightScrollElem, scrollTop)
-        $xeTable.triggerScrollYEvent(evnt)
+        if (scrollYLoad) {
+          $xeTable.triggerScrollYEvent(evnt)
+        }
         $xeTable.handleScrollEvent(evnt, isRollY, isRollX, scrollTop, scrollLeft, {
           type: 'table',
           fixed: ''