feat: support calculate field for PivotTable #1941

VisActor · Jun 19, 2024 · 8dc02e6 · 8dc02e6
1 parent 326e215
commit 8dc02e6
Showing 1 changed file with 18 additions and 13 deletions.
diff --git a/packages/vtable/src/data/DataSource.ts b/packages/vtable/src/data/DataSource.ts
@@ -178,7 +178,12 @@ export class DataSource extends EventTarget implements DataSourceAPI {
   // 注册聚合类型
   registedAggregators: {
     [key: string]: {
-      new (dimension: string | string[], formatFun?: any, isRecord?: boolean, aggregationFun?: Function): Aggregator;
+      new (config: {
+        dimension: string | string[];
+        formatFun?: any;
+        isRecord?: boolean;
+        aggregationFun?: Function;
+      }): Aggregator;
     };
   } = {};
   rowHierarchyType: 'grid' | 'tree';
@@ -279,25 +284,25 @@ export class DataSource extends EventTarget implements DataSourceAPI {
       if (Array.isArray(aggragation)) {
         for (let j = 0; j < aggragation.length; j++) {
           const item = aggragation[j];
-          const aggregator = new this.registedAggregators[item.aggregationType](
-            field as string,
-            item.formatFun,
-            true,
-            (item as CustomAggregation).aggregationFun
-          );
+          const aggregator = new this.registedAggregators[item.aggregationType]({
+            dimension: field as string,
+            formatFun: item.formatFun,
+            isRecord: true,
+            aggregationFun: (item as CustomAggregation).aggregationFun
+          });
           this.fieldAggregators.push(aggregator);
           if (!columnObjs[i].aggregator) {
             columnObjs[i].aggregator = [];
           }
           columnObjs[i].aggregator.push(aggregator);
         }
       } else {
-        const aggregator = new this.registedAggregators[aggragation.aggregationType](
-          field as string,
-          aggragation.formatFun,
-          true,
-          (aggragation as CustomAggregation).aggregationFun
-        );
+        const aggregator = new this.registedAggregators[aggragation.aggregationType]({
+          dimension: field as string,
+          formatFun: aggragation.formatFun,
+          isRecord: true,
+          aggregationFun: (aggragation as CustomAggregation).aggregationFun
+        });
         this.fieldAggregators.push(aggregator);
         columnObjs[i].aggregator = aggregator;
       }