vxe-table 3.15.34 → 3.15.35

package/packages/table/src/table.ts

@@ -881,11 +881,16 @@ export default {
 
       return Object.assign({}, getConfig().table.rowConfig, props.rowConfig)
     },
-    computeRowGroupOpts () {
+    computeAggregateOpts () {
       const $xeTable = this as VxeTableConstructor & VxeTablePrivateMethods
       const props = $xeTable
 
-      return Object.assign({}, getConfig().table.rowGroupConfig, props.rowGroupConfig)
+      return Object.assign({}, getConfig().table.aggregateConfig || getConfig().table.rowGroupConfig, props.aggregateConfig || props.rowGroupConfig)
+    },
+    computeRowGroupOpts () {
+      const $xeTable = this as VxeTableConstructor & VxeTablePrivateMethods
+
+      return $xeTable.computeAggregateOpts
     },
     computeCurrentRowOpts () {
       const $xeTable = this as VxeTableConstructor & VxeTablePrivateMethods
@@ -1279,8 +1284,8 @@ export default {
     computeRowGroupFields () {
       const $xeTable = this as VxeTableConstructor & VxeTablePrivateMethods
 
-      const rowGroupOpts = $xeTable.computeRowGroupOpts
-      return rowGroupOpts.groupFields
+      const aggregateOpts = $xeTable.computeAggregateOpts
+      return aggregateOpts.groupFields
     },
     tabsResizeFlag () {
       const $xeTable = this as VxeTableConstructor & VxeTablePrivateMethods
@@ -1564,8 +1569,8 @@ export default {
     const currentRowOpts = $xeTable.computeCurrentRowOpts
     const currentColumnOpts = $xeTable.computeCurrentColumnOpts
     const keyboardOpts = $xeTable.computeKeyboardOpts
-    const rowGroupOpts = $xeTable.computeRowGroupOpts
-    const { groupFields } = rowGroupOpts
+    const aggregateOpts = $xeTable.computeAggregateOpts
+    const { groupFields } = aggregateOpts
 
     if (props.rowId) {
       warnLog('vxe.error.delProp', ['row-id', 'row-config.keyField'])
@@ -1658,6 +1663,15 @@ export default {
     if (props.dragConfig) {
       warnLog('vxe.error.delProp', ['drag-config', 'row-drag-config'])
     }
+    if (props.rowGroupConfig) {
+      warnLog('vxe.error.delProp', ['row-group-config', 'aggregate-config'])
+    }
+    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 (props.treeConfig && treeOpts.children) {
       warnLog('vxe.error.delProp', ['tree-config.children', 'tree-config.childrenField'])
     }

package/packages/table/src/util.ts

@@ -4,7 +4,7 @@ import { isScale, isPx, queryElement } from '../../ui/src/dom'
 import { warnLog, errLog } from '../../ui/src/log'
 import { eqEmptyValue } from '../../ui/src/utils'
 
-import type { VxeTableDefines, VxeTableConstructor, TableReactData, TableInternalData, VxeTablePrivateMethods } from '../../../types'
+import type { VxeTableDefines, VxeTableConstructor, TableReactData, TableInternalData, VxeTablePrivateMethods, VxeTablePropTypes } from '../../../types'
 
 const getAllConvertColumns = (columns: any, parentColumn?: any) => {
   const result: any[] = []
@@ -204,7 +204,7 @@ export function handleFieldOrColumn ($xeTable: VxeTableConstructor, fieldOrColum
   return null
 }
 
-export const handleRowidOrRow = ($xeTable: VxeTableConstructor, rowidOrRow: any) => {
+export function handleRowidOrRow ($xeTable: VxeTableConstructor, rowidOrRow: any) {
   if (rowidOrRow) {
     const rowid = XEUtils.isString(rowidOrRow) || XEUtils.isNumber(rowidOrRow) ? rowidOrRow : getRowid($xeTable, rowidOrRow)
     return $xeTable.getRowById(rowid)
@@ -212,6 +212,10 @@ export const handleRowidOrRow = ($xeTable: VxeTableConstructor, rowidOrRow: any)
   return null
 }
 
+export function getCellRestHeight (rowRest: VxeTableDefines.RowCacheItem, cellOpts: VxeTablePropTypes.CellConfig, rowOpts: VxeTablePropTypes.RowConfig, defaultRowHeight: number) {
+  return rowRest.resizeHeight || cellOpts.height || rowOpts.height || rowRest.height || defaultRowHeight
+}
+
 // 组装列配置
 export function assembleColumn (_vm: any) {
   const $xeTable = _vm.$xeTable as VxeTableConstructor & VxeTablePrivateMethods

package/packages/ui/index.ts

@@ -133,7 +133,7 @@ VxeUI.setConfig({
       // isEvery: false,
       showIcon: true
     },
-    rowGroupConfig: {
+    aggregateConfig: {
       padding: true,
       rowField: 'id',
       parentField: '_X_ROW_PARENT_KEY',
@@ -208,13 +208,13 @@ VxeUI.setConfig({
       isReplace: true
     },
     virtualXConfig: {
-      enabled: true,
+      // enabled: false,
       gt: 24,
       preSize: 0,
       oSize: 0
     },
     virtualYConfig: {
-      enabled: true,
+      // enabled: false,
       gt: 100,
       preSize: 1,
       oSize: 0