vxe-table 4.17.6 → 4.17.8

package/es/table/src/body.js

@@ -23,7 +23,7 @@ export default defineVxeComponent({
     setup(props) {
         const $xeTable = inject('$xeTable', {});
         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();
         const refBodyScroll = ref();
         const refBodyTable = ref();
@@ -666,24 +666,15 @@ export default defineVxeComponent({
             const $xeGrid = $xeTable.xeGrid;
             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;
-            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;
             }
@@ -756,17 +747,18 @@ export default defineVxeComponent({
                     emptyContent = tableProps.emptyText || getI18n('vxe.table.emptyText');
                 }
             }
-            const ons = {
-                onScroll(evnt) {
-                    $xeTable.triggerBodyScrollEvent(evnt, fixedType);
-                }
-            };
             return h('div', {
                 ref: refElem,
                 class: ['vxe-table--body-wrapper', fixedType ? `fixed-${fixedType}--wrapper` : 'body--wrapper'],
                 xid: xID
             }, [
-                h('div', Object.assign({ ref: refBodyScroll, class: 'vxe-table--body-inner-wrapper' }, ons), [
+                h('div', {
+                    ref: refBodyScroll,
+                    class: 'vxe-table--body-inner-wrapper',
+                    onScroll(evnt) {
+                        $xeTable.triggerBodyScrollEvent(evnt, fixedType);
+                    }
+                }, [
                     fixedType
                         ? renderEmptyElement($xeTable)
                         : h('div', {

package/es/table/src/cell.js

@@ -164,7 +164,8 @@ function renderTitleContent(params, content) {
     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;
@@ -198,9 +199,11 @@ function renderTitleContent(params, content) {
     return [
         h('span', Object.assign({ class: 'vxe-cell--title' }, ons), isRowGroupStatus && column.aggFunc && $table.getPivotTableAggregateRenderColTitles
             ? $table.getPivotTableAggregateRenderColTitles(column, titleVN)
-            : [
-                titleVN
-            ])
+            : titleSlot
+                ? $table.callSlot(titleSlot, params)
+                : [
+                    titleVN
+                ])
     ];
 }
 function getFooterContent(params) {
@@ -1007,38 +1010,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) => {
-                                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) => {
-                                evnt.stopPropagation();
-                                $table.triggerSortEvent(evnt, column, 'desc');
-                            }
-                            : undefined
-                    })
-                ])
-            ];
+            const sortSlot = slots ? slots.sort : null;
+            return sortSlot
+                ? getSlotVNs($table.callSlot(sortSlot, params))
+                : [
+                    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) => {
+                                    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) => {
+                                    evnt.stopPropagation();
+                                    $table.triggerSortEvent(evnt, column, 'desc');
+                                }
+                                : undefined
+                        })
+                    ])
+                ];
         }
         return [];
     },

package/es/table/src/footer.js

@@ -30,7 +30,7 @@ export default defineVxeComponent({
     setup(props) {
         const $xeTable = inject('$xeTable', {});
         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();
         const refFooterScroll = ref();
         const refFooterTable = ref();
@@ -221,20 +221,11 @@ 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/es/table/src/header.js

@@ -37,7 +37,7 @@ export default defineVxeComponent({
     setup(props) {
         const $xeTable = inject('$xeTable', {});
         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([]);
         const refElem = ref();
         const refHeaderScroll = ref();
@@ -373,26 +373,18 @@ 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;
-            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/es/table/src/table.js

@@ -588,6 +588,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;
@@ -835,9 +906,13 @@ export default defineVxeComponent({
             computeCustomOpts,
             computeLeftFixedWidth,
             computeRightFixedWidth,
+            computeBodyMergeCoverFixed,
             computeFixedColumnSize,
             computeIsMaxFixedColumn,
             computeIsAllCheckboxDisabled,
+            computeIsHeaderRenderOptimize,
+            computeIsBodyRenderOptimize,
+            computeIsFooterRenderOptimize,
             computeVirtualScrollBars,
             computeRowGroupFields,
             computeRowGroupColumns,
@@ -1942,19 +2017,28 @@ export default defineVxeComponent({
          * 计算自适应行高
          */
         const calcCellAutoHeight = (rowRest, wrapperEl) => {
-            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 = null;
             let topBottomPadding = 0;
-            for (let i = 0; i < cellElemList.length; i++) {
-                const wrapperElem = cellElemList[i];
+            for (let i = 0; i < wrapperElemList.length; i++) {
+                const wrapperElem = wrapperElemList[i];
                 const cellElem = wrapperElem.parentElement;
                 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;
         };
@@ -2338,8 +2422,8 @@ export default defineVxeComponent({
             updateAfterDataIndex();
         };
         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;
@@ -2347,12 +2431,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) {
@@ -2470,7 +2557,7 @@ export default defineVxeComponent({
                 let fixedColumn = [];
                 let fixedWrapperElem;
                 if (fixedType) {
-                    fixedColumn = isFixedLeft ? columnStore.leftList : columnStore.rightList;
+                    fixedColumn = isFixedLeft ? leftList : rightList;
                     fixedWrapperElem = isFixedLeft ? refLeftContainer.value : refRightContainer.value;
                 }
                 layoutList.forEach(layout => {
@@ -2481,20 +2568,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;
                             }
@@ -2547,16 +2625,7 @@ export default defineVxeComponent({
                             fixedWrapperElem.style.width = `${fixedColumn.reduce((previous, column) => previous + column.renderWidth, 0)}px`;
                         }
                         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;
                             if (isOptimizeMode) {
@@ -2588,16 +2657,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;
                         }
@@ -4014,6 +4074,7 @@ export default defineVxeComponent({
          * @returns
          */
         const handleVirtualTreeExpand = (rows, expanded) => {
+            const { lastScrollLeft, lastScrollTop } = internalData;
             return handleBaseTreeExpand(rows, expanded).then(() => {
                 handleVirtualTreeToList();
                 $xeTable.handleTableData();
@@ -4021,9 +4082,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();
@@ -11698,7 +11759,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;
@@ -11713,13 +11774,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);
@@ -11732,19 +11793,22 @@ 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;
@@ -11752,7 +11816,7 @@ export default defineVxeComponent({
                     clientHeight = bodyScrollElem.clientHeight;
                 }
                 // 虚拟渲染
-                let ySpaceHeight = scrollYHeight;
+                let ySpaceHeight = sYHeight;
                 let scrollYTop = ySpaceTop;
                 if (isScrollYBig) {
                     // 触底
@@ -11794,7 +11858,7 @@ export default defineVxeComponent({
                     rowExpandYSpaceEl.style.height = ySpaceHeight ? `${ySpaceHeight}px` : '';
                 }
                 reactData.scrollYTop = scrollYTop;
-                reactData.scrollYHeight = scrollYHeight;
+                reactData.scrollYHeight = ySpaceHeight;
                 reactData.isScrollYBig = isScrollYBig;
                 calcScrollbar();
                 if (isScrollYBig && mouseOpts.area) {
@@ -12945,12 +13009,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']);
                 }

package/es/ui/index.js

@@ -1,6 +1,6 @@
 import { VxeUI } from '@vxe-ui/core';
 import { getFuncText } from './src/utils';
-export const version = "4.17.6";
+export const version = "4.17.8";
 VxeUI.version = version;
 VxeUI.tableVersion = version;
 VxeUI.setConfig({

package/es/ui/src/log.js

@@ -1,5 +1,5 @@
 import { VxeUI } from '@vxe-ui/core';
 const { log } = VxeUI;
-const version = `table v${"4.17.6"}`;
+const version = `table v${"4.17.8"}`;
 export const warnLog = log.create('warn', version);
 export const errLog = log.create('error', version);