vxe-table 4.19.1 → 4.19.3

package/packages/table/src/table.ts

@@ -312,6 +312,11 @@ export default defineVxeComponent({
       return computeAggregateOpts.value
     })
 
+    const computeAggregateMode = computed(() => {
+      const aggregateOpts = computeAggregateOpts.value
+      return aggregateOpts.mode
+    })
+
     const computeAggregateAccuracyOpts = computed(() => {
       return Object.assign({}, getConfig().table.aggregateAccuracyConfig, props.aggregateAccuracyConfig)
     })
@@ -3616,12 +3621,12 @@ export default defineVxeComponent({
       }
     }
 
-    const handleGroupData = (list: any[], rowGroups: VxeTableDefines.RowGroupItem[]) => {
+    const handleGroupData = (list: any[], rowGroups: VxeTableDefines.RowGroupItem[], isCombinedField?: boolean) => {
       let fullData = list
       let treeData = list
       if (rowGroups) {
         const aggregateOpts = computeAggregateOpts.value
-        const { rowField, parentField, childrenField, mapChildrenField } = aggregateOpts
+        const { rowField, parentField, separator, childrenField, mapChildrenField } = aggregateOpts
         const rowOpts = computeRowOpts.value
         const checkboxOpts = computeCheckboxOpts.value
         const { checkField } = checkboxOpts
@@ -3633,11 +3638,26 @@ export default defineVxeComponent({
           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 = []
@@ -3648,33 +3668,61 @@ export default defineVxeComponent({
             }
             childList.push(row)
           })
-          XEUtils.objectEach(groupMaps, (childList, groupValue) => {
-            const { fullData: childFullData, treeData: childTreeData } = handleGroupData(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(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(aggList)
         }
       }
@@ -3684,6 +3732,14 @@ export default defineVxeComponent({
       }
     }
 
+    const initGroupData = (list: any[], rowGroups: VxeTableDefines.RowGroupItem[]) => {
+      const aggregateOpts = computeAggregateOpts.value
+      const { mode } = aggregateOpts
+      const isCombinedField = mode === 'combined'
+      const groupRest = handleGroupData(list, rowGroups, isCombinedField)
+      return groupRest
+    }
+
     const initData = () => {
       const { data } = props
       loadTableData(data || [], true, true).then(() => {
@@ -3765,7 +3821,7 @@ export default defineVxeComponent({
           treeData = fullData.slice(0)
         }
       } else if ((aggregateConfig || rowGroupConfig) && rowGroupList.length) {
-        const groupRest = handleGroupData(fullData, rowGroupList)
+        const groupRest = initGroupData(fullData, rowGroupList)
         treeData = groupRest.treeData
         fullData = groupRest.fullData
         isRGroup = true
@@ -13878,6 +13934,12 @@ export default defineVxeComponent({
       internalData.keepUpdateFieldMaps = kpfMaps
     })
 
+    watch(computeAggregateMode, () => {
+      if (reactData.isRowGroupStatus) {
+        loadTableData(internalData.tableSynchData, false, true)
+      }
+    })
+
     if ($xeTabs) {
       watch(() => $xeTabs ? $xeTabs.reactData.resizeFlag : null, () => {
         handleGlobalResizeEvent()
@@ -14040,6 +14102,9 @@ export default defineVxeComponent({
       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

@@ -342,6 +342,7 @@ export function createReactData (): TableReactData {
       hasFooter: false,
       hasMerge: false,
       hasTree: false,
+      hasRowGroup: false,
       hasColgroup: false,
       visible: false
     },
@@ -352,7 +353,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;
         }
       }
     }