vxe-table 4.13.33 → 4.13.35

package/packages/grid/src/grid.ts

@@ -17,7 +17,7 @@ const { getConfig, getI18n, commands, hooks, useFns, createEvent, globalEvents,
 
 const tableComponentPropKeys = Object.keys(tableComponentProps as any)
 
-const tableComponentMethodKeys: (keyof VxeTableMethods)[] = ['clearAll', 'syncData', 'updateData', 'loadData', 'reloadData', 'reloadRow', 'loadColumn', 'reloadColumn', 'getRowNode', 'getColumnNode', 'getRowIndex', 'getVTRowIndex', 'getVMRowIndex', 'getColumnIndex', 'getVTColumnIndex', 'getVMColumnIndex', 'setRow', 'createData', 'createRow', 'revertData', 'clearData', 'isRemoveByRow', 'isInsertByRow', 'isUpdateByRow', 'getColumns', 'getColumnById', 'getColumnByField', 'getTableColumn', 'getFullColumns', 'getData', 'getCheckboxRecords', 'getParentRow', 'getTreeRowChildren', 'getTreeParentRow', 'getRowSeq', 'getRowById', 'getRowid', 'getTableData', 'getFullData', 'setColumnFixed', 'clearColumnFixed', 'setColumnWidth', 'getColumnWidth', 'setRowHeightConf', 'getRowHeightConf', 'setRowHeight', 'getRowHeight', 'hideColumn', 'showColumn', 'resetColumn', 'refreshColumn', 'refreshScroll', 'recalculate', 'closeTooltip', 'isAllCheckboxChecked', 'isAllCheckboxIndeterminate', 'getCheckboxIndeterminateRecords', 'setCheckboxRow', 'setCheckboxRowKey', 'isCheckedByCheckboxRow', 'isCheckedByCheckboxRowKey', 'isIndeterminateByCheckboxRow', 'isIndeterminateByCheckboxRowKey', 'toggleCheckboxRow', 'setAllCheckboxRow', 'getRadioReserveRecord', 'clearRadioReserve', 'getCheckboxReserveRecords', 'clearCheckboxReserve', 'toggleAllCheckboxRow', 'clearCheckboxRow', 'setCurrentRow', 'isCheckedByRadioRow', 'isCheckedByRadioRowKey', 'setRadioRow', 'setRadioRowKey', 'clearCurrentRow', 'clearRadioRow', 'getCurrentRecord', 'getRadioRecord', 'getCurrentColumn', 'setCurrentColumn', 'clearCurrentColumn', 'setPendingRow', 'togglePendingRow', 'hasPendingByRow', 'isPendingByRow', 'getPendingRecords', 'clearPendingRow', 'sort', 'setSort', 'clearSort', 'clearSortByEvent', 'isSort', 'getSortColumns', 'closeFilter', 'isFilter', 'clearFilterByEvent', 'isActiveFilterByColumn', 'isRowExpandLoaded', 'clearRowExpandLoaded', 'reloadRowExpand', 'reloadRowExpand', 'toggleRowExpand', 'setAllRowExpand', 'setRowExpand', 'isExpandByRow', 'isRowExpandByRow', 'clearRowExpand', 'clearRowExpandReserve', 'getRowExpandRecords', 'getTreeExpandRecords', 'isTreeExpandLoaded', 'clearTreeExpandLoaded', 'reloadTreeExpand', 'reloadTreeChilds', 'toggleTreeExpand', 'setAllTreeExpand', 'setTreeExpand', 'isTreeExpandByRow', 'clearTreeExpand', 'clearTreeExpandReserve', 'getScroll', 'scrollTo', 'scrollToRow', 'scrollToColumn', 'clearScroll', 'updateFooter', 'updateStatus', 'setMergeCells', 'removeInsertRow', 'removeMergeCells', 'getMergeCells', 'clearMergeCells', 'setMergeFooterItems', 'removeMergeFooterItems', 'getMergeFooterItems', 'clearMergeFooterItems', 'getCustomStoreData', 'setRowGroupExpand', 'setAllRowGroupExpand', 'clearRowGroupExpand', 'isRowGroupExpandByRow', 'isRowGroupRecord', 'setRowGroups', 'clearRowGroups', 'openTooltip', 'moveColumnTo', 'moveRowTo', 'getCellLabel', 'getCellElement', 'focus', 'blur', 'connect']
+const tableComponentMethodKeys: (keyof VxeTableMethods)[] = ['clearAll', 'syncData', 'updateData', 'loadData', 'reloadData', 'reloadRow', 'loadColumn', 'reloadColumn', 'getRowNode', 'getColumnNode', 'getRowIndex', 'getVTRowIndex', 'getVMRowIndex', 'getColumnIndex', 'getVTColumnIndex', 'getVMColumnIndex', 'setRow', 'createData', 'createRow', 'revertData', 'clearData', 'isRemoveByRow', 'isInsertByRow', 'isUpdateByRow', 'getColumns', 'getColumnById', 'getColumnByField', 'getTableColumn', 'getFullColumns', 'getData', 'getCheckboxRecords', 'getParentRow', 'getTreeRowChildren', 'getTreeParentRow', 'getRowSeq', 'getRowById', 'getRowid', 'getTableData', 'getFullData', 'setColumnFixed', 'clearColumnFixed', 'setColumnWidth', 'getColumnWidth', 'setRowHeightConf', 'getRowHeightConf', 'setRowHeight', 'getRowHeight', 'hideColumn', 'showColumn', 'resetColumn', 'refreshColumn', 'refreshScroll', 'recalculate', 'closeTooltip', 'isAllCheckboxChecked', 'isAllCheckboxIndeterminate', 'getCheckboxIndeterminateRecords', 'setCheckboxRow', 'setCheckboxRowKey', 'isCheckedByCheckboxRow', 'isCheckedByCheckboxRowKey', 'isIndeterminateByCheckboxRow', 'isIndeterminateByCheckboxRowKey', 'toggleCheckboxRow', 'setAllCheckboxRow', 'getRadioReserveRecord', 'clearRadioReserve', 'getCheckboxReserveRecords', 'clearCheckboxReserve', 'toggleAllCheckboxRow', 'clearCheckboxRow', 'setCurrentRow', 'isCheckedByRadioRow', 'isCheckedByRadioRowKey', 'setRadioRow', 'setRadioRowKey', 'clearCurrentRow', 'clearRadioRow', 'getCurrentRecord', 'getRadioRecord', 'getCurrentColumn', 'setCurrentColumn', 'clearCurrentColumn', 'setPendingRow', 'togglePendingRow', 'hasPendingByRow', 'isPendingByRow', 'getPendingRecords', 'clearPendingRow', 'sort', 'setSort', 'clearSort', 'clearSortByEvent', 'isSort', 'getSortColumns', 'closeFilter', 'isFilter', 'clearFilterByEvent', 'isActiveFilterByColumn', 'isRowExpandLoaded', 'clearRowExpandLoaded', 'reloadRowExpand', 'reloadRowExpand', 'toggleRowExpand', 'setAllRowExpand', 'setRowExpand', 'isExpandByRow', 'isRowExpandByRow', 'clearRowExpand', 'clearRowExpandReserve', 'getRowExpandRecords', 'getTreeExpandRecords', 'isTreeExpandLoaded', 'clearTreeExpandLoaded', 'reloadTreeExpand', 'reloadTreeChilds', 'toggleTreeExpand', 'setAllTreeExpand', 'setTreeExpand', 'isTreeExpandByRow', 'clearTreeExpand', 'clearTreeExpandReserve', 'getScroll', 'scrollTo', 'scrollToRow', 'scrollToColumn', 'clearScroll', 'updateFooter', 'updateStatus', 'setMergeCells', 'removeInsertRow', 'removeMergeCells', 'getMergeCells', 'clearMergeCells', 'setMergeFooterItems', 'removeMergeFooterItems', 'getMergeFooterItems', 'clearMergeFooterItems', 'getCustomStoreData', 'setRowGroupExpand', 'setAllRowGroupExpand', 'clearRowGroupExpand', 'isRowGroupExpandByRow', 'isRowGroupRecord', 'isAggregateRecord', 'isAggregateExpandByRow', 'setRowGroups', 'clearRowGroups', 'openTooltip', 'moveColumnTo', 'moveRowTo', 'getCellLabel', 'getCellElement', 'focus', 'blur', 'connect']
 
 const gridComponentEmits: VxeGridEmits = [
   ...tableComponentEmits,

package/packages/table/src/body.ts

@@ -1,7 +1,7 @@
 import { defineComponent, TransitionGroup, h, ref, Ref, PropType, inject, nextTick, onMounted, onUnmounted } from 'vue'
 import XEUtils from 'xe-utils'
 import { VxeUI } from '../../ui'
-import { getOffsetSize, calcTreeLine, getRowid, createHandleGetRowId } from './util'
+import { getOffsetSize, calcTreeLine, getRowid, createHandleGetRowId, getCellRestHeight } from './util'
 import { updateCellTitle, getPropClass } from '../../ui/src/dom'
 import { isEnableConf } from '../../ui/src/utils'
 import { getSlotVNs } from '../../ui/src/vn'
@@ -234,6 +234,7 @@ export default defineComponent({
         $xeTable.triggerCellDblclickEvent(evnt, cellParams)
       }
       let isMergeCell = false
+      let mergeRowspan = 1
       // 合并行或列
       if (mergeBodyFlag && mergeBodyList.length) {
         const spanRest = mergeBodyCellMaps[`${_rowIndex}:${_columnIndex}`]
@@ -244,6 +245,7 @@ export default defineComponent({
           }
           if (rowspan > 1) {
             isMergeCell = true
+            mergeRowspan = rowspan
             tdAttrs.rowspan = rowspan
           }
           if (colspan > 1) {
@@ -258,9 +260,12 @@ export default defineComponent({
           return null
         }
         if (rowspan > 1) {
+          isMergeCell = true
+          mergeRowspan = rowspan
           tdAttrs.rowspan = rowspan
         }
         if (colspan > 1) {
+          isMergeCell = true
           tdAttrs.colspan = colspan
         }
       }
@@ -276,7 +281,7 @@ export default defineComponent({
       }
 
       const isVNAutoHeight = scrollYLoad && !hasEllipsis
-      const cellHeight = rowRest.resizeHeight || cellOpts.height || rowOpts.height || rowRest.height || defaultRowHeight
+      let cellHeight = getCellRestHeight(rowRest, cellOpts, rowOpts, defaultRowHeight)
 
       const isLastColumn = $columnIndex === columns.length - 1
       const isAutoCellWidth = !column.resizeWidth && (column.minWidth === 'auto' || column.width === 'auto')
@@ -292,6 +297,16 @@ export default defineComponent({
         }
       }
 
+      if (mergeRowspan > 1) {
+        const mEndRow = afterFullData[_rowIndex + mergeRowspan - 1]
+        if (mEndRow) {
+          const meRowRest = fullAllDataRowIdData[getRowid($xeTable, mEndRow)]
+          if (meRowRest) {
+            cellHeight += meRowRest.oTop - rowRest.oTop + getCellRestHeight(meRowRest, cellOpts, rowOpts, defaultRowHeight)
+          }
+        }
+      }
+
       const tcStyle: Record<string, string> = {}
       if (hasEllipsis && resizeWidthFlag) {
         let tsColspan = tdAttrs.colspan || 0
@@ -326,8 +341,10 @@ export default defineComponent({
         )
       } else {
         // 渲染单元格
+        if (treeConfig) {
+          tdVNs.push(...renderLine(rowid, cellParams, cellHeight))
+        }
         tdVNs.push(
-          ...renderLine(rowid, cellParams, cellHeight),
           h('div', {
             key: 'tc',
             class: ['vxe-cell', {

package/packages/table/src/cell.ts

@@ -288,12 +288,12 @@ function renderCellHandle (params: VxeTableDefines.CellRenderBodyParams & {
   const { isRowGroupStatus } = tableReactData
   const { editConfig } = tableProps
   const { type, treeNode, rowGroupNode, editRender } = column
-  const { computeEditOpts, computeCheckboxOpts, computeRowGroupOpts } = $table.getComputeMaps()
-  const rowGroupOpts = computeRowGroupOpts.value
-  const { mode } = rowGroupOpts
+  const { computeEditOpts, computeCheckboxOpts, computeAggregateOpts } = $table.getComputeMaps()
+  const aggregateOpts = computeAggregateOpts.value
+  const { mode } = aggregateOpts
   const checkboxOpts = computeCheckboxOpts.value
   const editOpts = computeEditOpts.value
-  const isDeepCell = treeNode || (isRowGroupStatus && row.isAggregate && (mode === 'column' ? column.field === row.groupField : rowGroupNode))
+  const isDeepCell = treeNode || (isRowGroupStatus && (mode === 'column' ? column.field === row.groupField : rowGroupNode))
   switch (type) {
     case 'seq':
       return isDeepCell ? Cell.renderDeepIndexCell(params) : Cell.renderSeqCell(params)
@@ -397,7 +397,7 @@ export const Cell = {
     const tableReactData = $table.reactData
     const tableInternalData = $table.internalData
     const { isRowGroupStatus } = tableReactData
-    const { field, slots, editRender, cellRender, rowGroupNode } = column
+    const { field, slots, editRender, cellRender, rowGroupNode, aggFunc } = column
     const renderOpts = editRender || cellRender
     const defaultSlot = slots ? slots.default : null
     if (defaultSlot) {
@@ -415,39 +415,51 @@ export const Cell = {
       }
     }
     let cellValue: string | number | null = ''
-    if (isRowGroupStatus && row.isAggregate) {
+    if (isRowGroupStatus && field && row.isAggregate) {
+      const aggRow: VxeTableDefines.AggregateRowInfo = row
       const { fullColumnFieldData } = tableInternalData
-      const { computeRowGroupOpts } = $table.getComputeMaps()
-      const rowGroupOpts = computeRowGroupOpts.value
-      const { mode, showTotal, totalMethod, countFields, countMethod, contentMethod, mapChildrenField } = rowGroupOpts
-      const groupField = row.groupField
-      const groupContent = row.groupContent
-      const childList = mapChildrenField ? (row[mapChildrenField] || []) : []
-      const totalValue = row.childCount
+      const { computeAggregateOpts } = $table.getComputeMaps()
+      const aggregateOpts = computeAggregateOpts.value
+      const { mode, showTotal, totalMethod, countFields, contentMethod, mapChildrenField } = aggregateOpts
+      const aggMethod = aggregateOpts.aggregateMethod || aggregateOpts.countMethod
+      const groupField = aggRow.groupField
+      const groupContent = aggRow.groupContent
+      const childList = mapChildrenField ? (aggRow[mapChildrenField] || []) : []
+      const childCount = aggRow.childCount
       const colRest = fullColumnFieldData[groupField] || {}
-      const params = {
+      const ctParams = {
         $table,
         groupField,
         groupColumn: (colRest ? colRest.column : null) as VxeTableDefines.ColumnInfo,
         column,
         groupValue: groupContent,
         children: childList,
-        totalValue: totalValue
+        childCount,
+        aggValue: null as any,
+
+        /**
+         * 已废弃
+         * @deprecated
+         */
+        totalValue: childCount
       }
-      if (mode === 'column' ? column.field === row.groupField : rowGroupNode) {
+      if (mode === 'column' ? field === aggRow.groupField : rowGroupNode) {
         cellValue = groupContent
         if (contentMethod) {
-          cellValue = `${contentMethod(params)}`
+          cellValue = `${contentMethod(ctParams)}`
         }
         if (showTotal) {
-          cellValue = getI18n('vxe.table.rowGroupContentTotal', [cellValue, totalMethod ? totalMethod(params) : totalValue, totalValue])
+          cellValue = getI18n('vxe.table.rowGroupContentTotal', [cellValue, totalMethod ? totalMethod(ctParams) : childCount, childCount])
         }
-      } else if (countFields && countFields.includes(field)) {
-        if (countMethod) {
-          cellValue = `${countMethod(params)}`
+      } else if ($table.getPivotTableAggregateCellAggValue) {
+        cellValue = $table.getPivotTableAggregateCellAggValue(params)
+      } else if (aggFunc === true || (countFields && countFields.includes(field))) {
+        if (aggMethod) {
+          ctParams.aggValue = childCount
+          cellValue = `${aggMethod(ctParams)}`
         }
       }
-    } else if (!(isRowGroupStatus && row.isAggregate)) {
+    } else {
       cellValue = $table.getCellLabel(row, column)
     }
     const cellPlaceholder = editRender ? editRender.placeholder : ''
@@ -480,11 +492,11 @@ export const Cell = {
     const tableReactData = $table.reactData
     const tableInternalData = $table.internalData
     const { row, level } = params
-    const { computeRowGroupOpts } = $table.getComputeMaps()
+    const { computeAggregateOpts } = $table.getComputeMaps()
     const { rowGroupExpandedFlag } = tableReactData
     const { rowGroupExpandedMaps } = tableInternalData
-    const rowGroupOpts = computeRowGroupOpts.value
-    const { padding, indent } = rowGroupOpts
+    const aggregateOpts = computeAggregateOpts.value
+    const { padding, indent } = aggregateOpts
     const rowid = getRowid($table, row)
     const isExpand = !!rowGroupExpandedFlag && !!rowGroupExpandedMaps[rowid]
     return h('div', {
@@ -497,16 +509,18 @@ export const Cell = {
           }
         : 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
-        })
-      ]),
+      row.isAggregate
+        ? 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
+          })
+        ])
+        : renderEmptyElement($table),
       h('div', {
         class: 'vxe-row-group-cell'
       }, cellVNodes)
@@ -588,10 +602,12 @@ export const Cell = {
   renderDeepNodeBtn (params: VxeTableDefines.CellRenderBodyParams & { $table: VxeTableConstructor & VxeTablePrivateMethods }, cellVNodes: VxeComponentSlotType[]) {
     const { $table, row, column } = params
     const { rowGroupNode } = column
-    if (row.isAggregate) {
-      const { computeRowGroupOpts } = $table.getComputeMaps()
-      const rowGroupOpts = computeRowGroupOpts.value
-      const { mode } = rowGroupOpts
+    const tableReactData = $table.reactData
+    const { rowGroupList } = tableReactData
+    if (rowGroupList.length) {
+      const { computeAggregateOpts } = $table.getComputeMaps()
+      const aggregateOpts = computeAggregateOpts.value
+      const { mode } = aggregateOpts
       if (mode === 'column' ? column.field === row.groupField : rowGroupNode) {
         return [Cell.renderRowGroupBtn(params, cellVNodes)]
       }

package/packages/table/src/column.ts

@@ -124,6 +124,8 @@ export const columnProps = {
   editRender: Object as PropType<VxeColumnPropTypes.EditRender>,
   // 内容渲染配置项
   contentRender: Object as PropType<VxeColumnPropTypes.ContentRender>,
+  // 聚合函数
+  aggFunc: [String, Boolean] as PropType<VxeColumnPropTypes.AggFunc>,
   // 额外的参数
   params: Object as PropType<VxeColumnPropTypes.Params>
 }

package/packages/table/src/columnInfo.ts

@@ -95,6 +95,7 @@ export class ColumnInfo {
       titleHelp: _vm.titleHelp,
       titlePrefix: _vm.titlePrefix,
       titleSuffix: _vm.titleSuffix,
+      aggFunc: _vm.aggFunc,
       // 自定义参数
       params: _vm.params,
       // 渲染属性
@@ -124,6 +125,8 @@ export class ColumnInfo {
       sortNumber: 0, // 用于记录自定义列顺序
       renderSortNumber: 0, // 用于记录自定义列顺序
 
+      renderAggFn: '',
+
       renderFixed: '',
       renderVisible: false,
 

package/packages/table/src/props.ts

@@ -198,7 +198,9 @@ export default {
   footerCellConfig: Object as PropType<VxeTablePropTypes.FooterCellConfig>,
   // 行配置项
   rowConfig: Object as PropType<VxeTablePropTypes.RowConfig>,
-  // 行分组配置项
+  // 数据聚合配置项
+  aggregateConfig: Object as PropType<VxeTablePropTypes.AggregateConfig>,
+  //  已废弃，被 aggregateConfig 替换
   rowGroupConfig: Object as PropType<VxeTablePropTypes.RowGroupConfig>,
   // 当前行配置项
   currentRowConfig: Object as PropType<VxeTablePropTypes.CurrentRowConfig>,