feat: add supplementIndicatorNodes config #1644

VisActor · May 14, 2024 · fcd864c · fcd864c
1 parent 88d5692
commit fcd864c
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 1 deletion.
diff --git a/packages/vtable/src/PivotChart.ts b/packages/vtable/src/PivotChart.ts
@@ -47,6 +47,7 @@ import type { ITreeLayoutHeadNode } from './layout/tree-helper';
 import { DimensionTree, type LayouTreeNode } from './layout/tree-helper';
 import { IndicatorDimensionKeyPlaceholder } from './tools/global';
 import { checkHasCartesianChart } from './layout/chart-helper/get-chart-spec';
+import { supplementIndicatorNodesForCustomTree } from './layout/layout-helper';
 export class PivotChart extends BaseTable implements PivotChartAPI {
   layoutNodeId: { seqId: number } = { seqId: 0 };
   declare internalProps: PivotChartProtected;
@@ -97,12 +98,18 @@ export class PivotChart extends BaseTable implements PivotChartAPI {
     let columnDimensionTree;
     let rowDimensionTree;
     if (options.columnTree) {
+      if (options.indicatorsAsCol !== false) {
+        supplementIndicatorNodesForCustomTree(this.internalProps.columnTree, options.indicators);
+      }
       columnDimensionTree = new DimensionTree(
         (this.internalProps.columnTree as ITreeLayoutHeadNode[]) ?? [],
         this.layoutNodeId
       );
     }
     if (options.rowTree) {
+      if (options.indicatorsAsCol === false) {
+        supplementIndicatorNodesForCustomTree(this.internalProps.rowTree, options.indicators);
+      }
       rowDimensionTree = new DimensionTree(
         (this.internalProps.rowTree as ITreeLayoutHeadNode[]) ?? [],
         this.layoutNodeId
@@ -267,12 +274,18 @@ export class PivotChart extends BaseTable implements PivotChartAPI {
     let columnDimensionTree;
     let rowDimensionTree;
     if (options.columnTree) {
+      if (options.indicatorsAsCol !== false) {
+        supplementIndicatorNodesForCustomTree(this.internalProps.columnTree, options.indicators);
+      }
       columnDimensionTree = new DimensionTree(
         (this.internalProps.columnTree as ITreeLayoutHeadNode[]) ?? [],
         this.layoutNodeId
       );
     }
     if (options.rowTree) {
+      if (options.indicatorsAsCol === false) {
+        supplementIndicatorNodesForCustomTree(this.internalProps.rowTree, options.indicators);
+      }
       rowDimensionTree = new DimensionTree(
         (this.internalProps.rowTree as ITreeLayoutHeadNode[]) ?? [],
         this.layoutNodeId

diff --git a/packages/vtable/src/layout/layout-helper.ts b/packages/vtable/src/layout/layout-helper.ts
@@ -194,7 +194,10 @@ export function parseColKeyRowKeyForPivotTable(table: PivotTable, options: Pivot
   };
 }
 
-function supplementIndicatorNodesForCustomTree(customTree: IHeaderTreeDefine[], indicators: (string | IIndicator)[]) {
+export function supplementIndicatorNodesForCustomTree(
+  customTree: IHeaderTreeDefine[],
+  indicators: (string | IIndicator)[]
+) {
   const checkNode = (nodes: IHeaderTreeDefine[], isHasIndicator: boolean) => {
     nodes.forEach((node: IHeaderTreeDefine) => {
       if (

diff --git a/packages/vtable/src/tools/get-data-path/create-dataset.ts b/packages/vtable/src/tools/get-data-path/create-dataset.ts
@@ -1,4 +1,5 @@
 import { Dataset } from '../../dataset/dataset';
+import { supplementIndicatorNodesForCustomTree } from '../../layout/layout-helper';
 import type { ITreeLayoutHeadNode } from '../../layout/tree-helper';
 import { DimensionTree } from '../../layout/tree-helper';
 import type {
@@ -18,9 +19,15 @@ export function createDataset(options: PivotChartConstructorOptions) {
   let columnDimensionTree;
   let rowDimensionTree;
   if (options.columnTree) {
+    if (options.indicatorsAsCol !== false) {
+      supplementIndicatorNodesForCustomTree(options.columnTree, options.indicators);
+    }
     columnDimensionTree = new DimensionTree((options.columnTree as ITreeLayoutHeadNode[]) ?? [], layoutNodeId);
   }
   if (options.rowTree) {
+    if (options.indicatorsAsCol === false) {
+      supplementIndicatorNodesForCustomTree(options.rowTree, options.indicators);
+    }
     rowDimensionTree = new DimensionTree((options.rowTree as ITreeLayoutHeadNode[]) ?? [], layoutNodeId);
   }
   const rowKeys = rowDimensionTree.dimensionKeys?.count