vxe-table 4.17.6 → 4.17.8

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.17.6";
+const version = exports.version = "4.17.8";
 _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.17.6",iconPrefix=(_core.VxeUI.version=version,_core.VxeUI.tableVersion=version,_core.VxeUI.setConfig({emptyCell:"　",table:{fit:!0,showHeader:!0,animat:!0,delayHover:250,autoResize:!0,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},headerTooltipConfig:{enterable:!0},footerTooltipConfig:{enterable:!0},validConfig:{showMessage:!0,autoClear:!0,autoPos:!0,message:"inline",msgMode:"single",theme:"beautify"},columnConfig:{autoOptions:{isCalcHeader:!0,isCalcBody:!0,isCalcFooter:!0},maxFixedSize:4},cellConfig:{padding:!0},headerCellConfig:{height:"unset"},footerCellConfig:{height:"unset"},menuConfig:{destroyOnClose:!0},customConfig:{allowVisible:!0,allowResizable:!0,allowFixed:!0,allowSort:!0,showFooter:!0,placement:"top-right",storeOptions:{visible:!0,resizable:!0,sort:!0,fixed:!0},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:{destroyOnClose:!0,multiple:!0,showIcon:!0},floatingFilterConfig:{},aggregateConfig:{padding:!0,rowField:"id",parentField:"_X_ROW_PARENT_KEY",childrenField:"_X_ROW_CHILDREN",mapChildrenField:"_X_ROW_CHILD_LIST",indent:20,showIcon:!0,maxGroupSize:4,showAggFuncTitle:!0},treeConfig:{padding:!0,rowField:"id",parentField:"parentId",childrenField:"children",hasChildField:"hasChild",mapChildrenField:"_X_ROW_CHILD",indent:20,showIcon:!0,showRootLine:!0},expandConfig:{showIcon:!0,mode:"fixed"},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:{isAll:!0,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:{gt:24,preSize:1,oSize:0},virtualYConfig:{gt:100,preSize:1,oSize:0},scrollbarConfig:{x:{visible:!0},y:{visible:!0}}},grid:{formConfig:{enabled:!0},pagerConfig:{enabled:!0},toolbarConfig:{enabled:!0},proxyConfig:{enabled:!0,autoLoad:!0,showLoading:!0,showResponseMsg:!0,showActionMsg:!0,response:{list:null,result:"result",total:"page.total",message:"message"}}},toolbar:{},gantt:{}}),"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_CHECKBOX_DISABLED_UNCHECKED:iconPrefix+"checkbox-unchecked-fill",TABLE_RADIO_CHECKED:iconPrefix+"radio-checked-fill",TABLE_RADIO_UNCHECKED:iconPrefix+"radio-unchecked",TABLE_RADIO_DISABLED_UNCHECKED:iconPrefix+"radio-unchecked-fill",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_AGG_GROUP:iconPrefix+"grouping",TABLE_DRAG_STATUS_AGG_VALUES:iconPrefix+"values",TABLE_DRAG_STATUS_COLUMN:iconPrefix+"swap",TABLE_DRAG_DISABLED:iconPrefix+"no-drop",TABLE_ROW_GROUP_OPEN:iconPrefix+"arrow-right rotate90",TABLE_ROW_GROUP_CLOSE:iconPrefix+"arrow-right",TABLE_AGGREGATE_GROUPING:iconPrefix+"grouping",TABLE_AGGREGATE_VALUES:iconPrefix+"values",TABLE_AGGREGATE_SORT:iconPrefix+"drag-handle",TABLE_AGGREGATE_DELETE:iconPrefix+"close",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,i){return _core.VxeUI.modal.alert(e,o,i)},confirm(e,o,i){return _core.VxeUI.modal.confirm(e,o,i)},message(e,o){return _core.VxeUI.modal.message(e,o)},notification(e,o,i){return _core.VxeUI.modal.notification(e,o,i)}});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.17.8",iconPrefix=(_core.VxeUI.version=version,_core.VxeUI.tableVersion=version,_core.VxeUI.setConfig({emptyCell:"　",table:{fit:!0,showHeader:!0,animat:!0,delayHover:250,autoResize:!0,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},headerTooltipConfig:{enterable:!0},footerTooltipConfig:{enterable:!0},validConfig:{showMessage:!0,autoClear:!0,autoPos:!0,message:"inline",msgMode:"single",theme:"beautify"},columnConfig:{autoOptions:{isCalcHeader:!0,isCalcBody:!0,isCalcFooter:!0},maxFixedSize:4},cellConfig:{padding:!0},headerCellConfig:{height:"unset"},footerCellConfig:{height:"unset"},menuConfig:{destroyOnClose:!0},customConfig:{allowVisible:!0,allowResizable:!0,allowFixed:!0,allowSort:!0,showFooter:!0,placement:"top-right",storeOptions:{visible:!0,resizable:!0,sort:!0,fixed:!0},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:{destroyOnClose:!0,multiple:!0,showIcon:!0},floatingFilterConfig:{},aggregateConfig:{padding:!0,rowField:"id",parentField:"_X_ROW_PARENT_KEY",childrenField:"_X_ROW_CHILDREN",mapChildrenField:"_X_ROW_CHILD_LIST",indent:20,showIcon:!0,maxGroupSize:4,showAggFuncTitle:!0},treeConfig:{padding:!0,rowField:"id",parentField:"parentId",childrenField:"children",hasChildField:"hasChild",mapChildrenField:"_X_ROW_CHILD",indent:20,showIcon:!0,showRootLine:!0},expandConfig:{showIcon:!0,mode:"fixed"},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:{isAll:!0,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:{gt:24,preSize:1,oSize:0},virtualYConfig:{gt:100,preSize:1,oSize:0},scrollbarConfig:{x:{visible:!0},y:{visible:!0}}},grid:{formConfig:{enabled:!0},pagerConfig:{enabled:!0},toolbarConfig:{enabled:!0},proxyConfig:{enabled:!0,autoLoad:!0,showLoading:!0,showResponseMsg:!0,showActionMsg:!0,response:{list:null,result:"result",total:"page.total",message:"message"}}},toolbar:{},gantt:{}}),"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_CHECKBOX_DISABLED_UNCHECKED:iconPrefix+"checkbox-unchecked-fill",TABLE_RADIO_CHECKED:iconPrefix+"radio-checked-fill",TABLE_RADIO_UNCHECKED:iconPrefix+"radio-unchecked",TABLE_RADIO_DISABLED_UNCHECKED:iconPrefix+"radio-unchecked-fill",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_AGG_GROUP:iconPrefix+"grouping",TABLE_DRAG_STATUS_AGG_VALUES:iconPrefix+"values",TABLE_DRAG_STATUS_COLUMN:iconPrefix+"swap",TABLE_DRAG_DISABLED:iconPrefix+"no-drop",TABLE_ROW_GROUP_OPEN:iconPrefix+"arrow-right rotate90",TABLE_ROW_GROUP_CLOSE:iconPrefix+"arrow-right",TABLE_AGGREGATE_GROUPING:iconPrefix+"grouping",TABLE_AGGREGATE_VALUES:iconPrefix+"values",TABLE_AGGREGATE_SORT:iconPrefix+"drag-handle",TABLE_AGGREGATE_DELETE:iconPrefix+"close",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,i){return _core.VxeUI.modal.alert(e,o,i)},confirm(e,o,i){return _core.VxeUI.modal.confirm(e,o,i)},message(e,o){return _core.VxeUI.modal.message(e,o)},notification(e,o,i){return _core.VxeUI.modal.notification(e,o,i)}});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.17.6"}`;
+const version = `table v${"4.17.8"}`;
 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.17.6",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.17.8",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.17.6",
+  "version": "4.17.8",
   "description": "A PC-end table component based on Vxe UI, supporting copy-paste, data pivot table, and high-performance virtual list table solution.",
   "scripts": {
     "update": "npm install --legacy-peer-deps",

package/packages/table/src/body.ts

@@ -29,7 +29,7 @@ export default defineVxeComponent({
     const $xeTable = inject('$xeTable', {} as VxeTableConstructor & VxeTablePrivateMethods)
 
     const { xID, props: tableProps, context: tableContext, reactData: tableReactData, internalData: tableInternalData } = $xeTable
-    const { computeEditOpts, computeMouseOpts, computeCellOffsetWidth, computeAreaOpts, computeDefaultRowHeight, computeEmptyOpts, computeTooltipOpts, computeRadioOpts, computeExpandOpts, computeTreeOpts, computeCheckboxOpts, computeCellOpts, computeValidOpts, computeRowOpts, computeColumnOpts, computeRowDragOpts, computeResizableOpts, computeVirtualXOpts, computeVirtualYOpts } = $xeTable.getComputeMaps()
+    const { computeEditOpts, computeMouseOpts, computeCellOffsetWidth, computeAreaOpts, computeDefaultRowHeight, computeEmptyOpts, computeTooltipOpts, computeRadioOpts, computeExpandOpts, computeTreeOpts, computeCheckboxOpts, computeCellOpts, computeValidOpts, computeRowOpts, computeColumnOpts, computeRowDragOpts, computeResizableOpts, computeVirtualXOpts, computeVirtualYOpts, computeIsBodyRenderOptimize } = $xeTable.getComputeMaps()
 
     const refElem = ref() as Ref<HTMLDivElement>
     const refBodyScroll = ref() as Ref<HTMLDivElement>
@@ -729,24 +729,16 @@ export default defineVxeComponent({
       const $xeGantt = $xeTable.xeGantt
 
       const { fixedColumn, fixedType, tableColumn } = props
-      const { spanMethod, footerSpanMethod, mouseConfig } = tableProps
-      const { isGroup, tableData, isColLoading, overflowX, scrollXLoad, scrollYLoad, isAllOverflow, expandColumn, dragRow, dragCol } = tableReactData
+      const { mouseConfig } = tableProps
+      const { isGroup, tableData, isColLoading, overflowX, scrollXLoad, scrollYLoad, dragRow, dragCol } = tableReactData
       const { visibleColumn, fullAllDataRowIdData, fullColumnIdData } = tableInternalData
       const emptyOpts = computeEmptyOpts.value
       const mouseOpts = computeMouseOpts.value
-      const expandOpts = computeExpandOpts.value
+      const isBodyRenderOptimize = computeIsBodyRenderOptimize.value
 
       let renderDataList = tableData
       let renderColumnList = tableColumn as VxeTableDefines.ColumnInfo[]
-      let isOptimizeMode = false
-      // 如果是使用优化模式
-      if (scrollXLoad || scrollYLoad || isAllOverflow) {
-        if ((expandColumn && expandOpts.mode !== 'fixed') || spanMethod || footerSpanMethod) {
-          // 如果不支持优化模式
-        } else {
-          isOptimizeMode = true
-        }
-      }
+      const isOptimizeMode = isBodyRenderOptimize
 
       if (!isColLoading && (fixedType || !overflowX)) {
         renderColumnList = visibleColumn
@@ -821,12 +813,6 @@ export default defineVxeComponent({
         }
       }
 
-      const ons: Record<string, any> = {
-        onScroll (evnt: Event) {
-          $xeTable.triggerBodyScrollEvent(evnt, fixedType)
-        }
-      }
-
       return h('div', {
         ref: refElem,
         class: ['vxe-table--body-wrapper', fixedType ? `fixed-${fixedType}--wrapper` : 'body--wrapper'],
@@ -835,7 +821,9 @@ export default defineVxeComponent({
         h('div', {
           ref: refBodyScroll,
           class: 'vxe-table--body-inner-wrapper',
-          ...ons
+          onScroll (evnt) {
+            $xeTable.triggerBodyScrollEvent(evnt, fixedType)
+          }
         }, [
           fixedType
             ? renderEmptyElement($xeTable)

package/packages/table/src/cell.ts

@@ -186,7 +186,8 @@ function renderTitleContent (params: VxeTableDefines.CellRenderHeaderParams & {
   const { computeHeaderTooltipOpts } = $table.getComputeMaps()
   const { showHeaderOverflow: allColumnHeaderOverflow } = tableProps
   const { isRowGroupStatus } = tableReactData
-  const { showHeaderOverflow } = column
+  const { showHeaderOverflow, slots } = column
+  const titleSlot = slots ? slots.title : null
   const headerTooltipOpts = computeHeaderTooltipOpts.value
   const showAllTip = headerTooltipOpts.showAll
   const headOverflow = XEUtils.eqNull(showHeaderOverflow) ? allColumnHeaderOverflow : showHeaderOverflow
@@ -222,9 +223,11 @@ function renderTitleContent (params: VxeTableDefines.CellRenderHeaderParams & {
       ...ons
     }, isRowGroupStatus && column.aggFunc && $table.getPivotTableAggregateRenderColTitles
       ? $table.getPivotTableAggregateRenderColTitles(column, titleVN)
-      : [
-          titleVN
-        ])
+      : titleSlot
+        ? $table.callSlot(titleSlot, params)
+        : [
+            titleVN
+          ])
   ]
 }
 
@@ -1080,38 +1083,41 @@ export const Cell = {
     const { computeSortOpts } = $table.getComputeMaps()
     const sortOpts = computeSortOpts.value
     const { showIcon, allowBtn, ascTitle, descTitle, iconLayout, iconAsc, iconDesc, iconVisibleMethod } = sortOpts
-    const { order } = column
+    const { order, slots } = column
     if (showIcon && (!iconVisibleMethod || iconVisibleMethod(params))) {
-      return [
-        h('span', {
-          class: ['vxe-cell--sort', `vxe-cell--sort-${iconLayout}-layout`]
-        }, [
-          h('i', {
-            class: ['vxe-sort--asc-btn', iconAsc || getIcon().TABLE_SORT_ASC, {
-              'sort--active': order === 'asc'
-            }],
-            title: XEUtils.eqNull(ascTitle) ? getI18n('vxe.table.sortAsc') : `${ascTitle || ''}`,
-            onClick: allowBtn
-              ? (evnt: Event) => {
-                  evnt.stopPropagation()
-                  $table.triggerSortEvent(evnt, column, 'asc')
-                }
-              : undefined
-          }),
-          h('i', {
-            class: ['vxe-sort--desc-btn', iconDesc || getIcon().TABLE_SORT_DESC, {
-              'sort--active': order === 'desc'
-            }],
-            title: XEUtils.eqNull(descTitle) ? getI18n('vxe.table.sortDesc') : `${descTitle || ''}`,
-            onClick: allowBtn
-              ? (evnt: Event) => {
-                  evnt.stopPropagation()
-                  $table.triggerSortEvent(evnt, column, 'desc')
-                }
-              : undefined
-          })
-        ])
-      ]
+      const sortSlot = slots ? slots.sort : null
+      return sortSlot
+        ? getSlotVNs($table.callSlot(sortSlot, params)) as VNode[]
+        : [
+            h('span', {
+              class: ['vxe-cell--sort', `vxe-cell--sort-${iconLayout}-layout`]
+            }, [
+              h('i', {
+                class: ['vxe-sort--asc-btn', iconAsc || getIcon().TABLE_SORT_ASC, {
+                  'sort--active': order === 'asc'
+                }],
+                title: XEUtils.eqNull(ascTitle) ? getI18n('vxe.table.sortAsc') : `${ascTitle || ''}`,
+                onClick: allowBtn
+                  ? (evnt: Event) => {
+                      evnt.stopPropagation()
+                      $table.triggerSortEvent(evnt, column, 'asc')
+                    }
+                  : undefined
+              }),
+              h('i', {
+                class: ['vxe-sort--desc-btn', iconDesc || getIcon().TABLE_SORT_DESC, {
+                  'sort--active': order === 'desc'
+                }],
+                title: XEUtils.eqNull(descTitle) ? getI18n('vxe.table.sortDesc') : `${descTitle || ''}`,
+                onClick: allowBtn
+                  ? (evnt: Event) => {
+                      evnt.stopPropagation()
+                      $table.triggerSortEvent(evnt, column, 'desc')
+                    }
+                  : undefined
+              })
+            ])
+          ]
     }
     return []
   },

package/packages/table/src/footer.ts

@@ -36,7 +36,7 @@ export default defineVxeComponent({
     const $xeTable = inject('$xeTable', {} as VxeTableConstructor & VxeTableMethods & VxeTablePrivateMethods)
 
     const { xID, props: tableProps, reactData: tableReactData, internalData: tableInternalData } = $xeTable
-    const { computeFooterTooltipOpts, computeColumnOpts, computeCellOpts, computeFooterCellOpts, computeDefaultRowHeight, computeResizableOpts, computeVirtualXOpts } = $xeTable.getComputeMaps()
+    const { computeFooterTooltipOpts, computeColumnOpts, computeCellOpts, computeFooterCellOpts, computeDefaultRowHeight, computeResizableOpts, computeVirtualXOpts, computeIsFooterRenderOptimize } = $xeTable.getComputeMaps()
 
     const refElem = ref() as Ref<HTMLDivElement>
     const refFooterScroll = ref() as Ref<HTMLDivElement>
@@ -243,20 +243,12 @@ export default defineVxeComponent({
 
     const renderVN = () => {
       const { fixedType, fixedColumn, tableColumn } = props
-      const { spanMethod, footerSpanMethod, showFooterOverflow: allColumnFooterOverflow } = tableProps
       const { visibleColumn, fullColumnIdData } = tableInternalData
       const { isGroup, isColLoading, overflowX, scrollXLoad, dragCol } = tableReactData
+      const isFooterRenderOptimize = computeIsFooterRenderOptimize.value
 
       let renderColumnList = tableColumn
-      let isOptimizeMode = false
-      // 如果是使用优化模式
-      if (scrollXLoad && allColumnFooterOverflow) {
-        if (spanMethod || footerSpanMethod) {
-          // 如果不支持优化模式
-        } else {
-          isOptimizeMode = true
-        }
-      }
+      const isOptimizeMode = isFooterRenderOptimize
 
       if (!isOptimizeMode || (!isColLoading && (fixedType || !overflowX))) {
         renderColumnList = visibleColumn

package/packages/table/src/header.ts

@@ -45,7 +45,7 @@ export default defineVxeComponent({
     const $xeTable = inject('$xeTable', {} as VxeTableConstructor & VxeTableMethods & VxeTablePrivateMethods)
 
     const { xID, props: tableProps, reactData: tableReactData, internalData: tableInternalData } = $xeTable
-    const { computeColumnOpts, computeColumnDragOpts, computeCellOpts, computeMouseOpts, computeHeaderCellOpts, computeDefaultRowHeight, computeVirtualXOpts, computeFloatingFilterOpts } = $xeTable.getComputeMaps()
+    const { computeColumnOpts, computeColumnDragOpts, computeCellOpts, computeMouseOpts, computeHeaderCellOpts, computeDefaultRowHeight, computeVirtualXOpts, computeFloatingFilterOpts, computeIsHeaderRenderOptimize } = $xeTable.getComputeMaps()
 
     const headerColumn = ref<VxeTableDefines.ColumnInfo[][]>([])
 
@@ -416,27 +416,19 @@ export default defineVxeComponent({
 
     const renderVN = () => {
       const { fixedType, fixedColumn, tableColumn } = props
-      const { mouseConfig, showHeaderOverflow: allColumnHeaderOverflow, spanMethod, footerSpanMethod } = tableProps
+      const { mouseConfig } = tableProps
       const { isGroup, isColLoading, overflowX, scrollXLoad, dragCol } = tableReactData
       const { visibleColumn, fullColumnIdData } = tableInternalData
 
       const mouseOpts = computeMouseOpts.value
+      const isHeaderRenderOptimize = computeIsHeaderRenderOptimize.value
       let renderHeaderList = headerColumn.value || []
       let renderColumnList = tableColumn as VxeTableDefines.ColumnInfo[]
-      let isOptimizeMode = false
+      const isOptimizeMode = isHeaderRenderOptimize
 
       if (isGroup) {
         renderColumnList = visibleColumn
       } else {
-        // 如果是使用优化模式
-        if (scrollXLoad && allColumnHeaderOverflow) {
-          if (spanMethod || footerSpanMethod) {
-            // 如果不支持优化模式
-          } else {
-            isOptimizeMode = true
-          }
-        }
-
         if (!isOptimizeMode || (!isColLoading && (fixedType || !overflowX))) {
           renderColumnList = visibleColumn
         }

package/packages/table/src/table.ts

@@ -677,6 +677,77 @@ export default defineVxeComponent({
       return leftWidth
     })
 
+    const computeBodyMergeCoverFixed = computed(() => {
+      const { columnStore, mergeBodyFlag } = reactData
+      const { mergeBodyList, visibleColumn } = internalData
+      const { leftList, rightList } = columnStore
+      const rscIndex = visibleColumn.length - rightList.length
+      if (mergeBodyFlag && (leftList.length || rightList.length)) {
+        const lecIndex = leftList.length
+        for (let i = 0; i < mergeBodyList.length; i++) {
+          const { col, colspan } = mergeBodyList[i]
+          if (col < lecIndex || (col + colspan) > rscIndex) {
+            return true
+          }
+        }
+      }
+      return false
+    })
+
+    const computeIsHeaderRenderOptimize = computed(() => {
+      const { spanMethod, footerSpanMethod, showHeaderOverflow: allColumnHeaderOverflow } = props
+      const { isGroup, scrollXLoad } = reactData
+      let isOptimizeMode = false
+      if (isGroup) {
+        // 分组表头
+      } else {
+        // 如果是使用优化模式
+        if (scrollXLoad && allColumnHeaderOverflow) {
+          if (spanMethod || footerSpanMethod) {
+            // 如果不支持优化模式
+          } else {
+            isOptimizeMode = true
+          }
+        }
+      }
+      return isOptimizeMode
+    })
+
+    const computeIsBodyRenderOptimize = computed(() => {
+      const { spanMethod, footerSpanMethod } = props
+      const { scrollXLoad, scrollYLoad, isAllOverflow, expandColumn } = reactData
+      const bodyMergeCoverFixed = computeBodyMergeCoverFixed.value
+      const expandOpts = computeExpandOpts.value
+      let isOptimizeMode = false
+      // 如果是使用优化模式
+      if (scrollXLoad || scrollYLoad || isAllOverflow) {
+        // 如果是展开行，内联模式，不支持优化
+        // 如果是方法合并，不支持优化
+        // 如果固定列且配置式合并，不支持优化
+        if ((expandColumn && expandOpts.mode !== 'fixed') || bodyMergeCoverFixed || spanMethod || footerSpanMethod) {
+          // 如果不支持优化模式
+        } else {
+          isOptimizeMode = true
+        }
+      }
+      return isOptimizeMode
+    })
+
+    const computeIsFooterRenderOptimize = computed(() => {
+      const { spanMethod, footerSpanMethod, showFooterOverflow: allColumnFooterOverflow } = props
+      const { scrollXLoad } = reactData
+      let isOptimizeMode = false
+      // 如果是使用优化模式
+      if (scrollXLoad && allColumnFooterOverflow) {
+        if (spanMethod || footerSpanMethod) {
+          // 如果不支持优化模式
+        } else {
+          isOptimizeMode = true
+        }
+      }
+      return isOptimizeMode
+    })
+
     const computeHeaderMenu = computed(() => {
       const menuOpts = computeMenuOpts.value
       const headerOpts = menuOpts.header
@@ -949,9 +1020,13 @@ export default defineVxeComponent({
       computeCustomOpts,
       computeLeftFixedWidth,
       computeRightFixedWidth,
+      computeBodyMergeCoverFixed,
       computeFixedColumnSize,
       computeIsMaxFixedColumn,
       computeIsAllCheckboxDisabled,
+      computeIsHeaderRenderOptimize,
+      computeIsBodyRenderOptimize,
+      computeIsFooterRenderOptimize,
       computeVirtualScrollBars,
       computeRowGroupFields,
       computeRowGroupColumns,
@@ -2080,19 +2155,28 @@ export default defineVxeComponent({
      * 计算自适应行高
      */
     const calcCellAutoHeight = (rowRest: VxeTableDefines.RowCacheItem, wrapperEl: HTMLDivElement) => {
-      const cellElemList = wrapperEl.querySelectorAll(`.vxe-cell--wrapper[rowid="${rowRest.rowid}"]`)
+      const { scrollXLoad } = reactData
+      const wrapperElemList = wrapperEl.querySelectorAll(`.vxe-cell--wrapper[rowid="${rowRest.rowid}"]`)
       let colHeight = rowRest.height
       let firstCellStyle: CSSStyleDeclaration | null = null
       let topBottomPadding = 0
-      for (let i = 0; i < cellElemList.length; i++) {
-        const wrapperElem = cellElemList[i] as HTMLElement
+      for (let i = 0; i < wrapperElemList.length; i++) {
+        const wrapperElem = wrapperElemList[i] as HTMLElement
         const cellElem = wrapperElem.parentElement as HTMLTableCellElement
         if (!firstCellStyle) {
+          const cellStyle = cellElem.style
+          const orHeight = cellStyle.height
+          if (!scrollXLoad) {
+            cellStyle.height = ''
+          }
           firstCellStyle = getComputedStyle(cellElem)
           topBottomPadding = firstCellStyle ? Math.ceil(XEUtils.toNumber(firstCellStyle.paddingTop) + XEUtils.toNumber(firstCellStyle.paddingBottom)) : 0
+          if (!scrollXLoad) {
+            cellStyle.height = orHeight
+          }
         }
         const cellHeight = wrapperElem ? wrapperElem.clientHeight : 0
-        colHeight = Math.max(colHeight, Math.ceil(cellHeight + topBottomPadding))
+        colHeight = scrollXLoad ? Math.max(colHeight, Math.ceil(cellHeight + topBottomPadding)) : Math.ceil(cellHeight + topBottomPadding)
       }
       return colHeight
     }
@@ -2474,8 +2558,8 @@ export default defineVxeComponent({
     }
 
     const updateStyle = () => {
-      const { showHeaderOverflow: allColumnHeaderOverflow, showFooterOverflow: allColumnFooterOverflow, mouseConfig, spanMethod, footerSpanMethod } = props
-      const { isGroup, currentRow, tableColumn, scrollXLoad, scrollYLoad, overflowX, scrollbarWidth, overflowY, scrollbarHeight, scrollXWidth, columnStore, editStore, isAllOverflow, expandColumn, isColLoading } = reactData
+      const { mouseConfig } = props
+      const { isGroup, currentRow, tableColumn, overflowX, scrollbarWidth, overflowY, scrollbarHeight, scrollXWidth, columnStore, editStore, isColLoading } = reactData
       const { visibleColumn, tableHeight, elemStore, customHeight, customMinHeight, customMaxHeight, tHeaderHeight, tFooterHeight } = internalData
       const $xeGanttView = internalData.xeGanttView
       const el = refElem.value
@@ -2483,12 +2567,15 @@ export default defineVxeComponent({
         return
       }
       const containerList = ['main', 'left', 'right']
+      const { leftList, rightList } = columnStore
       let osbWidth = overflowY ? scrollbarWidth : 0
       let osbHeight = overflowX ? scrollbarHeight : 0
       const emptyPlaceholderElem = refEmptyPlaceholder.value
+      const isHeaderRenderOptimize = computeIsHeaderRenderOptimize.value
+      const isBodyRenderOptimize = computeIsBodyRenderOptimize.value
+      const isFooterRenderOptimize = computeIsFooterRenderOptimize.value
       const scrollbarOpts = computeScrollbarOpts.value
       const mouseOpts = computeMouseOpts.value
-      const expandOpts = computeExpandOpts.value
       const bodyWrapperElem = getRefElem(elemStore['main-body-wrapper'])
       const bodyTableElem = getRefElem(elemStore['main-body-table'])
       if (emptyPlaceholderElem) {
@@ -2610,7 +2697,7 @@ export default defineVxeComponent({
         let fixedColumn: VxeTableDefines.ColumnInfo[] = []
         let fixedWrapperElem: HTMLDivElement
         if (fixedType) {
-          fixedColumn = isFixedLeft ? columnStore.leftList : columnStore.rightList
+          fixedColumn = isFixedLeft ? leftList : rightList
           fixedWrapperElem = isFixedLeft ? refLeftContainer.value : refRightContainer.value
         }
         layoutList.forEach(layout => {
@@ -2621,20 +2708,11 @@ export default defineVxeComponent({
             // 表头体样式处理
             // 横向滚动渲染
             let renderColumnList = tableColumn
-            let isOptimizeMode = false
+            const isOptimizeMode = isHeaderRenderOptimize
 
             if (isGroup) {
               renderColumnList = visibleColumn
             } else {
-              // 如果是使用优化模式
-              if (scrollXLoad && allColumnHeaderOverflow) {
-                if (spanMethod || footerSpanMethod) {
-                  // 如果不支持优化模式
-                } else {
-                  isOptimizeMode = true
-                }
-              }
-
               if (!isOptimizeMode || (!isColLoading && (fixedType || !overflowX))) {
                 renderColumnList = visibleColumn
               }
@@ -2691,16 +2769,7 @@ export default defineVxeComponent({
             }
 
             let renderColumnList = tableColumn
-
-            let isOptimizeMode = false
-            // 如果是使用优化模式
-            if (scrollXLoad || scrollYLoad || isAllOverflow) {
-              if ((expandColumn && expandOpts.mode !== 'fixed') || spanMethod || footerSpanMethod) {
-                // 如果不支持优化模式
-              } else {
-                isOptimizeMode = true
-              }
-            }
+            const isOptimizeMode = isBodyRenderOptimize
 
             if (fixedType) {
               renderColumnList = visibleColumn
@@ -2734,15 +2803,7 @@ export default defineVxeComponent({
             }
           } else if (layout === 'footer') {
             let renderColumnList = tableColumn
-            let isOptimizeMode = false
-            // 如果是使用优化模式
-            if (scrollXLoad && allColumnFooterOverflow) {
-              if (spanMethod || footerSpanMethod) {
-                // 如果不支持优化模式
-              } else {
-                isOptimizeMode = true
-              }
-            }
+            const isOptimizeMode = isFooterRenderOptimize
 
             if (!isOptimizeMode || (!isColLoading && (fixedType || !overflowX))) {
               renderColumnList = visibleColumn
@@ -4190,6 +4251,7 @@ export default defineVxeComponent({
      * @returns
      */
     const handleVirtualTreeExpand = (rows: any[], expanded: boolean) => {
+      const { lastScrollLeft, lastScrollTop } = internalData
       return handleBaseTreeExpand(rows, expanded).then(() => {
         handleVirtualTreeToList()
         $xeTable.handleTableData()
@@ -4197,9 +4259,9 @@ export default defineVxeComponent({
         updateAfterDataIndex()
         return nextTick()
       }).then(() => {
-        updateTreeLineStyle()
-        return handleLazyRecalculate(true, true, true)
+        return handleRecalculateStyle(true, true, true)
       }).then(() => {
+        restoreScrollLocation($xeTable, lastScrollLeft, lastScrollTop)
         updateTreeLineStyle()
         setTimeout(() => {
           $xeTable.updateCellAreas()
@@ -11879,7 +11941,7 @@ export default defineVxeComponent({
       },
       // 更新纵向 Y 可视渲染上下剩余空间大小
       updateScrollYSpace () {
-        const { isAllOverflow, overflowY, scrollYLoad, expandColumn } = reactData
+        const { isAllOverflow, overflowY, scrollYLoad, scrollYHeight, expandColumn } = reactData
         const { scrollYStore, elemStore, isResizeCellHeight, afterFullData, fullAllDataRowIdData, rowExpandedMaps } = internalData
         const $xeGanttView = internalData.xeGanttView
         const { startIndex } = scrollYStore
@@ -11894,13 +11956,13 @@ export default defineVxeComponent({
         const rightbodyTableElem = getRefElem(elemStore['right-body-table'])
         const containerList = ['main', 'left', 'right']
         let ySpaceTop = 0
-        let scrollYHeight = 0
+        let sYHeight = scrollYHeight
         let isScrollYBig = false
         if (scrollYLoad) {
           const isCustomCellHeight = isResizeCellHeight || cellOpts.height || rowOpts.height
           if (!isCustomCellHeight && !expandColumn && isAllOverflow) {
-            scrollYHeight = afterFullData.length * defaultRowHeight
-            if (scrollYHeight > maxYHeight) {
+            sYHeight = afterFullData.length * defaultRowHeight
+            if (sYHeight > maxYHeight) {
               isScrollYBig = true
             }
             ySpaceTop = Math.max(0, startIndex * defaultRowHeight)
@@ -11913,18 +11975,21 @@ export default defineVxeComponent({
             const lastRow = afterFullData[afterFullData.length - 1]
             rowid = getRowid($xeTable, lastRow)
             rowRest = fullAllDataRowIdData[rowid] || {}
-            scrollYHeight = (rowRest.oTop || 0) + (rowRest.resizeHeight || cellOpts.height || rowOpts.height || rowRest.height || defaultRowHeight)
-            // 是否展开行
-            if (expandColumn && rowExpandedMaps[rowid]) {
-              scrollYHeight += rowRest.expandHeight || expandOpts.height || 0
+            // 如果为空时还没计算完数据，保持原高度不变
+            if (rowRest.oTop) {
+              sYHeight = (rowRest.oTop || 0) + (rowRest.resizeHeight || cellOpts.height || rowOpts.height || rowRest.height || defaultRowHeight)
+              // 是否展开行
+              if (expandColumn && rowExpandedMaps[rowid]) {
+                sYHeight += rowRest.expandHeight || expandOpts.height || 0
+              }
             }
-            if (scrollYHeight > maxYHeight) {
+            if (sYHeight > maxYHeight) {
               isScrollYBig = true
             }
           }
         } else {
           if (bodyTableElem) {
-            scrollYHeight = bodyTableElem.clientHeight
+            sYHeight = bodyTableElem.clientHeight
           }
         }
         let clientHeight = 0
@@ -11932,7 +11997,7 @@ export default defineVxeComponent({
           clientHeight = bodyScrollElem.clientHeight
         }
         // 虚拟渲染
-        let ySpaceHeight = scrollYHeight
+        let ySpaceHeight = sYHeight
         let scrollYTop = ySpaceTop
         if (isScrollYBig) {
           // 触底
@@ -11976,7 +12041,7 @@ export default defineVxeComponent({
           rowExpandYSpaceEl.style.height = ySpaceHeight ? `${ySpaceHeight}px` : ''
         }
         reactData.scrollYTop = scrollYTop
-        reactData.scrollYHeight = scrollYHeight
+        reactData.scrollYHeight = ySpaceHeight
         reactData.isScrollYBig = isScrollYBig
 
         calcScrollbar()
@@ -13175,12 +13240,12 @@ export default defineVxeComponent({
         if (props.resizable) {
           warnLog('vxe.error.delProp', ['resizable', 'column-config.resizable'])
         }
-        if (props.virtualXConfig && props.scrollX) {
-          warnLog('vxe.error.notSupportProp', ['virtual-x-config', 'scroll-x', 'scroll-x=null'])
-        }
-        if (props.virtualYConfig && props.scrollY) {
-          warnLog('vxe.error.notSupportProp', ['virtual-y-config', 'scroll-y', 'scroll-y=null'])
-        }
+        // if (props.virtualXConfig && props.scrollX) {
+        //   warnLog('vxe.error.notSupportProp', ['virtual-x-config', 'scroll-x', 'scroll-x=null'])
+        // }
+        // if (props.virtualYConfig && props.scrollY) {
+        //   warnLog('vxe.error.notSupportProp', ['virtual-y-config', 'scroll-y', 'scroll-y=null'])
+        // }
         if (props.aggregateConfig && props.rowGroupConfig) {
           warnLog('vxe.error.notSupportProp', ['aggregate-config', 'row-group-config', 'row-group-config=null'])
         }