vxe-table 4.19.7 → 4.19.9

package/es/table/render/index.js

@@ -778,7 +778,24 @@ renderer.mixin({
         renderTableEdit: nativeSelectEditRender,
         renderTableDefault: nativeSelectEditRender,
         renderTableCell(renderOpts, params) {
-            return getCellLabelVNs(renderOpts, params, getSelectCellValue(renderOpts, params));
+            const { options, optionGroups } = renderOpts;
+            const { $table, row, column } = params;
+            const opSize = options ? options.length : null;
+            const ogSize = optionGroups ? optionGroups.length : null;
+            const { cellResult } = $table.effectCellData(row, column, {
+                key: 'render_table_cell',
+                isChanged({ oldValue, cellValue }) {
+                    return oldValue && oldValue[0] === cellValue && oldValue[1] === opSize && oldValue[2] === ogSize;
+                },
+                setValue({ cellValue }) {
+                    return [cellValue, opSize, ogSize];
+                },
+                getResult({ cellValue }) {
+                    return handleSelectCellValue(cellValue, renderOpts);
+                }
+            });
+            // const cellResult = getSelectCellValue(renderOpts, params)
+            return getCellLabelVNs(renderOpts, params, cellResult);
         },
         createTableFilterOptions: defaultFilterOptions,
         renderTableFilter(renderOpts, params) {
@@ -889,15 +906,20 @@ renderer.mixin({
         tableAutoFocus: 'input',
         renderTableEdit: defaultEditRender,
         renderTableCell(renderOpts, params) {
-            const { props = {} } = renderOpts;
-            const { row, column } = params;
-            let cellValue = XEUtils.get(row, column.field);
-            if (cellValue) {
-                if (props.type !== 'time') {
-                    cellValue = getLabelFormatDate(cellValue, props);
+            const props = renderOpts.props || {};
+            const { $table, row, column } = params;
+            const { cellResult } = $table.effectCellData(row, column, {
+                key: 'render_table_cell',
+                getResult({ cellValue }) {
+                    if (cellValue) {
+                        if (props.type !== 'time') {
+                            return getLabelFormatDate(cellValue, props);
+                        }
+                    }
+                    return cellValue;
                 }
-            }
-            return getCellLabelVNs(renderOpts, params, cellValue);
+            });
+            return getCellLabelVNs(renderOpts, params, cellResult);
         },
         tableCellFormatter: handleFormatDatePicker,
         renderTableDefault: defaultEditRender,
@@ -945,6 +967,37 @@ renderer.mixin({
                 }, seOs)))
             ];
         },
+        renderTableDefault(renderOpts, params) {
+            const { startField, endField } = renderOpts;
+            const { row, column } = params;
+            const { model } = column;
+            const cellValue = getCellValue(row, column);
+            const seProps = {};
+            const seOs = {};
+            if (startField && endField) {
+                seProps.startValue = XEUtils.get(row, startField);
+                seProps.endValue = XEUtils.get(row, endField);
+                seOs['onUpdate:startValue'] = (value) => {
+                    if (startField) {
+                        XEUtils.set(row, startField, value);
+                    }
+                };
+                seOs['onUpdate:endValue'] = (value) => {
+                    if (endField) {
+                        XEUtils.set(row, endField, value);
+                    }
+                };
+            }
+            return [
+                h(getDefaultComponent(renderOpts), Object.assign(Object.assign({}, getCellEditProps(renderOpts, params, cellValue, seProps)), getComponentOns(renderOpts, params, {
+                    model(cellValue) {
+                        model.update = true;
+                        model.value = cellValue;
+                        setCellValue(row, column, cellValue);
+                    }
+                }, seOs)))
+            ];
+        },
         renderTableCell(renderOpts, params) {
             const { startField, endField } = renderOpts;
             const { row, column } = params;
@@ -977,6 +1030,7 @@ renderer.mixin({
     },
     VxeTextarea: {
         tableAutoFocus: 'textarea',
+        renderTableDefault: defaultEditRender,
         renderTableEdit: defaultEditRender,
         renderTableCell(renderOpts, params) {
             const { row, column } = params;
@@ -1000,7 +1054,24 @@ renderer.mixin({
         renderTableEdit: defaultSelectEditRender,
         renderTableDefault: defaultSelectEditRender,
         renderTableCell(renderOpts, params) {
-            return getCellLabelVNs(renderOpts, params, getSelectCellValue(renderOpts, params));
+            const { options, optionGroups } = renderOpts;
+            const { $table, row, column } = params;
+            const opSize = options ? options.length : null;
+            const ogSize = optionGroups ? optionGroups.length : null;
+            const { cellResult } = $table.effectCellData(row, column, {
+                key: 'render_table_cell',
+                isChanged({ oldValue, cellValue }) {
+                    return oldValue && oldValue[0] === cellValue && oldValue[1] === opSize && oldValue[2] === ogSize;
+                },
+                setValue({ cellValue }) {
+                    return [cellValue, opSize, ogSize];
+                },
+                getResult({ cellValue }) {
+                    return handleSelectCellValue(cellValue, renderOpts);
+                }
+            });
+            // const cellResult = getSelectCellValue(renderOpts, params)
+            return getCellLabelVNs(renderOpts, params, cellResult);
         },
         createTableFilterOptions: defaultFilterOptions,
         renderTableFilter(renderOpts, params) {
@@ -1055,7 +1126,24 @@ renderer.mixin({
     },
     FormatSelect: {
         renderTableDefault(renderOpts, params) {
-            return getCellLabelVNs(renderOpts, params, getSelectCellValue(renderOpts, params));
+            const { options, optionGroups } = renderOpts;
+            const { $table, row, column } = params;
+            const opSize = options ? options.length : null;
+            const ogSize = optionGroups ? optionGroups.length : null;
+            const { cellResult } = $table.effectCellData(row, column, {
+                key: 'render_table_cell',
+                isChanged({ oldValue, cellValue }) {
+                    return oldValue && oldValue[0] === cellValue && oldValue[1] === opSize && oldValue[2] === ogSize;
+                },
+                setValue({ cellValue }) {
+                    return [cellValue, opSize, ogSize];
+                },
+                getResult({ cellValue }) {
+                    return handleSelectCellValue(cellValue, renderOpts);
+                }
+            });
+            // const cellResult = getSelectCellValue(renderOpts, params)
+            return getCellLabelVNs(renderOpts, params, cellResult);
         },
         tableCellFormatter: handleFormatSelect,
         tableCellCopyMethod: handleFormatSelect,
@@ -1067,7 +1155,24 @@ renderer.mixin({
         tableAutoFocus: 'input',
         renderTableEdit: defaultTableOrTreeSelectEditRender,
         renderTableCell(renderOpts, params) {
-            return getCellLabelVNs(renderOpts, params, getTreeSelectCellValue(renderOpts, params));
+            const { options, optionGroups } = renderOpts;
+            const { $table, row, column } = params;
+            const opSize = options ? options.length : null;
+            const ogSize = optionGroups ? optionGroups.length : null;
+            const { cellResult } = $table.effectCellData(row, column, {
+                key: 'render_table_cell',
+                isChanged({ oldValue, cellValue }) {
+                    return oldValue && oldValue[0] === cellValue && oldValue[1] === opSize && oldValue[2] === ogSize;
+                },
+                setValue({ cellValue }) {
+                    return [cellValue, opSize, ogSize];
+                },
+                getResult({ cellValue }) {
+                    return handleTreeSelectCellValue(cellValue, renderOpts);
+                }
+            });
+            // const cellResult = getTreeSelectCellValue(renderOpts, params)
+            return getCellLabelVNs(renderOpts, params, cellResult);
         },
         tableCellFormatter: handleFormatTreeSelect,
         tableCellCopyMethod: handleFormatTreeSelect,
@@ -1085,7 +1190,24 @@ renderer.mixin({
     },
     FormatTreeSelect: {
         renderTableDefault(renderOpts, params) {
-            return getCellLabelVNs(renderOpts, params, getTreeSelectCellValue(renderOpts, params));
+            const { options, optionGroups } = renderOpts;
+            const { $table, row, column } = params;
+            const opSize = options ? options.length : null;
+            const ogSize = optionGroups ? optionGroups.length : null;
+            const { cellResult } = $table.effectCellData(row, column, {
+                key: 'render_table_cell',
+                isChanged({ oldValue, cellValue }) {
+                    return oldValue && oldValue[0] === cellValue && oldValue[1] === opSize && oldValue[2] === ogSize;
+                },
+                setValue({ cellValue }) {
+                    return [cellValue, opSize, ogSize];
+                },
+                getResult({ cellValue }) {
+                    return handleTreeSelectCellValue(cellValue, renderOpts);
+                }
+            });
+            // const cellResult = getTreeSelectCellValue(renderOpts, params)
+            return getCellLabelVNs(renderOpts, params, cellResult);
         },
         tableCellFormatter: handleFormatTreeSelect,
         tableCellCopyMethod: handleFormatTreeSelect,
@@ -1096,7 +1218,24 @@ renderer.mixin({
         tableAutoFocus: 'input',
         renderTableEdit: defaultTableOrTreeSelectEditRender,
         renderTableCell(renderOpts, params) {
-            return getCellLabelVNs(renderOpts, params, getTreeSelectCellValue(renderOpts, params));
+            const { options, optionGroups } = renderOpts;
+            const { $table, row, column } = params;
+            const opSize = options ? options.length : null;
+            const ogSize = optionGroups ? optionGroups.length : null;
+            const { cellResult } = $table.effectCellData(row, column, {
+                key: 'render_table_cell',
+                isChanged({ oldValue, cellValue }) {
+                    return oldValue && oldValue[0] === cellValue && oldValue[1] === opSize && oldValue[2] === ogSize;
+                },
+                setValue({ cellValue }) {
+                    return [cellValue, opSize, ogSize];
+                },
+                getResult({ cellValue }) {
+                    return handleTreeSelectCellValue(cellValue, renderOpts);
+                }
+            });
+            // const cellResult = getTreeSelectCellValue(renderOpts, params)
+            return getCellLabelVNs(renderOpts, params, cellResult);
         },
         tableCellFormatter: handleFormatTreeSelect,
         tableCellCopyMethod: handleFormatTreeSelect,

package/es/table/src/table.js

@@ -4,7 +4,7 @@ import XEUtils from 'xe-utils';
 import { initTpImg, getTpImg, isPx, isScale, hasClass, addClass, removeClass, wheelScrollTopTo, wheelScrollLeftTo, getEventTargetNode, getPaddingTopBottomSize, setScrollTop, setScrollLeft, toCssUnit, hasControlKey, checkTargetElement, hasEventInputTarget } from '../../ui/src/dom';
 import { getLastZIndex, nextZIndex, hasChildrenList, getFuncText, isEnableConf, formatText, eqEmptyValue } from '../../ui/src/utils';
 import { VxeUI } from '../../ui';
-import { createReactData, createInternalData, getRowUniqueId, createRowId, clearTableAllStatus, getColumnList, toFilters, hasDeepKey, getRowkey, getRowid, rowToVisible, colToVisible, getCellValue, setCellValue, handleRowidOrRow, handleFieldOrColumn, toTreePathSeq, restoreScrollLocation, getRootColumn, getRefElem, getColReMinWidth, getColReMaxWidth, createHandleUpdateRowId, createHandleGetRowId, getCalcHeight, getCellRestHeight, getLastChildColumn } from './util';
+import { createReactData, createInternalData, getRowUniqueId, createRowId, clearTableAllStatus, getColumnList, toFilters, hasDeepKey, getRowkey, getRowid, rowToVisible, colToVisible, getCellValue, setCellValue, handleRowidOrRow, handleFieldOrColumn, toTreePathSeq, restoreScrollLocation, getRootColumn, getRefElem, getColReMinWidth, getColReMaxWidth, createHandleUpdateRowId, createHandleGetRowId, getCalcHeight, getCellRestHeight, getLastChildColumn, getRowMaxHeight } from './util';
 import { getSlotVNs } from '../../ui/src/vn';
 import { moveRowAnimateToTb, clearRowAnimate, moveColAnimateToLr, clearColAnimate } from '../../ui/src/anime';
 import { warnLog, errLog } from '../../ui/src/log';
@@ -1962,34 +1962,38 @@ export default defineVxeComponent({
         /**
          * 计算自适应行高
          */
-        const calcCellAutoHeight = (rowRest, wrapperEl) => {
-            const { scrollXLoad } = reactData;
+        const calcCellAutoHeight = (rowid, rowRest, wrapperEl) => {
+            const { fullCellHeightMaps } = internalData;
+            let chRest = fullCellHeightMaps[rowid];
+            if (!chRest) {
+                chRest = {};
+                fullCellHeightMaps[rowid] = chRest;
+            }
             const wrapperElemList = wrapperEl.querySelectorAll(`.vxe-cell--wrapper[rowid="${rowRest.rowid}"]`);
-            let colHeight = 0;
             let firstCellStyle = null;
             let topBottomPadding = 0;
+            let changeCH = false;
             for (let i = 0; i < wrapperElemList.length; i++) {
                 const wrapperElem = wrapperElemList[i];
                 const cellElem = wrapperElem.parentElement;
                 const cellStyle = cellElem.style;
                 const orHeight = cellStyle.height;
-                if (!scrollXLoad) {
-                    cellStyle.height = '';
-                }
+                const colid = wrapperElem.getAttribute('colid') || '';
+                cellStyle.height = '';
                 if (!firstCellStyle) {
                     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));
-            }
-            if (scrollXLoad) {
-                colHeight = Math.max(colHeight, rowRest.height);
+                const colHeight = Math.ceil(cellHeight + topBottomPadding);
+                if (chRest[colid] !== colHeight) {
+                    changeCH = true;
+                    chRest[colid] = colHeight;
+                }
+                cellStyle.height = orHeight;
             }
-            return colHeight;
+            const cellMaxHeight = getRowMaxHeight(chRest, changeCH);
+            return cellMaxHeight;
         };
         /**
          * 自适应行高
@@ -2011,7 +2015,7 @@ export default defineVxeComponent({
                     const rowid = handleGetRowId(row);
                     const rowRest = fullAllDataRowIdData[rowid];
                     if (rowRest) {
-                        const reHeight = calcCellAutoHeight(rowRest, el);
+                        const reHeight = calcCellAutoHeight(rowid, rowRest, el);
                         rowRest.height = Math.max(defaultRowHeight, reHeight);
                     }
                     el.removeAttribute('data-calc-row');
@@ -3281,7 +3285,6 @@ export default defineVxeComponent({
         };
         const handleRecalculateStyle = (reFull, reWidth, reHeight) => {
             const el = refElem.value;
-            internalData.rceRunTime = Date.now();
             if (!el || !el.clientWidth) {
                 return nextTick();
             }
@@ -3305,6 +3308,7 @@ export default defineVxeComponent({
             if (reFull) {
                 updateTreeLineStyle();
             }
+            internalData.rceRunTime = Date.now();
             return computeScrollLoad().then(() => {
                 // 初始化时需要在列计算之后再执行优化运算，达到最优显示效果
                 if (reWidth) {
@@ -3325,18 +3329,30 @@ export default defineVxeComponent({
                 if (reFull) {
                     updateTreeLineStyle();
                 }
+                internalData.rceRunTime = Date.now();
                 if (reFull) {
                     return computeScrollLoad();
                 }
             });
         };
+        const minRunDelay = 50;
         const handleLazyRecalculate = (reFull, reWidth, reHeight) => {
             return new Promise(resolve => {
                 const $xeGanttView = internalData.xeGanttView;
                 const { customStore } = reactData;
                 const { rceTimeout, rceRunTime } = internalData;
                 const resizeOpts = computeResizeOpts.value;
-                const refreshDelay = resizeOpts.refreshDelay || 20;
+                let rceDelay = internalData.rceDelay;
+                // 如果在500毫秒内频繁执行，则执行次数减缓
+                if (rceRunTime && rceRunTime > Date.now() - 500) {
+                    rceDelay += 50;
+                }
+                else {
+                    rceDelay = 0;
+                }
+                internalData.rceDelay = rceDelay;
+                const refreshDelay = resizeOpts.refreshDelay || 30;
+                const reDelay = rceDelay + refreshDelay;
                 const el = refElem.value;
                 if (el && el.clientWidth) {
                     autoCellWidth();
@@ -3347,7 +3363,7 @@ export default defineVxeComponent({
                 }
                 if (rceTimeout) {
                     clearTimeout(rceTimeout);
-                    if (rceRunTime && rceRunTime + (refreshDelay - 5) < Date.now()) {
+                    if (rceRunTime && rceRunTime + minRunDelay < Date.now()) {
                         resolve(handleRecalculateStyle(reFull, reWidth, reHeight));
                     }
                     else {
@@ -3365,11 +3381,23 @@ export default defineVxeComponent({
                 internalData.rceTimeout = setTimeout(() => {
                     internalData.rceTimeout = undefined;
                     handleRecalculateStyle(reFull, reWidth, reHeight);
-                }, refreshDelay);
+                    if ($xeGanttView && $xeGanttView.handleLazyRecalculate) {
+                        $xeGanttView.handleLazyRecalculate();
+                    }
+                }, reDelay);
             });
         };
+        let resizePending = false;
         const handleResizeEvent = () => {
-            handleLazyRecalculate(true, true, true);
+            if (resizePending) {
+                return;
+            }
+            resizePending = true;
+            handleLazyRecalculate(true, true, true).then(() => {
+                resizePending = false;
+            }).catch(() => {
+                resizePending = false;
+            });
         };
         const handleUpdateAggValues = () => {
             const { visibleColumn } = internalData;
@@ -3713,6 +3741,8 @@ export default defineVxeComponent({
             reactData.insertRowFlag++;
             internalData.removeRowMaps = {};
             reactData.removeRowFlag++;
+            internalData.fullCellHeightMaps = {};
+            internalData.fullCellStoreMaps = {};
             const sYLoad = updateScrollYStatus(fullData);
             // 全量数据
             internalData.tableFullData = fullData;
@@ -4073,8 +4103,42 @@ export default defineVxeComponent({
             internalData.fullColumnIdData = fullColIdData;
             internalData.fullColumnFieldData = fullColFieldData;
         };
-        const handleInitColumn = (collectColumn) => {
+        const buildColumnInfo = () => {
+            const { scrollXLoad, scrollYLoad, expandColumn } = reactData;
             const expandOpts = computeExpandOpts.value;
+            cacheColumnMap();
+            parseColumns(true).then(() => {
+                if (reactData.scrollXLoad) {
+                    loadScrollXData();
+                }
+            });
+            $xeTable.clearHeaderFormatterCache();
+            $xeTable.clearMergeCells();
+            $xeTable.clearMergeFooterItems();
+            $xeTable.handleTableData(true);
+            $xeTable.handleAggregateSummaryData();
+            if ((scrollXLoad || scrollYLoad) && (expandColumn && expandOpts.mode !== 'fixed')) {
+                warnLog('vxe.error.scrollErrProp', ['column.type=expand']);
+            }
+            return nextTick().then(() => {
+                if ($xeToolbar) {
+                    $xeToolbar.syncUpdate({
+                        collectColumn: internalData.collectColumn,
+                        $table: $xeTable
+                    });
+                }
+                if ($xeTable.handleUpdateCustomColumn) {
+                    $xeTable.handleUpdateCustomColumn();
+                }
+                const columnOpts = computeColumnOpts.value;
+                if (props.showCustomHeader && reactData.isGroup && (columnOpts.resizable || props.resizable)) {
+                    warnLog('vxe.error.notConflictProp', ['show-custom-header & colgroup', 'column-config.resizable=false']);
+                }
+                reactData.isColLoading = false;
+                return handleLazyRecalculate(false, true, true);
+            });
+        };
+        const handleInitColumn = (collectColumn) => {
             internalData.collectColumn = collectColumn;
             const tFullColumn = getColumnList(collectColumn);
             internalData.tableFullColumn = tFullColumn;
@@ -4082,38 +4146,7 @@ export default defineVxeComponent({
             reactData.isColLoading = true;
             initColumnHierarchy();
             return Promise.resolve(restoreCustomStorage()).then(() => {
-                const { scrollXLoad, scrollYLoad, expandColumn } = reactData;
-                cacheColumnMap();
-                parseColumns(true).then(() => {
-                    if (reactData.scrollXLoad) {
-                        loadScrollXData();
-                    }
-                });
-                $xeTable.clearHeaderFormatterCache();
-                $xeTable.clearMergeCells();
-                $xeTable.clearMergeFooterItems();
-                $xeTable.handleTableData(true);
-                $xeTable.handleAggregateSummaryData();
-                if ((scrollXLoad || scrollYLoad) && (expandColumn && expandOpts.mode !== 'fixed')) {
-                    warnLog('vxe.error.scrollErrProp', ['column.type=expand']);
-                }
-                return nextTick().then(() => {
-                    if ($xeToolbar) {
-                        $xeToolbar.syncUpdate({
-                            collectColumn: internalData.collectColumn,
-                            $table: $xeTable
-                        });
-                    }
-                    if ($xeTable.handleUpdateCustomColumn) {
-                        $xeTable.handleUpdateCustomColumn();
-                    }
-                    const columnOpts = computeColumnOpts.value;
-                    if (props.showCustomHeader && reactData.isGroup && (columnOpts.resizable || props.resizable)) {
-                        warnLog('vxe.error.notConflictProp', ['show-custom-header & colgroup', 'column-config.resizable=false']);
-                    }
-                    reactData.isColLoading = false;
-                    return handleLazyRecalculate(false, true, true);
-                });
+                return buildColumnInfo();
             });
         };
         const updateScrollXStatus = (fullColumn) => {
@@ -5202,6 +5235,56 @@ export default defineVxeComponent({
                 }
                 return nextTick();
             },
+            effectCellData(row, column, options) {
+                const { fullCellStoreMaps } = internalData;
+                const editOpts = computeEditOpts.value;
+                const { key, isChanged, setValue, getResult } = options;
+                const rowid = getRowid($xeTable, row);
+                const colid = column.id;
+                let rowStore = fullCellStoreMaps[rowid];
+                const cellValue = XEUtils.get(row, column.field);
+                const restParams = {
+                    $table: $xeTable,
+                    row,
+                    rowid,
+                    column,
+                    colid,
+                    cellValue,
+                    oldValue: null
+                };
+                if (editOpts.cache === false && key === 'render_table_cell') {
+                    const rest = restParams;
+                    rest.cellResult = getResult ? getResult(restParams) : cellValue;
+                    return rest;
+                }
+                if (!rowStore) {
+                    rowStore = {};
+                    fullCellStoreMaps[rowid] = rowStore;
+                }
+                let cellStore = rowStore[colid];
+                if (!cellStore) {
+                    cellStore = {
+                        value: undefined,
+                        result: {}
+                    };
+                    rowStore[colid] = cellStore;
+                }
+                const restData = rowStore[colid];
+                const oldValue = restData.value;
+                restParams.oldValue = oldValue;
+                if (isChanged ? !isChanged(restParams) : oldValue !== cellValue) {
+                    restData.value = setValue ? setValue(restParams) : cellValue;
+                    restData.result = {};
+                }
+                const storeData = restData.result;
+                if (XEUtils.isUndefined(storeData[key])) {
+                    storeData[key] = getResult ? getResult(restParams) : cellValue;
+                }
+                const cellResult = storeData[key];
+                const rest = restParams;
+                rest.cellResult = cellResult;
+                return rest;
+            },
             getCellElement(row, fieldOrColumn) {
                 const { elemStore } = internalData;
                 const column = handleFieldOrColumn($xeTable, fieldOrColumn);
@@ -6054,7 +6137,7 @@ export default defineVxeComponent({
                         const rowid = XEUtils.isString(row) || XEUtils.isNumber(row) ? row : handleGetRowId(row);
                         const rowRest = fullAllDataRowIdData[rowid];
                         if (rowRest) {
-                            rowRest.resizeHeight = calcCellAutoHeight(rowRest, el);
+                            rowRest.resizeHeight = calcCellAutoHeight(rowid, rowRest, el);
                         }
                         el.removeAttribute('data-calc-row');
                     });
@@ -7808,6 +7891,65 @@ export default defineVxeComponent({
             clearHistory() {
                 return $xeTable.handleClearStack();
             },
+            /**
+             * 用于 custom-config，用于手动恢复自定义列设置信息，恢复表格重置为初始状态
+             * @param storeData
+             * @returns
+             */
+            setCustomStoreData(storeData) {
+                if (!storeData) {
+                    return nextTick();
+                }
+                const customOpts = computeCustomOpts.value;
+                const { checkMethod } = customOpts;
+                // 重置状态
+                clearTableAllStatus($xeTable);
+                // 恢复列
+                const allCols = [];
+                XEUtils.eachTree(internalData.collectColumn, (column) => {
+                    column.resizeWidth = 0;
+                    column.fixed = column.defaultFixed;
+                    column.renderSortNumber = column.sortNumber;
+                    column.parentId = column.defaultParentId;
+                    if (!checkMethod || checkMethod({ $table: $xeTable, column })) {
+                        column.visible = column.defaultVisible;
+                    }
+                    column.aggFunc = column.defaultAggFunc;
+                    column.renderAggFn = column.defaultAggFunc;
+                    column.renderResizeWidth = column.renderWidth;
+                    allCols.push(column);
+                });
+                const newCollectCols = XEUtils.toArrayTree(XEUtils.orderBy(allCols, 'renderSortNumber'), { key: 'id', parentKey: 'parentId', children: 'children' });
+                internalData.collectColumn = newCollectCols;
+                internalData.tableFullColumn = getColumnList(newCollectCols);
+                reactData.updateColFlag++;
+                reactData.isColLoading = true;
+                initColumnHierarchy();
+                return Promise.resolve(handleCustomRestore(storeData)).then(() => {
+                    return buildColumnInfo();
+                }).then(() => {
+                    // 恢复数据聚合分组
+                    const { isRowGroupStatus, rowGroupList } = reactData;
+                    if (isRowGroupStatus && !!$xeTable.handlePivotTableAggData) {
+                        const rowGroupFields = computeRowGroupFields.value;
+                        if (rowGroupFields ? rowGroupFields.length : rowGroupList.length) {
+                            if (rowGroupFields && rowGroupFields.length) {
+                                $xeTable.setRowGroups(rowGroupFields);
+                            }
+                            else {
+                                $xeTable.clearRowGroups();
+                            }
+                        }
+                        else {
+                            $xeTable.handleUpdateAggData();
+                        }
+                    }
+                });
+            },
+            /**
+             * 用于 custom-config，用于获取自定义列设置信息，用于自定义保持
+             * @returns
+             */
             getCustomStoreData() {
                 const { id } = props;
                 const customOpts = computeCustomOpts.value;
@@ -9587,6 +9729,9 @@ export default defineVxeComponent({
                     }
                 }
             },
+            /**
+             * @private
+             */
             handleRowResizeMousedownEvent(evnt, params) {
                 evnt.stopPropagation();
                 evnt.preventDefault();
@@ -9703,6 +9848,9 @@ export default defineVxeComponent({
                 };
                 updateEvent(evnt);
             },
+            /**
+             * @private
+             */
             handleRowResizeDblclickEvent(evnt, params) {
                 const resizableOpts = computeResizableOpts.value;
                 const { isDblclickAutoHeight } = resizableOpts;
@@ -9721,7 +9869,7 @@ export default defineVxeComponent({
                     }
                     const handleRsHeight = () => {
                         el.setAttribute('data-calc-row', 'Y');
-                        const resizeHeight = calcCellAutoHeight(rowRest, el);
+                        const resizeHeight = calcCellAutoHeight(rowid, rowRest, el);
                         el.removeAttribute('data-calc-row');
                         const resizeParams = Object.assign(Object.assign({}, params), { resizeHeight, resizeRow: row });
                         reactData.isDragResize = false;
@@ -9742,6 +9890,9 @@ export default defineVxeComponent({
                     }
                 }
             },
+            /**
+             * @private
+             */
             saveCustomStore(type) {
                 const { customConfig } = props;
                 const tableId = computeTableId.value;
@@ -9788,6 +9939,9 @@ export default defineVxeComponent({
                 }
                 return nextTick();
             },
+            /**
+             * @private
+             */
             handleCustom() {
                 const { mouseConfig } = props;
                 if (mouseConfig) {