vxe-table 3.21.2 → 3.21.4

package/lib/index.umd.js

@@ -3311,7 +3311,7 @@ function getClass(property, params) {
 /* unused harmony import specifier */ var VxeUI;
 
 
-const version = "3.21.2";
+const version = "3.21.4";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -3842,7 +3842,7 @@ var es_iterator_some = __webpack_require__(3579);
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"3.21.2"}`;
+const log_version = `table v${"3.21.4"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// ./packages/table/src/columnInfo.ts
@@ -4638,6 +4638,7 @@ function createReactData() {
       hasFooter: false,
       hasMerge: false,
       hasTree: false,
+      hasRowGroup: false,
       hasColgroup: false,
       visible: false
     },
@@ -4648,7 +4649,8 @@ function createReactData() {
       type: '',
       isColgroup: false,
       isMerge: false,
-      isAllExpand: false,
+      isTreeAllExpanded: false,
+      isRowGroupAllExpanded: false,
       useStyle: false,
       original: false,
       message: true,
@@ -6121,7 +6123,12 @@ const Cell = {
       const {
         mode
       } = aggregateOpts;
-      if (mode === 'column' ? column.field === row.groupField : rowGroupNode) {
+      if (mode === 'column') {
+        if (row.groupField && column.field === row.groupField) {
+          return [Cell.renderRowGroupBtn(h, params, cellVNodes)];
+        }
+        return cellVNodes;
+      } else if (rowGroupNode) {
         return [Cell.renderRowGroupBtn(h, params, cellVNodes)];
       }
     }
@@ -7777,7 +7784,7 @@ if(reWidth){calcCellWidth($xeTable);}if(reFull){autoCellWidth($xeTable);}if(reHe
                          * 已废弃
                          * @deprecated
                          */totalValue:childCount};let aggVal=0;// 如果下层同时也是分组
-if(childList.length&&childList[0].isAggregate){external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().each(childList,row=>{if(row.isAggregate){const currAggData=row.aggData[field];if(currAggData){aggVal+=currAggData.value;}}});}else{aggVal=aggCalcMethod?aggCalcMethod(ctParams):aggRow.childCount;}aggDtObj[field]={type:'count',value:aggVal,label:aggVal};});aggRow.aggData=aggDtObj;});}}}function updateGroupData($xeTable){const props=$xeTable;const reactData=$xeTable;const internalData=$xeTable;const{aggregateConfig,rowGroupConfig}=props;const{isRowGroupStatus}=reactData;const{tableFullGroupData}=internalData;const aggregateOpts=$xeTable.computeAggregateOpts;const{mapChildrenField}=aggregateOpts;if((aggregateConfig||rowGroupConfig)&&isRowGroupStatus){const aggList=[];external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(tableFullGroupData,row=>{if(row.isAggregate){aggList.push(row);}},{children:mapChildrenField});handleeGroupSummary($xeTable,aggList);}}function handleGroupData($xeTable,list,rowGroups){let fullData=list;let treeData=list;if(rowGroups){const aggregateOpts=$xeTable.computeAggregateOpts;const{rowField,parentField,childrenField,mapChildrenField}=aggregateOpts;const rowOpts=$xeTable.computeRowOpts;const checkboxOpts=$xeTable.computeCheckboxOpts;const{checkField}=checkboxOpts;const indeterminateField=checkboxOpts.indeterminateField||checkboxOpts.halfField;const rgItem=rowGroups[0];if(rgItem&&rowField&&parentField&&childrenField&&mapChildrenField){fullData=[];treeData=[];const groupField=rgItem.field;const groupColumn=$xeTable.getColumnByField(groupField);const groupMaps={};const aggList=[];const rowkey=getRowkey($xeTable);list.forEach(row=>{const cellValue=groupColumn?$xeTable.getCellLabel(row,groupColumn):external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row,groupField);const groupValue=external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(cellValue)?'':cellValue;let childList=groupMaps[groupValue];if(!childList){childList=[];groupMaps[groupValue]=childList;}if(row.isAggregate){row.isAggregate=undefined;}childList.push(row);});external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().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);}});handleeGroupSummary($xeTable,aggList);}}return{treeData,fullData};}/**
+if(childList.length&&childList[0].isAggregate){external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().each(childList,row=>{if(row.isAggregate){const currAggData=row.aggData[field];if(currAggData){aggVal+=currAggData.value;}}});}else{aggVal=aggCalcMethod?aggCalcMethod(ctParams):aggRow.childCount;}aggDtObj[field]={type:'count',value:aggVal,label:aggVal};});aggRow.aggData=aggDtObj;});}}}function updateGroupData($xeTable){const props=$xeTable;const reactData=$xeTable;const internalData=$xeTable;const{aggregateConfig,rowGroupConfig}=props;const{isRowGroupStatus}=reactData;const{tableFullGroupData}=internalData;const aggregateOpts=$xeTable.computeAggregateOpts;const{mapChildrenField}=aggregateOpts;if((aggregateConfig||rowGroupConfig)&&isRowGroupStatus){const aggList=[];external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(tableFullGroupData,row=>{if(row.isAggregate){aggList.push(row);}},{children:mapChildrenField});handleeGroupSummary($xeTable,aggList);}}function handleGroupData($xeTable,list,rowGroups,isCombinedField){let fullData=list;let treeData=list;if(rowGroups){const aggregateOpts=$xeTable.computeAggregateOpts;const{rowField,parentField,separator,childrenField,mapChildrenField}=aggregateOpts;const rowOpts=$xeTable.computeRowOpts;const checkboxOpts=$xeTable.computeCheckboxOpts;const{checkField}=checkboxOpts;const indeterminateField=checkboxOpts.indeterminateField||checkboxOpts.halfField;const rgItem=rowGroups[0];if(rgItem&&rowField&&parentField&&childrenField&&mapChildrenField){fullData=[];treeData=[];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):external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row,groupField);let groupValue=external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().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):external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row,ogField);const ogValue=external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(ocValue)?'':ocValue;groupValue+=(separator||' / ')+ogValue;groupVals.push(ogValue);});if(!groupCombinedMaps[groupValue]){groupCombinedMaps[groupValue]=groupVals;}}let childList=groupMaps[groupValue];if(!childList){childList=[];groupMaps[groupValue]=childList;}if(row.isAggregate){row.isAggregate=undefined;}childList.push(row);});if(isCombinedField){external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().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{external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().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);}}return{treeData,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 数据
  */function loadTableData($xeTable,datas,isReload,isReset){const props=$xeTable;const reactData=$xeTable;const internalData=$xeTable;const{keepSource,treeConfig,aggregateConfig,rowGroupConfig}=props;const{rowGroupList,scrollYLoad:oldScrollYLoad}=reactData;const{initStatus,scrollYStore,scrollXStore,lastScrollLeft,lastScrollTop}=internalData;const rowOpts=$xeTable.computeRowOpts;const treeOpts=$xeTable.computeTreeOpts;const expandOpts=$xeTable.computeExpandOpts;const{transform}=treeOpts;const childrenField=treeOpts.children||treeOpts.childrenField;let treeData=[];let fullData=datas?datas.slice(0):[];// 转为响应式数据
@@ -7787,7 +7794,7 @@ if(!treeOpts.rowField){errLog('vxe.error.reqProp',['tree-config.rowField']);}if(
 //     warnLog('vxe.error.errConflicts', ['tree-config.transform', `row.${treeOpts.children}`])
 //   }
 // })
-treeData=external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toArrayTree(fullData,{key:treeOpts.rowField,parentKey:treeOpts.parentField,children:childrenField,mapChildren:treeOpts.mapChildrenField});fullData=treeData.slice(0);}else{treeData=fullData.slice(0);}}else if((aggregateConfig||rowGroupConfig)&&rowGroupList.length){const groupRest=handleGroupData($xeTable,fullData,rowGroupList);treeData=groupRest.treeData;fullData=groupRest.fullData;isRGroup=true;}reactData.isRowGroupStatus=isRGroup;scrollYStore.startIndex=0;scrollYStore.endIndex=1;scrollXStore.startIndex=0;scrollXStore.endIndex=1;internalData.cvCacheMaps={};reactData.isRowLoading=true;reactData.scrollVMLoading=false;reactData.treeExpandedFlag++;reactData.rowExpandedFlag++;internalData.insertRowMaps={};reactData.insertRowFlag++;internalData.removeRowMaps={};reactData.removeRowFlag++;const sYLoad=updateScrollYStatus($xeTable,fullData);// 全量数据
+treeData=external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toArrayTree(fullData,{key:treeOpts.rowField,parentKey:treeOpts.parentField,children:childrenField,mapChildren:treeOpts.mapChildrenField});fullData=treeData.slice(0);}else{treeData=fullData.slice(0);}}else if((aggregateConfig||rowGroupConfig)&&rowGroupList.length){const groupRest=initGroupData($xeTable,fullData,rowGroupList);treeData=groupRest.treeData;fullData=groupRest.fullData;isRGroup=true;}reactData.isRowGroupStatus=isRGroup;scrollYStore.startIndex=0;scrollYStore.endIndex=1;scrollXStore.startIndex=0;scrollXStore.endIndex=1;internalData.cvCacheMaps={};reactData.isRowLoading=true;reactData.scrollVMLoading=false;reactData.treeExpandedFlag++;reactData.rowExpandedFlag++;internalData.insertRowMaps={};reactData.insertRowFlag++;internalData.removeRowMaps={};reactData.removeRowFlag++;const sYLoad=updateScrollYStatus($xeTable,fullData);// 全量数据
 internalData.tableFullData=fullData;internalData.tableFullTreeData=isRGroup?[]:treeData;internalData.tableFullGroupData=isRGroup?treeData:[];// 缓存数据
 $xeTable.cacheRowMap(isReset);// 原始数据
 internalData.tableSynchData=datas;if(isReset){internalData.isResizeCellHeight=false;}// 克隆原数据，用于显示编辑状态，与编辑值做对比
@@ -11015,6 +11022,7 @@ function panel_hideDropTip($xeTableCustomPanel) {
       const columnDragOpts = $xeTable.computeColumnDragOpts;
       const {
         isCrossDrag,
+        isPeerDrag,
         isSelfToChildDrag,
         isToChildDrag,
         dragEndMethod
@@ -11061,20 +11069,27 @@ function panel_hideDropTip($xeTableCustomPanel) {
             if (immediate) {
               if (dragColumn.parentId && newColumn.parentId) {
                 // 子到子
-                if (!isCrossDrag) {
-                  return;
-                }
-                if (oldAllMaps[newColumn.id]) {
-                  isSelfToChildStatus = true;
-                  if (!(isCrossDrag && isSelfToChildDrag)) {
-                    if (core_.VxeUI.modal) {
-                      core_.VxeUI.modal.message({
-                        status: 'error',
-                        content: panel_getI18n('vxe.error.treeDragChild')
-                      });
-                    }
+                if (isPeerDrag && !isCrossDrag) {
+                  if (dragColumn.parentId !== newColumn.parentId) {
+                    // 非同级
+                    return;
+                  }
+                } else {
+                  if (!isCrossDrag) {
                     return;
                   }
+                  if (oldAllMaps[newColumn.id]) {
+                    isSelfToChildStatus = true;
+                    if (!(isCrossDrag && isSelfToChildDrag)) {
+                      if (core_.VxeUI.modal) {
+                        core_.VxeUI.modal.message({
+                          status: 'error',
+                          content: panel_getI18n('vxe.error.treeDragChild')
+                        });
+                      }
+                      return;
+                    }
+                  }
                 }
               } else if (dragColumn.parentId) {
                 // 子到根
@@ -11218,6 +11233,7 @@ function panel_hideDropTip($xeTableCustomPanel) {
       const columnDragOpts = $xeTable.computeColumnDragOpts;
       const {
         isCrossDrag,
+        isPeerDrag,
         isToChildDrag
       } = columnDragOpts;
       const optEl = evnt.currentTarget;
@@ -11227,11 +11243,11 @@ function panel_hideDropTip($xeTableCustomPanel) {
       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 || !immediate && column.level > 1 || !isCrossDrag && dragCol.level > 1 || !immediate && dragCol.level > 1) {
+        if (!dragCol || !(showSortDragButton && allowSort) || dragCol && dragCol.id === column.id || !isCrossDrag && (isPeerDrag ? dragCol.parentId !== column.parentId : column.level > 1) || !immediate && column.level > 1 || !isCrossDrag && (isPeerDrag ? dragCol.parentId !== column.parentId : dragCol.level > 1) || !immediate && dragCol.level > 1) {
           panel_showDropTip($xeTableCustomPanel, evnt, optEl, false, dragPos);
           return;
         }
@@ -11430,7 +11446,8 @@ function panel_hideDropTip($xeTableCustomPanel) {
       const isMaxFixedColumn = $xeTable.computeIsMaxFixedColumn;
       const vSize = $xeTable.computeSize;
       const {
-        isCrossDrag
+        isCrossDrag,
+        isPeerDrag
       } = columnDragOpts;
       const slots = customOpts.slots || {};
       const headerSlot = slots.header;
@@ -11471,7 +11488,7 @@ function panel_hideDropTip($xeTableCustomPanel) {
             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: {
@@ -11775,7 +11792,8 @@ function panel_hideDropTip($xeTableCustomPanel) {
       const drawerOpts = Object.assign({}, drawerOptions);
       const isMaxFixedColumn = $xeTable.computeIsMaxFixedColumn;
       const {
-        isCrossDrag
+        isCrossDrag,
+        isPeerDrag
       } = columnDragOpts;
       const slots = customOpts.slots || {};
       const headerSlot = slots.header;
@@ -11829,7 +11847,7 @@ function panel_hideDropTip($xeTableCustomPanel) {
             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: {
@@ -13030,6 +13048,7 @@ const {
       } = reactData;
       const {
         hasTree,
+        hasRowGroup,
         hasMerge,
         isPrint,
         hasColgroup,
@@ -13217,6 +13236,18 @@ const {
                   defaultOptions.isHeader = value;
                 }
               }
+            }), h('vxe-checkbox', {
+              props: {
+                value: defaultOptions.isFooter,
+                disabled: !storeData.hasFooter,
+                title: export_panel_getI18n('vxe.export.expFooterTitle'),
+                content: export_panel_getI18n('vxe.export.expOptFooter')
+              },
+              on: {
+                input(value) {
+                  defaultOptions.isFooter = value;
+                }
+              }
             }), h('vxe-checkbox', {
               props: {
                 value: isHeader ? defaultOptions.isTitle : false,
@@ -13279,30 +13310,30 @@ const {
                   defaultOptions.useStyle = value;
                 }
               }
-            }), h('vxe-checkbox', {
+            })]), 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: export_panel_getI18n('vxe.export.expAllExpandTitle'),
-                content: export_panel_getI18n('vxe.export.expOptAllExpand')
+                title: export_panel_getI18n('vxe.export.expTreeAllExpandTitle'),
+                content: export_panel_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', {
+            }), h('vxe-checkbox', {
               props: {
-                value: defaultOptions.isFooter,
-                disabled: !storeData.hasFooter,
-                title: export_panel_getI18n('vxe.export.expFooterTitle'),
-                content: export_panel_getI18n('vxe.export.expOptFooter')
+                value: hasRowGroup ? defaultOptions.isRowGroupAllExpanded : false,
+                disabled: hasEmptyData || !hasRowGroup,
+                title: export_panel_getI18n('vxe.export.expRowGroupAllExpandTitle'),
+                content: export_panel_getI18n('vxe.export.expOptRowGroupAllExpand')
               },
               on: {
                 input(value) {
-                  defaultOptions.isFooter = value;
+                  defaultOptions.isRowGroupAllExpanded = value;
                 }
               }
             })])])])]])])]), bottomSlot ? h('div', {
@@ -15951,11 +15982,6 @@ const {
 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;
@@ -15994,39 +16020,218 @@ const toStringValue = cellValue => {
 };
 function getBodyLabelData($xeTable, opts, columns, datas) {
   const props = $xeTable;
+  const reactData = $xeTable;
+  const internalData = $xeTable;
   const {
-    isAllExpand,
-    mode
+    isTreeAllExpanded,
+    isRowGroupAllExpanded,
+    mode: expMode
   } = opts;
   const {
     treeConfig
   } = props;
+  const {
+    isRowGroupStatus
+  } = reactData;
+  const {
+    fullColumnFieldData
+  } = internalData;
   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 {
+      mode: aggMode,
+      showTotal,
+      totalMethod,
+      countFields,
+      contentMethod,
+      formatValuesMethod,
+      mapChildrenField
+    } = aggregateOpts;
+    const rest = [];
+    const expandMaps = {};
+    const useMaps = {};
+    external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().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) => {
+          const {
+            field,
+            editRender,
+            cellRender,
+            aggFunc,
+            rowGroupNode
+          } = column;
+          let cellValue = '';
+          const renderOpts = editRender || cellRender;
+          let bodyExportMethod = column.exportMethod || columnOpts.exportMethod;
+          if (!bodyExportMethod && renderOpts && renderOpts.name) {
+            const compConf = export_mixin_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 = expMode === 'all' ? seqVal : getSeq($xeTable, seqVal, row, $rowIndex, column, $columnIndex);
+                  break;
+                }
+              case 'checkbox':
+                {
+                  cellValue = toBooleanValue($xeTable.isCheckedByCheckboxRow(row));
+                  item._checkboxLabel = checkboxOpts.labelField ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().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 ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, radioOpts.labelField) : '';
+                  item._radioDisabled = radioOpts.checkMethod && !radioOpts.checkMethod({
+                    $table: $xeTable,
+                    row
+                  });
+                  break;
+                }
+              default:
+                {
+                  if (field && row.isAggregate) {
+                    const aggRow = row;
+                    const aggData = aggRow.aggData;
+                    const currAggData = aggData ? aggData[field] : null;
+                    const groupField = aggRow.groupField;
+                    const groupContent = aggRow.groupContent;
+                    const childList = mapChildrenField ? aggRow[mapChildrenField] || [] : [];
+                    const childCount = aggRow.childCount;
+                    const colRest = fullColumnFieldData[groupField] || {};
+                    const ctParams = {
+                      $table: $xeTable,
+                      groupField,
+                      groupColumn: colRest ? colRest.column : null,
+                      column,
+                      groupValue: groupContent,
+                      childList,
+                      childCount,
+                      aggValue: null,
+                      /**
+                       * 已废弃
+                       * @deprecated
+                       */
+                      children: childList,
+                      /**
+                       * 已废弃
+                       * @deprecated
+                       */
+                      totalValue: childCount
+                    };
+                    if (aggMode === 'column' ? field === aggRow.groupField : rowGroupNode) {
+                      cellValue = groupContent;
+                      if (contentMethod) {
+                        cellValue = `${contentMethod(ctParams)}`;
+                      }
+                      if (showTotal) {
+                        cellValue = export_mixin_getI18n('vxe.table.rowGroupContentTotal', [cellValue, totalMethod ? totalMethod(ctParams) : childCount, childCount]);
+                      }
+                    } else if ($xeTable.getPivotTableAggregateCellAggValue) {
+                      const aggParams = {
+                        $table: $xeTable,
+                        row,
+                        column
+                      };
+                      cellValue = $xeTable.getPivotTableAggregateCellAggValue(aggParams);
+                    } else if (aggFunc === true || countFields && countFields.includes(field)) {
+                      cellValue = currAggData ? currAggData.value : childCount;
+                      ctParams.aggValue = cellValue;
+                      if (formatValuesMethod) {
+                        cellValue = formatValuesMethod(ctParams);
+                      }
+                    }
+                  } else 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();
+                      }
+                    }
+                  }
+                  break;
+                }
+            }
+          }
+          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);
-    external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(datas, (item, $rowIndex, items, path, parent, nodes) => {
+    external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().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,
@@ -16058,7 +16263,7 @@ function getBodyLabelData($xeTable, opts, columns, datas) {
               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);
+                  cellValue = expMode === 'all' ? seqVal : getSeq($xeTable, seqVal, row, $rowIndex, column, $columnIndex);
                   break;
                 }
               case 'checkbox':
@@ -16133,7 +16338,7 @@ function getBodyLabelData($xeTable, opts, columns, datas) {
           case 'seq':
             {
               const seqValue = $rowIndex + 1;
-              cellValue = mode === 'all' ? seqValue : getSeq($xeTable, seqValue, row, $rowIndex, column, $columnIndex);
+              cellValue = expMode === 'all' ? seqValue : getSeq($xeTable, seqValue, row, $rowIndex, column, $columnIndex);
               break;
             }
           case 'checkbox':
@@ -17060,6 +17265,7 @@ function handleExportAndPrint($xeTable, options, isPrint) {
   const {
     initStore,
     isGroup,
+    rowGroupList,
     footerTableData,
     exportStore,
     exportParams
@@ -17070,7 +17276,8 @@ function handleExportAndPrint($xeTable, options, isPrint) {
     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 : {};
@@ -17087,6 +17294,11 @@ function handleExportAndPrint($xeTable, options, isPrint) {
     current: 'current',
     modes: (proxyOpts.ajax && proxyOpts.ajax.queryAll ? ['all'] : []).concat(['current', 'selected', 'empty'])
   }, options);
+  // 已废弃，参数 isAllExpand
+  if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isBoolean(defOpts.isAllExpand)) {
+    warnLog('vxe.error.delProp', ['isAllExpand', 'isTreeAllExpanded']);
+    defOpts.isTreeAllExpanded = defOpts.isAllExpand;
+  }
   const types = defOpts.types || external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().keys(exportOpts._typeMaps);
   const modes = defOpts.modes || [];
   const checkMethod = customOpts.checkMethod;
@@ -17134,17 +17346,16 @@ function handleExportAndPrint($xeTable, options, isPrint) {
     }) : 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'
@@ -17290,7 +17501,8 @@ const convertToRows = originColumns => {
         // filename: '',
         // sheetName: '',
         // original: false,
-        // isAllExpand: false,
+        // isTreeAllExpanded: false,
+        // isRowGroupAllExpanded: false,
         // data: null,
         // remote: false,
         // dataFilterMethod: null,
@@ -17300,6 +17512,11 @@ const convertToRows = originColumns => {
         // beforeExportMethod: null,
         // afterExportMethod: null
       }, exportOpts, options);
+      // 已废弃，参数 isAllExpand
+      if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isBoolean(opts.isAllExpand)) {
+        warnLog('vxe.error.delProp', ['isAllExpand', 'isTreeAllExpanded']);
+        opts.isTreeAllExpanded = opts.isAllExpand;
+      }
       let {
         filename,
         sheetName,
@@ -20437,6 +20654,11 @@ function renderBody(h, $xeTable) {
       const props = $xeTable;
       return Object.assign({}, table_getConfig().table.aggregateConfig || table_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;
@@ -21328,6 +21550,14 @@ function renderBody(h, $xeTable) {
           $xeTable.reloadData(tableFullData);
         });
       }
+    },
+    computeAggregateMode() {
+      const $xeTable = this;
+      const reactData = $xeTable;
+      const internalData = $xeTable;
+      if (reactData.isRowGroupStatus) {
+        this.loadTableData(internalData.tableSynchData, false, true);
+      }
     }
   },
   created() {
@@ -21453,6 +21683,9 @@ function renderBody(h, $xeTable) {
     if (exportConfig && exportOpts.types && !exportOpts.exportMethod && !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().includeArrays(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().keys(exportOpts._typeMaps), exportOpts.types)) {
       warnLog('vxe.error.errProp', [`export-config.types=${exportOpts.types.join(',')}`, exportOpts.types.filter(type => external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().includes(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().keys(exportOpts._typeMaps), type)).join(',') || external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().keys(exportOpts._typeMaps).join(',')]);
     }
+    if (exportConfig && external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().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']);
@@ -27140,6 +27373,10 @@ const Toolbar = VxeToolbar;
       expMergeTitle: '如果存在，则支持带有合并结构的单元格',
       expOptAllExpand: '展开树',
       expAllExpandTitle: '如果存在，则支持将带有层级结构的数据全部展开',
+      expOptTreeAllExpand: '展开树',
+      expTreeAllExpandTitle: '如果存在，则自动展开所有树层级',
+      expOptRowGroupAllExpand: '展开分组',
+      expRowGroupAllExpandTitle: '如果存在，则自动展开所有分组层级',
       expOptUseStyle: '样式',
       expUseStyleTitle: '如果存在，则支持带样式的单元格',
       expOptOriginal: '源数据',