vxe-table 3.12.2 → 3.12.4

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.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="3.12.2",iconPrefix=(_core.VxeUI.version=version,_core.VxeUI.tableVersion=version,_core.VxeUI.setConfig({emptyCell:"　",table:{fit:!0,showHeader:!0,animat:!0,delayHover:250,autoResize:!0,padding:!0,minHeight:144,resizeConfig:{},resizableConfig:{dragMode:"auto",showDragTip:!0},radioConfig:{strict:!0},rowDragConfig:{showIcon:!0,animation:!0,showGuidesStatus:!0},columnDragConfig:{showIcon:!0,animation:!0,showGuidesStatus:!0},checkboxConfig:{strict:!0},tooltipConfig:{enterable:!0},validConfig:{showMessage:!0,autoClear:!0,autoPos:!0,message:"inline",msgMode:"single",theme:"beautify"},columnConfig:{maxFixedSize:4},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,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},clipConfig:{isCopy:!0,isCut:!0,isPaste:!0},fnrConfig:{isFind:!0,isReplace:!0},scrollX:{gt:60},scrollY:{gt:100}},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,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.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="3.12.4",iconPrefix=(_core.VxeUI.version=version,_core.VxeUI.tableVersion=version,_core.VxeUI.setConfig({emptyCell:"　",table:{fit:!0,showHeader:!0,animat:!0,delayHover:250,autoResize:!0,padding:!0,minHeight:144,resizeConfig:{},resizableConfig:{dragMode:"auto",showDragTip:!0},radioConfig:{strict:!0},rowDragConfig:{showIcon:!0,animation:!0,showGuidesStatus:!0},columnDragConfig:{showIcon:!0,animation:!0,showGuidesStatus:!0},checkboxConfig:{strict:!0},tooltipConfig:{enterable:!0},validConfig:{showMessage:!0,autoClear:!0,autoPos:!0,message:"inline",msgMode:"single",theme:"beautify"},columnConfig:{maxFixedSize:4},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,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},clipConfig:{isCopy:!0,isCut:!0,isPaste:!0},fnrConfig:{isFind:!0,isReplace:!0},scrollX:{gt:60},scrollY:{gt:100}},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,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${"3.12.2"}`;
+const version = `table v${"3.12.4"}`;
 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 v3.12.2",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 v3.12.4",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": "3.12.2",
+  "version": "3.12.4",
   "description": "一个基于 vue 的 PC 端表格组件，支持增删改查、虚拟树、拖拽排序，懒加载、快捷菜单、数据校验、树形结构、打印、导入导出、自定义模板、渲染器、JSON 配置式...",
   "scripts": {
     "update": "npm install --legacy-peer-deps",

package/packages/table/src/methods.ts

@@ -211,7 +211,7 @@ function cacheColumnMap ($xeTable: VxeTableConstructor) {
     }
   }
 
-  if (process.env.VUE_APP_VXE_ENV === 'development') {
+  if (process.env.VUE_APP_VXE_ENV === 'developmeznt') {
     if (htmlColumn) {
       if (!columnOpts.useKey) {
         errLog('vxe.error.reqProp', ['column-config.useKey & column.type=html'])
@@ -228,6 +228,60 @@ function cacheColumnMap ($xeTable: VxeTableConstructor) {
   reactData.isAllOverflow = isAllOverflow
 }
 
+const updateScrollYStatus = ($xeTable: VxeTableConstructor, fullData?: any[]) => {
+  const props = $xeTable
+  const reactData = $xeTable as unknown as TableReactData
+  const internalData = $xeTable as unknown as TableInternalData
+
+  const { treeConfig } = props
+  const sYOpts = $xeTable.computeSYOpts
+  const treeOpts = $xeTable.computeTreeOpts
+  const { transform } = treeOpts
+  const allList = fullData || internalData.tableFullData
+  // 如果gt为0，则总是启用
+  const scrollYLoad = (transform || !treeConfig) && !!sYOpts.enabled && sYOpts.gt > -1 && (sYOpts.gt === 0 || sYOpts.gt < allList.length)
+  reactData.scrollYLoad = scrollYLoad
+  return scrollYLoad
+}
+
+/**
+ * 如果为虚拟树，将树结构拍平
+ * @returns
+ */
+function handleVirtualTreeToList ($xeTable: VxeTableConstructor) {
+  const props = $xeTable
+  const reactData = $xeTable as unknown as TableReactData
+  const internalData = $xeTable as unknown as TableInternalData
+
+  const { treeConfig } = props
+  const { treeExpandedMaps } = reactData
+  const { fullAllDataRowIdData } = internalData
+  const treeOpts = $xeTable.computeTreeOpts
+  const childrenField = treeOpts.children || treeOpts.childrenField
+  if (treeConfig && treeOpts.transform) {
+    const fullData: any[] = []
+    const expandMaps: {
+      [key: string]: number
+    } = {}
+    XEUtils.eachTree(internalData.afterTreeFullData, (row, index, items, path, parentRow) => {
+      const rowid = getRowid($xeTable, row)
+      const parentRowid = getRowid($xeTable, parentRow)
+      if (!parentRow || (expandMaps[parentRowid] && treeExpandedMaps[parentRowid])) {
+        const rowRest = fullAllDataRowIdData[rowid]
+        if (rowRest) {
+          rowRest._index = fullData.length
+        }
+        expandMaps[rowid] = 1
+        fullData.push(row)
+      }
+    }, { children: childrenField })
+    internalData.afterFullData = fullData
+    updateScrollYStatus($xeTable, fullData)
+    return fullData
+  }
+  return internalData.afterFullData
+}
+
 function computeRowHeight ($xeTable: any) {
   const tableHeader = $xeTable.$refs.tableHeader
   const tableBody = $xeTable.$refs.tableBody
@@ -1146,6 +1200,8 @@ const Methods = {
     })
   },
   handleTableData (force: any) {
+    const $xeTable = this
+
     const { scrollYLoad, scrollYStore, fullDataRowIdData, afterFullData } = this
     let fullList = afterFullData
     // 是否进行数据处理
@@ -1153,7 +1209,7 @@ const Methods = {
       // 更新数据，处理筛选和排序
       this.updateAfterFullData()
       // 如果为虚拟树，将树结构拍平
-      fullList = this.handleVirtualTreeToList()
+      fullList = handleVirtualTreeToList($xeTable)
     }
     const tableData = scrollYLoad ? fullList.slice(scrollYStore.startIndex, scrollYStore.endIndex) : fullList.slice(0)
     tableData.forEach((row: any, $index: any) => {
@@ -1166,15 +1222,6 @@ const Methods = {
     this.tableData = tableData
     return this.$nextTick()
   },
-  updateScrollYStatus (fullData: any) {
-    const { treeConfig, treeOpts, sYOpts } = this
-    const { transform } = treeOpts
-    const allList = fullData || this.tableFullData
-    // 如果gt为0，则总是启用
-    const scrollYLoad = (transform || !treeConfig) && !!sYOpts.enabled && sYOpts.gt > -1 && (sYOpts.gt === 0 || sYOpts.gt <= allList.length)
-    this.scrollYLoad = scrollYLoad
-    return scrollYLoad
-  },
   /**
    * 加载表格数据
    * @param {Array} datas 数据
@@ -1230,7 +1277,7 @@ const Methods = {
     editStore.insertMaps = {}
     editStore.removeList = []
     editStore.removeMaps = {}
-    const sYLoad = this.updateScrollYStatus(fullData)
+    const sYLoad = updateScrollYStatus($xeTable, fullData)
     this.isDragRowMove = false
     // 全量数据
     this.tableFullData = fullData
@@ -2106,38 +2153,6 @@ const Methods = {
     }
     return rowList
   },
-  /**
-   * 如果为虚拟树，将树结构拍平
-   * @returns
-   */
-  handleVirtualTreeToList () {
-    const $xeTable = this
-    const internalData = $xeTable
-
-    const { fullAllDataRowIdData } = internalData
-    const { treeOpts, treeConfig, treeExpandedMaps, afterTreeFullData, afterFullData } = this
-    const childrenField = treeOpts.children || treeOpts.childrenField
-    if (treeConfig && treeOpts.transform) {
-      const fullData: any[] = []
-      const expandMaps: any = {}
-      XEUtils.eachTree(afterTreeFullData, (row, index, items, path, parentRow) => {
-        const rowid = getRowid(this, row)
-        const parentRowid = getRowid(this, parentRow)
-        if (!parentRow || (expandMaps[parentRowid] && treeExpandedMaps[parentRowid])) {
-          const rowRest = fullAllDataRowIdData[rowid]
-          if (rowRest) {
-            rowRest._index = fullData.length
-          }
-          expandMaps[rowid] = 1
-          fullData.push(row)
-        }
-      }, { children: childrenField })
-      this.afterFullData = fullData
-      this.updateScrollYStatus(fullData)
-      return fullData
-    }
-    return afterFullData
-  },
   /**
    * 获取处理后全量的表格数据
    * 如果存在筛选条件，继续处理
@@ -5597,7 +5612,7 @@ const Methods = {
           reactData.isDragRowMove = true
           $xeTable.handleTableData(treeConfig && transform)
           $xeTable.cacheRowMap()
-          $xeTable.updateScrollYStatus()
+          updateScrollYStatus($xeTable)
           if (!(treeConfig && transform)) {
             $xeTable.updateAfterDataIndex()
           }
@@ -6286,21 +6301,22 @@ const Methods = {
     return rowRest && !!rowRest.expandLoaded
   },
   clearRowExpandLoaded (row: any) {
-    const $xeTable = this
+    const $xeTable = this as VxeTableConstructor
+    const reactData = $xeTable as unknown as TableReactData
+    const internalData = $xeTable as unknown as TableInternalData
 
-    const { expandOpts, rowExpandLazyLoadedMaps, fullAllDataRowIdData } = this
+    const rExpandLazyLoadedMaps = { ...reactData.rowExpandLazyLoadedMaps }
+    const { fullAllDataRowIdData } = internalData
+    const expandOpts = $xeTable.computeExpandOpts
     const { lazy } = expandOpts
     const rowid = getRowid($xeTable, row)
     const rowRest = fullAllDataRowIdData[rowid]
     if (lazy && rowRest) {
       rowRest.expandLoaded = false
-      const rowTempExpandLazyLoadedMaps = { ...rowExpandLazyLoadedMaps }
-      if (rowTempExpandLazyLoadedMaps[rowid]) {
-        delete rowTempExpandLazyLoadedMaps[rowid]
-      }
-      this.rowExpandLazyLoadedMaps = rowTempExpandLazyLoadedMaps
+      delete rExpandLazyLoadedMaps[rowid]
     }
-    return this.$nextTick()
+    reactData.rowExpandLazyLoadedMaps = rExpandLazyLoadedMaps
+    return $xeTable.$nextTick()
   },
   /**
    * 重新懒加载展开行，并展开内容
@@ -6386,31 +6402,37 @@ const Methods = {
   },
   handleAsyncRowExpand (row: any) {
     const $xeTable = this
+    const reactData = $xeTable as TableReactData
+    const internalData = $xeTable as TableInternalData
 
     return new Promise<void>(resolve => {
       const { expandOpts } = this
       const { loadMethod } = expandOpts
       if (loadMethod) {
-        const { rowExpandLazyLoadedMaps, fullAllDataRowIdData } = this
+        const { fullAllDataRowIdData } = internalData
+        const rExpandLazyLoadedMaps = { ...reactData.rowExpandLazyLoadedMaps }
         const rowid = getRowid($xeTable, row)
         const rowRest = fullAllDataRowIdData[rowid]
-        rowExpandLazyLoadedMaps[rowid] = row
-        loadMethod({ $table: $xeTable, row, rowIndex: this.getRowIndex(row), $rowIndex: this.getVMRowIndex(row) }).then(() => {
-          const { rowExpandedMaps } = this
+        rExpandLazyLoadedMaps[rowid] = row
+        reactData.rowExpandLazyLoadedMaps = rExpandLazyLoadedMaps
+        loadMethod({ $table: $xeTable, row, rowIndex: $xeTable.getRowIndex(row), $rowIndex: $xeTable.getVMRowIndex(row) }).then(() => {
+          const rExpandedMaps = { ...reactData.rowExpandedMaps }
           if (rowRest) {
             rowRest.expandLoaded = true
           }
-          rowExpandedMaps[rowid] = row
+          rExpandedMaps[rowid] = row
+          reactData.rowExpandedMaps = rExpandedMaps
         }).catch(() => {
           if (rowRest) {
             rowRest.expandLoaded = false
           }
         }).finally(() => {
-          const { rowExpandLazyLoadedMaps } = this
-          if (rowExpandLazyLoadedMaps[rowid]) {
-            delete rowExpandLazyLoadedMaps[rowid]
+          const rExpandLazyLoadedMaps = { ...reactData.rowExpandLazyLoadedMaps }
+          if (rExpandLazyLoadedMaps[rowid]) {
+            delete rExpandLazyLoadedMaps[rowid]
           }
-          this.$nextTick().then(() => this.recalculate()).then(() => resolve())
+          reactData.rowExpandLazyLoadedMaps = rExpandLazyLoadedMaps
+          $xeTable.$nextTick().then(() => $xeTable.recalculate()).then(() => resolve())
         })
       } else {
         resolve()
@@ -6559,9 +6581,13 @@ const Methods = {
     return rowRest && !!rowRest.treeLoaded
   },
   clearTreeExpandLoaded (rows: any) {
-    const $xeTable = this
+    const $xeTable = this as VxeTableConstructor & VxeTablePrivateMethods
+    const reactData = $xeTable as unknown as TableReactData
+    const internalData = $xeTable as unknown as TableInternalData
 
-    const { treeOpts, treeExpandedMaps, fullAllDataRowIdData } = this
+    const tExpandedMaps = { ...reactData.treeExpandedMaps }
+    const { fullAllDataRowIdData } = internalData
+    const treeOpts = $xeTable.computeTreeOpts
     const { transform } = treeOpts
     if (rows) {
       if (!XEUtils.isArray(rows)) {
@@ -6572,23 +6598,26 @@ const Methods = {
         const rowRest = fullAllDataRowIdData[rowid]
         if (rowRest) {
           rowRest.treeLoaded = false
-          if (treeExpandedMaps[rowid]) {
-            delete treeExpandedMaps[rowid]
+          if (tExpandedMaps[rowid]) {
+            delete tExpandedMaps[rowid]
           }
         }
       })
     }
+    reactData.treeExpandedMaps = tExpandedMaps
     if (transform) {
-      this.handleVirtualTreeToList()
-      return this.handleTableData()
+      handleVirtualTreeToList($xeTable)
+      return $xeTable.handleTableData()
     }
-    return this.$nextTick()
+    return $xeTable.$nextTick()
   },
   /**
    * 重新懒加载树节点，并展开该节点
    * @param {Row} row 行对象
    */
   reloadTreeExpand (row: any) {
+    const $xeTable = this as VxeTableConstructor & VxeTablePrivateMethods
+
     const { treeOpts, treeExpandLazyLoadedMaps } = this
     const { transform, lazy } = treeOpts
     const hasChildField = treeOpts.hasChild || treeOpts.hasChildField
@@ -6598,7 +6627,7 @@ const Methods = {
         return this.handleAsyncTreeExpandChilds(row)
       }).then(() => {
         if (transform) {
-          this.handleVirtualTreeToList()
+          handleVirtualTreeToList($xeTable)
           return this.handleTableData()
         }
       }).then(() => {
@@ -6809,8 +6838,10 @@ const Methods = {
    * @returns
    */
   handleVirtualTreeExpand (rows: any[], expanded: boolean) {
+    const $xeTable = this as VxeTableConstructor & VxeTablePrivateMethods
+
     return this.handleBaseTreeExpand(rows, expanded).then(() => {
-      this.handleVirtualTreeToList()
+      handleVirtualTreeToList($xeTable)
       this.handleTableData()
       this.updateTreeDataIndex()
     }).then(() => {
@@ -6858,6 +6889,8 @@ const Methods = {
    * 手动清空树形节点的展开状态，数据会恢复成未展开的状态
    */
   clearTreeExpand () {
+    const $xeTable = this as VxeTableConstructor & VxeTablePrivateMethods
+
     const { treeOpts, tableFullData } = this
     const { transform, reserve } = treeOpts
     const childrenField = treeOpts.children || treeOpts.childrenField
@@ -6868,7 +6901,7 @@ const Methods = {
     }
     return this.handleTableData().then(() => {
       if (transform) {
-        this.handleVirtualTreeToList()
+        handleVirtualTreeToList($xeTable)
         return this.handleTableData()
       }
     }).then(() => {
@@ -7297,6 +7330,11 @@ const Methods = {
     }
     this.$nextTick(this.updateStyle)
   },
+  updateScrollYStatus () {
+    const $xeTable = this
+
+    return updateScrollYStatus($xeTable)
+  },
   /**
    * 如果有滚动条，则滚动到对应的位置
    * @param {Number} scrollLeft 左距离