vxe-table 3.21.2 → 3.21.4

package/es/table/src/methods.js

@@ -3191,12 +3191,12 @@ function updateGroupData($xeTable) {
         handleeGroupSummary($xeTable, aggList);
     }
 }
-function handleGroupData($xeTable, list, rowGroups) {
+function handleGroupData($xeTable, list, rowGroups, isCombinedField) {
     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;
@@ -3208,11 +3208,26 @@ function handleGroupData($xeTable, list, rowGroups) {
             const groupField = rgItem.field;
             const groupColumn = $xeTable.getColumnByField(groupField);
             const groupMaps = {};
+            const groupCombinedMaps = {};
             const aggList = [];
             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 = [];
@@ -3223,33 +3238,62 @@ function handleGroupData($xeTable, list, rowGroups) {
                 }
                 childList.push(row);
             });
-            XEUtils.objectEach(groupMaps, (childList, groupValue) => {
-                const { fullData: childFullData, treeData: childTreeData } = handleGroupData($xeTable, childList, rowGroups.slice(1));
-                const aggRow = {
-                    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 = {
+                        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 = {
+                        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);
         }
     }
@@ -3258,6 +3302,13 @@ function handleGroupData($xeTable, list, rowGroups) {
         fullData
     };
 }
+function initGroupData($xeTable, list, rowGroups) {
+    const aggregateOpts = $xeTable.computeAggregateOpts;
+    const { mode } = aggregateOpts;
+    const isCombinedField = mode === 'combined';
+    const groupRest = handleGroupData($xeTable, list, rowGroups, isCombinedField);
+    return groupRest;
+}
 /**
  * 加载表格数据
  * @param {Array} datas 数据
@@ -3324,7 +3375,7 @@ function loadTableData($xeTable, datas, isReload, isReset) {
         }
     }
     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/es/table/src/table.js

@@ -758,6 +758,11 @@ export default {
             const props = $xeTable;
             return Object.assign({}, getConfig().table.aggregateConfig || getConfig().table.rowGroupConfig, props.aggregateConfig || props.rowGroupConfig);
         },
+        computeAggregateMode() {
+            const $xeTable = this;
+            const aggregateOpts = $xeTable.computeAggregateOpts;
+            return aggregateOpts.mode;
+        },
         computeAggregateAccuracyOpts() {
             const $xeTable = this;
             const props = $xeTable;
@@ -1523,6 +1528,14 @@ export default {
                     $xeTable.reloadData(tableFullData);
                 });
             }
+        },
+        computeAggregateMode() {
+            const $xeTable = this;
+            const reactData = $xeTable;
+            const internalData = $xeTable;
+            if (reactData.isRowGroupStatus) {
+                this.loadTableData(internalData.tableSynchData, false, true);
+            }
         }
     },
     created() {
@@ -1636,6 +1649,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.isAllExpand)) {
+            warnLog('vxe.error.delProp', ['isAllExpand', 'isTreeAllExpanded']);
+        }
         if (!props.id) {
             if ((props.customConfig ? isEnableConf(customOpts) : customOpts.enabled) && customOpts.storage) {
                 errLog('vxe.error.reqProp', ['id']);

package/es/table/src/util.js

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

package/es/table/style.css

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