vxe-table 4.19.2 → 4.19.3

package/dist/all.esm.js

@@ -44,7 +44,7 @@ function eqEmptyValue(cellValue) {
     return cellValue === '' || XEUtils.eqNull(cellValue);
 }
 
-const version$1 = "4.19.2";
+const version$1 = "4.19.3";
 VxeUI.version = version$1;
 VxeUI.tableVersion = version$1;
 VxeUI.setConfig({
@@ -556,7 +556,7 @@ const modal = {
 const defineVxeComponent = defineComponent;
 
 const { log } = VxeUI;
-const version = `table v${"4.19.2"}`;
+const version = `table v${"4.19.3"}`;
 const warnLog = log.create('warn', version);
 const errLog = log.create('error', version);
 
@@ -1262,6 +1262,7 @@ function createReactData$2() {
             hasFooter: false,
             hasMerge: false,
             hasTree: false,
+            hasRowGroup: false,
             hasColgroup: false,
             visible: false
         },
@@ -1272,7 +1273,8 @@ function createReactData$2() {
             type: '',
             isColgroup: false,
             isMerge: false,
-            isAllExpand: false,
+            isTreeAllExpanded: false,
+            isRowGroupAllExpanded: false,
             useStyle: false,
             original: false,
             message: true,
@@ -5916,7 +5918,7 @@ var TableCustomPanelComponent = defineVxeComponent({
             const { immediate } = customOpts;
             const trEl = evnt.currentTarget;
             const columnDragOpts = computeColumnDragOpts.value;
-            const { isCrossDrag, isSelfToChildDrag, isToChildDrag, dragEndMethod } = columnDragOpts;
+            const { isCrossDrag, isPeerDrag, isSelfToChildDrag, isToChildDrag, dragEndMethod } = columnDragOpts;
             const { dragCol } = customPanelReactData;
             const { prevDragCol, prevDragGroupField, prevDragAggFnColid, prevDragPos, prevDragToChild } = customPanelInternalData;
             const dragOffsetIndex = prevDragPos === 'bottom' ? 1 : 0;
@@ -5954,20 +5956,28 @@ var TableCustomPanelComponent = defineVxeComponent({
                         if (immediate) {
                             if (dragColumn.parentId && newColumn.parentId) {
                                 // 子到子
-                                if (!isCrossDrag) {
-                                    return;
+                                if (isPeerDrag && !isCrossDrag) {
+                                    if (dragColumn.parentId !== newColumn.parentId) {
+                                        // 非同级
+                                        return;
+                                    }
                                 }
-                                if (oldAllMaps[newColumn.id]) {
-                                    isSelfToChildStatus = true;
-                                    if (!(isCrossDrag && isSelfToChildDrag)) {
-                                        if (VxeUI.modal) {
-                                            VxeUI.modal.message({
-                                                status: 'error',
-                                                content: getI18n$a('vxe.error.treeDragChild')
-                                            });
-                                        }
+                                else {
+                                    if (!isCrossDrag) {
                                         return;
                                     }
+                                    if (oldAllMaps[newColumn.id]) {
+                                        isSelfToChildStatus = true;
+                                        if (!(isCrossDrag && isSelfToChildDrag)) {
+                                            if (VxeUI.modal) {
+                                                VxeUI.modal.message({
+                                                    status: 'error',
+                                                    content: getI18n$a('vxe.error.treeDragChild')
+                                                });
+                                            }
+                                            return;
+                                        }
+                                    }
                                 }
                             }
                             else if (dragColumn.parentId) {
@@ -6092,7 +6102,7 @@ var TableCustomPanelComponent = defineVxeComponent({
             const customOpts = computeCustomOpts.value;
             const { showSortDragButton, allowSort, immediate } = customOpts;
             const columnDragOpts = computeColumnDragOpts.value;
-            const { isCrossDrag, isToChildDrag } = columnDragOpts;
+            const { isCrossDrag, isPeerDrag, isToChildDrag } = columnDragOpts;
             const optEl = evnt.currentTarget;
             const isControlKey = hasControlKey(evnt);
             const colid = optEl.getAttribute('colid');
@@ -6101,16 +6111,16 @@ var TableCustomPanelComponent = defineVxeComponent({
             customPanelInternalData.prevDragGroupField = null;
             customPanelInternalData.prevDragAggFnColid = null;
             // 是否移入有效列
-            if (column && (isCrossDrag || column.level === 1)) {
+            if (column && (isCrossDrag || isPeerDrag || column.level === 1)) {
                 evnt.preventDefault();
                 const offsetY = evnt.clientY - optEl.getBoundingClientRect().y;
                 const dragPos = offsetY < optEl.clientHeight / 2 ? 'top' : 'bottom';
                 if (!dragCol ||
                     !(showSortDragButton && allowSort) ||
                     (dragCol && dragCol.id === column.id) ||
-                    (!isCrossDrag && column.level > 1) ||
+                    (!isCrossDrag && (isPeerDrag ? dragCol.parentId !== column.parentId : column.level > 1)) ||
                     (!immediate && column.level > 1) ||
-                    (!isCrossDrag && dragCol.level > 1) ||
+                    (!isCrossDrag && (isPeerDrag ? dragCol.parentId !== column.parentId : dragCol.level > 1)) ||
                     (!immediate && dragCol.level > 1)) {
                     showDropTip(evnt, optEl, false, dragPos);
                     return;
@@ -6245,7 +6255,7 @@ var TableCustomPanelComponent = defineVxeComponent({
             const { immediate, checkMethod, visibleMethod, allowVisible, allowSort, allowFixed, allowGroup, allowValues, trigger, placement, showSortDragButton, showSortMoveButton, showSortPutButton } = customOpts;
             const isMaxFixedColumn = computeIsMaxFixedColumn.value;
             const vSize = computeSize.value;
-            const { isCrossDrag } = columnDragOpts;
+            const { isCrossDrag, isPeerDrag } = columnDragOpts;
             const slots = customOpts.slots || {};
             const headerSlot = slots.header;
             const topSlot = slots.top;
@@ -6279,7 +6289,7 @@ var TableCustomPanelComponent = defineVxeComponent({
                     const colTitle = formatText(column.getTitle(), 1);
                     const isDisabled = checkMethod ? !checkMethod({ $table: $xeTable, column }) : false;
                     const isHidden = !isChecked;
-                    const showSortBtn = ((isCrossDrag ? immediate : false) || column.level === 1);
+                    const showSortBtn = (isCrossDrag || isPeerDrag ? immediate : false) || column.level === 1;
                     colVNs.push(h('li', {
                         key: column.id,
                         colid: column.id,
@@ -6575,7 +6585,7 @@ var TableCustomPanelComponent = defineVxeComponent({
             const modalOpts = Object.assign({}, modalOptions);
             const drawerOpts = Object.assign({}, drawerOptions);
             const isMaxFixedColumn = computeIsMaxFixedColumn.value;
-            const { isCrossDrag } = columnDragOpts;
+            const { isCrossDrag, isPeerDrag } = columnDragOpts;
             const slots = customOpts.slots || {};
             const headerSlot = slots.header;
             const topSlot = slots.top;
@@ -6622,7 +6632,7 @@ var TableCustomPanelComponent = defineVxeComponent({
                     const isColGroup = column.children && column.children.length;
                     const isDisabled = checkMethod ? !checkMethod({ $table: $xeTable, column }) : false;
                     const isHidden = !isChecked;
-                    const showSortBtn = ((isCrossDrag ? immediate : false) || column.level === 1);
+                    const showSortBtn = (isCrossDrag || isPeerDrag ? immediate : false) || column.level === 1;
                     trVNs.push(h('tr', {
                         key: column.id,
                         colid: column.id,
@@ -7692,7 +7702,7 @@ var TableExportPanelComponent = defineVxeComponent({
             const $xeGantt = $xeTable.xeGantt;
             const { defaultOptions, storeData } = props;
             const { isAll: isAllChecked, isIndeterminate: isAllIndeterminate } = reactData;
-            const { hasTree, hasMerge, isPrint, hasColgroup, columns } = storeData;
+            const { hasTree, hasRowGroup, hasMerge, isPrint, hasColgroup, columns } = storeData;
             const { isHeader } = defaultOptions;
             const colVNs = [];
             const checkedAll = computeCheckedAll.value;
@@ -7922,6 +7932,17 @@ var TableExportPanelComponent = defineVxeComponent({
                                                                         }
                                                                     })
                                                                     : renderEmptyElement$3($xeTable),
+                                                                VxeUICheckboxComponent
+                                                                    ? h(VxeUICheckboxComponent, {
+                                                                        modelValue: defaultOptions.isFooter,
+                                                                        disabled: !storeData.hasFooter,
+                                                                        title: getI18n$7('vxe.export.expFooterTitle'),
+                                                                        content: getI18n$7('vxe.export.expOptFooter'),
+                                                                        'onUpdate:modelValue'(value) {
+                                                                            defaultOptions.isFooter = value;
+                                                                        }
+                                                                    })
+                                                                    : renderEmptyElement$3($xeTable),
                                                                 VxeUICheckboxComponent
                                                                     ? h(VxeUICheckboxComponent, {
                                                                         modelValue: isHeader ? defaultOptions.isTitle : false,
@@ -7980,30 +8001,30 @@ var TableExportPanelComponent = defineVxeComponent({
                                                                         'onUpdate:modelValue'(value) {
                                                                             defaultOptions.useStyle = value;
                                                                         }
-                                                                    }),
+                                                                    })
+                                                            ]),
+                                                            h('div', {
+                                                                class: 'vxe-table-export--panel-option-row'
+                                                            }, [
                                                                 VxeUICheckboxComponent
                                                                     ? h(VxeUICheckboxComponent, {
-                                                                        modelValue: hasTree ? defaultOptions.isAllExpand : false,
+                                                                        modelValue: hasTree ? defaultOptions.isTreeAllExpanded : false,
                                                                         disabled: hasEmptyData || !hasTree,
-                                                                        title: getI18n$7('vxe.export.expAllExpandTitle'),
-                                                                        content: getI18n$7('vxe.export.expOptAllExpand'),
+                                                                        title: getI18n$7('vxe.export.expTreeAllExpandTitle'),
+                                                                        content: getI18n$7('vxe.export.expOptTreeAllExpand'),
                                                                         'onUpdate:modelValue'(value) {
-                                                                            defaultOptions.isAllExpand = value;
+                                                                            defaultOptions.isTreeAllExpanded = value;
                                                                         }
                                                                     })
-                                                                    : renderEmptyElement$3($xeTable)
-                                                            ]),
-                                                            h('div', {
-                                                                class: 'vxe-table-export--panel-option-row'
-                                                            }, [
+                                                                    : renderEmptyElement$3($xeTable),
                                                                 VxeUICheckboxComponent
                                                                     ? h(VxeUICheckboxComponent, {
-                                                                        modelValue: defaultOptions.isFooter,
-                                                                        disabled: !storeData.hasFooter,
-                                                                        title: getI18n$7('vxe.export.expFooterTitle'),
-                                                                        content: getI18n$7('vxe.export.expOptFooter'),
+                                                                        modelValue: hasRowGroup ? defaultOptions.isRowGroupAllExpanded : false,
+                                                                        disabled: hasEmptyData || !hasRowGroup,
+                                                                        title: getI18n$7('vxe.export.expRowGroupAllExpandTitle'),
+                                                                        content: getI18n$7('vxe.export.expOptRowGroupAllExpand'),
                                                                         'onUpdate:modelValue'(value) {
-                                                                            defaultOptions.isFooter = value;
+                                                                            defaultOptions.isRowGroupAllExpanded = value;
                                                                         }
                                                                     })
                                                                     : renderEmptyElement$3($xeTable)
@@ -10366,12 +10387,7 @@ const tableExportMethodKeys = ['exportData', 'importByFile', 'importData', 'save
 hooks$4.add('tableExportModule', {
     setupTable($xeTable) {
         const { props, reactData, internalData } = $xeTable;
-        const { computeTreeOpts, computePrintOpts, computeExportOpts, computeImportOpts, computeCustomOpts, computeSeqOpts, computeRadioOpts, computeCheckboxOpts, computeColumnOpts } = $xeTable.getComputeMaps();
-        const hasTreeChildren = (row) => {
-            const treeOpts = computeTreeOpts.value;
-            const childrenField = treeOpts.children || treeOpts.childrenField;
-            return row[childrenField] && row[childrenField].length;
-        };
+        const { computeTreeOpts, computePrintOpts, computeExportOpts, computeImportOpts, computeCustomOpts, computeSeqOpts, computeRadioOpts, computeCheckboxOpts, computeColumnOpts, computeAggregateOpts } = $xeTable.getComputeMaps();
         const getSeq = (cellValue, row, $rowIndex, column, $columnIndex) => {
             const seqOpts = computeSeqOpts.value;
             const seqMd = seqOpts.seqMethod || column.seqMethod;
@@ -10402,32 +10418,119 @@ hooks$4.add('tableExportModule', {
             return eqEmptyValue(cellValue) ? '' : `${cellValue}`;
         };
         const getBodyLabelData = (opts, columns, datas) => {
-            const { isAllExpand, mode } = opts;
+            const { isTreeAllExpanded, isRowGroupAllExpanded, mode } = opts;
             const { treeConfig } = props;
+            const { isRowGroupStatus } = reactData;
             const radioOpts = computeRadioOpts.value;
             const checkboxOpts = computeCheckboxOpts.value;
             const treeOpts = computeTreeOpts.value;
             const columnOpts = computeColumnOpts.value;
+            const aggregateOpts = computeAggregateOpts.value;
             if (!htmlCellElem) {
                 htmlCellElem = document.createElement('div');
             }
+            const { handleGetRowId } = createHandleGetRowId($xeTable);
+            if (isRowGroupStatus) {
+                // 如果是数据分组
+                const { mapChildrenField } = aggregateOpts;
+                const rest = [];
+                const expandMaps = {};
+                const useMaps = {};
+                XEUtils.eachTree(datas, (item, $rowIndex, items, path, parentItem, nodes) => {
+                    const row = item._row || item;
+                    const rowid = handleGetRowId(row);
+                    if (useMaps[rowid]) {
+                        return;
+                    }
+                    const parentRow = parentItem && parentItem._row ? parentItem._row : parentItem;
+                    const pRowid = parentRow ? handleGetRowId(parentRow) : '';
+                    if ((isRowGroupAllExpanded || !parentRow || (expandMaps[pRowid] && $xeTable.isRowExpandByRow(parentRow)))) {
+                        const hasRowChild = mapChildrenField && row[mapChildrenField] && row[mapChildrenField].length;
+                        const item = {
+                            _row: row,
+                            _level: nodes.length - 1,
+                            _hasChild: hasRowChild,
+                            _expand: hasRowChild && $xeTable.isRowExpandByRow(row)
+                        };
+                        columns.forEach((column, $columnIndex) => {
+                            let cellValue = '';
+                            const renderOpts = column.editRender || column.cellRender;
+                            let bodyExportMethod = column.exportMethod || columnOpts.exportMethod;
+                            if (!bodyExportMethod && renderOpts && renderOpts.name) {
+                                const compConf = renderer$3.get(renderOpts.name);
+                                if (compConf) {
+                                    bodyExportMethod = compConf.tableExportMethod || compConf.exportMethod;
+                                }
+                            }
+                            if (!bodyExportMethod) {
+                                bodyExportMethod = columnOpts.exportMethod;
+                            }
+                            if (bodyExportMethod) {
+                                cellValue = bodyExportMethod({ $table: $xeTable, row, column, options: opts });
+                            }
+                            else {
+                                switch (column.type) {
+                                    case 'seq': {
+                                        const seqVal = path.map((num, i) => i % 2 === 0 ? (Number(num) + 1) : '.').join('');
+                                        cellValue = mode === 'all' ? seqVal : getSeq(seqVal, row, $rowIndex, column, $columnIndex);
+                                        break;
+                                    }
+                                    case 'checkbox':
+                                        cellValue = toBooleanValue($xeTable.isCheckedByCheckboxRow(row));
+                                        item._checkboxLabel = checkboxOpts.labelField ? XEUtils.get(row, checkboxOpts.labelField) : '';
+                                        item._checkboxDisabled = checkboxOpts.checkMethod && !checkboxOpts.checkMethod({ $table: $xeTable, row });
+                                        break;
+                                    case 'radio':
+                                        cellValue = toBooleanValue($xeTable.isCheckedByRadioRow(row));
+                                        item._radioLabel = radioOpts.labelField ? XEUtils.get(row, radioOpts.labelField) : '';
+                                        item._radioDisabled = radioOpts.checkMethod && !radioOpts.checkMethod({ $table: $xeTable, row });
+                                        break;
+                                    default:
+                                        if (opts.original) {
+                                            cellValue = getCellValue(row, column);
+                                        }
+                                        else {
+                                            cellValue = $xeTable.getCellLabel(row, column);
+                                            if (column.type === 'html') {
+                                                htmlCellElem.innerHTML = cellValue;
+                                                cellValue = htmlCellElem.innerText.trim();
+                                            }
+                                            else {
+                                                const cell = $xeTable.getCellElement(row, column);
+                                                if (cell && !hasClass(cell, 'is--progress')) {
+                                                    cellValue = cell.innerText.trim();
+                                                }
+                                            }
+                                        }
+                                }
+                            }
+                            item[column.id] = toStringValue(cellValue);
+                        });
+                        useMaps[rowid] = true;
+                        if (pRowid) {
+                            expandMaps[pRowid] = true;
+                        }
+                        rest.push(Object.assign(item, row));
+                    }
+                }, { children: mapChildrenField });
+                return rest;
+            }
             if (treeConfig) {
+                // 如果是树结构
                 const childrenField = treeOpts.children || treeOpts.childrenField;
-                // 如果是树表格只允许导出数据源
                 const rest = [];
                 const expandMaps = {};
                 const useMaps = {};
-                const { handleGetRowId } = createHandleGetRowId($xeTable);
-                XEUtils.eachTree(datas, (item, $rowIndex, items, path, parent, nodes) => {
+                XEUtils.eachTree(datas, (item, $rowIndex, items, path, parentItem, nodes) => {
                     const row = item._row || item;
                     const rowid = handleGetRowId(row);
                     if (useMaps[rowid]) {
                         return;
                     }
-                    const parentRow = parent && parent._row ? parent._row : parent;
+                    const parentRow = parentItem && parentItem._row ? parentItem._row : parentItem;
                     const pRowid = parentRow ? handleGetRowId(parentRow) : '';
-                    if ((isAllExpand || !parentRow || (expandMaps[pRowid] && $xeTable.isTreeExpandByRow(parentRow)))) {
-                        const hasRowChild = hasTreeChildren(row);
+                    if ((isTreeAllExpanded || !parentRow || (expandMaps[pRowid] && $xeTable.isTreeExpandByRow(parentRow)))) {
+                        const hasRowChild = row[childrenField] && row[childrenField].length;
                         const item = {
                             _row: row,
                             _level: nodes.length - 1,
@@ -11082,10 +11185,11 @@ hooks$4.add('tableExportModule', {
             const $xeGantt = $xeTable.xeGantt;
             const $xeGGWrapper = $xeGrid || $xeGantt;
             const { treeConfig, showHeader, showFooter } = props;
-            const { initStore, isGroup, footerTableData, exportStore, exportParams } = reactData;
+            const { initStore, isGroup, rowGroupList, footerTableData, exportStore, exportParams } = reactData;
             const { collectColumn, mergeBodyList, mergeFooterList } = internalData;
             const exportOpts = computeExportOpts.value;
-            const hasTree = treeConfig;
+            const hasTree = !!treeConfig;
+            const hasRowGroup = rowGroupList.length > 0;
             const customOpts = computeCustomOpts.value;
             const selectRecords = $xeTable.getCheckboxRecords();
             const proxyOpts = $xeGGWrapper ? $xeGGWrapper.getComputeMaps().computeProxyOpts.value : {};
@@ -11102,6 +11206,11 @@ hooks$4.add('tableExportModule', {
                 current: 'current',
                 modes: (proxyOpts.ajax && proxyOpts.ajax.queryAll ? ['all'] : []).concat(['current', 'selected', 'empty'])
             }, options);
+            // 已废弃，参数 isAllExpand
+            if (XEUtils.isBoolean(defOpts.isAllExpand)) {
+                warnLog('vxe.error.delProp', ['isAllExpand', 'isTreeAllExpanded']);
+                defOpts.isTreeAllExpanded = defOpts.isAllExpand;
+            }
             const types = defOpts.types || XEUtils.keys(exportOpts._typeMaps);
             const modes = defOpts.modes || [];
             const checkMethod = customOpts.checkMethod;
@@ -11144,17 +11253,16 @@ hooks$4.add('tableExportModule', {
                 column.disabled = (parent && parent.disabled) || (checkMethod ? !checkMethod({ $table: $xeTable, column }) : false);
             });
             // 更新条件
-            Object.assign(exportStore, {
-                columns: exportColumns,
-                typeList,
-                modeList,
-                hasFooter,
-                hasMerge,
-                hasTree,
-                isPrint,
-                hasColgroup: isGroup,
-                visible: true
-            });
+            exportStore.columns = exportColumns;
+            exportStore.typeList = typeList;
+            exportStore.modeList = modeList;
+            exportStore.hasFooter = hasFooter;
+            exportStore.hasMerge = hasMerge;
+            exportStore.hasTree = hasTree;
+            exportStore.hasRowGroup = hasRowGroup;
+            exportStore.isPrint = !!isPrint;
+            exportStore.hasColgroup = isGroup;
+            exportStore.visible = true;
             // 默认参数
             Object.assign(exportParams, {
                 mode: selectRecords.length ? 'selected' : 'current'
@@ -11234,7 +11342,8 @@ hooks$4.add('tableExportModule', {
                     // filename: '',
                     // sheetName: '',
                     // original: false,
-                    // isAllExpand: false,
+                    // isTreeAllExpanded: false,
+                    // isRowGroupAllExpanded: false,
                     // data: null,
                     // remote: false,
                     // dataFilterMethod: null,
@@ -11244,6 +11353,11 @@ hooks$4.add('tableExportModule', {
                     // beforeExportMethod: null,
                     // afterExportMethod: null
                 }, exportOpts, options);
+                // 已废弃，参数 isAllExpand
+                if (XEUtils.isBoolean(opts.isAllExpand)) {
+                    warnLog('vxe.error.delProp', ['isAllExpand', 'isTreeAllExpanded']);
+                    opts.isTreeAllExpanded = opts.isAllExpand;
+                }
                 let { filename, sheetName, type, mode, columns, original, columnFilterMethod, beforeExportMethod, includeFields, excludeFields } = opts;
                 let groups = [];
                 const selectRecords = $xeTable.getCheckboxRecords();
@@ -14716,6 +14830,10 @@ var VxeTableComponent = defineVxeComponent({
         const computeRowGroupOpts = computed(() => {
             return computeAggregateOpts.value;
         });
+        const computeAggregateMode = computed(() => {
+            const aggregateOpts = computeAggregateOpts.value;
+            return aggregateOpts.mode;
+        });
         const computeAggregateAccuracyOpts = computed(() => {
             return Object.assign({}, getConfig$2().table.aggregateAccuracyConfig, props.aggregateAccuracyConfig);
         });
@@ -17894,12 +18012,12 @@ var VxeTableComponent = defineVxeComponent({
                 handleeGroupSummary(aggList);
             }
         };
-        const handleGroupData = (list, rowGroups) => {
+        const handleGroupData = (list, rowGroups, isCombinedField) => {
             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;
@@ -17911,11 +18029,26 @@ var VxeTableComponent = defineVxeComponent({
                     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 = [];
@@ -17926,33 +18059,62 @@ var VxeTableComponent = defineVxeComponent({
                         }
                         childList.push(row);
                     });
-                    XEUtils.objectEach(groupMaps, (childList, groupValue) => {
-                        const { fullData: childFullData, treeData: childTreeData } = handleGroupData(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(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(aggList);
                 }
             }
@@ -17961,6 +18123,13 @@ var VxeTableComponent = defineVxeComponent({
                 fullData
             };
         };
+        const initGroupData = (list, rowGroups) => {
+            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(() => {
@@ -18043,7 +18212,7 @@ var VxeTableComponent = defineVxeComponent({
                 }
             }
             else if ((aggregateConfig || rowGroupConfig) && rowGroupList.length) {
-                const groupRest = handleGroupData(fullData, rowGroupList);
+                const groupRest = initGroupData(fullData, rowGroupList);
                 treeData = groupRest.treeData;
                 fullData = groupRest.fullData;
                 isRGroup = true;
@@ -28092,6 +28261,11 @@ var VxeTableComponent = defineVxeComponent({
             });
             internalData.keepUpdateFieldMaps = kpfMaps;
         });
+        watch(computeAggregateMode, () => {
+            if (reactData.isRowGroupStatus) {
+                loadTableData(internalData.tableSynchData, false, true);
+            }
+        });
         if ($xeTabs) {
             watch(() => $xeTabs ? $xeTabs.reactData.resizeFlag : null, () => {
                 handleGlobalResizeEvent();
@@ -28243,6 +28417,9 @@ var VxeTableComponent = 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.isAllExpand)) {
+                warnLog('vxe.error.delProp', ['isAllExpand', 'isTreeAllExpanded']);
+            }
             if (!props.id) {
                 if ((props.customConfig ? isEnableConf(customOpts) : customOpts.enabled) && customOpts.storage) {
                     errLog('vxe.error.reqProp', ['id']);
@@ -31076,6 +31253,10 @@ var zhCN = {
             expMergeTitle: '如果存在，则支持带有合并结构的单元格',
             expOptAllExpand: '展开树',
             expAllExpandTitle: '如果存在，则支持将带有层级结构的数据全部展开',
+            expOptTreeAllExpand: '展开树',
+            expTreeAllExpandTitle: '如果存在，则自动展开所有树层级',
+            expOptRowGroupAllExpand: '展开分组',
+            expRowGroupAllExpandTitle: '如果存在，则自动展开所有分组层级',
             expOptUseStyle: '样式',
             expUseStyleTitle: '如果存在，则支持带样式的单元格',
             expOptOriginal: '源数据',