@visactor/vtable 0.19.2-alpha.3 → 0.20.0

package/cjs/layout/pivot-header-layout.d.ts

@@ -2,8 +2,8 @@ import type { CellAddress, CellRange, IPivotTableCellHeaderPaths, LayoutObjectId
 import type { HeaderData, IndicatorData, LayoutMapAPI, WidthData } from '../ts-types/list-table/layout-map/api';
 import type { PivotTable } from '../PivotTable';
 import type { PivotChart } from '../PivotChart';
-import type { LayouTreeNode, ITreeLayoutHeadNode } from './layout-helper';
-import { DimensionTree } from './layout-helper';
+import type { ITreeLayoutHeadNode, LayouTreeNode } from './tree-helper';
+import { DimensionTree } from './tree-helper';
 import type { Dataset } from '../dataset/dataset';
 export declare class PivotHeaderLayoutMap implements LayoutMapAPI {
     sharedVar: {
@@ -179,13 +179,14 @@ export declare class PivotHeaderLayoutMap implements LayoutMapAPI {
     isAxisCell(col: number, row: number): boolean;
     getChartAxes(col: number, row: number): any[];
     getRawChartSpec(col: number, row: number): any;
+    getChartSpec(col: number, row: number): any;
+    isShareChartSpec(col: number, row: number): any;
     getChartDataId(col: number, row: number): any;
     setPagination(pagination: IPagination): void;
     release(): void;
     getHeadNode(dimensions: IDimensionInfo[]): IHeaderTreeDefine;
     clearCellRangeMap(): void;
     getDimensionKeyInChartSpec(_col: number, _row: number): string;
-    getChartSpec(col: number, row: number): any;
     _generateChartState(): {
         vtable_selected: {
             filter: (datum: any) => boolean;
@@ -206,7 +207,9 @@ export declare class PivotHeaderLayoutMap implements LayoutMapAPI {
     getColKeysPath(col: number, row: number): string;
     getRowKeysPath(col: number, row: number): string;
     getIndicatorInfo(indicatorKey: string, indicatorValue?: string): IIndicator;
+    getLayoutColumnTree(): LayouTreeNode[];
     getLayoutRowTree(): LayouTreeNode[];
+    getLayoutColumnTreeCount(): number;
     getLayoutRowTreeCount(): number;
     resetHeaderTree(): void;
 }

package/cjs/layout/pivot-header-layout.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.PivotHeaderLayoutMap = void 0;
 
-const util_1 = require("../tools/util"), ts_types_1 = require("../ts-types"), global_1 = require("../tools/global"), diff_cell_1 = require("../tools/diff-cell"), get_chart_spec_1 = require("./chart-helper/get-chart-spec"), layout_helper_1 = require("./layout-helper"), vutils_1 = require("@visactor/vutils"), padding_1 = require("../scenegraph/utils/padding"), get_axis_config_1 = require("./chart-helper/get-axis-config"), defaultDimension = {
+const util_1 = require("../tools/util"), ts_types_1 = require("../ts-types"), global_1 = require("../tools/global"), diff_cell_1 = require("../tools/diff-cell"), get_chart_spec_1 = require("./chart-helper/get-chart-spec"), tree_helper_1 = require("./tree-helper"), vutils_1 = require("@visactor/vutils"), padding_1 = require("../scenegraph/utils/padding"), get_axis_config_1 = require("./chart-helper/get-axis-config"), defaultDimension = {
     startInTotal: 0,
     level: 0
 };
@@ -56,8 +56,8 @@ class PivotHeaderLayoutMap {
         }
         if (null === (_o = this.indicatorsDefine) || void 0 === _o || _o.forEach((indicator => {
             "string" == typeof indicator ? this.indicatorKeys.push(indicator) : this.indicatorKeys.push(indicator.indicatorKey);
-        })), this.columnDimensionTree = new layout_helper_1.DimensionTree(null !== (_p = this.columnTree) && void 0 !== _p ? _p : [], this.sharedVar), 
-        this.rowDimensionTree = new layout_helper_1.DimensionTree(null !== (_q = this.rowTree) && void 0 !== _q ? _q : [], this.sharedVar, this.rowHierarchyType, "tree" === this.rowHierarchyType ? this.rowExpandLevel : void 0), 
+        })), this.columnDimensionTree = new tree_helper_1.DimensionTree(null !== (_p = this.columnTree) && void 0 !== _p ? _p : [], this.sharedVar), 
+        this.rowDimensionTree = new tree_helper_1.DimensionTree(null !== (_q = this.rowTree) && void 0 !== _q ? _q : [], this.sharedVar, this.rowHierarchyType, "tree" === this.rowHierarchyType ? this.rowExpandLevel : void 0), 
         this.colDimensionKeys = this.columnDimensionTree.dimensionKeys.valueArr(), this.rowDimensionKeys = this.rowDimensionTree.dimensionKeys.valueArr(), 
         this.fullRowDimensionKeys = this.fullRowDimensionKeys.concat(this.rowDimensionKeys), 
         this.resetRowHeaderLevelCount(), this._generateColHeaderIds(), this.colIndex = 0, 
@@ -148,7 +148,7 @@ class PivotHeaderLayoutMap {
         }(row);
         for (let i = 0; i < header.length; i++) {
             const hd = header[i];
-            (0, layout_helper_1.dealHeader)(hd, _headerCellIds, results, roots, row, this);
+            (0, tree_helper_1.dealHeader)(hd, _headerCellIds, results, roots, row, this);
         }
         return results;
     }
@@ -163,7 +163,7 @@ class PivotHeaderLayoutMap {
         }(row);
         for (let i = 0; i < header.length; i++) {
             const hd = header[i];
-            (0, layout_helper_1.dealHeaderForTreeMode)(hd, _headerCellIds, results, roots, row, totalLevel, show, dimensions, this);
+            (0, tree_helper_1.dealHeaderForTreeMode)(hd, _headerCellIds, results, roots, row, totalLevel, show, dimensions, this);
         }
         return results;
     }
@@ -233,7 +233,7 @@ class PivotHeaderLayoutMap {
                     }))));
                 } else tree = (0, vutils_1.cloneDeep)(extensionRow.rowTree);
                 this._rowHeaderExtensionTree[key] ? (this._rowHeaderExtensionTree[key].reset(this._rowHeaderExtensionTree[key].tree.children, !0), 
-                rowExtensionDimensionTree = this._rowHeaderExtensionTree[key]) : (rowExtensionDimensionTree = new layout_helper_1.DimensionTree(null != tree ? tree : [], this.sharedVar, this.rowHierarchyType, void 0), 
+                rowExtensionDimensionTree = this._rowHeaderExtensionTree[key]) : (rowExtensionDimensionTree = new tree_helper_1.DimensionTree(null != tree ? tree : [], this.sharedVar, this.rowHierarchyType, void 0), 
                 this._rowHeaderExtensionTree[key] = rowExtensionDimensionTree);
                 const extensionRowTreeHeaderIds = [];
                 this._addHeadersForTreeMode(extensionRowTreeHeaderIds, 0, rowExtensionDimensionTree.tree.children, [], rowExtensionDimensionTree.totalLevel, !0, extensionRow.rows);
@@ -1042,7 +1042,7 @@ class PivotHeaderLayoutMap {
             const indicatorKey = null === (_c = paths.rowHeaderPaths.find((rowPath => rowPath.indicatorKey))) || void 0 === _c ? void 0 : _c.indicatorKey;
             indicatorObj = null === (_d = this._indicators) || void 0 === _d ? void 0 : _d.find((indicator => indicator.indicatorKey === indicatorKey));
         }
-        indicatorObj && (indicatorObj.chartInstance = chartInstance);
+        "function" != typeof (null == indicatorObj ? void 0 : indicatorObj.chartSpec) && indicatorObj && (indicatorObj.chartInstance = chartInstance);
     }
     getChartInstance(_col, _row) {
         var _a, _b, _c, _d;
@@ -1090,6 +1090,12 @@ class PivotHeaderLayoutMap {
     getRawChartSpec(col, row) {
         return (0, get_chart_spec_1.getRawChartSpec)(col, row, this);
     }
+    getChartSpec(col, row) {
+        return (0, get_chart_spec_1.getChartSpec)(col, row, this);
+    }
+    isShareChartSpec(col, row) {
+        return (0, get_chart_spec_1.isShareChartSpec)(col, row, this);
+    }
     getChartDataId(col, row) {
         return (0, get_chart_spec_1.getChartDataId)(col, row, this);
     }
@@ -1157,9 +1163,6 @@ class PivotHeaderLayoutMap {
         }
         return null;
     }
-    getChartSpec(col, row) {
-        return (0, get_chart_spec_1.getChartSpec)(col, row, this);
-    }
     _generateChartState() {
         return {
             vtable_selected: {
@@ -1283,17 +1286,25 @@ class PivotHeaderLayoutMap {
         var _a;
         return null === (_a = this.indicatorsDefine) || void 0 === _a ? void 0 : _a.find((indicator => "string" != typeof indicator && (indicatorKey ? indicator.indicatorKey === indicatorKey : !!indicatorValue && indicator.title === indicatorValue)));
     }
+    getLayoutColumnTree() {
+        const tree = [], children = this.columnDimensionTree.tree.children;
+        return (0, tree_helper_1.generateLayoutTree)(tree, children), tree;
+    }
     getLayoutRowTree() {
         const tree = [], children = this.rowDimensionTree.tree.children;
-        return (0, layout_helper_1.generateLayoutTree)(tree, children), tree;
+        return (0, tree_helper_1.generateLayoutTree)(tree, children), tree;
+    }
+    getLayoutColumnTreeCount() {
+        const children = this.columnDimensionTree.tree.children;
+        return (0, tree_helper_1.countLayoutTree)(children, "tree" === this.rowHierarchyType);
     }
     getLayoutRowTreeCount() {
         var _a;
         const children = this.rowDimensionTree.tree.children;
-        let totalCount = (0, layout_helper_1.countLayoutTree)(children, "tree" === this.rowHierarchyType);
+        let totalCount = (0, tree_helper_1.countLayoutTree)(children, "tree" === this.rowHierarchyType);
         return null === (_a = this.extensionRows) || void 0 === _a || _a.forEach((extensionRow => {
             if ("function" != typeof extensionRow.rowTree) {
-                const thisTreeCount = (0, layout_helper_1.countLayoutTree)(extensionRow.rowTree, !0);
+                const thisTreeCount = (0, tree_helper_1.countLayoutTree)(extensionRow.rowTree, !0);
                 totalCount *= thisTreeCount;
             }
         })), totalCount;
@@ -1302,8 +1313,8 @@ class PivotHeaderLayoutMap {
         var _a, _b;
         this._rowHeaderCellIds_FULL = [], this._columnHeaderCellIds = [];
         const dataset = this.dataset;
-        this.rowTree = dataset.rowHeaderTree, this.columnTree = dataset.colHeaderTree, this.columnDimensionTree = new layout_helper_1.DimensionTree(null !== (_a = this.columnTree) && void 0 !== _a ? _a : [], this.sharedVar), 
-        this.rowDimensionTree = new layout_helper_1.DimensionTree(null !== (_b = this.rowTree) && void 0 !== _b ? _b : [], this.sharedVar, this.rowHierarchyType, "tree" === this.rowHierarchyType ? this.rowExpandLevel : void 0), 
+        this.rowTree = dataset.rowHeaderTree, this.columnTree = dataset.colHeaderTree, this.columnDimensionTree = new tree_helper_1.DimensionTree(null !== (_a = this.columnTree) && void 0 !== _a ? _a : [], this.sharedVar), 
+        this.rowDimensionTree = new tree_helper_1.DimensionTree(null !== (_b = this.rowTree) && void 0 !== _b ? _b : [], this.sharedVar, this.rowHierarchyType, "tree" === this.rowHierarchyType ? this.rowExpandLevel : void 0), 
         this._generateColHeaderIds(), this.colIndex = 0, this._generateRowHeaderIds(), this.resetColumnHeaderLevelCount(), 
         this._rowHeaderCellIds_FULL = (0, util_1.transpose)(this._rowHeaderCellIds_FULL), 
         this._headerObjectMap = this._headerObjects.reduce(((o, e) => (o[e.id] = e, o)), {}),