vxe-table 3.15.5 → 3.15.6

package/lib/index.umd.js

@@ -2220,7 +2220,7 @@ function getClass(property, params) {
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
 
 
-const version = "3.15.5";
+const version = "3.15.6";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -2347,7 +2347,17 @@ core_.VxeUI.setConfig({
       // isEvery: false,
       showIcon: true
     },
+    rowGroupConfig: {
+      padding: true,
+      rowField: 'id',
+      parentField: '_X_ROW_PARENT_KEY',
+      childrenField: '_X_ROW_CHILDREN',
+      mapChildrenField: '_X_ROW_CHILD_LIST',
+      indent: 20,
+      showIcon: true
+    },
     treeConfig: {
+      padding: true,
       rowField: 'id',
       parentField: 'parentId',
       childrenField: 'children',
@@ -2507,6 +2517,8 @@ core_.VxeUI.setIcon({
   TABLE_DRAG_STATUS_SUB_ROW: iconPrefix + 'add-sub',
   TABLE_DRAG_STATUS_COLUMN: iconPrefix + 'swap',
   TABLE_DRAG_DISABLED: iconPrefix + 'no-drop',
+  TABLE_ROW_GROUP_OPEN: iconPrefix + 'arrow-right rotate90',
+  TABLE_ROW_GROUP_CLOSE: iconPrefix + 'arrow-right',
   // toolbar
   TOOLBAR_TOOLS_REFRESH: iconPrefix + 'repeat',
   TOOLBAR_TOOLS_REFRESH_LOADING: iconPrefix + 'repeat roll',
@@ -2719,6 +2731,9 @@ function addClass(elem, cls) {
     elem.className = `${elem.className} ${cls}`;
   }
 }
+function hasControlKey(evnt) {
+  return evnt.ctrlKey || evnt.metaKey;
+}
 function toCssUnit(val, unit = 'px') {
   if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isNumber(val) || /^\d+$/.test(`${val}`)) {
     return `${val}${unit}`;
@@ -2843,7 +2858,7 @@ function isNodeElement(elem) {
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"3.15.5"}`;
+const log_version = `table v${"3.15.6"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
@@ -2941,6 +2956,7 @@ class ColumnInfo {
       filterResetMethod: _vm.filterResetMethod,
       filterRecoverMethod: _vm.filterRecoverMethod,
       filterRender: _vm.filterRender,
+      rowGroupNode: _vm.rowGroupNode,
       treeNode: _vm.treeNode,
       dragSort: _vm.dragSort,
       rowResize: _vm.rowResize,
@@ -3751,7 +3767,7 @@ function renderCellBaseVNs(h, params, content) {
     visibleMethod
   } = rowDragOpts;
   const rVisibleMethod = visibleMethod || (dragConfig ? dragConfig.rowVisibleMethod : null);
-  const vns = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(content) ? content : [content];
+  const vns = [];
   if (dragSort && rowOpts.drag && (showIcon || (dragConfig ? dragConfig.showRowIcon : false)) && (!rVisibleMethod || rVisibleMethod(params))) {
     if (treeConfig) {
       if (treeOpts.transform && (isPeerDrag || isCrossDrag || !level)) {
@@ -3761,7 +3777,7 @@ function renderCellBaseVNs(h, params, content) {
       vns.unshift(renderCellDragIcon(h, params));
     }
   }
-  return vns;
+  return vns.concat(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(content) ? content : [content]);
 }
 function renderHeaderCellDragIcon(h, params) {
   const {
@@ -3935,26 +3951,28 @@ function renderCellHandle(h, params) {
   const {
     type,
     treeNode,
+    rowGroupNode,
     editRender
   } = column;
   const checkboxOpts = $table.computeCheckboxOpts;
   const editOpts = $table.computeEditOpts;
+  const isDeepCell = treeNode || rowGroupNode;
   switch (type) {
     case 'seq':
-      return treeNode ? Cell.renderTreeIndexCell(h, params) : Cell.renderSeqCell(h, params);
+      return isDeepCell ? Cell.renderDeepIndexCell(h, params) : Cell.renderSeqCell(h, params);
     case 'radio':
-      return treeNode ? Cell.renderTreeRadioCell(h, params) : Cell.renderRadioCell(h, params);
+      return isDeepCell ? Cell.renderDeepRadioCell(h, params) : Cell.renderRadioCell(h, params);
     case 'checkbox':
-      return checkboxOpts.checkField ? treeNode ? Cell.renderTreeSelectionCellByProp(h, params) : Cell.renderCheckboxCellByProp(h, params) : treeNode ? Cell.renderTreeSelectionCell(h, params) : Cell.renderCheckboxCell(h, params);
+      return checkboxOpts.checkField ? isDeepCell ? Cell.renderDeepSelectionCellByProp(h, params) : Cell.renderCheckboxCellByProp(h, params) : isDeepCell ? Cell.renderDeepSelectionCell(h, params) : Cell.renderCheckboxCell(h, params);
     case 'expand':
       return Cell.renderExpandCell(h, params);
     case 'html':
-      return treeNode ? Cell.renderTreeHTMLCell(h, params) : Cell.renderHTMLCell(h, params);
+      return isDeepCell ? Cell.renderDeepHTMLCell(h, params) : Cell.renderHTMLCell(h, params);
   }
   if (isEnableConf(editConfig) && editRender) {
-    return editOpts.mode === 'cell' ? treeNode ? Cell.renderTreeCellEdit(h, params) : Cell.renderCellEdit(h, params) : treeNode ? Cell.renderTreeRowEdit(h, params) : Cell.renderRowEdit(h, params);
+    return editOpts.mode === 'cell' ? isDeepCell ? Cell.renderDeepCellEdit(h, params) : Cell.renderCellEdit(h, params) : isDeepCell ? Cell.renderDeepRowEdit(h, params) : Cell.renderRowEdit(h, params);
   }
-  return treeNode ? Cell.renderTreeCell(h, params) : Cell.renderDefaultCell(h, params);
+  return isDeepCell ? Cell.renderDeepCell(h, params) : Cell.renderDefaultCell(h, params);
 }
 function renderHeaderHandle(h, params) {
   const {
@@ -4052,10 +4070,16 @@ const Cell = {
       row,
       column
     } = params;
+    const tableReactData = $table;
+    const tableInternalData = $table;
+    const {
+      isRowGroupStatus
+    } = tableReactData;
     const {
       slots,
       editRender,
-      cellRender
+      cellRender,
+      rowGroupNode
     } = column;
     const renderOpts = editRender || cellRender;
     if (slots && slots.default) {
@@ -4072,7 +4096,41 @@ const Cell = {
         }, params))));
       }
     }
-    const cellValue = $table.getCellLabel(row, column);
+    let cellValue = '';
+    if (isRowGroupStatus && rowGroupNode && row.isAggregate) {
+      const {
+        fullColumnFieldData
+      } = tableInternalData;
+      const rowGroupOpts = $table.computeRowGroupOpts;
+      const {
+        showTotal,
+        totalMethod,
+        contentMethod,
+        mapChildrenField
+      } = rowGroupOpts;
+      const groupField = row.groupField;
+      cellValue = row.groupContent;
+      const childList = mapChildrenField ? row[mapChildrenField] || [] : [];
+      const totalValue = childList.length;
+      const colRest = fullColumnFieldData[groupField] || {};
+      const params = {
+        $table,
+        groupField,
+        groupColumn: colRest ? colRest.column : null,
+        column,
+        groupValue: cellValue,
+        children: childList,
+        totalValue: totalValue
+      };
+      if (contentMethod) {
+        cellValue = `${contentMethod(params)}`;
+      }
+      if (showTotal) {
+        cellValue = cell_getI18n('vxe.table.rowGroupContentTotal', [cellValue, totalMethod ? totalMethod(params) : totalValue, totalValue]);
+      }
+    } else if (!(isRowGroupStatus && row.isAggregate)) {
+      cellValue = $table.getCellLabel(row, column);
+    }
     const cellPlaceholder = editRender ? editRender.placeholder : '';
     return renderCellBaseVNs(h, params, [h('span', {
       class: 'vxe-cell--label'
@@ -4082,16 +4140,62 @@ const Cell = {
       class: 'vxe-cell--placeholder'
     }, formatText(getFuncText(cellPlaceholder), 1)) : h('span', formatText(cellValue, 1))])]);
   },
-  renderTreeCell(h, params) {
-    return Cell.renderTreeIcon(h, params, Cell.renderDefaultCell.call(this, h, params));
+  renderDeepCell(h, params) {
+    return Cell.renderDeepNodeBtn(h, params, Cell.renderDefaultCell.call(this, h, params));
   },
   renderDefaultFooter(h, params) {
     return getFooterContent(h, params);
   },
   /**
-   * 树节点
+   * 行分组
+   */
+  renderRowGroupBtn(h, params, cellVNodes) {
+    const {
+      $table
+    } = params;
+    const tableReactData = $table;
+    const tableInternalData = $table;
+    const {
+      row,
+      level
+    } = params;
+    const {
+      rowGroupExpandedFlag
+    } = tableReactData;
+    const {
+      rowGroupExpandedMaps
+    } = tableInternalData;
+    const rowGroupOpts = $table.computeRowGroupOpts;
+    const {
+      padding,
+      indent
+    } = rowGroupOpts;
+    const rowid = getRowid($table, row);
+    const isExpand = !!rowGroupExpandedFlag && !!rowGroupExpandedMaps[rowid];
+    return h('div', {
+      class: ['vxe-row-group--tree-node', {
+        'is--expanded': isExpand
+      }],
+      style: padding && indent ? {
+        paddingLeft: `${level * indent}px`
+      } : undefined
+    }, [h('span', {
+      class: 'vxe-row-group--node-btn',
+      on: {
+        click(evnt) {
+          $table.triggerRowGroupExpandEvent(evnt, params);
+        }
+      }
+    }, [h('i', {
+      class: isExpand ? cell_getIcon().TABLE_ROW_GROUP_OPEN : cell_getIcon().TABLE_ROW_GROUP_CLOSE
+    })]), h('div', {
+      class: 'vxe-row-group-cell'
+    }, cellVNodes)]);
+  },
+  /**
+   * 树
    */
-  renderTreeIcon(h, params, cellVNodes) {
+  renderTreeNodeBtn(h, params, cellVNodes) {
     const {
       $table,
       isHidden
@@ -4116,6 +4220,7 @@ const Cell = {
       slots
     } = column;
     const {
+      padding,
       indent,
       lazy,
       trigger,
@@ -4156,18 +4261,35 @@ const Cell = {
       class: ['vxe-cell--tree-node', {
         'is--active': isActive
       }],
-      style: {
+      style: padding && indent ? {
         paddingLeft: `${level * indent}px`
-      }
+      } : undefined
     }, [showIcon && (lazy ? isLazyLoaded ? hasChild : hasChild || hasLazyChilds : hasChild) ? [h('div', {
-      class: 'vxe-tree--btn-wrapper',
+      class: 'vxe-cell--tree-btn',
       on: ons
     }, [h('i', {
-      class: ['vxe-tree--node-btn', isLazyLoading ? iconLoaded || cell_getIcon().TABLE_TREE_LOADED : isActive ? iconOpen || cell_getIcon().TABLE_TREE_OPEN : iconClose || cell_getIcon().TABLE_TREE_CLOSE]
+      class: isLazyLoading ? iconLoaded || cell_getIcon().TABLE_TREE_LOADED : isActive ? iconOpen || cell_getIcon().TABLE_TREE_OPEN : iconClose || cell_getIcon().TABLE_TREE_CLOSE
     })])] : null, h('div', {
       class: 'vxe-tree-cell'
     }, cellVNodes)])];
   },
+  /**
+   * 层级节点。
+   * 行分组、树结构
+   */
+  renderDeepNodeBtn(h, params, cellVNodes) {
+    const {
+      row,
+      column
+    } = params;
+    const {
+      rowGroupNode
+    } = column;
+    if (rowGroupNode && row.isAggregate) {
+      return [Cell.renderRowGroupBtn(h, params, cellVNodes)];
+    }
+    return [Cell.renderTreeNodeBtn(h, params, cellVNodes)];
+  },
   /**
    * 序号
    */
@@ -4203,8 +4325,8 @@ const Cell = {
     const seqMethod = seqOpts.seqMethod;
     return renderCellBaseVNs(h, params, [h('span', `${formatText(seqMethod ? seqMethod(params) : treeConfig ? seq : (seqOpts.startIndex || 0) + seq, 1)}`)]);
   },
-  renderTreeIndexCell(h, params) {
-    return Cell.renderTreeIcon(h, params, Cell.renderSeqCell(h, params));
+  renderDeepIndexCell(h, params) {
+    return Cell.renderDeepNodeBtn(h, params, Cell.renderSeqCell(h, params));
   },
   /**
    * 单选
@@ -4249,6 +4371,7 @@ const Cell = {
     const radioSlot = slots ? slots.radio : null;
     const isChecked = row === selectRadioRow;
     const isVisible = !visibleMethod || visibleMethod({
+      $table,
       row
     });
     let isDisabled = !!checkMethod;
@@ -4263,6 +4386,7 @@ const Cell = {
       };
       if (checkMethod) {
         isDisabled = !checkMethod({
+          $table,
           row
         });
       }
@@ -4295,8 +4419,8 @@ const Cell = {
       on
     }, radioVNs)]);
   },
-  renderTreeRadioCell(h, params) {
-    return Cell.renderTreeIcon(h, params, Cell.renderRadioCell(h, params));
+  renderDeepRadioCell(h, params) {
+    return Cell.renderDeepNodeBtn(h, params, Cell.renderRadioCell(h, params));
   },
   /**
    * 多选
@@ -4377,7 +4501,8 @@ const Cell = {
       treeConfig
     } = tableProps;
     const {
-      updateCheckboxFlag
+      updateCheckboxFlag,
+      isRowGroupStatus
     } = tableReactData;
     const {
       selectCheckboxMaps,
@@ -4397,6 +4522,7 @@ const Cell = {
     let indeterminate = false;
     let isChecked = false;
     const isVisible = !visibleMethod || visibleMethod({
+      $table,
       row
     });
     let isDisabled = !!checkMethod;
@@ -4411,10 +4537,11 @@ const Cell = {
       };
       if (checkMethod) {
         isDisabled = !checkMethod({
+          $table,
           row
         });
       }
-      if (treeConfig) {
+      if (treeConfig || isRowGroupStatus) {
         indeterminate = !!treeIndeterminateRowMaps[rowid];
       }
     }
@@ -4449,8 +4576,8 @@ const Cell = {
       on: ons
     }, checkVNs)]);
   },
-  renderTreeSelectionCell(h, params) {
-    return Cell.renderTreeIcon(h, params, Cell.renderCheckboxCell(h, params));
+  renderDeepSelectionCell(h, params) {
+    return Cell.renderDeepNodeBtn(h, params, Cell.renderCheckboxCell(h, params));
   },
   renderCheckboxCellByProp(h, params) {
     const {
@@ -4466,7 +4593,8 @@ const Cell = {
       treeConfig
     } = tableProps;
     const {
-      updateCheckboxFlag
+      updateCheckboxFlag,
+      isRowGroupStatus
     } = tableReactData;
     const {
       treeIndeterminateRowMaps
@@ -4487,6 +4615,7 @@ const Cell = {
     let isIndeterminate = false;
     let isChecked = false;
     const isVisible = !visibleMethod || visibleMethod({
+      $table,
       row
     });
     let isDisabled = !!checkMethod;
@@ -4501,10 +4630,11 @@ const Cell = {
       };
       if (checkMethod) {
         isDisabled = !checkMethod({
+          $table,
           row
         });
       }
-      if (treeConfig) {
+      if (treeConfig || isRowGroupStatus) {
         isIndeterminate = !!treeIndeterminateRowMaps[rowid];
       }
     }
@@ -4539,8 +4669,8 @@ const Cell = {
       on: ons
     }, checkVNs)]);
   },
-  renderTreeSelectionCellByProp(h, params) {
-    return Cell.renderTreeIcon(h, params, Cell.renderCheckboxCellByProp(h, params));
+  renderDeepSelectionCellByProp(h, params) {
+    return Cell.renderDeepNodeBtn(h, params, Cell.renderCheckboxCellByProp(h, params));
   },
   /**
    * 展开行
@@ -4552,7 +4682,11 @@ const Cell = {
       row,
       column
     } = params;
+    const tableReactData = $table;
     const tableInternalData = $table;
+    const {
+      isRowGroupStatus
+    } = tableReactData;
     const {
       rowExpandedMaps,
       rowExpandLazyLoadedMaps
@@ -4574,6 +4708,9 @@ const Cell = {
     const iconSlot = slots ? slots.icon : null;
     let isActive = false;
     let isLazyLoading = false;
+    if (isRowGroupStatus && row.isAggregate) {
+      return renderCellBaseVNs(h, params, []);
+    }
     if (iconSlot) {
       return renderCellBaseVNs(h, params, $table.callSlot(iconSlot, params, h));
     }
@@ -4644,8 +4781,8 @@ const Cell = {
       }
     })]);
   },
-  renderTreeHTMLCell(h, params) {
-    return Cell.renderTreeIcon(h, params, Cell.renderHTMLCell(h, params));
+  renderDeepHTMLCell(h, params) {
+    return Cell.renderDeepNodeBtn(h, params, Cell.renderHTMLCell(h, params));
   },
   /**
    * 排序和筛选
@@ -4806,8 +4943,8 @@ const Cell = {
     } = column;
     return Cell.runRenderer(h, params, this, isEnableConf(editRender) && actived && actived.row === params.row);
   },
-  renderTreeRowEdit(h, params) {
-    return Cell.renderTreeIcon(h, params, Cell.renderRowEdit(h, params));
+  renderDeepRowEdit(h, params) {
+    return Cell.renderDeepNodeBtn(h, params, Cell.renderRowEdit(h, params));
   },
   // 单元格编辑模式
   renderCellEdit(h, params) {
@@ -4827,8 +4964,8 @@ const Cell = {
     } = column;
     return Cell.runRenderer(h, params, this, isEnableConf(editRender) && actived && actived.row === params.row && actived.column === params.column);
   },
-  renderTreeCellEdit(h, params) {
-    return Cell.renderTreeIcon(h, params, Cell.renderCellEdit(h, params));
+  renderDeepCellEdit(h, params) {
+    return Cell.renderDeepNodeBtn(h, params, Cell.renderCellEdit(h, params));
   },
   runRenderer(h, params, _vm, isEdit) {
     const {
@@ -4967,6 +5104,8 @@ const columnProps = {
   filterRecoverMethod: Function,
   // 筛选模板配置项
   filterRender: Object,
+  // 设置为分组节点
+  rowGroupNode: Boolean,
   // 设置为树节点
   treeNode: Boolean,
   // 设置为拖拽排序
@@ -5343,6 +5482,7 @@ function restoreCustomStorage($xeTable) {
     const storeData = getCustomStorageMap(tableId);
     if (restoreStore) {
       return Promise.resolve(restoreStore({
+        $table: $xeTable,
         id: tableId,
         type: 'restore',
         storeData
@@ -5386,6 +5526,7 @@ function cacheColumnMap($xeTable) {
   const rowOpts = $xeTable.computeRowOpts;
   const isGroup = collectColumn.some(hasChildrenList);
   let isAllOverflow = !!props.showOverflow;
+  let rowGroupColumn;
   let expandColumn;
   let treeNodeColumn;
   let checkboxColumn;
@@ -5398,7 +5539,8 @@ function cacheColumnMap($xeTable) {
       field,
       fixed,
       type,
-      treeNode
+      treeNode,
+      rowGroupNode
     } = column;
     const rest = {
       $index: -1,
@@ -5434,7 +5576,16 @@ function cacheColumnMap($xeTable) {
       if (!treeNodeColumn) {
         treeNodeColumn = column;
       }
-    } else if (type === 'expand') {
+    }
+    if (rowGroupNode) {
+      if (treeNodeColumn) {
+        warnLog('vxe.error.colRepet', ['row-group-node', rowGroupNode]);
+      }
+      if (!rowGroupColumn) {
+        rowGroupColumn = column;
+      }
+    }
+    if (type === 'expand') {
       if (expandColumn) {
         warnLog('vxe.error.colRepet', ['type', type]);
       }
@@ -5485,6 +5636,7 @@ function cacheColumnMap($xeTable) {
     }
   }
   reactData.isGroup = isGroup;
+  reactData.rowGroupColumn = rowGroupColumn;
   reactData.treeNodeColumn = treeNodeColumn;
   reactData.expandColumn = expandColumn;
   reactData.isAllOverflow = isAllOverflow;
@@ -5521,7 +5673,7 @@ function handleBaseTreeExpand($xeTable, rows, expanded) {
   } = reactData;
   const {
     fullAllDataRowIdData,
-    tableFullData,
+    tableFullTreeData,
     treeExpandedMaps,
     treeExpandLazyLoadedMaps
   } = internalData;
@@ -5551,7 +5703,7 @@ function handleBaseTreeExpand($xeTable, rows, expanded) {
   if (accordion) {
     validRows = validRows.length ? [validRows[validRows.length - 1]] : [];
     // 同一级只能展开一个
-    const matchObj = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().findTree(tableFullData, item => item === validRows[0], {
+    const matchObj = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().findTree(tableFullTreeData, item => item === validRows[0], {
       children: childrenField
     });
     if (matchObj) {
@@ -5604,9 +5756,96 @@ function handleBaseTreeExpand($xeTable, rows, expanded) {
  * @returns
  */
 function handleVirtualTreeExpand($xeTable, rows, expanded) {
+  const reactData = $xeTable;
   return handleBaseTreeExpand($xeTable, rows, expanded).then(() => {
     handleVirtualTreeToList($xeTable);
     $xeTable.handleTableData();
+    reactData.treeExpandedFlag++;
+    updateAfterDataIndex($xeTable);
+    return $xeTable.$nextTick();
+  }).then(() => {
+    return $xeTable.recalculate(true);
+  }).then(() => {
+    setTimeout(() => {
+      $xeTable.updateCellAreas();
+    }, 30);
+  });
+}
+/**
+ * 展开与收起行分组节点
+ * @param rows
+ * @param expanded
+ * @returns
+ */
+function handleRowGroupBaseExpand($xeTable, rows, expanded) {
+  const reactData = $xeTable;
+  const internalData = $xeTable;
+  const {
+    fullAllDataRowIdData,
+    tableFullGroupData,
+    rowGroupExpandedMaps
+  } = internalData;
+  const rowGroupOpts = $xeTable.computeRowGroupOpts;
+  const {
+    mapChildrenField,
+    accordion
+  } = rowGroupOpts;
+  const {
+    handleGetRowId
+  } = createHandleGetRowId($xeTable);
+  let validRows = rows;
+  if (mapChildrenField) {
+    if (accordion) {
+      validRows = validRows.length ? [validRows[validRows.length - 1]] : [];
+      // 同一级只能展开一个
+      const matchObj = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().findTree(tableFullGroupData, item => getRowid($xeTable, item) === getRowid($xeTable, validRows[0]), {
+        children: mapChildrenField
+      });
+      if (matchObj) {
+        matchObj.items.forEach(item => {
+          const rowid = handleGetRowId(item);
+          if (rowGroupExpandedMaps[rowid]) {
+            delete rowGroupExpandedMaps[rowid];
+          }
+        });
+      }
+    }
+    if (expanded) {
+      validRows.forEach(row => {
+        const rowid = handleGetRowId(row);
+        if (!rowGroupExpandedMaps[rowid]) {
+          const rowRest = fullAllDataRowIdData[rowid];
+          if (rowRest) {
+            if (row[mapChildrenField] && row[mapChildrenField].length) {
+              rowGroupExpandedMaps[rowid] = row;
+            }
+          }
+        }
+      });
+    } else {
+      validRows.forEach(item => {
+        const rowid = handleGetRowId(item);
+        if (rowGroupExpandedMaps[rowid]) {
+          delete rowGroupExpandedMaps[rowid];
+        }
+      });
+    }
+  }
+  reactData.rowGroupExpandedFlag++;
+  return $xeTable.recalculate();
+}
+/**
+ * 行分组的展开与收起
+ * @param rows
+ * @param expanded
+ * @returns
+ */
+function handleRowGroupVirtualExpand($xeTable, rows, expanded) {
+  const reactData = $xeTable;
+  return handleRowGroupBaseExpand($xeTable, rows, expanded).then(() => {
+    handleVirtualTreeToList($xeTable);
+    $xeTable.handleTableData();
+    reactData.rowGroupExpandedFlag++;
     updateAfterDataIndex($xeTable);
     return $xeTable.$nextTick();
   }).then(() => {
@@ -5728,27 +5967,33 @@ function updateAfterDataIndex($xeTable) {
   }
 }
 /**
- * 如果为虚拟树，将树结构拍平
+ * 如果为虚拟树、行分组、则将树结构拍平
  * @returns
  */
 function handleVirtualTreeToList($xeTable) {
   const props = $xeTable;
+  const reactData = $xeTable;
   const internalData = $xeTable;
   const {
     treeConfig
   } = props;
+  const {
+    isRowGroupStatus
+  } = reactData;
   const {
     fullAllDataRowIdData,
-    treeExpandedMaps
+    treeExpandedMaps,
+    rowGroupExpandedMaps
   } = internalData;
+  const rowGroupOpts = $xeTable.computeRowGroupOpts;
   const treeOpts = $xeTable.computeTreeOpts;
-  const childrenField = treeOpts.children || treeOpts.childrenField;
+  const {
+    handleGetRowId
+  } = createHandleGetRowId($xeTable);
+  const fullData = [];
+  const expandMaps = {};
   if (treeConfig && treeOpts.transform) {
-    const {
-      handleGetRowId
-    } = createHandleGetRowId($xeTable);
-    const fullData = [];
-    const expandMaps = {};
+    const childrenField = treeOpts.children || treeOpts.childrenField;
     external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(internalData.afterTreeFullData, (row, index, items, path, parentRow) => {
       const rowid = handleGetRowId(row);
       const parentRowid = handleGetRowId(parentRow);
@@ -5766,106 +6011,433 @@ function handleVirtualTreeToList($xeTable) {
     internalData.afterFullData = fullData;
     updateScrollYStatus($xeTable, fullData);
     return fullData;
+  } else if (isRowGroupStatus) {
+    const {
+      childrenField
+    } = rowGroupOpts;
+    external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(internalData.afterGroupFullData, (row, index, items, path, parentRow) => {
+      const rowid = handleGetRowId(row);
+      const parentRowid = handleGetRowId(parentRow);
+      if (!parentRow || expandMaps[parentRowid] && rowGroupExpandedMaps[parentRowid]) {
+        const rowRest = fullAllDataRowIdData[rowid];
+        if (rowRest) {
+          rowRest._index = fullData.length;
+        }
+        expandMaps[rowid] = 1;
+        fullData.push(row);
+      }
+    }, {
+      children: childrenField
+    });
+    internalData.afterFullData = fullData;
+    updateScrollYStatus($xeTable, fullData);
+    return fullData;
   }
   return internalData.afterFullData;
 }
-function updateStyle($xeTable) {
+/**
+ * 编译处理后全量的表格数据
+ * 如果存在筛选条件，继续处理
+ */
+function updateAfterFullData($xeTable) {
   const props = $xeTable;
   const reactData = $xeTable;
   const internalData = $xeTable;
   const {
-    showHeaderOverflow: allColumnHeaderOverflow,
-    showFooterOverflow: allColumnFooterOverflow,
-    mouseConfig,
-    spanMethod,
-    footerSpanMethod
+    treeConfig
   } = props;
   const {
-    isGroup,
-    currentRow,
-    tableColumn,
-    scrollXLoad,
-    scrollYLoad,
-    overflowX,
-    scrollbarWidth,
-    overflowY,
-    scrollbarHeight,
-    scrollXWidth,
-    columnStore,
-    editStore,
-    isAllOverflow,
-    expandColumn
+    isRowGroupStatus
   } = reactData;
   const {
-    visibleColumn,
-    tableHeight,
-    headerHeight,
-    footerHeight,
-    elemStore,
-    customHeight,
-    customMinHeight,
-    customMaxHeight
+    tableFullColumn,
+    tableFullData,
+    tableFullTreeData,
+    tableFullGroupData
   } = internalData;
-  const el = $xeTable.$refs.refElem;
-  if (!el) {
-    return;
-  }
-  const containerList = ['main', 'left', 'right'];
-  const osbWidth = overflowY ? scrollbarWidth : 0;
-  const osbHeight = overflowX ? scrollbarHeight : 0;
-  const emptyPlaceholderElem = $xeTable.$refs.refEmptyPlaceholder;
-  const mouseOpts = $xeTable.computeMouseOpts;
-  const expandOpts = $xeTable.computeExpandOpts;
-  const bodyWrapperElem = getRefElem(elemStore['main-body-wrapper']);
-  const bodyTableElem = getRefElem(elemStore['main-body-table']);
-  if (emptyPlaceholderElem) {
-    emptyPlaceholderElem.style.top = `${headerHeight}px`;
-    emptyPlaceholderElem.style.height = bodyWrapperElem ? `${bodyWrapperElem.offsetHeight - osbHeight}px` : '';
-  }
-  let bodyHeight = 0;
-  let bodyMaxHeight = 0;
-  const bodyMinHeight = customMinHeight - headerHeight - footerHeight - osbHeight;
-  if (customMaxHeight) {
-    bodyMaxHeight = Math.max(bodyMinHeight, customMaxHeight - headerHeight - footerHeight - osbHeight);
-  }
-  if (customHeight) {
-    bodyHeight = customHeight - headerHeight - footerHeight - osbHeight;
-  }
-  if (!bodyHeight) {
-    if (bodyTableElem) {
-      bodyHeight = bodyTableElem.clientHeight;
-    }
-  }
-  if (bodyHeight) {
-    if (bodyMaxHeight) {
-      bodyHeight = Math.min(bodyMaxHeight, bodyHeight);
-    }
-    bodyHeight = Math.max(bodyMinHeight, bodyHeight);
-  }
-  const scrollbarXToTop = $xeTable.$refs.computeScrollbarXToTop;
-  const xLeftCornerEl = $xeTable.$refs.refScrollXLeftCornerElem;
-  const xRightCornerEl = $xeTable.$refs.refScrollXRightCornerElem;
-  const scrollXVirtualEl = $xeTable.$refs.refScrollXVirtualElem;
-  if (scrollXVirtualEl) {
-    scrollXVirtualEl.style.height = `${osbHeight}px`;
-    scrollXVirtualEl.style.visibility = overflowX ? 'visible' : 'hidden';
-  }
-  const xWrapperEl = $xeTable.$refs.refScrollXWrapperElem;
-  if (xWrapperEl) {
-    xWrapperEl.style.left = scrollbarXToTop ? `${osbWidth}px` : '';
-    xWrapperEl.style.width = `${el.clientWidth - osbWidth}px`;
-  }
-  if (xLeftCornerEl) {
-    xLeftCornerEl.style.width = scrollbarXToTop ? `${osbWidth}px` : '';
-    xLeftCornerEl.style.display = scrollbarXToTop ? overflowX && osbHeight ? 'block' : '' : '';
-  }
-  if (xRightCornerEl) {
-    xRightCornerEl.style.width = scrollbarXToTop ? '' : `${osbWidth}px`;
-    xRightCornerEl.style.display = scrollbarXToTop ? '' : overflowX && osbHeight ? 'block' : '';
-  }
-  const scrollYVirtualEl = $xeTable.$refs.refScrollYVirtualElem;
-  if (scrollYVirtualEl) {
-    scrollYVirtualEl.style.width = `${osbWidth}px`;
+  const filterOpts = $xeTable.computeFilterOpts;
+  const sortOpts = $xeTable.computeSortOpts;
+  const rowGroupOpts = $xeTable.computeRowGroupOpts;
+  const treeOpts = $xeTable.computeTreeOpts;
+  const childrenField = treeOpts.children || treeOpts.childrenField;
+  const {
+    transform,
+    rowField,
+    parentField,
+    mapChildrenField
+  } = treeOpts;
+  const {
+    isEvery,
+    remote: allRemoteFilter,
+    filterMethod: allFilterMethod
+  } = filterOpts;
+  const {
+    remote: allRemoteSort,
+    sortMethod: allSortMethod,
+    multiple: sortMultiple,
+    chronological
+  } = sortOpts;
+  let tableData = [];
+  let tableTree = [];
+  // 处理数据
+  if (!allRemoteFilter || !allRemoteSort) {
+    const filterColumns = [];
+    let orderColumns = [];
+    tableFullColumn.forEach(column => {
+      const {
+        field,
+        sortable,
+        order,
+        filters
+      } = column;
+      if (!allRemoteFilter && filters && filters.length) {
+        const valueList = [];
+        const itemList = [];
+        filters.forEach(item => {
+          if (item.checked) {
+            itemList.push(item);
+            valueList.push(item.value);
+          }
+        });
+        if (itemList.length) {
+          filterColumns.push({
+            column,
+            valueList,
+            itemList
+          });
+        }
+      }
+      if (!allRemoteSort && sortable && order) {
+        orderColumns.push({
+          column,
+          field,
+          property: field,
+          order: order,
+          sortTime: column.sortTime
+        });
+      }
+    });
+    if (sortMultiple && chronological && orderColumns.length > 1) {
+      orderColumns = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().orderBy(orderColumns, 'sortTime');
+    }
+    // 处理筛选
+    // 支持单列、多列、组合筛选
+    if (!allRemoteFilter && filterColumns.length) {
+      const handleFilter = row => {
+        return filterColumns.every(({
+          column,
+          valueList,
+          itemList
+        }) => {
+          const {
+            filterMethod,
+            filterRender
+          } = column;
+          const compConf = isEnableConf(filterRender) ? methods_renderer.get(filterRender.name) : null;
+          const compFilterMethod = compConf ? compConf.tableFilterMethod || compConf.filterMethod : null;
+          const tdFilterMethod = compConf ? compConf.tableFilterDefaultMethod || compConf.defaultTableFilterMethod || compConf.defaultFilterMethod : null;
+          const cellValue = getCellValue(row, column);
+          if (filterMethod) {
+            return itemList.some(item => filterMethod({
+              value: item.value,
+              option: item,
+              cellValue,
+              row,
+              column,
+              $table: $xeTable
+            }));
+          } else if (compFilterMethod) {
+            return itemList.some(item => compFilterMethod({
+              value: item.value,
+              option: item,
+              cellValue,
+              row,
+              column,
+              $table: $xeTable
+            }));
+          } else if (allFilterMethod) {
+            return allFilterMethod({
+              $table: $xeTable,
+              options: itemList,
+              values: valueList,
+              cellValue,
+              row,
+              column
+            });
+          } else if (tdFilterMethod) {
+            return itemList.some(item => tdFilterMethod({
+              value: item.value,
+              option: item,
+              cellValue,
+              row,
+              column,
+              $table: $xeTable
+            }));
+          }
+          return valueList.indexOf(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, column.field)) > -1;
+        });
+      };
+      if (isRowGroupStatus) {
+        // 行分组
+        tableTree = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().searchTree(tableFullGroupData, handleFilter, {
+          original: true,
+          isEvery: true,
+          children: rowGroupOpts.mapChildrenField,
+          mapChildren: rowGroupOpts.childrenField
+        });
+        tableData = tableTree;
+      } else if (treeConfig && transform) {
+        // 筛选虚拟树
+        tableTree = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().searchTree(tableFullTreeData, handleFilter, {
+          original: true,
+          isEvery,
+          children: mapChildrenField,
+          mapChildren: childrenField
+        });
+        tableData = tableTree;
+      } else {
+        tableData = treeConfig ? tableFullTreeData.filter(handleFilter) : tableFullData.filter(handleFilter);
+        tableTree = tableData;
+      }
+    } else {
+      if (isRowGroupStatus) {
+        // 还原行分组
+        tableTree = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().searchTree(tableFullGroupData, () => true, {
+          original: true,
+          isEvery: true,
+          children: rowGroupOpts.mapChildrenField,
+          mapChildren: rowGroupOpts.childrenField
+        });
+        tableData = tableTree;
+      } else if (treeConfig && transform) {
+        // 还原虚拟树
+        tableTree = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().searchTree(tableFullTreeData, () => true, {
+          original: true,
+          isEvery,
+          children: mapChildrenField,
+          mapChildren: childrenField
+        });
+        tableData = tableTree;
+      } else {
+        tableData = treeConfig ? tableFullTreeData.slice(0) : tableFullData.slice(0);
+        tableTree = tableData;
+      }
+    }
+    // 处理排序
+    // 支持单列、多列、组合排序
+    if (!allRemoteSort && orderColumns.length) {
+      if (isRowGroupStatus) {
+        // 行分组的排序
+        if (allSortMethod) {
+          const sortRests = allSortMethod({
+            data: tableTree,
+            sortList: orderColumns,
+            $table: $xeTable
+          });
+          tableTree = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(sortRests) ? sortRests : tableTree;
+        } else {
+          const treeList = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toTreeArray(tableTree, {
+            key: rowGroupOpts.rowField,
+            parentKey: rowGroupOpts.parentField,
+            children: rowGroupOpts.mapChildrenField
+          });
+          tableTree = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toArrayTree(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().orderBy(treeList, orderColumns.map(({
+            column,
+            order
+          }) => [getOrderField($xeTable, column), order])), {
+            key: rowGroupOpts.rowField,
+            parentKey: rowGroupOpts.parentField,
+            children: rowGroupOpts.childrenField,
+            mapChildren: rowGroupOpts.mapChildrenField
+          });
+        }
+        tableData = tableTree;
+      } else if (treeConfig && transform) {
+        // 虚拟树的排序
+        if (allSortMethod) {
+          const sortRests = allSortMethod({
+            data: tableTree,
+            sortList: orderColumns,
+            $table: $xeTable
+          });
+          tableTree = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(sortRests) ? sortRests : tableTree;
+        } else {
+          const treeList = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toTreeArray(tableTree, {
+            children: mapChildrenField
+          });
+          tableTree = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toArrayTree(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().orderBy(treeList, orderColumns.map(({
+            column,
+            order
+          }) => [getOrderField($xeTable, column), order])), {
+            key: rowField,
+            parentKey: parentField,
+            children: childrenField,
+            mapChildren: mapChildrenField
+          });
+        }
+        tableData = tableTree;
+      } else {
+        if (allSortMethod) {
+          const sortRests = allSortMethod({
+            data: tableData,
+            sortList: orderColumns,
+            $table: $xeTable
+          });
+          tableData = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(sortRests) ? sortRests : tableData;
+        } else {
+          // 兼容 v4
+          if (sortMultiple) {
+            tableData = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().orderBy(tableData, orderColumns.map(({
+              column,
+              order
+            }) => [getOrderField($xeTable, column), order]));
+          } else {
+            const firstOrderColumn = orderColumns[0];
+            let sortByConfs;
+            // 已废弃，兼容 v2，在 v4 中废弃， sortBy 不能为数组
+            if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(firstOrderColumn.sortBy)) {
+              sortByConfs = firstOrderColumn.sortBy.map(item => [item, firstOrderColumn.order]);
+            }
+            tableData = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().orderBy(tableData, sortByConfs || [firstOrderColumn].map(({
+              column,
+              order
+            }) => [getOrderField($xeTable, column), order]));
+          }
+          tableData = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().orderBy(tableData, orderColumns.map(({
+            column,
+            order
+          }) => [getOrderField($xeTable, column), order]));
+        }
+        tableTree = tableData;
+      }
+    }
+  } else {
+    if (isRowGroupStatus) {
+      // 还原行分组
+      // 还原虚拟树
+      tableTree = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().searchTree(tableFullGroupData, () => true, {
+        original: true,
+        isEvery: true,
+        children: rowGroupOpts.mapChildrenField,
+        mapChildren: rowGroupOpts.childrenField
+      });
+      tableData = tableTree;
+    } else if (treeConfig && transform) {
+      // 还原虚拟树
+      tableTree = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().searchTree(tableFullTreeData, () => true, {
+        original: true,
+        isEvery,
+        children: mapChildrenField,
+        mapChildren: childrenField
+      });
+      tableData = tableTree;
+    } else {
+      tableData = treeConfig ? tableFullTreeData.slice(0) : tableFullData.slice(0);
+      tableTree = tableData;
+    }
+  }
+  internalData.afterFullData = tableData;
+  internalData.afterTreeFullData = tableTree;
+  internalData.afterGroupFullData = tableTree;
+  updateAfterDataIndex($xeTable);
+}
+function updateStyle($xeTable) {
+  const props = $xeTable;
+  const reactData = $xeTable;
+  const internalData = $xeTable;
+  const {
+    showHeaderOverflow: allColumnHeaderOverflow,
+    showFooterOverflow: allColumnFooterOverflow,
+    mouseConfig,
+    spanMethod,
+    footerSpanMethod
+  } = props;
+  const {
+    isGroup,
+    currentRow,
+    tableColumn,
+    scrollXLoad,
+    scrollYLoad,
+    overflowX,
+    scrollbarWidth,
+    overflowY,
+    scrollbarHeight,
+    scrollXWidth,
+    columnStore,
+    editStore,
+    isAllOverflow,
+    expandColumn
+  } = reactData;
+  const {
+    visibleColumn,
+    tableHeight,
+    headerHeight,
+    footerHeight,
+    elemStore,
+    customHeight,
+    customMinHeight,
+    customMaxHeight
+  } = internalData;
+  const el = $xeTable.$refs.refElem;
+  if (!el) {
+    return;
+  }
+  const containerList = ['main', 'left', 'right'];
+  const osbWidth = overflowY ? scrollbarWidth : 0;
+  const osbHeight = overflowX ? scrollbarHeight : 0;
+  const emptyPlaceholderElem = $xeTable.$refs.refEmptyPlaceholder;
+  const mouseOpts = $xeTable.computeMouseOpts;
+  const expandOpts = $xeTable.computeExpandOpts;
+  const bodyWrapperElem = getRefElem(elemStore['main-body-wrapper']);
+  const bodyTableElem = getRefElem(elemStore['main-body-table']);
+  if (emptyPlaceholderElem) {
+    emptyPlaceholderElem.style.top = `${headerHeight}px`;
+    emptyPlaceholderElem.style.height = bodyWrapperElem ? `${bodyWrapperElem.offsetHeight - osbHeight}px` : '';
+  }
+  let bodyHeight = 0;
+  let bodyMaxHeight = 0;
+  const bodyMinHeight = customMinHeight - headerHeight - footerHeight - osbHeight;
+  if (customMaxHeight) {
+    bodyMaxHeight = Math.max(bodyMinHeight, customMaxHeight - headerHeight - footerHeight - osbHeight);
+  }
+  if (customHeight) {
+    bodyHeight = customHeight - headerHeight - footerHeight - osbHeight;
+  }
+  if (!bodyHeight) {
+    if (bodyTableElem) {
+      bodyHeight = bodyTableElem.clientHeight;
+    }
+  }
+  if (bodyHeight) {
+    if (bodyMaxHeight) {
+      bodyHeight = Math.min(bodyMaxHeight, bodyHeight);
+    }
+    bodyHeight = Math.max(bodyMinHeight, bodyHeight);
+  }
+  const scrollbarXToTop = $xeTable.$refs.computeScrollbarXToTop;
+  const xLeftCornerEl = $xeTable.$refs.refScrollXLeftCornerElem;
+  const xRightCornerEl = $xeTable.$refs.refScrollXRightCornerElem;
+  const scrollXVirtualEl = $xeTable.$refs.refScrollXVirtualElem;
+  if (scrollXVirtualEl) {
+    scrollXVirtualEl.style.height = `${osbHeight}px`;
+    scrollXVirtualEl.style.visibility = overflowX ? 'visible' : 'hidden';
+  }
+  const xWrapperEl = $xeTable.$refs.refScrollXWrapperElem;
+  if (xWrapperEl) {
+    xWrapperEl.style.left = scrollbarXToTop ? `${osbWidth}px` : '';
+    xWrapperEl.style.width = `${el.clientWidth - osbWidth}px`;
+  }
+  if (xLeftCornerEl) {
+    xLeftCornerEl.style.width = scrollbarXToTop ? `${osbWidth}px` : '';
+    xLeftCornerEl.style.display = scrollbarXToTop ? overflowX && osbHeight ? 'block' : '' : '';
+  }
+  if (xRightCornerEl) {
+    xRightCornerEl.style.width = scrollbarXToTop ? '' : `${osbWidth}px`;
+    xRightCornerEl.style.display = scrollbarXToTop ? '' : overflowX && osbHeight ? 'block' : '';
+  }
+  const scrollYVirtualEl = $xeTable.$refs.refScrollYVirtualElem;
+  if (scrollYVirtualEl) {
+    scrollYVirtualEl.style.width = `${osbWidth}px`;
     scrollYVirtualEl.style.height = `${bodyHeight + headerHeight + footerHeight}px`;
     scrollYVirtualEl.style.visibility = overflowY ? 'visible' : 'hidden';
   }
@@ -6227,6 +6799,7 @@ function handleCheckedRadioRow($xeTable, row, isForce) {
     checkMethod
   } = radioOpts;
   if (row && (isForce || !checkMethod || checkMethod({
+    $table: $xeTable,
     row
   }))) {
     reactData.selectRadioRow = row;
@@ -6249,12 +6822,18 @@ function handleCheckedAllCheckboxRow($xeTable, checked, isForce) {
   const {
     treeConfig
   } = props;
+  const {
+    isRowGroupStatus
+  } = reactData;
   const {
     afterFullData,
+    afterTreeFullData,
+    afterGroupFullData,
     checkboxReserveRowMap,
     selectCheckboxMaps
   } = internalData;
   const treeOpts = $xeTable.computeTreeOpts;
+  const rowGroupOpts = $xeTable.computeRowGroupOpts;
   const childrenField = treeOpts.children || treeOpts.childrenField;
   const checkboxOpts = $xeTable.computeCheckboxOpts;
   const {
@@ -6269,12 +6848,13 @@ function handleCheckedAllCheckboxRow($xeTable, checked, isForce) {
   const indeterminateField = checkboxOpts.indeterminateField || checkboxOpts.halfField;
   const selectRowMaps = {};
   /**
-   * 绑定属性方式（高性能，有污染）
+   * 绑定属性方式（有污染）
    * 必须在行数据存在对应的属性，否则将不响应
    */
   if (checkField) {
     const checkValFn = row => {
       if (isForce || !checkMethod || checkMethod({
+        $table: $xeTable,
         row
       })) {
         if (checked) {
@@ -6282,13 +6862,13 @@ function handleCheckedAllCheckboxRow($xeTable, checked, isForce) {
         }
         external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().set(row, checkField, checked);
       }
-      if (treeConfig && indeterminateField) {
+      if ((treeConfig || isRowGroupStatus) && indeterminateField) {
         external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().set(row, indeterminateField, false);
       }
     };
     // 如果存在选中方法
     // 如果方法成立，则更新值，否则忽略该数据
-    if (treeConfig) {
+    if (treeConfig || isRowGroupStatus) {
       external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(afterFullData, checkValFn, {
         children: childrenField
       });
@@ -6297,17 +6877,54 @@ function handleCheckedAllCheckboxRow($xeTable, checked, isForce) {
     }
   } else {
     /**
-       * 默认方式（低性能，无污染）
-       * 无需任何属性，直接绑定
-       */
-    if (treeConfig) {
+     * 默认方式（无污染）
+     * 无需任何属性，直接绑定
+     */
+    if (isRowGroupStatus) {
       if (checked) {
         /**
-           * 如果是树勾选
-           * 如果方法成立，则添加到临时集合中
-           */
-        external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(afterFullData, row => {
+         * 如果是行分组勾选
+         * 如果方法成立，则添加到临时集合中
+         */
+        external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(afterGroupFullData, row => {
           if (isForce || !checkMethod || checkMethod({
+            $table: $xeTable,
+            row
+          })) {
+            const rowid = handleGetRowId(row);
+            selectRowMaps[rowid] = row;
+          }
+        }, {
+          children: rowGroupOpts.mapChildrenField
+        });
+      } else {
+        /**
+         * 如果是树取消
+         * 如果方法成立，则不添加到临时集合中
+         */
+        if (!isForce && checkMethod) {
+          external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(afterGroupFullData, row => {
+            const rowid = handleGetRowId(row);
+            if (checkMethod({
+              $table: $xeTable,
+              row
+            }) ? false : selectCheckboxMaps[rowid]) {
+              selectRowMaps[rowid] = row;
+            }
+          }, {
+            children: rowGroupOpts.mapChildrenField
+          });
+        }
+      }
+    } else if (treeConfig) {
+      if (checked) {
+        /**
+         * 如果是树勾选
+         * 如果方法成立，则添加到临时集合中
+         */
+        external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(afterTreeFullData, row => {
+          if (isForce || !checkMethod || checkMethod({
+            $table: $xeTable,
             row
           })) {
             const rowid = handleGetRowId(row);
@@ -6318,15 +6935,16 @@ function handleCheckedAllCheckboxRow($xeTable, checked, isForce) {
         });
       } else {
         /**
-           * 如果是树取消
-           * 如果方法成立，则不添加到临时集合中
-           */
+         * 如果是树取消
+         * 如果方法成立，则不添加到临时集合中
+         */
         if (!isForce && checkMethod) {
-          external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(afterFullData, row => {
+          external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(afterTreeFullData, row => {
             const rowid = handleGetRowId(row);
             if (checkMethod({
+              $table: $xeTable,
               row
-            }) ? 0 : selectCheckboxMaps[rowid]) {
+            }) ? false : selectCheckboxMaps[rowid]) {
               selectRowMaps[rowid] = row;
             }
           }, {
@@ -6337,14 +6955,15 @@ function handleCheckedAllCheckboxRow($xeTable, checked, isForce) {
     } else {
       if (checked) {
         /**
-           * 如果是行勾选
-           * 如果存在选中方法且成立或者本身已勾选，则添加到临时集合中
-           * 如果不存在选中方法，则添加所有数据到临时集合中
-           */
+         * 如果是行勾选
+         * 如果存在选中方法且成立或者本身已勾选，则添加到临时集合中
+         * 如果不存在选中方法，则添加所有数据到临时集合中
+         */
         if (!isForce && checkMethod) {
           afterFullData.forEach(row => {
             const rowid = handleGetRowId(row);
             if (selectCheckboxMaps[rowid] || checkMethod({
+              $table: $xeTable,
               row
             })) {
               selectRowMaps[rowid] = row;
@@ -6358,16 +6977,17 @@ function handleCheckedAllCheckboxRow($xeTable, checked, isForce) {
         }
       } else {
         /**
-           * 如果是行取消
-           * 如果方法成立，则不添加到临时集合中；如果方法不成立则判断当前是否已勾选，如果已被勾选则添加到新集合中
-           * 如果不存在选中方法，无需处理，临时集合默认为空
-           */
+         * 如果是行取消
+         * 如果方法成立，则不添加到临时集合中；如果方法不成立则判断当前是否已勾选，如果已被勾选则添加到新集合中
+         * 如果不存在选中方法，无需处理，临时集合默认为空
+         */
         if (!isForce && checkMethod) {
           afterFullData.forEach(row => {
             const rowid = handleGetRowId(row);
             if (checkMethod({
+              $table: $xeTable,
               row
-            }) ? 0 : selectCheckboxMaps[rowid]) {
+            }) ? false : selectCheckboxMaps[rowid]) {
               selectRowMaps[rowid] = row;
             }
           });
@@ -7242,9 +7862,11 @@ function updateRowDropTipContent($xeTable, tdEl) {
   const rTooltipMethod = tooltipMethod || (dragConfig ? dragConfig.rowTooltipMethod : null);
   let tipContent = '';
   if (rTooltipMethod) {
-    tipContent = `${rTooltipMethod({
+    const rtParams = {
+      $table: $xeTable,
       row: dragRow
-    }) || ''}`;
+    };
+    tipContent = `${rTooltipMethod(rtParams) || ''}`;
   } else {
     tipContent = methods_getI18n('vxe.table.dragTip', [tdEl.textContent || '']);
   }
@@ -7284,9 +7906,11 @@ function updateColDropTipContent($xeTable, tdEl) {
   } = columnDragOpts;
   let tipContent = '';
   if (tooltipMethod) {
-    tipContent = `${tooltipMethod({
+    const dtParams = {
+      $table: $xeTable,
       column: dragCol
-    }) || ''}`;
+    };
+    tipContent = `${tooltipMethod(dtParams) || ''}`;
   } else {
     tipContent = methods_getI18n('vxe.table.dragTip', [tdEl.textContent || '']);
   }
@@ -7609,13 +8233,280 @@ function handleRecalculateLayout($xeTable, reFull) {
     }
     calcScrollbar($xeTable);
     updateStyle($xeTable);
-    if (reFull) {
-      updateRowOffsetTop($xeTable);
-    }
-    updateRowExpandStyle($xeTable);
-    if (reFull) {
-      return computeScrollLoad($xeTable);
+    if (reFull) {
+      updateRowOffsetTop($xeTable);
+    }
+    updateRowExpandStyle($xeTable);
+    if (reFull) {
+      return computeScrollLoad($xeTable);
+    }
+  });
+}
+const handleUpdateRowGroup = ($xeTable, groupFields) => {
+  const reactData = $xeTable;
+  reactData.rowGroupList = groupFields ? (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(groupFields) ? groupFields : [groupFields]).map(field => {
+    return {
+      field
+    };
+  }) : [];
+};
+function handleGroupData($xeTable, list, rowGroups) {
+  let fullData = list;
+  let treeData = list;
+  if (rowGroups) {
+    const rowGroupOpts = $xeTable.computeRowGroupOpts;
+    const {
+      rowField,
+      parentField,
+      childrenField,
+      mapChildrenField
+    } = rowGroupOpts;
+    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 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 groupRow = {
+          isAggregate: true,
+          groupContent: groupValue,
+          groupField,
+          [rowField]: getRowUniqueId(),
+          [parentField]: null,
+          [rowkey]: getRowUniqueId(),
+          [childrenField]: childTreeData,
+          [mapChildrenField]: childTreeData
+        };
+        if (checkField) {
+          groupRow[checkField] = false;
+        }
+        if (indeterminateField) {
+          groupRow[indeterminateField] = false;
+        }
+        treeData.push(groupRow);
+        fullData.push(groupRow);
+        if (childFullData.length) {
+          fullData.push(...childFullData);
+        }
+      });
+    }
+  }
+  return {
+    treeData,
+    fullData
+  };
+}
+/**
+ * 加载表格数据
+ * @param {Array} datas 数据
+ */
+function loadTableData($xeTable, datas, isReset) {
+  const props = $xeTable;
+  const reactData = $xeTable;
+  const internalData = $xeTable;
+  const {
+    keepSource,
+    treeConfig,
+    rowGroupConfig
+  } = props;
+  const {
+    rowGroupList,
+    scrollYLoad: oldScrollYLoad
+  } = reactData;
+  const {
+    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) : []; // 转为响应式数据
+  if (fullData.length > supportMaxRow) {
+    errLog('vxe.error.errMaxRow', [supportMaxRow]);
+  }
+  if (treeConfig && rowGroupList.length) {
+    errLog('vxe.error.noTree', ['row-group-config']);
+    return $xeTable.$nextTick();
+  }
+  if (rowOpts.drag && rowGroupList.length) {
+    errLog('vxe.error.errConflicts', ['row-config.drag', 'row-group-config']);
+    return $xeTable.$nextTick();
+  }
+  let isRGroup = false;
+  if (treeConfig) {
+    if (transform) {
+      // 树结构自动转换
+      if (!treeOpts.rowField) {
+        errLog('vxe.error.reqProp', ['tree-config.rowField']);
+      }
+      if (!treeOpts.parentField) {
+        errLog('vxe.error.reqProp', ['tree-config.parentField']);
+      }
+      if (!childrenField) {
+        errLog('vxe.error.reqProp', ['tree-config.childrenField']);
+      }
+      if (!treeOpts.mapChildrenField) {
+        errLog('vxe.error.reqProp', ['tree-config.mapChildrenField']);
+      }
+      if (childrenField === treeOpts.mapChildrenField) {
+        errLog('vxe.error.errConflicts', ['tree-config.childrenField', 'tree-config.mapChildrenField']);
+      }
+      // fullData.forEach(row => {
+      //   if (row[treeOpts.children] && row[treeOpts.children].length) {
+      //     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 (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;
+  reactData.isRowLoading = true;
+  reactData.scrollVMLoading = false;
+  internalData.insertRowMaps = {};
+  internalData.removeRowMaps = {};
+  const sYLoad = updateScrollYStatus($xeTable, fullData);
+  reactData.isDragColMove = false;
+  reactData.isDragRowMove = false;
+  // 全量数据
+  internalData.tableFullData = fullData;
+  internalData.tableFullTreeData = isRGroup ? [] : treeData;
+  internalData.tableFullGroupData = isRGroup ? treeData : [];
+  // 缓存数据
+  $xeTable.cacheRowMap(isReset);
+  // 原始数据
+  internalData.tableSynchData = datas;
+  if (isReset) {
+    internalData.isResizeCellHeight = false;
+  }
+  // 克隆原数据，用于显示编辑状态，与编辑值做对比
+  if (keepSource) {
+    $xeTable.cacheSourceMap(fullData);
+  }
+  if ($xeTable.clearCellAreas && props.mouseConfig) {
+    $xeTable.clearCellAreas();
+    $xeTable.clearCopyCellArea();
+  }
+  $xeTable.clearMergeCells();
+  $xeTable.clearMergeFooterItems();
+  $xeTable.handleTableData(true);
+  $xeTable.updateFooter();
+  $xeTable.handleUpdateBodyMerge();
+  return $xeTable.$nextTick().then(() => {
+    updateHeight($xeTable);
+    updateStyle($xeTable);
+  }).then(() => {
+    computeScrollLoad($xeTable);
+  }).then(() => {
+    // 是否启用了虚拟滚动
+    if (sYLoad) {
+      scrollYStore.endIndex = scrollYStore.visibleSize;
+    }
+    if (sYLoad) {
+      if (reactData.expandColumn && expandOpts.mode !== 'fixed') {
+        errLog('vxe.error.notConflictProp', ['column.type="expand', 'expand-config.mode="fixed"']);
+      }
+      // if (showOverflow) {
+      //   if (!rowOpts.height) {
+      //     const errColumn = internalData.tableFullColumn.find(column => column.showOverflow === false)
+      //     if (errColumn) {
+      //       errLog('vxe.error.errProp', [`column[field="${errColumn.field}"].show-overflow=false`, 'show-overflow=true'])
+      //     }
+      //   }
+      // }
+      if (!(props.height || props.maxHeight)) {
+        errLog('vxe.error.reqProp', ['table.height | table.max-height | table.scroll-y={enabled: false}']);
+      }
+      // if (!props.showOverflow) {
+      //   warnLog('vxe.error.reqProp', ['table.show-overflow'])
+      // }
+      if (props.spanMethod) {
+        errLog('vxe.error.scrollErrProp', ['table.span-method']);
+      }
     }
+    handleReserveStatus($xeTable);
+    $xeTable.checkSelectionStatus();
+    return new Promise(resolve => {
+      $xeTable.$nextTick().then(() => handleRecalculateLayout($xeTable, false)).then(() => {
+        calcCellHeight($xeTable);
+        updateRowOffsetTop($xeTable);
+        return handleRecalculateLayout($xeTable, false);
+      }).then(() => {
+        let targetScrollLeft = lastScrollLeft;
+        let targetScrollTop = lastScrollTop;
+        const virtualXOpts = $xeTable.computeVirtualXOpts;
+        const virtualYOpts = $xeTable.computeVirtualYOpts;
+        // 是否在更新数据之后自动滚动重置滚动条
+        if (virtualXOpts.scrollToLeftOnChange) {
+          targetScrollLeft = 0;
+        }
+        if (virtualYOpts.scrollToTopOnChange) {
+          targetScrollTop = 0;
+        }
+        reactData.isRowLoading = false;
+        handleRecalculateLayout($xeTable, false);
+        // 是否变更虚拟滚动
+        if (oldScrollYLoad === sYLoad) {
+          restoreScrollLocation($xeTable, targetScrollLeft, targetScrollTop).then(() => {
+            resolve();
+          });
+        } else {
+          setTimeout(() => {
+            restoreScrollLocation($xeTable, targetScrollLeft, targetScrollTop).then(() => {
+              resolve();
+            });
+          });
+        }
+      });
+    });
   });
 }
 /**
@@ -8375,16 +9266,23 @@ const Methods = {
   clearAll() {
     return clearTableAllStatus(this);
   },
+  handleUpdateRowGroup(groupFields) {
+    const $xeTable = this;
+    handleUpdateRowGroup($xeTable, groupFields);
+  },
   /**
    * 同步 data 数据（即将废弃）
    * 如果用了该方法，那么组件将不再记录增删改的状态，只能自行实现对应逻辑
    * 对于某些特殊的场景，比如深层树节点元素发生变动时可能会用到
    */
   syncData() {
+    const $xeTable = this;
+    const reactData = $xeTable;
+    const internalData = $xeTable;
     errLog('vxe.error.delFunc', ['syncData', 'getData']);
-    return this.$nextTick().then(() => {
-      this.tableData = [];
-      return this.$nextTick().then(() => this.loadTableData(this.tableFullData, true));
+    return $xeTable.$nextTick().then(() => {
+      reactData.tableData = [];
+      return $xeTable.$nextTick().then(() => loadTableData($xeTable, internalData.tableFullData, true));
     });
   },
   /**
@@ -8432,23 +9330,23 @@ const Methods = {
     // 是否进行数据处理
     if (force) {
       // 更新数据，处理筛选和排序
-      this.updateAfterFullData();
+      updateAfterFullData($xeTable);
       // 如果为虚拟树，将树结构拍平
       fullList = handleVirtualTreeToList($xeTable);
     }
     const tableData = scrollYLoad ? fullList.slice(scrollYStore.startIndex, scrollYStore.endIndex) : fullList.slice(0);
     const visibleDataRowIdMaps = {};
     tableData.forEach((row, $index) => {
-      const rowid = getRowid(this, row);
+      const rowid = getRowid($xeTable, row);
       const rest = fullDataRowIdData[rowid];
       if (rest) {
         rest.$index = $index;
       }
       visibleDataRowIdMaps[rowid] = row;
     });
-    this.tableData = tableData;
+    reactData.tableData = tableData;
     internalData.visibleDataRowIdData = visibleDataRowIdMaps;
-    return this.$nextTick();
+    return $xeTable.$nextTick();
   },
   /**
    * 加载表格数据
@@ -8456,169 +9354,7 @@ const Methods = {
    */
   loadTableData(datas, isReset) {
     const $xeTable = this;
-    const props = $xeTable;
-    const reactData = $xeTable;
-    const internalData = $xeTable;
-    const {
-      keepSource,
-      treeConfig
-    } = props;
-    const {
-      scrollYLoad: oldScrollYLoad
-    } = reactData;
-    const {
-      scrollYStore,
-      scrollXStore,
-      lastScrollLeft,
-      lastScrollTop
-    } = internalData;
-    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) : [];
-    if (fullData.length > supportMaxRow) {
-      errLog('vxe.error.errMaxRow', [supportMaxRow]);
-    }
-    if (treeConfig) {
-      // 树结构自动转换
-      if (transform) {
-        if (!treeOpts.rowField) {
-          errLog('vxe.error.reqProp', ['table.tree-config.rowField']);
-        }
-        if (!treeOpts.parentField) {
-          errLog('vxe.error.reqProp', ['table.tree-config.parentField']);
-        }
-        if (!childrenField) {
-          errLog('vxe.error.reqProp', ['tree-config.childrenField']);
-        }
-        if (!treeOpts.mapChildrenField) {
-          errLog('vxe.error.reqProp', ['tree-config.mapChildrenField']);
-        }
-        if (childrenField === treeOpts.mapChildrenField) {
-          errLog('vxe.error.errConflicts', ['tree-config.childrenField', 'tree-config.mapChildrenField']);
-        }
-        // fullData.forEach(row => {
-        //   if (row[childrenField] && row[childrenField].length) {
-        //     warnLog('vxe.error.errConflicts', ['tree-config.transform', `row.${childrenField}`])
-        //   }
-        // })
-        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);
-      }
-    }
-    scrollYStore.startIndex = 0;
-    scrollYStore.endIndex = 1;
-    scrollXStore.startIndex = 0;
-    scrollXStore.endIndex = 1;
-    reactData.isRowLoading = true;
-    reactData.scrollVMLoading = false;
-    internalData.insertRowMaps = {};
-    internalData.removeRowMaps = {};
-    const sYLoad = updateScrollYStatus($xeTable, fullData);
-    reactData.isDragColMove = false;
-    reactData.isDragRowMove = false;
-    // 全量数据
-    internalData.tableFullData = fullData;
-    internalData.tableFullTreeData = treeData;
-    // 缓存数据
-    $xeTable.cacheRowMap(isReset);
-    // 原始数据
-    internalData.tableSynchData = datas;
-    if (isReset) {
-      internalData.isResizeCellHeight = false;
-    }
-    // 克隆原数据，用于显示编辑状态，与编辑值做对比
-    if (keepSource) {
-      $xeTable.cacheSourceMap(fullData);
-    }
-    if ($xeTable.clearCellAreas && props.mouseConfig) {
-      $xeTable.clearCellAreas();
-      $xeTable.clearCopyCellArea();
-    }
-    $xeTable.clearMergeCells();
-    $xeTable.clearMergeFooterItems();
-    $xeTable.handleTableData(true);
-    $xeTable.updateFooter();
-    $xeTable.handleUpdateBodyMerge();
-    return $xeTable.$nextTick().then(() => {
-      updateHeight($xeTable);
-      updateStyle($xeTable);
-    }).then(() => {
-      computeScrollLoad($xeTable);
-    }).then(() => {
-      // 是否启用了虚拟滚动
-      if (sYLoad) {
-        scrollYStore.endIndex = scrollYStore.visibleSize;
-      }
-      if (sYLoad) {
-        if (reactData.expandColumn && expandOpts.mode !== 'fixed') {
-          errLog('vxe.error.notConflictProp', ['column.type="expand', 'expand-config.mode="fixed"']);
-        }
-        // if (showOverflow) {
-        //   if (!rowOpts.height) {
-        //     const errColumn = internalData.tableFullColumn.find((column: any) => column.showOverflow === false)
-        //     if (errColumn) {
-        //       errLog('vxe.error.errProp', [`column[field="${errColumn.field}"].show-overflow=false`, 'show-overflow=true'])
-        //     }
-        //   }
-        // }
-        if (!(props.height || props.maxHeight)) {
-          errLog('vxe.error.reqProp', ['table.height | table.max-height | table.scroll-y={enabled: false}']);
-        }
-        // if (!props.showOverflow) {
-        //   warnLog('vxe.error.reqProp', ['table.show-overflow'])
-        // }
-        if (props.spanMethod) {
-          errLog('vxe.error.scrollErrProp', ['table.span-method']);
-        }
-      }
-      handleReserveStatus($xeTable);
-      $xeTable.checkSelectionStatus();
-      return new Promise(resolve => {
-        this.$nextTick().then(() => handleRecalculateLayout($xeTable, false)).then(() => {
-          calcCellHeight($xeTable);
-          updateRowOffsetTop($xeTable);
-          return handleRecalculateLayout($xeTable, false);
-        }).then(() => {
-          let targetScrollLeft = lastScrollLeft;
-          let targetScrollTop = lastScrollTop;
-          const virtualXOpts = $xeTable.computeVirtualXOpts;
-          const virtualYOpts = $xeTable.computeVirtualYOpts;
-          // 是否在更新数据之后自动滚动重置滚动条
-          if (virtualXOpts.scrollToLeftOnChange) {
-            targetScrollLeft = 0;
-          }
-          if (virtualYOpts.scrollToTopOnChange) {
-            targetScrollTop = 0;
-          }
-          reactData.isRowLoading = false;
-          handleRecalculateLayout($xeTable, false);
-          // 是否变更虚拟滚动
-          if (oldScrollYLoad === sYLoad) {
-            restoreScrollLocation($xeTable, targetScrollLeft, targetScrollTop).then(() => {
-              resolve();
-            });
-          } else {
-            setTimeout(() => {
-              restoreScrollLocation($xeTable, targetScrollLeft, targetScrollTop).then(() => {
-                resolve();
-              });
-            });
-          }
-        });
-      });
-    });
+    return loadTableData($xeTable, datas, isReset);
   },
   /**
    * 重新加载数据，不会清空表格状态
@@ -8629,7 +9365,7 @@ const Methods = {
     const {
       initStatus
     } = this;
-    return this.loadTableData(datas, false).then(() => {
+    return loadTableData($xeTable, datas, false).then(() => {
       this.inited = true;
       this.initStatus = true;
       if (!initStatus) {
@@ -8647,7 +9383,7 @@ const Methods = {
     return this.clearAll().then(() => {
       this.inited = true;
       this.initStatus = true;
-      return this.loadTableData(datas, true);
+      return loadTableData($xeTable, datas, true);
     }).then(() => {
       handleLoadDefaults($xeTable);
       return this.recalculate();
@@ -8739,18 +9475,16 @@ const Methods = {
     const {
       treeConfig
     } = props;
+    const {
+      isRowGroupStatus
+    } = reactData;
     const {
       fullAllDataRowIdData,
       tableFullData,
       tableFullTreeData,
+      tableFullGroupData,
       treeExpandedMaps
     } = internalData;
-    const treeOpts = $xeTable.computeTreeOpts;
-    const childrenField = treeOpts.children || treeOpts.childrenField;
-    const hasChildField = treeOpts.hasChild || treeOpts.hasChildField;
-    const {
-      lazy
-    } = treeOpts;
     const fullAllDataRowIdMaps = isReset ? {} : {
       ...fullAllDataRowIdData
     }; // 存在已删除数据
@@ -8790,6 +9524,12 @@ const Methods = {
       fullAllDataRowIdMaps[rowid] = rowRest;
     };
     if (treeConfig) {
+      const treeOpts = $xeTable.computeTreeOpts;
+      const {
+        lazy
+      } = treeOpts;
+      const childrenField = treeOpts.children || treeOpts.childrenField;
+      const hasChildField = treeOpts.hasChild || treeOpts.hasChildField;
       external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(tableFullTreeData, (row, index, items, path, parentRow, nodes) => {
         const rowid = handleUpdateRowId(row);
         if (treeConfig && lazy) {
@@ -8806,6 +9546,17 @@ const Methods = {
       }, {
         children: childrenField
       });
+    } else if (isRowGroupStatus) {
+      const rowGroupOpts = $xeTable.computeRowGroupOpts;
+      const {
+        mapChildrenField
+      } = rowGroupOpts;
+      external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(tableFullGroupData, (row, index, items, path, parentRow, nodes) => {
+        const rowid = handleUpdateRowId(row);
+        handleRowCache(row, index, items, parentRow ? -1 : index, parentRow, rowid, nodes.length - 1, toTreePathSeq(path));
+      }, {
+        children: mapChildrenField
+      });
     } else {
       tableFullData.forEach((row, index, items) => {
         handleRowCache(row, index, items, index, null, handleUpdateRowId(row), 0, index + 1);
@@ -9612,299 +10363,54 @@ const Methods = {
     const {
       treeConfig
     } = props;
-    const {
-      updateCheckboxFlag
-    } = reactData;
-    const {
-      tableFullData,
-      afterFullData,
-      tableFullTreeData,
-      fullDataRowIdData,
-      afterFullRowMaps,
-      selectCheckboxMaps
-    } = internalData;
-    const treeOpts = $xeTable.computeTreeOpts;
-    const checkboxOpts = $xeTable.computeCheckboxOpts;
-    const {
-      transform,
-      mapChildrenField
-    } = treeOpts;
-    const {
-      checkField
-    } = checkboxOpts;
-    const childrenField = treeOpts.children || treeOpts.childrenField;
-    let rowList = [];
-    if (updateCheckboxFlag) {
-      if (checkField) {
-        if (treeConfig) {
-          const currTableData = isFull ? transform ? tableFullTreeData : tableFullData : transform ? tableFullTreeData : afterFullData;
-          rowList = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().filterTree(currTableData, row => external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, checkField), {
-            children: transform ? mapChildrenField : childrenField
-          });
-        } else {
-          const currTableData = isFull ? tableFullData : afterFullData;
-          rowList = currTableData.filter(row => external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, checkField));
-        }
-      } else {
-        external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().each(selectCheckboxMaps, (row, rowid) => {
-          if (isFull) {
-            if (fullDataRowIdData[rowid]) {
-              rowList.push(fullDataRowIdData[rowid].row);
-            }
-          } else {
-            if (afterFullRowMaps[rowid]) {
-              rowList.push(afterFullRowMaps[rowid]);
-            }
-          }
-        });
-      }
-    }
-    return rowList;
-  },
-  /**
-   * 获取处理后全量的表格数据
-   * 如果存在筛选条件，继续处理
-   */
-  updateAfterFullData() {
-    const $xeTable = this;
-    const props = $xeTable;
-    const internalData = $xeTable;
-    const {
-      treeConfig
-    } = props;
-    const {
-      tableFullColumn,
-      tableFullData,
-      tableFullTreeData
-    } = internalData;
-    const filterOpts = $xeTable.computeFilterOpts;
-    const sortOpts = $xeTable.computeSortOpts;
-    const treeOpts = $xeTable.computeTreeOpts;
-    const childrenField = treeOpts.children || treeOpts.childrenField;
-    const {
-      transform,
-      rowField,
-      parentField,
-      mapChildrenField
-    } = treeOpts;
-    const {
-      isEvery,
-      remote: allRemoteFilter,
-      filterMethod: allFilterMethod
-    } = filterOpts;
-    const {
-      remote: allRemoteSort,
-      sortMethod: allSortMethod,
-      multiple: sortMultiple,
-      chronological
-    } = sortOpts;
-    let tableData = [];
-    let tableTree = [];
-    // 处理数据
-    if (!allRemoteFilter || !allRemoteSort) {
-      const filterColumns = [];
-      let orderColumns = [];
-      tableFullColumn.forEach(column => {
-        const {
-          field,
-          sortable,
-          order,
-          filters
-        } = column;
-        if (!allRemoteFilter && filters && filters.length) {
-          const valueList = [];
-          const itemList = [];
-          filters.forEach(item => {
-            if (item.checked) {
-              itemList.push(item);
-              valueList.push(item.value);
-            }
-          });
-          if (itemList.length) {
-            filterColumns.push({
-              column,
-              valueList,
-              itemList
-            });
-          }
-        }
-        if (!allRemoteSort && sortable && order) {
-          orderColumns.push({
-            column,
-            field,
-            property: field,
-            order: order,
-            sortTime: column.sortTime
-          });
-        }
-      });
-      if (sortMultiple && chronological && orderColumns.length > 1) {
-        orderColumns = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().orderBy(orderColumns, 'sortTime');
-      }
-      // 处理筛选
-      // 支持单列、多列、组合筛选
-      if (!allRemoteFilter && filterColumns.length) {
-        const handleFilter = row => {
-          return filterColumns.every(({
-            column,
-            valueList,
-            itemList
-          }) => {
-            const {
-              filterMethod,
-              filterRender
-            } = column;
-            const compConf = isEnableConf(filterRender) ? methods_renderer.get(filterRender.name) : null;
-            const compFilterMethod = compConf ? compConf.tableFilterMethod || compConf.filterMethod : null;
-            const tdFilterMethod = compConf ? compConf.tableFilterDefaultMethod || compConf.defaultTableFilterMethod || compConf.defaultFilterMethod : null;
-            const cellValue = getCellValue(row, column);
-            if (filterMethod) {
-              return itemList.some(item => filterMethod({
-                value: item.value,
-                option: item,
-                cellValue,
-                row,
-                column,
-                $table: $xeTable
-              }));
-            } else if (compFilterMethod) {
-              return itemList.some(item => compFilterMethod({
-                value: item.value,
-                option: item,
-                cellValue,
-                row,
-                column,
-                $table: $xeTable
-              }));
-            } else if (allFilterMethod) {
-              return allFilterMethod({
-                options: itemList,
-                values: valueList,
-                cellValue,
-                row,
-                column
-              });
-            } else if (tdFilterMethod) {
-              return itemList.some(item => tdFilterMethod({
-                value: item.value,
-                option: item,
-                cellValue,
-                row,
-                column,
-                $table: $xeTable
-              }));
-            }
-            return valueList.indexOf(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, column.field)) > -1;
-          });
-        };
-        if (treeConfig && transform) {
-          // 筛选虚拟树
-          tableTree = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().searchTree(tableFullTreeData, handleFilter, {
-            original: true,
-            isEvery,
-            children: mapChildrenField,
-            mapChildren: childrenField
+    const {
+      updateCheckboxFlag
+    } = reactData;
+    const {
+      tableFullData,
+      afterFullData,
+      tableFullTreeData,
+      fullDataRowIdData,
+      afterFullRowMaps,
+      selectCheckboxMaps
+    } = internalData;
+    const treeOpts = $xeTable.computeTreeOpts;
+    const checkboxOpts = $xeTable.computeCheckboxOpts;
+    const {
+      transform,
+      mapChildrenField
+    } = treeOpts;
+    const {
+      checkField
+    } = checkboxOpts;
+    const childrenField = treeOpts.children || treeOpts.childrenField;
+    let rowList = [];
+    if (updateCheckboxFlag) {
+      if (checkField) {
+        if (treeConfig) {
+          const currTableData = isFull ? transform ? tableFullTreeData : tableFullData : transform ? tableFullTreeData : afterFullData;
+          rowList = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().filterTree(currTableData, row => external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, checkField), {
+            children: transform ? mapChildrenField : childrenField
           });
-          tableData = tableTree;
         } else {
-          tableData = treeConfig ? tableFullTreeData.filter(handleFilter) : tableFullData.filter(handleFilter);
-          tableTree = tableData;
+          const currTableData = isFull ? tableFullData : afterFullData;
+          rowList = currTableData.filter(row => external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, checkField));
         }
       } else {
-        if (treeConfig && transform) {
-          // 还原虚拟树
-          tableTree = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().searchTree(tableFullTreeData, () => true, {
-            original: true,
-            isEvery,
-            children: mapChildrenField,
-            mapChildren: childrenField
-          });
-          tableData = tableTree;
-        } else {
-          tableData = treeConfig ? tableFullTreeData.slice(0) : tableFullData.slice(0);
-          tableTree = tableData;
-        }
-      }
-      // 处理排序（不能用于树形结构）
-      // 支持单列、多列、组合排序
-      if (!allRemoteSort && orderColumns.length) {
-        if (treeConfig && transform) {
-          // 虚拟树和列表一样，只能排序根级节点
-          if (allSortMethod) {
-            const sortRests = allSortMethod({
-              data: tableTree,
-              sortList: orderColumns,
-              $table: $xeTable
-            });
-            tableTree = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(sortRests) ? sortRests : tableTree;
-          } else {
-            const treeList = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toTreeArray(tableTree, {
-              children: mapChildrenField
-            });
-            tableTree = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toArrayTree(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().orderBy(treeList, orderColumns.map(({
-              column,
-              order
-            }) => [getOrderField($xeTable, column), order])), {
-              key: rowField,
-              parentKey: parentField,
-              children: childrenField,
-              mapChildren: mapChildrenField
-            });
-          }
-          tableData = tableTree;
-        } else {
-          if (allSortMethod) {
-            const sortRests = allSortMethod({
-              data: tableData,
-              sortList: orderColumns,
-              $table: $xeTable
-            });
-            tableData = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(sortRests) ? sortRests : tableData;
+        external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().each(selectCheckboxMaps, (row, rowid) => {
+          if (isFull) {
+            if (fullDataRowIdData[rowid]) {
+              rowList.push(fullDataRowIdData[rowid].row);
+            }
           } else {
-            // 兼容 v4
-            if (sortMultiple) {
-              tableData = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().orderBy(tableData, orderColumns.map(({
-                column,
-                order
-              }) => [getOrderField(this, column), order]));
-            } else {
-              const firstOrderColumn = orderColumns[0];
-              let sortByConfs;
-              // 已废弃，兼容 v2，在 v4 中废弃， sortBy 不能为数组
-              if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(firstOrderColumn.sortBy)) {
-                sortByConfs = firstOrderColumn.sortBy.map(item => [item, firstOrderColumn.order]);
-              }
-              tableData = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().orderBy(tableData, sortByConfs || [firstOrderColumn].map(({
-                column,
-                order
-              }) => [getOrderField(this, column), order]));
+            if (afterFullRowMaps[rowid]) {
+              rowList.push(afterFullRowMaps[rowid]);
             }
-            tableData = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().orderBy(tableData, orderColumns.map(({
-              column,
-              order
-            }) => [getOrderField($xeTable, column), order]));
           }
-          tableTree = tableData;
-        }
-      }
-    } else {
-      if (treeConfig && transform) {
-        // 还原虚拟树
-        tableTree = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().searchTree(tableFullTreeData, () => true, {
-          original: true,
-          isEvery,
-          children: treeOpts.mapChildrenField,
-          mapChildren: childrenField
         });
-        tableData = tableTree;
-      } else {
-        tableData = treeConfig ? tableFullTreeData.slice(0) : tableFullData.slice(0);
-        tableTree = tableData;
       }
     }
-    internalData.afterFullData = tableData;
-    internalData.afterTreeFullData = tableTree;
-    updateAfterDataIndex($xeTable);
+    return rowList;
   },
   /**
    * 预编译
@@ -10288,6 +10794,7 @@ const Methods = {
       const storeData = getCustomStorageMap(tableId);
       if (restoreStore) {
         return Promise.resolve(restoreStore({
+          $table: $xeTable,
           id: tableId,
           type: 'restore',
           storeData
@@ -10363,6 +10870,7 @@ const Methods = {
         resizableData[colKey] = column.renderWidth;
       }
       if (isCustomVisible && (!checkMethod || checkMethod({
+        $table: $xeTable,
         column
       }))) {
         if (!column.visible && column.defaultVisible) {
@@ -10423,6 +10931,7 @@ const Methods = {
       } : this.getCustomStoreData();
       if (updateStore) {
         return updateStore({
+          $table: $xeTable,
           id: tableId,
           type,
           storeData
@@ -11420,8 +11929,7 @@ const Methods = {
         const hasDeleteKey = keyCode === 46;
         const isF2 = keyCode === 113;
         const isContextMenu = keyCode === 93;
-        const hasMetaKey = evnt.metaKey;
-        const hasCtrlKey = evnt.ctrlKey;
+        const isControlKey = hasControlKey(evnt);
         const hasShiftKey = evnt.shiftKey;
         const hasAltKey = evnt.altKey;
         const operArrow = isLeftArrow || isUpArrow || isRightArrow || isDwArrow;
@@ -11487,7 +11995,7 @@ const Methods = {
             enterMethod
           } = keyboardOpts;
           // 退出选中
-          if (hasCtrlKey) {
+          if (isControlKey) {
             // 如果是激活编辑状态，则取消编辑
             if (actived.row) {
               const params = actived.args;
@@ -11663,7 +12171,7 @@ const Methods = {
             };
             $xeTable.setTreeExpand(parentRow, false).then(() => $xeTable.scrollToRow(parentRow)).then(() => $xeTable.triggerCurrentRowEvent(evnt, params));
           }
-        } else if (keyboardConfig && keyboardOpts.isEdit && !hasCtrlKey && !hasMetaKey && (isSpacebar || keyCode >= 48 && keyCode <= 57 || keyCode >= 65 && keyCode <= 90 || keyCode >= 96 && keyCode <= 111 || keyCode >= 186 && keyCode <= 192 || keyCode >= 219 && keyCode <= 222)) {
+        } else if (keyboardConfig && keyboardOpts.isEdit && !isControlKey && (isSpacebar || keyCode >= 48 && keyCode <= 57 || keyCode >= 65 && keyCode <= 90 || keyCode >= 96 && keyCode <= 111 || keyCode >= 186 && keyCode <= 192 || keyCode >= 219 && keyCode <= 222)) {
           const {
             editMethod
           } = keyboardOpts;
@@ -12113,9 +12621,13 @@ const Methods = {
     const {
       treeConfig
     } = props;
+    const {
+      isRowGroupStatus
+    } = reactData;
     const {
       selectCheckboxMaps
     } = internalData;
+    const rowGroupOpts = $xeTable.computeRowGroupOpts;
     const treeOpts = $xeTable.computeTreeOpts;
     const {
       transform,
@@ -12135,10 +12647,11 @@ const Methods = {
     const indeterminateField = checkboxOpts.indeterminateField || checkboxOpts.halfField;
     if (checkField) {
       // 树结构
-      if (treeConfig && !checkStrictly) {
+      if ((treeConfig || isRowGroupStatus) && !checkStrictly) {
         // 更新子节点状态
         external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(rows, row => {
           if (isForce || !checkMethod || checkMethod({
+            $table: $xeTable,
             row
           })) {
             external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().set(row, checkField, checked);
@@ -12156,6 +12669,7 @@ const Methods = {
       // 列表
       rows.forEach(row => {
         if (isForce || !checkMethod || checkMethod({
+          $table: $xeTable,
           row
         })) {
           external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().set(row, checkField, checked);
@@ -12166,32 +12680,58 @@ const Methods = {
       return;
     }
     // 树结构
-    if (treeConfig && !checkStrictly) {
-      // 更新子节点状态
-      external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(rows, row => {
-        const rowid = handleGetRowId(row);
-        if (isForce || !checkMethod || checkMethod({
-          row
-        })) {
-          if (checked) {
-            selectCheckboxMaps[rowid] = row;
-          } else {
-            if (selectCheckboxMaps[rowid]) {
-              delete selectCheckboxMaps[rowid];
+    if (!checkStrictly) {
+      if (isRowGroupStatus) {
+        // 更新行分组节点状态
+        external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(rows, row => {
+          const rowid = handleGetRowId(row);
+          if (isForce || !checkMethod || checkMethod({
+            $table: $xeTable,
+            row
+          })) {
+            if (checked) {
+              selectCheckboxMaps[rowid] = row;
+            } else {
+              if (selectCheckboxMaps[rowid]) {
+                delete selectCheckboxMaps[rowid];
+              }
             }
+            handleCheckboxReserveRow($xeTable, row, checked);
           }
-          handleCheckboxReserveRow($xeTable, row, checked);
-        }
-      }, {
-        children: transform ? mapChildrenField : childrenField
-      });
-      reactData.updateCheckboxFlag++;
-      return;
+        }, {
+          children: rowGroupOpts.mapChildrenField
+        });
+        reactData.updateCheckboxFlag++;
+        return;
+      } else if (treeConfig) {
+        // 更新子节点状态
+        external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(rows, row => {
+          const rowid = handleGetRowId(row);
+          if (isForce || !checkMethod || checkMethod({
+            $table: $xeTable,
+            row
+          })) {
+            if (checked) {
+              selectCheckboxMaps[rowid] = row;
+            } else {
+              if (selectCheckboxMaps[rowid]) {
+                delete selectCheckboxMaps[rowid];
+              }
+            }
+            handleCheckboxReserveRow($xeTable, row, checked);
+          }
+        }, {
+          children: transform ? mapChildrenField : childrenField
+        });
+        reactData.updateCheckboxFlag++;
+        return;
+      }
     }
     // 列表
     rows.forEach(row => {
       const rowid = handleGetRowId(row);
       if (isForce || !checkMethod || checkMethod({
+        $table: $xeTable,
         row
       })) {
         if (checked) {
@@ -12251,10 +12791,17 @@ const Methods = {
   triggerCheckRowEvent(evnt, params, checked) {
     const $xeTable = this;
     const props = $xeTable;
+    const reactData = $xeTable;
     const internalData = $xeTable;
+    const {
+      treeConfig
+    } = props;
     const {
       row
     } = params;
+    const {
+      isRowGroupStatus
+    } = reactData;
     const {
       afterFullData
     } = internalData;
@@ -12267,7 +12814,7 @@ const Methods = {
       return;
     }
     evnt.stopPropagation();
-    if (checkboxOpts.isShiftKey && evnt.shiftKey && !props.treeConfig) {
+    if (checkboxOpts.isShiftKey && evnt.shiftKey && !(treeConfig || isRowGroupStatus)) {
       const checkboxRecords = $xeTable.getCheckboxRecords();
       if (checkboxRecords.length) {
         const firstRow = checkboxRecords[0];
@@ -12287,6 +12834,7 @@ const Methods = {
       }
     }
     if (!checkMethod || checkMethod({
+      $table: $xeTable,
       row
     })) {
       $xeTable.handleBatchSelectRows([row], checked);
@@ -12334,14 +12882,16 @@ const Methods = {
       treeConfig
     } = props;
     const {
+      isRowGroupStatus
+    } = reactData;
+    const {
+      afterTreeFullData,
+      afterGroupFullData,
       selectCheckboxMaps,
       treeIndeterminateRowMaps
     } = internalData;
+    const rowGroupOpts = $xeTable.computeRowGroupOpts;
     const treeOpts = $xeTable.computeTreeOpts;
-    const {
-      transform,
-      mapChildrenField
-    } = treeOpts;
     const childrenField = treeOpts.children || treeOpts.childrenField;
     const checkboxOpts = $xeTable.computeCheckboxOpts;
     const {
@@ -12349,29 +12899,47 @@ const Methods = {
       checkStrictly,
       checkMethod
     } = checkboxOpts;
-    const {
-      afterTreeFullData
-    } = internalData;
     if (checkStrictly) {
       return;
     }
-    // 树结构
-    if (treeConfig) {
+    if (isRowGroupStatus || treeConfig) {
       const {
         handleGetRowId
       } = createHandleGetRowId($xeTable);
       const childRowMaps = {};
       const childRowList = [];
-      external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(afterTreeFullData, row => {
-        const rowid = handleGetRowId(row);
-        const childList = row[transform ? mapChildrenField : childrenField];
-        if (childList && childList.length && !childRowMaps[rowid]) {
-          childRowMaps[rowid] = 1;
-          childRowList.unshift([row, rowid, childList]);
+      if (isRowGroupStatus) {
+        // 行分组
+        const mapChildrenField = rowGroupOpts.mapChildrenField;
+        if (mapChildrenField) {
+          external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(afterGroupFullData, row => {
+            const rowid = handleGetRowId(row);
+            const childList = row[mapChildrenField];
+            if (childList && childList.length && !childRowMaps[rowid]) {
+              childRowMaps[rowid] = 1;
+              childRowList.unshift([row, rowid, childList]);
+            }
+          }, {
+            children: mapChildrenField
+          });
         }
-      }, {
-        children: transform ? mapChildrenField : childrenField
-      });
+      } else if (treeConfig) {
+        // 树结构
+        const {
+          transform,
+          mapChildrenField
+        } = treeOpts;
+        external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(afterTreeFullData, row => {
+          const rowid = handleGetRowId(row);
+          const childList = row[transform ? mapChildrenField : childrenField];
+          if (childList && childList.length && !childRowMaps[rowid]) {
+            childRowMaps[rowid] = 1;
+            childRowList.unshift([row, rowid, childList]);
+          }
+        }, {
+          children: transform ? mapChildrenField : childrenField
+        });
+      }
       childRowList.forEach(vals => {
         const row = vals[0];
         const rowid = vals[1];
@@ -12383,6 +12951,7 @@ const Methods = {
           const childRowid = handleGetRowId(item);
           const isSelect = checkField ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(item, checkField) : selectCheckboxMaps[childRowid];
           if (checkMethod({
+            $table: $xeTable,
             row: item
           })) {
             if (isSelect) {
@@ -12446,9 +13015,13 @@ const Methods = {
     const {
       treeConfig
     } = props;
+    const {
+      isRowGroupStatus
+    } = reactData;
     const {
       afterFullData,
       afterTreeFullData,
+      afterGroupFullData,
       checkboxReserveRowMap,
       selectCheckboxMaps,
       treeIndeterminateRowMaps
@@ -12465,11 +13038,12 @@ const Methods = {
     let sLen = 0; // 已选
     let hLen = 0; // 半选
     let vLen = 0; // 有效行
-    const rootList = treeConfig ? afterTreeFullData : afterFullData;
+    const rootList = treeConfig ? afterTreeFullData : isRowGroupStatus ? afterGroupFullData : afterFullData;
     rootList.forEach(checkMethod ? row => {
       const childRowid = handleGetRowId(row);
       const selected = checkField ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, checkField) : selectCheckboxMaps[childRowid];
       if (checkMethod({
+        $table: $xeTable,
         row
       })) {
         if (selected) {
@@ -13062,6 +13636,7 @@ const Methods = {
     const radioOpts = $xeTable.computeRadioOpts;
     const checkboxOpts = $xeTable.computeCheckboxOpts;
     const keyboardOpts = $xeTable.computeKeyboardOpts;
+    const rowGroupOpts = $xeTable.computeRowGroupOpts;
     const rowOpts = $xeTable.computeRowOpts;
     const columnOpts = $xeTable.computeColumnOpts;
     const currentColumnOpts = $xeTable.computeCurrentColumnOpts;
@@ -13075,7 +13650,8 @@ const Methods = {
     } = params;
     const {
       type,
-      treeNode
+      treeNode,
+      rowGroupNode
     } = column;
     const isRadioType = type === 'radio';
     const isCheckboxType = type === 'checkbox';
@@ -13083,8 +13659,9 @@ const Methods = {
     const cell = evnt.currentTarget;
     const triggerRadio = isRadioType && getEventTargetNode(evnt, cell, 'vxe-cell--radio').flag;
     const triggerCheckbox = isCheckboxType && getEventTargetNode(evnt, cell, 'vxe-cell--checkbox').flag;
-    const triggerTreeNode = treeNode && getEventTargetNode(evnt, cell, 'vxe-tree--btn-wrapper').flag;
+    const triggerTreeNode = treeNode && getEventTargetNode(evnt, cell, 'vxe-cell--tree-btn').flag;
     const triggerExpandNode = isExpandType && getEventTargetNode(evnt, cell, 'vxe-table--expanded').flag;
+    const triggerRowGroupNode = isExpandType && getEventTargetNode(evnt, cell, 'vxe-row-group--node-btn').flag;
     params = Object.assign({
       cell,
       triggerRadio,
@@ -13101,11 +13678,15 @@ const Methods = {
       if (treeOpts.trigger === 'row' || treeNode && treeOpts.trigger === 'cell') {
         $xeTable.triggerTreeExpandEvent(evnt, params);
       }
+      // 如果是行分组
+      if (rowGroupOpts.trigger === 'row' || rowGroupNode && rowGroupOpts.trigger === 'cell') {
+        $xeTable.triggerRowGroupExpandEvent(evnt, params);
+      }
     }
     // 如果点击了树节点
     if (!triggerTreeNode) {
-      if (!triggerExpandNode) {
-        // 如果是高亮行
+      if (!triggerExpandNode && !triggerRowGroupNode) {
+        // 如果是当前行
         if (rowOpts.isCurrent || highlightCurrentRow) {
           if (!triggerCheckbox && !triggerRadio) {
             $xeTable.triggerCurrentRowEvent(evnt, params);
@@ -13371,7 +13952,7 @@ const Methods = {
     const triggerInput = cell && cell.tagName && cell.tagName.toLowerCase() === 'input';
     const triggerRadio = isRadioType && getEventTargetNode(evnt, cell, 'vxe-cell--radio').flag;
     const triggerCheckbox = isCheckboxType && getEventTargetNode(evnt, cell, 'vxe-cell--checkbox').flag;
-    const triggerTreeNode = treeNode && getEventTargetNode(evnt, cell, 'vxe-tree--btn-wrapper').flag;
+    const triggerTreeNode = treeNode && getEventTargetNode(evnt, cell, 'vxe-cell--tree-btn').flag;
     const triggerExpandNode = isExpandType && getEventTargetNode(evnt, cell, 'vxe-table--expanded').flag;
     let isColDragCell = false;
     if (rowOpts.drag) {
@@ -13688,7 +14269,7 @@ const Methods = {
       evnt.preventDefault();
       return;
     }
-    const hasCtrlKey = evnt.ctrlKey;
+    const isControlKey = hasControlKey(evnt);
     const trEl = evnt.currentTarget;
     const rowid = trEl.getAttribute('rowid') || '';
     const rest = fullAllDataRowIdData[rowid];
@@ -13702,10 +14283,10 @@ const Methods = {
       } = reactData;
       const offsetY = evnt.clientY - trEl.getBoundingClientRect().y;
       const dragPos = offsetY < trEl.clientHeight / 2 ? 'top' : 'bottom';
-      internalData.prevDragToChild = !!(treeConfig && transform && isToChildDrag && hasCtrlKey);
+      internalData.prevDragToChild = !!(treeConfig && transform && isToChildDrag && isControlKey);
       internalData.prevDragRow = row;
       internalData.prevDragPos = dragPos;
-      if ($xeTable.eqRow(dragRow, row) || hasCtrlKey && treeConfig && lazy && row[hasChildField] && rowRest && !rowRest.treeLoaded || !isCrossDrag && treeConfig && transform && (isPeerDrag ? dragRow[parentField] !== row[parentField] : rest.level)) {
+      if ($xeTable.eqRow(dragRow, row) || isControlKey && treeConfig && lazy && row[hasChildField] && rowRest && !rowRest.treeLoaded || !isCrossDrag && treeConfig && transform && (isPeerDrag ? dragRow[parentField] !== row[parentField] : rest.level)) {
         showDropTip($xeTable, evnt, trEl, null, false, dragPos);
         return;
       }
@@ -14003,7 +14584,7 @@ const Methods = {
       evnt.preventDefault();
       return;
     }
-    const hasCtrlKey = evnt.ctrlKey;
+    const isControlKey = hasControlKey(evnt);
     const thEl = evnt.currentTarget;
     const colid = thEl.getAttribute('colid');
     const column = $xeTable.getColumnById(colid);
@@ -14014,7 +14595,7 @@ const Methods = {
       } = evnt;
       const offsetX = clientX - thEl.getBoundingClientRect().x;
       const dragPos = offsetX < thEl.clientWidth / 2 ? 'left' : 'right';
-      internalData.prevDragToChild = !!(isCrossDrag && isToChildDrag && hasCtrlKey);
+      internalData.prevDragToChild = !!(isCrossDrag && isToChildDrag && isControlKey);
       internalData.prevDragCol = column;
       internalData.prevDragPos = dragPos;
       if (column.fixed || dragCol && dragCol.id === column.id || !isCrossDrag && (isPeerDrag ? dragCol.parentId !== column.parentId : column.parentId)) {
@@ -14476,7 +15057,7 @@ const Methods = {
     const reactData = $xeTable;
     const internalData = $xeTable;
     const {
-      expandColumn: column
+      expandColumn
     } = reactData;
     const {
       rowExpandLazyLoadedMaps
@@ -14496,12 +15077,12 @@ const Methods = {
     const rowid = getRowid($xeTable, row);
     if (!lazy || !rowExpandLazyLoadedMaps[rowid]) {
       const expanded = !$xeTable.isRowExpandByRow(row);
-      const columnIndex = $xeTable.getColumnIndex(column);
-      const $columnIndex = $xeTable.getVMColumnIndex(column);
+      const columnIndex = expandColumn ? $xeTable.getColumnIndex(expandColumn) : -1;
+      const $columnIndex = expandColumn ? $xeTable.getVMColumnIndex(expandColumn) : -1;
       $xeTable.setRowExpand(row, expanded);
       $xeTable.dispatchEvent('toggle-row-expand', {
         expanded,
-        column,
+        column: expandColumn,
         columnIndex,
         $columnIndex,
         row,
@@ -14570,8 +15151,8 @@ const Methods = {
       toggleMethod
     } = expandOpts;
     const lazyRests = [];
-    const columnIndex = $xeTable.getColumnIndex(expandColumn);
-    const $columnIndex = $xeTable.getVMColumnIndex(expandColumn);
+    const columnIndex = expandColumn ? $xeTable.getColumnIndex(expandColumn) : -1;
+    const $columnIndex = expandColumn ? $xeTable.getVMColumnIndex(expandColumn) : -1;
     if (rows) {
       if (!external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(rows)) {
         rows = [rows];
@@ -14657,43 +15238,141 @@ const Methods = {
     const reactData = $xeTable;
     const internalData = $xeTable;
     const {
-      tableFullData
+      tableFullData
+    } = internalData;
+    const expandOpts = $xeTable.computeExpandOpts;
+    const {
+      reserve
+    } = expandOpts;
+    const expList = $xeTable.getRowExpandRecords();
+    internalData.rowExpandedMaps = {};
+    reactData.rowExpandedFlag++;
+    if (reserve) {
+      tableFullData.forEach(row => handleRowExpandReserve($xeTable, row, false));
+    }
+    return $xeTable.$nextTick().then(() => {
+      if (expList.length) {
+        return $xeTable.recalculate(true);
+      }
+    }).then(() => {
+      updateRowOffsetTop($xeTable);
+      updateRowExpandStyle($xeTable);
+      handleRowExpandScroll($xeTable);
+      return $xeTable.updateCellAreas();
+    });
+  },
+  clearRowExpandReserve() {
+    this.rowExpandedReserveRowMap = {};
+    return this.$nextTick();
+  },
+  getRowExpandRecords() {
+    const $xeTable = this;
+    const internalData = $xeTable;
+    const rest = [];
+    external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().each(internalData.rowExpandedMaps, item => {
+      if (item) {
+        rest.push(item);
+      }
+    });
+    return rest;
+  },
+  setRowGroups(fieldOrColumns) {
+    const $xeTable = this;
+    const props = $xeTable;
+    const internalData = $xeTable;
+    const {
+      rowGroupConfig
+    } = props;
+    if (!rowGroupConfig) {
+      errLog('vxe.error.reqProp', ['row-group-config']);
+      return $xeTable.$nextTick();
+    }
+    if (fieldOrColumns) {
+      handleUpdateRowGroup($xeTable, (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(fieldOrColumns) ? fieldOrColumns : [fieldOrColumns]).map(fieldOrColumn => {
+        return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isString(fieldOrColumn) ? fieldOrColumn : fieldOrColumn.field;
+      }));
+      return loadTableData($xeTable, internalData.tableSynchData, true);
+    }
+    return $xeTable.$nextTick();
+  },
+  clearRowGroups() {
+    const $xeTable = this;
+    const props = $xeTable;
+    const internalData = $xeTable;
+    const {
+      rowGroupConfig
+    } = props;
+    if (!rowGroupConfig) {
+      errLog('vxe.error.reqProp', ['row-group-config']);
+      return $xeTable.$nextTick();
+    }
+    handleUpdateRowGroup($xeTable, []);
+    return loadTableData($xeTable, internalData.tableSynchData, true);
+  },
+  isRowGroupRecord(row) {
+    const $xeTable = this;
+    const reactData = $xeTable;
+    const {
+      isRowGroupStatus
+    } = reactData;
+    return isRowGroupStatus && row.isAggregate;
+  },
+  isRowGroupExpandByRow(row) {
+    const $xeTable = this;
+    const reactData = $xeTable;
+    const internalData = $xeTable;
+    const {
+      rowGroupExpandedFlag
+    } = reactData;
+    const {
+      rowGroupExpandedMaps
+    } = internalData;
+    return !!rowGroupExpandedFlag && !!rowGroupExpandedMaps[getRowid($xeTable, row)];
+  },
+  setRowGroupExpand(rows, expanded) {
+    const $xeTable = this;
+    if (rows) {
+      if (!external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(rows)) {
+        rows = [rows];
+      }
+      return handleRowGroupVirtualExpand($xeTable, rows, expanded);
+    }
+    return $xeTable.$nextTick();
+  },
+  setAllRowGroupExpand(expanded) {
+    const $xeTable = this;
+    const reactData = $xeTable;
+    const internalData = $xeTable;
+    const {
+      tableFullGroupData
     } = internalData;
-    const expandOpts = $xeTable.computeExpandOpts;
+    const rowGroupOpts = $xeTable.computeRowGroupOpts;
     const {
-      reserve
-    } = expandOpts;
-    const expList = $xeTable.getRowExpandRecords();
-    internalData.rowExpandedMaps = {};
-    reactData.rowExpandedFlag++;
-    if (reserve) {
-      tableFullData.forEach(row => handleRowExpandReserve($xeTable, row, false));
+      mapChildrenField
+    } = rowGroupOpts;
+    const rgExpandedMaps = {};
+    if (expanded && mapChildrenField) {
+      external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(tableFullGroupData, row => {
+        if (row[mapChildrenField] && row[mapChildrenField].length) {
+          rgExpandedMaps[getRowid($xeTable, row)] = row;
+        }
+      }, {
+        children: mapChildrenField
+      });
     }
-    return $xeTable.$nextTick().then(() => {
-      if (expList.length) {
-        return $xeTable.recalculate(true);
-      }
-    }).then(() => {
-      updateRowOffsetTop($xeTable);
-      updateRowExpandStyle($xeTable);
-      handleRowExpandScroll($xeTable);
-      return $xeTable.updateCellAreas();
-    });
-  },
-  clearRowExpandReserve() {
-    this.rowExpandedReserveRowMap = {};
-    return this.$nextTick();
+    internalData.rowGroupExpandedMaps = rgExpandedMaps;
+    handleVirtualTreeToList($xeTable);
+    reactData.rowGroupExpandedFlag++;
+    return $xeTable.handleTableData();
   },
-  getRowExpandRecords() {
+  clearRowGroupExpand() {
     const $xeTable = this;
+    const reactData = $xeTable;
     const internalData = $xeTable;
-    const rest = [];
-    external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().each(internalData.rowExpandedMaps, item => {
-      if (item) {
-        rest.push(item);
-      }
-    });
-    return rest;
+    internalData.rowGroupExpandedMaps = {};
+    handleVirtualTreeToList($xeTable);
+    reactData.rowGroupExpandedFlag++;
+    return $xeTable.handleTableData();
   },
   getTreeExpandRecords() {
     const $xeTable = this;
@@ -14762,11 +15441,11 @@ const Methods = {
       });
     }
     internalData.treeExpandedMaps = {};
-    reactData.treeExpandedFlag++;
     if (transform) {
       handleVirtualTreeToList($xeTable);
-      return $xeTable.handleTableData();
+      $xeTable.handleTableData();
     }
+    reactData.treeExpandedFlag++;
     return $xeTable.$nextTick();
   },
   /**
@@ -14775,6 +15454,7 @@ const Methods = {
    */
   reloadTreeExpand(row) {
     const $xeTable = this;
+    const reactData = $xeTable;
     const internalData = $xeTable;
     const {
       treeExpandLazyLoadedMaps
@@ -14792,8 +15472,9 @@ const Methods = {
       }).then(() => {
         if (transform) {
           handleVirtualTreeToList($xeTable);
-          return $xeTable.handleTableData();
+          $xeTable.handleTableData();
         }
+        reactData.treeExpandedFlag++;
       }).then(() => {
         return $xeTable.recalculate();
       });
@@ -14808,6 +15489,40 @@ const Methods = {
     // 即将废弃
     return $xeTable.reloadTreeExpand(row);
   },
+  /**
+   * 行分组事件
+   */
+  triggerRowGroupExpandEvent(evnt, params) {
+    const $xeTable = this;
+    const internalData = $xeTable;
+    const {
+      rowGroupExpandedMaps
+    } = internalData;
+    const rowGroupOpts = $xeTable.computeRowGroupOpts;
+    const {
+      row,
+      column
+    } = params;
+    const {
+      trigger
+    } = rowGroupOpts;
+    if (trigger === 'manual') {
+      return;
+    }
+    evnt.stopPropagation();
+    const rowid = getRowid($xeTable, row);
+    const expanded = !rowGroupExpandedMaps[rowid];
+    const columnIndex = $xeTable.getColumnIndex(column);
+    const $columnIndex = $xeTable.getVMColumnIndex(column);
+    $xeTable.setRowGroupExpand(row, expanded);
+    $xeTable.dispatchEvent('toggle-row-group-expand', {
+      expanded,
+      column,
+      columnIndex,
+      $columnIndex,
+      row
+    }, evnt);
+  },
   /**
    * 展开树节点事件
    */
@@ -14868,11 +15583,15 @@ const Methods = {
    * @param {Boolean} expanded 是否展开
    */
   setAllTreeExpand(expanded) {
+    const $xeTable = this;
+    const reactData = $xeTable;
+    const internalData = $xeTable;
     const {
-      tableFullData,
-      treeOpts
-    } = this;
+      tableFullData
+    } = internalData;
+    const treeOpts = $xeTable.computeTreeOpts;
     const {
+      transform,
       lazy
     } = treeOpts;
     const childrenField = treeOpts.children || treeOpts.childrenField;
@@ -14885,7 +15604,13 @@ const Methods = {
     }, {
       children: childrenField
     });
-    return this.setTreeExpand(expandeds, expanded);
+    return $xeTable.setTreeExpand(expandeds, expanded).then(() => {
+      if (transform) {
+        handleVirtualTreeToList($xeTable);
+        reactData.treeExpandedFlag++;
+        return $xeTable.recalculate();
+      }
+    });
   },
   /**
    * 设置展开树形节点，二个参数设置这一行展开与否
@@ -14951,7 +15676,6 @@ const Methods = {
     } = treeOpts;
     const expList = $xeTable.getTreeExpandRecords();
     internalData.treeExpandedMaps = {};
-    reactData.treeExpandedFlag++;
     if (reserve) {
       external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(tableFullTreeData, row => handleTreeExpandReserve($xeTable, row, false), {
         children: childrenField
@@ -14960,8 +15684,9 @@ const Methods = {
     return $xeTable.handleTableData().then(() => {
       if (transform) {
         handleVirtualTreeToList($xeTable);
-        return $xeTable.handleTableData();
+        $xeTable.handleTableData();
       }
+      reactData.treeExpandedFlag++;
     }).then(() => {
       if (expList.length) {
         $xeTable.recalculate();
@@ -15853,27 +16578,37 @@ const Methods = {
    * @param {Row} row 行对象
    */
   scrollToTreeRow(row) {
+    const $xeTable = this;
+    const props = $xeTable;
+    const reactData = $xeTable;
+    const internalData = $xeTable;
     const {
-      tableFullData,
-      treeConfig,
-      treeOpts
-    } = this;
-    const childrenField = treeOpts.children || treeOpts.childrenField;
+      treeConfig
+    } = props;
+    const {
+      isRowGroupStatus
+    } = reactData;
+    const {
+      tableFullData
+    } = internalData;
     const rests = [];
-    if (treeConfig) {
-      const matchObj = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().findTree(tableFullData, item => item === row, {
-        children: childrenField
+    if (treeConfig || isRowGroupStatus) {
+      const rowGroupOpts = $xeTable.computeRowGroupOpts;
+      const treeOpts = $xeTable.computeTreeOpts;
+      const childrenField = treeOpts.children || treeOpts.childrenField;
+      const matchObj = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().findTree(tableFullData, item => $xeTable.eqRow(item, row), {
+        children: isRowGroupStatus ? rowGroupOpts.mapChildrenField : childrenField
       });
       if (matchObj) {
         const nodes = matchObj.nodes;
         nodes.forEach((row, index) => {
-          if (index < nodes.length - 1 && !this.isTreeExpandByRow(row)) {
-            rests.push(this.setTreeExpand(row, true));
+          if (index < nodes.length - 1 && !$xeTable.isTreeExpandByRow(row)) {
+            rests.push($xeTable.setTreeExpand(row, true));
           }
         });
       }
     }
-    return Promise.all(rests).then(() => rowToVisible(this, row));
+    return Promise.all(rests).then(() => rowToVisible($xeTable, row));
   },
   /**
    * 手动清除滚动相关信息，还原到初始状态
@@ -16203,8 +16938,7 @@ const isVMScrollProcess = $xeTable => {
   } = tableReactData;
   return !!(isDragResize || lastScrollTime && Date.now() < lastScrollTime + delayHover);
 };
-function renderLine(h, _vm, rowid, params, cellHeight) {
-  const $xeTable = _vm.$parent;
+function renderLine(h, $xeTable, rowid, params, cellHeight) {
   const tableProps = $xeTable;
   const tableInternalData = $xeTable;
   const {
@@ -16253,8 +16987,7 @@ function renderLine(h, _vm, rowid, params, cellHeight) {
 /**
  * 渲染列
  */
-function renderTdColumn(h, _vm, seq, rowid, fixedType, isOptimizeMode, rowLevel, row, rowIndex, $rowIndex, _rowIndex, column, $columnIndex, columns, items) {
-  const $xeTable = _vm.$parent;
+function renderTdColumn(h, $xeTable, seq, rowid, fixedType, isOptimizeMode, rowLevel, row, rowIndex, $rowIndex, _rowIndex, column, $columnIndex, columns, items) {
   const tableProps = $xeTable;
   const tableReactData = $xeTable;
   const tableInternalData = $xeTable;
@@ -16549,7 +17282,7 @@ function renderTdColumn(h, _vm, seq, rowid, fixedType, isOptimizeMode, rowLevel,
     }));
   } else {
     // 渲染单元格
-    tdVNs.push(...renderLine(h, _vm, rowid, cellParams, cellHeight), h('div', {
+    tdVNs.push(...renderLine(h, $xeTable, rowid, cellParams, cellHeight), h('div', {
       key: 'tc',
       class: ['vxe-cell', {
         'c--title': showTitle,
@@ -16648,6 +17381,7 @@ function renderRows(h, _vm, fixedType, isOptimizeMode, tableData, tableColumn) {
   const tableProps = $xeTable;
   const tableReactData = $xeTable;
   const tableInternalData = $xeTable;
+  const $xeGrid = $xeTable.$xeGrid;
   const {
     stripe,
     rowKey,
@@ -16669,10 +17403,12 @@ function renderRows(h, _vm, fixedType, isOptimizeMode, tableData, tableColumn) {
     selectRadioRow,
     pendingRowFlag,
     isDragColMove,
-    rowExpandHeightFlag
+    rowExpandHeightFlag,
+    isRowGroupStatus
   } = tableReactData;
   const {
     fullAllDataRowIdData,
+    fullColumnIdData,
     treeExpandedMaps,
     pendingRowMaps,
     rowExpandedMaps
@@ -16693,6 +17429,7 @@ function renderRows(h, _vm, fixedType, isOptimizeMode, tableData, tableColumn) {
   const {
     handleGetRowId
   } = createHandleGetRowId($xeTable);
+  const isDeepRow = treeConfig || isRowGroupStatus;
   tableData.forEach((row, $rowIndex) => {
     const trOn = {};
     const rowid = handleGetRowId(row);
@@ -16701,6 +17438,7 @@ function renderRows(h, _vm, fixedType, isOptimizeMode, tableData, tableColumn) {
     let rowLevel = 0;
     let seq = -1;
     let _rowIndex = -1;
+    const hasRowGroupAggregate = isRowGroupStatus && row.isAggregate;
     // 当前行事件
     if (rowOpts.isHover || highlightHoverRow) {
       trOn.mouseenter = evnt => {
@@ -16721,7 +17459,7 @@ function renderRows(h, _vm, fixedType, isOptimizeMode, tableData, tableColumn) {
     }
     if (rowRest) {
       rowLevel = rowRest.level;
-      if (treeConfig && transform && seqMode === 'increasing') {
+      if (hasRowGroupAggregate || treeConfig && transform && seqMode === 'increasing') {
         seq = rowRest._index + 1;
       } else {
         seq = rowRest.seq;
@@ -16756,12 +17494,12 @@ function renderRows(h, _vm, fixedType, isOptimizeMode, tableData, tableColumn) {
       isExpandTree = !!treeExpandedFlag && rowChildren && rowChildren.length > 0 && !!treeExpandedMaps[rowid];
     }
     // 拖拽行事件
-    if (rowOpts.drag && (!treeConfig || transform)) {
+    if (rowOpts.drag && !isRowGroupStatus && (!treeConfig || transform)) {
       trOn.dragstart = $xeTable.handleRowDragDragstartEvent;
       trOn.dragend = $xeTable.handleRowDragDragendEvent;
       trOn.dragover = $xeTable.handleRowDragDragoverEvent;
     }
-    const trClass = ['vxe-body--row', treeConfig ? `row--level-${rowLevel}` : '', {
+    const trClass = ['vxe-body--row', isDeepRow ? `row--level-${rowLevel}` : '', {
       'row--stripe': stripe && (_rowIndex + 1) % 2 === 0,
       'is--new': isNewRow,
       'is--expand-row': isExpandRow,
@@ -16769,10 +17507,11 @@ function renderRows(h, _vm, fixedType, isOptimizeMode, tableData, tableColumn) {
       'row--new': isNewRow && (editOpts.showStatus || editOpts.showInsertStatus),
       'row--radio': radioOpts.highlight && selectRadioRow === row,
       'row--checked': checkboxOpts.highlight && $xeTable.isCheckedByCheckboxRow(row),
-      'row--pending': !!pendingRowFlag && !!pendingRowMaps[rowid]
+      'row--pending': !!pendingRowFlag && !!pendingRowMaps[rowid],
+      'row--group': hasRowGroupAggregate
     }, rowClassName ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(rowClassName) ? rowClassName(params) : rowClassName : ''];
     const tdVNs = tableColumn.map((column, $columnIndex) => {
-      return renderTdColumn(h, _vm, seq, rowid, fixedType, isOptimizeMode, rowLevel, row, rowIndex, $rowIndex, _rowIndex, column, $columnIndex, tableColumn, tableData);
+      return renderTdColumn(h, $xeTable, seq, rowid, fixedType, isOptimizeMode, rowLevel, row, rowIndex, $rowIndex, _rowIndex, column, $columnIndex, tableColumn, tableData);
     });
     rows.push(!isColLoading && columnOpts.drag && columnDragOpts.animation ? h('transition-group', {
       props: {
@@ -16784,7 +17523,7 @@ function renderRows(h, _vm, fixedType, isOptimizeMode, tableData, tableColumn) {
         rowid
       },
       style: rowStyle ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(rowStyle) ? rowStyle(params) : rowStyle : undefined,
-      key: rowKey || scrollXLoad || scrollYLoad || rowOpts.useKey || rowOpts.drag || columnOpts.drag || treeConfig ? rowid : $rowIndex,
+      key: rowKey || scrollXLoad || scrollYLoad || rowOpts.useKey || rowOpts.drag || columnOpts.drag || isRowGroupStatus || treeConfig ? rowid : $rowIndex,
       nativeOn: trOn
     }, tdVNs) : h('tr', {
       class: trClass,
@@ -16792,7 +17531,7 @@ function renderRows(h, _vm, fixedType, isOptimizeMode, tableData, tableColumn) {
         rowid
       },
       style: rowStyle ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(rowStyle) ? rowStyle(params) : rowStyle : undefined,
-      key: rowKey || scrollXLoad || scrollYLoad || rowOpts.useKey || rowOpts.drag || columnOpts.drag || treeConfig ? rowid : $rowIndex,
+      key: rowKey || scrollXLoad || scrollYLoad || rowOpts.useKey || rowOpts.drag || columnOpts.drag || isRowGroupStatus || treeConfig ? rowid : $rowIndex,
       on: trOn
     }, tdVNs));
     // 如果行被展开了
@@ -16829,19 +17568,39 @@ function renderRows(h, _vm, fixedType, isOptimizeMode, tableData, tableColumn) {
         }
         const {
           showOverflow
-        } = expandColumn;
+        } = expandColumn || {};
+        const colid = expandColumn.id;
+        const colRest = fullColumnIdData[colid] || {};
         const hasEllipsis = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isUndefined(showOverflow) || external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isNull(showOverflow) ? isAllOverflow : showOverflow;
+        let columnIndex = -1;
+        let $columnIndex = -1;
+        let _columnIndex = -1;
+        if (colRest) {
+          columnIndex = colRest.index;
+          $columnIndex = colRest.$index;
+          _columnIndex = colRest._index;
+        }
         const expandParams = {
+          $grid: $xeGrid,
           $table: $xeTable,
           seq,
           column: expandColumn,
+          columnIndex,
+          $columnIndex,
+          _columnIndex,
           fixed: fixedType,
           type: renderType,
           level: rowLevel,
           row,
+          rowid,
           rowIndex,
           $rowIndex,
-          _rowIndex
+          _rowIndex,
+          isHidden: false,
+          isEdit: false,
+          visibleData: [],
+          data: [],
+          items: []
         };
         rows.push(h('tr', {
           class: ['vxe-body--expanded-row', {
@@ -18249,19 +19008,21 @@ const {
   syncResize: [Boolean, String, Number],
   // 响应式布局配置项
   resizeConfig: Object,
-  // 列配置信息
+  // 列配置项
   columnConfig: Object,
-  // 当前列配置信息
+  // 当前列配置项
   currentColumnConfig: Object,
-  // 单元格配置信息
+  // 单元格配置项
   cellConfig: Object,
-  // 表头单元格配置信息
+  // 表头单元格配置项
   headerCellConfig: Object,
-  // 表尾单元格配置信息
+  // 表尾单元格配置项
   footerCellConfig: Object,
-  // 行配置信息
+  // 行配置项
   rowConfig: Object,
-  // 当前行配置信息
+  // 行分组配置项
+  rowGroupConfig: Object,
+  // 当前行配置项
   currentRowConfig: Object,
   // 已废弃，被 rowDragConfig 替换
   dragConfig: Object,
@@ -18482,6 +19243,7 @@ const renderSimplePanel = (h, _vm) => {
   };
   external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(customColumnList, (column, index, items, path, parent) => {
     const isVisible = visibleMethod ? visibleMethod({
+      $table: $xeTable,
       column
     }) : true;
     if (isVisible) {
@@ -18490,6 +19252,7 @@ const renderSimplePanel = (h, _vm) => {
       const isColGroup = column.children && column.children.length;
       const colTitle = formatText(column.getTitle(), 1);
       const isDisabled = checkMethod ? !checkMethod({
+        $table: $xeTable,
         column
       }) : false;
       const isHidden = !isChecked;
@@ -18743,6 +19506,7 @@ const renderPopupPanel = (h, _vm) => {
   };
   external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(customColumnList, (column, index, items, path, parent) => {
     const isVisible = visibleMethod ? visibleMethod({
+      $table: $xeTable,
       column
     }) : true;
     if (isVisible) {
@@ -18769,6 +19533,7 @@ const renderPopupPanel = (h, _vm) => {
       const colTitle = formatText(column.getTitle(), 1);
       const isColGroup = column.children && column.children.length;
       const isDisabled = checkMethod ? !checkMethod({
+        $table: $xeTable,
         column
       }) : false;
       const isHidden = !isChecked;
@@ -19500,7 +20265,7 @@ const renderPopupPanel = (h, _vm) => {
         isToChildDrag
       } = columnDragOpts;
       const optEl = evnt.currentTarget;
-      const hasCtrlKey = evnt.ctrlKey;
+      const isControlKey = hasControlKey(evnt);
       const colid = optEl.getAttribute('colid');
       const column = $xeTable.getColumnById(colid);
       // 是否移入有效列
@@ -19512,7 +20277,7 @@ const renderPopupPanel = (h, _vm) => {
           panel_showDropTip(this, evnt, optEl, false, dragPos);
           return;
         }
-        this.prevDragToChild = !!(isCrossDrag && isToChildDrag && hasCtrlKey && immediate);
+        this.prevDragToChild = !!(isCrossDrag && isToChildDrag && isControlKey && immediate);
         this.prevDragCol = column;
         this.prevDragPos = dragPos;
         panel_showDropTip(this, evnt, optEl, true, dragPos);
@@ -22694,6 +23459,7 @@ function getSeq($xeTable, cellValue, row, $rowIndex, column, $columnIndex) {
   const seqMethod = seqOpts.seqMethod || column.seqMethod;
   if (seqMethod) {
     return seqMethod({
+      $table: $xeTable,
       row,
       rowIndex: $xeTable.getRowIndex(row),
       $rowIndex,
@@ -22786,6 +23552,7 @@ function getBodyLabelData($xeTable, opts, columns, datas) {
                 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;
@@ -22793,6 +23560,7 @@ function getBodyLabelData($xeTable, opts, columns, datas) {
                 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;
@@ -22856,6 +23624,7 @@ function getBodyLabelData($xeTable, opts, columns, datas) {
             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;
@@ -22863,6 +23632,7 @@ function getBodyLabelData($xeTable, opts, columns, datas) {
             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;
@@ -22896,6 +23666,7 @@ function getExportData($xeTable, opts) {
   let datas = opts.data;
   if (dataFilterMethod) {
     datas = datas.filter((row, index) => dataFilterMethod({
+      $table: $xeTable,
       row,
       $rowIndex: index
     }));
@@ -22945,11 +23716,12 @@ function getFooterCellValue($xeTable, opts, row, column) {
   }
   return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, column.field);
 }
-function getFooterData(opts, footerTableData) {
+function getFooterData($xeTable, opts, footerTableData) {
   const {
     footerFilterMethod
   } = opts;
   return footerFilterMethod ? footerTableData.filter((items, index) => footerFilterMethod({
+    $table: $xeTable,
     items,
     $rowIndex: index
   })) : footerTableData;
@@ -22995,7 +23767,7 @@ function toCsv($xeTable, opts, columns, datas) {
     const {
       footerTableData
     } = reactData;
-    const footers = getFooterData(opts, footerTableData);
+    const footers = getFooterData($xeTable, opts, footerTableData);
     footers.forEach(row => {
       content += columns.map(column => toTxtCellLabel(getFooterCellValue($xeTable, opts, row, column))).join(',') + enterSymbol;
     });
@@ -23015,7 +23787,7 @@ function toTxt($xeTable, opts, columns, datas) {
     const {
       footerTableData
     } = reactData;
-    const footers = getFooterData(opts, footerTableData);
+    const footers = getFooterData($xeTable, opts, footerTableData);
     footers.forEach(row => {
       content += columns.map(column => toTxtCellLabel(getFooterCellValue($xeTable, opts, row, column))).join('\t') + enterSymbol;
     });
@@ -23197,7 +23969,7 @@ function toHtml($xeTable, opts, columns, datas) {
     const {
       footerTableData
     } = reactData;
-    const footers = getFooterData(opts, footerTableData);
+    const footers = getFooterData($xeTable, opts, footerTableData);
     if (footers.length) {
       tables.push('<tfoot>');
       footers.forEach(row => {
@@ -23232,7 +24004,7 @@ function toXML($xeTable, opts, columns, datas) {
     const {
       footerTableData
     } = reactData;
-    const footers = getFooterData(opts, footerTableData);
+    const footers = getFooterData($xeTable, opts, footerTableData);
     footers.forEach(row => {
       xml += `<Row>${columns.map(column => `<Cell><Data ss:Type="String">${getFooterCellValue($xeTable, opts, row, column)}</Data></Cell>`).join('')}</Row>`;
     });
@@ -23932,6 +24704,7 @@ function handleExportAndPrint($xeTable, options, isPrint) {
     column.checked = isChecked;
     column.halfChecked = false;
     column.disabled = parent && parent.disabled || (checkMethod ? !checkMethod({
+      $table: $xeTable,
       column
     }) : false);
   });
@@ -25061,8 +25834,9 @@ function handleMoveSelected($xeTable, evnt, args, isLeftArrow, isUpArrow, isRigh
           const rangeRows = getCheckboxRangeRows(this, evnt, params, trElem, trRect, offsetClientTop, offsetTop < marginSize ? -rangeHeight : rangeHeight);
           // 至少滑动 10px 才能有效匹配
           if (rangeHeight > 10 && rangeRows.length !== lastRangeRows.length) {
+            const isControlKey = hasControlKey(evnt);
             lastRangeRows = rangeRows;
-            if (evnt.ctrlKey) {
+            if (isControlKey) {
               rangeRows.forEach(row => {
                 $xeTable.handleBatchSelectRows([row], selectRecords.indexOf(row) === -1);
               });
@@ -25779,6 +26553,26 @@ function validErrorRuleValue(rule, val) {
 });
 ;// CONCATENATED MODULE: ./packages/table/module/custom/mixin.ts
 
+function calcMaxHeight($xeTable) {
+  const reactData = $xeTable;
+  const {
+    customStore
+  } = reactData;
+  const el = $xeTable.$refs.refElem;
+  // 判断面板不能大于表格高度
+  let tableHeight = 0;
+  if (el) {
+    tableHeight = el.clientHeight - 28;
+  }
+  customStore.maxHeight = Math.max(88, tableHeight);
+}
+function emitCustomEvent($xeTable, type, evnt) {
+  const $xeGrid = $xeTable.$xeGrid;
+  const comp = $xeGrid || $xeTable;
+  comp.dispatchEvent('custom', {
+    type
+  }, evnt);
+}
 /* harmony default export */ var custom_mixin = ({
   methods: {
     _openCustom() {
@@ -25792,21 +26586,23 @@ function validErrorRuleValue(rule, val) {
       initStore.custom = true;
       $xeTable.handleUpdateCustomColumn();
       $xeTable.checkCustomStatus();
-      $xeTable.calcMaxHeight();
-      return this.$nextTick().then(() => this.calcMaxHeight());
+      calcMaxHeight($xeTable);
+      return $xeTable.$nextTick().then(() => calcMaxHeight($xeTable));
     },
     _closeCustom() {
+      const $xeTable = this;
+      const reactData = $xeTable;
       const {
-        customStore,
-        customOpts
-      } = this;
+        customStore
+      } = reactData;
+      const customOpts = $xeTable.computeCustomOpts;
       if (customStore.visible) {
         customStore.visible = false;
         if (!customOpts.immediate) {
-          this.handleCustom();
+          $xeTable.handleCustom();
         }
       }
-      return this.$nextTick();
+      return $xeTable.$nextTick();
     },
     _saveCustom() {
       const $xeTable = this;
@@ -25855,16 +26651,17 @@ function validErrorRuleValue(rule, val) {
     },
     _cancelCustom() {
       const $xeTable = this;
+      const reactData = $xeTable;
       const {
-        customStore,
-        customOpts,
-        customColumnList
-      } = $xeTable;
+        customColumnList,
+        customStore
+      } = reactData;
       const {
         oldSortMaps,
         oldFixedMaps,
         oldVisibleMaps
       } = customStore;
+      const customOpts = $xeTable.computeCustomOpts;
       const {
         allowVisible,
         allowSort,
@@ -25899,9 +26696,9 @@ function validErrorRuleValue(rule, val) {
       const reactData = $xeTable;
       const internalData = $xeTable;
       const {
-        collectColumn,
-        customOpts
+        collectColumn
       } = internalData;
+      const customOpts = $xeTable.computeCustomOpts;
       const {
         checkMethod
       } = customOpts;
@@ -25922,6 +26719,7 @@ function validErrorRuleValue(rule, val) {
           column.renderSortNumber = column.sortNumber;
         }
         if (!checkMethod || checkMethod({
+          $table: $xeTable,
           column
         })) {
           column.visible = column.defaultVisible;
@@ -25944,11 +26742,11 @@ function validErrorRuleValue(rule, val) {
       const reactData = $xeTable;
       const {
         customStore
-      } = this;
+      } = reactData;
       const {
-        customColumnList,
-        customOpts
-      } = this;
+        customColumnList
+      } = reactData;
+      const customOpts = $xeTable.computeCustomOpts;
       const {
         checkMethod,
         visibleMethod
@@ -25957,11 +26755,13 @@ function validErrorRuleValue(rule, val) {
       if (customOpts.immediate) {
         external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(customColumnList, column => {
           if (visibleMethod && !visibleMethod({
+            $table: $xeTable,
             column
           })) {
             return;
           }
           if (checkMethod && !checkMethod({
+            $table: $xeTable,
             column
           })) {
             return;
@@ -25977,11 +26777,13 @@ function validErrorRuleValue(rule, val) {
       } else {
         external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(customColumnList, column => {
           if (visibleMethod && !visibleMethod({
+            $table: $xeTable,
             column
           })) {
             return;
           }
           if (checkMethod && !checkMethod({
+            $table: $xeTable,
             column
           })) {
             return;
@@ -25993,31 +26795,26 @@ function validErrorRuleValue(rule, val) {
       }
       $xeTable.checkCustomStatus();
     },
-    calcMaxHeight() {
+    checkCustomStatus() {
+      const $xeTable = this;
+      const reactData = $xeTable;
+      const internalData = $xeTable;
       const {
-        $el,
         customStore
-      } = this;
-      // 判断面板不能大于表格高度
-      let tableHeight = 0;
-      if ($el) {
-        tableHeight = $el.clientHeight - 28;
-      }
-      customStore.maxHeight = Math.max(88, tableHeight);
-    },
-    checkCustomStatus() {
+      } = reactData;
       const {
-        customStore,
-        collectColumn,
-        customOpts
-      } = this;
+        collectColumn
+      } = internalData;
+      const customOpts = $xeTable.computeCustomOpts;
       const {
         checkMethod
       } = customOpts;
       customStore.isAll = collectColumn.every(column => (checkMethod ? !checkMethod({
+        $table: $xeTable,
         column
       }) : false) || column.renderVisible);
       customStore.isIndeterminate = !customStore.isAll && collectColumn.some(column => (!checkMethod || checkMethod({
+        $table: $xeTable,
         column
       })) && (column.renderVisible || column.halfVisible));
     },
@@ -26025,45 +26822,48 @@ function validErrorRuleValue(rule, val) {
       const $xeTable = this;
       const $xeGrid = $xeTable.$xeGrid;
       const comp = $xeGrid || $xeTable;
-      comp.$emit('custom', {
-        type,
-        $table: $xeTable,
-        $grid: $xeGrid,
-        $event: evnt
-      });
+      comp.dispatchEvent('custom', {
+        type
+      }, evnt);
     },
     triggerCustomEvent(evnt) {
+      const $xeTable = this;
+      const reactData = $xeTable;
       const {
         customStore
-      } = this;
+      } = reactData;
       if (customStore.visible) {
         this.closeCustom();
-        this.emitCustomEvent('close', evnt);
+        emitCustomEvent($xeTable, 'close', evnt);
       } else {
         customStore.btnEl = evnt.target;
         this.openCustom();
-        this.emitCustomEvent('open', evnt);
+        emitCustomEvent($xeTable, 'open', evnt);
       }
     },
     customOpenEvent(evnt) {
+      const $xeTable = this;
+      const reactData = $xeTable;
       const {
         customStore
-      } = this;
-      if (!customStore.visible) {
+      } = reactData;
+      if (customStore.visible) {
         customStore.activeBtn = true;
         customStore.btnEl = evnt.target;
-        this.openCustom();
-        this.emitCustomEvent('open', evnt);
+        $xeTable.openCustom();
+        emitCustomEvent($xeTable, 'open', evnt);
       }
     },
     customCloseEvent(evnt) {
+      const $xeTable = this;
+      const reactData = $xeTable;
       const {
         customStore
-      } = this;
+      } = reactData;
       if (customStore.visible) {
         customStore.activeBtn = false;
-        this.closeCustom();
-        this.emitCustomEvent('close', evnt);
+        $xeTable.closeCustom();
+        emitCustomEvent($xeTable, 'close', evnt);
       }
     },
     handleUpdateCustomColumn() {
@@ -26289,11 +27089,13 @@ function renderRowExpandedVNs(h, $xeTable) {
   const props = $xeTable;
   const reactData = $xeTable;
   const internalData = $xeTable;
+  const $xeGrid = $xeTable.$xeGrid;
   const {
     treeConfig
   } = props;
   const {
-    expandColumn
+    expandColumn,
+    isRowGroupStatus
   } = reactData;
   const tableRowExpandedList = $xeTable.computeTableRowExpandedList;
   const expandOpts = $xeTable.computeExpandOpts;
@@ -26315,10 +27117,12 @@ function renderRowExpandedVNs(h, $xeTable) {
       const expandOpts = $xeTable.computeExpandOpts;
       const {
         height: expandHeight,
-        padding
+        padding,
+        indent
       } = expandOpts;
       const {
-        fullAllDataRowIdData
+        fullAllDataRowIdData,
+        fullColumnIdData
       } = internalData;
       const treeOpts = $xeTable.computeTreeOpts;
       const {
@@ -26328,6 +27132,8 @@ function renderRowExpandedVNs(h, $xeTable) {
       const cellStyle = {};
       const rowid = handleGetRowId(row);
       const rowRest = fullAllDataRowIdData[rowid];
+      const colid = expandColumn.id;
+      const colRest = fullColumnIdData[colid] || {};
       let rowLevel = 0;
       let seq = -1;
       let _rowIndex = -1;
@@ -26335,7 +27141,7 @@ function renderRowExpandedVNs(h, $xeTable) {
       let $rowIndex = -1;
       if (rowRest) {
         rowLevel = rowRest.level;
-        if (treeConfig && transform && seqMode === 'increasing') {
+        if (isRowGroupStatus || treeConfig && transform && seqMode === 'increasing') {
           seq = rowRest._index + 1;
         } else {
           seq = rowRest.seq;
@@ -26347,20 +27153,38 @@ function renderRowExpandedVNs(h, $xeTable) {
       if (expandHeight) {
         cellStyle.height = `${expandHeight}px`;
       }
-      if (treeConfig) {
-        cellStyle.paddingLeft = `${rowLevel * treeOpts.indent + 30}px`;
+      if (isRowGroupStatus || treeConfig) {
+        cellStyle.paddingLeft = `${rowLevel * (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isNumber(indent) ? indent : treeOpts.indent) + 30}px`;
+      }
+      let columnIndex = -1;
+      let $columnIndex = -1;
+      let _columnIndex = -1;
+      if (colRest) {
+        columnIndex = colRest.index;
+        $columnIndex = colRest.$index;
+        _columnIndex = colRest._index;
       }
       const expandParams = {
+        $grid: $xeGrid,
         $table: $xeTable,
         seq,
         column: expandColumn,
+        columnIndex,
+        $columnIndex,
+        _columnIndex,
         fixed: '',
         type: 'body',
         level: rowLevel,
+        rowid,
         row,
         rowIndex,
         $rowIndex,
-        _rowIndex
+        _rowIndex,
+        isHidden: false,
+        isEdit: false,
+        visibleData: [],
+        data: [],
+        items: []
       };
       expandVNs.push(h('div', {
         key: rowid,
@@ -26556,6 +27380,8 @@ function renderBody(h, $xeTable) {
       selectRadioRow: null,
       // 表尾合计数据
       footerTableData: [],
+      // 行分组列信息
+      rowGroupColumn: null,
       // 展开列信息
       expandColumn: null,
       hasFixedColumn: false,
@@ -26706,6 +27532,9 @@ function renderBody(h, $xeTable) {
         isTitle: false,
         isFooter: false
       },
+      visiblwRowsFlag: 1,
+      isRowGroupStatus: false,
+      rowGroupExpandedFlag: 1,
       rowExpandedFlag: 1,
       treeExpandedFlag: 1,
       updateCheckboxFlag: 1,
@@ -26894,28 +27723,41 @@ function renderBody(h, $xeTable) {
       const props = $xeTable;
       return Object.assign({}, table_getConfig().table.rowConfig, props.rowConfig);
     },
+    computeRowGroupOpts() {
+      const $xeTable = this;
+      const props = $xeTable;
+      return Object.assign({}, table_getConfig().table.rowGroupConfig, props.rowGroupConfig);
+    },
     computeCurrentRowOpts() {
       const $xeTable = this;
       const props = $xeTable;
       return Object.assign({}, table_getConfig().table.currentRowConfig, props.currentRowConfig);
     },
     computeRowDragOpts() {
-      return Object.assign({}, table_getConfig().table.rowDragConfig, this.rowDragConfig);
+      const $xeTable = this;
+      const props = $xeTable;
+      return Object.assign({}, table_getConfig().table.rowDragConfig, props.rowDragConfig);
     },
     computeColumnDragOpts() {
-      return Object.assign({}, table_getConfig().table.columnDragConfig, this.columnDragConfig);
+      const $xeTable = this;
+      const props = $xeTable;
+      return Object.assign({}, table_getConfig().table.columnDragConfig, props.columnDragConfig);
     },
     resizeOpts() {
       return this.computeResizeOpts;
     },
     computeResizeOpts() {
-      return Object.assign({}, table_getConfig().table.resizeConfig, this.resizeConfig);
+      const $xeTable = this;
+      const props = $xeTable;
+      return Object.assign({}, table_getConfig().table.resizeConfig, props.resizeConfig);
     },
     resizableOpts() {
       return this.computeResizableOpts;
     },
     computeResizableOpts() {
-      return Object.assign({}, table_getConfig().table.resizableConfig, this.resizableConfig);
+      const $xeTable = this;
+      const props = $xeTable;
+      return Object.assign({}, table_getConfig().table.resizableConfig, props.resizableConfig);
     },
     seqOpts() {
       return this.computeSeqOpts;
@@ -27180,7 +28022,10 @@ function renderBody(h, $xeTable) {
       } = props;
       const {
         rowExpandedFlag,
-        expandColumn
+        expandColumn,
+        rowGroupExpandedFlag,
+        treeExpandedFlag,
+        isRowGroupStatus
       } = reactData;
       const {
         visibleDataRowIdData,
@@ -27191,15 +28036,16 @@ function renderBody(h, $xeTable) {
         transform
       } = treeOpts;
       const expandList = [];
-      if (expandColumn && rowExpandedFlag) {
-        if (treeConfig && !transform) {
+      if (expandColumn && rowExpandedFlag && rowGroupExpandedFlag && treeExpandedFlag) {
+        if (isRowGroupStatus || treeConfig && transform) {
+          external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().each(rowExpandedMaps, (row, rowid) => {
+            if (visibleDataRowIdData[rowid]) {
+              expandList.push(row);
+            }
+          });
+        } else {
           return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().values(rowExpandedMaps);
         }
-        external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().each(rowExpandedMaps, (row, rowid) => {
-          if (visibleDataRowIdData[rowid]) {
-            expandList.push(row);
-          }
-        });
       }
       return expandList;
     },
@@ -27306,6 +28152,11 @@ function renderBody(h, $xeTable) {
         y: overflowY && scrollYLoad
       };
     },
+    computeRowGroupFields() {
+      const $xeTable = this;
+      const rowGroupOpts = $xeTable.computeRowGroupOpts;
+      return rowGroupOpts.groupFields;
+    },
     tabsResizeFlag() {
       const $xeTable = this;
       const $xeTabs = $xeTable.$xeTabs;
@@ -27425,6 +28276,10 @@ function renderBody(h, $xeTable) {
     mergeFooterItems(value) {
       this.clearMergeFooterItems();
       this.$nextTick(() => this.setMergeFooterItems(value));
+    },
+    computeRowGroupFields(val) {
+      const $xeTable = this;
+      $xeTable.handleUpdateRowGroup(val);
     }
   },
   created() {
@@ -27480,8 +28335,16 @@ function renderBody(h, $xeTable) {
       // 列表完整数据、条件处理后
       tableFullData: [],
       afterFullData: [],
+      afterTreeFullData: [],
+      afterGroupFullData: [],
       // 列表条件处理后数据集合
       afterFullRowMaps: {},
+      // 树结构完整数据、条件处理后
+      tableFullTreeData: [],
+      // 行分组全量数据、条件处理后
+      tableFullGroupData: [],
+      tableSynchData: [],
+      tableSourceData: [],
       // 收集的列配置（带分组）
       collectColumn: [],
       // 完整所有列（不带分组）
@@ -27512,6 +28375,8 @@ function renderBody(h, $xeTable) {
       rowExpandedMaps: {},
       // 懒加载中的展开行的集合
       rowExpandLazyLoadedMaps: {},
+      // 已展开的分组行
+      rowGroupExpandedMaps: {},
       // 已展开树节点集合
       treeExpandedMaps: {},
       // 懒加载中的树节点的集合
@@ -27554,9 +28419,11 @@ function renderBody(h, $xeTable) {
     const importOpts = $xeTable.computeImportOpts;
     const currentRowOpts = $xeTable.computeCurrentRowOpts;
     const currentColumnOpts = $xeTable.computeCurrentColumnOpts;
-    const virtualXOpts = $xeTable.computeVirtualXOpts;
-    const virtualYOpts = $xeTable.computeVirtualYOpts;
     const keyboardOpts = $xeTable.computeKeyboardOpts;
+    const rowGroupOpts = $xeTable.computeRowGroupOpts;
+    const {
+      groupFields
+    } = rowGroupOpts;
     if (props.rowId) {
       warnLog('vxe.error.delProp', ['row-id', 'row-config.keyField']);
     }
@@ -27712,19 +28579,19 @@ function renderBody(h, $xeTable) {
       warnLog('vxe.error.notConflictProp', ['column-config.isCurrent', 'current-column-config.isFollowSelected']);
     }
     // 如果不支持虚拟滚动
-    if (props.spanMethod) {
-      if (virtualXOpts.enabled) {
-        warnLog('vxe.error.notConflictProp', ['span-method', 'virtual-x-config.enabled=false']);
-      }
-      if (virtualYOpts.enabled) {
-        warnLog('vxe.error.notConflictProp', ['span-method', 'virtual-y-config.enabled=false']);
-      }
-    }
-    if (props.footerSpanMethod) {
-      if (virtualXOpts.enabled) {
-        warnLog('vxe.error.notConflictProp', ['footer-span-method', 'virtual-x-config.enabled=false']);
-      }
-    }
+    // if (props.spanMethod) {
+    //   if (virtualXOpts.enabled) {
+    //     warnLog('vxe.error.notConflictProp', ['span-method', 'virtual-x-config.enabled=false'])
+    //   }
+    //   if (virtualYOpts.enabled) {
+    //     warnLog('vxe.error.notConflictProp', ['span-method', 'virtual-y-config.enabled=false'])
+    //   }
+    // }
+    // if (props.footerSpanMethod) {
+    //   if (virtualXOpts.enabled) {
+    //     warnLog('vxe.error.notConflictProp', ['footer-span-method', 'virtual-x-config.enabled=false'])
+    //   }
+    // }
     // 检查是否有安装需要的模块
     if (props.editConfig && !$xeTable.insert) {
       errLog('vxe.error.reqModule', ['Edit']);
@@ -27748,6 +28615,7 @@ function renderBody(h, $xeTable) {
       endIndex: 1,
       visibleSize: 0
     });
+    this.handleUpdateRowGroup(groupFields);
     this.loadTableData(data, true).then(() => {
       if (data && data.length) {
         this.inited = true;
@@ -27888,6 +28756,7 @@ function renderBody(h, $xeTable) {
       scrollYLoad,
       tableData,
       initStore,
+      isRowGroupStatus,
       columnStore,
       filterStore,
       customStore
@@ -27935,6 +28804,7 @@ function renderBody(h, $xeTable) {
         'is--header': showHeader,
         'is--footer': showFooter,
         'is--group': isGroup,
+        'is-row-group': isRowGroupStatus,
         'is--tree-line': treeConfig && (treeOpts.showLine || treeOpts.line),
         'is--fixed-left': leftList.length,
         'is--fixed-right': rightList.length,
@@ -31919,7 +32789,8 @@ const Toolbar = VxeToolbar;
       maxFixedCol: '最大冻结列的数量不能超过 {0} 个',
       dragTip: '移动：{0}',
       resizeColTip: '宽：{0} 像素',
-      resizeRowTip: '高：{0} 像素'
+      resizeRowTip: '高：{0} 像素',
+      rowGroupContentTotal: '{0}（{1}）'
     },
     grid: {
       selectOneRecord: '请至少选择一条记录！',