vxe-table 3.21.1 → 3.21.3

package/es/table/module/custom/panel.js

@@ -393,7 +393,7 @@ export default {
             const { immediate } = customOpts;
             const trEl = evnt.currentTarget;
             const columnDragOpts = $xeTable.computeColumnDragOpts;
-            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;
@@ -431,20 +431,28 @@ export default {
                         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('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('vxe.error.treeDragChild')
+                                                });
+                                            }
+                                            return;
+                                        }
+                                    }
                                 }
                             }
                             else if (dragColumn.parentId) {
@@ -576,7 +584,7 @@ export default {
             const customOpts = $xeTable.computeCustomOpts;
             const { showSortDragButton, allowSort, immediate } = customOpts;
             const columnDragOpts = $xeTable.computeColumnDragOpts;
-            const { isCrossDrag, isToChildDrag } = columnDragOpts;
+            const { isCrossDrag, isPeerDrag, isToChildDrag } = columnDragOpts;
             const optEl = evnt.currentTarget;
             const isControlKey = hasControlKey(evnt);
             const colid = optEl.getAttribute('colid');
@@ -584,16 +592,16 @@ export default {
             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($xeTableCustomPanel, evnt, optEl, false, dragPos);
                     return;
@@ -747,13 +755,12 @@ export default {
             const { treeConfig, rowGroupConfig, aggregateConfig } = tableProps;
             const { isCustomStatus, customColumnList, isCustomDragStatus } = tableReactData;
             const customOpts = $xeTable.computeCustomOpts;
-            const { immediate } = customOpts;
             const columnDragOpts = $xeTable.computeColumnDragOpts;
             const { popupStyle } = customStore;
-            const { checkMethod, visibleMethod, allowVisible, allowSort, allowFixed, allowGroup, allowValues, trigger, placement, showSortDragButton, showSortMoveButton, showSortPutButton } = customOpts;
+            const { immediate, checkMethod, visibleMethod, allowVisible, allowSort, allowFixed, allowGroup, allowValues, trigger, placement, showSortDragButton, showSortMoveButton, showSortPutButton } = customOpts;
             const isMaxFixedColumn = $xeTable.computeIsMaxFixedColumn;
             const vSize = $xeTable.computeSize;
-            const { isCrossDrag } = columnDragOpts;
+            const { isCrossDrag, isPeerDrag } = columnDragOpts;
             const slots = customOpts.slots || {};
             const headerSlot = slots.header;
             const topSlot = slots.top;
@@ -787,7 +794,7 @@ export default {
                     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,
                         attrs: {
@@ -1150,7 +1157,7 @@ export default {
             const modalOpts = Object.assign({}, modalOptions);
             const drawerOpts = Object.assign({}, drawerOptions);
             const isMaxFixedColumn = $xeTable.computeIsMaxFixedColumn;
-            const { isCrossDrag } = columnDragOpts;
+            const { isCrossDrag, isPeerDrag } = columnDragOpts;
             const slots = customOpts.slots || {};
             const headerSlot = slots.header;
             const topSlot = slots.top;
@@ -1197,7 +1204,7 @@ export default {
                     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,
                         attrs: {

package/es/table/module/export/export-panel.js

@@ -210,7 +210,7 @@ export default {
             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 = $xeExportPanel.computeCheckedAll;
@@ -459,6 +459,19 @@ export default {
                                                                         }
                                                                     }
                                                                 }),
+                                                                h('vxe-checkbox', {
+                                                                    props: {
+                                                                        value: defaultOptions.isFooter,
+                                                                        disabled: !storeData.hasFooter,
+                                                                        title: getI18n('vxe.export.expFooterTitle'),
+                                                                        content: getI18n('vxe.export.expOptFooter')
+                                                                    },
+                                                                    on: {
+                                                                        input(value) {
+                                                                            defaultOptions.isFooter = value;
+                                                                        }
+                                                                    }
+                                                                }),
                                                                 h('vxe-checkbox', {
                                                                     props: {
                                                                         value: isHeader ? defaultOptions.isTitle : false,
@@ -529,34 +542,34 @@ export default {
                                                                                 defaultOptions.useStyle = value;
                                                                             }
                                                                         }
-                                                                    }),
+                                                                    })
+                                                            ]),
+                                                            h('div', {
+                                                                class: 'vxe-table-export--panel-option-row'
+                                                            }, [
                                                                 h('vxe-checkbox', {
                                                                     props: {
-                                                                        value: hasTree ? defaultOptions.isAllExpand : false,
+                                                                        value: hasTree ? defaultOptions.isTreeAllExpanded : false,
                                                                         disabled: hasEmptyData || !hasTree,
-                                                                        title: getI18n('vxe.export.expAllExpandTitle'),
-                                                                        content: getI18n('vxe.export.expOptAllExpand')
+                                                                        title: getI18n('vxe.export.expTreeAllExpandTitle'),
+                                                                        content: getI18n('vxe.export.expOptTreeAllExpand')
                                                                     },
                                                                     on: {
                                                                         input(value) {
-                                                                            defaultOptions.isAllExpand = value;
+                                                                            defaultOptions.isTreeAllExpanded = value;
                                                                         }
                                                                     }
-                                                                })
-                                                            ]),
-                                                            h('div', {
-                                                                class: 'vxe-table-export--panel-option-row'
-                                                            }, [
+                                                                }),
                                                                 h('vxe-checkbox', {
                                                                     props: {
-                                                                        value: defaultOptions.isFooter,
-                                                                        disabled: !storeData.hasFooter,
-                                                                        title: getI18n('vxe.export.expFooterTitle'),
-                                                                        content: getI18n('vxe.export.expOptFooter')
+                                                                        value: hasRowGroup ? defaultOptions.isRowGroupAllExpanded : false,
+                                                                        disabled: hasEmptyData || !hasRowGroup,
+                                                                        title: getI18n('vxe.export.expRowGroupAllExpandTitle'),
+                                                                        content: getI18n('vxe.export.expOptRowGroupAllExpand')
                                                                     },
                                                                     on: {
                                                                         input(value) {
-                                                                            defaultOptions.isFooter = value;
+                                                                            defaultOptions.isRowGroupAllExpanded = value;
                                                                         }
                                                                     }
                                                                 })

package/es/table/module/export/mixin.js

@@ -9,11 +9,6 @@ const { getI18n, renderer } = VxeUI;
 let htmlCellElem;
 const csvBOM = '\ufeff';
 const enterSymbol = '\r\n';
-function hasTreeChildren($xeTable, row) {
-    const treeOpts = $xeTable.computeTreeOpts;
-    const childrenField = treeOpts.children || treeOpts.childrenField;
-    return row[childrenField] && row[childrenField].length;
-}
 function getSeq($xeTable, cellValue, row, $rowIndex, column, $columnIndex) {
     const seqOpts = $xeTable.computeSeqOpts;
     const seqMd = seqOpts.seqMethod || column.seqMethod;
@@ -52,32 +47,121 @@ const toStringValue = (cellValue) => {
 };
 function getBodyLabelData($xeTable, opts, columns, datas) {
     const props = $xeTable;
-    const { isAllExpand, mode } = opts;
+    const reactData = $xeTable;
+    const { isTreeAllExpanded, isRowGroupAllExpanded, mode } = opts;
     const { treeConfig } = props;
+    const { isRowGroupStatus } = reactData;
     const radioOpts = $xeTable.computeRadioOpts;
     const checkboxOpts = $xeTable.computeCheckboxOpts;
     const treeOpts = $xeTable.computeTreeOpts;
     const columnOpts = $xeTable.computeColumnOpts;
+    const aggregateOpts = $xeTable.computeAggregateOpts;
     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.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($xeTable, 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($xeTable, row);
+            if ((isTreeAllExpanded || !parentRow || (expandMaps[pRowid] && $xeTable.isTreeExpandByRow(parentRow)))) {
+                const hasRowChild = row[childrenField] && row[childrenField].length;
                 const item = {
                     _row: row,
                     _level: nodes.length - 1,
@@ -937,10 +1021,11 @@ function handleExportAndPrint($xeTable, options, isPrint) {
     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 = $xeTable.computeExportOpts;
-    const hasTree = treeConfig;
+    const hasTree = !!treeConfig;
+    const hasRowGroup = rowGroupList.length > 0;
     const customOpts = $xeTable.computeCustomOpts;
     const selectRecords = $xeTable.getCheckboxRecords();
     const proxyOpts = $xeGGWrapper ? $xeGGWrapper.computeProxyOpts : {};
@@ -957,6 +1042,11 @@ function handleExportAndPrint($xeTable, options, isPrint) {
         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;
@@ -999,17 +1089,16 @@ function handleExportAndPrint($xeTable, options, isPrint) {
         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'
@@ -1142,7 +1231,8 @@ export default {
                 // filename: '',
                 // sheetName: '',
                 // original: false,
-                // isAllExpand: false,
+                // isTreeAllExpanded: false,
+                // isRowGroupAllExpanded: false,
                 // data: null,
                 // remote: false,
                 // dataFilterMethod: null,
@@ -1152,6 +1242,11 @@ export default {
                 // 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();

package/es/table/module/menu/mixin.js

@@ -309,8 +309,9 @@ export default {
             if (!menu.loading && !menu.disabled && (menu.code || !menu.children || !menu.children.length)) {
                 const gMenuOpts = menus.get(menu.code);
                 const params = Object.assign({}, internalData._currMenuParams, { menu, $table: $xeTable, $grid: $xeGrid, $gantt: $xeGantt, $event: evnt });
-                if (gMenuOpts && gMenuOpts.menuMethod) {
-                    gMenuOpts.menuMethod(params, evnt);
+                const tmMethod = gMenuOpts ? (gMenuOpts.tableMenuMethod || gMenuOpts.menuMethod) : null;
+                if (tmMethod) {
+                    tmMethod(params, evnt);
                 }
                 // 在 v4 中废弃事件 context-menu-click
                 if ($xeTable.$listeners['context-menu-click']) {

package/es/table/module/validator/mixin.js

@@ -378,9 +378,9 @@ export default {
         },
         hasCellRules(type, row, column) {
             const { editRules } = this;
-            const { property } = column;
-            if (property && editRules) {
-                const rules = XEUtils.get(editRules, property);
+            const { field } = column;
+            if (field && editRules) {
+                const rules = column.rules ? column.rules : XEUtils.get(editRules, field);
                 return rules && XEUtils.find(rules, rule => type === 'all' || !rule.trigger || type === rule.trigger);
             }
             return false;
@@ -408,7 +408,7 @@ export default {
             const errorRules = [];
             const syncValidList = [];
             if (field && editRules) {
-                const rules = XEUtils.get(editRules, field);
+                const rules = column.rules ? column.rules : XEUtils.get(editRules, field);
                 if (rules) {
                     const cellValue = XEUtils.isUndefined(val) ? XEUtils.get(row, field) : val;
                     rules.forEach((rule) => {

package/es/table/src/cell.js

@@ -1110,7 +1110,7 @@ export const Cell = {
         const editRenderOpts = isEnableEdit && isEnableConf(editRender) ? editRender : null;
         let isRequired = false;
         if (editRules) {
-            const columnRules = XEUtils.get(editRules, column.field);
+            const columnRules = column.rules ? column.rules : XEUtils.get(editRules, column.field);
             if (columnRules) {
                 isRequired = columnRules.some((rule) => rule.required);
             }

package/es/table/src/column.js

@@ -99,6 +99,8 @@ export const columnProps = {
     filterRender: Object,
     // 是否显示浮动筛选
     floatingFilters: Object,
+    // 列的校验规则
+    rules: Array,
     // 设置为分组节点
     rowGroupNode: Boolean,
     // 设置为树节点

package/es/table/src/columnInfo.js

@@ -108,6 +108,7 @@ export class ColumnInfo {
             filterRecoverMethod: _vm.filterRecoverMethod,
             filterRender: filterRender,
             floatingFilters: _vm.floatingFilters,
+            rules: _vm.rules,
             rowGroupNode: _vm.rowGroupNode,
             treeNode: _vm.treeNode,
             dragSort: _vm.dragSort,

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;