vxe-table 4.13.45 → 4.13.47

package/packages/locale/lang/uk-UA.ts

@@ -79,6 +79,7 @@ export default {
       customCancel: 'Скасувати',
       customRestore: 'Відновити за замовчуванням',
       maxFixedCol: 'Максимальна кількість заморожених стовпців не може перевищувати {0}',
+      maxGroupCol: '最大分组字段的数量不能超过 {0} 个',
       dragTip: 'Перемістити: {0}',
       resizeColTip: 'Ширина: {0} пікселів',
       resizeRowTip: 'Висота: {0} пікселів',
@@ -561,7 +562,19 @@ export default {
       extendPivotTable: {
         aggregation: {
           grouping: '分组',
-          values: '值'
+          values: '值',
+          groupPlaceholder: '拖至此处进行分组',
+          valuesPlaceholder: '拖至此处进行聚合',
+          dragExistCol: '该列已存在'
+        },
+        aggFuncs: {
+          sum: '求和',
+          count: '计数',
+          avg: '平均值',
+          min: '最小值',
+          max: '最大值',
+          first: '首个值',
+          last: '末尾值'
         }
       },
       filterComplexInput: {

package/packages/locale/lang/uz-UZ.ts

@@ -79,6 +79,7 @@ export default {
       customCancel: 'Bekor qilmoq',
       customRestore: 'Standartni tiklash',
       maxFixedCol: 'Muzlatilgan ustunlarning maksimal soni {0} dan oshmaydi',
+      maxGroupCol: '最大分组字段的数量不能超过 {0} 个',
       dragTip: "Ko'chiring: {0}",
       resizeColTip: 'Kengligi: {0} piksel',
       resizeRowTip: 'Yuqori: {0} piksel',
@@ -561,7 +562,19 @@ export default {
       extendPivotTable: {
         aggregation: {
           grouping: '分组',
-          values: '值'
+          values: '值',
+          groupPlaceholder: '拖至此处进行分组',
+          valuesPlaceholder: '拖至此处进行聚合',
+          dragExistCol: '该列已存在'
+        },
+        aggFuncs: {
+          sum: '求和',
+          count: '计数',
+          avg: '平均值',
+          min: '最小值',
+          max: '最大值',
+          first: '首个值',
+          last: '末尾值'
         }
       },
       filterComplexInput: {

package/packages/locale/lang/vi-VN.ts

@@ -79,6 +79,7 @@ export default {
       customCancel: 'Hủy bỏ',
       customRestore: 'Khôi phục mặc định',
       maxFixedCol: 'Số lượng cột đóng băng tối đa không thể vượt quá {0}',
+      maxGroupCol: '最大分组字段的数量不能超过 {0} 个',
       dragTip: 'Di chuyển: {0}',
       resizeColTip: 'Chiều rộng: {0} pixel',
       resizeRowTip: 'Chiều cao: {0} pixel',
@@ -561,7 +562,19 @@ export default {
       extendPivotTable: {
         aggregation: {
           grouping: '分组',
-          values: '值'
+          values: '值',
+          groupPlaceholder: '拖至此处进行分组',
+          valuesPlaceholder: '拖至此处进行聚合',
+          dragExistCol: '该列已存在'
+        },
+        aggFuncs: {
+          sum: '求和',
+          count: '计数',
+          avg: '平均值',
+          min: '最小值',
+          max: '最大值',
+          first: '首个值',
+          last: '末尾值'
         }
       },
       filterComplexInput: {

package/packages/locale/lang/zh-CHT.ts

@@ -79,6 +79,7 @@ export default {
       customCancel: '取消',
       customRestore: '恢復默認',
       maxFixedCol: '最大凍結列的數量不能超過 {0} 個',
+      maxGroupCol: '最大分組欄位的數量不能超過 {0} 個',
       dragTip: '移動：{0}',
       resizeColTip: '寬：{0} 像素',
       resizeRowTip: '高：{0} 像素',
@@ -560,8 +561,20 @@ export default {
       },
       extendPivotTable: {
         aggregation: {
-          grouping: '分组',
-          values: '值'
+          grouping: '分組',
+          values: '值',
+          groupPlaceholder: '拖曳至此處進行分組',
+          valuesPlaceholder: '拖曳至此處進行聚合',
+          dragExistCol: '該列已存在'
+        },
+        aggFuncs: {
+          sum: '求和',
+          count: '计数',
+          avg: '平均值',
+          min: '最小值',
+          max: '最大值',
+          first: '首个值',
+          last: '末尾值'
         }
       },
       filterComplexInput: {

package/packages/locale/lang/zh-CN.ts

@@ -79,6 +79,7 @@ export default {
       customCancel: '取消',
       customRestore: '恢复默认',
       maxFixedCol: '最大冻结列的数量不能超过 {0} 个',
+      maxGroupCol: '最大分组字段的数量不能超过 {0} 个',
       dragTip: '移动：{0}',
       resizeColTip: '宽：{0} 像素',
       resizeRowTip: '高：{0} 像素',
@@ -561,7 +562,19 @@ export default {
       extendPivotTable: {
         aggregation: {
           grouping: '分组',
-          values: '值'
+          values: '值',
+          groupPlaceholder: '拖至此处进行分组',
+          valuesPlaceholder: '拖至此处进行聚合',
+          dragExistCol: '该列已存在'
+        },
+        aggFuncs: {
+          sum: '求和',
+          count: '计数',
+          avg: '平均值',
+          min: '最小值',
+          max: '最大值',
+          first: '首个值',
+          last: '末尾值'
         }
       },
       filterComplexInput: {

package/packages/table/module/custom/hook.ts

@@ -81,7 +81,7 @@ VxeUI.hooks.add('tableCustomModule', {
     const saveCustom = () => {
       const { customColumnList, aggHandleFields, rowGroupList } = reactData
       const customOpts = computeCustomOpts.value
-      const { allowVisible, allowSort, allowFixed, allowResizable } = customOpts
+      const { allowVisible, allowSort, allowFixed, allowResizable, allowGroup, allowValues } = customOpts
       XEUtils.eachTree(customColumnList, (column, index, items, path, parentColumn) => {
         if (parentColumn) {
           // 更新子列信息
@@ -106,6 +106,9 @@ VxeUI.hooks.add('tableCustomModule', {
         if (allowVisible) {
           column.visible = column.renderVisible
         }
+        if (allowGroup && allowValues) {
+          column.aggFunc = column.renderAggFn
+        }
       })
       reactData.isCustomStatus = true
       reactData.isDragColMove = true
@@ -113,14 +116,17 @@ VxeUI.hooks.add('tableCustomModule', {
         reactData.isDragColMove = false
       }, 1000)
       return $xeTable.saveCustomStore('confirm').then(() => {
-        if (($xeTable as any).handlePivotTableAggregateData) {
+        if (allowGroup && allowValues && ($xeTable as any).handlePivotTableAggregateData) {
           if (rowGroupList.length !== aggHandleFields.length || rowGroupList.some((conf, i) => conf.field !== aggHandleFields[i])) {
-          // 改动聚合分组
+            // 更新数据分组
             if (aggHandleFields.length) {
               $xeTable.setRowGroups(aggHandleFields)
             } else {
               $xeTable.clearRowGroups()
             }
+          } else {
+            // 更新聚合函数
+            $xeTable.handleUpdateAggData()
           }
         }
       })
@@ -207,7 +213,8 @@ VxeUI.hooks.add('tableCustomModule', {
           visible: true,
           resizable: options === true,
           fixed: options === true,
-          sort: options === true
+          sort: options === true,
+          aggFunc: options === true
         }, options)
         XEUtils.eachTree(collectColumn, (column) => {
           if (opts.resizable) {
@@ -222,12 +229,16 @@ VxeUI.hooks.add('tableCustomModule', {
           if (!checkMethod || checkMethod({ $table: $xeTable, column })) {
             column.visible = column.defaultVisible
           }
+          if (opts.aggFunc) {
+            column.aggFunc = column.defaultAggFunc
+            column.renderAggFn = column.defaultAggFunc
+          }
           column.renderResizeWidth = column.renderWidth
         })
         reactData.isCustomStatus = false
         $xeTable.saveCustomStore('reset')
         return $xeTable.handleCustom().then(() => {
-          if (($xeTable as any).handlePivotTableAggregateData) {
+          if (opts.aggFunc && ($xeTable as any).handlePivotTableAggregateData) {
             const rowGroupFields = computeRowGroupFields.value
             if (rowGroupFields ? rowGroupFields.length : rowGroupList.length) {
               if (rowGroupFields && rowGroupFields.length) {
@@ -235,6 +246,8 @@ VxeUI.hooks.add('tableCustomModule', {
               } else {
                 $xeTable.clearRowGroups()
               }
+            } else {
+              $xeTable.handleUpdateAggData()
             }
           }
         })

package/packages/table/module/custom/panel.ts

@@ -39,15 +39,17 @@ export default defineVxeComponent({
     const refDragLineElem = ref() as Ref<HTMLDivElement>
     const refDragTipElem = ref() as Ref<HTMLDivElement>
 
-    const customPanelReactData: TableCustomPanelReactData = reactive({
+    const customPanelReactData = reactive<TableCustomPanelReactData>({
       dragCol: null,
-      dragGroup: null,
-      dragValues: null,
+      dragGroupField: null,
+      dragAggFnCol: null,
       dragTipText: ''
     })
 
     const customPanelInternalData: TableCustomPanelInternalData = {
       // prevDragCol: undefined,
+      // prevDragGroupField: undefined,
+      // prevDragAggFnColid: undefined,
       // prevDragToChild: false,
       // prevDragPos: null
     }
@@ -230,8 +232,8 @@ export default defineVxeComponent({
       const { prevDragToChild } = customPanelInternalData
       const bodyWrapperRect = bodyWrapperElem.getBoundingClientRect()
       const customBodyRect = customBodyElem.getBoundingClientRect()
+      const dragLineEl = refDragLineElem.value
       if (optEl) {
-        const dragLineEl = refDragLineElem.value
         if (dragLineEl) {
           if (showLine) {
             const optRect = optEl.getBoundingClientRect()
@@ -246,6 +248,10 @@ export default defineVxeComponent({
             dragLineEl.style.display = ''
           }
         }
+      } else {
+        if (dragLineEl) {
+          dragLineEl.style.display = 'node'
+        }
       }
       const dragTipEl = refDragTipElem.value
       if (dragTipEl) {
@@ -293,6 +299,8 @@ export default defineVxeComponent({
       const column = $xeTable.getColumnById(colid)
       trEl.draggable = true
       customPanelReactData.dragCol = column
+      customPanelReactData.dragGroupField = null
+      customPanelReactData.dragAggFnCol = null
       updateColDropTipContent()
       addClass(trEl, 'active--drag-origin')
     }
@@ -305,6 +313,8 @@ export default defineVxeComponent({
       hideDropTip()
       trEl.draggable = false
       customPanelReactData.dragCol = null
+      customPanelReactData.dragGroupField = null
+      customPanelReactData.dragAggFnCol = null
       removeClass(trEl, 'active--drag-origin')
     }
 
@@ -312,8 +322,8 @@ export default defineVxeComponent({
       if (evnt.dataTransfer) {
         evnt.dataTransfer.setDragImage(getTpImg(), 0, 0)
       }
-      customPanelReactData.dragGroup = null
-      customPanelReactData.dragValues = null
+      customPanelInternalData.prevDragGroupField = null
+      customPanelInternalData.prevDragAggFnColid = null
     }
 
     const sortDragendEvent = (evnt: DragEvent) => {
@@ -325,11 +335,11 @@ export default defineVxeComponent({
       const trEl = evnt.currentTarget as HTMLElement
       const columnDragOpts = computeColumnDragOpts.value
       const { isCrossDrag, isSelfToChildDrag, isToChildDrag, dragEndMethod } = columnDragOpts
-      const { dragCol, dragGroup, dragValues } = customPanelReactData
-      const { prevDragCol, prevDragPos, prevDragToChild } = customPanelInternalData
+      const { dragCol } = customPanelReactData
+      const { prevDragCol, prevDragGroupField, prevDragAggFnColid, prevDragPos, prevDragToChild } = customPanelInternalData
       const dragOffsetIndex = prevDragPos === 'bottom' ? 1 : 0
 
-      if (dragGroup || dragValues) {
+      if (prevDragGroupField || prevDragAggFnColid) {
         if ($xeTable.handlePivotTableAggregatePanelDragendEvent) {
           $xeTable.handlePivotTableAggregatePanelDragendEvent(evnt)
         }
@@ -499,8 +509,10 @@ export default defineVxeComponent({
 
       hideDropTip()
       customPanelReactData.dragCol = null
-      customPanelReactData.dragGroup = null
-      customPanelReactData.dragValues = null
+      customPanelReactData.dragGroupField = null
+      customPanelReactData.dragAggFnCol = null
+      customPanelInternalData.prevDragGroupField = null
+      customPanelInternalData.prevDragAggFnColid = null
       trEl.draggable = false
       trEl.removeAttribute('drag-pos')
       removeClass(trEl, 'active--drag-target')
@@ -517,14 +529,15 @@ export default defineVxeComponent({
       const colid = optEl.getAttribute('colid')
       const column = $xeTable.getColumnById(colid)
       const { dragCol } = customPanelReactData
-      customPanelReactData.dragGroup = null
-      customPanelReactData.dragValues = null
+      customPanelInternalData.prevDragGroupField = null
+      customPanelInternalData.prevDragAggFnColid = null
       // 是否移入有效列
       if (column && (isCrossDrag || column.level === 1)) {
         evnt.preventDefault()
         const offsetY = evnt.clientY - optEl.getBoundingClientRect().y
         const dragPos = offsetY < optEl.clientHeight / 2 ? 'top' : 'bottom'
         if (
+          !dragCol ||
           (dragCol && dragCol.id === column.id) ||
           (!isCrossDrag && column.level > 1) ||
           (!immediate && column.level > 1) ||

package/packages/table/src/columnInfo.ts

@@ -106,6 +106,7 @@ export class ColumnInfo {
       halfVisible: false,
       defaultVisible: visible,
       defaultFixed: _vm.fixed,
+      defaultAggFunc: _vm.aggFunc,
 
       checked: false,
       halfChecked: false,

package/packages/table/src/table.ts

@@ -20,7 +20,7 @@ import TableExportPanelComponent from '../module/export/export-panel'
 import TableMenuPanelComponent from '../module/menu/panel'
 
 import type { VxeLoadingComponent, VxeTooltipInstance, VxeTooltipComponent, VxeTabsConstructor, VxeTabsPrivateMethods, ValueOf, VxeComponentSlotType } from 'vxe-pc-ui'
-import type { VxeGridConstructor, VxeGridPrivateMethods, VxeTableConstructor, TableReactData, TableInternalData, VxeTablePropTypes, VxeToolbarConstructor, TablePrivateMethods, VxeTablePrivateRef, VxeTablePrivateComputed, VxeTablePrivateMethods, TableMethods, VxeTableMethods, VxeTableDefines, VxeTableEmits, VxeTableProps, VxeColumnPropTypes } from '../../../types'
+import type { VxeGridConstructor, VxeGridPrivateMethods, VxeTableConstructor, TableReactData, TableInternalData, VxeTablePropTypes, VxeToolbarConstructor, TablePrivateMethods, VxeTablePrivateRef, VxeTablePrivateComputed, VxeTablePrivateMethods, TableMethods, VxeTableMethods, VxeTableDefines, VxeTableEmits, VxeTableProps, VxeColumnPropTypes, VxeTableCustomPanelConstructor } from '../../../types'
 
 const { getConfig, getIcon, getI18n, renderer, formats, createEvent, globalResize, interceptor, hooks, globalEvents, GLOBAL_EVENT_KEYS, useFns, renderEmptyElement } = VxeUI
 
@@ -249,6 +249,7 @@ export default defineVxeComponent({
       isRowGroupStatus: false,
       rowGroupList: [],
       aggHandleFields: [],
+      aggHandleAggColumns: [],
 
       rowGroupExpandedFlag: 1,
       rowExpandedFlag: 1,
@@ -422,7 +423,7 @@ export default defineVxeComponent({
     const refValidTooltip = ref() as Ref<VxeTooltipInstance>
     const refTableMenu = ref() as Ref<any>
     const refTableFilter = ref() as Ref<any>
-    const refTableCustom = ref() as Ref<ComponentPublicInstance>
+    const refTableCustom = ref() as Ref<VxeTableCustomPanelConstructor>
 
     const refTableViewportElem = ref<HTMLDivElement>()
     const refTableHeader = ref() as Ref<ComponentPublicInstance>
@@ -1544,7 +1545,8 @@ export default defineVxeComponent({
       const isCustomVisible = hangleStorageDefaultValue(storageOpts.visible, isAllCustom)
       const isCustomFixed = hangleStorageDefaultValue(storageOpts.fixed, isAllCustom)
       const isCustomSort = hangleStorageDefaultValue(storageOpts.sort, isAllCustom)
-      if (storage && (customConfig ? isEnableConf(customOpts) : customOpts.enabled) && (isCustomResizable || isCustomVisible || isCustomFixed || isCustomSort)) {
+      const isCustomAggFunc = hangleStorageDefaultValue(storageOpts.aggFunc, isAllCustom)
+      if (storage && (customConfig ? isEnableConf(customOpts) : customOpts.enabled) && (isCustomResizable || isCustomVisible || isCustomFixed || isCustomSort || isCustomAggFunc)) {
         if (!tableId) {
           errLog('vxe.error.reqProp', ['id'])
           return
@@ -3148,6 +3150,17 @@ export default defineVxeComponent({
       })
     }
 
+    const handleUpdateAggValues = () => {
+      const { visibleColumn } = internalData
+      const aggCols: VxeTableDefines.ColumnInfo[] = []
+      visibleColumn.forEach(column => {
+        if (column.aggFunc) {
+          aggCols.push(column)
+        }
+      })
+      reactData.aggHandleAggColumns = aggCols
+    }
+
     const handleUpdateRowGroup = (groupFields?: string[]) => {
       const aggFields: string[] = []
       const aggConfs: { field: string }[] = []
@@ -3161,6 +3174,7 @@ export default defineVxeComponent({
       }
       reactData.rowGroupList = aggConfs
       reactData.aggHandleFields = aggFields
+      handleUpdateAggValues()
     }
 
     const handleeGroupSummary = (aggList: VxeTableDefines.AggregateRowInfo[]) => {
@@ -3645,6 +3659,7 @@ export default defineVxeComponent({
         }
       })
       handleTableColumn()
+      handleUpdateAggValues()
       if (isReset) {
         updateColumnOffsetLeft()
         return $xeTable.updateFooter().then(() => {
@@ -6226,12 +6241,25 @@ export default defineVxeComponent({
       },
       setRowGroups (fieldOrColumns) {
         const { aggregateConfig, rowGroupConfig } = props
+        const { rowGroupList } = reactData
+        const aggregateOpts = computeAggregateOpts.value
+        const { maxGroupSize } = aggregateOpts
         if (!(aggregateConfig || rowGroupConfig)) {
           errLog('vxe.error.reqProp', ['aggregate-config'])
           return nextTick()
         }
-        if (fieldOrColumns) {
-          handleUpdateRowGroup((XEUtils.isArray(fieldOrColumns) ? fieldOrColumns : [fieldOrColumns]).map(fieldOrColumn => {
+        const confList = fieldOrColumns ? (XEUtils.isArray(fieldOrColumns) ? fieldOrColumns : [fieldOrColumns]) : []
+        if (maxGroupSize && (rowGroupList.length + confList.length > maxGroupSize)) {
+          if (VxeUI.modal) {
+            VxeUI.modal.message({
+              status: 'error',
+              content: getI18n('vxe.table.maxGroupCol', [maxGroupSize])
+            })
+          }
+          return nextTick()
+        }
+        if (confList.length) {
+          handleUpdateRowGroup(confList.map(fieldOrColumn => {
             return XEUtils.isString(fieldOrColumn) ? fieldOrColumn : fieldOrColumn.field
           }))
           return loadTableData(internalData.tableSynchData, true)
@@ -6756,15 +6784,18 @@ export default defineVxeComponent({
         const isCustomVisible = hangleStorageDefaultValue(storageOpts.visible, isAllCustom)
         const isCustomFixed = hangleStorageDefaultValue(storageOpts.fixed, isAllCustom)
         const isCustomSort = hangleStorageDefaultValue(storageOpts.sort, isAllCustom)
+        const isCustomAggFunc = hangleStorageDefaultValue(storageOpts.aggFunc, isAllCustom)
         const resizableData: Record<string, number> = {}
         const sortData: Record<string, number> = {}
         const visibleData: Record<string, boolean> = {}
         const fixedData: Record<string, VxeColumnPropTypes.Fixed> = {}
+        const aggFuncData: Record<string, VxeColumnPropTypes.AggFunc> = {}
         const storeData: VxeTableDefines.CustomStoreData = {
           resizableData: undefined,
           sortData: undefined,
           visibleData: undefined,
-          fixedData: undefined
+          fixedData: undefined,
+          aggFuncData: undefined
         }
         if (!id) {
           if (storage) {
@@ -6776,6 +6807,7 @@ export default defineVxeComponent({
         let hasSort = 0
         let hasFixed = 0
         let hasVisible = 0
+        let hasAggFunc = 0
         XEUtils.eachTree(collectColumn, (column, index, items, path, parentColumn) => {
           const colKey = column.getKey()
           if (!colKey) {
@@ -6806,6 +6838,10 @@ export default defineVxeComponent({
               visibleData[colKey] = true
             }
           }
+          if (isCustomAggFunc && column.aggFunc !== column.defaultAggFunc) {
+            hasAggFunc = 1
+            aggFuncData[colKey] = column.aggFunc
+          }
         })
         if (hasResizable) {
           storeData.resizableData = resizableData
@@ -6819,6 +6855,9 @@ export default defineVxeComponent({
         if (hasVisible) {
           storeData.visibleData = visibleData
         }
+        if (hasAggFunc) {
+          storeData.aggFuncData = aggFuncData
+        }
         return storeData
       },
       focus () {
@@ -6863,7 +6902,7 @@ export default defineVxeComponent({
       if (tableFilter) {
         if (getEventTargetNode(evnt, el, 'vxe-cell--filter').flag) {
           // 如果点击了筛选按钮
-        } else if (getEventTargetNode(evnt, tableFilter.getRefMaps().refElem.value as HTMLDivElement).flag) {
+        } else if (getEventTargetNode(evnt, tableFilter.getRefMaps().refElem.value).flag) {
           // 如果点击筛选容器
         } else {
           if (!getEventTargetNode(evnt, document.body, 'vxe-table--ignore-clear').flag) {
@@ -6875,7 +6914,7 @@ export default defineVxeComponent({
       if (tableCustom) {
         if (customStore.btnEl === evnt.target || getEventTargetNode(evnt, document.body, 'vxe-toolbar-custom-target').flag) {
           // 如果点击了自定义列按钮
-        } else if (getEventTargetNode(evnt, tableCustom.$el as HTMLDivElement).flag) {
+        } else if (getEventTargetNode(evnt, tableCustom.getRefMaps().refElem.value).flag) {
           // 如果点击自定义列容器
         } else {
           if (!getEventTargetNode(evnt, document.body, 'vxe-table--ignore-clear').flag) {
@@ -8247,11 +8286,12 @@ export default defineVxeComponent({
         const isCustomVisible = hangleStorageDefaultValue(storageOpts.visible, isAllCustom)
         const isCustomFixed = hangleStorageDefaultValue(storageOpts.fixed, isAllCustom)
         const isCustomSort = hangleStorageDefaultValue(storageOpts.sort, isAllCustom)
+        const isCustomAggFunc = hangleStorageDefaultValue(storageOpts.aggFunc, isAllCustom)
         if (type !== 'reset') {
           // fix：修复拖动列宽，重置按钮无法点击的问题
           reactData.isCustomStatus = true
         }
-        if (storage && (customConfig ? isEnableConf(customOpts) : customOpts.enabled) && (isCustomResizable || isCustomVisible || isCustomFixed || isCustomSort)) {
+        if (storage && (customConfig ? isEnableConf(customOpts) : customOpts.enabled) && (isCustomResizable || isCustomVisible || isCustomFixed || isCustomSort || isCustomAggFunc)) {
           if (!tableId) {
             errLog('vxe.error.reqProp', ['id'])
             return nextTick()
@@ -8377,7 +8417,7 @@ export default defineVxeComponent({
           }
 
           childRowList.forEach(vals => {
-            const row: string = vals[0]
+            const row = vals[0]
             const rowid: string = vals[1]
             const childList: any[] = vals[2]
             let sLen = 0 // 已选
@@ -8414,8 +8454,17 @@ export default defineVxeComponent({
                   vLen++
                 }
             )
-            const isSelected = selectCheckboxMaps[rowid] || (sLen >= vLen && (vLen >= 1 || hLen >= 1))
+
+            let isSelected = (sLen >= vLen && (vLen >= 1 || hLen >= 1))
+            if (checkMethod) {
+              if (checkMethod({ $table: $xeTable, row })) {
+                isSelected = sLen >= vLen
+              } else {
+                isSelected = selectCheckboxMaps[rowid]
+              }
+            }
             const halfSelect = !isSelected && (sLen >= 1 || hLen >= 1)
+
             if (checkField) {
               XEUtils.set(row, checkField, isSelected)
             }
@@ -10612,6 +10661,9 @@ export default defineVxeComponent({
           }
         }
       },
+      handleUpdateAggData () {
+        return loadTableData(internalData.tableSynchData, true)
+      },
       updateZindex () {
         if (props.zIndex) {
           internalData.tZindex = props.zIndex
@@ -11629,6 +11681,16 @@ export default defineVxeComponent({
             return
           }
         }
+        if (!$xeTable.handlePivotTableAggregateData) {
+          if (customOpts.allowGroup) {
+            errLog('vxe.error.notProp', ['custom-config.allowGroup'])
+            return
+          }
+          if (customOpts.allowValues) {
+            errLog('vxe.error.notProp', ['custom-config.allowValues'])
+            return
+          }
+        }
         if (treeConfig && rowOpts.drag && !treeOpts.transform) {
           errLog('vxe.error.notSupportProp', ['column-config.drag', 'tree-config.transform=false', 'tree-config.transform=true'])
         }
@@ -11641,8 +11703,8 @@ export default defineVxeComponent({
         if (aggregateOpts.countFields) {
           warnLog('vxe.error.delProp', ['row-group-config.countFields', 'column.agg-func'])
         }
-        if (aggregateOpts.countMethod) {
-          warnLog('vxe.error.delProp', ['row-group-config.countMethod', 'aggregate-config.aggregateMethod'])
+        if (aggregateOpts.aggregateMethod) {
+          warnLog('vxe.error.delProp', ['row-group-config.aggregateMethod', 'aggregate-config.countMethod'])
         }
         if (props.treeConfig && treeOpts.children) {
           warnLog('vxe.error.delProp', ['tree-config.children', 'tree-config.childrenField'])

package/packages/ui/index.ts

@@ -108,6 +108,7 @@ VxeUI.setConfig({
         // rowGroup: false,
         // aggFunc: false
       },
+      // autoAggGroupValues: false,
       //  checkMethod () {},
       modalOptions: {
         showMaximize: true,
@@ -147,7 +148,8 @@ VxeUI.setConfig({
       childrenField: '_X_ROW_CHILDREN',
       mapChildrenField: '_X_ROW_CHILD_LIST',
       indent: 20,
-      showIcon: true
+      showIcon: true,
+      maxGroupSize: 4
     },
     treeConfig: {
       padding: true,
@@ -320,9 +322,10 @@ VxeUI.setIcon({
   TABLE_DRAG_DISABLED: iconPrefix + 'no-drop',
   TABLE_ROW_GROUP_OPEN: iconPrefix + 'arrow-right rotate90',
   TABLE_ROW_GROUP_CLOSE: iconPrefix + 'arrow-right',
-  TABLE_AGGREGATION_GROUPING: iconPrefix + 'grouping',
-  TABLE_AGGREGATION_VALUES: iconPrefix + 'values',
-  TABLE_AGGREGATION_DELETE: iconPrefix + 'close',
+  TABLE_AGGREGATE_GROUPING: iconPrefix + 'grouping',
+  TABLE_AGGREGATE_VALUES: iconPrefix + 'values',
+  TABLE_AGGREGATE_SORT: iconPrefix + 'drag-handle',
+  TABLE_AGGREGATE_DELETE: iconPrefix + 'close',
 
   // toolbar
   TOOLBAR_TOOLS_REFRESH: iconPrefix + 'repeat',