vxe-table 3.15.34 → 3.15.35

package/lib/index.umd.js

@@ -2002,7 +2002,7 @@ function getClass(property, params) {
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
 
 
-const version = "3.15.34";
+const version = "3.15.35";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -2129,7 +2129,7 @@ core_.VxeUI.setConfig({
       // isEvery: false,
       showIcon: true
     },
-    rowGroupConfig: {
+    aggregateConfig: {
       padding: true,
       rowField: 'id',
       parentField: '_X_ROW_PARENT_KEY',
@@ -2203,13 +2203,13 @@ core_.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
@@ -2646,7 +2646,7 @@ function isNodeElement(elem) {
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"3.15.34"}`;
+const log_version = `table v${"3.15.35"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
@@ -2758,6 +2758,7 @@ class ColumnInfo {
       titleHelp: _vm.titleHelp,
       titlePrefix: _vm.titlePrefix,
       titleSuffix: _vm.titleSuffix,
+      aggFunc: _vm.aggFunc,
       // 自定义参数
       params: _vm.params,
       // 渲染属性
@@ -2780,6 +2781,7 @@ class ColumnInfo {
       // 列排序
       sortNumber: 0,
       renderSortNumber: 0,
+      renderAggFn: '',
       renderFixed: '',
       renderVisible: false,
       renderWidth: 0,
@@ -3015,13 +3017,16 @@ function handleFieldOrColumn($xeTable, fieldOrColumn) {
   }
   return null;
 }
-const handleRowidOrRow = ($xeTable, rowidOrRow) => {
+function handleRowidOrRow($xeTable, rowidOrRow) {
   if (rowidOrRow) {
     const rowid = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isString(rowidOrRow) || external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isNumber(rowidOrRow) ? rowidOrRow : getRowid($xeTable, rowidOrRow);
     return $xeTable.getRowById(rowid);
   }
   return null;
-};
+}
+function getCellRestHeight(rowRest, cellOpts, rowOpts, defaultRowHeight) {
+  return rowRest.resizeHeight || cellOpts.height || rowOpts.height || rowRest.height || defaultRowHeight;
+}
 // 组装列配置
 function assembleColumn(_vm) {
   const $xeTable = _vm.$xeTable;
@@ -3759,13 +3764,13 @@ function renderCellHandle(h, params) {
     rowGroupNode,
     editRender
   } = column;
-  const rowGroupOpts = $table.computeRowGroupOpts;
+  const aggregateOpts = $table.computeAggregateOpts;
   const {
     mode
-  } = rowGroupOpts;
+  } = aggregateOpts;
   const checkboxOpts = $table.computeCheckboxOpts;
   const editOpts = $table.computeEditOpts;
-  const isDeepCell = treeNode || isRowGroupStatus && row.isAggregate && (mode === 'column' ? column.field === row.groupField : rowGroupNode);
+  const isDeepCell = treeNode || isRowGroupStatus && (mode === 'column' ? column.field === row.groupField : rowGroupNode);
   switch (type) {
     case 'seq':
       return isDeepCell ? Cell.renderDeepIndexCell(h, params) : Cell.renderSeqCell(h, params);
@@ -3889,7 +3894,8 @@ const Cell = {
       slots,
       editRender,
       cellRender,
-      rowGroupNode
+      rowGroupNode,
+      aggFunc
     } = column;
     const renderOpts = editRender || cellRender;
     if (slots && slots.default) {
@@ -3907,48 +3913,58 @@ const Cell = {
       }
     }
     let cellValue = '';
-    if (isRowGroupStatus && row.isAggregate) {
+    if (isRowGroupStatus && field && row.isAggregate) {
+      const aggRow = row;
       const {
         fullColumnFieldData
       } = tableInternalData;
-      const rowGroupOpts = $table.computeRowGroupOpts;
+      const aggregateOpts = $table.computeAggregateOpts;
       const {
         mode,
         showTotal,
         totalMethod,
         countFields,
-        countMethod,
         contentMethod,
         mapChildrenField
-      } = rowGroupOpts;
-      const groupField = row.groupField;
-      const groupContent = row.groupContent;
-      const childList = mapChildrenField ? row[mapChildrenField] || [] : [];
-      const totalValue = row.childCount;
+      } = aggregateOpts;
+      const aggMethod = aggregateOpts.aggregateMethod || aggregateOpts.countMethod;
+      const groupField = aggRow.groupField;
+      const groupContent = aggRow.groupContent;
+      const childList = mapChildrenField ? aggRow[mapChildrenField] || [] : [];
+      const childCount = aggRow.childCount;
       const colRest = fullColumnFieldData[groupField] || {};
-      const params = {
+      const ctParams = {
         $table,
         groupField,
         groupColumn: colRest ? colRest.column : null,
         column,
         groupValue: groupContent,
         children: childList,
-        totalValue: totalValue
+        childCount,
+        aggValue: null,
+        /**
+         * 已废弃
+         * @deprecated
+         */
+        totalValue: childCount
       };
-      if (mode === 'column' ? column.field === row.groupField : rowGroupNode) {
+      if (mode === 'column' ? field === aggRow.groupField : rowGroupNode) {
         cellValue = groupContent;
         if (contentMethod) {
-          cellValue = `${contentMethod(params)}`;
+          cellValue = `${contentMethod(ctParams)}`;
         }
         if (showTotal) {
-          cellValue = cell_getI18n('vxe.table.rowGroupContentTotal', [cellValue, totalMethod ? totalMethod(params) : totalValue, totalValue]);
+          cellValue = cell_getI18n('vxe.table.rowGroupContentTotal', [cellValue, totalMethod ? totalMethod(ctParams) : childCount, childCount]);
         }
-      } else if (countFields && countFields.includes(field)) {
-        if (countMethod) {
-          cellValue = `${countMethod(params)}`;
+      } else if ($table.getPivotTableAggregateCellAggValue) {
+        cellValue = $table.getPivotTableAggregateCellAggValue(params);
+      } else if (aggFunc === true || countFields && countFields.includes(field)) {
+        if (aggMethod) {
+          ctParams.aggValue = childCount;
+          cellValue = `${aggMethod(ctParams)}`;
         }
       }
-    } else if (!(isRowGroupStatus && row.isAggregate)) {
+    } else {
       cellValue = $table.getCellLabel(row, column);
     }
     const cellPlaceholder = editRender ? editRender.placeholder : '';
@@ -3985,11 +4001,11 @@ const Cell = {
     const {
       rowGroupExpandedMaps
     } = tableInternalData;
-    const rowGroupOpts = $table.computeRowGroupOpts;
+    const aggregateOpts = $table.computeAggregateOpts;
     const {
       padding,
       indent
-    } = rowGroupOpts;
+    } = aggregateOpts;
     const rowid = getRowid($table, row);
     const isExpand = !!rowGroupExpandedFlag && !!rowGroupExpandedMaps[rowid];
     return h('div', {
@@ -3999,7 +4015,7 @@ const Cell = {
       style: padding && indent ? {
         paddingLeft: `${level * indent}px`
       } : undefined
-    }, [h('span', {
+    }, [row.isAggregate ? h('span', {
       class: 'vxe-row-group--node-btn',
       on: {
         click(evnt) {
@@ -4008,7 +4024,7 @@ const Cell = {
       }
     }, [h('i', {
       class: isExpand ? cell_getIcon().TABLE_ROW_GROUP_OPEN : cell_getIcon().TABLE_ROW_GROUP_CLOSE
-    })]), h('div', {
+    })]) : renderEmptyElement($table), h('div', {
       class: 'vxe-row-group-cell'
     }, cellVNodes)]);
   },
@@ -4106,11 +4122,15 @@ const Cell = {
     const {
       rowGroupNode
     } = column;
-    if (row.isAggregate) {
-      const rowGroupOpts = $table.computeRowGroupOpts;
+    const tableReactData = $table;
+    const {
+      rowGroupList
+    } = tableReactData;
+    if (rowGroupList.length) {
+      const aggregateOpts = $table.computeAggregateOpts;
       const {
         mode
-      } = rowGroupOpts;
+      } = aggregateOpts;
       if (mode === 'column' ? column.field === row.groupField : rowGroupNode) {
         return [Cell.renderRowGroupBtn(h, params, cellVNodes)];
       }
@@ -4968,6 +4988,8 @@ const columnProps = {
   editRender: Object,
   // 内容渲染配置项
   contentRender: Object,
+  // 聚合函数
+  aggFunc: [String, Boolean],
   // 额外的参数
   params: Object
 };
@@ -5619,11 +5641,11 @@ function handleRowGroupBaseExpand($xeTable, rows, expanded) {
     tableFullGroupData,
     rowGroupExpandedMaps
   } = internalData;
-  const rowGroupOpts = $xeTable.computeRowGroupOpts;
+  const aggregateOpts = $xeTable.computeAggregateOpts;
   const {
     mapChildrenField,
     accordion
-  } = rowGroupOpts;
+  } = aggregateOpts;
   const {
     handleGetRowId
   } = createHandleGetRowId($xeTable);
@@ -5832,7 +5854,7 @@ function handleVirtualTreeToList($xeTable) {
     treeExpandedMaps,
     rowGroupExpandedMaps
   } = internalData;
-  const rowGroupOpts = $xeTable.computeRowGroupOpts;
+  const aggregateOpts = $xeTable.computeAggregateOpts;
   const treeOpts = $xeTable.computeTreeOpts;
   const {
     handleGetRowId
@@ -5861,7 +5883,7 @@ function handleVirtualTreeToList($xeTable) {
   } else if (isRowGroupStatus) {
     const {
       childrenField
-    } = rowGroupOpts;
+    } = aggregateOpts;
     external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(internalData.afterGroupFullData, (row, index, items, path, parentRow) => {
       const rowid = handleGetRowId(row);
       const parentRowid = handleGetRowId(parentRow);
@@ -5904,7 +5926,7 @@ function updateAfterFullData($xeTable) {
   } = 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 {
@@ -6029,8 +6051,8 @@ function updateAfterFullData($xeTable) {
         tableTree = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().searchTree(tableFullGroupData, handleFilter, {
           original: true,
           isEvery: true,
-          children: rowGroupOpts.mapChildrenField,
-          mapChildren: rowGroupOpts.childrenField
+          children: aggregateOpts.mapChildrenField,
+          mapChildren: aggregateOpts.childrenField
         });
         tableData = tableTree;
       } else if (treeConfig && transform) {
@@ -6052,8 +6074,8 @@ function updateAfterFullData($xeTable) {
         tableTree = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().searchTree(tableFullGroupData, () => true, {
           original: true,
           isEvery: true,
-          children: rowGroupOpts.mapChildrenField,
-          mapChildren: rowGroupOpts.childrenField
+          children: aggregateOpts.mapChildrenField,
+          mapChildren: aggregateOpts.childrenField
         });
         tableData = tableTree;
       } else if (treeConfig && transform) {
@@ -6084,18 +6106,18 @@ function updateAfterFullData($xeTable) {
           tableTree = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(sortRests) ? sortRests : tableTree;
         } else {
           const treeList = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toTreeArray(tableTree, {
-            key: rowGroupOpts.rowField,
-            parentKey: rowGroupOpts.parentField,
-            children: rowGroupOpts.mapChildrenField
+            key: aggregateOpts.rowField,
+            parentKey: aggregateOpts.parentField,
+            children: aggregateOpts.mapChildrenField
           });
           tableTree = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toArrayTree(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().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;
@@ -6165,8 +6187,8 @@ function updateAfterFullData($xeTable) {
       tableTree = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().searchTree(tableFullGroupData, () => true, {
         original: true,
         isEvery: true,
-        children: rowGroupOpts.mapChildrenField,
-        mapChildren: rowGroupOpts.childrenField
+        children: aggregateOpts.mapChildrenField,
+        mapChildren: aggregateOpts.childrenField
       });
       tableData = tableTree;
     } else if (treeConfig && transform) {
@@ -6685,7 +6707,7 @@ function handleCheckedAllCheckboxRow($xeTable, checked, isForce) {
     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 {
@@ -6747,7 +6769,7 @@ function handleCheckedAllCheckboxRow($xeTable, checked, isForce) {
             selectRowMaps[rowid] = row;
           }
         }, {
-          children: rowGroupOpts.mapChildrenField
+          children: aggregateOpts.mapChildrenField
         });
       } else {
         /**
@@ -6764,7 +6786,7 @@ function handleCheckedAllCheckboxRow($xeTable, checked, isForce) {
               selectRowMaps[rowid] = row;
             }
           }, {
-            children: rowGroupOpts.mapChildrenField
+            children: aggregateOpts.mapChildrenField
           });
         }
       }
@@ -8231,17 +8253,69 @@ const handleUpdateRowGroup = ($xeTable, groupFields) => {
     };
   }) : [];
 };
+function handleeGroupSummary($xeTable, aggList) {
+  const aggregateOpts = $xeTable.computeAggregateOpts;
+  const {
+    mapChildrenField
+  } = aggregateOpts;
+  if (mapChildrenField) {
+    external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().lastEach(aggList, aggRow => {
+      let count = 0;
+      external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().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 = [];
+    external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().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 aggregateOpts = $xeTable.computeAggregateOpts;
     const {
       rowField,
       parentField,
       childrenField,
       mapChildrenField
-    } = rowGroupOpts;
+    } = aggregateOpts;
     const checkboxOpts = $xeTable.computeCheckboxOpts;
     const {
       checkField
@@ -8254,7 +8328,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) : external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, groupField);
@@ -8274,12 +8348,12 @@ function handleGroupData($xeTable, list, rowGroups) {
           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(),
@@ -8287,29 +8361,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);
         }
       });
-      external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().lastEach(groupList, groupItem => {
-        let count = 0;
-        external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().each(groupItem[childrenField], row => {
-          if (row.isAggregate) {
-            count += row[childrenField] ? row[childrenField].length : 0;
-          } else {
-            count++;
-          }
-        });
-        groupItem.childCount = count;
-      });
+      handleeGroupSummary($xeTable, aggList);
     }
   }
   return {
@@ -8328,6 +8392,7 @@ function loadTableData($xeTable, datas, isReset) {
   const {
     keepSource,
     treeConfig,
+    aggregateConfig,
     rowGroupConfig
   } = props;
   const {
@@ -8353,11 +8418,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;
@@ -8394,7 +8459,7 @@ function loadTableData($xeTable, datas, isReset) {
     } else {
       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;
@@ -8499,11 +8564,15 @@ function loadTableData($xeTable, datas, isReset) {
         // 是否变更虚拟滚动
         if (oldScrollYLoad === sYLoad) {
           restoreScrollLocation($xeTable, targetScrollLeft, targetScrollTop).then(() => {
+            calcCellHeight($xeTable);
+            updateRowOffsetTop($xeTable);
             resolve();
           });
         } else {
           setTimeout(() => {
             restoreScrollLocation($xeTable, targetScrollLeft, targetScrollTop).then(() => {
+              calcCellHeight($xeTable);
+              updateRowOffsetTop($xeTable);
               resolve();
             });
           });
@@ -8786,6 +8855,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']);
     }
@@ -9560,10 +9630,10 @@ const Methods = {
         children: childrenField
       });
     } else if (isRowGroupStatus) {
-      const rowGroupOpts = $xeTable.computeRowGroupOpts;
+      const aggregateOpts = $xeTable.computeAggregateOpts;
       const {
         mapChildrenField
-      } = rowGroupOpts;
+      } = aggregateOpts;
       external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().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));
@@ -12299,6 +12369,10 @@ const Methods = {
     internalData.mergeFooterCellMaps = buildMergeData(mergeFooterList);
     reactData.mergeFootFlag++;
   },
+  handleAggregateSummaryData() {
+    const $xeTable = this;
+    return updateGroupData($xeTable);
+  },
   handleTargetLeaveEvent() {
     const $xeTable = this;
     const internalData = $xeTable;
@@ -12651,7 +12725,7 @@ const Methods = {
     const {
       selectCheckboxMaps
     } = internalData;
-    const rowGroupOpts = $xeTable.computeRowGroupOpts;
+    const aggregateOpts = $xeTable.computeAggregateOpts;
     const treeOpts = $xeTable.computeTreeOpts;
     const {
       transform,
@@ -12723,7 +12797,7 @@ const Methods = {
             handleCheckboxReserveRow($xeTable, row, checked);
           }
         }, {
-          children: rowGroupOpts.mapChildrenField
+          children: aggregateOpts.mapChildrenField
         });
         reactData.updateCheckboxFlag++;
         return;
@@ -12914,7 +12988,7 @@ const Methods = {
       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;
@@ -12934,7 +13008,7 @@ const Methods = {
       const childRowList = [];
       if (isRowGroupStatus) {
         // 行分组
-        const mapChildrenField = rowGroupOpts.mapChildrenField;
+        const mapChildrenField = aggregateOpts.mapChildrenField;
         if (mapChildrenField) {
           external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(afterGroupFullData, row => {
             const rowid = handleGetRowId(row);
@@ -13666,7 +13740,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;
@@ -13709,7 +13783,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);
       }
     }
@@ -15375,10 +15449,11 @@ const Methods = {
     const props = $xeTable;
     const internalData = $xeTable;
     const {
+      aggregateConfig,
       rowGroupConfig
     } = props;
-    if (!rowGroupConfig) {
-      errLog('vxe.error.reqProp', ['row-group-config']);
+    if (!(aggregateConfig || rowGroupConfig)) {
+      errLog('vxe.error.reqProp', ['aggregate-config']);
       return $xeTable.$nextTick();
     }
     if (fieldOrColumns) {
@@ -15394,16 +15469,27 @@ const Methods = {
     const props = $xeTable;
     const internalData = $xeTable;
     const {
+      aggregateConfig,
       rowGroupConfig
     } = props;
-    if (!rowGroupConfig) {
-      errLog('vxe.error.reqProp', ['row-group-config']);
+    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 {
@@ -15411,7 +15497,7 @@ const Methods = {
     } = reactData;
     return isRowGroupStatus && row.isAggregate;
   },
-  isRowGroupExpandByRow(row) {
+  isAggregateExpandByRow(row) {
     const $xeTable = this;
     const reactData = $xeTable;
     const internalData = $xeTable;
@@ -15440,10 +15526,10 @@ const Methods = {
     const {
       tableFullGroupData
     } = internalData;
-    const rowGroupOpts = $xeTable.computeRowGroupOpts;
+    const aggregateOpts = $xeTable.computeAggregateOpts;
     const {
       mapChildrenField
-    } = rowGroupOpts;
+    } = aggregateOpts;
     const rgExpandedMaps = {};
     if (expanded && mapChildrenField) {
       external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(tableFullGroupData, row => {
@@ -15592,14 +15678,14 @@ const Methods = {
     const {
       rowGroupExpandedMaps
     } = internalData;
-    const rowGroupOpts = $xeTable.computeRowGroupOpts;
+    const aggregateOpts = $xeTable.computeAggregateOpts;
     const {
       row,
       column
     } = params;
     const {
       trigger
-    } = rowGroupOpts;
+    } = aggregateOpts;
     if (trigger === 'manual') {
       return;
     }
@@ -16716,11 +16802,11 @@ const Methods = {
     } = 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 = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().findTree(tableFullData, item => $xeTable.eqRow(item, row), {
-        children: isRowGroupStatus ? rowGroupOpts.mapChildrenField : childrenField
+        children: isRowGroupStatus ? aggregateOpts.mapChildrenField : childrenField
       });
       if (matchObj) {
         const nodes = matchObj.nodes;
@@ -17318,6 +17404,7 @@ function renderTdColumn(h, $xeTable, seq, rowid, fixedType, isOptimizeMode, rowL
     $xeTable.triggerCellDblclickEvent(evnt, cellParams);
   };
   let isMergeCell = false;
+  let mergeRowspan = 1;
   // 合并行或列
   if (mergeBodyFlag && mergeBodyList.length) {
     const spanRest = mergeBodyCellMaps[`${_rowIndex}:${_columnIndex}`];
@@ -17331,6 +17418,7 @@ function renderTdColumn(h, $xeTable, seq, rowid, fixedType, isOptimizeMode, rowL
       }
       if (rowspan > 1) {
         isMergeCell = true;
+        mergeRowspan = rowspan;
         tdAttrs.rowspan = rowspan;
       }
       if (colspan > 1) {
@@ -17348,9 +17436,12 @@ function renderTdColumn(h, $xeTable, seq, rowid, fixedType, isOptimizeMode, rowL
       return null;
     }
     if (rowspan > 1) {
+      isMergeCell = true;
+      mergeRowspan = rowspan;
       tdAttrs.rowspan = rowspan;
     }
     if (colspan > 1) {
+      isMergeCell = true;
       tdAttrs.colspan = colspan;
     }
   }
@@ -17365,7 +17456,7 @@ function renderTdColumn(h, $xeTable, seq, rowid, fixedType, isOptimizeMode, rowL
     isDirty = $xeTable.isUpdateByRow(row, column.field);
   }
   const isVNAutoHeight = scrollYLoad && !hasEllipsis;
-  const cellHeight = rowRest.resizeHeight || cellOpts.height || rowOpts.height || rowRest.height || defaultRowHeight;
+  let cellHeight = getCellRestHeight(rowRest, cellOpts, rowOpts, defaultRowHeight);
   const isLastColumn = $columnIndex === columns.length - 1;
   const isAutoCellWidth = !column.resizeWidth && (column.minWidth === 'auto' || column.width === 'auto');
   let isVNPreEmptyStatus = false;
@@ -17378,6 +17469,15 @@ function renderTdColumn(h, $xeTable, seq, rowid, fixedType, isOptimizeMode, rowL
       }
     }
   }
+  if (mergeRowspan > 1) {
+    const mEndRow = afterFullData[_rowIndex + mergeRowspan - 1];
+    if (mEndRow) {
+      const meRowRest = fullAllDataRowIdData[getRowid($xeTable, mEndRow)];
+      if (meRowRest) {
+        cellHeight += meRowRest.oTop - rowRest.oTop + getCellRestHeight(meRowRest, cellOpts, rowOpts, defaultRowHeight);
+      }
+    }
+  }
   const tcStyle = {};
   if (hasEllipsis && resizeWidthFlag) {
     let tsColspan = tdAttrs.colspan || 0;
@@ -17409,7 +17509,10 @@ function renderTdColumn(h, $xeTable, seq, rowid, fixedType, isOptimizeMode, rowL
     }));
   } else {
     // 渲染单元格
-    tdVNs.push(...renderLine(h, $xeTable, rowid, cellParams, cellHeight), h('div', {
+    if (treeConfig) {
+      tdVNs.push(...renderLine(h, $xeTable, rowid, cellParams, cellHeight));
+    }
+    tdVNs.push(h('div', {
       key: 'tc',
       class: ['vxe-cell', {
         'c--title': showTitle,
@@ -19140,7 +19243,9 @@ const {
   footerCellConfig: Object,
   // 行配置项
   rowConfig: Object,
-  // 行分组配置项
+  // 数据聚合配置项
+  aggregateConfig: Object,
+  //  已废弃，被 aggregateConfig 替换
   rowGroupConfig: Object,
   // 当前行配置项
   currentRowConfig: Object,
@@ -27836,10 +27941,14 @@ function renderBody(h, $xeTable) {
       const props = $xeTable;
       return Object.assign({}, table_getConfig().table.rowConfig, props.rowConfig);
     },
-    computeRowGroupOpts() {
+    computeAggregateOpts() {
       const $xeTable = this;
       const props = $xeTable;
-      return Object.assign({}, table_getConfig().table.rowGroupConfig, props.rowGroupConfig);
+      return Object.assign({}, table_getConfig().table.aggregateConfig || table_getConfig().table.rowGroupConfig, props.aggregateConfig || props.rowGroupConfig);
+    },
+    computeRowGroupOpts() {
+      const $xeTable = this;
+      return $xeTable.computeAggregateOpts;
     },
     computeCurrentRowOpts() {
       const $xeTable = this;
@@ -28267,8 +28376,8 @@ function renderBody(h, $xeTable) {
     },
     computeRowGroupFields() {
       const $xeTable = this;
-      const rowGroupOpts = $xeTable.computeRowGroupOpts;
-      return rowGroupOpts.groupFields;
+      const aggregateOpts = $xeTable.computeAggregateOpts;
+      return aggregateOpts.groupFields;
     },
     tabsResizeFlag() {
       const $xeTable = this;
@@ -28554,10 +28663,10 @@ function renderBody(h, $xeTable) {
     const currentRowOpts = $xeTable.computeCurrentRowOpts;
     const currentColumnOpts = $xeTable.computeCurrentColumnOpts;
     const keyboardOpts = $xeTable.computeKeyboardOpts;
-    const rowGroupOpts = $xeTable.computeRowGroupOpts;
+    const aggregateOpts = $xeTable.computeAggregateOpts;
     const {
       groupFields
-    } = rowGroupOpts;
+    } = aggregateOpts;
     if (props.rowId) {
       warnLog('vxe.error.delProp', ['row-id', 'row-config.keyField']);
     }
@@ -28648,6 +28757,15 @@ function renderBody(h, $xeTable) {
     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']);
     }