vxe-table 4.13.5 → 4.13.7

package/packages/table/src/body.ts

@@ -450,9 +450,11 @@ export default defineComponent({
     }
 
     const renderRows = (fixedType: 'left' | 'right' | '', isOptimizeMode: boolean, tableData: any[], tableColumn: VxeTableDefines.ColumnInfo[]) => {
+      const $xeGrid = $xeTable.xeGrid
+
       const { stripe, rowKey, highlightHoverRow, rowClassName, rowStyle, editConfig, treeConfig } = tableProps
-      const { hasFixedColumn, treeExpandedFlag, isColLoading, scrollXLoad, scrollYLoad, isAllOverflow, rowExpandedFlag, expandColumn, selectRadioRow, pendingRowFlag, isDragColMove, rowExpandHeightFlag } = tableReactData
-      const { fullAllDataRowIdData, treeExpandedMaps, pendingRowMaps, rowExpandedMaps } = tableInternalData
+      const { hasFixedColumn, treeExpandedFlag, isColLoading, scrollXLoad, scrollYLoad, isAllOverflow, rowExpandedFlag, expandColumn, selectRadioRow, pendingRowFlag, isDragColMove, rowExpandHeightFlag, isRowGroupStatus } = tableReactData
+      const { fullAllDataRowIdData, fullColumnIdData, treeExpandedMaps, pendingRowMaps, rowExpandedMaps } = tableInternalData
       const checkboxOpts = computeCheckboxOpts.value
       const radioOpts = computeRadioOpts.value
       const treeOpts = computeTreeOpts.value
@@ -464,6 +466,7 @@ export default defineComponent({
       const childrenField = treeOpts.children || treeOpts.childrenField
       const rows: any[] = []
       const { handleGetRowId } = createHandleGetRowId($xeTable)
+      const isDeepRow = treeConfig || isRowGroupStatus
       tableData.forEach((row, $rowIndex) => {
         const rowid = handleGetRowId(row)
         const rowRest = fullAllDataRowIdData[rowid] || {}
@@ -471,6 +474,7 @@ export default defineComponent({
         let rowLevel = 0
         let seq: string | number = -1
         let _rowIndex = -1
+        const hasRowGroupAggregate = isRowGroupStatus && row.isAggregate
         const trOn: Record<string, any> = {}
         // 当前行事件
         if (rowOpts.isHover || highlightHoverRow) {
@@ -489,7 +493,7 @@ export default defineComponent({
         }
         if (rowRest) {
           rowLevel = rowRest.level
-          if (treeConfig && transform && seqMode === 'increasing') {
+          if (hasRowGroupAggregate || (treeConfig && transform && seqMode === 'increasing')) {
             seq = rowRest._index + 1
           } else {
             seq = rowRest.seq
@@ -512,14 +516,14 @@ export default defineComponent({
           isExpandTree = !!treeExpandedFlag && rowChildren && rowChildren.length > 0 && !!treeExpandedMaps[rowid]
         }
         // 拖拽行事件
-        if (rowOpts.drag && (!treeConfig || transform)) {
+        if (rowOpts.drag && !isRowGroupStatus && (!treeConfig || transform)) {
           trOn.onDragstart = $xeTable.handleRowDragDragstartEvent
           trOn.onDragend = $xeTable.handleRowDragDragendEvent
           trOn.onDragover = $xeTable.handleRowDragDragoverEvent
         }
         const trClass = [
           'vxe-body--row',
-          treeConfig ? `row--level-${rowLevel}` : '',
+          isDeepRow ? `row--level-${rowLevel}` : '',
           {
             'row--stripe': stripe && (_rowIndex + 1) % 2 === 0,
             'is--new': isNewRow,
@@ -528,7 +532,8 @@ export default defineComponent({
             'row--new': isNewRow && (editOpts.showStatus || editOpts.showInsertStatus),
             'row--radio': radioOpts.highlight && $xeTable.eqRow(selectRadioRow, row),
             'row--checked': checkboxOpts.highlight && $xeTable.isCheckedByCheckboxRow(row),
-            'row--pending': !!pendingRowFlag && !!pendingRowMaps[rowid]
+            'row--pending': !!pendingRowFlag && !!pendingRowMaps[rowid],
+            'row--group': hasRowGroupAggregate
           },
           getPropClass(rowClassName, params)
         ]
@@ -543,7 +548,7 @@ export default defineComponent({
               class: trClass,
               rowid: rowid,
               style: rowStyle ? (XEUtils.isFunction(rowStyle) ? rowStyle(params) : rowStyle) : null,
-              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,
               ...trOn
             }, {
               default: () => tdVNs
@@ -552,7 +557,7 @@ export default defineComponent({
               class: trClass,
               rowid: rowid,
               style: rowStyle ? (XEUtils.isFunction(rowStyle) ? rowStyle(params) : rowStyle) : null,
-              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,
               ...trOn
             }, tdVNs)
         )
@@ -584,9 +589,40 @@ export default defineComponent({
             if (treeConfig) {
               cellStyle.paddingLeft = `${(rowLevel * treeOpts.indent) + 30}px`
             }
-            const { showOverflow } = expandColumn
+            const { showOverflow } = expandColumn || {}
+            const colid = expandColumn.id
+            const colRest = fullColumnIdData[colid] || {}
             const hasEllipsis = (XEUtils.isUndefined(showOverflow) || XEUtils.isNull(showOverflow)) ? isAllOverflow : showOverflow
-            const expandParams = { $table: $xeTable, seq, column: expandColumn, fixed: fixedType, type: renderType, level: rowLevel, row, rowIndex, $rowIndex, _rowIndex }
+            let columnIndex = -1
+            let $columnIndex = -1
+            let _columnIndex = -1
+            if (colRest) {
+              columnIndex = colRest.index
+              $columnIndex = colRest.$index
+              _columnIndex = colRest._index
+            }
+            const expandParams: VxeTableDefines.CellRenderDataParams = {
+              $grid: $xeGrid,
+              $table: $xeTable,
+              seq,
+              column: expandColumn as VxeTableDefines.ColumnInfo,
+              columnIndex,
+              $columnIndex,
+              _columnIndex,
+              fixed: fixedType,
+              type: renderType,
+              level: rowLevel,
+              row,
+              rowid,
+              rowIndex,
+              $rowIndex,
+              _rowIndex,
+              isHidden: false,
+              isEdit: false,
+              visibleData: [],
+              data: [],
+              items: []
+            }
             rows.push(
               h('tr', {
                 class: ['vxe-body--expanded-row', {

package/packages/table/src/cell.ts

@@ -92,21 +92,21 @@ function renderCellBaseVNs (params: VxeTableDefines.CellRenderBodyParams & { $ta
   const treeOpts = computeTreeOpts.value
   const { showIcon, isPeerDrag, isCrossDrag, visibleMethod } = rowDragOpts
   const rVisibleMethod = visibleMethod || (dragConfig ? dragConfig.rowVisibleMethod : null)
-  const vns: VxeComponentSlotType[] = XEUtils.isArray(content) ? content : [content]
+  const vns: VxeComponentSlotType[] = []
   if (dragSort && rowOpts.drag && ((showIcon || (dragConfig ? dragConfig.showRowIcon : false)) && (!rVisibleMethod || rVisibleMethod(params)))) {
     if (treeConfig) {
       if (treeOpts.transform && (isPeerDrag || isCrossDrag || !level)) {
-        vns.unshift(
+        vns.push(
           renderCellDragIcon(params)
         )
       }
     } else {
-      vns.unshift(
+      vns.push(
         renderCellDragIcon(params)
       )
     }
   }
-  return vns
+  return vns.concat(XEUtils.isArray(content) ? content : [content])
 }
 
 function renderHeaderCellDragIcon (params: VxeTableDefines.CellRenderHeaderParams & { $table: VxeTableConstructor & VxeTablePrivateMethods }) {
@@ -277,26 +277,27 @@ function renderCellHandle (params: VxeTableDefines.CellRenderBodyParams & {
   const { column, $table } = params
   const tableProps = $table.props
   const { editConfig } = tableProps
-  const { type, treeNode, editRender } = column
+  const { type, treeNode, rowGroupNode, editRender } = column
   const { computeEditOpts, computeCheckboxOpts } = $table.getComputeMaps()
   const checkboxOpts = computeCheckboxOpts.value
   const editOpts = computeEditOpts.value
+  const isDeepCell = treeNode || rowGroupNode
   switch (type) {
     case 'seq':
-      return treeNode ? Cell.renderTreeIndexCell(params) : Cell.renderSeqCell(params)
+      return isDeepCell ? Cell.renderDeepIndexCell(params) : Cell.renderSeqCell(params)
     case 'radio':
-      return treeNode ? Cell.renderTreeRadioCell(params) : Cell.renderRadioCell(params)
+      return isDeepCell ? Cell.renderDeepRadioCell(params) : Cell.renderRadioCell(params)
     case 'checkbox':
-      return checkboxOpts.checkField ? (treeNode ? Cell.renderTreeSelectionCellByProp(params) : Cell.renderCheckboxCellByProp(params)) : (treeNode ? Cell.renderTreeSelectionCell(params) : Cell.renderCheckboxCell(params))
+      return checkboxOpts.checkField ? (isDeepCell ? Cell.renderDeepSelectionCellByProp(params) : Cell.renderCheckboxCellByProp(params)) : (isDeepCell ? Cell.renderDeepSelectionCell(params) : Cell.renderCheckboxCell(params))
     case 'expand':
       return Cell.renderExpandCell(params)
     case 'html':
-      return treeNode ? Cell.renderTreeHTMLCell(params) : Cell.renderHTMLCell(params)
+      return isDeepCell ? Cell.renderDeepHTMLCell(params) : Cell.renderHTMLCell(params)
   }
   if (isEnableConf(editConfig) && editRender) {
-    return editOpts.mode === 'cell' ? (treeNode ? Cell.renderTreeCellEdit(params) : Cell.renderCellEdit(params)) : (treeNode ? Cell.renderTreeRowEdit(params) : Cell.renderRowEdit(params))
+    return editOpts.mode === 'cell' ? (isDeepCell ? Cell.renderDeepCellEdit(params) : Cell.renderCellEdit(params)) : (isDeepCell ? Cell.renderDeepRowEdit(params) : Cell.renderRowEdit(params))
   }
-  return treeNode ? Cell.renderTreeCell(params) : Cell.renderDefaultCell(params)
+  return isDeepCell ? Cell.renderDeepCell(params) : Cell.renderDefaultCell(params)
 }
 
 function renderHeaderHandle (params: VxeTableDefines.CellRenderHeaderParams & {
@@ -381,7 +382,10 @@ export const Cell = {
   },
   renderDefaultCell (params: VxeTableDefines.CellRenderBodyParams & { $table: VxeTableConstructor & VxeTablePrivateMethods }) {
     const { $table, row, column } = params
-    const { slots, editRender, cellRender } = column
+    const tableReactData = $table.reactData
+    const tableInternalData = $table.internalData
+    const { isRowGroupStatus } = tableReactData
+    const { slots, editRender, cellRender, rowGroupNode } = column
     const renderOpts = editRender || cellRender
     const defaultSlot = slots ? slots.default : null
     if (defaultSlot) {
@@ -398,7 +402,35 @@ export const Cell = {
         }
       }
     }
-    const cellValue = $table.getCellLabel(row, column)
+    let cellValue: string | number | null = ''
+    if (isRowGroupStatus && rowGroupNode && row.isAggregate) {
+      const { fullColumnFieldData } = tableInternalData
+      const { computeRowGroupOpts } = $table.getComputeMaps()
+      const rowGroupOpts = computeRowGroupOpts.value
+      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) as VxeTableDefines.ColumnInfo,
+        column,
+        groupValue: cellValue,
+        children: childList,
+        totalValue: totalValue
+      }
+      if (contentMethod) {
+        cellValue = `${contentMethod(params)}`
+      }
+      if (showTotal) {
+        cellValue = 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(params, [
       h('span', {
@@ -414,40 +446,80 @@ export const Cell = {
       )
     ])
   },
-  renderTreeCell (params: VxeTableDefines.CellRenderBodyParams & { $table: VxeTableConstructor & VxeTablePrivateMethods }) {
-    return Cell.renderTreeIcon(params, Cell.renderDefaultCell(params) as VNode[])
+  renderDeepCell (params: VxeTableDefines.CellRenderBodyParams & { $table: VxeTableConstructor & VxeTablePrivateMethods }) {
+    return Cell.renderDeepNodeBtn(params, Cell.renderDefaultCell(params) as VNode[])
   },
   renderDefaultFooter (params: VxeTableDefines.CellRenderFooterParams & { $table: VxeTableConstructor & VxeTablePrivateMethods }) {
     return getFooterContent(params)
   },
 
   /**
-   * 树节点
+   * 行分组
    */
-  renderTreeIcon (params: VxeTableDefines.CellRenderBodyParams & { $table: VxeTableConstructor & VxeTablePrivateMethods }, cellVNodes: VxeComponentSlotType[]) {
+  renderRowGroupBtn (params: VxeTableDefines.CellRenderBodyParams & { $table: VxeTableConstructor & VxeTablePrivateMethods }, cellVNodes: VxeComponentSlotType[]) {
+    const { $table } = params
+    const tableReactData = $table.reactData
+    const tableInternalData = $table.internalData
+    const { row, level } = params
+    const { computeRowGroupOpts } = $table.getComputeMaps()
+    const { rowGroupExpandedFlag } = tableReactData
+    const { rowGroupExpandedMaps } = tableInternalData
+    const rowGroupOpts = computeRowGroupOpts.value
+    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',
+        onClick (evnt: MouseEvent) {
+          $table.triggerRowGroupExpandEvent(evnt, params)
+        }
+      }, [
+        h('i', {
+          class: isExpand ? getIcon().TABLE_ROW_GROUP_OPEN : getIcon().TABLE_ROW_GROUP_CLOSE
+        })
+      ]),
+      h('div', {
+        class: 'vxe-row-group-cell'
+      }, cellVNodes)
+    ])
+  },
+  /**
+   * 树
+   */
+  renderTreeNodeBtn (params: VxeTableDefines.CellRenderBodyParams & { $table: VxeTableConstructor & VxeTablePrivateMethods }, cellVNodes: VxeComponentSlotType[]) {
     const { $table, isHidden } = params
     const tableReactData = $table.reactData
     const tableInternalData = $table.internalData
+    const { row, column, level } = params
+    const { slots } = column
+    const iconSlot = slots ? slots.icon : null
+    if (iconSlot) {
+      return $table.callSlot(iconSlot, params)
+    }
     const { computeTreeOpts } = $table.getComputeMaps()
     const { treeExpandedFlag } = tableReactData
     const { fullAllDataRowIdData, treeExpandedMaps, treeExpandLazyLoadedMaps } = tableInternalData
     const treeOpts = computeTreeOpts.value
-    const { row, column, level } = params
-    const { slots } = column
-    const { indent, lazy, trigger, iconLoaded, showIcon, iconOpen, iconClose } = treeOpts
+    const { padding, indent, lazy, trigger, iconLoaded, showIcon, iconOpen, iconClose } = treeOpts
     const childrenField = treeOpts.children || treeOpts.childrenField
     const hasChildField = treeOpts.hasChild || treeOpts.hasChildField
     const rowChilds = row[childrenField]
     const hasChild = rowChilds && rowChilds.length
-    const iconSlot = slots ? slots.icon : null
     let hasLazyChilds = false
     let isActive = false
     let isLazyLoading = false
     let isLazyLoaded = false
     const ons: Record<string, any> = {}
-    if (iconSlot) {
-      return $table.callSlot(iconSlot, params)
-    }
     if (!isHidden) {
       const rowid = getRowid($table, row)
       isActive = !!treeExpandedFlag && !!treeExpandedMaps[rowid]
@@ -463,32 +535,44 @@ export const Cell = {
         $table.triggerTreeExpandEvent(evnt, params)
       }
     }
-    return [
+    return h('div', {
+      class: ['vxe-cell--tree-node', {
+        'is--active': isActive
+      }],
+      style: padding && indent
+        ? {
+            paddingLeft: `${level * indent}px`
+          }
+        : undefined
+    }, [
+      showIcon && (lazy ? (isLazyLoaded ? hasChild : (hasChild || hasLazyChilds)) : hasChild)
+        ? [
+            h('div', {
+              class: 'vxe-cell--tree-btn',
+              ...ons
+            }, [
+              h('i', {
+                class: isLazyLoading ? (iconLoaded || getIcon().TABLE_TREE_LOADED) : (isActive ? (iconOpen || getIcon().TABLE_TREE_OPEN) : (iconClose || getIcon().TABLE_TREE_CLOSE))
+              })
+            ])
+          ]
+        : null,
       h('div', {
-        class: ['vxe-cell--tree-node', {
-          'is--active': isActive
-        }],
-        style: {
-          paddingLeft: `${level * indent}px`
-        }
-      }, [
-        showIcon && (lazy ? (isLazyLoaded ? hasChild : (hasChild || hasLazyChilds)) : hasChild)
-          ? [
-              h('div', {
-                class: 'vxe-tree--btn-wrapper',
-                ...ons
-              }, [
-                h('i', {
-                  class: ['vxe-tree--node-btn', isLazyLoading ? (iconLoaded || getIcon().TABLE_TREE_LOADED) : (isActive ? (iconOpen || getIcon().TABLE_TREE_OPEN) : (iconClose || getIcon().TABLE_TREE_CLOSE))]
-                })
-              ])
-            ]
-          : null,
-        h('div', {
-          class: 'vxe-tree-cell'
-        }, cellVNodes)
-      ])
-    ]
+        class: 'vxe-tree-cell'
+      }, cellVNodes)
+    ])
+  },
+  /**
+   * 层级节点。
+   * 行分组、树结构
+   */
+  renderDeepNodeBtn (params: VxeTableDefines.CellRenderBodyParams & { $table: VxeTableConstructor & VxeTablePrivateMethods }, cellVNodes: VxeComponentSlotType[]) {
+    const { row, column } = params
+    const { rowGroupNode } = column
+    if (rowGroupNode && row.isAggregate) {
+      return [Cell.renderRowGroupBtn(params, cellVNodes)]
+    }
+    return [Cell.renderTreeNodeBtn(params, cellVNodes)]
   },
 
   /**
@@ -517,8 +601,8 @@ export const Cell = {
       h('span', `${formatText(seqMethod ? seqMethod(params) : treeConfig ? seq : (seqOpts.startIndex || 0) + (seq as number), 1)}`)
     ])
   },
-  renderTreeIndexCell (params: VxeTableDefines.CellRenderBodyParams & { $table: VxeTableConstructor & VxeTablePrivateMethods }) {
-    return Cell.renderTreeIcon(params, Cell.renderSeqCell(params) as VNode[])
+  renderDeepIndexCell (params: VxeTableDefines.CellRenderBodyParams & { $table: VxeTableConstructor & VxeTablePrivateMethods }) {
+    return Cell.renderDeepNodeBtn(params, Cell.renderSeqCell(params) as VNode[])
   },
 
   /**
@@ -551,7 +635,7 @@ export const Cell = {
     const defaultSlot = slots ? slots.default : null
     const radioSlot = slots ? slots.radio : null
     const isChecked = $table.eqRow(row, selectRadioRow)
-    const isVisible = !visibleMethod || visibleMethod({ row })
+    const isVisible = !visibleMethod || visibleMethod({ $table, row })
     let isDisabled = !!checkMethod
     let ons
     if (!isHidden) {
@@ -563,7 +647,7 @@ export const Cell = {
         }
       }
       if (checkMethod) {
-        isDisabled = !checkMethod({ row })
+        isDisabled = !checkMethod({ $table, row })
       }
     }
     const radioParams = { ...params, checked: isChecked, disabled: isDisabled, visible: isVisible }
@@ -595,8 +679,8 @@ export const Cell = {
       }, radioVNs)
     ])
   },
-  renderTreeRadioCell (params: VxeTableDefines.CellRenderBodyParams & { $table: VxeTableConstructor & VxeTablePrivateMethods }) {
-    return Cell.renderTreeIcon(params, Cell.renderRadioCell(params))
+  renderDeepRadioCell (params: VxeTableDefines.CellRenderBodyParams & { $table: VxeTableConstructor & VxeTablePrivateMethods }) {
+    return Cell.renderDeepNodeBtn(params, Cell.renderRadioCell(params))
   },
 
   /**
@@ -663,7 +747,7 @@ export const Cell = {
     const tableReactData = $table.reactData
     const tableInternalData = $table.internalData
     const { treeConfig } = tableProps
-    const { updateCheckboxFlag } = tableReactData
+    const { updateCheckboxFlag, isRowGroupStatus } = tableReactData
     const { selectCheckboxMaps, treeIndeterminateRowMaps } = tableInternalData
     const { computeCheckboxOpts } = $table.getComputeMaps()
     const checkboxOpts = computeCheckboxOpts.value
@@ -673,7 +757,7 @@ export const Cell = {
     const checkboxSlot = slots ? slots.checkbox : null
     let indeterminate = false
     let isChecked = false
-    const isVisible = !visibleMethod || visibleMethod({ row })
+    const isVisible = !visibleMethod || visibleMethod({ $table, row })
     let isDisabled = !!checkMethod
     const ons: Record<string, any> = {}
     if (!isHidden) {
@@ -685,9 +769,9 @@ export const Cell = {
         }
       }
       if (checkMethod) {
-        isDisabled = !checkMethod({ row })
+        isDisabled = !checkMethod({ $table, row })
       }
-      if (treeConfig) {
+      if (treeConfig || isRowGroupStatus) {
         indeterminate = !!treeIndeterminateRowMaps[rowid]
       }
     }
@@ -722,8 +806,8 @@ export const Cell = {
       }, checkVNs)
     ])
   },
-  renderTreeSelectionCell (params: VxeTableDefines.CellRenderBodyParams & { $table: VxeTableConstructor & VxeTablePrivateMethods }) {
-    return Cell.renderTreeIcon(params, Cell.renderCheckboxCell(params))
+  renderDeepSelectionCell (params: VxeTableDefines.CellRenderBodyParams & { $table: VxeTableConstructor & VxeTablePrivateMethods }) {
+    return Cell.renderDeepNodeBtn(params, Cell.renderCheckboxCell(params))
   },
   renderCheckboxCellByProp (params: VxeTableDefines.CellRenderBodyParams & { $table: VxeTableConstructor & VxeTablePrivateMethods }) {
     const { $table, row, column, isHidden } = params
@@ -731,7 +815,7 @@ export const Cell = {
     const tableReactData = $table.reactData
     const tableInternalData = $table.internalData
     const { treeConfig } = tableProps
-    const { updateCheckboxFlag } = tableReactData
+    const { updateCheckboxFlag, isRowGroupStatus } = tableReactData
     const { treeIndeterminateRowMaps } = tableInternalData
     const { computeCheckboxOpts } = $table.getComputeMaps()
     const checkboxOpts = computeCheckboxOpts.value
@@ -742,7 +826,7 @@ export const Cell = {
     const checkboxSlot = slots ? slots.checkbox : null
     let isIndeterminate = false
     let isChecked = false
-    const isVisible = !visibleMethod || visibleMethod({ row })
+    const isVisible = !visibleMethod || visibleMethod({ $table, row })
     let isDisabled = !!checkMethod
     const ons: Record<string, any> = {}
     if (!isHidden) {
@@ -754,9 +838,9 @@ export const Cell = {
         }
       }
       if (checkMethod) {
-        isDisabled = !checkMethod({ row })
+        isDisabled = !checkMethod({ $table, row })
       }
-      if (treeConfig) {
+      if (treeConfig || isRowGroupStatus) {
         isIndeterminate = !!treeIndeterminateRowMaps[rowid]
       }
     }
@@ -791,8 +875,8 @@ export const Cell = {
       }, checkVNs)
     ])
   },
-  renderTreeSelectionCellByProp (params: VxeTableDefines.CellRenderBodyParams & { $table: VxeTableConstructor & VxeTablePrivateMethods }) {
-    return Cell.renderTreeIcon(params, Cell.renderCheckboxCellByProp(params))
+  renderDeepSelectionCellByProp (params: VxeTableDefines.CellRenderBodyParams & { $table: VxeTableConstructor & VxeTablePrivateMethods }) {
+    return Cell.renderDeepNodeBtn(params, Cell.renderCheckboxCellByProp(params))
   },
 
   /**
@@ -800,7 +884,9 @@ export const Cell = {
    */
   renderExpandCell (params: VxeTableDefines.CellRenderBodyParams & { $table: VxeTableConstructor & VxeTablePrivateMethods }) {
     const { $table, isHidden, row, column } = params
+    const tableReactData = $table.reactData
     const tableInternalData = $table.internalData
+    const { isRowGroupStatus } = tableReactData
     const { rowExpandedMaps, rowExpandLazyLoadedMaps } = tableInternalData
     const { computeExpandOpts } = $table.getComputeMaps()
     const expandOpts = computeExpandOpts.value
@@ -810,6 +896,9 @@ export const Cell = {
     const iconSlot = slots ? slots.icon : null
     let isActive = false
     let isLazyLoading = false
+    if (isRowGroupStatus && row.isAggregate) {
+      return renderCellBaseVNs(params, [])
+    }
     if (iconSlot) {
       return renderCellBaseVNs(params, $table.callSlot(iconSlot, params))
     }
@@ -881,8 +970,8 @@ export const Cell = {
       })
     ])
   },
-  renderTreeHTMLCell (params: VxeTableDefines.CellRenderBodyParams & { $table: VxeTableConstructor & VxeTablePrivateMethods }) {
-    return Cell.renderTreeIcon(params, Cell.renderHTMLCell(params))
+  renderDeepHTMLCell (params: VxeTableDefines.CellRenderBodyParams & { $table: VxeTableConstructor & VxeTablePrivateMethods }) {
+    return Cell.renderDeepNodeBtn(params, Cell.renderHTMLCell(params))
   },
 
   /**
@@ -1027,8 +1116,8 @@ export const Cell = {
     const { editRender } = column
     return Cell.runRenderer(params, isEnableConf(editRender) && actived && actived.row === params.row)
   },
-  renderTreeRowEdit (params: VxeTableDefines.CellRenderBodyParams & { $table: VxeTableConstructor & VxeTablePrivateMethods }) {
-    return Cell.renderTreeIcon(params, Cell.renderRowEdit(params) as VNode[])
+  renderDeepRowEdit (params: VxeTableDefines.CellRenderBodyParams & { $table: VxeTableConstructor & VxeTablePrivateMethods }) {
+    return Cell.renderDeepNodeBtn(params, Cell.renderRowEdit(params) as VNode[])
   },
   // 单元格编辑模式
   renderCellEdit (params: VxeTableDefines.CellRenderBodyParams & { $table: VxeTableConstructor & VxeTablePrivateMethods }) {
@@ -1039,8 +1128,8 @@ export const Cell = {
     const { editRender } = column
     return Cell.runRenderer(params, isEnableConf(editRender) && actived && actived.row === params.row && actived.column === params.column)
   },
-  renderTreeCellEdit (params: VxeTableDefines.CellRenderBodyParams & { $table: VxeTableConstructor & VxeTablePrivateMethods }) {
-    return Cell.renderTreeIcon(params, Cell.renderCellEdit(params) as VNode[])
+  renderDeepCellEdit (params: VxeTableDefines.CellRenderBodyParams & { $table: VxeTableConstructor & VxeTablePrivateMethods }) {
+    return Cell.renderDeepNodeBtn(params, Cell.renderCellEdit(params) as VNode[])
   },
   runRenderer (params: VxeTableDefines.CellRenderBodyParams & { $table: VxeTableConstructor & VxeTablePrivateMethods }, isEdit: boolean) {
     const { $table, column } = params

package/packages/table/src/column.ts

@@ -91,6 +91,8 @@ export const columnProps = {
   filterRecoverMethod: Function as PropType<VxeColumnPropTypes.FilterRecoverMethod>,
   // 筛选模板配置项
   filterRender: Object as PropType<VxeColumnPropTypes.FilterRender>,
+  // 设置为分组节点
+  rowGroupNode: Boolean as PropType<VxeColumnPropTypes.RowGroupNode>,
   // 设置为树节点
   treeNode: Boolean as PropType<VxeColumnPropTypes.TreeNode>,
   // 设置为拖拽排序

package/packages/table/src/columnInfo.ts

@@ -81,6 +81,7 @@ export class ColumnInfo {
       filterResetMethod: _vm.filterResetMethod,
       filterRecoverMethod: _vm.filterRecoverMethod,
       filterRender: _vm.filterRender,
+      rowGroupNode: _vm.rowGroupNode,
       treeNode: _vm.treeNode,
       dragSort: _vm.dragSort,
       rowResize: _vm.rowResize,

package/packages/table/src/emits.ts

@@ -47,6 +47,7 @@ export default [
 
   'column-resizable-change',
   'row-resizable-change',
+  'toggle-row-group-expand',
   'toggle-row-expand',
   'toggle-tree-expand',
   'menu-click',

package/packages/table/src/props.ts

@@ -186,19 +186,21 @@ export default {
   syncResize: [Boolean, String, Number],
   // 响应式布局配置项
   resizeConfig: Object as PropType<VxeTablePropTypes.ResizeConfig>,
-  // 列配置信息
+  // 列配置项
   columnConfig: Object as PropType<VxeTablePropTypes.ColumnConfig>,
-  // 当前列配置信息
+  // 当前列配置项
   currentColumnConfig: Object as PropType<VxeTablePropTypes.CurrentColumnConfig>,
-  // 单元格配置信息
+  // 单元格配置项
   cellConfig: Object as PropType<VxeTablePropTypes.CellConfig>,
-  // 表头单元格配置信息
+  // 表头单元格配置项
   headerCellConfig: Object as PropType<VxeTablePropTypes.HeaderCellConfig>,
-  // 表尾单元格配置信息
+  // 表尾单元格配置项
   footerCellConfig: Object as PropType<VxeTablePropTypes.FooterCellConfig>,
-  // 行配置信息
+  // 行配置项
   rowConfig: Object as PropType<VxeTablePropTypes.RowConfig>,
-  // 当前行配置信息
+  // 行分组配置项
+  rowGroupConfig: Object as PropType<VxeTablePropTypes.RowGroupConfig>,
+  // 当前行配置项
   currentRowConfig: Object as PropType<VxeTablePropTypes.CurrentRowConfig>,
   // 已废弃，被 rowDragConfig 替换
   dragConfig: Object as PropType<VxeTablePropTypes.DragConfig>,