@visactor/vtable 0.25.5 → 0.26.0-alpha.1

package/cjs/layout/layout-helper.js

@@ -1,5 +1,11 @@
 "use strict";
 
+Object.defineProperty(exports, "__esModule", {
+    value: !0
+}), exports.parseColKeyRowKeyForPivotTable = exports.checkHasTreeDefine = exports.checkHasAggregationOnBottom = exports.checkHasAggregationOnTop = exports.checkHasAggregation = void 0;
+
+const global_1 = require("../tools/global"), ts_types_1 = require("../ts-types"), tree_helper_1 = require("./tree-helper");
+
 function checkHasAggregation(layoutMap) {
     const columnObjects = layoutMap.columnObjects;
     for (let i = 0; i < columnObjects.length; i++) {
@@ -39,9 +45,51 @@ function checkHasTreeDefine(layoutMap) {
     return !1;
 }
 
-Object.defineProperty(exports, "__esModule", {
-    value: !0
-}), exports.checkHasTreeDefine = exports.checkHasAggregationOnBottom = exports.checkHasAggregationOnTop = exports.checkHasAggregation = void 0, 
+function parseColKeyRowKeyForPivotTable(table, options) {
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r;
+    let columnDimensionTree, rowDimensionTree, isNeedResetColumnDimensionTree = !0, isNeedResetRowDimensionTree = !0;
+    options.columnTree && (columnDimensionTree = new tree_helper_1.DimensionTree(null !== (_a = table.internalProps.columnTree) && void 0 !== _a ? _a : [], table.layoutNodeId), 
+    isNeedResetColumnDimensionTree = !1 !== table.options.indicatorsAsCol && !columnDimensionTree.dimensionKeys.contain(global_1.IndicatorDimensionKeyPlaceholder) && (null === (_b = options.indicators) || void 0 === _b ? void 0 : _b.length) >= 1), 
+    options.rowTree && (rowDimensionTree = new tree_helper_1.DimensionTree(null !== (_c = table.internalProps.rowTree) && void 0 !== _c ? _c : [], table.layoutNodeId, table.options.rowHierarchyType, "tree" === table.options.rowHierarchyType ? null !== (_d = table.options.rowExpandLevel) && void 0 !== _d ? _d : 1 : void 0), 
+    isNeedResetRowDimensionTree = !1 === table.options.indicatorsAsCol && !rowDimensionTree.dimensionKeys.contain(global_1.IndicatorDimensionKeyPlaceholder) && (null === (_e = options.indicators) || void 0 === _e ? void 0 : _e.length) >= 1);
+    const rowKeys = (null === (_f = null == rowDimensionTree ? void 0 : rowDimensionTree.dimensionKeys) || void 0 === _f ? void 0 : _f.count) ? rowDimensionTree.dimensionKeys.valueArr() : null !== (_h = null === (_g = options.rows) || void 0 === _g ? void 0 : _g.reduce(((keys, rowObj) => ("string" == typeof rowObj ? keys.push(rowObj) : keys.push(rowObj.dimensionKey), 
+    keys)), [])) && void 0 !== _h ? _h : [], columnKeys = (null === (_j = null == columnDimensionTree ? void 0 : columnDimensionTree.dimensionKeys) || void 0 === _j ? void 0 : _j.count) ? columnDimensionTree.dimensionKeys.valueArr() : null !== (_l = null === (_k = options.columns) || void 0 === _k ? void 0 : _k.reduce(((keys, columnObj) => ("string" == typeof columnObj ? keys.push(columnObj) : keys.push(columnObj.dimensionKey), 
+    keys)), [])) && void 0 !== _l ? _l : [], indicatorKeys = null !== (_o = null === (_m = options.indicators) || void 0 === _m ? void 0 : _m.reduce(((keys, indicatorObj) => {
+        var _a, _b;
+        return "string" == typeof indicatorObj ? keys.push(indicatorObj) : (keys.push(indicatorObj.indicatorKey), 
+        indicatorObj.chartSpec && ((null === (_a = table.internalProps.dataConfig) || void 0 === _a ? void 0 : _a.aggregationRules) ? null === (_b = table.internalProps.dataConfig) || void 0 === _b || _b.aggregationRules.push({
+            field: indicatorObj.indicatorKey,
+            indicatorKey: indicatorObj.indicatorKey,
+            aggregationType: ts_types_1.AggregationType.NONE
+        }) : table.internalProps.dataConfig ? table.internalProps.dataConfig.aggregationRules = [ {
+            field: indicatorObj.indicatorKey,
+            indicatorKey: indicatorObj.indicatorKey,
+            aggregationType: ts_types_1.AggregationType.NONE
+        } ] : table.internalProps.dataConfig = {
+            aggregationRules: [ {
+                field: indicatorObj.indicatorKey,
+                indicatorKey: indicatorObj.indicatorKey,
+                aggregationType: ts_types_1.AggregationType.NONE
+            } ]
+        })), keys;
+    }), [])) && void 0 !== _o ? _o : [];
+    return "tree" === options.rowHierarchyType && (null !== (_q = null === (_p = options.extensionRows) || void 0 === _p ? void 0 : _p.length) && void 0 !== _q ? _q : 0) >= 1 && (null === (_r = options.extensionRows) || void 0 === _r || _r.forEach((extensionRow => {
+        const extension_rowKeys = [];
+        extensionRow.rows.forEach((row => {
+            "string" == typeof row ? extension_rowKeys.push(row) : extension_rowKeys.push(row.dimensionKey);
+        })), rowKeys.push(...extension_rowKeys);
+    }))), {
+        rowKeys: rowKeys,
+        columnKeys: columnKeys,
+        indicatorKeys: indicatorKeys,
+        isNeedResetColumnDimensionTree: isNeedResetColumnDimensionTree,
+        isNeedResetRowDimensionTree: isNeedResetRowDimensionTree,
+        columnDimensionTree: columnDimensionTree,
+        rowDimensionTree: rowDimensionTree
+    };
+}
+
 exports.checkHasAggregation = checkHasAggregation, exports.checkHasAggregationOnTop = checkHasAggregationOnTop, 
-exports.checkHasAggregationOnBottom = checkHasAggregationOnBottom, exports.checkHasTreeDefine = checkHasTreeDefine;
+exports.checkHasAggregationOnBottom = checkHasAggregationOnBottom, exports.checkHasTreeDefine = checkHasTreeDefine, 
+exports.parseColKeyRowKeyForPivotTable = parseColKeyRowKeyForPivotTable;
 //# sourceMappingURL=layout-helper.js.map

package/cjs/layout/layout-helper.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/layout/layout-helper.ts"],"names":[],"mappings":"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","file":"layout-helper.js","sourcesContent":["import type { Aggregation } from '../ts-types';\nimport type { ColumnData } from '../ts-types/list-table/layout-map/api';\nimport type { SimpleHeaderLayoutMap } from './simple-header-layout';\n\nexport function checkHasAggregation(layoutMap: SimpleHeaderLayoutMap) {\n  const columnObjects = layoutMap.columnObjects;\n  for (let i = 0; i < columnObjects.length; i++) {\n    const column = columnObjects[i];\n    if ((column as ColumnData)?.aggregation) {\n      return true;\n    }\n  }\n  return false;\n}\n\nexport function checkHasAggregationOnTop(layoutMap: SimpleHeaderLayoutMap) {\n  const columnObjects = layoutMap.columnObjects;\n  let count = 0;\n  for (let i = 0; i < columnObjects.length; i++) {\n    const column = columnObjects[i];\n    if ((column as ColumnData)?.aggregation) {\n      if (Array.isArray((column as ColumnData)?.aggregation)) {\n        count = Math.max(\n          count,\n          ((column as ColumnData).aggregation as Array<Aggregation>).filter(item => item.showOnTop === true).length\n        );\n      } else if (((column as ColumnData).aggregation as Aggregation).showOnTop === true) {\n        count = Math.max(count, 1);\n      }\n    }\n  }\n  return count;\n}\n\nexport function checkHasAggregationOnBottom(layoutMap: SimpleHeaderLayoutMap) {\n  const columnObjects = layoutMap.columnObjects;\n  let count = 0;\n  for (let i = 0; i < columnObjects.length; i++) {\n    const column = columnObjects[i];\n    if ((column as ColumnData)?.aggregation) {\n      if (Array.isArray((column as ColumnData)?.aggregation)) {\n        count = Math.max(\n          count,\n          ((column as ColumnData).aggregation as Array<Aggregation>).filter(item => item.showOnTop === false).length\n        );\n      } else if (((column as ColumnData).aggregation as Aggregation).showOnTop === false) {\n        count = Math.max(count, 1);\n      }\n    }\n  }\n  return count;\n}\n\nexport function checkHasTreeDefine(layoutMap: SimpleHeaderLayoutMap) {\n  const columnObjects = layoutMap.columnObjects;\n  for (let i = 0; i < columnObjects.length; i++) {\n    const column = columnObjects[i];\n    if ((column as ColumnData)?.define?.tree) {\n      return true;\n    }\n  }\n  return false;\n}\n"]}
+{"version":3,"sources":["../src/layout/layout-helper.ts"],"names":[],"mappings":"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","file":"layout-helper.js","sourcesContent":["import type { PivotTable } from '../PivotTable';\nimport { IndicatorDimensionKeyPlaceholder } from '../tools/global';\nimport { AggregationType } from '../ts-types';\nimport type { PivotTableConstructorOptions, Aggregation } from '../ts-types';\nimport type { ColumnData } from '../ts-types/list-table/layout-map/api';\nimport type { IChartColumnIndicator } from '../ts-types/pivot-table/indicator/chart-indicator';\nimport type { SimpleHeaderLayoutMap } from './simple-header-layout';\nimport type { ITreeLayoutHeadNode } from './tree-helper';\nimport { DimensionTree } from './tree-helper';\n\nexport function checkHasAggregation(layoutMap: SimpleHeaderLayoutMap) {\n  const columnObjects = layoutMap.columnObjects;\n  for (let i = 0; i < columnObjects.length; i++) {\n    const column = columnObjects[i];\n    if ((column as ColumnData)?.aggregation) {\n      return true;\n    }\n  }\n  return false;\n}\n\nexport function checkHasAggregationOnTop(layoutMap: SimpleHeaderLayoutMap) {\n  const columnObjects = layoutMap.columnObjects;\n  let count = 0;\n  for (let i = 0; i < columnObjects.length; i++) {\n    const column = columnObjects[i];\n    if ((column as ColumnData)?.aggregation) {\n      if (Array.isArray((column as ColumnData)?.aggregation)) {\n        count = Math.max(\n          count,\n          ((column as ColumnData).aggregation as Array<Aggregation>).filter(item => item.showOnTop === true).length\n        );\n      } else if (((column as ColumnData).aggregation as Aggregation).showOnTop === true) {\n        count = Math.max(count, 1);\n      }\n    }\n  }\n  return count;\n}\n\nexport function checkHasAggregationOnBottom(layoutMap: SimpleHeaderLayoutMap) {\n  const columnObjects = layoutMap.columnObjects;\n  let count = 0;\n  for (let i = 0; i < columnObjects.length; i++) {\n    const column = columnObjects[i];\n    if ((column as ColumnData)?.aggregation) {\n      if (Array.isArray((column as ColumnData)?.aggregation)) {\n        count = Math.max(\n          count,\n          ((column as ColumnData).aggregation as Array<Aggregation>).filter(item => item.showOnTop === false).length\n        );\n      } else if (((column as ColumnData).aggregation as Aggregation).showOnTop === false) {\n        count = Math.max(count, 1);\n      }\n    }\n  }\n  return count;\n}\n\nexport function checkHasTreeDefine(layoutMap: SimpleHeaderLayoutMap) {\n  const columnObjects = layoutMap.columnObjects;\n  for (let i = 0; i < columnObjects.length; i++) {\n    const column = columnObjects[i];\n    if ((column as ColumnData)?.define?.tree) {\n      return true;\n    }\n  }\n  return false;\n}\n\nexport function parseColKeyRowKeyForPivotTable(table: PivotTable, options: PivotTableConstructorOptions) {\n  let columnDimensionTree;\n  let rowDimensionTree;\n  let isNeedResetColumnDimensionTree = true;\n  let isNeedResetRowDimensionTree = true;\n  if (options.columnTree) {\n    columnDimensionTree = new DimensionTree(\n      (table.internalProps.columnTree as ITreeLayoutHeadNode[]) ?? [],\n      table.layoutNodeId\n    );\n    if (\n      table.options.indicatorsAsCol !== false &&\n      !columnDimensionTree.dimensionKeys.contain(IndicatorDimensionKeyPlaceholder) &&\n      options.indicators?.length >= 1\n    ) {\n      isNeedResetColumnDimensionTree = true;\n    } else {\n      isNeedResetColumnDimensionTree = false;\n    }\n  }\n  if (options.rowTree) {\n    rowDimensionTree = new DimensionTree(\n      (table.internalProps.rowTree as ITreeLayoutHeadNode[]) ?? [],\n      table.layoutNodeId,\n      table.options.rowHierarchyType,\n      table.options.rowHierarchyType === 'tree' ? table.options.rowExpandLevel ?? 1 : undefined\n    );\n    if (\n      table.options.indicatorsAsCol === false &&\n      !rowDimensionTree.dimensionKeys.contain(IndicatorDimensionKeyPlaceholder) &&\n      options.indicators?.length >= 1\n    ) {\n      isNeedResetRowDimensionTree = true;\n    } else {\n      isNeedResetRowDimensionTree = false;\n    }\n  }\n  const rowKeys = rowDimensionTree?.dimensionKeys?.count\n    ? rowDimensionTree.dimensionKeys.valueArr()\n    : options.rows?.reduce((keys: string[], rowObj) => {\n        if (typeof rowObj === 'string') {\n          keys.push(rowObj);\n        } else {\n          keys.push(rowObj.dimensionKey);\n        }\n        return keys;\n      }, []) ?? [];\n  const columnKeys = columnDimensionTree?.dimensionKeys?.count\n    ? columnDimensionTree.dimensionKeys.valueArr()\n    : options.columns?.reduce((keys: string[], columnObj) => {\n        if (typeof columnObj === 'string') {\n          keys.push(columnObj);\n        } else {\n          keys.push(columnObj.dimensionKey);\n        }\n        return keys;\n      }, []) ?? [];\n  const indicatorKeys =\n    options.indicators?.reduce((keys: string[], indicatorObj) => {\n      if (typeof indicatorObj === 'string') {\n        keys.push(indicatorObj);\n      } else {\n        keys.push(indicatorObj.indicatorKey);\n        if ((indicatorObj as IChartColumnIndicator).chartSpec) {\n          if (table.internalProps.dataConfig?.aggregationRules) {\n            table.internalProps.dataConfig?.aggregationRules.push({\n              field: indicatorObj.indicatorKey,\n              indicatorKey: indicatorObj.indicatorKey,\n              aggregationType: AggregationType.NONE\n            });\n          } else if (table.internalProps.dataConfig) {\n            table.internalProps.dataConfig.aggregationRules = [\n              {\n                field: indicatorObj.indicatorKey,\n                indicatorKey: indicatorObj.indicatorKey,\n                aggregationType: AggregationType.NONE\n              }\n            ];\n          } else {\n            table.internalProps.dataConfig = {\n              aggregationRules: [\n                {\n                  field: indicatorObj.indicatorKey,\n                  indicatorKey: indicatorObj.indicatorKey,\n                  aggregationType: AggregationType.NONE\n                }\n              ]\n            };\n          }\n        }\n      }\n      return keys;\n    }, []) ?? [];\n  if (options.rowHierarchyType === 'tree' && (options.extensionRows?.length ?? 0) >= 1) {\n    options.extensionRows?.forEach(extensionRow => {\n      const extension_rowKeys: string[] = [];\n      extensionRow.rows.forEach(row => {\n        if (typeof row === 'string') {\n          extension_rowKeys.push(row);\n        } else {\n          extension_rowKeys.push(row.dimensionKey);\n        }\n      });\n      rowKeys.push(...extension_rowKeys);\n    });\n  }\n  return {\n    rowKeys,\n    columnKeys,\n    indicatorKeys,\n    isNeedResetColumnDimensionTree,\n    isNeedResetRowDimensionTree,\n    columnDimensionTree,\n    rowDimensionTree\n  };\n}\n"]}

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

@@ -74,7 +74,7 @@ export declare class PivotHeaderLayoutMap implements LayoutMapAPI {
     leftRowSeriesNumberColumnCount: number;
     rightRowSeriesNumberColumn: SeriesNumberColumnData[];
     rightRowSeriesNumberColumnCount: number;
-    constructor(table: PivotTable | PivotChart, dataset: Dataset);
+    constructor(table: PivotTable | PivotChart, dataset: Dataset, columnDimensionTree: DimensionTree, rowDimensionTree: DimensionTree);
     handleRowSeriesNumber(rowSeriesNumber: IRowSeriesNumber): void;
     _generateColHeaderIds(): void;
     _generateRowHeaderIds(): void;
@@ -146,7 +146,7 @@ export declare class PivotHeaderLayoutMap implements LayoutMapAPI {
     getBodyIndexByCol(col: number): number;
     getRecordStartRowByRecordIndex(index: number): number;
     getRecordShowIndexByCell(col: number, row: number): number;
-    getCellHeaderPathsWidthTreeNode(col: number, row: number): IPivotTableCellHeaderPaths;
+    getCellHeaderPathsWithTreeNode(col: number, row: number): IPivotTableCellHeaderPaths;
     getCellHeaderPaths(col: number, row: number): IPivotTableCellHeaderPaths;
     private getIndicatorInfoByIndicatorKey;
     private findFullCellIds;
@@ -192,7 +192,8 @@ export declare class PivotHeaderLayoutMap implements LayoutMapAPI {
     getChartDataId(col: number, row: number): any;
     setPagination(pagination: IPagination): void;
     release(): void;
-    getHeadNode(dimensions: IDimensionInfo[]): IHeaderTreeDefine;
+    getHeadNode(col: number, row: number): IHeaderTreeDefine;
+    getHeadNodeByRowOrColDimensions(dimensions: IDimensionInfo[], col?: number, row?: number): IHeaderTreeDefine;
     clearCellRangeMap(): void;
     getDimensionKeyInChartSpec(_col: number, _row: number): string;
     _generateChartState(): {

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

@@ -10,8 +10,8 @@ const util_1 = require("../tools/util"), ts_types_1 = require("../ts-types"), gl
 };
 
 class PivotHeaderLayoutMap {
-    constructor(table, dataset) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s;
+    constructor(table, dataset, columnDimensionTree, rowDimensionTree) {
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p;
         if (this.colIndex = 0, this._showHeader = !0, this.columnHeaderObjs = [], this.rowHeaderObjs = [], 
         this._cornerHeaderCellIds = [], this._columnHeaderCellIds = [], this._rowHeaderCellIds = [], 
         this._rowHeaderCellIds_FULL = [], this._columnWidths = [], this.columnPaths = [], 
@@ -21,9 +21,7 @@ class PivotHeaderLayoutMap {
         this.colDimensionKeys = [], this.indicatorKeys = [], this.indicatorDimensionKey = global_1.IndicatorDimensionKeyPlaceholder, 
         this._rowHeaderExtensionTree = {}, this._extensionRowDimensionKeys = [], this.fullRowDimensionKeys = [], 
         this.leftRowSeriesNumberColumnCount = 0, this.rightRowSeriesNumberColumnCount = 0, 
-        this.sharedVar = {
-            seqId: 0
-        }, this._table = table, "tree" === table.options.rowHierarchyType && (this.extensionRows = table.options.extensionRows), 
+        this.sharedVar = table.layoutNodeId, this._table = table, "tree" === table.options.rowHierarchyType && (this.extensionRows = table.options.extensionRows), 
         this.dataset = dataset, this._largeCellRangeCache = [], this._CellHeaderPathMap = new Map, 
         this.rowTree = table.internalProps.rowTree, this.columnTree = table.internalProps.columnTree, 
         this.rowsDefine = null !== (_a = table.internalProps.rows) && void 0 !== _a ? _a : [], 
@@ -40,26 +38,10 @@ class PivotHeaderLayoutMap {
         this.rowHierarchyTextStartAlignment = table.options.rowHierarchyTextStartAlignment, 
         this.cornerSetting = null !== (_l = table.options.corner) && void 0 !== _l ? _l : {
             titleOnDimension: "column"
-        }, dataset && (this.rowTree = dataset.rowHeaderTree, this.columnTree = dataset.colHeaderTree, 
-        this.indicatorsAsCol && this._table.isPivotChart() && (0, get_chart_spec_1.checkHasCartesianChart)(this))) {
-            const supplyAxisNode = nodes => {
-                nodes.forEach((node => {
-                    var _a;
-                    (null === (_a = node.children) || void 0 === _a ? void 0 : _a.length) ? supplyAxisNode(node.children) : node.children = [ {
-                        dimensionKey: "axis",
-                        value: ""
-                    } ];
-                }));
-            };
-            (null === (_m = this.rowTree) || void 0 === _m ? void 0 : _m.length) ? supplyAxisNode(this.rowTree) : this.rowTree = [ {
-                dimensionKey: "axis",
-                value: ""
-            } ];
-        }
-        if (null === (_o = this.indicatorsDefine) || void 0 === _o || _o.forEach((indicator => {
+        }, dataset && (this.rowTree = dataset.rowHeaderTree, this.columnTree = dataset.colHeaderTree), 
+        null === (_m = this.indicatorsDefine) || void 0 === _m || _m.forEach((indicator => {
             "string" == typeof indicator ? this.indicatorKeys.push(indicator) : this.indicatorKeys.push(indicator.indicatorKey);
-        })), 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.columnDimensionTree = columnDimensionTree, this.rowDimensionTree = rowDimensionTree, 
         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, 
@@ -71,21 +53,27 @@ class PivotHeaderLayoutMap {
             }
             return !1;
         }))), this.resetColumnHeaderLevelCount(), this._rowHeaderCellIds_FULL = (0, util_1.transpose)(this._rowHeaderCellIds_FULL), 
-        "tree" === table.options.rowHierarchyType && (null === (_r = this.extensionRows) || void 0 === _r ? void 0 : _r.length) >= 1 && (this.generateExtensionRowTree(), 
+        "tree" === table.options.rowHierarchyType && (null === (_o = this.extensionRows) || void 0 === _o ? void 0 : _o.length) >= 1 && (this.generateExtensionRowTree(), 
         this.extensionRows.forEach((extensionRow => {
             const rowKeys = [];
             extensionRow.rows.forEach((row => {
                 "string" == typeof row ? rowKeys.push(row) : rowKeys.push(row.dimensionKey);
             })), this._extensionRowDimensionKeys.push(rowKeys), this.fullRowDimensionKeys = this.fullRowDimensionKeys.concat(rowKeys);
         }))), this.sharedVar.seqId = Math.max(this.sharedVar.seqId, this._headerObjects.length), 
-        "column" === this.cornerSetting.titleOnDimension) this.cornerHeaderObjs = this._addCornerHeaders(this.columnHeaderTitle ? [ "" ].concat(this.colDimensionKeys) : this.colDimensionKeys, this.columnsDefine); else if ("row" === this.cornerSetting.titleOnDimension) if ("tree" === this.rowHierarchyType && (null === (_s = this.extensionRows) || void 0 === _s ? void 0 : _s.length) >= 1) {
+        "column" === this.cornerSetting.titleOnDimension) {
+            const colDimensionKeys = this.columnDimensionTree.dimensionKeysIncludeVirtual.valueArr();
+            this.cornerHeaderObjs = this._addCornerHeaders(this.columnHeaderTitle ? [ "" ].concat(colDimensionKeys) : colDimensionKeys, this.columnsDefine);
+        } else if ("row" === this.cornerSetting.titleOnDimension) if ("tree" === this.rowHierarchyType && (null === (_p = this.extensionRows) || void 0 === _p ? void 0 : _p.length) >= 1) {
             const rowTreeFirstKey = [];
             rowTreeFirstKey.push(this.rowDimensionKeys[0]), this._extensionRowDimensionKeys.forEach((extensionRowKeys => {
                 rowTreeFirstKey.push(extensionRowKeys[0]);
             }));
             const extensionRowDimensions = this.extensionRows.reduce(((dimensions, cur) => dimensions.concat(cur.rows)), []);
             this.cornerHeaderObjs = this._addCornerHeaders(this.rowHeaderTitle ? [ "" ].concat(rowTreeFirstKey) : rowTreeFirstKey, this.rowsDefine.concat(extensionRowDimensions));
-        } else this.cornerHeaderObjs = this._addCornerHeaders(this.rowHeaderTitle ? [ "" ].concat(this.rowDimensionKeys) : this.rowDimensionKeys, this.rowsDefine); else this.cornerHeaderObjs = this._addCornerHeaders(null, void 0);
+        } else {
+            const rowDimensionKeys = this.rowDimensionTree.dimensionKeysIncludeVirtual.valueArr();
+            this.cornerHeaderObjs = this._addCornerHeaders(this.rowHeaderTitle ? [ "" ].concat(rowDimensionKeys) : rowDimensionKeys, this.rowsDefine);
+        } else this.cornerHeaderObjs = this._addCornerHeaders(null, void 0);
         this.colIndex = 0, this._headerObjectMap = this._headerObjects.reduce(((o, e) => (o[e.id] = e, 
         o)), {}), this.indicatorsAsCol && !this.hideIndicatorName ? this._indicatorShowType = "column" : this.indicatorsAsCol || this.hideIndicatorName ? this._indicatorShowType = "none" : this._indicatorShowType = "row", 
         this.setPagination(table.options.pagination), this._table.isPivotChart() && (this._chartItemSpanSize = 0, 
@@ -485,7 +473,8 @@ class PivotHeaderLayoutMap {
             if (this._table.isPivotChart() && this.indicatorsAsCol && !(null === (_b = null === (_a = this.dataset) || void 0 === _a ? void 0 : _a.colKeys) || void 0 === _b ? void 0 : _b.length) && 0 === (null === (_d = null === (_c = this.columnDimensionTree) || void 0 === _c ? void 0 : _c.tree) || void 0 === _d ? void 0 : _d.level) && !this.hasTwoIndicatorAxes) return void (this.columnHeaderLevelCount = 0);
             let count = this.indicatorsAsCol && this.hideIndicatorName && this.colDimensionKeys[this.colDimensionKeys.length - 1] === this.indicatorDimensionKey ? this.columnDimensionTree.totalLevel - 1 : this.columnDimensionTree.totalLevel;
             return this.columnHeaderTitle && (count += 1), this._table.isPivotChart() && this.indicatorsAsCol && !this.hasTwoIndicatorAxes && (0, 
-            get_chart_spec_1.checkHasCartesianChart)(this) && (count -= 1), void (this.columnHeaderLevelCount = count);
+            get_chart_spec_1.checkHasCartesianChart)(this.indicatorsDefine) && (count -= 1), 
+            void (this.columnHeaderLevelCount = count);
         }
         this.columnHeaderLevelCount = 0;
     }
@@ -496,7 +485,7 @@ class PivotHeaderLayoutMap {
                 const extensionRowCount = null !== (_b = null === (_a = this.extensionRows) || void 0 === _a ? void 0 : _a.length) && void 0 !== _b ? _b : 0;
                 return this.rowHeaderTitle ? void (this.rowHeaderLevelCount = 2 + extensionRowCount) : void (this.rowHeaderLevelCount = 1 + extensionRowCount);
             }
-            const rowLevelCount = this.rowDimensionKeys.length;
+            const rowLevelCount = this.rowDimensionTree.totalLevel;
             let count = rowLevelCount;
             return this.indicatorsAsCol || this.hideIndicatorName && this.rowDimensionKeys[this.rowDimensionKeys.length - 1] === this.indicatorDimensionKey && (count = rowLevelCount - 1), 
             this.rowHeaderTitle && (count += 1), void (this.rowHeaderLevelCount = count);
@@ -527,7 +516,7 @@ class PivotHeaderLayoutMap {
     }
     get bottomFrozenRowCount() {
         if (!this._table.isPivotChart()) return this._table.internalProps.bottomFrozenRowCount ? this.rowCount - this.headerLevelCount >= this._table.internalProps.bottomFrozenRowCount ? this._table.internalProps.bottomFrozenRowCount : this.rowCount - this.headerLevelCount : 0;
-        if (this.indicatorKeys.length >= 1 && (0, get_chart_spec_1.checkHasCartesianChart)(this)) {
+        if (this.indicatorKeys.length >= 1 && (0, get_chart_spec_1.checkHasCartesianChart)(this.indicatorsDefine)) {
             const axisOption = this._table.pivotChartAxes.find((axisOption => "bottom" === axisOption.orient));
             return !1 === (null == axisOption ? void 0 : axisOption.visible) ? 0 : (this.indicatorsAsCol, 
             1);
@@ -708,7 +697,7 @@ class PivotHeaderLayoutMap {
         return this.columnHeaderLevelCount + index;
     }
     getRecordShowIndexByCell(col, row) {}
-    getCellHeaderPathsWidthTreeNode(col, row) {
+    getCellHeaderPathsWithTreeNode(col, row) {
         if (col === this._lastCellCol && row === this._lastCellRow) return this._lastCellHeaderPath;
         let _largeCellRangeCacheIndex = -1;
         for (let i = 0; i < this._largeCellRangeCache.length; i++) {
@@ -747,7 +736,7 @@ class PivotHeaderLayoutMap {
     }
     getCellHeaderPaths(col, row) {
         var _a, _b;
-        const headerPathsWidthNode = this.getCellHeaderPathsWidthTreeNode(col, row), headerPaths = {
+        const headerPathsWidthNode = this.getCellHeaderPathsWithTreeNode(col, row), headerPaths = {
             colHeaderPaths: [],
             rowHeaderPaths: [],
             cellLocation: headerPathsWidthNode.cellLocation
@@ -757,14 +746,14 @@ class PivotHeaderLayoutMap {
             const colHeaderPath = {};
             colHeaderPath.dimensionKey = colHeader.dimensionKey, colHeaderPath.indicatorKey = colHeader.indicatorKey, 
             colHeaderPath.value = null !== (_c = null !== (_a = colHeader.value) && void 0 !== _a ? _a : null === (_b = this.getIndicatorInfoByIndicatorKey(colHeader.indicatorKey)) || void 0 === _b ? void 0 : _b.title) && void 0 !== _c ? _c : "", 
-            headerPaths.colHeaderPaths.push(colHeaderPath);
+            colHeaderPath.virtual = colHeader.virtual, headerPaths.colHeaderPaths.push(colHeaderPath);
         })), null === (_b = headerPathsWidthNode.rowHeaderPaths) || void 0 === _b || _b.forEach((rowHeader => {
             var _a, _b, _c;
             if ("axis" !== rowHeader.dimensionKey) {
                 const rowHeaderPath = {};
                 rowHeaderPath.dimensionKey = rowHeader.dimensionKey, rowHeaderPath.indicatorKey = rowHeader.indicatorKey, 
                 rowHeaderPath.value = null !== (_c = null !== (_a = rowHeader.value) && void 0 !== _a ? _a : null === (_b = this.getIndicatorInfoByIndicatorKey(rowHeader.indicatorKey)) || void 0 === _b ? void 0 : _b.title) && void 0 !== _c ? _c : "", 
-                headerPaths.rowHeaderPaths.push(rowHeaderPath);
+                rowHeaderPath.virtual = rowHeader.virtual, headerPaths.rowHeaderPaths.push(rowHeaderPath);
             }
         })), headerPaths;
     }
@@ -955,8 +944,8 @@ class PivotHeaderLayoutMap {
                 return this.getParentCellId(sourceCellRange.start.col, source.row) === this.getParentCellId(sourceCellRange.start.col, target.row);
             }
             {
-                const sourceRowHeaderPaths = (0, vutils_1.cloneDeep)(this.getCellHeaderPathsWidthTreeNode(source.col, source.row).rowHeaderPaths), targetRowHeaderPaths = (0, 
-                vutils_1.cloneDeep)(this.getCellHeaderPathsWidthTreeNode(target.col, target.row).rowHeaderPaths);
+                const sourceRowHeaderPaths = (0, vutils_1.cloneDeep)(this.getCellHeaderPathsWithTreeNode(source.col, source.row).rowHeaderPaths), targetRowHeaderPaths = (0, 
+                vutils_1.cloneDeep)(this.getCellHeaderPathsWithTreeNode(target.col, target.row).rowHeaderPaths);
                 if (sourceRowHeaderPaths.pop(), targetRowHeaderPaths.pop(), sourceRowHeaderPaths.length <= targetRowHeaderPaths.length) {
                     if (sourceRowHeaderPaths.length === targetRowHeaderPaths.length) return !sourceRowHeaderPaths.find(((item, i) => item.dimensionKey !== targetRowHeaderPaths[i].dimensionKey || item.value !== targetRowHeaderPaths[i].value));
                     if (sourceRowHeaderPaths.length > 0) for (let i = 0; i < sourceRowHeaderPaths.length; i++) if (sourceRowHeaderPaths[i].startInTotal !== targetRowHeaderPaths[i].startInTotal) return !1;
@@ -982,7 +971,7 @@ class PivotHeaderLayoutMap {
                 }
                 const sourceColumns = this._columnWidths.splice(sourceCellRange.start.col - this.leftRowSeriesNumberColumnCount, sourceSize);
                 return sourceColumns.unshift(targetIndex - this.leftRowSeriesNumberColumnCount, 0), 
-                Array.prototype.splice.apply(this._columnWidths, sourceColumns), this.columnDimensionTree.movePosition(this.getCellHeaderPathsWidthTreeNode(source.col, source.row).colHeaderPaths.length - 1, sourceCellRange.start.col - this.rowHeaderLevelCount - this.leftRowSeriesNumberColumnCount, targetCellRange.start.col - this.rowHeaderLevelCount - this.leftRowSeriesNumberColumnCount), 
+                Array.prototype.splice.apply(this._columnWidths, sourceColumns), this.columnDimensionTree.movePosition(this.getCellHeaderPathsWithTreeNode(source.col, source.row).colHeaderPaths.length - 1, sourceCellRange.start.col - this.rowHeaderLevelCount - this.leftRowSeriesNumberColumnCount, targetCellRange.start.col - this.rowHeaderLevelCount - this.leftRowSeriesNumberColumnCount), 
                 this.columnDimensionTree.reset(this.columnDimensionTree.tree.children, !0), this._CellHeaderPathMap = new Map, 
                 this._largeCellRangeCache.length = 0, {
                     sourceIndex: sourceCellRange.start.col,
@@ -994,7 +983,7 @@ class PivotHeaderLayoutMap {
             }
             if (this.isRowHeader(source.col, source.row)) {
                 let targetIndex;
-                const sourceRowHeaderPaths = this.getCellHeaderPathsWidthTreeNode(source.col, source.row).rowHeaderPaths, targetRowHeaderPaths = this.getCellHeaderPathsWidthTreeNode(target.col, target.row).rowHeaderPaths, sourceRowHeaderNode = sourceRowHeaderPaths[sourceRowHeaderPaths.length - 1], targetRowHeaderNode = targetRowHeaderPaths[sourceRowHeaderPaths.length - 1], sourceSize = sourceRowHeaderNode.size;
+                const sourceRowHeaderPaths = this.getCellHeaderPathsWithTreeNode(source.col, source.row).rowHeaderPaths, targetRowHeaderPaths = this.getCellHeaderPathsWithTreeNode(target.col, target.row).rowHeaderPaths, sourceRowHeaderNode = sourceRowHeaderPaths[sourceRowHeaderPaths.length - 1], targetRowHeaderNode = targetRowHeaderPaths[sourceRowHeaderPaths.length - 1], sourceSize = sourceRowHeaderNode.size;
                 if (targetIndex = target.row >= source.row ? targetRowHeaderNode.startInTotal + targetRowHeaderNode.size - sourceSize : targetRowHeaderNode.startInTotal, 
                 targetIndex === sourceCellRange.start.row - this.columnHeaderLevelCount) return null;
                 const sourceIds = this._rowHeaderCellIds.splice(sourceCellRange.start.row - this.columnHeaderLevelCount, sourceSize);
@@ -1125,7 +1114,7 @@ class PivotHeaderLayoutMap {
     }
     isAxisCell(col, row) {
         if (!this._table.isPivotChart()) return !1;
-        if (this.indicatorKeys.length >= 1 && (0, get_chart_spec_1.checkHasCartesianChart)(this)) {
+        if (this.indicatorKeys.length >= 1 && (0, get_chart_spec_1.checkHasCartesianChart)(this.indicatorsDefine)) {
             if (this.isBottomFrozenRow(col, row) && (0, get_chart_spec_1.isHasCartesianChartInline)(col, row, "col", this) || this.isRightFrozenColumn(col, row) && (0, 
             get_chart_spec_1.isHasCartesianChartInline)(col, row, "row", this)) return !0;
             if (this.isRowHeader(col, row) && col === this.rowHeaderLevelCount - 1 && (0, get_chart_spec_1.isHasCartesianChartInline)(col, row, "row", this)) return !0;
@@ -1171,9 +1160,21 @@ class PivotHeaderLayoutMap {
             null === (_a = indicatorObject.chartInstance) || void 0 === _a || _a.release();
         }));
     }
-    getHeadNode(dimensions) {
+    getHeadNode(col, row) {
+        var _a, _b, _c;
+        let dimensions;
+        const headerPaths = this.getCellHeaderPaths(col, row);
+        return headerPaths.rowHeaderPaths && (null !== (_b = null === (_a = headerPaths.rowHeaderPaths) || void 0 === _a ? void 0 : _a.length) && void 0 !== _b ? _b : 0) > 0 ? dimensions = null === (_c = headerPaths.rowHeaderPaths) || void 0 === _c ? void 0 : _c.slice(0, headerPaths.rowHeaderPaths.length) : headerPaths.colHeaderPaths && headerPaths.colHeaderPaths.length > 0 && (dimensions = headerPaths.colHeaderPaths.slice(0, headerPaths.colHeaderPaths.length)), 
+        this.getHeadNodeByRowOrColDimensions(dimensions, col, row);
+    }
+    getHeadNodeByRowOrColDimensions(dimensions, col, row) {
+        var _a;
         if (!Array.isArray(dimensions)) return;
         let rowDimension, colDimension, rowArr = this.rowTree, colArr = this.columnTree;
+        if ((0, vutils_1.isValid)(row) && (0, vutils_1.isValid)(col) && "tree" === this.rowHierarchyType && this.extensionRows && col >= 1 + this.leftRowSeriesNumberColumnCount) {
+            const hdId = this.getCellId(col - 1, row);
+            rowArr = this._rowHeaderExtensionTree[hdId].tree.children;
+        }
         for (let i = 0; i < dimensions.length; i++) {
             const highlightDimension = dimensions[i];
             if ((highlightDimension.isPivotCorner || !highlightDimension.value) && i === dimensions.length - 1) return;
@@ -1187,7 +1188,7 @@ class PivotHeaderLayoutMap {
                     break;
                 }
             }
-            if (!isCol) for (let k = 0; k < rowArr.length; k++) {
+            if (!isCol) for (let k = 0; null !== (_a = k < (null == rowArr ? void 0 : rowArr.length)) && void 0 !== _a && _a; k++) {
                 const dimension = rowArr[k];
                 if ((0, vutils_1.isValid)(highlightDimension.dimensionKey) && dimension.dimensionKey === highlightDimension.dimensionKey && dimension.value === highlightDimension.value || (0, 
                 vutils_1.isValid)(highlightDimension.indicatorKey) && dimension.indicatorKey === highlightDimension.indicatorKey && (dimension.value === highlightDimension.value || !(0, 
@@ -1391,12 +1392,7 @@ class PivotHeaderLayoutMap {
         return this.leftRowSeriesNumberColumnCount > 0 && col >= 0 && col < this.leftRowSeriesNumberColumnCount && row >= this.headerLevelCount ? this.leftRowSeriesNumberColumn[col] : this.rightRowSeriesNumberColumnCount > 0 && col >= this.colCount - this.rightRowSeriesNumberColumnCount && row >= this.headerLevelCount ? this.rightRowSeriesNumberColumn[col - (this.colCount - this.rightRowSeriesNumberColumnCount)] : void 0;
     }
     changeTreeNodeTitle(col, row, value) {
-        const headerPaths = this.getCellHeaderPaths(col, row);
-        if (headerPaths.rowHeaderPaths.length > 0) {
-            this.getHeadNode(headerPaths.rowHeaderPaths.slice(0, headerPaths.rowHeaderPaths.length)).value = value;
-        } else if (headerPaths.colHeaderPaths.length > 0) {
-            this.getHeadNode(headerPaths.colHeaderPaths.slice(0, headerPaths.colHeaderPaths.length)).value = value;
-        }
+        this.getHeadNode(col, row).value = value;
         const id = this.getCellId(col, row);
         this._headerObjectMap[id].title = value;
     }