@visactor/vtable 0.25.4 → 0.26.0-alpha.0

package/dist/vtable.js

@@ -33300,7 +33300,7 @@
         type = AggregationType.RECORD;
         isRecord = true;
         push(record) {
-            if (this.isRecord) {
+            if (this.isRecord && this.records) {
                 if (record.className === 'Aggregator') {
                     this.records.push(...record.records);
                 }
@@ -33326,7 +33326,9 @@
             if (this.isRecord) {
                 this.records = [record];
             }
-            this.fieldValue = record[this.field];
+            if (this.field) {
+                this.fieldValue = record[this.field];
+            }
         }
         value() {
             return this.fieldValue;
@@ -33349,7 +33351,7 @@
             this.aggregationFun = aggregationFun;
         }
         push(record) {
-            if (this.isRecord) {
+            if (this.isRecord && this.records) {
                 if (record.className === 'Aggregator') {
                     this.records.push(...record.records);
                 }
@@ -33357,7 +33359,9 @@
                     this.records.push(record);
                 }
             }
-            this.values.push(record[this.field]);
+            if (this.field) {
+                this.values.push(record[this.field]);
+            }
         }
         value() {
             if (!this.fieldValue) {
@@ -33383,7 +33387,7 @@
             this.needSplitPositiveAndNegativeForSum = needSplitPositiveAndNegative ?? false;
         }
         push(record) {
-            if (this.isRecord) {
+            if (this.isRecord && this.records) {
                 if (record.className === 'Aggregator') {
                     this.records.push(...record.records);
                 }
@@ -33403,7 +33407,7 @@
                     }
                 }
             }
-            else if (!isNaN(parseFloat(record[this.field]))) {
+            else if (this.field && !isNaN(parseFloat(record[this.field]))) {
                 const value = parseFloat(record[this.field]);
                 this.sum += value;
                 if (this.needSplitPositiveAndNegativeForSum) {
@@ -33432,29 +33436,31 @@
         recalculate() {
             this.sum = 0;
             this._formatedValue = undefined;
-            for (let i = 0; i < this.records.length; i++) {
-                const record = this.records[i];
-                if (record.className === 'Aggregator') {
-                    const value = record.value();
-                    this.sum += value;
-                    if (this.needSplitPositiveAndNegativeForSum) {
-                        if (value > 0) {
-                            this.positiveSum += value;
-                        }
-                        else if (value < 0) {
-                            this.nagetiveSum += value;
+            if (this.records) {
+                for (let i = 0; i < this.records.length; i++) {
+                    const record = this.records[i];
+                    if (record.className === 'Aggregator') {
+                        const value = record.value();
+                        this.sum += value;
+                        if (this.needSplitPositiveAndNegativeForSum) {
+                            if (value > 0) {
+                                this.positiveSum += value;
+                            }
+                            else if (value < 0) {
+                                this.nagetiveSum += value;
+                            }
                         }
                     }
-                }
-                else if (!isNaN(parseFloat(record[this.field]))) {
-                    const value = parseFloat(record[this.field]);
-                    this.sum += value;
-                    if (this.needSplitPositiveAndNegativeForSum) {
-                        if (value > 0) {
-                            this.positiveSum += value;
-                        }
-                        else if (value < 0) {
-                            this.nagetiveSum += value;
+                    else if (this.field && !isNaN(parseFloat(record[this.field]))) {
+                        const value = parseFloat(record[this.field]);
+                        this.sum += value;
+                        if (this.needSplitPositiveAndNegativeForSum) {
+                            if (value > 0) {
+                                this.positiveSum += value;
+                            }
+                            else if (value < 0) {
+                                this.nagetiveSum += value;
+                            }
                         }
                     }
                 }
@@ -33465,7 +33471,7 @@
         type = AggregationType.COUNT;
         count = 0;
         push(record) {
-            if (this.isRecord) {
+            if (this.isRecord && this.records) {
                 if (record.className === 'Aggregator') {
                     this.records.push(...record.records);
                 }
@@ -33490,13 +33496,15 @@
         recalculate() {
             this.count = 0;
             this._formatedValue = undefined;
-            for (let i = 0; i < this.records.length; i++) {
-                const record = this.records[i];
-                if (record.className === 'Aggregator') {
-                    this.count += record.value();
-                }
-                else {
-                    this.count++;
+            if (this.records) {
+                for (let i = 0; i < this.records.length; i++) {
+                    const record = this.records[i];
+                    if (record.className === 'Aggregator') {
+                        this.count += record.value();
+                    }
+                    else {
+                        this.count++;
+                    }
                 }
             }
         }
@@ -33506,7 +33514,7 @@
         sum = 0;
         count = 0;
         push(record) {
-            if (this.isRecord) {
+            if (this.isRecord && this.records) {
                 if (record.className === 'Aggregator') {
                     this.records.push(...record.records);
                 }
@@ -33518,7 +33526,7 @@
                 this.sum += record.sum;
                 this.count += record.count;
             }
-            else if (!isNaN(parseFloat(record[this.field]))) {
+            else if (this.field && !isNaN(parseFloat(record[this.field]))) {
                 this.sum += parseFloat(record[this.field]);
                 this.count++;
             }
@@ -33535,15 +33543,17 @@
             this.sum = 0;
             this.count = 0;
             this._formatedValue = undefined;
-            for (let i = 0; i < this.records.length; i++) {
-                const record = this.records[i];
-                if (record.className === 'Aggregator' && record.type === AggregationType.AVG) {
-                    this.sum += record.sum;
-                    this.count += record.count;
-                }
-                else if (!isNaN(parseFloat(record[this.field]))) {
-                    this.sum += parseFloat(record[this.field]);
-                    this.count++;
+            if (this.records) {
+                for (let i = 0; i < this.records.length; i++) {
+                    const record = this.records[i];
+                    if (record.className === 'Aggregator' && record.type === AggregationType.AVG) {
+                        this.sum += record.sum;
+                        this.count += record.count;
+                    }
+                    else if (this.field && !isNaN(parseFloat(record[this.field]))) {
+                        this.sum += parseFloat(record[this.field]);
+                        this.count++;
+                    }
                 }
             }
         }
@@ -33552,7 +33562,7 @@
         type = AggregationType.MAX;
         max = Number.MIN_SAFE_INTEGER;
         push(record) {
-            if (this.isRecord) {
+            if (this.isRecord && this.records) {
                 if (record.className === 'Aggregator') {
                     this.records.push(...record.records);
                 }
@@ -33566,10 +33576,10 @@
             else if (typeof record === 'number') {
                 this.max = record > this.max ? record : this.max;
             }
-            else if (typeof record[this.field] === 'number') {
+            else if (this.field && typeof record[this.field] === 'number') {
                 this.max = record[this.field] > this.max ? record[this.field] : this.max;
             }
-            else if (!isNaN(record[this.field])) {
+            else if (this.field && !isNaN(record[this.field])) {
                 this.max = parseFloat(record[this.field]) > this.max ? parseFloat(record[this.field]) : this.max;
             }
         }
@@ -33583,19 +33593,21 @@
         recalculate() {
             this.max = Number.MIN_SAFE_INTEGER;
             this._formatedValue = undefined;
-            for (let i = 0; i < this.records.length; i++) {
-                const record = this.records[i];
-                if (record.className === 'Aggregator') {
-                    this.max = record.max > this.max ? record.max : this.max;
-                }
-                else if (typeof record === 'number') {
-                    this.max = record > this.max ? record : this.max;
-                }
-                else if (typeof record[this.field] === 'number') {
-                    this.max = record[this.field] > this.max ? record[this.field] : this.max;
-                }
-                else if (!isNaN(record[this.field])) {
-                    this.max = parseFloat(record[this.field]) > this.max ? parseFloat(record[this.field]) : this.max;
+            if (this.records) {
+                for (let i = 0; i < this.records.length; i++) {
+                    const record = this.records[i];
+                    if (record.className === 'Aggregator') {
+                        this.max = record.max > this.max ? record.max : this.max;
+                    }
+                    else if (typeof record === 'number') {
+                        this.max = record > this.max ? record : this.max;
+                    }
+                    else if (this.field && typeof record[this.field] === 'number') {
+                        this.max = record[this.field] > this.max ? record[this.field] : this.max;
+                    }
+                    else if (this.field && !isNaN(record[this.field])) {
+                        this.max = parseFloat(record[this.field]) > this.max ? parseFloat(record[this.field]) : this.max;
+                    }
                 }
             }
         }
@@ -33604,7 +33616,7 @@
         type = AggregationType.MIN;
         min = Number.MAX_SAFE_INTEGER;
         push(record) {
-            if (this.isRecord) {
+            if (this.isRecord && this.records) {
                 if (record.className === 'Aggregator') {
                     this.records.push(...record.records);
                 }
@@ -33618,7 +33630,7 @@
             else if (typeof record === 'number') {
                 this.min = record < this.min ? record : this.min;
             }
-            else if (typeof record[this.field] === 'number') {
+            else if (this.field && typeof record[this.field] === 'number') {
                 this.min = record[this.field] < this.min ? record[this.field] : this.min;
             }
         }
@@ -33632,16 +33644,18 @@
         recalculate() {
             this.min = Number.MAX_SAFE_INTEGER;
             this._formatedValue = undefined;
-            for (let i = 0; i < this.records.length; i++) {
-                const record = this.records[i];
-                if (record.className === 'Aggregator') {
-                    this.min = record.min < this.min ? record.min : this.min;
-                }
-                else if (typeof record === 'number') {
-                    this.min = record < this.min ? record : this.min;
-                }
-                else if (typeof record[this.field] === 'number') {
-                    this.min = record[this.field] < this.min ? record[this.field] : this.min;
+            if (this.records) {
+                for (let i = 0; i < this.records.length; i++) {
+                    const record = this.records[i];
+                    if (record.className === 'Aggregator') {
+                        this.min = record.min < this.min ? record.min : this.min;
+                    }
+                    else if (typeof record === 'number') {
+                        this.min = record < this.min ? record : this.min;
+                    }
+                    else if (this.field && typeof record[this.field] === 'number') {
+                        this.min = record[this.field] < this.min ? record[this.field] : this.min;
+                    }
                 }
             }
         }
@@ -50973,9 +50987,9 @@
                 target.col = table.rowHeaderLevelCount + layoutMap.leftRowSeriesNumberColumnCount - 1;
             }
             if (layoutMap.rowHierarchyType === 'tree') {
-                const sourceRowHeaderPaths = layoutMap.getCellHeaderPathsWidthTreeNode(source.col, source.row)
+                const sourceRowHeaderPaths = layoutMap.getCellHeaderPathsWithTreeNode(source.col, source.row)
                     .rowHeaderPaths;
-                const targetRowHeaderPaths = layoutMap.getCellHeaderPathsWidthTreeNode(target.col, target.row)
+                const targetRowHeaderPaths = layoutMap.getCellHeaderPathsWithTreeNode(target.col, target.row)
                     .rowHeaderPaths;
                 if (sourceRowHeaderPaths.length <= targetRowHeaderPaths.length) {
                     const targetPathNode = targetRowHeaderPaths[sourceRowHeaderPaths.length - 1];
@@ -51374,7 +51388,7 @@
     function updateResizeColForIndicatorGroup$1(detaX, state) {
         const layout = state.table.internalProps.layoutMap;
         const headerPaths = layout.getCellHeaderPaths(state.columnResize.col, state.table.columnHeaderLevelCount);
-        const node = layout.getHeadNode(headerPaths.colHeaderPaths.slice(0, headerPaths.colHeaderPaths.length - 1));
+        const node = layout.getHeadNodeByRowOrColDimensions(headerPaths.colHeaderPaths.slice(0, headerPaths.colHeaderPaths.length - 1));
         const startCol = node.startInTotal + state.table.frozenColCount;
         const endCol = node.startInTotal + state.table.frozenColCount + node.size - 1;
         const totalColWidth = state.table.getColsWidth(startCol, endCol);
@@ -51776,9 +51790,9 @@
         }
         else {
             const headerPaths = layout.getCellHeaderPaths(state.table.rowHeaderLevelCount - 1, state.rowResize.row);
-            const headerPath = headerPaths.rowHeaderPaths[headerPaths.rowHeaderPaths.length - 1];
-            resizeDimensionKey = headerPath.dimensionKey;
-            resizeDimensionValue = headerPath.value;
+            const headerPath = headerPaths.rowHeaderPaths?.[headerPaths.rowHeaderPaths.length - 1];
+            resizeDimensionKey = headerPath?.dimensionKey;
+            resizeDimensionValue = headerPath?.value;
         }
         for (let row = state.table.columnHeaderLevelCount; row < state.table.rowCount - state.table.bottomFrozenRowCount; row++) {
             const indicatorKey = layout.getIndicatorKey(state.table.rowHeaderLevelCount, row);
@@ -51788,7 +51802,7 @@
             }
             else if (layout.indicatorsAsCol) {
                 const headerPaths = layout.getCellHeaderPaths(state.table.rowHeaderLevelCount - 1, row);
-                const headerPath = headerPaths?.rowHeaderPaths[headerPaths.rowHeaderPaths.length - 1];
+                const headerPath = headerPaths?.rowHeaderPaths?.[headerPaths.rowHeaderPaths.length - 1];
                 if (headerPath && resizeDimensionKey === headerPath.dimensionKey && resizeDimensionValue === headerPath.value) {
                     state.table.scenegraph.updateRowHeight(row, detaY);
                     state.table.internalProps._heightResizedRowMap.add(row);
@@ -51799,7 +51813,7 @@
     function updateResizeColForIndicatorGroup(detaY, state) {
         const layout = state.table.internalProps.layoutMap;
         const headerPaths = layout.getCellHeaderPaths(state.table.rowHeaderLevelCount, state.rowResize.row);
-        const node = layout.getHeadNode(headerPaths.rowHeaderPaths.slice(0, headerPaths.rowHeaderPaths.length - 1));
+        const node = layout.getHeadNodeByRowOrColDimensions(headerPaths.rowHeaderPaths.slice(0, headerPaths.rowHeaderPaths.length - 1));
         const startRow = node.startInTotal + state.table.frozenRowCount;
         const endRow = node.startInTotal + state.table.frozenRowCount + node.size - 1;
         const totalRowHeight = state.table.getRowsHeight(startRow, endRow);
@@ -58244,7 +58258,7 @@
             return TABLE_EVENT_TYPE;
         }
         options;
-        version = "0.25.4";
+        version = "0.26.0-alpha.0";
         pagination;
         id = `VTable${Date.now()}`;
         headerStyleCache;
@@ -61093,10 +61107,10 @@
         }
         return true;
     }
-    function checkHasCartesianChart(layout) {
+    function checkHasCartesianChart(indicatorsDefine) {
         let isHasCartesianChart = false;
-        for (let i = 0; i < layout.indicatorsDefine.length; i++) {
-            const columnObj = layout.indicatorsDefine[i];
+        for (let i = 0; i < indicatorsDefine.length; i++) {
+            const columnObj = indicatorsDefine[i];
             if (columnObj.chartSpec) {
                 if (columnObj.chartSpec.type !== 'wordCloud' &&
                     columnObj.chartSpec.type !== 'radar' &&
@@ -61370,59 +61384,6 @@
         return isHasChart;
     }
 
-    function checkHasAggregation(layoutMap) {
-        const columnObjects = layoutMap.columnObjects;
-        for (let i = 0; i < columnObjects.length; i++) {
-            const column = columnObjects[i];
-            if (column?.aggregation) {
-                return true;
-            }
-        }
-        return false;
-    }
-    function checkHasAggregationOnTop(layoutMap) {
-        const columnObjects = layoutMap.columnObjects;
-        let count = 0;
-        for (let i = 0; i < columnObjects.length; i++) {
-            const column = columnObjects[i];
-            if (column?.aggregation) {
-                if (Array.isArray(column?.aggregation)) {
-                    count = Math.max(count, column.aggregation.filter(item => item.showOnTop === true).length);
-                }
-                else if (column.aggregation.showOnTop === true) {
-                    count = Math.max(count, 1);
-                }
-            }
-        }
-        return count;
-    }
-    function checkHasAggregationOnBottom(layoutMap) {
-        const columnObjects = layoutMap.columnObjects;
-        let count = 0;
-        for (let i = 0; i < columnObjects.length; i++) {
-            const column = columnObjects[i];
-            if (column?.aggregation) {
-                if (Array.isArray(column?.aggregation)) {
-                    count = Math.max(count, column.aggregation.filter(item => item.showOnTop === false).length);
-                }
-                else if (column.aggregation.showOnTop === false) {
-                    count = Math.max(count, 1);
-                }
-            }
-        }
-        return count;
-    }
-    function checkHasTreeDefine(layoutMap) {
-        const columnObjects = layoutMap.columnObjects;
-        for (let i = 0; i < columnObjects.length; i++) {
-            const column = columnObjects[i];
-            if (column?.define?.tree) {
-                return true;
-            }
-        }
-        return false;
-    }
-
     class DimensionTree {
         sharedVar;
         sizeIncludeParent = false;
@@ -61455,14 +61416,15 @@
             this.dimensionKeys = new NumberMap();
             this.tree.children = tree;
             this.setTreeNode(this.tree, 0, this.tree);
-            this.totalLevel = this.dimensionKeys.count();
         }
         setTreeNode(node, startIndex, parent) {
             node.startIndex = startIndex;
             node.startInTotal = (parent.startInTotal ?? 0) + node.startIndex;
             if (node.dimensionKey ?? node.indicatorKey) {
-                !this.dimensionKeys.contain(node.indicatorKey ? IndicatorDimensionKeyPlaceholder : node.dimensionKey) &&
+                if (!node.virtual &&
+                    !this.dimensionKeys.contain(node.indicatorKey ? IndicatorDimensionKeyPlaceholder : node.dimensionKey)) {
                     this.dimensionKeys.put(node.level, node.indicatorKey ? IndicatorDimensionKeyPlaceholder : node.dimensionKey);
+                }
                 if (!node.id) {
                     node.id = ++this.sharedVar.seqId;
                 }
@@ -61473,6 +61435,7 @@
                 if (children?.length >= 1) {
                     children.forEach((n) => {
                         n.level = (node.level ?? 0) + 1;
+                        this.totalLevel = Math.max(this.totalLevel, n.level + 1);
                         size += this.setTreeNode(n, size, node);
                     });
                 }
@@ -61483,12 +61446,14 @@
             else if (node.hierarchyState === HierarchyState.expand && children?.length >= 1) {
                 children.forEach((n) => {
                     n.level = (node.level ?? 0) + 1;
+                    this.totalLevel = Math.max(this.totalLevel, n.level + 1);
                     size += this.setTreeNode(n, size, node);
                 });
             }
             else if (node.hierarchyState === HierarchyState.collapse && children?.length >= 1) {
                 children.forEach((n) => {
                     n.level = (node.level ?? 0) + 1;
+                    this.totalLevel = Math.max(this.totalLevel, n.level + 1);
                     this.setTreeNode(n, size, node);
                 });
             }
@@ -61499,6 +61464,7 @@
                 children?.length >= 1 &&
                     children.forEach((n) => {
                         n.level = (node.level ?? 0) + 1;
+                        this.totalLevel = Math.max(this.totalLevel, n.level + 1);
                         size += this.setTreeNode(n, size, node);
                     });
             }
@@ -61507,6 +61473,7 @@
                 children?.length >= 1 &&
                     children.forEach((n) => {
                         n.level = (node.level ?? 0) + 1;
+                        this.totalLevel = Math.max(this.totalLevel, n.level + 1);
                         this.setTreeNode(n, size, node);
                     });
             }
@@ -61832,6 +61799,164 @@
         }
     }
 
+    function checkHasAggregation(layoutMap) {
+        const columnObjects = layoutMap.columnObjects;
+        for (let i = 0; i < columnObjects.length; i++) {
+            const column = columnObjects[i];
+            if (column?.aggregation) {
+                return true;
+            }
+        }
+        return false;
+    }
+    function checkHasAggregationOnTop(layoutMap) {
+        const columnObjects = layoutMap.columnObjects;
+        let count = 0;
+        for (let i = 0; i < columnObjects.length; i++) {
+            const column = columnObjects[i];
+            if (column?.aggregation) {
+                if (Array.isArray(column?.aggregation)) {
+                    count = Math.max(count, column.aggregation.filter(item => item.showOnTop === true).length);
+                }
+                else if (column.aggregation.showOnTop === true) {
+                    count = Math.max(count, 1);
+                }
+            }
+        }
+        return count;
+    }
+    function checkHasAggregationOnBottom(layoutMap) {
+        const columnObjects = layoutMap.columnObjects;
+        let count = 0;
+        for (let i = 0; i < columnObjects.length; i++) {
+            const column = columnObjects[i];
+            if (column?.aggregation) {
+                if (Array.isArray(column?.aggregation)) {
+                    count = Math.max(count, column.aggregation.filter(item => item.showOnTop === false).length);
+                }
+                else if (column.aggregation.showOnTop === false) {
+                    count = Math.max(count, 1);
+                }
+            }
+        }
+        return count;
+    }
+    function checkHasTreeDefine(layoutMap) {
+        const columnObjects = layoutMap.columnObjects;
+        for (let i = 0; i < columnObjects.length; i++) {
+            const column = columnObjects[i];
+            if (column?.define?.tree) {
+                return true;
+            }
+        }
+        return false;
+    }
+    function parseColKeyRowKeyForPivotTable(table, options) {
+        let columnDimensionTree;
+        let rowDimensionTree;
+        let isNeedResetColumnDimensionTree = false;
+        let isNeedResetRowDimensionTree = false;
+        if (options.columnTree) {
+            columnDimensionTree = new DimensionTree(table.internalProps.columnTree ?? [], table.layoutNodeId);
+            if (table.options.indicatorsAsCol !== false &&
+                !columnDimensionTree.dimensionKeys.contain(IndicatorDimensionKeyPlaceholder) &&
+                options.indicators?.length >= 1) {
+                isNeedResetColumnDimensionTree = true;
+            }
+        }
+        if (options.rowTree) {
+            rowDimensionTree = new DimensionTree(table.internalProps.rowTree ?? [], table.layoutNodeId, table.options.rowHierarchyType, table.options.rowHierarchyType === 'tree' ? table.options.rowExpandLevel ?? 1 : undefined);
+            if (table.options.indicatorsAsCol === false &&
+                !rowDimensionTree.dimensionKeys.contain(IndicatorDimensionKeyPlaceholder) &&
+                options.indicators?.length >= 1) {
+                isNeedResetRowDimensionTree = true;
+            }
+        }
+        const rowKeys = rowDimensionTree?.dimensionKeys?.count
+            ? rowDimensionTree.dimensionKeys.valueArr()
+            : options.rows?.reduce((keys, rowObj) => {
+                if (typeof rowObj === 'string') {
+                    keys.push(rowObj);
+                }
+                else {
+                    keys.push(rowObj.dimensionKey);
+                }
+                return keys;
+            }, []) ?? [];
+        const columnKeys = columnDimensionTree?.dimensionKeys?.count
+            ? columnDimensionTree.dimensionKeys.valueArr()
+            : options.columns?.reduce((keys, columnObj) => {
+                if (typeof columnObj === 'string') {
+                    keys.push(columnObj);
+                }
+                else {
+                    keys.push(columnObj.dimensionKey);
+                }
+                return keys;
+            }, []) ?? [];
+        const indicatorKeys = options.indicators?.reduce((keys, indicatorObj) => {
+            if (typeof indicatorObj === 'string') {
+                keys.push(indicatorObj);
+            }
+            else {
+                keys.push(indicatorObj.indicatorKey);
+                if (indicatorObj.chartSpec) {
+                    if (table.internalProps.dataConfig?.aggregationRules) {
+                        table.internalProps.dataConfig?.aggregationRules.push({
+                            field: indicatorObj.indicatorKey,
+                            indicatorKey: indicatorObj.indicatorKey,
+                            aggregationType: AggregationType.NONE
+                        });
+                    }
+                    else if (table.internalProps.dataConfig) {
+                        table.internalProps.dataConfig.aggregationRules = [
+                            {
+                                field: indicatorObj.indicatorKey,
+                                indicatorKey: indicatorObj.indicatorKey,
+                                aggregationType: AggregationType.NONE
+                            }
+                        ];
+                    }
+                    else {
+                        table.internalProps.dataConfig = {
+                            aggregationRules: [
+                                {
+                                    field: indicatorObj.indicatorKey,
+                                    indicatorKey: indicatorObj.indicatorKey,
+                                    aggregationType: AggregationType.NONE
+                                }
+                            ]
+                        };
+                    }
+                }
+            }
+            return keys;
+        }, []) ?? [];
+        if (options.rowHierarchyType === 'tree' && (options.extensionRows?.length ?? 0) >= 1) {
+            options.extensionRows?.forEach(extensionRow => {
+                const extension_rowKeys = [];
+                extensionRow.rows.forEach(row => {
+                    if (typeof row === 'string') {
+                        extension_rowKeys.push(row);
+                    }
+                    else {
+                        extension_rowKeys.push(row.dimensionKey);
+                    }
+                });
+                rowKeys.push(...extension_rowKeys);
+            });
+        }
+        return {
+            rowKeys,
+            columnKeys,
+            indicatorKeys,
+            isNeedResetColumnDimensionTree,
+            isNeedResetRowDimensionTree,
+            columnDimensionTree,
+            rowDimensionTree
+        };
+    }
+
     class SimpleHeaderLayoutMap {
         seqId = 0;
         _headerObjects;
@@ -64784,8 +64909,8 @@
         leftRowSeriesNumberColumnCount = 0;
         rightRowSeriesNumberColumn;
         rightRowSeriesNumberColumnCount = 0;
-        constructor(table, dataset) {
-            this.sharedVar = { seqId: 0 };
+        constructor(table, dataset, columnDimensionTree, rowDimensionTree) {
+            this.sharedVar = table.layoutNodeId;
             this._table = table;
             if (table.options.rowHierarchyType === 'tree') {
                 this.extensionRows = table.options.extensionRows;
@@ -64813,34 +64938,6 @@
             if (dataset) {
                 this.rowTree = dataset.rowHeaderTree;
                 this.columnTree = dataset.colHeaderTree;
-                if (this.indicatorsAsCol && this._table.isPivotChart() && checkHasCartesianChart(this)) {
-                    const supplyAxisNode = (nodes) => {
-                        nodes.forEach((node) => {
-                            if (node.children?.length) {
-                                supplyAxisNode(node.children);
-                            }
-                            else {
-                                node.children = [
-                                    {
-                                        dimensionKey: 'axis',
-                                        value: ''
-                                    }
-                                ];
-                            }
-                        });
-                    };
-                    if (this.rowTree?.length) {
-                        supplyAxisNode(this.rowTree);
-                    }
-                    else {
-                        this.rowTree = [
-                            {
-                                dimensionKey: 'axis',
-                                value: ''
-                            }
-                        ];
-                    }
-                }
             }
             this.indicatorsDefine?.forEach(indicator => {
                 if (typeof indicator === 'string') {
@@ -64850,8 +64947,8 @@
                     this.indicatorKeys.push(indicator.indicatorKey);
                 }
             });
-            this.columnDimensionTree = new DimensionTree(this.columnTree ?? [], this.sharedVar);
-            this.rowDimensionTree = new DimensionTree(this.rowTree ?? [], this.sharedVar, this.rowHierarchyType, this.rowHierarchyType === 'tree' ? this.rowExpandLevel : undefined);
+            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);
@@ -65571,7 +65668,7 @@
                 if (this._table.isPivotChart() &&
                     this.indicatorsAsCol &&
                     !this.hasTwoIndicatorAxes &&
-                    checkHasCartesianChart(this)) {
+                    checkHasCartesianChart(this.indicatorsDefine)) {
                     count -= 1;
                 }
                 this.columnHeaderLevelCount = count;
@@ -65591,7 +65688,7 @@
                     this.rowHeaderLevelCount = 1 + extensionRowCount;
                     return;
                 }
-                const rowLevelCount = this.rowDimensionKeys.length;
+                const rowLevelCount = this.rowDimensionTree.totalLevel;
                 let count = rowLevelCount;
                 if (this.indicatorsAsCol) ;
                 else if (this.hideIndicatorName &&
@@ -65647,7 +65744,7 @@
                 }
                 return 0;
             }
-            if (this.indicatorKeys.length >= 1 && checkHasCartesianChart(this)) {
+            if (this.indicatorKeys.length >= 1 && checkHasCartesianChart(this.indicatorsDefine)) {
                 const axisOption = this._table.pivotChartAxes.find(axisOption => {
                     return axisOption.orient === 'bottom';
                 });
@@ -65917,7 +66014,7 @@
         getRecordShowIndexByCell(col, row) {
             return undefined;
         }
-        getCellHeaderPathsWidthTreeNode(col, row) {
+        getCellHeaderPathsWithTreeNode(col, row) {
             if (col === this._lastCellCol && row === this._lastCellRow) {
                 return this._lastCellHeaderPath;
             }
@@ -65974,7 +66071,7 @@
             return p;
         }
         getCellHeaderPaths(col, row) {
-            const headerPathsWidthNode = this.getCellHeaderPathsWidthTreeNode(col, row);
+            const headerPathsWidthNode = this.getCellHeaderPathsWithTreeNode(col, row);
             const headerPaths = {
                 colHeaderPaths: [],
                 rowHeaderPaths: [],
@@ -65985,6 +66082,7 @@
                 colHeaderPath.dimensionKey = colHeader.dimensionKey;
                 colHeaderPath.indicatorKey = colHeader.indicatorKey;
                 colHeaderPath.value = colHeader.value ?? this.getIndicatorInfoByIndicatorKey(colHeader.indicatorKey)?.title ?? '';
+                colHeaderPath.virtual = colHeader.virtual;
                 headerPaths.colHeaderPaths.push(colHeaderPath);
             });
             headerPathsWidthNode.rowHeaderPaths?.forEach((rowHeader) => {
@@ -65994,6 +66092,7 @@
                     rowHeaderPath.indicatorKey = rowHeader.indicatorKey;
                     rowHeaderPath.value =
                         rowHeader.value ?? this.getIndicatorInfoByIndicatorKey(rowHeader.indicatorKey)?.title ?? '';
+                    rowHeaderPath.virtual = rowHeader.virtual;
                     headerPaths.rowHeaderPaths.push(rowHeaderPath);
                 }
             });
@@ -66290,8 +66389,8 @@
             }
             else if (this.isRowHeader(source.col, source.row)) {
                 if (this.rowHierarchyType === 'tree') {
-                    const sourceRowHeaderPaths = cloneDeep(this.getCellHeaderPathsWidthTreeNode(source.col, source.row).rowHeaderPaths);
-                    const targetRowHeaderPaths = cloneDeep(this.getCellHeaderPathsWidthTreeNode(target.col, target.row).rowHeaderPaths);
+                    const sourceRowHeaderPaths = cloneDeep(this.getCellHeaderPathsWithTreeNode(source.col, source.row).rowHeaderPaths);
+                    const targetRowHeaderPaths = cloneDeep(this.getCellHeaderPathsWithTreeNode(target.col, target.row).rowHeaderPaths);
                     sourceRowHeaderPaths.pop();
                     targetRowHeaderPaths.pop();
                     if (sourceRowHeaderPaths.length <= targetRowHeaderPaths.length) {
@@ -66342,7 +66441,7 @@
                     const sourceColumns = this._columnWidths.splice(sourceCellRange.start.col - this.leftRowSeriesNumberColumnCount, sourceSize);
                     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);
+                    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, true);
                     this._CellHeaderPathMap = new Map();
                     this._largeCellRangeCache.length = 0;
@@ -66356,8 +66455,8 @@
                 }
                 else if (this.isRowHeader(source.col, source.row)) {
                     let targetIndex;
-                    const sourceRowHeaderPaths = this.getCellHeaderPathsWidthTreeNode(source.col, source.row).rowHeaderPaths;
-                    const targetRowHeaderPaths = this.getCellHeaderPathsWidthTreeNode(target.col, target.row).rowHeaderPaths;
+                    const sourceRowHeaderPaths = this.getCellHeaderPathsWithTreeNode(source.col, source.row).rowHeaderPaths;
+                    const targetRowHeaderPaths = this.getCellHeaderPathsWithTreeNode(target.col, target.row).rowHeaderPaths;
                     const sourceRowHeaderNode = sourceRowHeaderPaths[sourceRowHeaderPaths.length - 1];
                     const targetRowHeaderNode = targetRowHeaderPaths[sourceRowHeaderPaths.length - 1];
                     const sourceSize = sourceRowHeaderNode.size;
@@ -66601,7 +66700,7 @@
             if (!this._table.isPivotChart()) {
                 return false;
             }
-            if (this.indicatorKeys.length >= 1 && checkHasCartesianChart(this)) {
+            if (this.indicatorKeys.length >= 1 && checkHasCartesianChart(this.indicatorsDefine)) {
                 if ((this.isBottomFrozenRow(col, row) && isHasCartesianChartInline(col, row, 'col', this)) ||
                     (this.isRightFrozenColumn(col, row) && isHasCartesianChartInline(col, row, 'row', this))) {
                     return true;
@@ -66667,7 +66766,18 @@
                 indicatorObject.chartInstance?.release();
             });
         }
-        getHeadNode(dimensions) {
+        getHeadNode(col, row) {
+            let dimensions;
+            const headerPaths = this.getCellHeaderPaths(col, row);
+            if (headerPaths.rowHeaderPaths && (headerPaths.rowHeaderPaths?.length ?? 0) > 0) {
+                dimensions = headerPaths.rowHeaderPaths?.slice(0, headerPaths.rowHeaderPaths.length);
+            }
+            else if (headerPaths.colHeaderPaths && headerPaths.colHeaderPaths.length > 0) {
+                dimensions = headerPaths.colHeaderPaths.slice(0, headerPaths.colHeaderPaths.length);
+            }
+            return this.getHeadNodeByRowOrColDimensions(dimensions, col, row);
+        }
+        getHeadNodeByRowOrColDimensions(dimensions, col, row) {
             if (!Array.isArray(dimensions)) {
                 return undefined;
             }
@@ -66675,6 +66785,14 @@
             let rowDimension;
             let colArr = this.columnTree;
             let colDimension;
+            if (isValid$3(row) &&
+                isValid$3(col) &&
+                this.rowHierarchyType === 'tree' &&
+                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) &&
@@ -66701,7 +66819,7 @@
                 if (isCol) {
                     continue;
                 }
-                for (let k = 0; k < rowArr.length; k++) {
+                for (let k = 0; k < rowArr?.length ?? 0; k++) {
                     const dimension = rowArr[k];
                     if ((isValid$3(highlightDimension.dimensionKey) &&
                         dimension.dimensionKey === highlightDimension.dimensionKey &&
@@ -67109,15 +67227,8 @@
             return undefined;
         }
         changeTreeNodeTitle(col, row, value) {
-            const headerPaths = this.getCellHeaderPaths(col, row);
-            if (headerPaths.rowHeaderPaths.length > 0) {
-                const headerTreeNode = this.getHeadNode(headerPaths.rowHeaderPaths.slice(0, headerPaths.rowHeaderPaths.length));
-                headerTreeNode.value = value;
-            }
-            else if (headerPaths.colHeaderPaths.length > 0) {
-                const headerTreeNode = this.getHeadNode(headerPaths.colHeaderPaths.slice(0, headerPaths.colHeaderPaths.length));
-                headerTreeNode.value = value;
-            }
+            const headerTreeNode = this.getHeadNode(col, row);
+            headerTreeNode.value = value;
             const id = this.getCellId(col, row);
             this._headerObjectMap[id].title = value;
         }
@@ -67440,15 +67551,15 @@
             this.needSplitPositiveAndNegative = needSplitPositiveAndNegative ?? false;
             this.rowsIsTotal = new Array(this.rows?.length ?? 0).fill(false);
             this.colsIsTotal = new Array(this.columns?.length ?? 0).fill(false);
-            if (this.totals?.row && this.totals.row.showSubTotals !== false) {
-                for (let i = 0, len = this.totals?.row?.subTotalsDimensions?.length; i < len; i++) {
+            if (this.totals?.row && this.totals.row.showSubTotals !== false && this.totals.row.subTotalsDimensions) {
+                for (let i = 0, len = this.totals?.row?.subTotalsDimensions?.length ?? 0; i < len; i++) {
                     const dimension = this.totals.row.subTotalsDimensions[i];
                     const dimensionIndex = this.rows.indexOf(dimension);
                     this.rowsIsTotal[dimensionIndex] = true;
                 }
             }
-            if (this.totals?.column && this.totals.column.showSubTotals !== false) {
-                for (let i = 0, len = this.totals?.column?.subTotalsDimensions?.length; i < len; i++) {
+            if (this.totals?.column && this.totals.column.showSubTotals !== false && this.totals.column.subTotalsDimensions) {
+                for (let i = 0, len = this.totals?.column?.subTotalsDimensions?.length ?? 0; i < len; i++) {
                     const dimension = this.totals.column.subTotalsDimensions[i];
                     const dimensionIndex = this.columns.indexOf(dimension);
                     this.colsIsTotal[dimensionIndex] = true;
@@ -67526,7 +67637,7 @@
         }
         processCollectedValuesWithSumBy() {
             for (const field in this.collectedValues) {
-                if (this.collectValuesBy[field]?.sumBy) {
+                if (this.collectValuesBy?.[field]?.sumBy) {
                     for (const byKeys in this.collectedValues[field]) {
                         let max;
                         if (this.collectValuesBy[field]?.extendRange === 'sum') {
@@ -67571,17 +67682,19 @@
             }
         }
         processCollectedValuesWithSortBy() {
+            const that = this;
             for (const field in this.collectedValues) {
-                if (this.collectValuesBy[field]?.sortBy) {
+                if (this.collectValuesBy?.[field]?.sortBy) {
                     for (const byKeys in this.collectedValues[field]) {
-                        this.collectedValues[field][byKeys] = this.collectedValues[field][byKeys].sort((a, b) => this.collectValuesBy[field]?.sortBy.indexOf(a) - this.collectValuesBy[field]?.sortBy.indexOf(b));
+                        this.collectedValues[field][byKeys] = this.collectedValues[field][byKeys].sort((a, b) => (that.collectValuesBy[field].sortBy?.indexOf(a) ?? -1) -
+                            (that.collectValuesBy[field].sortBy?.indexOf(b) ?? -1));
                     }
                 }
             }
         }
         generateCollectedValuesSortRule() {
             for (const field in this.collectedValues) {
-                if (this.collectValuesBy[field] && !this.collectValuesBy[field].sortBy) {
+                if (this.collectValuesBy && this.collectValuesBy[field] && !this.collectValuesBy[field].sortBy) {
                     let sortByRule = [];
                     for (const byKeys in this.collectedValues[field]) {
                         if (Array.isArray(this.collectedValues[field][byKeys])) {
@@ -67597,7 +67710,7 @@
         }
         processRecords() {
             let isNeedFilter = false;
-            if (this.dataConfig?.filterRules?.length >= 1) {
+            if ((this.dataConfig?.filterRules?.length ?? 0) >= 1) {
                 isNeedFilter = true;
             }
             if (Array.isArray(this.records)) {
@@ -67623,25 +67736,29 @@
         }
         filterRecord(record) {
             let isReserved = true;
-            for (let i = 0; i < this.dataConfig.filterRules.length; i++) {
-                const filterRule = this.dataConfig?.filterRules[i];
-                if (filterRule.filterKey) {
-                    const filterValue = record[filterRule.filterKey];
-                    if (filterRule.filteredValues.indexOf(filterValue) === -1) {
+            if (this.dataConfig?.filterRules) {
+                for (let i = 0; i < this.dataConfig.filterRules.length; i++) {
+                    const filterRule = this.dataConfig?.filterRules[i];
+                    if (filterRule.filterKey) {
+                        const filterValue = record[filterRule.filterKey];
+                        if (filterRule.filteredValues?.indexOf(filterValue) === -1) {
+                            isReserved = false;
+                            break;
+                        }
+                    }
+                    else if (!filterRule.filterFunc?.(record)) {
                         isReserved = false;
                         break;
                     }
                 }
-                else if (!filterRule.filterFunc?.(record)) {
-                    isReserved = false;
-                    break;
-                }
             }
             return isReserved;
         }
         processRecord(record, assignedIndicatorKey) {
             this.derivedFieldRules?.forEach((derivedFieldRule, i) => {
-                record[derivedFieldRule.fieldName] = derivedFieldRule.derivedFunc(record);
+                if (derivedFieldRule.fieldName && derivedFieldRule.derivedFunc) {
+                    record[derivedFieldRule.fieldName] = derivedFieldRule.derivedFunc(record);
+                }
             });
             for (const field in this.collectValuesBy) {
                 if (isValid$3(record[field])) {
@@ -67664,7 +67781,9 @@
                         }
                     }
                     if (this.collectValuesBy[field].sumBy) {
-                        const sumByKeys = this.collectValuesBy[field].sumBy.map(byField => record[byField]).join(this.stringJoinChar);
+                        const sumByKeys = this.collectValuesBy[field]
+                            .sumBy.map(byField => record[byField])
+                            .join(this.stringJoinChar);
                         if (!this.collectedValues[field][collectKeys][sumByKeys]) {
                             this.collectedValues[field][collectKeys][sumByKeys] = new this.aggregators[AggregationType.SUM](field, undefined, undefined, this.needSplitPositiveAndNegative);
                         }
@@ -67705,7 +67824,8 @@
                         isToTalRecord = true;
                         break;
                     }
-                    else if (this.dataConfig?.totals?.row?.subTotalsDimensions.indexOf(this.rows[l - 1]) >= 0) {
+                    else if (this.dataConfig?.totals?.row?.subTotalsDimensions &&
+                        this.dataConfig?.totals?.row?.subTotalsDimensions.indexOf(this.rows[l - 1]) >= 0) {
                         if (this.rowHierarchyType === 'grid') {
                             rowKey.push(this.rowSubTotalLabel);
                         }
@@ -67729,7 +67849,8 @@
                         isToTalRecord = true;
                         break;
                     }
-                    else if (this.dataConfig?.totals?.column?.subTotalsDimensions.indexOf(this.columns[n - 1]) >= 0) {
+                    else if (this.dataConfig?.totals?.column?.subTotalsDimensions &&
+                        this.dataConfig?.totals?.column?.subTotalsDimensions.indexOf(this.columns[n - 1]) >= 0) {
                         colKey.push(this.colSubTotalLabel);
                         isToTalRecord = true;
                         break;
@@ -67781,31 +67902,35 @@
                 }
                 for (let i = 0; i < this.indicatorKeys.length; i++) {
                     const aggRule = this.getAggregatorRule(this.indicatorKeys[i]);
-                    if (!this.tree[flatRowKey]?.[flatColKey]?.[i]) {
-                        this.tree[flatRowKey][flatColKey][i] = new this.aggregators[aggRule?.aggregationType ?? AggregationType.SUM](aggRule?.field ?? this.indicatorKeys[i], aggRule?.formatFun ??
-                            this.indicators?.find((indicator) => {
-                                if (typeof indicator !== 'string') {
-                                    return indicator.indicatorKey === this.indicatorKeys[i];
-                                }
-                                return false;
-                            })?.format);
-                    }
+                    let needAddToAggregator = false;
                     if (assignedIndicatorKey) {
-                        this.indicatorKeys[i] === assignedIndicatorKey && this.tree[flatRowKey]?.[flatColKey]?.[i].push(record);
+                        this.indicatorKeys[i] === assignedIndicatorKey && (needAddToAggregator = true);
                     }
                     else if (aggRule?.field) {
                         if (typeof aggRule?.field === 'string') {
-                            aggRule?.field in record && this.tree[flatRowKey]?.[flatColKey]?.[i].push(record);
+                            aggRule?.field in record && (needAddToAggregator = true);
                         }
                         else {
                             const isPush = aggRule?.field.find((field) => {
                                 return field in record;
                             });
-                            isPush && this.tree[flatRowKey]?.[flatColKey]?.[i].push(record);
+                            isPush && (needAddToAggregator = true);
                         }
                     }
                     else {
-                        this.indicatorKeys[i] in record && this.tree[flatRowKey]?.[flatColKey]?.[i].push(record);
+                        this.indicatorKeys[i] in record && (needAddToAggregator = true);
+                    }
+                    if (!this.tree[flatRowKey]?.[flatColKey]?.[i] && needAddToAggregator) {
+                        this.tree[flatRowKey][flatColKey][i] = new this.aggregators[aggRule?.aggregationType ?? AggregationType.SUM](aggRule?.field ?? this.indicatorKeys[i], aggRule?.formatFun ??
+                            this.indicators?.find((indicator) => {
+                                if (typeof indicator !== 'string') {
+                                    return indicator.indicatorKey === this.indicatorKeys[i];
+                                }
+                                return false;
+                            })?.format);
+                    }
+                    if (needAddToAggregator) {
+                        this.tree[flatRowKey]?.[flatColKey]?.[i].push(record);
                     }
                 }
             }
@@ -67884,12 +68009,22 @@
                 flatRowKey = rowKey;
             }
             else {
+                rowKey.map((key, i) => {
+                    if (key === indicator) {
+                        rowKey.splice(i, 1);
+                    }
+                });
                 flatRowKey = rowKey.join(this.stringJoinChar);
             }
             if (typeof colKey === 'string') {
                 flatColKey = colKey;
             }
             else {
+                colKey.map((key, i) => {
+                    if (key === indicator) {
+                        colKey.splice(i, 1);
+                    }
+                });
                 flatColKey = colKey.join(this.stringJoinChar);
             }
             const agg = this.tree[flatRowKey]?.[flatColKey]?.[indicatorIndex];
@@ -67943,9 +68078,6 @@
                     value() {
                         return null;
                     },
-                    formatValue() {
-                        return '';
-                    },
                     clearCacheValue() {
                     },
                     reset() {
@@ -68074,8 +68206,8 @@
         }
         totalStatistics() {
             const that = this;
-            if (that?.totals?.column?.subTotalsDimensions?.length >= 1 ||
-                that?.totals?.row?.subTotalsDimensions?.length >= 1 ||
+            if ((that?.totals?.column?.subTotalsDimensions && that?.totals?.column?.subTotalsDimensions?.length >= 1) ||
+                (that?.totals?.row?.subTotalsDimensions && that?.totals?.row?.subTotalsDimensions?.length >= 1) ||
                 that?.totals?.column?.showGrandTotals ||
                 that?.totals?.row?.showGrandTotals) {
                 const rowTotalKeys = [];
@@ -68085,32 +68217,34 @@
                         return;
                     }
                     const colKey = flatColKey.split(this.stringJoinChar);
-                    for (let i = 0, len = that.totals?.column?.subTotalsDimensions?.length; i < len; i++) {
-                        const dimension = that.totals.column.subTotalsDimensions[i];
-                        const dimensionIndex = that.columns.indexOf(dimension);
-                        if (dimensionIndex >= 0) {
-                            const colTotalKey = colKey.slice(0, dimensionIndex + 1);
-                            colTotalKey.push(that.colSubTotalLabel);
-                            const flatColTotalKey = colTotalKey.join(this.stringJoinChar);
-                            if (this.totalRecordsTree?.[flatRowKey]?.[flatColTotalKey]) {
-                                this.tree[flatRowKey][flatColTotalKey] = this.totalRecordsTree?.[flatRowKey]?.[flatColTotalKey];
-                                return;
-                            }
-                            if (!this.tree[flatRowKey][flatColTotalKey]) {
-                                this.tree[flatRowKey][flatColTotalKey] = [];
-                            }
-                            for (let i = 0; i < this.indicatorKeys.length; i++) {
-                                if (!this.tree[flatRowKey][flatColTotalKey][i]) {
-                                    const aggRule = this.getAggregatorRule(this.indicatorKeys[i]);
-                                    this.tree[flatRowKey][flatColTotalKey][i] = new this.aggregators[aggRule?.aggregationType ?? AggregationType.SUM](aggRule?.field ?? this.indicatorKeys[i], aggRule?.formatFun ??
-                                        this.indicators?.find((indicator) => {
-                                            if (typeof indicator !== 'string') {
-                                                return indicator.indicatorKey === this.indicatorKeys[i];
-                                            }
-                                            return false;
-                                        })?.format);
+                    if (that.totals?.column?.subTotalsDimensions) {
+                        for (let i = 0, len = that.totals?.column?.subTotalsDimensions?.length; i < len; i++) {
+                            const dimension = that.totals.column.subTotalsDimensions[i];
+                            const dimensionIndex = that.columns.indexOf(dimension);
+                            if (dimensionIndex >= 0) {
+                                const colTotalKey = colKey.slice(0, dimensionIndex + 1);
+                                colTotalKey.push(that.colSubTotalLabel);
+                                const flatColTotalKey = colTotalKey.join(this.stringJoinChar);
+                                if (this.totalRecordsTree?.[flatRowKey]?.[flatColTotalKey]) {
+                                    this.tree[flatRowKey][flatColTotalKey] = this.totalRecordsTree?.[flatRowKey]?.[flatColTotalKey];
+                                    return;
+                                }
+                                if (!this.tree[flatRowKey][flatColTotalKey]) {
+                                    this.tree[flatRowKey][flatColTotalKey] = [];
+                                }
+                                for (let i = 0; i < this.indicatorKeys.length; i++) {
+                                    if (!this.tree[flatRowKey][flatColTotalKey][i]) {
+                                        const aggRule = this.getAggregatorRule(this.indicatorKeys[i]);
+                                        this.tree[flatRowKey][flatColTotalKey][i] = new this.aggregators[aggRule?.aggregationType ?? AggregationType.SUM](aggRule?.field ?? this.indicatorKeys[i], aggRule?.formatFun ??
+                                            this.indicators?.find((indicator) => {
+                                                if (typeof indicator !== 'string') {
+                                                    return indicator.indicatorKey === this.indicatorKeys[i];
+                                                }
+                                                return false;
+                                            })?.format);
+                                    }
+                                    this.tree[flatRowKey][flatColTotalKey][i].push(that.tree[flatRowKey]?.[flatColKey]?.[i]);
                                 }
-                                this.tree[flatRowKey][flatColTotalKey][i].push(that.tree[flatRowKey]?.[flatColKey]?.[i]);
                             }
                         }
                     }
@@ -68141,34 +68275,36 @@
                 Object.keys(that.tree).forEach(flatRowKey => {
                     const rowKey = flatRowKey.split(this.stringJoinChar);
                     Object.keys(that.tree[flatRowKey]).forEach(flatColKey => {
-                        for (let i = 0, len = that.totals?.row?.subTotalsDimensions?.length; i < len; i++) {
-                            const dimension = that.totals.row.subTotalsDimensions[i];
-                            const dimensionIndex = that.rows.indexOf(dimension);
-                            if (dimensionIndex >= 0 && dimensionIndex < that.rows.length - 1) {
-                                const rowTotalKey = rowKey.slice(0, dimensionIndex + 1);
-                                if (this.rowHierarchyType === 'grid') {
-                                    rowTotalKey.push(that.rowSubTotalLabel);
-                                }
-                                const flatRowTotalKey = rowTotalKey.join(this.stringJoinChar);
-                                if (!this.tree[flatRowTotalKey]) {
-                                    this.tree[flatRowTotalKey] = {};
-                                    rowTotalKeys.push(flatRowTotalKey);
-                                }
-                                if (!this.tree[flatRowTotalKey][flatColKey]) {
-                                    this.tree[flatRowTotalKey][flatColKey] = [];
-                                }
-                                for (let i = 0; i < this.indicatorKeys.length; i++) {
-                                    if (!this.tree[flatRowTotalKey][flatColKey][i]) {
-                                        const aggRule = this.getAggregatorRule(this.indicatorKeys[i]);
-                                        this.tree[flatRowTotalKey][flatColKey][i] = new this.aggregators[aggRule?.aggregationType ?? AggregationType.SUM](aggRule?.field ?? this.indicatorKeys[i], aggRule?.formatFun ??
-                                            this.indicators?.find((indicator) => {
-                                                if (typeof indicator !== 'string') {
-                                                    return indicator.indicatorKey === this.indicatorKeys[i];
-                                                }
-                                                return false;
-                                            })?.format);
+                        if (that.totals?.row?.subTotalsDimensions) {
+                            for (let i = 0, len = that.totals?.row?.subTotalsDimensions?.length; i < len; i++) {
+                                const dimension = that.totals.row.subTotalsDimensions[i];
+                                const dimensionIndex = that.rows.indexOf(dimension);
+                                if (dimensionIndex >= 0 && dimensionIndex < that.rows.length - 1) {
+                                    const rowTotalKey = rowKey.slice(0, dimensionIndex + 1);
+                                    if (this.rowHierarchyType === 'grid') {
+                                        rowTotalKey.push(that.rowSubTotalLabel);
+                                    }
+                                    const flatRowTotalKey = rowTotalKey.join(this.stringJoinChar);
+                                    if (!this.tree[flatRowTotalKey]) {
+                                        this.tree[flatRowTotalKey] = {};
+                                        rowTotalKeys.push(flatRowTotalKey);
+                                    }
+                                    if (!this.tree[flatRowTotalKey][flatColKey]) {
+                                        this.tree[flatRowTotalKey][flatColKey] = [];
+                                    }
+                                    for (let i = 0; i < this.indicatorKeys.length; i++) {
+                                        if (!this.tree[flatRowTotalKey][flatColKey][i]) {
+                                            const aggRule = this.getAggregatorRule(this.indicatorKeys[i]);
+                                            this.tree[flatRowTotalKey][flatColKey][i] = new this.aggregators[aggRule?.aggregationType ?? AggregationType.SUM](aggRule?.field ?? this.indicatorKeys[i], aggRule?.formatFun ??
+                                                this.indicators?.find((indicator) => {
+                                                    if (typeof indicator !== 'string') {
+                                                        return indicator.indicatorKey === this.indicatorKeys[i];
+                                                    }
+                                                    return false;
+                                                })?.format);
+                                        }
+                                        this.tree[flatRowTotalKey][flatColKey][i].push(that.tree[flatRowKey]?.[flatColKey]?.[i]);
                                     }
-                                    this.tree[flatRowTotalKey][flatColKey][i].push(that.tree[flatRowKey]?.[flatColKey]?.[i]);
                                 }
                             }
                         }
@@ -68220,7 +68356,7 @@
                         item = {
                             value,
                             dimensionKey: rows[index],
-                            children: index === list.length - 1 && indicators?.length >= 1
+                            children: index === list.length - 1 && (indicators?.length ?? 0) >= 1
                                 ? indicators?.map(indicator => {
                                     if (typeof indicator === 'string') {
                                         return {
@@ -68267,7 +68403,7 @@
                         item = {
                             value,
                             dimensionKey: rows[index],
-                            children: index === list.length - 1 && indicators?.length >= 1
+                            children: index === list.length - 1 && (indicators?.length ?? 0) >= 1
                                 ? indicators?.map(indicator => {
                                     if (typeof indicator === 'string') {
                                         return {
@@ -68283,12 +68419,12 @@
                                 : []
                         };
                         if (subTotalFlags[index]) {
-                            let curChild = item.children;
+                            let curChild = item.children ?? [];
                             const totalChild = {
                                 value: subTotalLabel,
                                 dimensionKey: rows[index + 1],
                                 levelSpan: subTotalFlags.length - index - 1,
-                                children: indicators?.length >= 1
+                                children: (indicators?.length ?? 0) >= 1
                                     ? indicators?.map(indicator => {
                                         if (typeof indicator === 'string') {
                                             return {
@@ -68304,7 +68440,7 @@
                                     : []
                             };
                             curChild.push(totalChild);
-                            curChild = totalChild.children;
+                            curChild = totalChild.children ?? [];
                         }
                         map.set(flatKey, item);
                         if (node) {
@@ -68327,6 +68463,9 @@
             }
             else if (indicators) {
                 result = indicators?.map((indicator) => {
+                    if (typeof indicator === 'string') {
+                        return { indicatorKey: indicator, value: indicator };
+                    }
                     return { indicatorKey: indicator.indicatorKey, value: indicator.title ?? indicator.indicatorKey };
                 });
             }
@@ -68390,6 +68529,9 @@
                         !isHasIndicator &&
                         (!node.children?.length || !node.children)) {
                         node.children = this.indicators?.map((indicator) => {
+                            if (typeof indicator === 'string') {
+                                return { indicatorKey: indicator, value: indicator };
+                            }
                             return { indicatorKey: indicator.indicatorKey, value: indicator.title ?? indicator.indicatorKey };
                         });
                     }
@@ -68403,6 +68545,9 @@
             }
             else {
                 customTree = this.indicators?.map((indicator) => {
+                    if (typeof indicator === 'string') {
+                        return { indicatorKey: indicator, value: indicator };
+                    }
                     return { indicatorKey: indicator.indicatorKey, value: indicator.title ?? indicator.indicatorKey };
                 });
             }
@@ -68469,6 +68614,19 @@
                 this.processRecords();
             }
         }
+        changeDataConfig(dataConfig) {
+            this.rows = dataConfig.rows;
+            this.columns = dataConfig.columns;
+        }
+        addRecords(records) {
+            for (let i = 0, len = records.length; i < len; i++) {
+                const record = records[i];
+                this.processRecord(record);
+            }
+            if (Array.isArray(this.records)) {
+                this.records.push(records);
+            }
+        }
     }
     function arraySortByAnotherArray(array, sortArray) {
         return array.sort((a, b) => {
@@ -68485,6 +68643,7 @@
     }
 
     class PivotTable extends BaseTable {
+        layoutNodeId = { seqId: 0 };
         pivotSortState;
         editorManager;
         dataset;
@@ -68504,96 +68663,77 @@
                 }
             }
             super(container, options);
-            if (options.layout) {
-                Object.assign(options, options.layout);
-            }
-            this.internalProps.columns = cloneDeep(options.columns);
-            this.internalProps.rows = cloneDeep(options.rows);
-            this.internalProps.indicators = cloneDeepSpec(options.indicators);
-            options.indicators?.forEach((indicatorDefine, index) => {
-                if (typeof indicatorDefine === 'object' && indicatorDefine?.editor) {
-                    this.internalProps.indicators[index].editor = indicatorDefine.editor;
+            if (options) {
+                if (options.layout) {
+                    Object.assign(options, options.layout);
                 }
-            });
-            this.internalProps.columnTree =
-                options.indicatorsAsCol && !options.columns?.length && !options.columnTree ? [] : cloneDeep(options.columnTree);
-            this.internalProps.rowTree =
-                !options.indicatorsAsCol && !options.rows?.length && !options.rowTree ? [] : cloneDeep(options.rowTree);
-            this.internalProps.records = options.records;
-            this.pagination = options.pagination;
-            this.internalProps.columnResizeType = options.columnResizeType ?? 'column';
-            this.internalProps.rowResizeType = options.rowResizeType ?? 'row';
-            this.internalProps.dataConfig = cloneDeep(options.dataConfig);
-            if (!options.rowTree && !options.columnTree) {
-                this.internalProps.enableDataAnalysis = true;
-            }
-            else {
-                this.internalProps.enableDataAnalysis = false;
-            }
-            const records = this.internalProps.records;
-            if (this.internalProps.enableDataAnalysis && (options.rows || options.columns)) {
-                const rowKeys = options.rows?.reduce((keys, rowObj) => {
-                    if (typeof rowObj === 'string') {
-                        keys.push(rowObj);
-                    }
-                    else {
-                        keys.push(rowObj.dimensionKey);
-                    }
-                    return keys;
-                }, []) ?? [];
-                const columnKeys = options.columns?.reduce((keys, columnObj) => {
-                    if (typeof columnObj === 'string') {
-                        keys.push(columnObj);
+                this.internalProps.columns = cloneDeep(options.columns);
+                this.internalProps.rows = cloneDeep(options.rows);
+                this.internalProps.indicators = cloneDeepSpec(options.indicators);
+                options.indicators?.forEach((indicatorDefine, index) => {
+                    if (typeof indicatorDefine === 'object' && indicatorDefine?.editor) {
+                        this.internalProps.indicators[index].editor = indicatorDefine.editor;
                     }
-                    else {
-                        keys.push(columnObj.dimensionKey);
+                });
+                this.internalProps.columnTree =
+                    options.indicatorsAsCol && !options.columns?.length && !options.columnTree ? [] : cloneDeep(options.columnTree);
+                this.internalProps.rowTree =
+                    !options.indicatorsAsCol && !options.rows?.length && !options.rowTree ? [] : cloneDeep(options.rowTree);
+                this.internalProps.records = options.records;
+                this.pagination = options.pagination;
+                this.internalProps.columnResizeType = options.columnResizeType ?? 'column';
+                this.internalProps.rowResizeType = options.rowResizeType ?? 'row';
+                this.internalProps.dataConfig = cloneDeep(options.dataConfig);
+                const records = this.internalProps.records;
+                this.internalProps.recordsIsTwoDimensionalArray = false;
+                if (records?.[0]?.constructor === Array) {
+                    this.internalProps.recordsIsTwoDimensionalArray = true;
+                }
+                if (options.customConfig?.enableDataAnalysis === false) {
+                    const columnDimensionTree = new DimensionTree(this.internalProps.columnTree ?? [], this.layoutNodeId);
+                    const rowDimensionTree = new DimensionTree(this.internalProps.rowTree ?? [], this.layoutNodeId, this.options.rowHierarchyType, this.options.rowHierarchyType === 'tree' ? this.options.rowExpandLevel ?? 1 : undefined);
+                    this.internalProps.layoutMap = new PivotHeaderLayoutMap(this, null, columnDimensionTree, rowDimensionTree);
+                    if (this.internalProps.recordsIsTwoDimensionalArray === false) {
+                        this.flatDataToObjects = new FlatDataToObjects({
+                            rows: this.internalProps.layoutMap.fullRowDimensionKeys,
+                            columns: this.internalProps.layoutMap.colDimensionKeys,
+                            indicators: this.internalProps.layoutMap.indicatorKeys,
+                            indicatorsAsCol: this.internalProps.layoutMap.indicatorsAsCol,
+                            indicatorDimensionKey: this.internalProps.layoutMap.indicatorDimensionKey
+                        }, records);
                     }
-                    return keys;
-                }, []) ?? [];
-                const indicatorKeys = options.indicators?.reduce((keys, indicatorObj) => {
-                    if (typeof indicatorObj === 'string') {
-                        keys.push(indicatorObj);
+                }
+                else {
+                    const keysResults = parseColKeyRowKeyForPivotTable(this, options);
+                    const { rowKeys, columnKeys, indicatorKeys, isNeedResetColumnDimensionTree, isNeedResetRowDimensionTree } = keysResults;
+                    let { columnDimensionTree, rowDimensionTree } = keysResults;
+                    this.dataset = new Dataset(this.internalProps.dataConfig, rowKeys, columnKeys, indicatorKeys, this.internalProps.indicators, options.indicatorsAsCol ?? true, options.records, options.rowHierarchyType, this.internalProps.columnTree, this.internalProps.rowTree);
+                    if (!options.columnTree || isNeedResetColumnDimensionTree) {
+                        columnDimensionTree = new DimensionTree(this.dataset.colHeaderTree ?? [], this.layoutNodeId);
                     }
-                    else {
-                        keys.push(indicatorObj.indicatorKey);
+                    if (!options.rowTree || isNeedResetRowDimensionTree) {
+                        rowDimensionTree = new DimensionTree(this.dataset.rowHeaderTree ?? [], this.layoutNodeId, this.options.rowHierarchyType, this.options.rowHierarchyType === 'tree' ? this.options.rowExpandLevel ?? 1 : undefined);
                     }
-                    return keys;
-                }, []) ?? [];
-                this.dataset = new Dataset(this.internalProps.dataConfig, rowKeys, columnKeys, indicatorKeys, this.internalProps.indicators, options.indicatorsAsCol ?? true, options.records, options.rowHierarchyType, this.internalProps.columnTree, this.internalProps.rowTree);
-                this.internalProps.layoutMap = new PivotHeaderLayoutMap(this, this.dataset);
-            }
-            else if (Array.isArray(this.internalProps.columnTree) || Array.isArray(this.internalProps.rowTree)) {
-                this.internalProps.layoutMap = new PivotHeaderLayoutMap(this, null);
-                if (records?.[0]?.constructor !== Array) {
-                    this.flatDataToObjects = new FlatDataToObjects({
-                        rows: this.internalProps.layoutMap.fullRowDimensionKeys,
-                        columns: this.internalProps.layoutMap.colDimensionKeys,
-                        indicators: this.internalProps.layoutMap.indicatorKeys,
-                        indicatorsAsCol: this.internalProps.layoutMap.indicatorsAsCol,
-                        indicatorDimensionKey: this.internalProps.layoutMap.indicatorDimensionKey
-                    }, records);
+                    this.internalProps.layoutMap = new PivotHeaderLayoutMap(this, this.dataset, columnDimensionTree, rowDimensionTree);
                 }
+                this.pivotSortState = [];
+                if (options.pivotSortState) {
+                    this.updatePivotSortState(options.pivotSortState);
+                }
+                if (Env.mode !== 'node') {
+                    this.editorManager = new EditManeger(this);
+                }
+                this.refreshHeader();
+                this.stateManager.initCheckedState(records);
+                this.scenegraph.createSceneGraph();
+                if (options.title) {
+                    this.internalProps.title = new Title(options.title, this);
+                    this.scenegraph.resize();
+                }
+                setTimeout(() => {
+                    this.fireListeners(TABLE_EVENT_TYPE.INITIALIZED, null);
+                }, 0);
             }
-            else {
-                return;
-            }
-            this.pivotSortState = [];
-            if (options.pivotSortState) {
-                this.updatePivotSortState(options.pivotSortState);
-            }
-            if (Env.mode !== 'node') {
-                this.editorManager = new EditManeger(this);
-            }
-            this.refreshHeader();
-            this.stateManager.initCheckedState(records);
-            this.scenegraph.createSceneGraph();
-            if (options.title) {
-                this.internalProps.title = new Title(options.title, this);
-                this.scenegraph.resize();
-            }
-            setTimeout(() => {
-                this.fireListeners(TABLE_EVENT_TYPE.INITIALIZED, null);
-            }, 0);
         }
         static get EVENT_TYPE() {
             return PIVOT_TABLE_EVENT_TYPE;
@@ -68625,6 +68765,7 @@
         updateOption(options) {
             const internalProps = this.internalProps;
             super.updateOption(options);
+            this.layoutNodeId = { seqId: 0 };
             this.internalProps.columns = cloneDeep(options.columns);
             this.internalProps.rows = cloneDeep(options.rows);
             this.internalProps.indicators = !options.indicators?.length ? [] : cloneDeepSpec(options.indicators);
@@ -68644,12 +68785,6 @@
             internalProps.columnResizeType = options.columnResizeType ?? 'column';
             internalProps.rowResizeType = options.rowResizeType ?? 'row';
             internalProps.dataConfig = cloneDeep(options.dataConfig);
-            if (!options.rowTree && !options.columnTree) {
-                internalProps.enableDataAnalysis = true;
-            }
-            else {
-                internalProps.enableDataAnalysis = false;
-            }
             if (options?.rowHierarchyType === 'tree' &&
                 this.internalProps.layoutMap.rowHierarchyType === 'tree' &&
                 this.internalProps.layoutMap.rowExpandLevel === options?.rowExpandLevel) {
@@ -68662,40 +68797,21 @@
                 });
             }
             const records = this.internalProps.records;
-            if (this.internalProps.enableDataAnalysis && (options.rows || options.columns)) {
-                const rowKeys = options.rows?.reduce((keys, rowObj) => {
-                    if (typeof rowObj === 'string') {
-                        keys.push(rowObj);
-                    }
-                    else {
-                        keys.push(rowObj.dimensionKey);
-                    }
-                    return keys;
-                }, []);
-                const columnKeys = options.columns?.reduce((keys, columnObj) => {
-                    if (typeof columnObj === 'string') {
-                        keys.push(columnObj);
-                    }
-                    else {
-                        keys.push(columnObj.dimensionKey);
-                    }
-                    return keys;
-                }, []);
-                const indicatorKeys = options.indicators?.reduce((keys, indicatorObj) => {
-                    if (typeof indicatorObj === 'string') {
-                        keys.push(indicatorObj);
-                    }
-                    else {
-                        keys.push(indicatorObj.indicatorKey);
-                    }
-                    return keys;
-                }, []);
-                this.dataset = new Dataset(internalProps.dataConfig, rowKeys, columnKeys, indicatorKeys, this.internalProps.indicators, options.indicatorsAsCol ?? true, options.records, options.rowHierarchyType, this.internalProps.columnTree, this.internalProps.rowTree);
-                internalProps.layoutMap = new PivotHeaderLayoutMap(this, this.dataset);
+            this.internalProps.recordsIsTwoDimensionalArray = false;
+            if (records?.[0]?.constructor === Array) {
+                this.internalProps.recordsIsTwoDimensionalArray = true;
             }
-            else if (Array.isArray(this.internalProps.columnTree) || Array.isArray(this.internalProps.rowTree)) {
-                internalProps.layoutMap = new PivotHeaderLayoutMap(this, null);
-                if (records?.[0]?.constructor !== Array) {
+            if (options.customConfig?.enableDataAnalysis === false) {
+                let columnDimensionTree;
+                let rowDimensionTree;
+                if (options.columnTree) {
+                    columnDimensionTree = new DimensionTree(this.internalProps.columnTree ?? [], this.layoutNodeId);
+                }
+                if (options.rowTree) {
+                    rowDimensionTree = new DimensionTree(this.internalProps.rowTree ?? [], this.layoutNodeId, this.options.rowHierarchyType, this.options.rowHierarchyType === 'tree' ? this.options.rowExpandLevel ?? 1 : undefined);
+                }
+                internalProps.layoutMap = new PivotHeaderLayoutMap(this, null, columnDimensionTree, rowDimensionTree);
+                if (this.internalProps.recordsIsTwoDimensionalArray === false) {
                     this.flatDataToObjects = new FlatDataToObjects({
                         rows: internalProps.layoutMap.fullRowDimensionKeys,
                         columns: internalProps.layoutMap.colDimensionKeys,
@@ -68706,7 +68822,17 @@
                 }
             }
             else {
-                return this;
+                const keysResults = parseColKeyRowKeyForPivotTable(this, options);
+                const { rowKeys, columnKeys, indicatorKeys, isNeedResetColumnDimensionTree, isNeedResetRowDimensionTree } = keysResults;
+                let { columnDimensionTree, rowDimensionTree } = keysResults;
+                this.dataset = new Dataset(internalProps.dataConfig, rowKeys, columnKeys, indicatorKeys, this.internalProps.indicators, options.indicatorsAsCol ?? true, records, options.rowHierarchyType, this.internalProps.columnTree, this.internalProps.rowTree);
+                if (!options.columnTree || isNeedResetColumnDimensionTree) {
+                    columnDimensionTree = new DimensionTree(this.dataset.colHeaderTree ?? [], this.layoutNodeId);
+                }
+                if (!options.rowTree || isNeedResetRowDimensionTree) {
+                    rowDimensionTree = new DimensionTree(this.dataset.rowHeaderTree ?? [], this.layoutNodeId, this.options.rowHierarchyType, this.options.rowHierarchyType === 'tree' ? this.options.rowExpandLevel ?? 1 : undefined);
+                }
+                internalProps.layoutMap = new PivotHeaderLayoutMap(this, this.dataset, columnDimensionTree, rowDimensionTree);
             }
             this.pivotSortState = [];
             if (options.pivotSortState) {
@@ -68819,7 +68945,12 @@
             if (table.internalProps.layoutMap.isHeader(col, row)) {
                 return undefined;
             }
-            if (this.dataset) {
+            if (this.internalProps.recordsIsTwoDimensionalArray) {
+                const rowIndex = this.getBodyIndexByRow(row);
+                const colIndex = this.getBodyIndexByCol(col);
+                return this.records[rowIndex]?.[colIndex];
+            }
+            else if (this.dataset) {
                 const cellDimensionPath = this.internalProps.layoutMap.getCellHeaderPaths(col, row);
                 if (cellDimensionPath) {
                     const colKeys = cellDimensionPath.colHeaderPaths.map((colPath) => {
@@ -68828,7 +68959,7 @@
                     const rowKeys = cellDimensionPath.rowHeaderPaths.map((rowPath) => {
                         return rowPath.indicatorKey ?? rowPath.value;
                     });
-                    const aggregator = this.dataset.getAggregator(!this.internalProps.layoutMap.indicatorsAsCol ? rowKeys.slice(0, -1) : rowKeys, this.internalProps.layoutMap.indicatorsAsCol ? colKeys.slice(0, -1) : colKeys, this.internalProps.layoutMap.getIndicatorKey(col, row));
+                    const aggregator = this.dataset.getAggregator(rowKeys, colKeys, this.internalProps.layoutMap.getIndicatorKey(col, row));
                     if (aggregator.records && aggregator.records.length >= 1) {
                         return aggregator.records[0][field];
                     }
@@ -68847,9 +68978,6 @@
                     return treeNode?.record[field];
                 }
             }
-            const rowIndex = this.getBodyIndexByRow(row);
-            const colIndex = this.getBodyIndexByCol(col);
-            return this.records[rowIndex]?.[colIndex];
         }
         getCellValue(col, row, skipCustomMerge) {
             if (!skipCustomMerge) {
@@ -68870,16 +68998,40 @@
                 const { title, fieldFormat } = this.internalProps.layoutMap.getHeader(col, row);
                 return typeof fieldFormat === 'function' ? fieldFormat(title, col, row, this) : title;
             }
-            if (this.dataset) {
+            if (this.internalProps.recordsIsTwoDimensionalArray) {
+                const { fieldFormat } = this.internalProps.layoutMap.getBody(col, row);
+                const rowIndex = this.getBodyIndexByRow(row);
+                const colIndex = this.getBodyIndexByCol(col);
+                const dataValue = this.records[rowIndex]?.[colIndex];
+                if (typeof fieldFormat === 'function') {
+                    const fieldResult = fieldFormat(dataValue, col, row, this);
+                    return fieldResult;
+                }
+                return dataValue;
+            }
+            else if (this.dataset) {
                 const cellDimensionPath = this.internalProps.layoutMap.getCellHeaderPaths(col, row);
-                const colKeys = cellDimensionPath.colHeaderPaths.map((colPath) => {
+                const colKeys = cellDimensionPath.colHeaderPaths
+                    ?.filter((path) => {
+                    return !path.virtual;
+                })
+                    ?.map((colPath) => {
                     return colPath.indicatorKey ?? colPath.value;
                 });
-                const rowKeys = cellDimensionPath.rowHeaderPaths.map((rowPath) => {
+                const rowKeys = cellDimensionPath.rowHeaderPaths
+                    ?.filter((path) => {
+                    return !path.virtual;
+                })
+                    ?.map((rowPath) => {
                     return rowPath.indicatorKey ?? rowPath.value;
                 });
-                const aggregator = this.dataset.getAggregator(!this.internalProps.layoutMap.indicatorsAsCol ? rowKeys.slice(0, -1) : rowKeys, this.internalProps.layoutMap.indicatorsAsCol ? colKeys.slice(0, -1) : colKeys, this.internalProps.layoutMap.getIndicatorKey(col, row));
-                return aggregator.formatValue ? aggregator.formatValue(col, row, this) : '';
+                const aggregator = this.dataset.getAggregator(rowKeys, colKeys, this.internalProps.layoutMap.getIndicatorKey(col, row));
+                const { fieldFormat } = this.internalProps.layoutMap.getBody(col, row);
+                return aggregator.formatValue
+                    ? aggregator.formatValue(col, row, this)
+                    : typeof fieldFormat === 'function'
+                        ? fieldFormat(aggregator?.value(), col, row, this)
+                        : aggregator?.value() ?? '';
             }
             else if (this.flatDataToObjects) {
                 const cellDimensionPath = this.internalProps.layoutMap.getCellHeaderPaths(col, row);
@@ -68895,15 +69047,6 @@
                     ? fieldFormat(valueNode?.value, col, row, this)
                     : valueNode?.value ?? '';
             }
-            const { fieldFormat } = this.internalProps.layoutMap.getBody(col, row);
-            const rowIndex = this.getBodyIndexByRow(row);
-            const colIndex = this.getBodyIndexByCol(col);
-            const dataValue = this.records[rowIndex]?.[colIndex];
-            if (typeof fieldFormat === 'function') {
-                const fieldResult = fieldFormat(dataValue, col, row, this);
-                return fieldResult;
-            }
-            return dataValue;
         }
         getCellOriginValue(col, row) {
             const table = this;
@@ -68911,7 +69054,13 @@
                 const { title } = table.internalProps.layoutMap.getHeader(col, row);
                 return typeof title === 'function' ? title() : title;
             }
-            if (this.dataset) {
+            if (this.internalProps.recordsIsTwoDimensionalArray) {
+                const rowIndex = this.getBodyIndexByRow(row);
+                const colIndex = this.getBodyIndexByCol(col);
+                const dataValue = this.records[rowIndex]?.[colIndex];
+                return dataValue;
+            }
+            else if (this.dataset) {
                 const cellDimensionPath = this.internalProps.layoutMap.getCellHeaderPaths(col, row);
                 const colKeys = cellDimensionPath.colHeaderPaths.map((colPath) => {
                     return colPath.indicatorKey ?? colPath.value;
@@ -68919,7 +69068,7 @@
                 const rowKeys = cellDimensionPath.rowHeaderPaths.map((rowPath) => {
                     return rowPath.indicatorKey ?? rowPath.value;
                 });
-                const aggregator = this.dataset.getAggregator(!this.internalProps.layoutMap.indicatorsAsCol ? rowKeys.slice(0, -1) : rowKeys, this.internalProps.layoutMap.indicatorsAsCol ? colKeys.slice(0, -1) : colKeys, this.internalProps.layoutMap.getIndicatorKey(col, row));
+                const aggregator = this.dataset.getAggregator(rowKeys, colKeys, this.internalProps.layoutMap.getIndicatorKey(col, row));
                 return aggregator.value ? aggregator.value() : undefined;
             }
             else if (this.flatDataToObjects) {
@@ -68933,10 +69082,6 @@
                 const treeNode = this.flatDataToObjects.getTreeNode(rowKeys, colKeys, this.internalProps.layoutMap.getBody(col, row).indicatorKey);
                 return treeNode?.value;
             }
-            const rowIndex = this.getBodyIndexByRow(row);
-            const colIndex = this.getBodyIndexByCol(col);
-            const dataValue = this.records[rowIndex]?.[colIndex];
-            return dataValue;
         }
         getCellRawValue(col, row) {
             const table = this;
@@ -68944,7 +69089,13 @@
                 const { title } = table.internalProps.layoutMap.getHeader(col, row);
                 return typeof title === 'function' ? title() : title;
             }
-            if (this.dataset) {
+            if (this.internalProps.recordsIsTwoDimensionalArray) {
+                const rowIndex = this.getBodyIndexByRow(row);
+                const colIndex = this.getBodyIndexByCol(col);
+                const dataValue = this.records[rowIndex]?.[colIndex];
+                return dataValue;
+            }
+            else if (this.dataset) {
                 const cellDimensionPath = this.internalProps.layoutMap.getCellHeaderPaths(col, row);
                 const colKeys = cellDimensionPath.colHeaderPaths.map((colPath) => {
                     return colPath.indicatorKey ?? colPath.value;
@@ -68952,7 +69103,7 @@
                 const rowKeys = cellDimensionPath.rowHeaderPaths.map((rowPath) => {
                     return rowPath.indicatorKey ?? rowPath.value;
                 });
-                const aggregator = this.dataset.getAggregator(!this.internalProps.layoutMap.indicatorsAsCol ? rowKeys.slice(0, -1) : rowKeys, this.internalProps.layoutMap.indicatorsAsCol ? colKeys.slice(0, -1) : colKeys, this.internalProps.layoutMap.getIndicatorKey(col, row), false);
+                const aggregator = this.dataset.getAggregator(rowKeys, colKeys, this.internalProps.layoutMap.getIndicatorKey(col, row), false);
                 return aggregator.value ? aggregator.value() : undefined;
             }
             else if (this.flatDataToObjects) {
@@ -68966,17 +69117,19 @@
                 const treeNode = this.flatDataToObjects.getTreeNode(rowKeys, colKeys, this.internalProps.layoutMap.getBody(col, row).indicatorKey, false);
                 return treeNode?.value;
             }
-            const rowIndex = this.getBodyIndexByRow(row);
-            const colIndex = this.getBodyIndexByCol(col);
-            const dataValue = this.records[rowIndex]?.[colIndex];
-            return dataValue;
         }
         getCellOriginRecord(col, row) {
             const table = this;
             if (table.internalProps.layoutMap.isHeader(col, row)) {
                 return undefined;
             }
-            if (this.dataset) {
+            if (this.internalProps.recordsIsTwoDimensionalArray) {
+                const rowIndex = this.getBodyIndexByRow(row);
+                const colIndex = this.getBodyIndexByCol(col);
+                const dataValue = this.records[rowIndex]?.[colIndex];
+                return dataValue;
+            }
+            else if (this.dataset) {
                 const cellDimensionPath = this.internalProps.layoutMap.getCellHeaderPaths(col, row);
                 const colKeys = cellDimensionPath.colHeaderPaths.map((colPath) => {
                     return colPath.indicatorKey ?? colPath.value;
@@ -68984,7 +69137,7 @@
                 const rowKeys = cellDimensionPath.rowHeaderPaths.map((rowPath) => {
                     return rowPath.indicatorKey ?? rowPath.value;
                 });
-                const aggregator = this.dataset.getAggregator(!this.internalProps.layoutMap.indicatorsAsCol ? rowKeys.slice(0, -1) : rowKeys, this.internalProps.layoutMap.indicatorsAsCol ? colKeys.slice(0, -1) : colKeys, this.internalProps.layoutMap.getIndicatorKey(col, row));
+                const aggregator = this.dataset.getAggregator(rowKeys, colKeys, this.internalProps.layoutMap.getIndicatorKey(col, row));
                 return aggregator.records;
             }
             else if (this.flatDataToObjects) {
@@ -68998,17 +69151,19 @@
                 const treeNode = this.flatDataToObjects.getTreeNode(rowKeys, colKeys, this.internalProps.layoutMap.getBody(col, row).indicatorKey);
                 return treeNode?.record;
             }
-            const rowIndex = this.getBodyIndexByRow(row);
-            const colIndex = this.getBodyIndexByCol(col);
-            const dataValue = this.records[rowIndex]?.[colIndex];
-            return dataValue;
         }
         getCellRawRecord(col, row) {
             const table = this;
             if (table.internalProps.layoutMap.isHeader(col, row)) {
                 return undefined;
             }
-            if (this.dataset) {
+            if (this.internalProps.recordsIsTwoDimensionalArray) {
+                const rowIndex = this.getBodyIndexByRow(row);
+                const colIndex = this.getBodyIndexByCol(col);
+                const dataValue = this.records[rowIndex]?.[colIndex];
+                return dataValue;
+            }
+            else if (this.dataset) {
                 const cellDimensionPath = this.internalProps.layoutMap.getCellHeaderPaths(col, row);
                 const colKeys = cellDimensionPath.colHeaderPaths.map((colPath) => {
                     return colPath.indicatorKey ?? colPath.value;
@@ -69016,7 +69171,7 @@
                 const rowKeys = cellDimensionPath.rowHeaderPaths.map((rowPath) => {
                     return rowPath.indicatorKey ?? rowPath.value;
                 });
-                const aggregator = this.dataset.getAggregator(!this.internalProps.layoutMap.indicatorsAsCol ? rowKeys.slice(0, -1) : rowKeys, this.internalProps.layoutMap.indicatorsAsCol ? colKeys.slice(0, -1) : colKeys, this.internalProps.layoutMap.getIndicatorKey(col, row));
+                const aggregator = this.dataset.getAggregator(rowKeys, colKeys, this.internalProps.layoutMap.getIndicatorKey(col, row));
                 return aggregator.records;
             }
             else if (this.flatDataToObjects) {
@@ -69030,10 +69185,6 @@
                 const treeNode = this.flatDataToObjects.getTreeNode(rowKeys, colKeys, this.internalProps.layoutMap.getBody(col, row).indicatorKey, false);
                 return treeNode?.record;
             }
-            const rowIndex = this.getBodyIndexByRow(row);
-            const colIndex = this.getBodyIndexByCol(col);
-            const dataValue = this.records[rowIndex]?.[colIndex];
-            return dataValue;
         }
         updateSortRules(sortRules) {
             this.internalProps.dataConfig.sortRules = sortRules;
@@ -69075,7 +69226,7 @@
             const moveContext = this.internalProps.layoutMap.moveHeaderPosition(source, target);
             if (moveContext) {
                 if (moveContext.moveType === 'column') {
-                    if (this.options.records?.[0]?.constructor === Array) {
+                    if (this.internalProps.recordsIsTwoDimensionalArray) {
                         for (let row = 0; row < this.internalProps.records.length; row++) {
                             const sourceColumns = this.internalProps.records[row].splice(moveContext.sourceIndex - this.rowHeaderLevelCount, moveContext.sourceSize);
                             sourceColumns.unshift(moveContext.targetIndex - this.rowHeaderLevelCount, 0);
@@ -69086,7 +69237,7 @@
                     this.setMinMaxLimitWidth();
                 }
                 else if (moveContext.moveType === 'row') {
-                    if (this.options.records?.[0]?.constructor === Array) {
+                    if (this.internalProps.recordsIsTwoDimensionalArray) {
                         const sourceRows = this.internalProps.records.splice(moveContext.sourceIndex - this.columnHeaderLevelCount, moveContext.sourceSize);
                         sourceRows.unshift(moveContext.targetIndex - this.columnHeaderLevelCount, 0);
                         Array.prototype.splice.apply(this.internalProps.records, sourceRows);
@@ -69113,8 +69264,7 @@
                 });
             }
             else if (hierarchyState === HierarchyState.collapse) {
-                const headerPaths = this.internalProps.layoutMap.getCellHeaderPaths(col, row);
-                const headerTreeNode = this.internalProps.layoutMap.getHeadNode(headerPaths.rowHeaderPaths.slice(0, headerPaths.rowHeaderPaths.length));
+                const headerTreeNode = this.internalProps.layoutMap.getHeadNode(col, row);
                 if (Array.isArray(headerTreeNode.children)) {
                     this._refreshHierarchyState(col, row);
                 }
@@ -69197,7 +69347,7 @@
         }
         getCellHeaderTreeNodes(col, row) {
             const layoutMap = this.internalProps.layoutMap;
-            const headerNodes = layoutMap.getCellHeaderPathsWidthTreeNode(col, row);
+            const headerNodes = layoutMap.getCellHeaderPathsWithTreeNode(col, row);
             return headerNodes;
         }
         _hasHierarchyTreeHeader() {
@@ -69217,18 +69367,14 @@
         setRecords(records) {
             const oldHoverState = { col: this.stateManager.hover.cellPos.col, row: this.stateManager.hover.cellPos.row };
             this.options.records = this.internalProps.records = records;
+            this.internalProps.recordsIsTwoDimensionalArray = false;
+            if (records?.[0]?.constructor === Array) {
+                this.internalProps.recordsIsTwoDimensionalArray = true;
+            }
             const options = this.options;
             const internalProps = this.internalProps;
-            if (this.internalProps.enableDataAnalysis && (options.rows || options.columns)) {
-                this.dataset.setRecords(records);
-                internalProps.layoutMap = new PivotHeaderLayoutMap(this, this.dataset);
-                this.pivotSortState = [];
-                if (options.pivotSortState) {
-                    this.updatePivotSortState(options.pivotSortState);
-                }
-            }
-            else if (Array.isArray(this.internalProps.columnTree) || Array.isArray(this.internalProps.rowTree)) {
-                if (records?.[0]?.constructor !== Array) {
+            if (this.options.customConfig?.enableDataAnalysis === false) {
+                if (this.internalProps.recordsIsTwoDimensionalArray === false) {
                     this.flatDataToObjects = new FlatDataToObjects({
                         rows: internalProps.layoutMap.fullRowDimensionKeys,
                         columns: internalProps.layoutMap.colDimensionKeys,
@@ -69238,6 +69384,28 @@
                     }, records);
                 }
             }
+            else {
+                this.dataset.setRecords(records);
+                let columnDimensionTree;
+                let rowDimensionTree;
+                if (options.columnTree) {
+                    columnDimensionTree = internalProps.layoutMap.columnDimensionTree;
+                }
+                else {
+                    columnDimensionTree = new DimensionTree(this.dataset.colHeaderTree ?? [], this.layoutNodeId);
+                }
+                if (options.rowTree) {
+                    rowDimensionTree = internalProps.layoutMap.rowDimensionTree;
+                }
+                else {
+                    rowDimensionTree = new DimensionTree(this.dataset.rowHeaderTree ?? [], this.layoutNodeId, this.options.rowHierarchyType, this.options.rowHierarchyType === 'tree' ? this.options.rowExpandLevel ?? 1 : undefined);
+                }
+                internalProps.layoutMap = new PivotHeaderLayoutMap(this, this.dataset, columnDimensionTree, rowDimensionTree);
+                this.pivotSortState = [];
+                if (options.pivotSortState) {
+                    this.updatePivotSortState(options.pivotSortState);
+                }
+            }
             this.refreshHeader();
             this.scenegraph.clearCells();
             this.clearCellStyleCache();
@@ -69431,7 +69599,12 @@
             this.scenegraph.updateNextFrame();
         }
         _changeCellValueToDataSet(col, row, oldValue, newValue) {
-            if (this.dataset) {
+            if (this.internalProps.recordsIsTwoDimensionalArray) {
+                const rowIndex = this.getBodyIndexByRow(row);
+                const colIndex = this.getBodyIndexByCol(col);
+                this.records[rowIndex][colIndex] = newValue;
+            }
+            else if (this.dataset) {
                 const cellDimensionPath = this.internalProps.layoutMap.getCellHeaderPaths(col, row);
                 if (this.isHeader(col, row)) {
                     this.internalProps.layoutMap.changeTreeNodeTitle(col, row, newValue);
@@ -69473,11 +69646,6 @@
                     this.flatDataToObjects.changeTreeNodeValue(rowKeys, colKeys, this.internalProps.layoutMap.getBody(col, row).indicatorKey, newValue);
                 }
             }
-            else {
-                const rowIndex = this.getBodyIndexByRow(row);
-                const colIndex = this.getBodyIndexByCol(col);
-                this.records[rowIndex][colIndex] = newValue;
-            }
         }
         _hasCustomRenderOrLayout() {
             if (this.options.customRender) {
@@ -69512,8 +69680,7 @@
         }
         setTreeNodeChildren(children, records, col, row) {
             if (this.flatDataToObjects) {
-                const headerPaths = this.internalProps.layoutMap.getCellHeaderPaths(col, row);
-                const headerTreeNode = this.internalProps.layoutMap.getHeadNode(headerPaths.rowHeaderPaths.slice(0, headerPaths.rowHeaderPaths.length));
+                const headerTreeNode = this.internalProps.layoutMap.getHeadNode(col, row);
                 headerTreeNode.children = children;
                 this._refreshHierarchyState(col, row, () => {
                     this.flatDataToObjects.changeDataConfig({
@@ -69526,10 +69693,22 @@
                     this.flatDataToObjects.addRecords(records);
                 });
             }
+            else {
+                const headerTreeNode = this.internalProps.layoutMap.getHeadNode(col, row);
+                headerTreeNode.children = children;
+                this._refreshHierarchyState(col, row, () => {
+                    this.dataset.changeDataConfig({
+                        rows: this.internalProps.layoutMap.fullRowDimensionKeys,
+                        columns: this.internalProps.layoutMap.colDimensionKeys
+                    });
+                    this.dataset.addRecords(records);
+                });
+            }
         }
     }
 
     class PivotChart extends BaseTable {
+        layoutNodeId = { seqId: 0 };
         pivotSortState;
         dataset;
         _selectedDataItemsInChart = [];
@@ -69567,24 +69746,36 @@
             this.internalProps.rowResizeType = options.rowResizeType ?? 'row';
             this.internalProps.dataConfig = { isPivotChart: true };
             this._axes = isArray$3(options.axes) ? options.axes : [];
-            const rowKeys = options.rows?.reduce((keys, rowObj) => {
-                if (typeof rowObj === 'string') {
-                    keys.push(rowObj);
-                }
-                else {
-                    keys.push(rowObj.dimensionKey);
-                }
-                return keys;
-            }, []) ?? [];
-            const columnKeys = options.columns?.reduce((keys, columnObj) => {
-                if (typeof columnObj === 'string') {
-                    keys.push(columnObj);
-                }
-                else {
-                    keys.push(columnObj.dimensionKey);
-                }
-                return keys;
-            }, []) ?? [];
+            let columnDimensionTree;
+            let rowDimensionTree;
+            if (options.columnTree) {
+                columnDimensionTree = new DimensionTree(this.internalProps.columnTree ?? [], this.layoutNodeId);
+            }
+            if (options.rowTree) {
+                rowDimensionTree = new DimensionTree(this.internalProps.rowTree ?? [], this.layoutNodeId);
+            }
+            const rowKeys = rowDimensionTree?.dimensionKeys?.count
+                ? rowDimensionTree.dimensionKeys.valueArr()
+                : options.rows?.reduce((keys, rowObj) => {
+                    if (typeof rowObj === 'string') {
+                        keys.push(rowObj);
+                    }
+                    else {
+                        keys.push(rowObj.dimensionKey);
+                    }
+                    return keys;
+                }, []) ?? [];
+            const columnKeys = columnDimensionTree?.dimensionKeys?.count
+                ? columnDimensionTree.dimensionKeys.valueArr()
+                : options.columns?.reduce((keys, columnObj) => {
+                    if (typeof columnObj === 'string') {
+                        keys.push(columnObj);
+                    }
+                    else {
+                        keys.push(columnObj.dimensionKey);
+                    }
+                    return keys;
+                }, []) ?? [];
             const indicatorKeys = options.indicators?.reduce((keys, indicatorObj) => {
                 if (typeof indicatorObj === 'string') {
                     keys.push(indicatorObj);
@@ -69598,7 +69789,37 @@
             this.internalProps.dataConfig.aggregationRules = this._generateAggregationRules();
             this.internalProps.dataConfig.dimensionSortArray = this._getDimensionSortArray();
             this.dataset = new Dataset(this.internalProps.dataConfig, rowKeys, columnKeys, indicatorKeys, this.internalProps.indicators, options.indicatorsAsCol ?? true, options.records, undefined, this.internalProps.columnTree, this.internalProps.rowTree, true);
-            this.internalProps.layoutMap = new PivotHeaderLayoutMap(this, this.dataset);
+            if (this.options.indicatorsAsCol && checkHasCartesianChart(this.internalProps.indicators)) {
+                const supplyAxisNode = (nodes) => {
+                    nodes.forEach((node) => {
+                        if (node.children?.length) {
+                            supplyAxisNode(node.children);
+                        }
+                        else {
+                            node.children = [
+                                {
+                                    dimensionKey: 'axis',
+                                    value: ''
+                                }
+                            ];
+                        }
+                    });
+                };
+                if (this.dataset.rowHeaderTree?.length) {
+                    supplyAxisNode(this.dataset.rowHeaderTree);
+                }
+                else {
+                    this.dataset.rowHeaderTree = [
+                        {
+                            dimensionKey: 'axis',
+                            value: ''
+                        }
+                    ];
+                }
+            }
+            columnDimensionTree = new DimensionTree(this.dataset.colHeaderTree ?? [], this.layoutNodeId);
+            rowDimensionTree = new DimensionTree(this.dataset.rowHeaderTree ?? [], this.layoutNodeId);
+            this.internalProps.layoutMap = new PivotHeaderLayoutMap(this, this.dataset, columnDimensionTree, rowDimensionTree);
             this.refreshHeader();
             this.scenegraph.createSceneGraph();
             if (options.title) {
@@ -69642,6 +69863,7 @@
         updateOption(options) {
             const internalProps = this.internalProps;
             super.updateOption(options);
+            this.layoutNodeId = { seqId: 0 };
             this.internalProps.columns = cloneDeep(options.columns);
             this.internalProps.rows = cloneDeep(options.rows);
             this.internalProps.indicators = !options.indicators?.length ? [] : cloneDeepSpec(options.indicators);
@@ -69656,24 +69878,36 @@
             internalProps.rowResizeType = options.rowResizeType ?? 'row';
             internalProps.dataConfig = { isPivotChart: true };
             this._axes = isArray$3(options.axes) ? options.axes : [];
-            const rowKeys = options.rows?.reduce((keys, rowObj) => {
-                if (typeof rowObj === 'string') {
-                    keys.push(rowObj);
-                }
-                else {
-                    keys.push(rowObj.dimensionKey);
-                }
-                return keys;
-            }, []) ?? [];
-            const columnKeys = options.columns?.reduce((keys, columnObj) => {
-                if (typeof columnObj === 'string') {
-                    keys.push(columnObj);
-                }
-                else {
-                    keys.push(columnObj.dimensionKey);
-                }
-                return keys;
-            }, []) ?? [];
+            let columnDimensionTree;
+            let rowDimensionTree;
+            if (options.columnTree) {
+                columnDimensionTree = new DimensionTree(this.internalProps.columnTree ?? [], this.layoutNodeId);
+            }
+            if (options.rowTree) {
+                rowDimensionTree = new DimensionTree(this.internalProps.rowTree ?? [], this.layoutNodeId);
+            }
+            const rowKeys = rowDimensionTree?.dimensionKeys?.count
+                ? rowDimensionTree.dimensionKeys.valueArr()
+                : options.rows?.reduce((keys, rowObj) => {
+                    if (typeof rowObj === 'string') {
+                        keys.push(rowObj);
+                    }
+                    else {
+                        keys.push(rowObj.dimensionKey);
+                    }
+                    return keys;
+                }, []) ?? [];
+            const columnKeys = columnDimensionTree?.dimensionKeys?.count
+                ? columnDimensionTree.dimensionKeys.valueArr()
+                : options.columns?.reduce((keys, columnObj) => {
+                    if (typeof columnObj === 'string') {
+                        keys.push(columnObj);
+                    }
+                    else {
+                        keys.push(columnObj.dimensionKey);
+                    }
+                    return keys;
+                }, []) ?? [];
             const indicatorKeys = options.indicators?.reduce((keys, indicatorObj) => {
                 if (typeof indicatorObj === 'string') {
                     keys.push(indicatorObj);
@@ -69687,7 +69921,37 @@
             this.internalProps.dataConfig.aggregationRules = this._generateAggregationRules();
             this.internalProps.dataConfig.dimensionSortArray = this._getDimensionSortArray();
             this.dataset = new Dataset(this.internalProps.dataConfig, rowKeys, columnKeys, indicatorKeys, this.internalProps.indicators, options.indicatorsAsCol ?? true, options.records ?? this.internalProps.records, undefined, this.internalProps.columnTree, this.internalProps.rowTree, true);
-            internalProps.layoutMap = new PivotHeaderLayoutMap(this, this.dataset);
+            if (this.options.indicatorsAsCol && checkHasCartesianChart(this.internalProps.indicators)) {
+                const supplyAxisNode = (nodes) => {
+                    nodes.forEach((node) => {
+                        if (node.children?.length) {
+                            supplyAxisNode(node.children);
+                        }
+                        else {
+                            node.children = [
+                                {
+                                    dimensionKey: 'axis',
+                                    value: ''
+                                }
+                            ];
+                        }
+                    });
+                };
+                if (this.dataset.rowHeaderTree?.length) {
+                    supplyAxisNode(this.dataset.rowHeaderTree);
+                }
+                else {
+                    this.dataset.rowHeaderTree = [
+                        {
+                            dimensionKey: 'axis',
+                            value: ''
+                        }
+                    ];
+                }
+            }
+            columnDimensionTree = new DimensionTree(this.dataset.colHeaderTree ?? [], this.layoutNodeId);
+            rowDimensionTree = new DimensionTree(this.dataset.rowHeaderTree ?? [], this.layoutNodeId);
+            internalProps.layoutMap = new PivotHeaderLayoutMap(this, this.dataset, columnDimensionTree, rowDimensionTree);
             this.refreshHeader();
             if (internalProps.releaseList) {
                 internalProps.releaseList.forEach(releaseObj => releaseObj?.release?.());
@@ -69792,7 +70056,7 @@
                 const rowKeys = cellDimensionPath.rowHeaderPaths.map((rowPath) => {
                     return rowPath.indicatorKey ?? rowPath.value;
                 });
-                const aggregator = this.dataset.getAggregator(!this.internalProps.layoutMap.indicatorsAsCol ? rowKeys.slice(0, -1) : rowKeys, this.internalProps.layoutMap.indicatorsAsCol ? colKeys.slice(0, -1) : colKeys, this.internalProps.layoutMap.getIndicatorKey(col, row));
+                const aggregator = this.dataset.getAggregator(rowKeys, colKeys, this.internalProps.layoutMap.getIndicatorKey(col, row));
                 return aggregator.value ? aggregator.value() : undefined;
             }
             const { fieldFormat } = this.internalProps.layoutMap.getBody(col, row);
@@ -69831,7 +70095,7 @@
                 const rowKeys = cellDimensionPath.rowHeaderPaths.map((rowPath) => {
                     return rowPath.indicatorKey ?? rowPath.value;
                 });
-                const aggregator = this.dataset.getAggregator(!this.internalProps.layoutMap.indicatorsAsCol ? rowKeys.slice(0, -1) : rowKeys, this.internalProps.layoutMap.indicatorsAsCol ? colKeys.slice(0, -1) : colKeys, this.internalProps.layoutMap.getIndicatorKey(col, row));
+                const aggregator = this.dataset.getAggregator(rowKeys, colKeys, this.internalProps.layoutMap.getIndicatorKey(col, row));
                 return aggregator.value ? aggregator.value() : undefined;
             }
             const rowIndex = this.getBodyIndexByRow(row);
@@ -69855,7 +70119,7 @@
                 const rowKeys = cellDimensionPath.rowHeaderPaths.map((rowPath) => {
                     return rowPath.indicatorKey ?? rowPath.value;
                 });
-                const aggregator = this.dataset.getAggregator(!this.internalProps.layoutMap.indicatorsAsCol ? rowKeys.slice(0, -1) : rowKeys, this.internalProps.layoutMap.indicatorsAsCol ? colKeys.slice(0, -1) : colKeys, this.internalProps.layoutMap.getIndicatorKey(col, row));
+                const aggregator = this.dataset.getAggregator(rowKeys, colKeys, this.internalProps.layoutMap.getIndicatorKey(col, row));
                 return aggregator.records;
             }
             return undefined;
@@ -69983,6 +70247,8 @@
             return result;
         }
         _generateCollectValuesConfig(columnKeys, rowKeys) {
+            columnKeys = columnKeys.filter(key => key !== IndicatorDimensionKeyPlaceholder);
+            rowKeys = rowKeys.filter(key => key !== IndicatorDimensionKeyPlaceholder);
             const indicators = this.internalProps.indicators;
             const collectValuesBy = {};
             for (let i = 0, len = indicators?.length; i < len; i++) {
@@ -70342,10 +70608,24 @@
         setRecords(records) {
             const oldHoverState = { col: this.stateManager.hover.cellPos.col, row: this.stateManager.hover.cellPos.row };
             this.options.records = this.internalProps.records = records;
-            this.options;
+            const options = this.options;
             const internalProps = this.internalProps;
             this.dataset.setRecords(records);
-            internalProps.layoutMap = new PivotHeaderLayoutMap(this, this.dataset);
+            let columnDimensionTree;
+            let rowDimensionTree;
+            if (options.columnTree) {
+                columnDimensionTree = internalProps.layoutMap.columnDimensionTree;
+            }
+            else {
+                columnDimensionTree = new DimensionTree(this.dataset.colHeaderTree ?? [], this.layoutNodeId);
+            }
+            if (options.rowTree) {
+                rowDimensionTree = internalProps.layoutMap.rowDimensionTree;
+            }
+            else {
+                rowDimensionTree = new DimensionTree(this.dataset.rowHeaderTree ?? [], this.layoutNodeId);
+            }
+            internalProps.layoutMap = new PivotHeaderLayoutMap(this, this.dataset, columnDimensionTree, rowDimensionTree);
             this.refreshHeader();
             this.scenegraph.clearCells();
             this.clearCellStyleCache();
@@ -70389,6 +70669,27 @@
         }
         changeRecordOrder(source, target) {
         }
+        getLayoutColumnTree() {
+            const layoutMap = this.internalProps.layoutMap;
+            return layoutMap.getLayoutColumnTree();
+        }
+        getLayoutColumnTreeCount() {
+            const layoutMap = this.internalProps.layoutMap;
+            return layoutMap.getLayoutColumnTreeCount();
+        }
+        getLayoutRowTree() {
+            const layoutMap = this.internalProps.layoutMap;
+            return layoutMap.getLayoutRowTree();
+        }
+        getLayoutRowTreeCount() {
+            const layoutMap = this.internalProps.layoutMap;
+            return layoutMap.getLayoutRowTreeCount();
+        }
+        getCellHeaderTreeNodes(col, row) {
+            const layoutMap = this.internalProps.layoutMap;
+            const headerNodes = layoutMap.getCellHeaderPathsWithTreeNode(col, row);
+            return headerNodes;
+        }
     }
 
     class Circle extends Circle$1 {
@@ -70652,25 +70953,38 @@
     });
 
     function createDataset(options) {
+        const layoutNodeId = { seqId: 0 };
         const dataConfig = { isPivotChart: true };
-        const rowKeys = options.rows?.reduce((keys, rowObj) => {
-            if (typeof rowObj === 'string') {
-                keys.push(rowObj);
-            }
-            else {
-                keys.push(rowObj.dimensionKey);
-            }
-            return keys;
-        }, []) ?? [];
-        const columnKeys = options.columns?.reduce((keys, columnObj) => {
-            if (typeof columnObj === 'string') {
-                keys.push(columnObj);
-            }
-            else {
-                keys.push(columnObj.dimensionKey);
-            }
-            return keys;
-        }, []) ?? [];
+        let columnDimensionTree;
+        let rowDimensionTree;
+        if (options.columnTree) {
+            columnDimensionTree = new DimensionTree(options.columnTree ?? [], layoutNodeId);
+        }
+        if (options.rowTree) {
+            rowDimensionTree = new DimensionTree(options.rowTree ?? [], layoutNodeId);
+        }
+        const rowKeys = rowDimensionTree.dimensionKeys?.count
+            ? rowDimensionTree.dimensionKeys.valueArr()
+            : options.rows?.reduce((keys, rowObj) => {
+                if (typeof rowObj === 'string') {
+                    keys.push(rowObj);
+                }
+                else {
+                    keys.push(rowObj.dimensionKey);
+                }
+                return keys;
+            }, []) ?? [];
+        const columnKeys = columnDimensionTree.dimensionKeys?.count
+            ? columnDimensionTree.dimensionKeys.valueArr()
+            : options.columns?.reduce((keys, columnObj) => {
+                if (typeof columnObj === 'string') {
+                    keys.push(columnObj);
+                }
+                else {
+                    keys.push(columnObj.dimensionKey);
+                }
+                return keys;
+            }, []) ?? [];
         const indicatorKeys = options.indicators?.reduce((keys, indicatorObj) => {
             if (typeof indicatorObj === 'string') {
                 keys.push(indicatorObj);
@@ -70683,7 +70997,7 @@
         dataConfig.collectValuesBy = _generateCollectValuesConfig(options, columnKeys, rowKeys);
         dataConfig.aggregationRules = _generateAggregationRules(options);
         const dataset = new Dataset(dataConfig, rowKeys, columnKeys, indicatorKeys, options.indicators, options.indicatorsAsCol ?? true, options.records, undefined, options.columnTree, options.rowTree, true);
-        return dataset;
+        return { dataset, columnDimensionTree, rowDimensionTree, layoutNodeId };
     }
     function _generateCollectValuesConfig(option, columnKeys, rowKeys) {
         const collectValuesBy = {};
@@ -70846,9 +71160,25 @@
     }
 
     function getDataCellPath(options, data, compareFunc) {
-        const dataset = createDataset(options);
+        const results = createDataset(options);
+        let columnDimensionTree = results.columnDimensionTree;
+        let rowDimensionTree = results.rowDimensionTree;
+        let isNeedResetColumnDimensionTree = false;
+        let isNeedResetRowDimensionTree = false;
+        if (options.columnTree) {
+            if (options.indicatorsAsCol && !columnDimensionTree.dimensionKeys.contain(IndicatorDimensionKeyPlaceholder)) {
+                isNeedResetColumnDimensionTree = true;
+            }
+        }
+        if (options.rowTree) {
+            if (!options.indicatorsAsCol && !rowDimensionTree.dimensionKeys.contain(IndicatorDimensionKeyPlaceholder)) {
+                isNeedResetRowDimensionTree = true;
+            }
+        }
+        const { dataset, layoutNodeId } = results;
         const mockTable = {
             options,
+            layoutNodeId,
             internalProps: options,
             isPivotChart: () => true,
             pivotChartAxes: [],
@@ -70860,7 +71190,13 @@
                 };
             }
         };
-        const layoutMap = new PivotHeaderLayoutMap(mockTable, dataset);
+        if (!options.columnTree || isNeedResetColumnDimensionTree) {
+            columnDimensionTree = new DimensionTree(dataset.colHeaderTree ?? [], layoutNodeId);
+        }
+        if (!options.rowTree || isNeedResetRowDimensionTree) {
+            rowDimensionTree = new DimensionTree(dataset.rowHeaderTree ?? [], layoutNodeId);
+        }
+        const layoutMap = new PivotHeaderLayoutMap(mockTable, dataset, columnDimensionTree, rowDimensionTree);
         for (let col = 0; col < layoutMap.colCount; col++) {
             for (let row = 0; row < layoutMap.rowCount; row++) {
                 if (layoutMap.isHeader(col, row)) {
@@ -70907,7 +71243,7 @@
     }
 
     registerForVrender();
-    const version = "0.25.4";
+    const version = "0.26.0-alpha.0";
     function getIcons() {
         return get$2();
     }