vxe-table 4.15.0-beta.8 → 4.15.0-beta.9

package/es/table/src/cell.js

@@ -389,7 +389,7 @@ export const Cell = {
             const { computeAggregateOpts } = $table.getComputeMaps();
             const aggregateOpts = computeAggregateOpts.value;
             const { mode, showTotal, totalMethod, countFields, contentMethod, mapChildrenField } = aggregateOpts;
-            const aggMethod = aggregateOpts.calcValuesMethod || aggregateOpts.countMethod || aggregateOpts.aggregateMethod;
+            const aggCalcMethod = aggregateOpts.calcValuesMethod || aggregateOpts.countMethod || aggregateOpts.aggregateMethod;
             const groupField = aggRow.groupField;
             const groupContent = aggRow.groupContent;
             const childList = mapChildrenField ? (aggRow[mapChildrenField] || []) : [];
@@ -423,9 +423,9 @@ export const Cell = {
                 cellValue = $table.getPivotTableAggregateCellAggValue(params);
             }
             else if (aggFunc === true || (countFields && countFields.includes(field))) {
-                if (aggMethod) {
+                if (aggCalcMethod) {
                     ctParams.aggValue = childCount;
-                    cellValue = `${aggMethod(ctParams)}`;
+                    cellValue = `${aggCalcMethod(ctParams)}`;
                 }
             }
         }
@@ -478,14 +478,14 @@ export const Cell = {
         const { rowGroupExpandedFlag } = tableReactData;
         const { rowGroupExpandedMaps } = tableInternalData;
         const aggregateOpts = computeAggregateOpts.value;
-        const { padding, indent } = aggregateOpts;
+        const { mode, padding, indent } = aggregateOpts;
         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
+            style: mode !== 'column' && padding && indent
                 ? {
                     paddingLeft: `${level * indent}px`
                 }

package/es/ui/index.js

@@ -1,6 +1,6 @@
 import { VxeUI } from '@vxe-ui/core';
 import { getFuncText } from './src/utils';
-export const version = "4.15.0-beta.8";
+export const version = "4.15.0-beta.9";
 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${"4.15.0-beta.8"}`;
+const version = `table v${"4.15.0-beta.9"}`;
 export const warnLog = log.create('warn', version);
 export const errLog = log.create('error', version);

package/lib/index.umd.js

@@ -3138,7 +3138,7 @@ function eqEmptyValue(cellValue) {
 ;// ./packages/ui/index.ts
 
 
-const version = "4.15.0-beta.8";
+const version = "4.15.0-beta.9";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -3628,7 +3628,7 @@ var esnext_iterator_some = __webpack_require__(7550);
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"4.15.0-beta.8"}`;
+const log_version = `table v${"4.15.0-beta.9"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// ./packages/table/src/columnInfo.ts
@@ -5241,7 +5241,7 @@ const Cell = {
         contentMethod,
         mapChildrenField
       } = aggregateOpts;
-      const aggMethod = aggregateOpts.calcValuesMethod || aggregateOpts.countMethod || aggregateOpts.aggregateMethod;
+      const aggCalcMethod = aggregateOpts.calcValuesMethod || aggregateOpts.countMethod || aggregateOpts.aggregateMethod;
       const groupField = aggRow.groupField;
       const groupContent = aggRow.groupContent;
       const childList = mapChildrenField ? aggRow[mapChildrenField] || [] : [];
@@ -5273,9 +5273,9 @@ const Cell = {
       } else if ($table.getPivotTableAggregateCellAggValue) {
         cellValue = $table.getPivotTableAggregateCellAggValue(params);
       } else if (aggFunc === true || countFields && countFields.includes(field)) {
-        if (aggMethod) {
+        if (aggCalcMethod) {
           ctParams.aggValue = childCount;
-          cellValue = `${aggMethod(ctParams)}`;
+          cellValue = `${aggCalcMethod(ctParams)}`;
         }
       }
     } else {
@@ -5336,6 +5336,7 @@ const Cell = {
     } = tableInternalData;
     const aggregateOpts = computeAggregateOpts.value;
     const {
+      mode,
       padding,
       indent
     } = aggregateOpts;
@@ -5345,7 +5346,7 @@ const Cell = {
       class: ['vxe-row-group--tree-node', {
         'is--expanded': isExpand
       }],
-      style: padding && indent ? {
+      style: mode !== 'column' && padding && indent ? {
         paddingLeft: `${level * indent}px`
       } : undefined
     }, [row.isAggregate ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('span', {