@visactor/vtable 0.25.4 → 0.26.0-alpha.0

package/es/PivotTable.js

@@ -18,6 +18,8 @@ import { cloneDeep, isValid } from "@visactor/vutils";
 
 import { Env } from "./tools/env";
 
+import { DimensionTree } from "./layout/tree-helper";
+
 import { TABLE_EVENT_TYPE } from "./core/TABLE_EVENT_TYPE";
 
 import { EditManeger } from "./edit/edit-manager";
@@ -32,46 +34,54 @@ import { isAllDigits } from "./tools/util";
 
 import { cloneDeepSpec } from "./vutil-extension-temp";
 
+import { parseColKeyRowKeyForPivotTable } from "./layout/layout-helper";
+
 export class PivotTable extends BaseTable {
     constructor(container, options) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
-        "node" === Env.mode ? (options = container, container = null) : container instanceof HTMLElement || (options = container, 
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p;
+        if ("node" === Env.mode ? (options = container, container = null) : container instanceof HTMLElement || (options = container, 
         container = container.container ? container.container : null), super(container, options), 
-        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), 
-        null === (_a = options.indicators) || void 0 === _a || _a.forEach(((indicatorDefine, index) => {
-            "object" == typeof indicatorDefine && (null == indicatorDefine ? void 0 : indicatorDefine.editor) && (this.internalProps.indicators[index].editor = indicatorDefine.editor);
-        })), this.internalProps.columnTree = !options.indicatorsAsCol || (null === (_b = options.columns) || void 0 === _b ? void 0 : _b.length) || options.columnTree ? cloneDeep(options.columnTree) : [], 
-        this.internalProps.rowTree = options.indicatorsAsCol || (null === (_c = options.rows) || void 0 === _c ? void 0 : _c.length) || options.rowTree ? cloneDeep(options.rowTree) : [], 
-        this.internalProps.records = options.records, this.pagination = options.pagination, 
-        this.internalProps.columnResizeType = null !== (_d = options.columnResizeType) && void 0 !== _d ? _d : "column", 
-        this.internalProps.rowResizeType = null !== (_e = options.rowResizeType) && void 0 !== _e ? _e : "row", 
-        this.internalProps.dataConfig = cloneDeep(options.dataConfig), options.rowTree || options.columnTree ? this.internalProps.enableDataAnalysis = !1 : this.internalProps.enableDataAnalysis = !0;
-        const records = this.internalProps.records;
-        if (this.internalProps.enableDataAnalysis && (options.rows || options.columns)) {
-            const rowKeys = null !== (_g = null === (_f = options.rows) || void 0 === _f ? void 0 : _f.reduce(((keys, rowObj) => ("string" == typeof rowObj ? keys.push(rowObj) : keys.push(rowObj.dimensionKey), 
-            keys)), [])) && void 0 !== _g ? _g : [], columnKeys = null !== (_j = null === (_h = options.columns) || void 0 === _h ? void 0 : _h.reduce(((keys, columnObj) => ("string" == typeof columnObj ? keys.push(columnObj) : keys.push(columnObj.dimensionKey), 
-            keys)), [])) && void 0 !== _j ? _j : [], indicatorKeys = null !== (_l = null === (_k = options.indicators) || void 0 === _k ? void 0 : _k.reduce(((keys, indicatorObj) => ("string" == typeof indicatorObj ? keys.push(indicatorObj) : keys.push(indicatorObj.indicatorKey), 
-            keys)), [])) && void 0 !== _l ? _l : [];
-            this.dataset = new Dataset(this.internalProps.dataConfig, rowKeys, columnKeys, indicatorKeys, this.internalProps.indicators, null === (_m = options.indicatorsAsCol) || void 0 === _m || _m, 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)) return;
-            this.internalProps.layoutMap = new PivotHeaderLayoutMap(this, null), (null === (_o = null == records ? void 0 : records[0]) || void 0 === _o ? void 0 : _o.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.layoutNodeId = {
+            seqId: 0
+        }, options) {
+            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), 
+            null === (_a = options.indicators) || void 0 === _a || _a.forEach(((indicatorDefine, index) => {
+                "object" == typeof indicatorDefine && (null == indicatorDefine ? void 0 : indicatorDefine.editor) && (this.internalProps.indicators[index].editor = indicatorDefine.editor);
+            })), this.internalProps.columnTree = !options.indicatorsAsCol || (null === (_b = options.columns) || void 0 === _b ? void 0 : _b.length) || options.columnTree ? cloneDeep(options.columnTree) : [], 
+            this.internalProps.rowTree = options.indicatorsAsCol || (null === (_c = options.rows) || void 0 === _c ? void 0 : _c.length) || options.rowTree ? cloneDeep(options.rowTree) : [], 
+            this.internalProps.records = options.records, this.pagination = options.pagination, 
+            this.internalProps.columnResizeType = null !== (_d = options.columnResizeType) && void 0 !== _d ? _d : "column", 
+            this.internalProps.rowResizeType = null !== (_e = options.rowResizeType) && void 0 !== _e ? _e : "row", 
+            this.internalProps.dataConfig = cloneDeep(options.dataConfig);
+            const records = this.internalProps.records;
+            if (this.internalProps.recordsIsTwoDimensionalArray = !1, (null === (_f = null == records ? void 0 : records[0]) || void 0 === _f ? void 0 : _f.constructor) === Array && (this.internalProps.recordsIsTwoDimensionalArray = !0), 
+            !1 === (null === (_g = options.customConfig) || void 0 === _g ? void 0 : _g.enableDataAnalysis)) {
+                const columnDimensionTree = new DimensionTree(null !== (_h = this.internalProps.columnTree) && void 0 !== _h ? _h : [], this.layoutNodeId), rowDimensionTree = new DimensionTree(null !== (_j = this.internalProps.rowTree) && void 0 !== _j ? _j : [], this.layoutNodeId, this.options.rowHierarchyType, "tree" === this.options.rowHierarchyType ? null !== (_k = this.options.rowExpandLevel) && void 0 !== _k ? _k : 1 : void 0);
+                this.internalProps.layoutMap = new PivotHeaderLayoutMap(this, null, columnDimensionTree, rowDimensionTree), 
+                !1 === this.internalProps.recordsIsTwoDimensionalArray && (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));
+            } else {
+                const keysResults = parseColKeyRowKeyForPivotTable(this, options), {rowKeys: rowKeys, columnKeys: columnKeys, indicatorKeys: indicatorKeys, isNeedResetColumnDimensionTree: isNeedResetColumnDimensionTree, isNeedResetRowDimensionTree: isNeedResetRowDimensionTree} = keysResults;
+                let {columnDimensionTree: columnDimensionTree, rowDimensionTree: rowDimensionTree} = keysResults;
+                this.dataset = new Dataset(this.internalProps.dataConfig, rowKeys, columnKeys, indicatorKeys, this.internalProps.indicators, null === (_l = options.indicatorsAsCol) || void 0 === _l || _l, options.records, options.rowHierarchyType, this.internalProps.columnTree, this.internalProps.rowTree), 
+                options.columnTree && !isNeedResetColumnDimensionTree || (columnDimensionTree = new DimensionTree(null !== (_m = this.dataset.colHeaderTree) && void 0 !== _m ? _m : [], this.layoutNodeId)), 
+                options.rowTree && !isNeedResetRowDimensionTree || (rowDimensionTree = new DimensionTree(null !== (_o = this.dataset.rowHeaderTree) && void 0 !== _o ? _o : [], this.layoutNodeId, this.options.rowHierarchyType, "tree" === this.options.rowHierarchyType ? null !== (_p = this.options.rowExpandLevel) && void 0 !== _p ? _p : 1 : void 0)), 
+                this.internalProps.layoutMap = new PivotHeaderLayoutMap(this, this.dataset, columnDimensionTree, rowDimensionTree);
+            }
+            this.pivotSortState = [], options.pivotSortState && this.updatePivotSortState(options.pivotSortState), 
+            "node" !== Env.mode && (this.editorManager = new EditManeger(this)), this.refreshHeader(), 
+            this.stateManager.initCheckedState(records), this.scenegraph.createSceneGraph(), 
+            options.title && (this.internalProps.title = new Title(options.title, this), this.scenegraph.resize()), 
+            setTimeout((() => {
+                this.fireListeners(TABLE_EVENT_TYPE.INITIALIZED, null);
+            }), 0);
         }
-        this.pivotSortState = [], options.pivotSortState && this.updatePivotSortState(options.pivotSortState), 
-        "node" !== Env.mode && (this.editorManager = new EditManeger(this)), this.refreshHeader(), 
-        this.stateManager.initCheckedState(records), this.scenegraph.createSceneGraph(), 
-        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;
@@ -98,10 +108,12 @@ export class PivotTable extends BaseTable {
         return ifCan;
     }
     updateOption(options) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r;
         const internalProps = this.internalProps;
-        if (super.updateOption(options), this.internalProps.columns = cloneDeep(options.columns), 
-        this.internalProps.rows = cloneDeep(options.rows), this.internalProps.indicators = (null === (_a = options.indicators) || void 0 === _a ? void 0 : _a.length) ? cloneDeepSpec(options.indicators) : [], 
+        if (super.updateOption(options), this.layoutNodeId = {
+            seqId: 0
+        }, this.internalProps.columns = cloneDeep(options.columns), this.internalProps.rows = cloneDeep(options.rows), 
+        this.internalProps.indicators = (null === (_a = options.indicators) || void 0 === _a ? void 0 : _a.length) ? cloneDeepSpec(options.indicators) : [], 
         null === (_b = options.indicators) || void 0 === _b || _b.forEach(((indicatorDefine, index) => {
             "object" == typeof indicatorDefine && (null == indicatorDefine ? void 0 : indicatorDefine.editor) && (this.internalProps.indicators[index].editor = indicatorDefine.editor);
         })), this.internalProps.columnTree = !options.indicatorsAsCol || (null === (_c = options.columns) || void 0 === _c ? void 0 : _c.length) || options.columnTree ? cloneDeep(options.columnTree) : [], 
@@ -110,8 +122,7 @@ export class PivotTable extends BaseTable {
         this.stateManager.updateDrillState(void 0, void 0, !1, !1, -1, -1), this.pagination = options.pagination, 
         internalProps.columnResizeType = null !== (_e = options.columnResizeType) && void 0 !== _e ? _e : "column", 
         internalProps.rowResizeType = null !== (_f = options.rowResizeType) && void 0 !== _f ? _f : "row", 
-        internalProps.dataConfig = cloneDeep(options.dataConfig), options.rowTree || options.columnTree ? internalProps.enableDataAnalysis = !1 : internalProps.enableDataAnalysis = !0, 
-        "tree" === (null == options ? void 0 : options.rowHierarchyType) && "tree" === this.internalProps.layoutMap.rowHierarchyType && this.internalProps.layoutMap.rowExpandLevel === (null == options ? void 0 : options.rowExpandLevel)) {
+        internalProps.dataConfig = cloneDeep(options.dataConfig), "tree" === (null == options ? void 0 : options.rowHierarchyType) && "tree" === this.internalProps.layoutMap.rowHierarchyType && this.internalProps.layoutMap.rowExpandLevel === (null == options ? void 0 : options.rowExpandLevel)) {
             const beforeRowDimensions = this.internalProps.layoutMap.rowDimensionTree.tree.children;
             null === (_g = this.internalProps.rowTree) || void 0 === _g || _g.forEach(((node, index) => {
                 const beforeRowDimension = beforeRowDimensions.find((item => item.dimensionKey === node.dimensionKey && item.value === node.value));
@@ -119,22 +130,26 @@ export class PivotTable extends BaseTable {
             }));
         }
         const records = this.internalProps.records;
-        if (this.internalProps.enableDataAnalysis && (options.rows || options.columns)) {
-            const rowKeys = null === (_h = options.rows) || void 0 === _h ? void 0 : _h.reduce(((keys, rowObj) => ("string" == typeof rowObj ? keys.push(rowObj) : keys.push(rowObj.dimensionKey), 
-            keys)), []), columnKeys = null === (_j = options.columns) || void 0 === _j ? void 0 : _j.reduce(((keys, columnObj) => ("string" == typeof columnObj ? keys.push(columnObj) : keys.push(columnObj.dimensionKey), 
-            keys)), []), indicatorKeys = null === (_k = options.indicators) || void 0 === _k ? void 0 : _k.reduce(((keys, indicatorObj) => ("string" == typeof indicatorObj ? keys.push(indicatorObj) : keys.push(indicatorObj.indicatorKey), 
-            keys)), []);
-            this.dataset = new Dataset(internalProps.dataConfig, rowKeys, columnKeys, indicatorKeys, this.internalProps.indicators, null === (_l = options.indicatorsAsCol) || void 0 === _l || _l, options.records, options.rowHierarchyType, this.internalProps.columnTree, this.internalProps.rowTree), 
-            internalProps.layoutMap = new PivotHeaderLayoutMap(this, this.dataset);
-        } else {
-            if (!Array.isArray(this.internalProps.columnTree) && !Array.isArray(this.internalProps.rowTree)) return this;
-            internalProps.layoutMap = new PivotHeaderLayoutMap(this, null), (null === (_m = null == records ? void 0 : records[0]) || void 0 === _m ? void 0 : _m.constructor) !== Array && (this.flatDataToObjects = new FlatDataToObjects({
+        if (this.internalProps.recordsIsTwoDimensionalArray = !1, (null === (_h = null == records ? void 0 : records[0]) || void 0 === _h ? void 0 : _h.constructor) === Array && (this.internalProps.recordsIsTwoDimensionalArray = !0), 
+        !1 === (null === (_j = options.customConfig) || void 0 === _j ? void 0 : _j.enableDataAnalysis)) {
+            let columnDimensionTree, rowDimensionTree;
+            options.columnTree && (columnDimensionTree = new DimensionTree(null !== (_k = this.internalProps.columnTree) && void 0 !== _k ? _k : [], this.layoutNodeId)), 
+            options.rowTree && (rowDimensionTree = new DimensionTree(null !== (_l = this.internalProps.rowTree) && void 0 !== _l ? _l : [], this.layoutNodeId, this.options.rowHierarchyType, "tree" === this.options.rowHierarchyType ? null !== (_m = this.options.rowExpandLevel) && void 0 !== _m ? _m : 1 : void 0)), 
+            internalProps.layoutMap = new PivotHeaderLayoutMap(this, null, columnDimensionTree, rowDimensionTree), 
+            !1 === this.internalProps.recordsIsTwoDimensionalArray && (this.flatDataToObjects = new FlatDataToObjects({
                 rows: internalProps.layoutMap.fullRowDimensionKeys,
                 columns: internalProps.layoutMap.colDimensionKeys,
                 indicators: internalProps.layoutMap.indicatorKeys,
                 indicatorsAsCol: internalProps.layoutMap.indicatorsAsCol,
                 indicatorDimensionKey: internalProps.layoutMap.indicatorDimensionKey
             }, records));
+        } else {
+            const keysResults = parseColKeyRowKeyForPivotTable(this, options), {rowKeys: rowKeys, columnKeys: columnKeys, indicatorKeys: indicatorKeys, isNeedResetColumnDimensionTree: isNeedResetColumnDimensionTree, isNeedResetRowDimensionTree: isNeedResetRowDimensionTree} = keysResults;
+            let {columnDimensionTree: columnDimensionTree, rowDimensionTree: rowDimensionTree} = keysResults;
+            this.dataset = new Dataset(internalProps.dataConfig, rowKeys, columnKeys, indicatorKeys, this.internalProps.indicators, null === (_o = options.indicatorsAsCol) || void 0 === _o || _o, records, options.rowHierarchyType, this.internalProps.columnTree, this.internalProps.rowTree), 
+            options.columnTree && !isNeedResetColumnDimensionTree || (columnDimensionTree = new DimensionTree(null !== (_p = this.dataset.colHeaderTree) && void 0 !== _p ? _p : [], this.layoutNodeId)), 
+            options.rowTree && !isNeedResetRowDimensionTree || (rowDimensionTree = new DimensionTree(null !== (_q = this.dataset.rowHeaderTree) && void 0 !== _q ? _q : [], this.layoutNodeId, this.options.rowHierarchyType, "tree" === this.options.rowHierarchyType ? null !== (_r = this.options.rowExpandLevel) && void 0 !== _r ? _r : 1 : void 0)), 
+            internalProps.layoutMap = new PivotHeaderLayoutMap(this, this.dataset, columnDimensionTree, rowDimensionTree);
         }
         return this.pivotSortState = [], options.pivotSortState && this.updatePivotSortState(options.pivotSortState), 
         this.refreshHeader(), internalProps.releaseList && (internalProps.releaseList.forEach((releaseObj => {
@@ -198,34 +213,37 @@ export class PivotTable extends BaseTable {
     }
     getFieldData(field, col, row) {
         var _a;
-        if (this.internalProps.layoutMap.isHeader(col, row)) return;
-        if (this.dataset) {
-            const cellDimensionPath = this.internalProps.layoutMap.getCellHeaderPaths(col, row);
-            if (cellDimensionPath) {
-                const colKeys = cellDimensionPath.colHeaderPaths.map((colPath => {
+        if (!this.internalProps.layoutMap.isHeader(col, row)) {
+            if (this.internalProps.recordsIsTwoDimensionalArray) {
+                const rowIndex = this.getBodyIndexByRow(row), colIndex = this.getBodyIndexByCol(col);
+                return null === (_a = this.records[rowIndex]) || void 0 === _a ? void 0 : _a[colIndex];
+            }
+            if (this.dataset) {
+                const cellDimensionPath = this.internalProps.layoutMap.getCellHeaderPaths(col, row);
+                if (cellDimensionPath) {
+                    const colKeys = cellDimensionPath.colHeaderPaths.map((colPath => {
+                        var _a;
+                        return null !== (_a = colPath.indicatorKey) && void 0 !== _a ? _a : colPath.value;
+                    })), rowKeys = cellDimensionPath.rowHeaderPaths.map((rowPath => {
+                        var _a;
+                        return null !== (_a = rowPath.indicatorKey) && void 0 !== _a ? _a : rowPath.value;
+                    })), aggregator = this.dataset.getAggregator(rowKeys, colKeys, this.internalProps.layoutMap.getIndicatorKey(col, row));
+                    if (aggregator.records && aggregator.records.length >= 1) return aggregator.records[0][field];
+                }
+            } else if (this.flatDataToObjects) {
+                const cellDimensionPath = this.internalProps.layoutMap.getCellHeaderPaths(col, row), colKeys = cellDimensionPath.colHeaderPaths.map((colPath => {
                     var _a;
                     return null !== (_a = colPath.indicatorKey) && void 0 !== _a ? _a : colPath.value;
                 })), rowKeys = cellDimensionPath.rowHeaderPaths.map((rowPath => {
                     var _a;
                     return null !== (_a = rowPath.indicatorKey) && void 0 !== _a ? _a : rowPath.value;
-                })), aggregator = this.dataset.getAggregator(this.internalProps.layoutMap.indicatorsAsCol ? rowKeys : rowKeys.slice(0, -1), this.internalProps.layoutMap.indicatorsAsCol ? colKeys.slice(0, -1) : colKeys, this.internalProps.layoutMap.getIndicatorKey(col, row));
-                if (aggregator.records && aggregator.records.length >= 1) return aggregator.records[0][field];
+                })), treeNode = this.flatDataToObjects.getTreeNode(rowKeys, colKeys, this.internalProps.layoutMap.getBody(col, row).indicatorKey, !1);
+                if (null == treeNode ? void 0 : treeNode.record) return null == treeNode ? void 0 : treeNode.record[field];
             }
-        } else if (this.flatDataToObjects) {
-            const cellDimensionPath = this.internalProps.layoutMap.getCellHeaderPaths(col, row), colKeys = cellDimensionPath.colHeaderPaths.map((colPath => {
-                var _a;
-                return null !== (_a = colPath.indicatorKey) && void 0 !== _a ? _a : colPath.value;
-            })), rowKeys = cellDimensionPath.rowHeaderPaths.map((rowPath => {
-                var _a;
-                return null !== (_a = rowPath.indicatorKey) && void 0 !== _a ? _a : rowPath.value;
-            })), treeNode = this.flatDataToObjects.getTreeNode(rowKeys, colKeys, this.internalProps.layoutMap.getBody(col, row).indicatorKey, !1);
-            if (null == treeNode ? void 0 : treeNode.record) return null == treeNode ? void 0 : treeNode.record[field];
         }
-        const rowIndex = this.getBodyIndexByRow(row), colIndex = this.getBodyIndexByCol(col);
-        return null === (_a = this.records[rowIndex]) || void 0 === _a ? void 0 : _a[colIndex];
     }
     getCellValue(col, row, skipCustomMerge) {
-        var _a, _b;
+        var _a, _b, _c, _d, _e, _f, _g;
         if (!skipCustomMerge) {
             const customMergeText = this.getCustomMergeValue(col, row);
             if (customMergeText) return customMergeText;
@@ -242,15 +260,22 @@ export class PivotTable extends BaseTable {
             const {title: title, fieldFormat: fieldFormat} = this.internalProps.layoutMap.getHeader(col, row);
             return "function" == typeof fieldFormat ? fieldFormat(title, col, row, this) : title;
         }
+        if (this.internalProps.recordsIsTwoDimensionalArray) {
+            const {fieldFormat: fieldFormat} = this.internalProps.layoutMap.getBody(col, row), rowIndex = this.getBodyIndexByRow(row), colIndex = this.getBodyIndexByCol(col), dataValue = null === (_a = this.records[rowIndex]) || void 0 === _a ? void 0 : _a[colIndex];
+            if ("function" == typeof fieldFormat) {
+                return fieldFormat(dataValue, col, row, this);
+            }
+            return dataValue;
+        }
         if (this.dataset) {
-            const cellDimensionPath = this.internalProps.layoutMap.getCellHeaderPaths(col, row), colKeys = cellDimensionPath.colHeaderPaths.map((colPath => {
+            const cellDimensionPath = this.internalProps.layoutMap.getCellHeaderPaths(col, row), colKeys = null === (_c = null === (_b = cellDimensionPath.colHeaderPaths) || void 0 === _b ? void 0 : _b.filter((path => !path.virtual))) || void 0 === _c ? void 0 : _c.map((colPath => {
                 var _a;
                 return null !== (_a = colPath.indicatorKey) && void 0 !== _a ? _a : colPath.value;
-            })), rowKeys = cellDimensionPath.rowHeaderPaths.map((rowPath => {
+            })), rowKeys = null === (_e = null === (_d = cellDimensionPath.rowHeaderPaths) || void 0 === _d ? void 0 : _d.filter((path => !path.virtual))) || void 0 === _e ? void 0 : _e.map((rowPath => {
                 var _a;
                 return null !== (_a = rowPath.indicatorKey) && void 0 !== _a ? _a : rowPath.value;
-            })), aggregator = this.dataset.getAggregator(this.internalProps.layoutMap.indicatorsAsCol ? rowKeys : rowKeys.slice(0, -1), this.internalProps.layoutMap.indicatorsAsCol ? colKeys.slice(0, -1) : colKeys, this.internalProps.layoutMap.getIndicatorKey(col, row));
-            return aggregator.formatValue ? aggregator.formatValue(col, row, this) : "";
+            })), aggregator = this.dataset.getAggregator(rowKeys, colKeys, this.internalProps.layoutMap.getIndicatorKey(col, row)), {fieldFormat: fieldFormat} = this.internalProps.layoutMap.getBody(col, row);
+            return aggregator.formatValue ? aggregator.formatValue(col, row, this) : "function" == typeof fieldFormat ? fieldFormat(null == aggregator ? void 0 : aggregator.value(), col, row, this) : null !== (_f = null == aggregator ? void 0 : aggregator.value()) && void 0 !== _f ? _f : "";
         }
         if (this.flatDataToObjects) {
             const cellDimensionPath = this.internalProps.layoutMap.getCellHeaderPaths(col, row), colKeys = cellDimensionPath.colHeaderPaths.map((colPath => {
@@ -260,13 +285,8 @@ export class PivotTable extends BaseTable {
                 var _a;
                 return null !== (_a = rowPath.indicatorKey) && void 0 !== _a ? _a : rowPath.value;
             })), valueNode = this.flatDataToObjects.getTreeNode(rowKeys, colKeys, this.internalProps.layoutMap.getBody(col, row).indicatorKey), {fieldFormat: fieldFormat} = this.internalProps.layoutMap.getBody(col, row);
-            return "function" == typeof fieldFormat ? fieldFormat(null == valueNode ? void 0 : valueNode.value, col, row, this) : null !== (_a = null == valueNode ? void 0 : valueNode.value) && void 0 !== _a ? _a : "";
-        }
-        const {fieldFormat: fieldFormat} = this.internalProps.layoutMap.getBody(col, row), rowIndex = this.getBodyIndexByRow(row), colIndex = this.getBodyIndexByCol(col), dataValue = null === (_b = this.records[rowIndex]) || void 0 === _b ? void 0 : _b[colIndex];
-        if ("function" == typeof fieldFormat) {
-            return fieldFormat(dataValue, col, row, this);
+            return "function" == typeof fieldFormat ? fieldFormat(null == valueNode ? void 0 : valueNode.value, col, row, this) : null !== (_g = null == valueNode ? void 0 : valueNode.value) && void 0 !== _g ? _g : "";
         }
-        return dataValue;
     }
     getCellOriginValue(col, row) {
         var _a;
@@ -275,6 +295,10 @@ export class PivotTable extends BaseTable {
             const {title: title} = table.internalProps.layoutMap.getHeader(col, row);
             return "function" == typeof title ? title() : title;
         }
+        if (this.internalProps.recordsIsTwoDimensionalArray) {
+            const rowIndex = this.getBodyIndexByRow(row), colIndex = this.getBodyIndexByCol(col);
+            return null === (_a = this.records[rowIndex]) || void 0 === _a ? void 0 : _a[colIndex];
+        }
         if (this.dataset) {
             const cellDimensionPath = this.internalProps.layoutMap.getCellHeaderPaths(col, row), colKeys = cellDimensionPath.colHeaderPaths.map((colPath => {
                 var _a;
@@ -282,7 +306,7 @@ export class PivotTable extends BaseTable {
             })), rowKeys = cellDimensionPath.rowHeaderPaths.map((rowPath => {
                 var _a;
                 return null !== (_a = rowPath.indicatorKey) && void 0 !== _a ? _a : rowPath.value;
-            })), aggregator = this.dataset.getAggregator(this.internalProps.layoutMap.indicatorsAsCol ? rowKeys : rowKeys.slice(0, -1), this.internalProps.layoutMap.indicatorsAsCol ? colKeys.slice(0, -1) : colKeys, this.internalProps.layoutMap.getIndicatorKey(col, row));
+            })), aggregator = this.dataset.getAggregator(rowKeys, colKeys, this.internalProps.layoutMap.getIndicatorKey(col, row));
             return aggregator.value ? aggregator.value() : void 0;
         }
         if (this.flatDataToObjects) {
@@ -295,8 +319,6 @@ export class PivotTable extends BaseTable {
             })), treeNode = this.flatDataToObjects.getTreeNode(rowKeys, colKeys, this.internalProps.layoutMap.getBody(col, row).indicatorKey);
             return null == treeNode ? void 0 : treeNode.value;
         }
-        const rowIndex = this.getBodyIndexByRow(row), colIndex = this.getBodyIndexByCol(col);
-        return null === (_a = this.records[rowIndex]) || void 0 === _a ? void 0 : _a[colIndex];
     }
     getCellRawValue(col, row) {
         var _a;
@@ -305,6 +327,10 @@ export class PivotTable extends BaseTable {
             const {title: title} = table.internalProps.layoutMap.getHeader(col, row);
             return "function" == typeof title ? title() : title;
         }
+        if (this.internalProps.recordsIsTwoDimensionalArray) {
+            const rowIndex = this.getBodyIndexByRow(row), colIndex = this.getBodyIndexByCol(col);
+            return null === (_a = this.records[rowIndex]) || void 0 === _a ? void 0 : _a[colIndex];
+        }
         if (this.dataset) {
             const cellDimensionPath = this.internalProps.layoutMap.getCellHeaderPaths(col, row), colKeys = cellDimensionPath.colHeaderPaths.map((colPath => {
                 var _a;
@@ -312,7 +338,7 @@ export class PivotTable extends BaseTable {
             })), rowKeys = cellDimensionPath.rowHeaderPaths.map((rowPath => {
                 var _a;
                 return null !== (_a = rowPath.indicatorKey) && void 0 !== _a ? _a : rowPath.value;
-            })), aggregator = this.dataset.getAggregator(this.internalProps.layoutMap.indicatorsAsCol ? rowKeys : rowKeys.slice(0, -1), this.internalProps.layoutMap.indicatorsAsCol ? colKeys.slice(0, -1) : colKeys, this.internalProps.layoutMap.getIndicatorKey(col, row), !1);
+            })), aggregator = this.dataset.getAggregator(rowKeys, colKeys, this.internalProps.layoutMap.getIndicatorKey(col, row), !1);
             return aggregator.value ? aggregator.value() : void 0;
         }
         if (this.flatDataToObjects) {
@@ -325,60 +351,64 @@ export class PivotTable extends BaseTable {
             })), treeNode = this.flatDataToObjects.getTreeNode(rowKeys, colKeys, this.internalProps.layoutMap.getBody(col, row).indicatorKey, !1);
             return null == treeNode ? void 0 : treeNode.value;
         }
-        const rowIndex = this.getBodyIndexByRow(row), colIndex = this.getBodyIndexByCol(col);
-        return null === (_a = this.records[rowIndex]) || void 0 === _a ? void 0 : _a[colIndex];
     }
     getCellOriginRecord(col, row) {
         var _a;
-        if (this.internalProps.layoutMap.isHeader(col, row)) return;
-        if (this.dataset) {
-            const cellDimensionPath = this.internalProps.layoutMap.getCellHeaderPaths(col, row), colKeys = cellDimensionPath.colHeaderPaths.map((colPath => {
-                var _a;
-                return null !== (_a = colPath.indicatorKey) && void 0 !== _a ? _a : colPath.value;
-            })), rowKeys = cellDimensionPath.rowHeaderPaths.map((rowPath => {
-                var _a;
-                return null !== (_a = rowPath.indicatorKey) && void 0 !== _a ? _a : rowPath.value;
-            }));
-            return this.dataset.getAggregator(this.internalProps.layoutMap.indicatorsAsCol ? rowKeys : rowKeys.slice(0, -1), this.internalProps.layoutMap.indicatorsAsCol ? colKeys.slice(0, -1) : colKeys, this.internalProps.layoutMap.getIndicatorKey(col, row)).records;
-        }
-        if (this.flatDataToObjects) {
-            const cellDimensionPath = this.internalProps.layoutMap.getCellHeaderPaths(col, row), colKeys = cellDimensionPath.colHeaderPaths.map((colPath => {
-                var _a;
-                return null !== (_a = colPath.indicatorKey) && void 0 !== _a ? _a : colPath.value;
-            })), rowKeys = cellDimensionPath.rowHeaderPaths.map((rowPath => {
-                var _a;
-                return null !== (_a = rowPath.indicatorKey) && void 0 !== _a ? _a : rowPath.value;
-            })), treeNode = this.flatDataToObjects.getTreeNode(rowKeys, colKeys, this.internalProps.layoutMap.getBody(col, row).indicatorKey);
-            return null == treeNode ? void 0 : treeNode.record;
+        if (!this.internalProps.layoutMap.isHeader(col, row)) {
+            if (this.internalProps.recordsIsTwoDimensionalArray) {
+                const rowIndex = this.getBodyIndexByRow(row), colIndex = this.getBodyIndexByCol(col);
+                return null === (_a = this.records[rowIndex]) || void 0 === _a ? void 0 : _a[colIndex];
+            }
+            if (this.dataset) {
+                const cellDimensionPath = this.internalProps.layoutMap.getCellHeaderPaths(col, row), colKeys = cellDimensionPath.colHeaderPaths.map((colPath => {
+                    var _a;
+                    return null !== (_a = colPath.indicatorKey) && void 0 !== _a ? _a : colPath.value;
+                })), rowKeys = cellDimensionPath.rowHeaderPaths.map((rowPath => {
+                    var _a;
+                    return null !== (_a = rowPath.indicatorKey) && void 0 !== _a ? _a : rowPath.value;
+                }));
+                return this.dataset.getAggregator(rowKeys, colKeys, this.internalProps.layoutMap.getIndicatorKey(col, row)).records;
+            }
+            if (this.flatDataToObjects) {
+                const cellDimensionPath = this.internalProps.layoutMap.getCellHeaderPaths(col, row), colKeys = cellDimensionPath.colHeaderPaths.map((colPath => {
+                    var _a;
+                    return null !== (_a = colPath.indicatorKey) && void 0 !== _a ? _a : colPath.value;
+                })), rowKeys = cellDimensionPath.rowHeaderPaths.map((rowPath => {
+                    var _a;
+                    return null !== (_a = rowPath.indicatorKey) && void 0 !== _a ? _a : rowPath.value;
+                })), treeNode = this.flatDataToObjects.getTreeNode(rowKeys, colKeys, this.internalProps.layoutMap.getBody(col, row).indicatorKey);
+                return null == treeNode ? void 0 : treeNode.record;
+            }
         }
-        const rowIndex = this.getBodyIndexByRow(row), colIndex = this.getBodyIndexByCol(col);
-        return null === (_a = this.records[rowIndex]) || void 0 === _a ? void 0 : _a[colIndex];
     }
     getCellRawRecord(col, row) {
         var _a;
-        if (this.internalProps.layoutMap.isHeader(col, row)) return;
-        if (this.dataset) {
-            const cellDimensionPath = this.internalProps.layoutMap.getCellHeaderPaths(col, row), colKeys = cellDimensionPath.colHeaderPaths.map((colPath => {
-                var _a;
-                return null !== (_a = colPath.indicatorKey) && void 0 !== _a ? _a : colPath.value;
-            })), rowKeys = cellDimensionPath.rowHeaderPaths.map((rowPath => {
-                var _a;
-                return null !== (_a = rowPath.indicatorKey) && void 0 !== _a ? _a : rowPath.value;
-            }));
-            return this.dataset.getAggregator(this.internalProps.layoutMap.indicatorsAsCol ? rowKeys : rowKeys.slice(0, -1), this.internalProps.layoutMap.indicatorsAsCol ? colKeys.slice(0, -1) : colKeys, this.internalProps.layoutMap.getIndicatorKey(col, row)).records;
-        }
-        if (this.flatDataToObjects) {
-            const cellDimensionPath = this.internalProps.layoutMap.getCellHeaderPaths(col, row), colKeys = cellDimensionPath.colHeaderPaths.map((colPath => {
-                var _a;
-                return null !== (_a = colPath.indicatorKey) && void 0 !== _a ? _a : colPath.value;
-            })), rowKeys = cellDimensionPath.rowHeaderPaths.map((rowPath => {
-                var _a;
-                return null !== (_a = rowPath.indicatorKey) && void 0 !== _a ? _a : rowPath.value;
-            })), treeNode = this.flatDataToObjects.getTreeNode(rowKeys, colKeys, this.internalProps.layoutMap.getBody(col, row).indicatorKey, !1);
-            return null == treeNode ? void 0 : treeNode.record;
+        if (!this.internalProps.layoutMap.isHeader(col, row)) {
+            if (this.internalProps.recordsIsTwoDimensionalArray) {
+                const rowIndex = this.getBodyIndexByRow(row), colIndex = this.getBodyIndexByCol(col);
+                return null === (_a = this.records[rowIndex]) || void 0 === _a ? void 0 : _a[colIndex];
+            }
+            if (this.dataset) {
+                const cellDimensionPath = this.internalProps.layoutMap.getCellHeaderPaths(col, row), colKeys = cellDimensionPath.colHeaderPaths.map((colPath => {
+                    var _a;
+                    return null !== (_a = colPath.indicatorKey) && void 0 !== _a ? _a : colPath.value;
+                })), rowKeys = cellDimensionPath.rowHeaderPaths.map((rowPath => {
+                    var _a;
+                    return null !== (_a = rowPath.indicatorKey) && void 0 !== _a ? _a : rowPath.value;
+                }));
+                return this.dataset.getAggregator(rowKeys, colKeys, this.internalProps.layoutMap.getIndicatorKey(col, row)).records;
+            }
+            if (this.flatDataToObjects) {
+                const cellDimensionPath = this.internalProps.layoutMap.getCellHeaderPaths(col, row), colKeys = cellDimensionPath.colHeaderPaths.map((colPath => {
+                    var _a;
+                    return null !== (_a = colPath.indicatorKey) && void 0 !== _a ? _a : colPath.value;
+                })), rowKeys = cellDimensionPath.rowHeaderPaths.map((rowPath => {
+                    var _a;
+                    return null !== (_a = rowPath.indicatorKey) && void 0 !== _a ? _a : rowPath.value;
+                })), treeNode = this.flatDataToObjects.getTreeNode(rowKeys, colKeys, this.internalProps.layoutMap.getBody(col, row).indicatorKey, !1);
+                return null == treeNode ? void 0 : treeNode.record;
+            }
         }
-        const rowIndex = this.getBodyIndexByRow(row), colIndex = this.getBodyIndexByCol(col);
-        return null === (_a = this.records[rowIndex]) || void 0 === _a ? void 0 : _a[colIndex];
     }
     updateSortRules(sortRules) {
         this.internalProps.dataConfig.sortRules = sortRules, this.dataset.updateSortRules(sortRules), 
@@ -404,18 +434,17 @@ export class PivotTable extends BaseTable {
         }
     }
     _moveHeaderPosition(source, target) {
-        var _a, _b, _c, _d;
         const sourceCellRange = this.getCellRange(source.col, source.row), targetCellRange = this.getCellRange(target.col, target.row), moveContext = this.internalProps.layoutMap.moveHeaderPosition(source, target);
         if (moveContext) {
             if ("column" === moveContext.moveType) {
-                if ((null === (_b = null === (_a = this.options.records) || void 0 === _a ? void 0 : _a[0]) || void 0 === _b ? void 0 : _b.constructor) === Array) for (let row = 0; row < this.internalProps.records.length; row++) {
+                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), Array.prototype.splice.apply(this.internalProps.records[row], sourceColumns);
                 }
                 this.colWidthsMap.exchangeOrder(sourceCellRange.start.col, sourceCellRange.end.col - sourceCellRange.start.col + 1, targetCellRange.start.col, targetCellRange.end.col - targetCellRange.start.col + 1, moveContext.targetIndex), 
                 this.setMinMaxLimitWidth();
             } else if ("row" === moveContext.moveType) {
-                if ((null === (_d = null === (_c = this.options.records) || void 0 === _c ? void 0 : _c[0]) || void 0 === _d ? void 0 : _d.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);
                 }
@@ -433,7 +462,7 @@ export class PivotTable extends BaseTable {
             row: row,
             hierarchyState: HierarchyState.collapse
         }); else if (hierarchyState === HierarchyState.collapse) {
-            const headerPaths = this.internalProps.layoutMap.getCellHeaderPaths(col, row), headerTreeNode = this.internalProps.layoutMap.getHeadNode(headerPaths.rowHeaderPaths.slice(0, headerPaths.rowHeaderPaths.length));
+            const headerTreeNode = this.internalProps.layoutMap.getHeadNode(col, row);
             Array.isArray(headerTreeNode.children) && this._refreshHierarchyState(col, row), 
             this.fireListeners(PIVOT_TABLE_EVENT_TYPE.TREE_HIERARCHY_STATE_CHANGE, {
                 col: col,
@@ -484,7 +513,7 @@ export class PivotTable extends BaseTable {
         return this.internalProps.layoutMap.getLayoutRowTreeCount();
     }
     getCellHeaderTreeNodes(col, row) {
-        return this.internalProps.layoutMap.getCellHeaderPathsWidthTreeNode(col, row);
+        return this.internalProps.layoutMap.getCellHeaderPathsWithTreeNode(col, row);
     }
     _hasHierarchyTreeHeader() {
         return "tree" === this.internalProps.layoutMap.rowHierarchyType;
@@ -500,22 +529,28 @@ export class PivotTable extends BaseTable {
         };
     }
     setRecords(records) {
-        var _a;
+        var _a, _b, _c, _d, _e;
         const oldHoverState = {
             col: this.stateManager.hover.cellPos.col,
             row: this.stateManager.hover.cellPos.row
         };
-        this.options.records = this.internalProps.records = records;
+        this.options.records = this.internalProps.records = records, this.internalProps.recordsIsTwoDimensionalArray = !1, 
+        (null === (_a = null == records ? void 0 : records[0]) || void 0 === _a ? void 0 : _a.constructor) === Array && (this.internalProps.recordsIsTwoDimensionalArray = !0);
         const options = this.options, internalProps = this.internalProps;
-        this.internalProps.enableDataAnalysis && (options.rows || options.columns) ? (this.dataset.setRecords(records), 
-        internalProps.layoutMap = new PivotHeaderLayoutMap(this, this.dataset), this.pivotSortState = [], 
-        options.pivotSortState && this.updatePivotSortState(options.pivotSortState)) : (Array.isArray(this.internalProps.columnTree) || Array.isArray(this.internalProps.rowTree)) && (null === (_a = null == records ? void 0 : records[0]) || void 0 === _a ? void 0 : _a.constructor) !== Array && (this.flatDataToObjects = new FlatDataToObjects({
+        if (!1 === (null === (_b = this.options.customConfig) || void 0 === _b ? void 0 : _b.enableDataAnalysis)) !1 === this.internalProps.recordsIsTwoDimensionalArray && (this.flatDataToObjects = new FlatDataToObjects({
             rows: internalProps.layoutMap.fullRowDimensionKeys,
             columns: internalProps.layoutMap.colDimensionKeys,
             indicators: internalProps.layoutMap.indicatorKeys,
             indicatorsAsCol: internalProps.layoutMap.indicatorsAsCol,
             indicatorDimensionKey: internalProps.layoutMap.indicatorDimensionKey
-        }, records)), this.refreshHeader(), this.scenegraph.clearCells(), this.clearCellStyleCache(), 
+        }, records)); else {
+            let columnDimensionTree, rowDimensionTree;
+            this.dataset.setRecords(records), columnDimensionTree = options.columnTree ? internalProps.layoutMap.columnDimensionTree : new DimensionTree(null !== (_c = this.dataset.colHeaderTree) && void 0 !== _c ? _c : [], this.layoutNodeId), 
+            rowDimensionTree = options.rowTree ? internalProps.layoutMap.rowDimensionTree : new DimensionTree(null !== (_d = this.dataset.rowHeaderTree) && void 0 !== _d ? _d : [], this.layoutNodeId, this.options.rowHierarchyType, "tree" === this.options.rowHierarchyType ? null !== (_e = this.options.rowExpandLevel) && void 0 !== _e ? _e : 1 : void 0), 
+            internalProps.layoutMap = new PivotHeaderLayoutMap(this, this.dataset, columnDimensionTree, rowDimensionTree), 
+            this.pivotSortState = [], options.pivotSortState && this.updatePivotSortState(options.pivotSortState);
+        }
+        this.refreshHeader(), this.scenegraph.clearCells(), this.clearCellStyleCache(), 
         this.scenegraph.createSceneGraph(), this.stateManager.updateHoverPos(oldHoverState.col, oldHoverState.row), 
         this.internalProps.title && !this.internalProps.title.isReleased && (this._updateSize(), 
         this.internalProps.title.resize(), this.scenegraph.resize()), this.eventManager.updateEventBinder();
@@ -632,7 +667,10 @@ export class PivotTable extends BaseTable {
     }
     _changeCellValueToDataSet(col, row, oldValue, newValue) {
         var _a, _b, _c, _d, _e, _f;
-        if (this.dataset) {
+        if (this.internalProps.recordsIsTwoDimensionalArray) {
+            const rowIndex = this.getBodyIndexByRow(row), 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), 
             !this.isCornerHeader(col, row) && this.dataset.changeRecordFieldValue((null === (_a = cellDimensionPath.colHeaderPaths) || void 0 === _a ? void 0 : _a.length) ? null !== (_b = cellDimensionPath.colHeaderPaths[cellDimensionPath.colHeaderPaths.length - 1].indicatorKey) && void 0 !== _b ? _b : cellDimensionPath.colHeaderPaths[cellDimensionPath.colHeaderPaths.length - 1].dimensionKey : null !== (_c = cellDimensionPath.rowHeaderPaths[cellDimensionPath.rowHeaderPaths.length - 1].indicatorKey) && void 0 !== _c ? _c : cellDimensionPath.rowHeaderPaths[cellDimensionPath.rowHeaderPaths.length - 1].dimensionKey, oldValue, newValue); else {
@@ -658,9 +696,6 @@ export class PivotTable extends BaseTable {
                 }));
                 this.flatDataToObjects.changeTreeNodeValue(rowKeys, colKeys, this.internalProps.layoutMap.getBody(col, row).indicatorKey, newValue);
             }
-        } else {
-            const rowIndex = this.getBodyIndexByRow(row), colIndex = this.getBodyIndexByCol(col);
-            this.records[rowIndex][colIndex] = newValue;
         }
     }
     _hasCustomRenderOrLayout() {
@@ -683,9 +718,7 @@ export class PivotTable extends BaseTable {
     changeRecordOrder(source, target) {}
     setTreeNodeChildren(children, records, col, row) {
         if (this.flatDataToObjects) {
-            const headerPaths = this.internalProps.layoutMap.getCellHeaderPaths(col, row);
-            this.internalProps.layoutMap.getHeadNode(headerPaths.rowHeaderPaths.slice(0, headerPaths.rowHeaderPaths.length)).children = children, 
-            this._refreshHierarchyState(col, row, (() => {
+            this.internalProps.layoutMap.getHeadNode(col, row).children = children, this._refreshHierarchyState(col, row, (() => {
                 this.flatDataToObjects.changeDataConfig({
                     rows: this.internalProps.layoutMap.fullRowDimensionKeys,
                     columns: this.internalProps.layoutMap.colDimensionKeys,
@@ -694,6 +727,13 @@ export class PivotTable extends BaseTable {
                     indicatorDimensionKey: this.internalProps.layoutMap.indicatorDimensionKey
                 }), this.flatDataToObjects.addRecords(records);
             }));
+        } else {
+            this.internalProps.layoutMap.getHeadNode(col, row).children = children, this._refreshHierarchyState(col, row, (() => {
+                this.dataset.changeDataConfig({
+                    rows: this.internalProps.layoutMap.fullRowDimensionKeys,
+                    columns: this.internalProps.layoutMap.colDimensionKeys
+                }), this.dataset.addRecords(records);
+            }));
         }
     }
 }