vxe-table 4.19.7 → 4.19.9

package/dist/all.esm.js

@@ -44,7 +44,7 @@ function eqEmptyValue(cellValue) {
     return cellValue === '' || XEUtils.eqNull(cellValue);
 }
 
-const version$1 = "4.19.7";
+const version$1 = "4.19.9";
 VxeUI.version = version$1;
 VxeUI.tableVersion = version$1;
 VxeUI.setConfig({
@@ -556,7 +556,7 @@ const modal = {
 const defineVxeComponent = defineComponent;
 
 const { log } = VxeUI;
-const version = `table v${"4.19.7"}`;
+const version = `table v${"4.19.9"}`;
 const warnLog = log.create('warn', version);
 const errLog = log.create('error', version);
 
@@ -1019,6 +1019,8 @@ function createInternalData$3() {
         sourceDataRowIdData: {},
         fullColumnIdData: {},
         fullColumnFieldData: {},
+        fullCellHeightMaps: {},
+        fullCellStoreMaps: {},
         // 当前行
         currentRow: null,
         // 合并表头单元格的数据
@@ -1079,7 +1081,8 @@ function createInternalData$3() {
         inited: false,
         tooltipTimeout: null,
         initStatus: false,
-        isActivated: false
+        isActivated: false,
+        rceDelay: 0
         // _sToTime: null
     };
 }
@@ -1327,6 +1330,21 @@ function createReactData$2() {
         isColLoading: false
     };
 }
+const maxKey = '__max';
+function getRowMaxHeight(chRest, isForce) {
+    if (isForce || !chRest[maxKey]) {
+        let max = 0;
+        for (const key in chRest) {
+            const val = chRest[key];
+            if (key !== maxKey && XEUtils.isNumber(val) && val > max) {
+                max = val;
+            }
+        }
+        chRest[maxKey] = max;
+        return max;
+    }
+    return chRest[maxKey];
+}
 const getAllConvertColumns = (columns, parentColumn) => {
     const result = [];
     columns.forEach((column) => {
@@ -14212,7 +14230,24 @@ renderer$2.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) {
@@ -14323,15 +14358,20 @@ renderer$2.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,
@@ -14379,6 +14419,37 @@ renderer$2.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;
@@ -14411,6 +14482,7 @@ renderer$2.mixin({
     },
     VxeTextarea: {
         tableAutoFocus: 'textarea',
+        renderTableDefault: defaultEditRender,
         renderTableEdit: defaultEditRender,
         renderTableCell(renderOpts, params) {
             const { row, column } = params;
@@ -14434,7 +14506,24 @@ renderer$2.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) {
@@ -14489,7 +14578,24 @@ renderer$2.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,
@@ -14501,7 +14607,24 @@ renderer$2.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,
@@ -14519,7 +14642,24 @@ renderer$2.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,
@@ -14530,7 +14670,24 @@ renderer$2.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,
@@ -16624,34 +16781,38 @@ var VxeTableComponent = 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;
         };
         /**
          * 自适应行高
@@ -16673,7 +16834,7 @@ var VxeTableComponent = 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');
@@ -17943,7 +18104,6 @@ var VxeTableComponent = defineVxeComponent({
         };
         const handleRecalculateStyle = (reFull, reWidth, reHeight) => {
             const el = refElem.value;
-            internalData.rceRunTime = Date.now();
             if (!el || !el.clientWidth) {
                 return nextTick();
             }
@@ -17967,6 +18127,7 @@ var VxeTableComponent = defineVxeComponent({
             if (reFull) {
                 updateTreeLineStyle();
             }
+            internalData.rceRunTime = Date.now();
             return computeScrollLoad().then(() => {
                 // 初始化时需要在列计算之后再执行优化运算，达到最优显示效果
                 if (reWidth) {
@@ -17987,18 +18148,30 @@ var VxeTableComponent = 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();
@@ -18009,7 +18182,7 @@ var VxeTableComponent = defineVxeComponent({
                 }
                 if (rceTimeout) {
                     clearTimeout(rceTimeout);
-                    if (rceRunTime && rceRunTime + (refreshDelay - 5) < Date.now()) {
+                    if (rceRunTime && rceRunTime + minRunDelay < Date.now()) {
                         resolve(handleRecalculateStyle(reFull, reWidth, reHeight));
                     }
                     else {
@@ -18027,11 +18200,23 @@ var VxeTableComponent = 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;
@@ -18375,6 +18560,8 @@ var VxeTableComponent = defineVxeComponent({
             reactData.insertRowFlag++;
             internalData.removeRowMaps = {};
             reactData.removeRowFlag++;
+            internalData.fullCellHeightMaps = {};
+            internalData.fullCellStoreMaps = {};
             const sYLoad = updateScrollYStatus(fullData);
             // 全量数据
             internalData.tableFullData = fullData;
@@ -18735,8 +18922,42 @@ var VxeTableComponent = 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;
@@ -18744,38 +18965,7 @@ var VxeTableComponent = 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) => {
@@ -19864,6 +20054,56 @@ var VxeTableComponent = 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);
@@ -20712,7 +20952,7 @@ var VxeTableComponent = 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');
                     });
@@ -22466,6 +22706,65 @@ var VxeTableComponent = 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;
@@ -24235,6 +24534,9 @@ var VxeTableComponent = defineVxeComponent({
                     }
                 }
             },
+            /**
+             * @private
+             */
             handleRowResizeMousedownEvent(evnt, params) {
                 evnt.stopPropagation();
                 evnt.preventDefault();
@@ -24351,6 +24653,9 @@ var VxeTableComponent = defineVxeComponent({
                 };
                 updateEvent(evnt);
             },
+            /**
+             * @private
+             */
             handleRowResizeDblclickEvent(evnt, params) {
                 const resizableOpts = computeResizableOpts.value;
                 const { isDblclickAutoHeight } = resizableOpts;
@@ -24369,7 +24674,7 @@ var VxeTableComponent = 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;
@@ -24390,6 +24695,9 @@ var VxeTableComponent = defineVxeComponent({
                     }
                 }
             },
+            /**
+             * @private
+             */
             saveCustomStore(type) {
                 const { customConfig } = props;
                 const tableId = computeTableId.value;
@@ -24436,6 +24744,9 @@ var VxeTableComponent = defineVxeComponent({
                 }
                 return nextTick();
             },
+            /**
+             * @private
+             */
             handleCustom() {
                 const { mouseConfig } = props;
                 if (mouseConfig) {
@@ -29526,7 +29837,7 @@ var VxeToolbarComponent = defineVxeComponent({
 
 const { getConfig, getI18n, commands, hooks, useFns, createEvent, globalEvents, GLOBAL_EVENT_KEYS, renderEmptyElement } = VxeUI;
 const tableComponentPropKeys = Object.keys(tableProps);
-const tableComponentMethodKeys = ['clearAll', 'syncData', 'updateData', 'loadData', 'reloadData', 'reloadRow', 'loadColumn', 'reloadColumn', 'getRowNode', 'getColumnNode', 'getRowIndex', 'getVTRowIndex', 'getVMRowIndex', 'getColumnIndex', 'getVTColumnIndex', 'getVMColumnIndex', 'setRow', 'createData', 'createRow', 'revertData', 'clearData', 'isRemoveByRow', 'isInsertByRow', 'isUpdateByRow', 'getColumns', 'getColumnById', 'getColumnByField', 'getTableColumn', 'getFullColumns', 'getData', 'getCheckboxRecords', 'getParentRow', 'getTreeRowChildren', 'getTreeRowLevel', 'getTreeParentRow', 'getRowSeq', 'getRowById', 'getRowid', 'getTableData', 'getFullData', 'setColumnFixed', 'clearColumnFixed', 'setColumnWidth', 'getColumnWidth', 'recalcRowHeight', 'setRowHeightConf', 'getRowHeightConf', 'setRowHeight', 'getRowHeight', 'hideColumn', 'showColumn', 'resetColumn', 'refreshColumn', 'refreshScroll', 'recalculate', 'closeTooltip', 'isAllCheckboxChecked', 'isAllCheckboxIndeterminate', 'getCheckboxIndeterminateRecords', 'setCheckboxRow', 'setCheckboxRowKey', 'isCheckedByCheckboxRow', 'isCheckedByCheckboxRowKey', 'isIndeterminateByCheckboxRow', 'isIndeterminateByCheckboxRowKey', 'toggleCheckboxRow', 'setAllCheckboxRow', 'getRadioReserveRecord', 'clearRadioReserve', 'getCheckboxReserveRecords', 'clearCheckboxReserve', 'toggleAllCheckboxRow', 'clearCheckboxRow', 'setCurrentRow', 'isCheckedByRadioRow', 'isCheckedByRadioRowKey', 'setRadioRow', 'setRadioRowKey', 'clearCurrentRow', 'clearRadioRow', 'getCurrentRecord', 'getRadioRecord', 'getCurrentColumn', 'setCurrentColumn', 'clearCurrentColumn', 'setPendingRow', 'togglePendingRow', 'hasPendingByRow', 'isPendingByRow', 'getPendingRecords', 'clearPendingRow', 'setFilterByEvent', 'sort', 'setSort', 'setSortByEvent', 'clearSort', 'clearSortByEvent', 'isSort', 'getSortColumns', 'closeFilter', 'isFilter', 'clearFilterByEvent', 'isActiveFilterByColumn', 'isRowExpandLoaded', 'clearRowExpandLoaded', 'reloadRowExpand', 'reloadRowExpand', 'toggleRowExpand', 'setAllRowExpand', 'setRowExpand', 'isExpandByRow', 'isRowExpandByRow', 'clearRowExpand', 'clearRowExpandReserve', 'getRowExpandRecords', 'getTreeExpandRecords', 'isTreeExpandLoaded', 'clearTreeExpandLoaded', 'reloadTreeExpand', 'reloadTreeChilds', 'toggleTreeExpand', 'setAllTreeExpand', 'setTreeExpand', 'isTreeExpandByRow', 'clearTreeExpand', 'clearTreeExpandReserve', 'getScroll', 'getScrollData', 'scrollTo', 'scrollToStartRow', 'scrollToEndRow', 'scrollToRow', 'scrollToStartColumn', 'scrollToEndColumn', 'scrollToColumn', 'clearScroll', 'updateFooter', 'updateStatus', 'setMergeCells', 'removeInsertRow', 'removeMergeCells', 'getMergeCells', 'setMergeHeaderCells', 'removeMergeHeaderCells', 'getMergeHeaderCells', 'clearMergeHeaderCells', 'clearMergeCells', 'setMergeFooterItems', 'removeMergeFooterItems', 'getMergeFooterItems', 'clearMergeFooterItems', 'getCustomStoreData', 'setRowGroupExpand', 'setRowGroupExpandByField', 'setAllRowGroupExpand', 'clearRowGroupExpand', 'isRowGroupExpandByRow', 'isRowGroupRecord', 'isAggregateRecord', 'isAggregateExpandByRow', 'getAggregateContentByRow', 'getAggregateRowChildren', 'setRowGroups', 'clearRowGroups', 'openTooltip', 'moveColumnTo', 'moveRowTo', 'getCellLabel', 'updateCellLabel', 'clearFormatterCache', 'getFooterCellLabel', 'updateFooterCellLabel', 'clearFooterFormatterCache', 'undo', 'redo', 'getCellElement', 'focus', 'blur', 'connect', 'connectToolbar'];
+const tableComponentMethodKeys = ['clearAll', 'syncData', 'updateData', 'loadData', 'reloadData', 'reloadRow', 'loadColumn', 'reloadColumn', 'getRowNode', 'getColumnNode', 'getRowIndex', 'getVTRowIndex', 'getVMRowIndex', 'getColumnIndex', 'getVTColumnIndex', 'getVMColumnIndex', 'setRow', 'createData', 'createRow', 'revertData', 'clearData', 'isRemoveByRow', 'isInsertByRow', 'isUpdateByRow', 'getColumns', 'getColumnById', 'getColumnByField', 'getTableColumn', 'getFullColumns', 'getData', 'getCheckboxRecords', 'getParentRow', 'getTreeRowChildren', 'getTreeRowLevel', 'getTreeParentRow', 'getRowSeq', 'getRowById', 'getRowid', 'getTableData', 'getFullData', 'setColumnFixed', 'clearColumnFixed', 'setColumnWidth', 'getColumnWidth', 'recalcRowHeight', 'setRowHeightConf', 'getRowHeightConf', 'setRowHeight', 'getRowHeight', 'hideColumn', 'showColumn', 'resetColumn', 'refreshColumn', 'refreshScroll', 'recalculate', 'closeTooltip', 'isAllCheckboxChecked', 'isAllCheckboxIndeterminate', 'getCheckboxIndeterminateRecords', 'setCheckboxRow', 'setCheckboxRowKey', 'isCheckedByCheckboxRow', 'isCheckedByCheckboxRowKey', 'isIndeterminateByCheckboxRow', 'isIndeterminateByCheckboxRowKey', 'toggleCheckboxRow', 'setAllCheckboxRow', 'getRadioReserveRecord', 'clearRadioReserve', 'getCheckboxReserveRecords', 'clearCheckboxReserve', 'toggleAllCheckboxRow', 'clearCheckboxRow', 'setCurrentRow', 'isCheckedByRadioRow', 'isCheckedByRadioRowKey', 'setRadioRow', 'setRadioRowKey', 'clearCurrentRow', 'clearRadioRow', 'getCurrentRecord', 'getRadioRecord', 'getCurrentColumn', 'setCurrentColumn', 'clearCurrentColumn', 'setPendingRow', 'togglePendingRow', 'hasPendingByRow', 'isPendingByRow', 'getPendingRecords', 'clearPendingRow', 'setFilterByEvent', 'sort', 'setSort', 'setSortByEvent', 'clearSort', 'clearSortByEvent', 'isSort', 'getSortColumns', 'closeFilter', 'isFilter', 'clearFilterByEvent', 'isActiveFilterByColumn', 'isRowExpandLoaded', 'clearRowExpandLoaded', 'reloadRowExpand', 'reloadRowExpand', 'toggleRowExpand', 'setAllRowExpand', 'setRowExpand', 'isExpandByRow', 'isRowExpandByRow', 'clearRowExpand', 'clearRowExpandReserve', 'getRowExpandRecords', 'getTreeExpandRecords', 'isTreeExpandLoaded', 'clearTreeExpandLoaded', 'reloadTreeExpand', 'reloadTreeChilds', 'toggleTreeExpand', 'setAllTreeExpand', 'setTreeExpand', 'isTreeExpandByRow', 'clearTreeExpand', 'clearTreeExpandReserve', 'getScroll', 'getScrollData', 'scrollTo', 'scrollToStartRow', 'scrollToEndRow', 'scrollToRow', 'scrollToStartColumn', 'scrollToEndColumn', 'scrollToColumn', 'clearScroll', 'updateFooter', 'updateStatus', 'setMergeCells', 'removeInsertRow', 'removeMergeCells', 'getMergeCells', 'setMergeHeaderCells', 'removeMergeHeaderCells', 'getMergeHeaderCells', 'clearMergeHeaderCells', 'clearMergeCells', 'setMergeFooterItems', 'removeMergeFooterItems', 'getMergeFooterItems', 'clearMergeFooterItems', 'setCustomStoreData', 'getCustomStoreData', 'setRowGroupExpand', 'setRowGroupExpandByField', 'setAllRowGroupExpand', 'clearRowGroupExpand', 'isRowGroupExpandByRow', 'isRowGroupRecord', 'isAggregateRecord', 'isAggregateExpandByRow', 'getAggregateContentByRow', 'getAggregateRowChildren', 'setRowGroups', 'clearRowGroups', 'openTooltip', 'moveColumnTo', 'moveRowTo', 'getCellLabel', 'updateCellLabel', 'clearFormatterCache', 'getFooterCellLabel', 'updateFooterCellLabel', 'clearFooterFormatterCache', 'undo', 'redo', 'effectCellData', 'getCellElement', 'focus', 'blur', 'connect', 'connectToolbar'];
 function createReactData() {
     var _a;
     return {