vxe-table 3.17.0-beta.7 → 3.17.0-beta.8

package/es/table/src/table.js

@@ -1610,7 +1610,10 @@ export default {
             warnLog('vxe.error.delProp', ['row-group-config.countFields', 'column.agg-func']);
         }
         if (aggregateOpts.aggregateMethod) {
-            warnLog('vxe.error.delProp', ['row-group-config.aggregateMethod', 'aggregate-config.countMethod']);
+            warnLog('vxe.error.delProp', ['row-group-config.aggregateMethod', 'aggregate-config.calcValuesMethod']);
+        }
+        if (aggregateOpts.countMethod) {
+            warnLog('vxe.error.delProp', ['aggregate-config.countMethod', 'aggregate-config.calcValuesMethod']);
         }
         if (props.treeConfig && treeOpts.children) {
             warnLog('vxe.error.delProp', ['tree-config.children', 'tree-config.childrenField']);

package/es/ui/index.js

@@ -1,6 +1,6 @@
 import { VxeUI } from '@vxe-ui/core';
 import { getFuncText } from './src/utils';
-export const version = "3.17.0-beta.7";
+export const version = "3.17.0-beta.8";
 VxeUI.version = version;
 VxeUI.tableVersion = version;
 VxeUI.setConfig({

package/es/ui/src/log.js

@@ -1,5 +1,5 @@
 import { VxeUI } from '@vxe-ui/core';
 const { log } = VxeUI;
-const version = `table v${"3.17.0-beta.7"}`;
+const version = `table v${"3.17.0-beta.8"}`;
 export const warnLog = log.create('warn', version);
 export const errLog = log.create('error', version);

package/lib/index.umd.js

@@ -2002,7 +2002,7 @@ function getClass(property, params) {
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
 
 
-const version = "3.17.0-beta.7";
+const version = "3.17.0-beta.8";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -2667,7 +2667,7 @@ function isNodeElement(elem) {
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"3.17.0-beta.7"}`;
+const log_version = `table v${"3.17.0-beta.8"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
@@ -3970,7 +3970,7 @@ const Cell = {
         contentMethod,
         mapChildrenField
       } = aggregateOpts;
-      const aggMethod = aggregateOpts.aggregateMethod || aggregateOpts.countMethod;
+      const aggMethod = aggregateOpts.calcValuesMethod || aggregateOpts.countMethod || aggregateOpts.aggregateMethod;
       const groupField = aggRow.groupField;
       const groupContent = aggRow.groupContent;
       const childList = mapChildrenField ? aggRow[mapChildrenField] || [] : [];
@@ -29602,7 +29602,10 @@ function renderBody(h, $xeTable) {
       warnLog('vxe.error.delProp', ['row-group-config.countFields', 'column.agg-func']);
     }
     if (aggregateOpts.aggregateMethod) {
-      warnLog('vxe.error.delProp', ['row-group-config.aggregateMethod', 'aggregate-config.countMethod']);
+      warnLog('vxe.error.delProp', ['row-group-config.aggregateMethod', 'aggregate-config.calcValuesMethod']);
+    }
+    if (aggregateOpts.countMethod) {
+      warnLog('vxe.error.delProp', ['aggregate-config.countMethod', 'aggregate-config.calcValuesMethod']);
     }
     if (props.treeConfig && treeOpts.children) {
       warnLog('vxe.error.delProp', ['tree-config.children', 'tree-config.childrenField']);
@@ -34329,7 +34332,7 @@ const Toolbar = VxeToolbar;
       treeDragChild: '父级不能拖拽到自己的子级中',
       reqPlugin: '扩展插件未安装 "{1}" https://vxeui.com/other{0}/#/{1}/install',
       errMaxRow: '超过支持的最大数据量 {0} 行，这可能会导致出现错误',
-      useNew: '{0} 已经不建议使用，请使用新的方式 {1}'
+      useNew: '不建议使用 {0}，请使用 {1}'
     },
     table: {
       emptyText: '暂无数据',