vxe-table 3.21.1 → 3.21.3

package/packages/table/src/methods.ts

@@ -3327,12 +3327,12 @@ function updateGroupData ($xeTable: VxeTableConstructor & VxeTablePrivateMethods
   }
 }
 
-function handleGroupData ($xeTable: VxeTableConstructor & VxeTablePrivateMethods, list: any[], rowGroups: VxeTableDefines.RowGroupItem[]) {
+function handleGroupData ($xeTable: VxeTableConstructor & VxeTablePrivateMethods, list: any[], rowGroups: VxeTableDefines.RowGroupItem[], isCombinedField?: boolean) {
   let fullData = list
   let treeData = list
   if (rowGroups) {
     const aggregateOpts = $xeTable.computeAggregateOpts
-    const { rowField, parentField, childrenField, mapChildrenField } = aggregateOpts
+    const { rowField, parentField, separator, childrenField, mapChildrenField } = aggregateOpts
     const rowOpts = $xeTable.computeRowOpts
     const checkboxOpts = $xeTable.computeCheckboxOpts
     const { checkField } = checkboxOpts
@@ -3344,11 +3344,26 @@ function handleGroupData ($xeTable: VxeTableConstructor & VxeTablePrivateMethods
       const groupField = rgItem.field
       const groupColumn = $xeTable.getColumnByField(groupField)
       const groupMaps: Record<string, any[]> = {}
+      const groupCombinedMaps: Record<string, any[]> = {}
       const aggList: VxeTableDefines.AggregateRowInfo[] = []
       const rowkey = getRowkey($xeTable)
       list.forEach((row) => {
         const cellValue = groupColumn ? $xeTable.getCellLabel(row, groupColumn) : XEUtils.get(row, groupField)
-        const groupValue = XEUtils.eqNull(cellValue) ? '' : cellValue
+        let groupValue = XEUtils.eqNull(cellValue) ? '' : cellValue
+        if (isCombinedField) {
+          const groupVals = [groupValue]
+          rowGroups.slice(1).forEach(ogItem => {
+            const ogField = ogItem.field
+            const ogColumn = $xeTable.getColumnByField(ogField)
+            const ocValue = ogColumn ? $xeTable.getCellLabel(row, ogColumn) : XEUtils.get(row, ogField)
+            const ogValue = XEUtils.eqNull(ocValue) ? '' : ocValue
+            groupValue += (separator || ' / ') + ogValue
+            groupVals.push(ogValue)
+          })
+          if (!groupCombinedMaps[groupValue]) {
+            groupCombinedMaps[groupValue] = groupVals
+          }
+        }
         let childList = groupMaps[groupValue]
         if (!childList) {
           childList = []
@@ -3359,33 +3374,61 @@ function handleGroupData ($xeTable: VxeTableConstructor & VxeTablePrivateMethods
         }
         childList.push(row)
       })
-      XEUtils.objectEach(groupMaps, (childList, groupValue) => {
-        const { fullData: childFullData, treeData: childTreeData } = handleGroupData($xeTable, childList, rowGroups.slice(1))
-        const aggRow: VxeTableDefines.AggregateRowInfo = {
-          isAggregate: true,
-          aggData: {},
-          groupContent: groupValue,
-          groupField,
-          childCount: 0,
-          [rowField]: getRowUniqueId(),
-          [parentField]: null,
-          [childrenField]: childTreeData,
-          [mapChildrenField]: childTreeData
-        }
-        aggRow[rowkey] = createRowId(rowOpts, aggRow, rowkey)
-        if (checkField) {
-          aggRow[checkField] = false
-        }
-        if (indeterminateField) {
-          aggRow[indeterminateField] = false
-        }
-        aggList.push(aggRow)
-        treeData.push(aggRow)
-        fullData.push(aggRow)
-        if (childFullData.length) {
-          fullData.push(...childFullData)
-        }
-      })
+      if (isCombinedField) {
+        XEUtils.objectEach(groupMaps, (childList, groupValue) => {
+          const aggRow: VxeTableDefines.AggregateRowInfo = {
+            isAggregate: true,
+            aggData: {},
+            groupContent: groupValue,
+            groupCombineds: groupCombinedMaps[groupValue],
+            groupField,
+            childCount: 0,
+            [rowField]: getRowUniqueId(),
+            [parentField]: null,
+            [childrenField]: childList,
+            [mapChildrenField]: childList
+          }
+          aggRow[rowkey] = createRowId(rowOpts, aggRow, rowkey)
+          if (checkField) {
+            aggRow[checkField] = false
+          }
+          if (indeterminateField) {
+            aggRow[indeterminateField] = false
+          }
+          aggList.push(aggRow)
+          treeData.push(aggRow)
+          fullData.push(aggRow)
+        })
+      } else {
+        XEUtils.objectEach(groupMaps, (childList, groupValue) => {
+          const { fullData: childFullData, treeData: childTreeData } = handleGroupData($xeTable, childList, rowGroups.slice(1))
+          const aggRow: VxeTableDefines.AggregateRowInfo = {
+            isAggregate: true,
+            aggData: {},
+            groupContent: groupValue,
+            groupCombineds: [],
+            groupField,
+            childCount: 0,
+            [rowField]: getRowUniqueId(),
+            [parentField]: null,
+            [childrenField]: childTreeData,
+            [mapChildrenField]: childTreeData
+          }
+          aggRow[rowkey] = createRowId(rowOpts, aggRow, rowkey)
+          if (checkField) {
+            aggRow[checkField] = false
+          }
+          if (indeterminateField) {
+            aggRow[indeterminateField] = false
+          }
+          aggList.push(aggRow)
+          treeData.push(aggRow)
+          fullData.push(aggRow)
+          if (childFullData.length) {
+            fullData.push(...childFullData)
+          }
+        })
+      }
       handleeGroupSummary($xeTable, aggList)
     }
   }
@@ -3395,6 +3438,14 @@ function handleGroupData ($xeTable: VxeTableConstructor & VxeTablePrivateMethods
   }
 }
 
+function initGroupData ($xeTable: VxeTableConstructor & VxeTablePrivateMethods, list: any[], rowGroups: VxeTableDefines.RowGroupItem[]) {
+  const aggregateOpts = $xeTable.computeAggregateOpts
+  const { mode } = aggregateOpts
+  const isCombinedField = mode === 'combined'
+  const groupRest = handleGroupData($xeTable, list, rowGroups, isCombinedField)
+  return groupRest
+}
+
 /**
  * 加载表格数据
  * @param {Array} datas 数据
@@ -3460,7 +3511,7 @@ function loadTableData ($xeTable: VxeTableConstructor & VxeTablePrivateMethods,
       treeData = fullData.slice(0)
     }
   } else if ((aggregateConfig || rowGroupConfig) && rowGroupList.length) {
-    const groupRest = handleGroupData($xeTable, fullData, rowGroupList)
+    const groupRest = initGroupData($xeTable, fullData, rowGroupList)
     treeData = groupRest.treeData
     fullData = groupRest.fullData
     isRGroup = true

package/packages/table/src/table.ts

@@ -828,6 +828,12 @@ export default {
 
       return Object.assign({}, getConfig().table.aggregateConfig || getConfig().table.rowGroupConfig, props.aggregateConfig || props.rowGroupConfig)
     },
+    computeAggregateMode () {
+      const $xeTable = this as VxeTableConstructor & VxeTablePrivateMethods
+
+      const aggregateOpts = $xeTable.computeAggregateOpts
+      return aggregateOpts.mode
+    },
     computeAggregateAccuracyOpts () {
       const $xeTable = this as VxeTableConstructor & VxeTablePrivateMethods
       const props = $xeTable
@@ -1651,6 +1657,15 @@ export default {
           $xeTable.reloadData(tableFullData)
         })
       }
+    },
+    computeAggregateMode () {
+      const $xeTable = this as VxeTableConstructor & VxeTablePrivateMethods
+      const reactData = $xeTable as unknown as TableReactData
+      const internalData = $xeTable as unknown as TableInternalData
+
+      if (reactData.isRowGroupStatus) {
+        this.loadTableData(internalData.tableSynchData, false, true)
+      }
     }
   } as any,
   created () {
@@ -1768,6 +1783,9 @@ export default {
     if (exportConfig && exportOpts.types && !exportOpts.exportMethod && !XEUtils.includeArrays(XEUtils.keys(exportOpts._typeMaps), exportOpts.types)) {
       warnLog('vxe.error.errProp', [`export-config.types=${exportOpts.types.join(',')}`, exportOpts.types.filter((type) => XEUtils.includes(XEUtils.keys(exportOpts._typeMaps), type)).join(',') || XEUtils.keys(exportOpts._typeMaps).join(',')])
     }
+    if (exportConfig && XEUtils.isBoolean((exportOpts as any).isAllExpand)) {
+      warnLog('vxe.error.delProp', ['isAllExpand', 'isTreeAllExpanded'])
+    }
 
     if (!props.id) {
       if ((props.customConfig ? isEnableConf(customOpts) : customOpts.enabled) && customOpts.storage) {

package/packages/table/src/util.ts

@@ -340,6 +340,7 @@ export function createReactData (): TableReactData {
       hasFooter: false,
       hasMerge: false,
       hasTree: false,
+      hasRowGroup: false,
       hasColgroup: false,
       visible: false
     },
@@ -350,7 +351,8 @@ export function createReactData (): TableReactData {
       type: '',
       isColgroup: false,
       isMerge: false,
-      isAllExpand: false,
+      isTreeAllExpanded: false,
+      isRowGroupAllExpanded: false,
       useStyle: false,
       original: false,
       message: true,

package/styles/components/table-module/export.scss

@@ -37,7 +37,7 @@
           width: 80%;
         }
         & > .vxe-table-export--panel-option-row {
-          padding: 0.25em 0;
+          padding: 0.5em 0;
         }
       }
     }