vxe-table 3.15.33 → 3.15.35

package/packages/table/src/methods.ts

@@ -447,8 +447,8 @@ function handleRowGroupBaseExpand ($xeTable: VxeTableConstructor & VxeTablePriva
   const internalData = $xeTable as unknown as TableInternalData
 
   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) {
@@ -602,7 +602,7 @@ function handleVirtualTreeToList ($xeTable: VxeTableConstructor & VxeTablePrivat
   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: any[] = []
@@ -627,7 +627,7 @@ function handleVirtualTreeToList ($xeTable: VxeTableConstructor & VxeTablePrivat
     updateScrollYStatus($xeTable, fullData)
     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)
@@ -661,7 +661,7 @@ function updateAfterFullData ($xeTable: VxeTableConstructor & VxeTablePrivateMet
   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
@@ -728,8 +728,8 @@ function updateAfterFullData ($xeTable: VxeTableConstructor & VxeTablePrivateMet
         tableTree = XEUtils.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) {
@@ -751,8 +751,8 @@ function updateAfterFullData ($xeTable: VxeTableConstructor & VxeTablePrivateMet
         tableTree = XEUtils.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) {
@@ -780,17 +780,17 @@ function updateAfterFullData ($xeTable: VxeTableConstructor & VxeTablePrivateMet
           tableTree = XEUtils.isArray(sortRests) ? sortRests : tableTree
         } 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
             }
           )
         }
@@ -844,8 +844,8 @@ function updateAfterFullData ($xeTable: VxeTableConstructor & VxeTablePrivateMet
       tableTree = XEUtils.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) {
@@ -1336,7 +1336,7 @@ function handleCheckedAllCheckboxRow ($xeTable: VxeTableConstructor & VxeTablePr
   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
@@ -1384,7 +1384,7 @@ function handleCheckedAllCheckboxRow ($xeTable: VxeTableConstructor & VxeTablePr
             const rowid = handleGetRowId(row)
             selectRowMaps[rowid] = row
           }
-        }, { children: rowGroupOpts.mapChildrenField })
+        }, { children: aggregateOpts.mapChildrenField })
       } else {
         /**
          * 如果是树取消
@@ -1396,7 +1396,7 @@ function handleCheckedAllCheckboxRow ($xeTable: VxeTableConstructor & VxeTablePr
             if (checkMethod({ $table: $xeTable, row }) ? false : selectCheckboxMaps[rowid]) {
               selectRowMaps[rowid] = row
             }
-          }, { children: rowGroupOpts.mapChildrenField })
+          }, { children: aggregateOpts.mapChildrenField })
         }
       }
     } else if (treeConfig) {
@@ -2711,12 +2711,54 @@ const handleUpdateRowGroup = ($xeTable: VxeTableConstructor & VxeTablePrivateMet
     : []
 }
 
+function handleeGroupSummary ($xeTable: VxeTableConstructor & VxeTablePrivateMethods, aggList: VxeTableDefines.AggregateRowInfo[]) {
+  const aggregateOpts = $xeTable.computeAggregateOpts
+  const { mapChildrenField } = aggregateOpts
+  if (mapChildrenField) {
+    XEUtils.lastEach(aggList, aggRow => {
+      let count = 0
+      XEUtils.each(aggRow[mapChildrenField], (row: VxeTableDefines.AggregateRowInfo) => {
+        if (row.isAggregate) {
+          count += row.childCount || 0
+        } else {
+          count++
+        }
+      })
+      aggRow.childCount = count
+    })
+    if ($xeTable.handlePivotTableAggregateData) {
+      $xeTable.handlePivotTableAggregateData(aggList)
+    }
+  }
+}
+
+function updateGroupData ($xeTable: VxeTableConstructor & VxeTablePrivateMethods) {
+  const props = $xeTable
+  const reactData = $xeTable as unknown as TableReactData
+  const internalData = $xeTable as unknown as TableInternalData
+
+  const { aggregateConfig, rowGroupConfig } = props
+  const { isRowGroupStatus } = reactData
+  const { tableFullGroupData } = internalData
+  const aggregateOpts = $xeTable.computeAggregateOpts
+  const { mapChildrenField } = aggregateOpts
+  if ((aggregateConfig || rowGroupConfig) && isRowGroupStatus) {
+    const aggList: VxeTableDefines.AggregateRowInfo[] = []
+    XEUtils.eachTree(tableFullGroupData, row => {
+      if (row.isAggregate) {
+        aggList.push(row)
+      }
+    }, { children: mapChildrenField })
+    handleeGroupSummary($xeTable, aggList)
+  }
+}
+
 function handleGroupData ($xeTable: VxeTableConstructor & VxeTablePrivateMethods, list: any[], rowGroups: VxeTableDefines.RowGroupItem[]) {
   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
@@ -2727,7 +2769,7 @@ function handleGroupData ($xeTable: VxeTableConstructor & VxeTablePrivateMethods
       const groupField = rgItem.field
       const groupColumn = $xeTable.getColumnByField(groupField)
       const groupMaps: Record<string, any[]> = {}
-      const groupList: any[] = []
+      const aggList: VxeTableDefines.AggregateRowInfo[] = []
       const rowkey = getRowkey($xeTable)
       list.forEach((row) => {
         const cellValue = groupColumn ? $xeTable.getCellLabel(row, groupColumn) : XEUtils.get(row, groupField)
@@ -2744,12 +2786,12 @@ function handleGroupData ($xeTable: VxeTableConstructor & VxeTablePrivateMethods
       })
       XEUtils.objectEach(groupMaps, (childList, groupValue) => {
         const { fullData: childFullData, treeData: childTreeData } = handleGroupData($xeTable, childList, rowGroups.slice(1))
-        const childCount = 0
-        const groupRow = {
+        const aggRow: VxeTableDefines.AggregateRowInfo = {
           isAggregate: true,
-          childCount,
+          aggData: {},
           groupContent: groupValue,
           groupField,
+          childCount: 0,
           [rowField]: getRowUniqueId(),
           [parentField]: null,
           [rowkey]: getRowUniqueId(),
@@ -2757,29 +2799,19 @@ function handleGroupData ($xeTable: VxeTableConstructor & VxeTablePrivateMethods
           [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 {
@@ -2797,7 +2829,7 @@ function loadTableData ($xeTable: VxeTableConstructor & VxeTablePrivateMethods,
   const reactData = $xeTable as unknown as TableReactData
   const internalData = $xeTable as unknown as TableInternalData
 
-  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
@@ -2811,11 +2843,11 @@ function loadTableData ($xeTable: VxeTableConstructor & VxeTablePrivateMethods,
     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
@@ -2852,7 +2884,7 @@ function loadTableData ($xeTable: VxeTableConstructor & VxeTablePrivateMethods,
     } 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
@@ -2964,12 +2996,16 @@ function loadTableData ($xeTable: VxeTableConstructor & VxeTablePrivateMethods,
           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()
                 })
             })
@@ -3226,6 +3262,7 @@ function handleColumn ($xeTable: VxeTableConstructor & VxeTablePrivateMethods, c
     $xeTable.clearMergeCells()
     $xeTable.clearMergeFooterItems()
     $xeTable.handleTableData(true)
+    $xeTable.handleAggregateSummaryData()
 
     if ((scrollXLoad || scrollYLoad) && (expandColumn && expandOpts.mode !== 'fixed')) {
       warnLog('vxe.error.scrollErrProp', ['column.type=expand'])
@@ -3938,8 +3975,8 @@ const Methods = {
         handleRowCache(row, index, items, parentRow ? -1 : index, parentRow, rowid, nodes.length - 1, toTreePathSeq(path))
       }, { 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))
@@ -6385,6 +6422,11 @@ const Methods = {
     internalData.mergeFooterCellMaps = buildMergeData(mergeFooterList)
     reactData.mergeFootFlag++
   },
+  handleAggregateSummaryData () {
+    const $xeTable = this as VxeTableConstructor & VxeTablePrivateMethods
+
+    return updateGroupData($xeTable)
+  },
   handleTargetLeaveEvent () {
     const $xeTable = this as VxeTableConstructor & VxeTablePrivateMethods
     const internalData = $xeTable as unknown as TableInternalData
@@ -6695,7 +6737,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
@@ -6747,7 +6789,7 @@ const Methods = {
             }
             handleCheckboxReserveRow($xeTable, row, checked)
           }
-        }, { children: rowGroupOpts.mapChildrenField })
+        }, { children: aggregateOpts.mapChildrenField })
         reactData.updateCheckboxFlag++
         return
       } else if (treeConfig) {
@@ -6898,7 +6940,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
@@ -6913,7 +6955,7 @@ const Methods = {
 
       if (isRowGroupStatus) {
         // 行分组
-        const mapChildrenField = rowGroupOpts.mapChildrenField
+        const mapChildrenField = aggregateOpts.mapChildrenField
         if (mapChildrenField) {
           XEUtils.eachTree(afterGroupFullData, (row) => {
             const rowid = handleGetRowId(row)
@@ -7527,7 +7569,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
@@ -7554,7 +7596,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)
       }
     }
@@ -9034,9 +9076,9 @@ const Methods = {
     const props = $xeTable
     const internalData = $xeTable as unknown as TableInternalData
 
-    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) {
@@ -9052,9 +9094,9 @@ const Methods = {
     const props = $xeTable
     const internalData = $xeTable as unknown as TableInternalData
 
-    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, [])
@@ -9062,12 +9104,24 @@ const Methods = {
   },
   isRowGroupRecord (row: any) {
     const $xeTable = this as VxeTableConstructor & VxeTablePrivateMethods
+
+    warnLog('vxe.error.delFunc', ['isRowGroupRecord', 'isAggregateRecord'])
+    return $xeTable.isAggregateRecord(row)
+  },
+  isRowGroupExpandByRow (row: any) {
+    const $xeTable = this as VxeTableConstructor & VxeTablePrivateMethods
+
+    warnLog('vxe.error.delFunc', ['isRowGroupExpandByRow', 'isAggregateExpandByRow'])
+    return $xeTable.isAggregateExpandByRow(row)
+  },
+  isAggregateRecord (row: any) {
+    const $xeTable = this as VxeTableConstructor & VxeTablePrivateMethods
     const reactData = $xeTable as unknown as TableReactData
 
     const { isRowGroupStatus } = reactData
     return isRowGroupStatus && row.isAggregate
   },
-  isRowGroupExpandByRow (row: any) {
+  isAggregateExpandByRow (row: any) {
     const $xeTable = this as VxeTableConstructor & VxeTablePrivateMethods
     const reactData = $xeTable as unknown as TableReactData
     const internalData = $xeTable as unknown as TableInternalData
@@ -9093,8 +9147,8 @@ const Methods = {
     const internalData = $xeTable as unknown as TableInternalData
 
     const { tableFullGroupData } = internalData
-    const rowGroupOpts = $xeTable.computeRowGroupOpts
-    const { mapChildrenField } = rowGroupOpts
+    const aggregateOpts = $xeTable.computeAggregateOpts
+    const { mapChildrenField } = aggregateOpts
     const rgExpandedMaps: Record<string, any> = {}
     if (expanded && mapChildrenField) {
       XEUtils.eachTree(tableFullGroupData, (row) => {
@@ -9234,9 +9288,9 @@ const Methods = {
     const internalData = $xeTable as unknown as TableInternalData
 
     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
     }
@@ -10240,10 +10294,10 @@ const Methods = {
     const { tableFullData } = internalData
     const rests: Promise<any>[] = []
     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/packages/table/src/props.ts

@@ -177,7 +177,9 @@ export default {
   footerCellConfig: Object as PropType<VxeTablePropTypes.FooterCellConfig>,
   // 行配置项
   rowConfig: Object as PropType<VxeTablePropTypes.RowConfig>,
-  // 行分组配置项
+  // 数据聚合配置项
+  aggregateConfig: Object as PropType<VxeTablePropTypes.AggregateConfig>,
+  //  已废弃，被 aggregateConfig 替换
   rowGroupConfig: Object as PropType<VxeTablePropTypes.RowGroupConfig>,
   // 当前行配置项
   currentRowConfig: Object as PropType<VxeTablePropTypes.CurrentRowConfig>,

package/packages/table/src/table.ts

@@ -777,13 +777,13 @@ export default {
       const $xeTable = this
       const props = $xeTable
 
-      return Object.assign({}, getConfig().table.scrollX, getConfig().table.virtualXConfig, props.scrollX, props.virtualXConfig)
+      return Object.assign({}, getConfig().table.virtualXConfig || getConfig().table.scrollX, props.virtualXConfig || props.scrollX)
     },
     computeVirtualYOpts () {
       const $xeTable = this
       const props = $xeTable
 
-      return Object.assign({}, getConfig().table.scrollY, getConfig().table.virtualYConfig, props.scrollY, props.virtualYConfig)
+      return Object.assign({}, getConfig().table.virtualYConfig || getConfig().table.scrollY, props.virtualYConfig || props.scrollY)
     },
     computeScrollbarOpts () {
       const $xeTable = this
@@ -881,11 +881,16 @@ export default {
 
       return Object.assign({}, getConfig().table.rowConfig, props.rowConfig)
     },
-    computeRowGroupOpts () {
+    computeAggregateOpts () {
       const $xeTable = this as VxeTableConstructor & VxeTablePrivateMethods
       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 as VxeTableConstructor & VxeTablePrivateMethods
+
+      return $xeTable.computeAggregateOpts
     },
     computeCurrentRowOpts () {
       const $xeTable = this as VxeTableConstructor & VxeTablePrivateMethods
@@ -1279,8 +1284,8 @@ export default {
     computeRowGroupFields () {
       const $xeTable = this as VxeTableConstructor & VxeTablePrivateMethods
 
-      const rowGroupOpts = $xeTable.computeRowGroupOpts
-      return rowGroupOpts.groupFields
+      const aggregateOpts = $xeTable.computeAggregateOpts
+      return aggregateOpts.groupFields
     },
     tabsResizeFlag () {
       const $xeTable = this as VxeTableConstructor & VxeTablePrivateMethods
@@ -1564,8 +1569,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'])
@@ -1658,6 +1663,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/packages/table/src/util.ts

@@ -4,7 +4,7 @@ import { isScale, isPx, queryElement } from '../../ui/src/dom'
 import { warnLog, errLog } from '../../ui/src/log'
 import { eqEmptyValue } from '../../ui/src/utils'
 
-import type { VxeTableDefines, VxeTableConstructor, TableReactData, TableInternalData, VxeTablePrivateMethods } from '../../../types'
+import type { VxeTableDefines, VxeTableConstructor, TableReactData, TableInternalData, VxeTablePrivateMethods, VxeTablePropTypes } from '../../../types'
 
 const getAllConvertColumns = (columns: any, parentColumn?: any) => {
   const result: any[] = []
@@ -204,7 +204,7 @@ export function handleFieldOrColumn ($xeTable: VxeTableConstructor, fieldOrColum
   return null
 }
 
-export const handleRowidOrRow = ($xeTable: VxeTableConstructor, rowidOrRow: any) => {
+export function handleRowidOrRow ($xeTable: VxeTableConstructor, rowidOrRow: any) {
   if (rowidOrRow) {
     const rowid = XEUtils.isString(rowidOrRow) || XEUtils.isNumber(rowidOrRow) ? rowidOrRow : getRowid($xeTable, rowidOrRow)
     return $xeTable.getRowById(rowid)
@@ -212,6 +212,10 @@ export const handleRowidOrRow = ($xeTable: VxeTableConstructor, rowidOrRow: any)
   return null
 }
 
+export function getCellRestHeight (rowRest: VxeTableDefines.RowCacheItem, cellOpts: VxeTablePropTypes.CellConfig, rowOpts: VxeTablePropTypes.RowConfig, defaultRowHeight: number) {
+  return rowRest.resizeHeight || cellOpts.height || rowOpts.height || rowRest.height || defaultRowHeight
+}
+
 // 组装列配置
 export function assembleColumn (_vm: any) {
   const $xeTable = _vm.$xeTable as VxeTableConstructor & VxeTablePrivateMethods

package/packages/ui/index.ts

@@ -133,7 +133,7 @@ VxeUI.setConfig({
       // isEvery: false,
       showIcon: true
     },
-    rowGroupConfig: {
+    aggregateConfig: {
       padding: true,
       rowField: 'id',
       parentField: '_X_ROW_PARENT_KEY',
@@ -208,13 +208,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/styles/components/table.scss

@@ -1000,15 +1000,6 @@ $btnThemeList: (
       }
     }
   }
-  &.column--highlight {
-    .vxe-header--column {
-      &:not(.col--seq) {
-        &:hover {
-          background-color: var(--vxe-ui-table-column-hover-background-color);
-        }
-      }
-    }
-  }
   &.header-cell--area {
     .vxe-table--header-wrapper {
       user-select: none;
@@ -1090,6 +1081,16 @@ $btnThemeList: (
   }
 
   // 列高亮
+  &.column--highlight {
+    .vxe-header--column {
+      &:hover {
+        background-color: var(--vxe-ui-table-column-hover-background-color);
+        &.col--current {
+          background-color: var(--vxe-ui-table-column-hover-current-background-color);
+        }
+      }
+    }
+  }
   .vxe-header--column,
   .vxe-body--column,
   .vxe-footer--column {
@@ -1135,6 +1136,9 @@ $btnThemeList: (
     &.row--hover {
       & > .vxe-body--column {
         background-color: var(--vxe-ui-table-row-hover-background-color);
+        &.col--current {
+          background-color: var(--vxe-ui-table-column-current-background-color);
+        }
       }
       &.row--stripe {
         & > .vxe-body--column {

package/styles/theme/base.scss

@@ -36,8 +36,6 @@
   --vxe-ui-table-row-height-mini: 36px;
   --vxe-ui-table-row-line-height: 22px;
 
-  --vxe-ui-table-column-hover-background-color: #d7effb;
-  --vxe-ui-table-column-current-background-color: #e6f7ff;
   --vxe-ui-table-column-icon-border-color: #c0c4cc;
   --vxe-ui-table-column-icon-border-hover-color: #515A6E;
 

package/styles/theme/dark.scss

@@ -31,6 +31,9 @@
   /*table*/
   --vxe-ui-table-header-background-color: #28282a;
   --vxe-ui-table-column-to-row-background-color: #28282a;
+  --vxe-ui-table-column-hover-background-color: #242f3b;
+  --vxe-ui-table-column-current-background-color: #18222c;
+  --vxe-ui-table-column-hover-current-background-color: #242f3b;
   --vxe-ui-table-border-color: #37373a;
   --vxe-ui-table-row-hover-background-color: #262727;
   --vxe-ui-table-row-striped-background-color: #1D1D1D;
@@ -40,7 +43,7 @@
   --vxe-ui-table-row-checkbox-checked-background-color: #604820;
   --vxe-ui-table-row-hover-checkbox-checked-background-color: #6e5326;
   --vxe-ui-table-row-current-background-color: #18222c;
-  --vxe-ui-table-row-hover-current-background-color: #262727;
+  --vxe-ui-table-row-hover-current-background-color: #242f3b;
   --vxe-ui-table-fixed-scrolling-box-shadow-color: rgba(0, 0, 0, 0.8);
   --vxe-ui-table-drag-over-background-color:rgba(48, 48, 0, 0.3);
 }