vxe-table 3.15.5 → 3.15.6

package/lib/table/src/methods.js

@@ -214,6 +214,7 @@ function restoreCustomStorage($xeTable) {
     const storeData = getCustomStorageMap(tableId);
     if (restoreStore) {
       return Promise.resolve(restoreStore({
+        $table: $xeTable,
         id: tableId,
         type: 'restore',
         storeData
@@ -257,6 +258,7 @@ function cacheColumnMap($xeTable) {
   const rowOpts = $xeTable.computeRowOpts;
   const isGroup = collectColumn.some(_utils.hasChildrenList);
   let isAllOverflow = !!props.showOverflow;
+  let rowGroupColumn;
   let expandColumn;
   let treeNodeColumn;
   let checkboxColumn;
@@ -269,7 +271,8 @@ function cacheColumnMap($xeTable) {
       field,
       fixed,
       type,
-      treeNode
+      treeNode,
+      rowGroupNode
     } = column;
     const rest = {
       $index: -1,
@@ -305,7 +308,16 @@ function cacheColumnMap($xeTable) {
       if (!treeNodeColumn) {
         treeNodeColumn = column;
       }
-    } else if (type === 'expand') {
+    }
+    if (rowGroupNode) {
+      if (treeNodeColumn) {
+        (0, _log.warnLog)('vxe.error.colRepet', ['row-group-node', rowGroupNode]);
+      }
+      if (!rowGroupColumn) {
+        rowGroupColumn = column;
+      }
+    }
+    if (type === 'expand') {
       if (expandColumn) {
         (0, _log.warnLog)('vxe.error.colRepet', ['type', type]);
       }
@@ -356,6 +368,7 @@ function cacheColumnMap($xeTable) {
     }
   }
   reactData.isGroup = isGroup;
+  reactData.rowGroupColumn = rowGroupColumn;
   reactData.treeNodeColumn = treeNodeColumn;
   reactData.expandColumn = expandColumn;
   reactData.isAllOverflow = isAllOverflow;
@@ -392,7 +405,7 @@ function handleBaseTreeExpand($xeTable, rows, expanded) {
   } = reactData;
   const {
     fullAllDataRowIdData,
-    tableFullData,
+    tableFullTreeData,
     treeExpandedMaps,
     treeExpandLazyLoadedMaps
   } = internalData;
@@ -422,7 +435,7 @@ function handleBaseTreeExpand($xeTable, rows, expanded) {
   if (accordion) {
     validRows = validRows.length ? [validRows[validRows.length - 1]] : [];
     // 同一级只能展开一个
-    const matchObj = _xeUtils.default.findTree(tableFullData, item => item === validRows[0], {
+    const matchObj = _xeUtils.default.findTree(tableFullTreeData, item => item === validRows[0], {
       children: childrenField
     });
     if (matchObj) {
@@ -475,9 +488,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
+  } = (0, _util.createHandleGetRowId)($xeTable);
+  let validRows = rows;
+  if (mapChildrenField) {
+    if (accordion) {
+      validRows = validRows.length ? [validRows[validRows.length - 1]] : [];
+      // 同一级只能展开一个
+      const matchObj = _xeUtils.default.findTree(tableFullGroupData, item => (0, _util.getRowid)($xeTable, item) === (0, _util.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(() => {
@@ -599,27 +699,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
+  } = (0, _util.createHandleGetRowId)($xeTable);
+  const fullData = [];
+  const expandMaps = {};
   if (treeConfig && treeOpts.transform) {
-    const {
-      handleGetRowId
-    } = (0, _util.createHandleGetRowId)($xeTable);
-    const fullData = [];
-    const expandMaps = {};
+    const childrenField = treeOpts.children || treeOpts.childrenField;
     _xeUtils.default.eachTree(internalData.afterTreeFullData, (row, index, items, path, parentRow) => {
       const rowid = handleGetRowId(row);
       const parentRowid = handleGetRowId(parentRow);
@@ -637,9 +743,336 @@ function handleVirtualTreeToList($xeTable) {
     internalData.afterFullData = fullData;
     updateScrollYStatus($xeTable, fullData);
     return fullData;
+  } else if (isRowGroupStatus) {
+    const {
+      childrenField
+    } = rowGroupOpts;
+    _xeUtils.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 updateAfterFullData($xeTable) {
+  const props = $xeTable;
+  const reactData = $xeTable;
+  const internalData = $xeTable;
+  const {
+    treeConfig
+  } = props;
+  const {
+    isRowGroupStatus
+  } = reactData;
+  const {
+    tableFullColumn,
+    tableFullData,
+    tableFullTreeData,
+    tableFullGroupData
+  } = internalData;
+  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 = _xeUtils.default.orderBy(orderColumns, 'sortTime');
+    }
+    // 处理筛选
+    // 支持单列、多列、组合筛选
+    if (!allRemoteFilter && filterColumns.length) {
+      const handleFilter = row => {
+        return filterColumns.every(({
+          column,
+          valueList,
+          itemList
+        }) => {
+          const {
+            filterMethod,
+            filterRender
+          } = column;
+          const compConf = (0, _utils.isEnableConf)(filterRender) ? 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 = (0, _util.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(_xeUtils.default.get(row, column.field)) > -1;
+        });
+      };
+      if (isRowGroupStatus) {
+        // 行分组
+        tableTree = _xeUtils.default.searchTree(tableFullGroupData, handleFilter, {
+          original: true,
+          isEvery: true,
+          children: rowGroupOpts.mapChildrenField,
+          mapChildren: rowGroupOpts.childrenField
+        });
+        tableData = tableTree;
+      } else if (treeConfig && transform) {
+        // 筛选虚拟树
+        tableTree = _xeUtils.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 = _xeUtils.default.searchTree(tableFullGroupData, () => true, {
+          original: true,
+          isEvery: true,
+          children: rowGroupOpts.mapChildrenField,
+          mapChildren: rowGroupOpts.childrenField
+        });
+        tableData = tableTree;
+      } else if (treeConfig && transform) {
+        // 还原虚拟树
+        tableTree = _xeUtils.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 = _xeUtils.default.isArray(sortRests) ? sortRests : tableTree;
+        } else {
+          const treeList = _xeUtils.default.toTreeArray(tableTree, {
+            key: rowGroupOpts.rowField,
+            parentKey: rowGroupOpts.parentField,
+            children: rowGroupOpts.mapChildrenField
+          });
+          tableTree = _xeUtils.default.toArrayTree(_xeUtils.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 = _xeUtils.default.isArray(sortRests) ? sortRests : tableTree;
+        } else {
+          const treeList = _xeUtils.default.toTreeArray(tableTree, {
+            children: mapChildrenField
+          });
+          tableTree = _xeUtils.default.toArrayTree(_xeUtils.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 = _xeUtils.default.isArray(sortRests) ? sortRests : tableData;
+        } else {
+          // 兼容 v4
+          if (sortMultiple) {
+            tableData = _xeUtils.default.orderBy(tableData, orderColumns.map(({
+              column,
+              order
+            }) => [getOrderField($xeTable, column), order]));
+          } else {
+            const firstOrderColumn = orderColumns[0];
+            let sortByConfs;
+            // 已废弃，兼容 v2，在 v4 中废弃， sortBy 不能为数组
+            if (_xeUtils.default.isArray(firstOrderColumn.sortBy)) {
+              sortByConfs = firstOrderColumn.sortBy.map(item => [item, firstOrderColumn.order]);
+            }
+            tableData = _xeUtils.default.orderBy(tableData, sortByConfs || [firstOrderColumn].map(({
+              column,
+              order
+            }) => [getOrderField($xeTable, column), order]));
+          }
+          tableData = _xeUtils.default.orderBy(tableData, orderColumns.map(({
+            column,
+            order
+          }) => [getOrderField($xeTable, column), order]));
+        }
+        tableTree = tableData;
+      }
+    }
+  } else {
+    if (isRowGroupStatus) {
+      // 还原行分组
+      // 还原虚拟树
+      tableTree = _xeUtils.default.searchTree(tableFullGroupData, () => true, {
+        original: true,
+        isEvery: true,
+        children: rowGroupOpts.mapChildrenField,
+        mapChildren: rowGroupOpts.childrenField
+      });
+      tableData = tableTree;
+    } else if (treeConfig && transform) {
+      // 还原虚拟树
+      tableTree = _xeUtils.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;
@@ -1098,6 +1531,7 @@ function handleCheckedRadioRow($xeTable, row, isForce) {
     checkMethod
   } = radioOpts;
   if (row && (isForce || !checkMethod || checkMethod({
+    $table: $xeTable,
     row
   }))) {
     reactData.selectRadioRow = row;
@@ -1120,12 +1554,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 {
@@ -1140,12 +1580,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) {
@@ -1153,13 +1594,13 @@ function handleCheckedAllCheckboxRow($xeTable, checked, isForce) {
         }
         _xeUtils.default.set(row, checkField, checked);
       }
-      if (treeConfig && indeterminateField) {
+      if ((treeConfig || isRowGroupStatus) && indeterminateField) {
         _xeUtils.default.set(row, indeterminateField, false);
       }
     };
     // 如果存在选中方法
     // 如果方法成立，则更新值，否则忽略该数据
-    if (treeConfig) {
+    if (treeConfig || isRowGroupStatus) {
       _xeUtils.default.eachTree(afterFullData, checkValFn, {
         children: childrenField
       });
@@ -1168,17 +1609,54 @@ function handleCheckedAllCheckboxRow($xeTable, checked, isForce) {
     }
   } else {
     /**
-       * 默认方式（低性能，无污染）
-       * 无需任何属性，直接绑定
-       */
-    if (treeConfig) {
+     * 默认方式（无污染）
+     * 无需任何属性，直接绑定
+     */
+    if (isRowGroupStatus) {
       if (checked) {
         /**
-           * 如果是树勾选
-           * 如果方法成立，则添加到临时集合中
-           */
-        _xeUtils.default.eachTree(afterFullData, row => {
+         * 如果是行分组勾选
+         * 如果方法成立，则添加到临时集合中
+         */
+        _xeUtils.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) {
+          _xeUtils.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) {
+        /**
+         * 如果是树勾选
+         * 如果方法成立，则添加到临时集合中
+         */
+        _xeUtils.default.eachTree(afterTreeFullData, row => {
+          if (isForce || !checkMethod || checkMethod({
+            $table: $xeTable,
             row
           })) {
             const rowid = handleGetRowId(row);
@@ -1189,15 +1667,16 @@ function handleCheckedAllCheckboxRow($xeTable, checked, isForce) {
         });
       } else {
         /**
-           * 如果是树取消
-           * 如果方法成立，则不添加到临时集合中
-           */
+         * 如果是树取消
+         * 如果方法成立，则不添加到临时集合中
+         */
         if (!isForce && checkMethod) {
-          _xeUtils.default.eachTree(afterFullData, row => {
+          _xeUtils.default.eachTree(afterTreeFullData, row => {
             const rowid = handleGetRowId(row);
             if (checkMethod({
+              $table: $xeTable,
               row
-            }) ? 0 : selectCheckboxMaps[rowid]) {
+            }) ? false : selectCheckboxMaps[rowid]) {
               selectRowMaps[rowid] = row;
             }
           }, {
@@ -1208,14 +1687,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;
@@ -1229,16 +1709,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;
             }
           });
@@ -2113,9 +2594,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 = getI18n('vxe.table.dragTip', [tdEl.textContent || '']);
   }
@@ -2155,9 +2638,11 @@ function updateColDropTipContent($xeTable, tdEl) {
   } = columnDragOpts;
   let tipContent = '';
   if (tooltipMethod) {
-    tipContent = `${tooltipMethod({
+    const dtParams = {
+      $table: $xeTable,
       column: dragCol
-    }) || ''}`;
+    };
+    tipContent = `${tooltipMethod(dtParams) || ''}`;
   } else {
     tipContent = getI18n('vxe.table.dragTip', [tdEl.textContent || '']);
   }
@@ -2489,8 +2974,275 @@ function handleRecalculateLayout($xeTable, reFull) {
     }
   });
 }
-/**
- * 处理数据加载默认行为
+const handleUpdateRowGroup = ($xeTable, groupFields) => {
+  const reactData = $xeTable;
+  reactData.rowGroupList = groupFields ? (_xeUtils.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 = (0, _util.getRowkey)($xeTable);
+      list.forEach(row => {
+        const cellValue = groupColumn ? $xeTable.getCellLabel(row, groupColumn) : _xeUtils.default.get(row, groupField);
+        const groupValue = _xeUtils.default.eqNull(cellValue) ? '' : cellValue;
+        let childList = groupMaps[groupValue];
+        if (!childList) {
+          childList = [];
+          groupMaps[groupValue] = childList;
+        }
+        if (row.isAggregate) {
+          row.isAggregate = undefined;
+        }
+        childList.push(row);
+      });
+      _xeUtils.default.objectEach(groupMaps, (childList, groupValue) => {
+        const {
+          fullData: childFullData,
+          treeData: childTreeData
+        } = handleGroupData($xeTable, childList, rowGroups.slice(1));
+        const groupRow = {
+          isAggregate: true,
+          groupContent: groupValue,
+          groupField,
+          [rowField]: (0, _util.getRowUniqueId)(),
+          [parentField]: null,
+          [rowkey]: (0, _util.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) {
+    (0, _log.errLog)('vxe.error.errMaxRow', [supportMaxRow]);
+  }
+  if (treeConfig && rowGroupList.length) {
+    (0, _log.errLog)('vxe.error.noTree', ['row-group-config']);
+    return $xeTable.$nextTick();
+  }
+  if (rowOpts.drag && rowGroupList.length) {
+    (0, _log.errLog)('vxe.error.errConflicts', ['row-config.drag', 'row-group-config']);
+    return $xeTable.$nextTick();
+  }
+  let isRGroup = false;
+  if (treeConfig) {
+    if (transform) {
+      // 树结构自动转换
+      if (!treeOpts.rowField) {
+        (0, _log.errLog)('vxe.error.reqProp', ['tree-config.rowField']);
+      }
+      if (!treeOpts.parentField) {
+        (0, _log.errLog)('vxe.error.reqProp', ['tree-config.parentField']);
+      }
+      if (!childrenField) {
+        (0, _log.errLog)('vxe.error.reqProp', ['tree-config.childrenField']);
+      }
+      if (!treeOpts.mapChildrenField) {
+        (0, _log.errLog)('vxe.error.reqProp', ['tree-config.mapChildrenField']);
+      }
+      if (childrenField === treeOpts.mapChildrenField) {
+        (0, _log.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 = _xeUtils.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') {
+        (0, _log.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)) {
+        (0, _log.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) {
+        (0, _log.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) {
+          (0, _util.restoreScrollLocation)($xeTable, targetScrollLeft, targetScrollTop).then(() => {
+            resolve();
+          });
+        } else {
+          setTimeout(() => {
+            (0, _util.restoreScrollLocation)($xeTable, targetScrollLeft, targetScrollTop).then(() => {
+              resolve();
+            });
+          });
+        }
+      });
+    });
+  });
+}
+/**
+ * 处理数据加载默认行为
  * 默认执行一次，除非被重置
  */
 function handleLoadDefaults($xeTable) {
@@ -3246,16 +3998,23 @@ const Methods = {
   clearAll() {
     return (0, _util.clearTableAllStatus)(this);
   },
+  handleUpdateRowGroup(groupFields) {
+    const $xeTable = this;
+    handleUpdateRowGroup($xeTable, groupFields);
+  },
   /**
    * 同步 data 数据（即将废弃）
    * 如果用了该方法，那么组件将不再记录增删改的状态，只能自行实现对应逻辑
    * 对于某些特殊的场景，比如深层树节点元素发生变动时可能会用到
    */
   syncData() {
+    const $xeTable = this;
+    const reactData = $xeTable;
+    const internalData = $xeTable;
     (0, _log.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));
     });
   },
   /**
@@ -3303,23 +4062,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 = (0, _util.getRowid)(this, row);
+      const rowid = (0, _util.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();
   },
   /**
    * 加载表格数据
@@ -3327,169 +4086,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) {
-      (0, _log.errLog)('vxe.error.errMaxRow', [supportMaxRow]);
-    }
-    if (treeConfig) {
-      // 树结构自动转换
-      if (transform) {
-        if (!treeOpts.rowField) {
-          (0, _log.errLog)('vxe.error.reqProp', ['table.tree-config.rowField']);
-        }
-        if (!treeOpts.parentField) {
-          (0, _log.errLog)('vxe.error.reqProp', ['table.tree-config.parentField']);
-        }
-        if (!childrenField) {
-          (0, _log.errLog)('vxe.error.reqProp', ['tree-config.childrenField']);
-        }
-        if (!treeOpts.mapChildrenField) {
-          (0, _log.errLog)('vxe.error.reqProp', ['tree-config.mapChildrenField']);
-        }
-        if (childrenField === treeOpts.mapChildrenField) {
-          (0, _log.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 = _xeUtils.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') {
-          (0, _log.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)) {
-          (0, _log.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) {
-          (0, _log.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) {
-            (0, _util.restoreScrollLocation)($xeTable, targetScrollLeft, targetScrollTop).then(() => {
-              resolve();
-            });
-          } else {
-            setTimeout(() => {
-              (0, _util.restoreScrollLocation)($xeTable, targetScrollLeft, targetScrollTop).then(() => {
-                resolve();
-              });
-            });
-          }
-        });
-      });
-    });
+    return loadTableData($xeTable, datas, isReset);
   },
   /**
    * 重新加载数据，不会清空表格状态
@@ -3500,7 +4097,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) {
@@ -3518,7 +4115,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();
@@ -3608,18 +4205,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 ? {} : Object.assign({}, fullAllDataRowIdData); // 存在已删除数据
     const fullDataRowIdMaps = {};
     const {
@@ -3657,6 +4252,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;
       _xeUtils.default.eachTree(tableFullTreeData, (row, index, items, path, parentRow, nodes) => {
         const rowid = handleUpdateRowId(row);
         if (treeConfig && lazy) {
@@ -3673,6 +4274,17 @@ const Methods = {
       }, {
         children: childrenField
       });
+    } else if (isRowGroupStatus) {
+      const rowGroupOpts = $xeTable.computeRowGroupOpts;
+      const {
+        mapChildrenField
+      } = rowGroupOpts;
+      _xeUtils.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, (0, _util.toTreePathSeq)(path));
+      }, {
+        children: mapChildrenField
+      });
     } else {
       tableFullData.forEach((row, index, items) => {
         handleRowCache(row, index, items, index, null, handleUpdateRowId(row), 0, index + 1);
@@ -4501,277 +5113,32 @@ const Methods = {
     } = 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 = _xeUtils.default.filterTree(currTableData, row => _xeUtils.default.get(row, checkField), {
-            children: transform ? mapChildrenField : childrenField
-          });
-        } else {
-          const currTableData = isFull ? tableFullData : afterFullData;
-          rowList = currTableData.filter(row => _xeUtils.default.get(row, checkField));
-        }
-      } else {
-        _xeUtils.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 = _xeUtils.default.orderBy(orderColumns, 'sortTime');
-      }
-      // 处理筛选
-      // 支持单列、多列、组合筛选
-      if (!allRemoteFilter && filterColumns.length) {
-        const handleFilter = row => {
-          return filterColumns.every(({
-            column,
-            valueList,
-            itemList
-          }) => {
-            const {
-              filterMethod,
-              filterRender
-            } = column;
-            const compConf = (0, _utils.isEnableConf)(filterRender) ? 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 = (0, _util.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(_xeUtils.default.get(row, column.field)) > -1;
-          });
-        };
-        if (treeConfig && transform) {
-          // 筛选虚拟树
-          tableTree = _xeUtils.default.searchTree(tableFullTreeData, handleFilter, {
-            original: true,
-            isEvery,
-            children: mapChildrenField,
-            mapChildren: childrenField
+    if (updateCheckboxFlag) {
+      if (checkField) {
+        if (treeConfig) {
+          const currTableData = isFull ? transform ? tableFullTreeData : tableFullData : transform ? tableFullTreeData : afterFullData;
+          rowList = _xeUtils.default.filterTree(currTableData, row => _xeUtils.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 => _xeUtils.default.get(row, checkField));
         }
       } else {
-        if (treeConfig && transform) {
-          // 还原虚拟树
-          tableTree = _xeUtils.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 = _xeUtils.default.isArray(sortRests) ? sortRests : tableTree;
-          } else {
-            const treeList = _xeUtils.default.toTreeArray(tableTree, {
-              children: mapChildrenField
-            });
-            tableTree = _xeUtils.default.toArrayTree(_xeUtils.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 = _xeUtils.default.isArray(sortRests) ? sortRests : tableData;
+        _xeUtils.default.each(selectCheckboxMaps, (row, rowid) => {
+          if (isFull) {
+            if (fullDataRowIdData[rowid]) {
+              rowList.push(fullDataRowIdData[rowid].row);
+            }
           } else {
-            // 兼容 v4
-            if (sortMultiple) {
-              tableData = _xeUtils.default.orderBy(tableData, orderColumns.map(({
-                column,
-                order
-              }) => [getOrderField(this, column), order]));
-            } else {
-              const firstOrderColumn = orderColumns[0];
-              let sortByConfs;
-              // 已废弃，兼容 v2，在 v4 中废弃， sortBy 不能为数组
-              if (_xeUtils.default.isArray(firstOrderColumn.sortBy)) {
-                sortByConfs = firstOrderColumn.sortBy.map(item => [item, firstOrderColumn.order]);
-              }
-              tableData = _xeUtils.default.orderBy(tableData, sortByConfs || [firstOrderColumn].map(({
-                column,
-                order
-              }) => [getOrderField(this, column), order]));
+            if (afterFullRowMaps[rowid]) {
+              rowList.push(afterFullRowMaps[rowid]);
             }
-            tableData = _xeUtils.default.orderBy(tableData, orderColumns.map(({
-              column,
-              order
-            }) => [getOrderField($xeTable, column), order]));
           }
-          tableTree = tableData;
-        }
-      }
-    } else {
-      if (treeConfig && transform) {
-        // 还原虚拟树
-        tableTree = _xeUtils.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;
   },
   /**
    * 预编译
@@ -5155,6 +5522,7 @@ const Methods = {
       const storeData = getCustomStorageMap(tableId);
       if (restoreStore) {
         return Promise.resolve(restoreStore({
+          $table: $xeTable,
           id: tableId,
           type: 'restore',
           storeData
@@ -5230,6 +5598,7 @@ const Methods = {
         resizableData[colKey] = column.renderWidth;
       }
       if (isCustomVisible && (!checkMethod || checkMethod({
+        $table: $xeTable,
         column
       }))) {
         if (!column.visible && column.defaultVisible) {
@@ -5290,6 +5659,7 @@ const Methods = {
       } : this.getCustomStoreData();
       if (updateStore) {
         return updateStore({
+          $table: $xeTable,
           id: tableId,
           type,
           storeData
@@ -6283,8 +6653,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 = (0, _dom.hasControlKey)(evnt);
         const hasShiftKey = evnt.shiftKey;
         const hasAltKey = evnt.altKey;
         const operArrow = isLeftArrow || isUpArrow || isRightArrow || isDwArrow;
@@ -6350,7 +6719,7 @@ const Methods = {
             enterMethod
           } = keyboardOpts;
           // 退出选中
-          if (hasCtrlKey) {
+          if (isControlKey) {
             // 如果是激活编辑状态，则取消编辑
             if (actived.row) {
               const params = actived.args;
@@ -6525,7 +6894,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;
@@ -6975,9 +7344,13 @@ const Methods = {
     const {
       treeConfig
     } = props;
+    const {
+      isRowGroupStatus
+    } = reactData;
     const {
       selectCheckboxMaps
     } = internalData;
+    const rowGroupOpts = $xeTable.computeRowGroupOpts;
     const treeOpts = $xeTable.computeTreeOpts;
     const {
       transform,
@@ -6997,10 +7370,11 @@ const Methods = {
     const indeterminateField = checkboxOpts.indeterminateField || checkboxOpts.halfField;
     if (checkField) {
       // 树结构
-      if (treeConfig && !checkStrictly) {
+      if ((treeConfig || isRowGroupStatus) && !checkStrictly) {
         // 更新子节点状态
         _xeUtils.default.eachTree(rows, row => {
           if (isForce || !checkMethod || checkMethod({
+            $table: $xeTable,
             row
           })) {
             _xeUtils.default.set(row, checkField, checked);
@@ -7018,6 +7392,7 @@ const Methods = {
       // 列表
       rows.forEach(row => {
         if (isForce || !checkMethod || checkMethod({
+          $table: $xeTable,
           row
         })) {
           _xeUtils.default.set(row, checkField, checked);
@@ -7028,32 +7403,58 @@ const Methods = {
       return;
     }
     // 树结构
-    if (treeConfig && !checkStrictly) {
-      // 更新子节点状态
-      _xeUtils.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) {
+        // 更新行分组节点状态
+        _xeUtils.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) {
+        // 更新子节点状态
+        _xeUtils.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) {
@@ -7113,10 +7514,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;
@@ -7129,7 +7537,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];
@@ -7149,6 +7557,7 @@ const Methods = {
       }
     }
     if (!checkMethod || checkMethod({
+      $table: $xeTable,
       row
     })) {
       $xeTable.handleBatchSelectRows([row], checked);
@@ -7196,14 +7605,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 {
@@ -7211,29 +7622,47 @@ const Methods = {
       checkStrictly,
       checkMethod
     } = checkboxOpts;
-    const {
-      afterTreeFullData
-    } = internalData;
     if (checkStrictly) {
       return;
     }
-    // 树结构
-    if (treeConfig) {
+    if (isRowGroupStatus || treeConfig) {
       const {
         handleGetRowId
       } = (0, _util.createHandleGetRowId)($xeTable);
       const childRowMaps = {};
       const childRowList = [];
-      _xeUtils.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) {
+          _xeUtils.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;
+        _xeUtils.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];
@@ -7245,6 +7674,7 @@ const Methods = {
           const childRowid = handleGetRowId(item);
           const isSelect = checkField ? _xeUtils.default.get(item, checkField) : selectCheckboxMaps[childRowid];
           if (checkMethod({
+            $table: $xeTable,
             row: item
           })) {
             if (isSelect) {
@@ -7308,9 +7738,13 @@ const Methods = {
     const {
       treeConfig
     } = props;
+    const {
+      isRowGroupStatus
+    } = reactData;
     const {
       afterFullData,
       afterTreeFullData,
+      afterGroupFullData,
       checkboxReserveRowMap,
       selectCheckboxMaps,
       treeIndeterminateRowMaps
@@ -7327,11 +7761,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 ? _xeUtils.default.get(row, checkField) : selectCheckboxMaps[childRowid];
       if (checkMethod({
+        $table: $xeTable,
         row
       })) {
         if (selected) {
@@ -7920,6 +8355,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;
@@ -7933,7 +8369,8 @@ const Methods = {
     } = params;
     const {
       type,
-      treeNode
+      treeNode,
+      rowGroupNode
     } = column;
     const isRadioType = type === 'radio';
     const isCheckboxType = type === 'checkbox';
@@ -7941,8 +8378,9 @@ const Methods = {
     const cell = evnt.currentTarget;
     const triggerRadio = isRadioType && (0, _dom.getEventTargetNode)(evnt, cell, 'vxe-cell--radio').flag;
     const triggerCheckbox = isCheckboxType && (0, _dom.getEventTargetNode)(evnt, cell, 'vxe-cell--checkbox').flag;
-    const triggerTreeNode = treeNode && (0, _dom.getEventTargetNode)(evnt, cell, 'vxe-tree--btn-wrapper').flag;
+    const triggerTreeNode = treeNode && (0, _dom.getEventTargetNode)(evnt, cell, 'vxe-cell--tree-btn').flag;
     const triggerExpandNode = isExpandType && (0, _dom.getEventTargetNode)(evnt, cell, 'vxe-table--expanded').flag;
+    const triggerRowGroupNode = isExpandType && (0, _dom.getEventTargetNode)(evnt, cell, 'vxe-row-group--node-btn').flag;
     params = Object.assign({
       cell,
       triggerRadio,
@@ -7959,11 +8397,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);
@@ -8229,7 +8671,7 @@ const Methods = {
     const triggerInput = cell && cell.tagName && cell.tagName.toLowerCase() === 'input';
     const triggerRadio = isRadioType && (0, _dom.getEventTargetNode)(evnt, cell, 'vxe-cell--radio').flag;
     const triggerCheckbox = isCheckboxType && (0, _dom.getEventTargetNode)(evnt, cell, 'vxe-cell--checkbox').flag;
-    const triggerTreeNode = treeNode && (0, _dom.getEventTargetNode)(evnt, cell, 'vxe-tree--btn-wrapper').flag;
+    const triggerTreeNode = treeNode && (0, _dom.getEventTargetNode)(evnt, cell, 'vxe-cell--tree-btn').flag;
     const triggerExpandNode = isExpandType && (0, _dom.getEventTargetNode)(evnt, cell, 'vxe-table--expanded').flag;
     let isColDragCell = false;
     if (rowOpts.drag) {
@@ -8546,7 +8988,7 @@ const Methods = {
       evnt.preventDefault();
       return;
     }
-    const hasCtrlKey = evnt.ctrlKey;
+    const isControlKey = (0, _dom.hasControlKey)(evnt);
     const trEl = evnt.currentTarget;
     const rowid = trEl.getAttribute('rowid') || '';
     const rest = fullAllDataRowIdData[rowid];
@@ -8560,10 +9002,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;
       }
@@ -8862,7 +9304,7 @@ const Methods = {
       evnt.preventDefault();
       return;
     }
-    const hasCtrlKey = evnt.ctrlKey;
+    const isControlKey = (0, _dom.hasControlKey)(evnt);
     const thEl = evnt.currentTarget;
     const colid = thEl.getAttribute('colid');
     const column = $xeTable.getColumnById(colid);
@@ -8873,7 +9315,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)) {
@@ -9336,7 +9778,7 @@ const Methods = {
     const reactData = $xeTable;
     const internalData = $xeTable;
     const {
-      expandColumn: column
+      expandColumn
     } = reactData;
     const {
       rowExpandLazyLoadedMaps
@@ -9356,12 +9798,12 @@ const Methods = {
     const rowid = (0, _util.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,
@@ -9430,8 +9872,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 (!_xeUtils.default.isArray(rows)) {
         rows = [rows];
@@ -9555,6 +9997,104 @@ const Methods = {
     });
     return rest;
   },
+  setRowGroups(fieldOrColumns) {
+    const $xeTable = this;
+    const props = $xeTable;
+    const internalData = $xeTable;
+    const {
+      rowGroupConfig
+    } = props;
+    if (!rowGroupConfig) {
+      (0, _log.errLog)('vxe.error.reqProp', ['row-group-config']);
+      return $xeTable.$nextTick();
+    }
+    if (fieldOrColumns) {
+      handleUpdateRowGroup($xeTable, (_xeUtils.default.isArray(fieldOrColumns) ? fieldOrColumns : [fieldOrColumns]).map(fieldOrColumn => {
+        return _xeUtils.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) {
+      (0, _log.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[(0, _util.getRowid)($xeTable, row)];
+  },
+  setRowGroupExpand(rows, expanded) {
+    const $xeTable = this;
+    if (rows) {
+      if (!_xeUtils.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 rowGroupOpts = $xeTable.computeRowGroupOpts;
+    const {
+      mapChildrenField
+    } = rowGroupOpts;
+    const rgExpandedMaps = {};
+    if (expanded && mapChildrenField) {
+      _xeUtils.default.eachTree(tableFullGroupData, row => {
+        if (row[mapChildrenField] && row[mapChildrenField].length) {
+          rgExpandedMaps[(0, _util.getRowid)($xeTable, row)] = row;
+        }
+      }, {
+        children: mapChildrenField
+      });
+    }
+    internalData.rowGroupExpandedMaps = rgExpandedMaps;
+    handleVirtualTreeToList($xeTable);
+    reactData.rowGroupExpandedFlag++;
+    return $xeTable.handleTableData();
+  },
+  clearRowGroupExpand() {
+    const $xeTable = this;
+    const reactData = $xeTable;
+    const internalData = $xeTable;
+    internalData.rowGroupExpandedMaps = {};
+    handleVirtualTreeToList($xeTable);
+    reactData.rowGroupExpandedFlag++;
+    return $xeTable.handleTableData();
+  },
   getTreeExpandRecords() {
     const $xeTable = this;
     const internalData = $xeTable;
@@ -9622,11 +10162,11 @@ const Methods = {
       });
     }
     internalData.treeExpandedMaps = {};
-    reactData.treeExpandedFlag++;
     if (transform) {
       handleVirtualTreeToList($xeTable);
-      return $xeTable.handleTableData();
+      $xeTable.handleTableData();
     }
+    reactData.treeExpandedFlag++;
     return $xeTable.$nextTick();
   },
   /**
@@ -9635,6 +10175,7 @@ const Methods = {
    */
   reloadTreeExpand(row) {
     const $xeTable = this;
+    const reactData = $xeTable;
     const internalData = $xeTable;
     const {
       treeExpandLazyLoadedMaps
@@ -9652,8 +10193,9 @@ const Methods = {
       }).then(() => {
         if (transform) {
           handleVirtualTreeToList($xeTable);
-          return $xeTable.handleTableData();
+          $xeTable.handleTableData();
         }
+        reactData.treeExpandedFlag++;
       }).then(() => {
         return $xeTable.recalculate();
       });
@@ -9668,6 +10210,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 = (0, _util.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);
+  },
   /**
    * 展开树节点事件
    */
@@ -9728,11 +10304,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;
@@ -9745,7 +10325,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();
+      }
+    });
   },
   /**
    * 设置展开树形节点，二个参数设置这一行展开与否
@@ -9811,7 +10397,6 @@ const Methods = {
     } = treeOpts;
     const expList = $xeTable.getTreeExpandRecords();
     internalData.treeExpandedMaps = {};
-    reactData.treeExpandedFlag++;
     if (reserve) {
       _xeUtils.default.eachTree(tableFullTreeData, row => handleTreeExpandReserve($xeTable, row, false), {
         children: childrenField
@@ -9820,8 +10405,9 @@ const Methods = {
     return $xeTable.handleTableData().then(() => {
       if (transform) {
         handleVirtualTreeToList($xeTable);
-        return $xeTable.handleTableData();
+        $xeTable.handleTableData();
       }
+      reactData.treeExpandedFlag++;
     }).then(() => {
       if (expList.length) {
         $xeTable.recalculate();
@@ -10712,27 +11298,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 = _xeUtils.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 = _xeUtils.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(() => (0, _util.rowToVisible)(this, row));
+    return Promise.all(rests).then(() => (0, _util.rowToVisible)($xeTable, row));
   },
   /**
    * 手动清除滚动相关信息，还原到初始状态