vxe-table 3.15.34 → 3.15.36

package/es/table/src/methods.js

@@ -420,8 +420,8 @@ function handleRowGroupBaseExpand($xeTable, rows, expanded) {
     const reactData = $xeTable;
     const internalData = $xeTable;
     const { fullAllDataRowIdData, tableFullGroupData, rowGroupExpandedMaps } = internalData;
-    const rowGroupOpts = $xeTable.computeRowGroupOpts;
-    const { mapChildrenField, accordion } = rowGroupOpts;
+    const aggregateOpts = $xeTable.computeAggregateOpts;
+    const { mapChildrenField, accordion } = aggregateOpts;
     const { handleGetRowId } = createHandleGetRowId($xeTable);
     let validRows = rows;
     if (mapChildrenField) {
@@ -571,7 +571,7 @@ function handleVirtualTreeToList($xeTable) {
     const { treeConfig } = props;
     const { isRowGroupStatus } = reactData;
     const { fullAllDataRowIdData, treeExpandedMaps, rowGroupExpandedMaps } = internalData;
-    const rowGroupOpts = $xeTable.computeRowGroupOpts;
+    const aggregateOpts = $xeTable.computeAggregateOpts;
     const treeOpts = $xeTable.computeTreeOpts;
     const { handleGetRowId } = createHandleGetRowId($xeTable);
     const fullData = [];
@@ -595,7 +595,7 @@ function handleVirtualTreeToList($xeTable) {
         return fullData;
     }
     else if (isRowGroupStatus) {
-        const { childrenField } = rowGroupOpts;
+        const { childrenField } = aggregateOpts;
         XEUtils.eachTree(internalData.afterGroupFullData, (row, index, items, path, parentRow) => {
             const rowid = handleGetRowId(row);
             const parentRowid = handleGetRowId(parentRow);
@@ -627,7 +627,7 @@ function updateAfterFullData($xeTable) {
     const { tableFullColumn, tableFullData, tableFullTreeData, tableFullGroupData } = internalData;
     const filterOpts = $xeTable.computeFilterOpts;
     const sortOpts = $xeTable.computeSortOpts;
-    const rowGroupOpts = $xeTable.computeRowGroupOpts;
+    const aggregateOpts = $xeTable.computeAggregateOpts;
     const treeOpts = $xeTable.computeTreeOpts;
     const childrenField = treeOpts.children || treeOpts.childrenField;
     const { transform, rowField, parentField, mapChildrenField } = treeOpts;
@@ -691,8 +691,8 @@ function updateAfterFullData($xeTable) {
                 tableTree = XEUtils.searchTree(tableFullGroupData, handleFilter, {
                     original: true,
                     isEvery: true,
-                    children: rowGroupOpts.mapChildrenField,
-                    mapChildren: rowGroupOpts.childrenField
+                    children: aggregateOpts.mapChildrenField,
+                    mapChildren: aggregateOpts.childrenField
                 });
                 tableData = tableTree;
             }
@@ -717,8 +717,8 @@ function updateAfterFullData($xeTable) {
                 tableTree = XEUtils.searchTree(tableFullGroupData, () => true, {
                     original: true,
                     isEvery: true,
-                    children: rowGroupOpts.mapChildrenField,
-                    mapChildren: rowGroupOpts.childrenField
+                    children: aggregateOpts.mapChildrenField,
+                    mapChildren: aggregateOpts.childrenField
                 });
                 tableData = tableTree;
             }
@@ -748,15 +748,15 @@ function updateAfterFullData($xeTable) {
                 }
                 else {
                     const treeList = XEUtils.toTreeArray(tableTree, {
-                        key: rowGroupOpts.rowField,
-                        parentKey: rowGroupOpts.parentField,
-                        children: rowGroupOpts.mapChildrenField
+                        key: aggregateOpts.rowField,
+                        parentKey: aggregateOpts.parentField,
+                        children: aggregateOpts.mapChildrenField
                     });
                     tableTree = XEUtils.toArrayTree(XEUtils.orderBy(treeList, orderColumns.map(({ column, order }) => [getOrderField($xeTable, column), order])), {
-                        key: rowGroupOpts.rowField,
-                        parentKey: rowGroupOpts.parentField,
-                        children: rowGroupOpts.childrenField,
-                        mapChildren: rowGroupOpts.mapChildrenField
+                        key: aggregateOpts.rowField,
+                        parentKey: aggregateOpts.parentField,
+                        children: aggregateOpts.childrenField,
+                        mapChildren: aggregateOpts.mapChildrenField
                     });
                 }
                 tableData = tableTree;
@@ -812,8 +812,8 @@ function updateAfterFullData($xeTable) {
             tableTree = XEUtils.searchTree(tableFullGroupData, () => true, {
                 original: true,
                 isEvery: true,
-                children: rowGroupOpts.mapChildrenField,
-                mapChildren: rowGroupOpts.childrenField
+                children: aggregateOpts.mapChildrenField,
+                mapChildren: aggregateOpts.childrenField
             });
             tableData = tableTree;
         }
@@ -1273,7 +1273,7 @@ function handleCheckedAllCheckboxRow($xeTable, checked, isForce) {
     const { isRowGroupStatus } = reactData;
     const { afterFullData, afterTreeFullData, afterGroupFullData, checkboxReserveRowMap, selectCheckboxMaps } = internalData;
     const treeOpts = $xeTable.computeTreeOpts;
-    const rowGroupOpts = $xeTable.computeRowGroupOpts;
+    const aggregateOpts = $xeTable.computeAggregateOpts;
     const childrenField = treeOpts.children || treeOpts.childrenField;
     const checkboxOpts = $xeTable.computeCheckboxOpts;
     const { checkField, reserve, checkMethod } = checkboxOpts;
@@ -1322,7 +1322,7 @@ function handleCheckedAllCheckboxRow($xeTable, checked, isForce) {
                         const rowid = handleGetRowId(row);
                         selectRowMaps[rowid] = row;
                     }
-                }, { children: rowGroupOpts.mapChildrenField });
+                }, { children: aggregateOpts.mapChildrenField });
             }
             else {
                 /**
@@ -1335,7 +1335,7 @@ function handleCheckedAllCheckboxRow($xeTable, checked, isForce) {
                         if (checkMethod({ $table: $xeTable, row }) ? false : selectCheckboxMaps[rowid]) {
                             selectRowMaps[rowid] = row;
                         }
-                    }, { children: rowGroupOpts.mapChildrenField });
+                    }, { children: aggregateOpts.mapChildrenField });
                 }
             }
         }
@@ -2608,12 +2608,52 @@ const handleUpdateRowGroup = ($xeTable, groupFields) => {
         })
         : [];
 };
+function handleeGroupSummary($xeTable, aggList) {
+    const aggregateOpts = $xeTable.computeAggregateOpts;
+    const { mapChildrenField } = aggregateOpts;
+    if (mapChildrenField) {
+        XEUtils.lastEach(aggList, aggRow => {
+            let count = 0;
+            XEUtils.each(aggRow[mapChildrenField], (row) => {
+                if (row.isAggregate) {
+                    count += row.childCount || 0;
+                }
+                else {
+                    count++;
+                }
+            });
+            aggRow.childCount = count;
+        });
+        if ($xeTable.handlePivotTableAggregateData) {
+            $xeTable.handlePivotTableAggregateData(aggList);
+        }
+    }
+}
+function updateGroupData($xeTable) {
+    const props = $xeTable;
+    const reactData = $xeTable;
+    const internalData = $xeTable;
+    const { aggregateConfig, rowGroupConfig } = props;
+    const { isRowGroupStatus } = reactData;
+    const { tableFullGroupData } = internalData;
+    const aggregateOpts = $xeTable.computeAggregateOpts;
+    const { mapChildrenField } = aggregateOpts;
+    if ((aggregateConfig || rowGroupConfig) && isRowGroupStatus) {
+        const aggList = [];
+        XEUtils.eachTree(tableFullGroupData, row => {
+            if (row.isAggregate) {
+                aggList.push(row);
+            }
+        }, { children: mapChildrenField });
+        handleeGroupSummary($xeTable, aggList);
+    }
+}
 function handleGroupData($xeTable, list, rowGroups) {
     let fullData = list;
     let treeData = list;
     if (rowGroups) {
-        const rowGroupOpts = $xeTable.computeRowGroupOpts;
-        const { rowField, parentField, childrenField, mapChildrenField } = rowGroupOpts;
+        const aggregateOpts = $xeTable.computeAggregateOpts;
+        const { rowField, parentField, childrenField, mapChildrenField } = aggregateOpts;
         const checkboxOpts = $xeTable.computeCheckboxOpts;
         const { checkField } = checkboxOpts;
         const indeterminateField = checkboxOpts.indeterminateField || checkboxOpts.halfField;
@@ -2624,7 +2664,7 @@ function handleGroupData($xeTable, list, rowGroups) {
             const groupField = rgItem.field;
             const groupColumn = $xeTable.getColumnByField(groupField);
             const groupMaps = {};
-            const groupList = [];
+            const aggList = [];
             const rowkey = getRowkey($xeTable);
             list.forEach((row) => {
                 const cellValue = groupColumn ? $xeTable.getCellLabel(row, groupColumn) : XEUtils.get(row, groupField);
@@ -2641,12 +2681,12 @@ function handleGroupData($xeTable, list, rowGroups) {
             });
             XEUtils.objectEach(groupMaps, (childList, groupValue) => {
                 const { fullData: childFullData, treeData: childTreeData } = handleGroupData($xeTable, childList, rowGroups.slice(1));
-                const childCount = 0;
-                const groupRow = {
+                const aggRow = {
                     isAggregate: true,
-                    childCount,
+                    aggData: {},
                     groupContent: groupValue,
                     groupField,
+                    childCount: 0,
                     [rowField]: getRowUniqueId(),
                     [parentField]: null,
                     [rowkey]: getRowUniqueId(),
@@ -2654,30 +2694,19 @@ function handleGroupData($xeTable, list, rowGroups) {
                     [mapChildrenField]: childTreeData
                 };
                 if (checkField) {
-                    groupRow[checkField] = false;
+                    aggRow[checkField] = false;
                 }
                 if (indeterminateField) {
-                    groupRow[indeterminateField] = false;
+                    aggRow[indeterminateField] = false;
                 }
-                groupList.push(groupRow);
-                treeData.push(groupRow);
-                fullData.push(groupRow);
+                aggList.push(aggRow);
+                treeData.push(aggRow);
+                fullData.push(aggRow);
                 if (childFullData.length) {
                     fullData.push(...childFullData);
                 }
             });
-            XEUtils.lastEach(groupList, groupItem => {
-                let count = 0;
-                XEUtils.each(groupItem[childrenField], row => {
-                    if (row.isAggregate) {
-                        count += row[childrenField] ? row[childrenField].length : 0;
-                    }
-                    else {
-                        count++;
-                    }
-                });
-                groupItem.childCount = count;
-            });
+            handleeGroupSummary($xeTable, aggList);
         }
     }
     return {
@@ -2693,7 +2722,7 @@ function loadTableData($xeTable, datas, isReset) {
     const props = $xeTable;
     const reactData = $xeTable;
     const internalData = $xeTable;
-    const { keepSource, treeConfig, rowGroupConfig } = props;
+    const { keepSource, treeConfig, aggregateConfig, rowGroupConfig } = props;
     const { rowGroupList, scrollYLoad: oldScrollYLoad } = reactData;
     const { scrollYStore, scrollXStore, lastScrollLeft, lastScrollTop } = internalData;
     const rowOpts = $xeTable.computeRowOpts;
@@ -2707,11 +2736,11 @@ function loadTableData($xeTable, datas, isReset) {
         errLog('vxe.error.errMaxRow', [supportMaxRow]);
     }
     if (treeConfig && rowGroupList.length) {
-        errLog('vxe.error.noTree', ['row-group-config']);
+        errLog('vxe.error.noTree', ['aggregate-config']);
         return $xeTable.$nextTick();
     }
     if (rowOpts.drag && rowGroupList.length) {
-        errLog('vxe.error.errConflicts', ['row-config.drag', 'row-group-config']);
+        errLog('vxe.error.errConflicts', ['row-config.drag', 'aggregate-config']);
         return $xeTable.$nextTick();
     }
     let isRGroup = false;
@@ -2750,7 +2779,7 @@ function loadTableData($xeTable, datas, isReset) {
             treeData = fullData.slice(0);
         }
     }
-    else if (rowGroupConfig && rowGroupList.length) {
+    else if ((aggregateConfig || rowGroupConfig) && rowGroupList.length) {
         const groupRest = handleGroupData($xeTable, fullData, rowGroupList);
         treeData = groupRest.treeData;
         fullData = groupRest.fullData;
@@ -2859,6 +2888,8 @@ function loadTableData($xeTable, datas, isReset) {
                 if (oldScrollYLoad === sYLoad) {
                     restoreScrollLocation($xeTable, targetScrollLeft, targetScrollTop)
                         .then(() => {
+                        calcCellHeight($xeTable);
+                        updateRowOffsetTop($xeTable);
                         resolve();
                     });
                 }
@@ -2866,6 +2897,8 @@ function loadTableData($xeTable, datas, isReset) {
                     setTimeout(() => {
                         restoreScrollLocation($xeTable, targetScrollLeft, targetScrollTop)
                             .then(() => {
+                            calcCellHeight($xeTable);
+                            updateRowOffsetTop($xeTable);
                             resolve();
                         });
                     });
@@ -3113,6 +3146,7 @@ function handleColumn($xeTable, collectColumn) {
         $xeTable.clearMergeCells();
         $xeTable.clearMergeFooterItems();
         $xeTable.handleTableData(true);
+        $xeTable.handleAggregateSummaryData();
         if ((scrollXLoad || scrollYLoad) && (expandColumn && expandOpts.mode !== 'fixed')) {
             warnLog('vxe.error.scrollErrProp', ['column.type=expand']);
         }
@@ -3684,27 +3718,38 @@ const Methods = {
      * @param {String} field 字段名
      */
     reloadRow(row, record, field) {
-        const { keepSource, tableSourceData, tableData } = this;
+        const $xeTable = this;
+        const props = $xeTable;
+        const reactData = $xeTable;
+        const internalData = $xeTable;
+        const { keepSource } = props;
+        const { tableData } = reactData;
+        const { sourceDataRowIdData } = internalData;
         if (keepSource) {
-            const rowIndex = this.getRowIndex(row);
-            const oRow = tableSourceData[rowIndex];
+            if ($xeTable.isAggregateRecord(row)) {
+                return $xeTable.$nextTick();
+            }
+            const oRow = sourceDataRowIdData[getRowid($xeTable, row)];
             if (oRow && row) {
                 if (field) {
-                    const newValue = XEUtils.get(record || row, field);
+                    const newValue = XEUtils.clone(XEUtils.get(record || row, field), true);
                     XEUtils.set(row, field, newValue);
                     XEUtils.set(oRow, field, newValue);
                 }
                 else {
+                    const rowkey = getRowkey($xeTable);
+                    const rowid = getRowid($xeTable, row);
                     const newRecord = XEUtils.clone(Object.assign({}, record), true);
+                    XEUtils.set(newRecord, rowkey, rowid);
                     XEUtils.destructuring(oRow, Object.assign(row, newRecord));
                 }
             }
-            this.tableData = tableData.slice(0);
+            reactData.tableData = tableData.slice(0);
         }
         else {
             errLog('vxe.error.reqProp', ['keep-source']);
         }
-        return this.$nextTick();
+        return $xeTable.$nextTick();
     },
     /**
      * 加载列配置
@@ -3713,7 +3758,7 @@ const Methods = {
      */
     loadColumn(columns) {
         const $xeTable = this;
-        const collectColumn = XEUtils.mapTree(columns, column => Cell.createColumn(this, column), { children: 'children' });
+        const collectColumn = XEUtils.mapTree(columns, column => Cell.createColumn($xeTable, column), { children: 'children' });
         return handleColumn($xeTable, collectColumn);
     },
     /**
@@ -3781,8 +3826,8 @@ const Methods = {
             }, { children: childrenField });
         }
         else if (isRowGroupStatus) {
-            const rowGroupOpts = $xeTable.computeRowGroupOpts;
-            const { mapChildrenField } = rowGroupOpts;
+            const aggregateOpts = $xeTable.computeAggregateOpts;
+            const { mapChildrenField } = aggregateOpts;
             XEUtils.eachTree(tableFullGroupData, (row, index, items, path, parentRow, nodes) => {
                 const rowid = handleUpdateRowId(row);
                 handleRowCache(row, index, items, parentRow ? -1 : index, parentRow, rowid, nodes.length - 1, toTreePathSeq(path));
@@ -6193,6 +6238,10 @@ const Methods = {
         internalData.mergeFooterCellMaps = buildMergeData(mergeFooterList);
         reactData.mergeFootFlag++;
     },
+    handleAggregateSummaryData() {
+        const $xeTable = this;
+        return updateGroupData($xeTable);
+    },
     handleTargetLeaveEvent() {
         const $xeTable = this;
         const internalData = $xeTable;
@@ -6489,7 +6538,7 @@ const Methods = {
         const { treeConfig } = props;
         const { isRowGroupStatus } = reactData;
         const { selectCheckboxMaps } = internalData;
-        const rowGroupOpts = $xeTable.computeRowGroupOpts;
+        const aggregateOpts = $xeTable.computeAggregateOpts;
         const treeOpts = $xeTable.computeTreeOpts;
         const { transform, mapChildrenField } = treeOpts;
         const childrenField = treeOpts.children || treeOpts.childrenField;
@@ -6541,7 +6590,7 @@ const Methods = {
                         }
                         handleCheckboxReserveRow($xeTable, row, checked);
                     }
-                }, { children: rowGroupOpts.mapChildrenField });
+                }, { children: aggregateOpts.mapChildrenField });
                 reactData.updateCheckboxFlag++;
                 return;
             }
@@ -6690,7 +6739,7 @@ const Methods = {
         const { treeConfig } = props;
         const { isRowGroupStatus } = reactData;
         const { afterTreeFullData, afterGroupFullData, selectCheckboxMaps, treeIndeterminateRowMaps } = internalData;
-        const rowGroupOpts = $xeTable.computeRowGroupOpts;
+        const aggregateOpts = $xeTable.computeAggregateOpts;
         const treeOpts = $xeTable.computeTreeOpts;
         const childrenField = treeOpts.children || treeOpts.childrenField;
         const checkboxOpts = $xeTable.computeCheckboxOpts;
@@ -6704,7 +6753,7 @@ const Methods = {
             const childRowList = [];
             if (isRowGroupStatus) {
                 // 行分组
-                const mapChildrenField = rowGroupOpts.mapChildrenField;
+                const mapChildrenField = aggregateOpts.mapChildrenField;
                 if (mapChildrenField) {
                     XEUtils.eachTree(afterGroupFullData, (row) => {
                         const rowid = handleGetRowId(row);
@@ -7311,7 +7360,7 @@ const Methods = {
         const radioOpts = $xeTable.computeRadioOpts;
         const checkboxOpts = $xeTable.computeCheckboxOpts;
         const keyboardOpts = $xeTable.computeKeyboardOpts;
-        const rowGroupOpts = $xeTable.computeRowGroupOpts;
+        const aggregateOpts = $xeTable.computeAggregateOpts;
         const rowOpts = $xeTable.computeRowOpts;
         const columnOpts = $xeTable.computeColumnOpts;
         const currentColumnOpts = $xeTable.computeCurrentColumnOpts;
@@ -7338,7 +7387,7 @@ const Methods = {
                 $xeTable.triggerTreeExpandEvent(evnt, params);
             }
             // 如果是行分组
-            if ((rowGroupOpts.trigger === 'row' || (rowGroupNode && rowGroupOpts.trigger === 'cell'))) {
+            if ((aggregateOpts.trigger === 'row' || (rowGroupNode && aggregateOpts.trigger === 'cell'))) {
                 $xeTable.triggerRowGroupExpandEvent(evnt, params);
             }
         }
@@ -8769,9 +8818,9 @@ const Methods = {
         const $xeTable = this;
         const props = $xeTable;
         const internalData = $xeTable;
-        const { rowGroupConfig } = props;
-        if (!rowGroupConfig) {
-            errLog('vxe.error.reqProp', ['row-group-config']);
+        const { aggregateConfig, rowGroupConfig } = props;
+        if (!(aggregateConfig || rowGroupConfig)) {
+            errLog('vxe.error.reqProp', ['aggregate-config']);
             return $xeTable.$nextTick();
         }
         if (fieldOrColumns) {
@@ -8786,21 +8835,31 @@ const Methods = {
         const $xeTable = this;
         const props = $xeTable;
         const internalData = $xeTable;
-        const { rowGroupConfig } = props;
-        if (!rowGroupConfig) {
-            errLog('vxe.error.reqProp', ['row-group-config']);
+        const { aggregateConfig, rowGroupConfig } = props;
+        if (!(aggregateConfig || rowGroupConfig)) {
+            errLog('vxe.error.reqProp', ['aggregate-config']);
             return $xeTable.$nextTick();
         }
         handleUpdateRowGroup($xeTable, []);
         return loadTableData($xeTable, internalData.tableSynchData, true);
     },
     isRowGroupRecord(row) {
+        const $xeTable = this;
+        warnLog('vxe.error.delFunc', ['isRowGroupRecord', 'isAggregateRecord']);
+        return $xeTable.isAggregateRecord(row);
+    },
+    isRowGroupExpandByRow(row) {
+        const $xeTable = this;
+        warnLog('vxe.error.delFunc', ['isRowGroupExpandByRow', 'isAggregateExpandByRow']);
+        return $xeTable.isAggregateExpandByRow(row);
+    },
+    isAggregateRecord(row) {
         const $xeTable = this;
         const reactData = $xeTable;
         const { isRowGroupStatus } = reactData;
         return isRowGroupStatus && row.isAggregate;
     },
-    isRowGroupExpandByRow(row) {
+    isAggregateExpandByRow(row) {
         const $xeTable = this;
         const reactData = $xeTable;
         const internalData = $xeTable;
@@ -8823,8 +8882,8 @@ const Methods = {
         const reactData = $xeTable;
         const internalData = $xeTable;
         const { tableFullGroupData } = internalData;
-        const rowGroupOpts = $xeTable.computeRowGroupOpts;
-        const { mapChildrenField } = rowGroupOpts;
+        const aggregateOpts = $xeTable.computeAggregateOpts;
+        const { mapChildrenField } = aggregateOpts;
         const rgExpandedMaps = {};
         if (expanded && mapChildrenField) {
             XEUtils.eachTree(tableFullGroupData, (row) => {
@@ -8958,9 +9017,9 @@ const Methods = {
         const $xeTable = this;
         const internalData = $xeTable;
         const { rowGroupExpandedMaps } = internalData;
-        const rowGroupOpts = $xeTable.computeRowGroupOpts;
+        const aggregateOpts = $xeTable.computeAggregateOpts;
         const { row, column } = params;
-        const { trigger } = rowGroupOpts;
+        const { trigger } = aggregateOpts;
         if (trigger === 'manual') {
             return;
         }
@@ -9928,10 +9987,10 @@ const Methods = {
         const { tableFullData } = internalData;
         const rests = [];
         if (treeConfig || isRowGroupStatus) {
-            const rowGroupOpts = $xeTable.computeRowGroupOpts;
+            const aggregateOpts = $xeTable.computeAggregateOpts;
             const treeOpts = $xeTable.computeTreeOpts;
             const childrenField = treeOpts.children || treeOpts.childrenField;
-            const matchObj = XEUtils.findTree(tableFullData, item => $xeTable.eqRow(item, row), { children: isRowGroupStatus ? rowGroupOpts.mapChildrenField : childrenField });
+            const matchObj = XEUtils.findTree(tableFullData, item => $xeTable.eqRow(item, row), { children: isRowGroupStatus ? aggregateOpts.mapChildrenField : childrenField });
             if (matchObj) {
                 const nodes = matchObj.nodes;
                 nodes.forEach((row, index) => {

package/es/table/src/props.js

@@ -171,7 +171,9 @@ export default {
     footerCellConfig: Object,
     // 行配置项
     rowConfig: Object,
-    // 行分组配置项
+    // 数据聚合配置项
+    aggregateConfig: Object,
+    //  已废弃，被 aggregateConfig 替换
     rowGroupConfig: Object,
     // 当前行配置项
     currentRowConfig: Object,

package/es/table/src/table.js

@@ -823,10 +823,14 @@ export default {
             const props = $xeTable;
             return Object.assign({}, getConfig().table.rowConfig, props.rowConfig);
         },
-        computeRowGroupOpts() {
+        computeAggregateOpts() {
             const $xeTable = this;
             const props = $xeTable;
-            return Object.assign({}, getConfig().table.rowGroupConfig, props.rowGroupConfig);
+            return Object.assign({}, getConfig().table.aggregateConfig || getConfig().table.rowGroupConfig, props.aggregateConfig || props.rowGroupConfig);
+        },
+        computeRowGroupOpts() {
+            const $xeTable = this;
+            return $xeTable.computeAggregateOpts;
         },
         computeCurrentRowOpts() {
             const $xeTable = this;
@@ -1196,8 +1200,8 @@ export default {
         },
         computeRowGroupFields() {
             const $xeTable = this;
-            const rowGroupOpts = $xeTable.computeRowGroupOpts;
-            return rowGroupOpts.groupFields;
+            const aggregateOpts = $xeTable.computeAggregateOpts;
+            return aggregateOpts.groupFields;
         },
         tabsResizeFlag() {
             const $xeTable = this;
@@ -1462,8 +1466,8 @@ export default {
         const currentRowOpts = $xeTable.computeCurrentRowOpts;
         const currentColumnOpts = $xeTable.computeCurrentColumnOpts;
         const keyboardOpts = $xeTable.computeKeyboardOpts;
-        const rowGroupOpts = $xeTable.computeRowGroupOpts;
-        const { groupFields } = rowGroupOpts;
+        const aggregateOpts = $xeTable.computeAggregateOpts;
+        const { groupFields } = aggregateOpts;
         if (props.rowId) {
             warnLog('vxe.error.delProp', ['row-id', 'row-config.keyField']);
         }
@@ -1554,6 +1558,15 @@ export default {
         if (props.dragConfig) {
             warnLog('vxe.error.delProp', ['drag-config', 'row-drag-config']);
         }
+        if (props.rowGroupConfig) {
+            warnLog('vxe.error.delProp', ['row-group-config', 'aggregate-config']);
+        }
+        if (aggregateOpts.countFields) {
+            warnLog('vxe.error.delProp', ['row-group-config.countFields', 'column.agg-func']);
+        }
+        if (aggregateOpts.countMethod) {
+            warnLog('vxe.error.delProp', ['row-group-config.countMethod', 'aggregate-config.aggregateMethod']);
+        }
         if (props.treeConfig && treeOpts.children) {
             warnLog('vxe.error.delProp', ['tree-config.children', 'tree-config.childrenField']);
         }

package/es/table/src/util.js

@@ -179,13 +179,16 @@ export function handleFieldOrColumn($xeTable, fieldOrColumn) {
     }
     return null;
 }
-export const handleRowidOrRow = ($xeTable, rowidOrRow) => {
+export function handleRowidOrRow($xeTable, rowidOrRow) {
     if (rowidOrRow) {
         const rowid = XEUtils.isString(rowidOrRow) || XEUtils.isNumber(rowidOrRow) ? rowidOrRow : getRowid($xeTable, rowidOrRow);
         return $xeTable.getRowById(rowid);
     }
     return null;
-};
+}
+export function getCellRestHeight(rowRest, cellOpts, rowOpts, defaultRowHeight) {
+    return rowRest.resizeHeight || cellOpts.height || rowOpts.height || rowRest.height || defaultRowHeight;
+}
 // 组装列配置
 export function assembleColumn(_vm) {
     const $xeTable = _vm.$xeTable;

package/es/ui/index.js

@@ -1,6 +1,6 @@
 import { VxeUI } from '@vxe-ui/core';
 import { getFuncText } from './src/utils';
-export const version = "3.15.34";
+export const version = "3.15.36";
 VxeUI.version = version;
 VxeUI.tableVersion = version;
 VxeUI.setConfig({
@@ -127,7 +127,7 @@ VxeUI.setConfig({
             // isEvery: false,
             showIcon: true
         },
-        rowGroupConfig: {
+        aggregateConfig: {
             padding: true,
             rowField: 'id',
             parentField: '_X_ROW_PARENT_KEY',
@@ -201,13 +201,13 @@ VxeUI.setConfig({
             isReplace: true
         },
         virtualXConfig: {
-            enabled: true,
+            // enabled: false,
             gt: 24,
             preSize: 0,
             oSize: 0
         },
         virtualYConfig: {
-            enabled: true,
+            // enabled: false,
             gt: 100,
             preSize: 1,
             oSize: 0

package/es/ui/src/log.js

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