vxe-table 3.19.27 → 3.19.29

package/es/table/src/methods.js

@@ -5,7 +5,7 @@ import { VxeUI } from '../../ui';
 import Cell from './cell';
 import { getRowUniqueId, clearTableAllStatus, getColumnList, toFilters, getRowkey, getRowid, rowToVisible, colToVisible, getCellValue, setCellValue, handleRowidOrRow, handleFieldOrColumn, toTreePathSeq, restoreScrollLocation, getRootColumn, getColReMinWidth, createHandleUpdateRowId, createHandleGetRowId, getRefElem, getCellRestHeight, getLastChildColumn } from './util';
 import { getSlotVNs } from '../../ui/src/vn';
-import { moveRowAnimateToTb, clearRowAnimate, moveColAnimateToLr, clearColAnimate } from './anime';
+import { moveRowAnimateToTb, clearRowAnimate, moveColAnimateToLr, clearColAnimate } from '../../ui/src/anime';
 import { warnLog, errLog } from '../../ui/src/log';
 import { getCrossTableDragRowInfo } from './store';
 const { getConfig, getI18n, renderer, formats, interceptor, createEvent } = VxeUI;
@@ -2540,6 +2540,16 @@ function clearDragStatus($xeTable) {
         reactData.dragCol = null;
     }
 }
+function handleRowDragEndClearStatus($xeTable) {
+    clearRowDragData($xeTable);
+    clearCrossTableDragStatus($xeTable);
+    handleRecalculateStyle($xeTable, false, true, true);
+}
+function handleColDragEndClearStatus($xeTable) {
+    clearColDragData($xeTable);
+    clearCrossTableDragStatus($xeTable);
+    handleRecalculateStyle($xeTable, true, true, true);
+}
 function clearRowDropOrigin($xeTable) {
     const el = $xeTable.$el;
     if (el) {
@@ -3215,13 +3225,13 @@ function handleGroupData($xeTable, list, rowGroups) {
  * 加载表格数据
  * @param {Array} datas 数据
  */
-function loadTableData($xeTable, datas, isReset) {
+function loadTableData($xeTable, datas, isReload, isReset) {
     const props = $xeTable;
     const reactData = $xeTable;
     const internalData = $xeTable;
     const { keepSource, treeConfig, aggregateConfig, rowGroupConfig } = props;
     const { rowGroupList, scrollYLoad: oldScrollYLoad } = reactData;
-    const { scrollYStore, scrollXStore, lastScrollLeft, lastScrollTop } = internalData;
+    const { initStatus, scrollYStore, scrollXStore, lastScrollLeft, lastScrollTop } = internalData;
     const rowOpts = $xeTable.computeRowOpts;
     const treeOpts = $xeTable.computeTreeOpts;
     const expandOpts = $xeTable.computeExpandOpts;
@@ -3359,6 +3369,19 @@ function loadTableData($xeTable, datas, isReset) {
         }
         handleReserveStatus($xeTable);
         $xeTable.checkSelectionStatus();
+        if (initStatus) {
+            $xeTable.dispatchEvent('data-rendered', {
+                isReload,
+                visibleColumn: internalData.visibleColumn,
+                visibleData: internalData.afterFullData
+            }, null);
+        }
+        else {
+            $xeTable.dispatchEvent('init-rendered', {
+                visibleColumn: internalData.visibleColumn,
+                visibleData: internalData.afterFullData
+            }, null);
+        }
         $xeTable.dispatchEvent('data-change', {
             visibleColumn: internalData.visibleColumn,
             visibleData: internalData.afterFullData
@@ -3430,7 +3453,14 @@ function handleLoadDefaults($xeTable) {
     handleDefaultMergeCells($xeTable);
     handleDefaultMergeHeaderItems($xeTable);
     handleDefaultMergeFooterItems($xeTable);
-    $xeTable.$nextTick(() => setTimeout(() => $xeTable.recalculate()));
+    $xeTable.$nextTick(() => {
+        const internalData = $xeTable;
+        $xeTable.dispatchEvent('init-rendered', {
+            visibleColumn: internalData.visibleColumn,
+            visibleData: internalData.afterFullData
+        }, null);
+        setTimeout(() => $xeTable.recalculate());
+    });
 }
 /**
  * 处理初始化的默认行为
@@ -4316,7 +4346,7 @@ const tableMethods = {
         errLog('vxe.error.delFunc', ['syncData', 'getData']);
         return $xeTable.$nextTick().then(() => {
             reactData.tableData = [];
-            return $xeTable.$nextTick().then(() => loadTableData($xeTable, internalData.tableFullData, true));
+            return $xeTable.$nextTick().then(() => loadTableData($xeTable, internalData.tableFullData, true, true));
         });
     },
     /**
@@ -4384,7 +4414,8 @@ const tableMethods = {
         const reactData = $xeTable;
         const internalData = $xeTable;
         const { data } = props;
-        loadTableData($xeTable, data || [], true).then(() => {
+        $xeTable.dispatchEvent('ready', {}, null);
+        loadTableData($xeTable, data || [], true, true).then(() => {
             if (data && data.length) {
                 internalData.inited = true;
                 internalData.initStatus = true;
@@ -4402,9 +4433,9 @@ const tableMethods = {
      * 加载表格数据
      * @param {Array} datas 数据
      */
-    loadTableData(datas, isReset) {
+    loadTableData(datas, isReload, isReset) {
         const $xeTable = this;
-        return loadTableData($xeTable, datas, isReset);
+        return loadTableData($xeTable, datas, isReload, isReset);
     },
     /**
      * 重新加载数据，不会清空表格状态
@@ -4412,11 +4443,12 @@ const tableMethods = {
      */
     loadData(datas) {
         const $xeTable = this;
-        const { initStatus } = this;
-        return loadTableData($xeTable, datas, false).then(() => {
-            this.inited = true;
-            this.initStatus = true;
-            if (!initStatus) {
+        const internalData = $xeTable;
+        const { initStatus } = internalData;
+        return loadTableData($xeTable, datas, false, false).then(() => {
+            internalData.inited = true;
+            internalData.initStatus = true;
+            if (initStatus) {
                 handleLoadDefaults($xeTable);
             }
             return handleLazyRecalculate($xeTable, false, true, true);
@@ -4428,11 +4460,12 @@ const tableMethods = {
      */
     reloadData(datas) {
         const $xeTable = this;
-        return this.clearAll()
+        const internalData = $xeTable;
+        return $xeTable.clearAll()
             .then(() => {
-            this.inited = true;
-            this.initStatus = true;
-            return loadTableData($xeTable, datas, true);
+            internalData.inited = true;
+            internalData.initStatus = true;
+            return loadTableData($xeTable, datas, true, true);
         })
             .then(() => {
             handleLoadDefaults($xeTable);
@@ -4443,6 +4476,7 @@ const tableMethods = {
      * 修改行数据
      */
     setRow(rows, record) {
+        const $xeTable = this;
         if (record) {
             let rest = rows;
             if (!XEUtils.isArray(rows)) {
@@ -4450,7 +4484,7 @@ const tableMethods = {
             }
             rest.forEach((item) => Object.assign(item, record));
         }
-        return this.$nextTick();
+        return $xeTable.$nextTick();
     },
     /**
      * 局部加载行数据并恢复到初始状态
@@ -5070,7 +5104,7 @@ const tableMethods = {
                 }
             }
             else if (renderOpts && tcFormatter) {
-                cellLabel = `${tcFormatter(renderOpts, formatParams)}`;
+                cellLabel = tcFormatter(renderOpts, formatParams);
             }
             if (formatData) {
                 formatData[colid] = { value: cellValue, label: cellLabel };
@@ -8757,76 +8791,43 @@ const tableMethods = {
                 dragToChild: !!prevDragToChild,
                 offsetIndex: dragOffsetIndex
             };
-            const isDragToChildFlag = isSelfToChildDrag && dragToChildMethod ? dragToChildMethod(dragParams) : prevDragToChild;
-            return Promise.resolve(dEndMethod ? dEndMethod(dragParams) : true).then((status) => {
-                if (!status) {
-                    clearRowDragData($xeTable);
-                    clearCrossTableDragStatus($xeTable);
-                    return errRest;
-                }
-                const dragRowid = getRowid($xeTable, dragRow);
-                const dragRowRest = fullAllDataRowIdData[dragRowid] || {};
-                const _dragRowIndex = dragRowRest._index;
-                let dragRowHeight = 0;
-                let dragOffsetTop = -1;
-                if (animation) {
-                    dragRowHeight = getCellRestHeight(dragRowRest, cellOpts, rowOpts, defaultRowHeight);
-                    const oldTrEl = el.querySelector(`.vxe-body--row[rowid="${dragRowid}"]`);
-                    if (oldTrEl) {
-                        dragOffsetTop = oldTrEl.offsetTop;
-                    }
-                }
-                let oafIndex = -1;
-                let nafIndex = -1;
-                // 如果为树结构
-                if (treeConfig) {
-                    if (transform) {
-                        // 移出源位置
-                        const oldRest = dragRowRest;
-                        const newRowid = getRowid($xeTable, prevDragRow);
-                        const newRest = fullAllDataRowIdData[newRowid];
-                        if (oldRest && newRest) {
-                            const { level: oldLevel } = oldRest;
-                            const { level: newLevel } = newRest;
-                            const oldAllMaps = {};
-                            XEUtils.eachTree([dragRow], item => {
-                                oldAllMaps[getRowid($xeTable, item)] = item;
-                            }, { children: mapChildrenField });
-                            let isSelfToChildStatus = false;
-                            if (oldLevel && newLevel) {
-                                // 子到子
-                                if (isPeerDrag && !isCrossDrag) {
-                                    if (oldRest.row[parentField] !== newRest.row[parentField]) {
-                                        // 非同级
-                                        return errRest;
-                                    }
-                                }
-                                else {
-                                    if (!isCrossDrag) {
-                                        return errRest;
-                                    }
-                                    if (oldAllMaps[newRowid]) {
-                                        isSelfToChildStatus = true;
-                                        if (!(isCrossDrag && isSelfToChildDrag)) {
-                                            if (VxeUI.modal) {
-                                                VxeUI.modal.message({
-                                                    status: 'error',
-                                                    content: getI18n('vxe.error.treeDragChild')
-                                                });
-                                            }
-                                            return errRest;
-                                        }
-                                    }
-                                }
-                            }
-                            else if (oldLevel) {
-                                // 子到根
-                                if (!isCrossDrag) {
+            const dragRowid = getRowid($xeTable, dragRow);
+            const dragRowRest = fullAllDataRowIdData[dragRowid] || {};
+            const _dragRowIndex = dragRowRest._index;
+            let dragRowHeight = 0;
+            let dragOffsetTop = -1;
+            if (animation) {
+                dragRowHeight = getCellRestHeight(dragRowRest, cellOpts, rowOpts, defaultRowHeight);
+                const oldTrEl = el.querySelector(`.vxe-body--row[rowid="${dragRowid}"]`);
+                if (oldTrEl) {
+                    dragOffsetTop = oldTrEl.offsetTop;
+                }
+            }
+            let oafIndex = -1;
+            let nafIndex = -1;
+            const oldRest = dragRowRest;
+            const newRowid = getRowid($xeTable, prevDragRow);
+            const newRest = fullAllDataRowIdData[newRowid];
+            const oldAllMaps = {};
+            let isSelfToChildStatus = false;
+            // 如果为树结构
+            if (treeConfig) {
+                if (transform) {
+                    if (oldRest && newRest) {
+                        const { level: oldLevel } = oldRest;
+                        const { level: newLevel } = newRest;
+                        XEUtils.eachTree([dragRow], item => {
+                            oldAllMaps[getRowid($xeTable, item)] = item;
+                        }, { children: mapChildrenField });
+                        if (oldLevel && newLevel) {
+                            // 子到子
+                            if (isPeerDrag && !isCrossDrag) {
+                                if (oldRest.row[parentField] !== newRest.row[parentField]) {
+                                    // 非同级
                                     return errRest;
                                 }
                             }
-                            else if (newLevel) {
-                                // 根到子
+                            else {
                                 if (!isCrossDrag) {
                                     return errRest;
                                 }
@@ -8843,9 +8844,47 @@ const tableMethods = {
                                     }
                                 }
                             }
-                            else {
-                                // 根到根
+                        }
+                        else if (oldLevel) {
+                            // 子到根
+                            if (!isCrossDrag) {
+                                return errRest;
+                            }
+                        }
+                        else if (newLevel) {
+                            // 根到子
+                            if (!isCrossDrag) {
+                                return errRest;
+                            }
+                            if (oldAllMaps[newRowid]) {
+                                isSelfToChildStatus = true;
+                                if (!(isCrossDrag && isSelfToChildDrag)) {
+                                    if (VxeUI.modal) {
+                                        VxeUI.modal.message({
+                                            status: 'error',
+                                            content: getI18n('vxe.error.treeDragChild')
+                                        });
+                                    }
+                                    return errRest;
+                                }
                             }
+                        }
+                        else {
+                            // 根到根
+                        }
+                    }
+                }
+            }
+            const isDragToChildFlag = isSelfToChildDrag && dragToChildMethod ? dragToChildMethod(dragParams) : prevDragToChild;
+            return Promise.resolve(dEndMethod ? dEndMethod(dragParams) : true).then((status) => {
+                if (!status) {
+                    return errRest;
+                }
+                // 如果为树结构
+                if (treeConfig) {
+                    if (transform) {
+                        // 移出源位置
+                        if (oldRest && newRest) {
                             const fullList = XEUtils.toTreeArray(internalData.afterTreeFullData, {
                                 key: rowField,
                                 parentKey: parentField,
@@ -8888,8 +8927,6 @@ const tableMethods = {
                     afterFullData.splice(nafIndex, 0, dragRow);
                     tableFullData.splice(ntfIndex, 0, dragRow);
                 }
-                clearRowDragData($xeTable);
-                clearCrossTableDragStatus($xeTable);
                 $xeTable.handleTableData(treeConfig && transform);
                 $xeTable.cacheRowMap(false);
                 updateScrollYStatus($xeTable);
@@ -8917,6 +8954,7 @@ const tableMethods = {
                 return $xeTable.$nextTick().then(() => {
                     if (animation) {
                         const { tableData } = reactData;
+                        const { fullAllDataRowIdData } = internalData;
                         const dragRowRest = fullAllDataRowIdData[dragRowid];
                         const _newRowIndex = dragRowRest._index;
                         const firstRow = tableData[0];
@@ -8994,16 +9032,17 @@ const tableMethods = {
                 });
             }).catch(() => {
                 return errRest;
+            }).then((rest) => {
+                handleRowDragEndClearStatus($xeTable);
+                return rest;
             });
         }
-        clearRowDragData($xeTable);
-        clearCrossTableDragStatus($xeTable);
+        handleRowDragEndClearStatus($xeTable);
         return Promise.resolve(errRest);
     },
     handleCrossTableRowDragCancelEvent() {
         const $xeTable = this;
-        clearRowDragData($xeTable);
-        clearCrossTableDragStatus($xeTable);
+        handleRowDragEndClearStatus($xeTable);
     },
     /**
      * 处理跨表拖拽完成
@@ -9067,8 +9106,7 @@ const tableMethods = {
                 $xeTable.dispatchEvent('row-remove-dragend', {
                     row: dragRow
                 }, evnt);
-                clearRowDragData($xeTable);
-                clearCrossTableDragStatus($xeTable);
+                handleRowDragEndClearStatus($xeTable);
             }
         }
     },
@@ -9150,8 +9188,7 @@ const tableMethods = {
                                 $oldTable.handleCrossTableRowDragCancelEvent(evnt);
                             }
                         }
-                        clearRowDragData($xeTable);
-                        clearCrossTableDragStatus($xeTable);
+                        handleRowDragEndClearStatus($xeTable);
                         return errRest;
                     }
                     let insertRest = Promise.resolve();
@@ -9310,12 +9347,10 @@ const tableMethods = {
         const isControlKey = hasControlKey(evnt);
         const trEl = evnt.currentTarget;
         const rowid = trEl.getAttribute('rowid') || '';
-        const rest = fullAllDataRowIdData[rowid];
-        if (rest) {
+        const rowRest = fullAllDataRowIdData[rowid];
+        if (rowRest) {
             evnt.preventDefault();
-            const row = rest.row;
-            const rowid = getRowid($xeTable, row);
-            const rowRest = fullAllDataRowIdData[rowid];
+            const row = rowRest.row;
             const offsetY = evnt.clientY - trEl.getBoundingClientRect().y;
             const dragPos = offsetY < trEl.clientHeight / 2 ? 'top' : 'bottom';
             internalData.prevDragToChild = !!(treeConfig && transform && (isCrossDrag && isToChildDrag) && isControlKey);
@@ -9349,7 +9384,7 @@ const tableMethods = {
             }
             if ($xeTable.eqRow(dragRow, row) ||
                 (isControlKey && treeConfig && lazy && row[hasChildField] && rowRest && !rowRest.treeLoaded) ||
-                (!isCrossDrag && treeConfig && transform && (isPeerDrag ? dragRow[parentField] !== row[parentField] : rest.level))) {
+                (!isCrossDrag && treeConfig && transform && (isPeerDrag ? dragRow[parentField] !== row[parentField] : rowRest.level))) {
                 showDropTip($xeTable, evnt, trEl, null, false, dragPos);
                 return;
             }
@@ -9446,80 +9481,50 @@ const tableMethods = {
                 dragToChild: !!prevDragToChild,
                 offsetIndex: dragOffsetIndex
             };
-            const isDragToChildFlag = isSelfToChildDrag && dragToChildMethod ? dragToChildMethod(dragParams) : prevDragToChild;
-            return Promise.resolve(dragEndMethod ? dragEndMethod(dragParams) : true).then((status) => {
-                if (!status) {
-                    clearColDragData($xeTable);
-                    clearCrossTableDragStatus($xeTable);
-                    return errRest;
-                }
-                let dragTargetColumn = null;
-                const dragAllTargetCols = [];
-                let dragColWidth = 0;
-                if (animation) {
-                    XEUtils.eachTree([dragColumn], column => {
-                        if (!dragTargetColumn && (!column.children || !column.children.length)) {
-                            dragTargetColumn = column;
-                            dragColWidth += column.renderWidth;
-                        }
-                        dragAllTargetCols.push(column);
-                    });
-                }
-                if (!dragTargetColumn) {
-                    dragTargetColumn = dragColumn;
-                }
-                const dragColRest = fullColumnIdData[dragTargetColumn.id] || {};
-                const _dragColIndex = dragColRest._index;
-                let dragOffsetLeft = -1;
-                if (animation) {
-                    const oldTrEl = el.querySelector(`.vxe-table--column[colid="${dragTargetColumn.id}"]`);
-                    if (oldTrEl) {
-                        dragOffsetLeft = oldTrEl.offsetLeft;
-                    }
-                }
-                let oafIndex = -1;
-                let nafIndex = -1;
-                const oldAllMaps = {};
+            let dragTargetColumn = null;
+            const dragAllTargetCols = [];
+            let dragColWidth = 0;
+            if (animation) {
                 XEUtils.eachTree([dragColumn], column => {
-                    oldAllMaps[column.id] = column;
-                });
-                let isSelfToChildStatus = false;
-                if (dragColumn.parentId && newColumn.parentId) {
-                    // 子到子
-                    if (isPeerDrag && !isCrossDrag) {
-                        if (dragColumn.parentId !== newColumn.parentId) {
-                            // 非同级
-                            return errRest;
-                        }
-                    }
-                    else {
-                        if (!isCrossDrag) {
-                            return errRest;
-                        }
-                        if (oldAllMaps[newColumn.id]) {
-                            isSelfToChildStatus = true;
-                            if (!(isCrossDrag && isSelfToChildDrag)) {
-                                if (VxeUI.modal) {
-                                    VxeUI.modal.message({
-                                        status: 'error',
-                                        content: getI18n('vxe.error.treeDragChild')
-                                    });
-                                }
-                                return errRest;
-                            }
-                        }
+                    if (!dragTargetColumn && (!column.children || !column.children.length)) {
+                        dragTargetColumn = column;
+                        dragColWidth += column.renderWidth;
                     }
+                    dragAllTargetCols.push(column);
+                });
+            }
+            if (!dragTargetColumn) {
+                dragTargetColumn = dragColumn;
+            }
+            const dragColRest = fullColumnIdData[dragTargetColumn.id] || {};
+            const _dragColIndex = dragColRest._index;
+            let dragOffsetLeft = -1;
+            if (animation) {
+                const oldTrEl = el.querySelector(`.vxe-table--column[colid="${dragTargetColumn.id}"]`);
+                if (oldTrEl) {
+                    dragOffsetLeft = oldTrEl.offsetLeft;
                 }
-                else if (dragColumn.parentId) {
-                    // 子到根
-                    if (!isCrossDrag) {
-                        return errRest;
+            }
+            let oafIndex = -1;
+            let nafIndex = -1;
+            const oldAllMaps = {};
+            XEUtils.eachTree([dragColumn], column => {
+                oldAllMaps[column.id] = column;
+            });
+            let isSelfToChildStatus = false;
+            if (dragColumn.parentId && newColumn.parentId) {
+                // 子到子
+                if (isPeerDrag && !isCrossDrag) {
+                    if (dragColumn.parentId !== newColumn.parentId) {
+                        // 非同级
+                        handleColDragEndClearStatus($xeTable);
+                        return Promise.resolve(errRest);
                     }
                 }
-                else if (newColumn.parentId) {
-                    // 根到子
+                else {
                     if (!isCrossDrag) {
-                        return errRest;
+                        handleColDragEndClearStatus($xeTable);
+                        return Promise.resolve(errRest);
                     }
                     if (oldAllMaps[newColumn.id]) {
                         isSelfToChildStatus = true;
@@ -9530,12 +9535,46 @@ const tableMethods = {
                                     content: getI18n('vxe.error.treeDragChild')
                                 });
                             }
-                            return errRest;
+                            handleColDragEndClearStatus($xeTable);
+                            return Promise.resolve(errRest);
                         }
                     }
                 }
-                else {
-                    // 根到根
+            }
+            else if (dragColumn.parentId) {
+                // 子到根
+                if (!isCrossDrag) {
+                    handleColDragEndClearStatus($xeTable);
+                    return Promise.resolve(errRest);
+                }
+            }
+            else if (newColumn.parentId) {
+                // 根到子
+                if (!isCrossDrag) {
+                    handleColDragEndClearStatus($xeTable);
+                    return Promise.resolve(errRest);
+                }
+                if (oldAllMaps[newColumn.id]) {
+                    isSelfToChildStatus = true;
+                    if (!(isCrossDrag && isSelfToChildDrag)) {
+                        if (VxeUI.modal) {
+                            VxeUI.modal.message({
+                                status: 'error',
+                                content: getI18n('vxe.error.treeDragChild')
+                            });
+                        }
+                        handleColDragEndClearStatus($xeTable);
+                        return Promise.resolve(errRest);
+                    }
+                }
+            }
+            else {
+                // 根到根
+            }
+            const isDragToChildFlag = isSelfToChildDrag && dragToChildMethod ? dragToChildMethod(dragParams) : prevDragToChild;
+            return Promise.resolve(dragEndMethod ? dragEndMethod(dragParams) : true).then((status) => {
+                if (!status) {
+                    return errRest;
                 }
                 const oldewMatchRest = XEUtils.findTree(collectColumn, item => item.id === dragColumn.id);
                 // 改变层级
@@ -9590,8 +9629,6 @@ const tableMethods = {
                         $xeTable.clearCopyCellArea();
                     }
                 }
-                clearColDragData($xeTable);
-                clearCrossTableDragStatus($xeTable);
                 if (evnt) {
                     $xeTable.dispatchEvent('column-dragend', {
                         oldColumn: dragColumn,
@@ -9696,10 +9733,12 @@ const tableMethods = {
                 });
             }).catch(() => {
                 return errRest;
+            }).then((rest) => {
+                handleColDragEndClearStatus($xeTable);
+                return rest;
             });
         }
-        clearColDragData($xeTable);
-        clearCrossTableDragStatus($xeTable);
+        handleColDragEndClearStatus($xeTable);
         return Promise.resolve(errRest);
     },
     handleHeaderCellDragDragendEvent(evnt) {
@@ -10425,7 +10464,7 @@ const tableMethods = {
             handleUpdateRowGroup($xeTable, confList.map(fieldOrColumn => {
                 return XEUtils.isString(fieldOrColumn) ? fieldOrColumn : fieldOrColumn.field;
             }));
-            return loadTableData($xeTable, internalData.tableSynchData, true);
+            return loadTableData($xeTable, internalData.tableSynchData, false, true);
         }
         return $xeTable.$nextTick();
     },
@@ -10462,7 +10501,7 @@ const tableMethods = {
             return $xeTable.$nextTick();
         }
         handleUpdateRowGroup($xeTable, []);
-        return loadTableData($xeTable, internalData.tableSynchData, true);
+        return loadTableData($xeTable, internalData.tableSynchData, false, true);
     },
     isRowGroupRecord(row) {
         const $xeTable = this;
@@ -11569,12 +11608,15 @@ const tableMethods = {
                     const lastRow = afterFullData[afterFullData.length - 1];
                     rowid = getRowid($xeTable, lastRow);
                     rowRest = fullAllDataRowIdData[rowid] || {};
-                    // 如果为空时还没计算完数据，保持原高度不变
-                    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 (rowRest) {
+                        const rHeight = getCellRestHeight(rowRest, cellOpts, rowOpts, defaultRowHeight);
+                        // 如果为空时还没计算完数据，保持原高度不变
+                        if (rHeight) {
+                            sYHeight = (rowRest.oTop || 0) + rHeight;
+                            // 是否展开行
+                            if (expandColumn && rowExpandedMaps[rowid]) {
+                                sYHeight += rowRest.expandHeight || expandOpts.height || 0;
+                            }
                         }
                     }
                     if (sYHeight > maxYHeight) {
@@ -12044,7 +12086,7 @@ const tableMethods = {
     handleUpdateAggData() {
         const $xeTable = this;
         const internalData = $xeTable;
-        return loadTableData($xeTable, internalData.tableSynchData, true);
+        return loadTableData($xeTable, internalData.tableSynchData, false, true);
     },
     updateZindex() {
         if (this.zIndex) {