@visactor/vtable 1.15.3-alpha.1 → 1.16.0-alpha.0

package/es/PivotTable.js

@@ -38,12 +38,13 @@ import { Factory } from "./core/factory";
 
 export class PivotTable extends BaseTable {
     constructor(container, options) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v;
         if ("node" === Env.mode ? (options = container, container = null) : container instanceof HTMLElement || (options = container, 
         container = container.container ? container.container : null), super(container, options), 
         this.layoutNodeId = {
             seqId: 0
         }, options) {
+            options.rowHierarchyType || (options.rowHierarchyType = "grid"), options.columnHierarchyType || (options.columnHierarchyType = "grid"), 
             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) => {
@@ -58,7 +59,7 @@ export class PivotTable extends BaseTable {
             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);
+                const columnDimensionTree = new DimensionTree(null !== (_h = this.internalProps.columnTree) && void 0 !== _h ? _h : [], this.layoutNodeId, this.options.columnHierarchyType, "grid" !== this.options.columnHierarchyType ? null !== (_j = this.options.columnExpandLevel) && void 0 !== _j ? _j : 1 : void 0), rowDimensionTree = new DimensionTree(null !== (_k = this.internalProps.rowTree) && void 0 !== _k ? _k : [], this.layoutNodeId, this.options.rowHierarchyType, "grid" !== this.options.rowHierarchyType ? null !== (_l = this.options.rowExpandLevel) && void 0 !== _l ? _l : 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,
@@ -70,27 +71,27 @@ export class PivotTable extends BaseTable {
             } else {
                 const keysResults = parseColKeyRowKeyForPivotTable(this, options), {rowKeys: rowKeys, columnKeys: columnKeys, indicatorKeys: indicatorKeys} = 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, !1, !!options.extensionRows, !!options.parseCustomTreeToMatchRecords), 
+                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, options.columnHierarchyType, this.internalProps.columnTree, this.internalProps.rowTree, !1, !!options.extensionRows, !!options.parseCustomTreeToMatchRecords), 
                 options.columnTree ? columnDimensionTree.hasHideNode && (deleteHideIndicatorNode(columnDimensionTree.tree.children, options.indicators, !0, this), 
                 columnDimensionTree.reset(columnDimensionTree.tree.children)) : (!1 !== options.indicatorsAsCol && (this.dataset.colHeaderTree = supplementIndicatorNodesForCustomTree(this.dataset.colHeaderTree, options.indicators)), 
                 !1 !== options.indicatorsAsCol && options.indicators && this.dataset.colHeaderTree && deleteHideIndicatorNode(this.dataset.colHeaderTree, options.indicators, !1, this), 
-                columnDimensionTree = new DimensionTree(null !== (_m = this.dataset.colHeaderTree) && void 0 !== _m ? _m : [], this.layoutNodeId)), 
+                columnDimensionTree = new DimensionTree(null !== (_o = this.dataset.colHeaderTree) && void 0 !== _o ? _o : [], this.layoutNodeId, this.options.columnHierarchyType, "grid" !== this.options.columnHierarchyType ? null !== (_p = this.options.columnExpandLevel) && void 0 !== _p ? _p : 1 : void 0)), 
                 options.rowTree ? rowDimensionTree.hasHideNode && (deleteHideIndicatorNode(rowDimensionTree.tree.children, options.indicators, !0, this), 
                 rowDimensionTree.reset(rowDimensionTree.tree.children)) : (!1 === options.indicatorsAsCol && (this.dataset.rowHeaderTree = supplementIndicatorNodesForCustomTree(this.dataset.rowHeaderTree, options.indicators)), 
                 !1 === options.indicatorsAsCol && this.dataset.rowHeaderTree && options.indicators && deleteHideIndicatorNode(this.dataset.rowHeaderTree, options.indicators, !1, this), 
-                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)), 
+                rowDimensionTree = new DimensionTree(null !== (_q = this.dataset.rowHeaderTree) && void 0 !== _q ? _q : [], this.layoutNodeId, this.options.rowHierarchyType, "grid" !== this.options.rowHierarchyType ? null !== (_r = this.options.rowExpandLevel) && void 0 !== _r ? _r : 1 : void 0)), 
                 this.internalProps.layoutMap = new PivotHeaderLayoutMap(this, this.dataset, columnDimensionTree, rowDimensionTree);
             }
-            if (this._changePivotSortStateBySortRules(), (null !== (_r = null === (_q = options.pivotSortState) || void 0 === _q ? void 0 : _q.length) && void 0 !== _r ? _r : 0) > 0 && (this.pivotSortState = [], 
+            if (this._changePivotSortStateBySortRules(), (null !== (_t = null === (_s = options.pivotSortState) || void 0 === _s ? void 0 : _s.length) && void 0 !== _t ? _t : 0) > 0 && (this.pivotSortState = [], 
             this.pivotSortState = options.pivotSortState), "node" !== Env.mode && (this.editorManager = new EditManager(this)), 
             this.refreshHeader(), this.internalProps.useOneRowHeightFillAll = !1, this.stateManager.initCheckedState(records), 
             this.scenegraph.createSceneGraph(), options.title) {
                 const Title = Factory.getComponent("title");
                 this.internalProps.title = new Title(options.title, this), this.scenegraph.resize();
             }
-            if (this.options.emptyTip) if (this.internalProps.emptyTip) null === (_s = this.internalProps.emptyTip) || void 0 === _s || _s.resetVisible(); else {
+            if (this.options.emptyTip) if (this.internalProps.emptyTip) null === (_u = this.internalProps.emptyTip) || void 0 === _u || _u.resetVisible(); else {
                 const EmptyTip = Factory.getComponent("emptyTip");
-                this.internalProps.emptyTip = new EmptyTip(this.options.emptyTip, this), null === (_t = this.internalProps.emptyTip) || void 0 === _t || _t.resetVisible();
+                this.internalProps.emptyTip = new EmptyTip(this.options.emptyTip, this), null === (_v = this.internalProps.emptyTip) || void 0 === _v || _v.resetVisible();
             }
             setTimeout((() => {
                 this.fireListeners(TABLE_EVENT_TYPE.INITIALIZED, null);
@@ -125,9 +126,10 @@ export class PivotTable extends BaseTable {
         return ifCan;
     }
     updateOption(options) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x;
         const internalProps = this.internalProps;
-        if (super.updateOption(options), this.layoutNodeId = {
+        if (super.updateOption(options), options.rowHierarchyType || (options.rowHierarchyType = "grid"), 
+        options.columnHierarchyType || (options.columnHierarchyType = "grid"), 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) : [], 
@@ -141,7 +143,7 @@ export class PivotTable extends BaseTable {
         internalProps.rowResizeType = null !== (_f = options.rowResizeType) && void 0 !== _f ? _f : "row", 
         internalProps.dataConfig = cloneDeep(options.dataConfig), this.internalProps.columnWidthConfig = options.columnWidthConfig, 
         this.internalProps.columnWidthConfigForRowHeader = options.columnWidthConfigForRowHeader, 
-        "tree" === (null == options ? void 0 : options.rowHierarchyType) && "tree" === this.internalProps.layoutMap.rowHierarchyType && this.internalProps.layoutMap.rowExpandLevel === (null == options ? void 0 : options.rowExpandLevel)) {
+        "grid" !== (null == options ? void 0 : options.rowHierarchyType) && "grid" !== 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));
@@ -152,8 +154,8 @@ export class PivotTable extends BaseTable {
         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)), 
+            options.columnTree && (columnDimensionTree = new DimensionTree(null !== (_k = this.internalProps.columnTree) && void 0 !== _k ? _k : [], this.layoutNodeId, this.options.columnHierarchyType, "grid" !== this.options.columnHierarchyType ? null !== (_l = this.options.columnExpandLevel) && void 0 !== _l ? _l : 1 : void 0)), 
+            options.rowTree && (rowDimensionTree = new DimensionTree(null !== (_m = this.internalProps.rowTree) && void 0 !== _m ? _m : [], this.layoutNodeId, this.options.rowHierarchyType, "grid" !== this.options.rowHierarchyType ? null !== (_o = this.options.rowExpandLevel) && void 0 !== _o ? _o : 1 : void 0)), 
             internalProps.layoutMap = new PivotHeaderLayoutMap(this, null, columnDimensionTree, rowDimensionTree), 
             !1 === this.internalProps.recordsIsTwoDimensionalArray && (this.flatDataToObjects = new FlatDataToObjects({
                 rows: internalProps.layoutMap.fullRowDimensionKeys,
@@ -165,18 +167,18 @@ export class PivotTable extends BaseTable {
         } else {
             const keysResults = parseColKeyRowKeyForPivotTable(this, options), {rowKeys: rowKeys, columnKeys: columnKeys, indicatorKeys: indicatorKeys} = 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, !1, !!options.extensionRows, !!options.parseCustomTreeToMatchRecords), 
+            this.dataset = new Dataset(internalProps.dataConfig, rowKeys, columnKeys, indicatorKeys, this.internalProps.indicators, null === (_p = options.indicatorsAsCol) || void 0 === _p || _p, records, options.rowHierarchyType, options.columnHierarchyType, this.internalProps.columnTree, this.internalProps.rowTree, !1, !!options.extensionRows, !!options.parseCustomTreeToMatchRecords), 
             options.columnTree ? columnDimensionTree.hasHideNode && (deleteHideIndicatorNode(columnDimensionTree.tree.children, options.indicators, !0, this), 
             columnDimensionTree.reset(columnDimensionTree.tree.children)) : (!1 !== options.indicatorsAsCol && (this.dataset.colHeaderTree = supplementIndicatorNodesForCustomTree(this.dataset.colHeaderTree, options.indicators)), 
             !1 !== options.indicatorsAsCol && options.indicators && this.dataset.colHeaderTree && deleteHideIndicatorNode(this.dataset.colHeaderTree, options.indicators, !1, this), 
-            columnDimensionTree = new DimensionTree(null !== (_p = this.dataset.colHeaderTree) && void 0 !== _p ? _p : [], this.layoutNodeId)), 
+            columnDimensionTree = new DimensionTree(null !== (_q = this.dataset.colHeaderTree) && void 0 !== _q ? _q : [], this.layoutNodeId, this.options.columnHierarchyType, "grid" !== this.options.columnHierarchyType ? null !== (_r = this.options.columnExpandLevel) && void 0 !== _r ? _r : 1 : void 0)), 
             options.rowTree ? rowDimensionTree.hasHideNode && (deleteHideIndicatorNode(rowDimensionTree.tree.children, options.indicators, !0, this), 
             rowDimensionTree.reset(rowDimensionTree.tree.children)) : (!1 === options.indicatorsAsCol && (this.dataset.rowHeaderTree = supplementIndicatorNodesForCustomTree(this.dataset.rowHeaderTree, options.indicators)), 
             !1 === options.indicatorsAsCol && this.dataset.rowHeaderTree && options.indicators && deleteHideIndicatorNode(this.dataset.rowHeaderTree, options.indicators, !1, this), 
-            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)), 
+            rowDimensionTree = new DimensionTree(null !== (_s = this.dataset.rowHeaderTree) && void 0 !== _s ? _s : [], this.layoutNodeId, this.options.rowHierarchyType, "grid" !== this.options.rowHierarchyType ? null !== (_t = this.options.rowExpandLevel) && void 0 !== _t ? _t : 1 : void 0)), 
             internalProps.layoutMap = new PivotHeaderLayoutMap(this, this.dataset, columnDimensionTree, rowDimensionTree);
         }
-        if (this._changePivotSortStateBySortRules(), (null !== (_t = null === (_s = options.pivotSortState) || void 0 === _s ? void 0 : _s.length) && void 0 !== _t ? _t : 0) > 0 && (this.pivotSortState = [], 
+        if (this._changePivotSortStateBySortRules(), (null !== (_v = null === (_u = options.pivotSortState) || void 0 === _u ? void 0 : _u.length) && void 0 !== _v ? _v : 0) > 0 && (this.pivotSortState = [], 
         this.pivotSortState = options.pivotSortState), this.refreshHeader(), this.internalProps.useOneRowHeightFillAll = !1, 
         internalProps.releaseList && (internalProps.releaseList.forEach((releaseObj => {
             var _a;
@@ -186,9 +188,9 @@ export class PivotTable extends BaseTable {
             const Title = Factory.getComponent("title");
             this.internalProps.title = new Title(options.title, this), this.scenegraph.resize();
         }
-        if (this.options.emptyTip) if (this.internalProps.emptyTip) null === (_u = this.internalProps.emptyTip) || void 0 === _u || _u.resetVisible(); else {
+        if (this.options.emptyTip) if (this.internalProps.emptyTip) null === (_w = this.internalProps.emptyTip) || void 0 === _w || _w.resetVisible(); else {
             const EmptyTip = Factory.getComponent("emptyTip");
-            this.internalProps.emptyTip = new EmptyTip(this.options.emptyTip, this), null === (_v = this.internalProps.emptyTip) || void 0 === _v || _v.resetVisible();
+            this.internalProps.emptyTip = new EmptyTip(this.options.emptyTip, this), null === (_x = this.internalProps.emptyTip) || void 0 === _x || _x.resetVisible();
         }
         return new Promise((resolve => {
             setTimeout(resolve, 0);
@@ -216,12 +218,15 @@ export class PivotTable extends BaseTable {
         table.frozenRowCount = Math.max(layoutMap.headerLevelCount, null !== (_d = this.options.frozenRowCount) && void 0 !== _d ? _d : 0), 
         table.bottomFrozenRowCount !== (null !== (_e = this.options.bottomFrozenRowCount) && void 0 !== _e ? _e : 0) && (table.bottomFrozenRowCount = null !== (_f = this.options.bottomFrozenRowCount) && void 0 !== _f ? _f : 0), 
         table.rightFrozenColCount !== (null !== (_g = this.options.rightFrozenColCount) && void 0 !== _g ? _g : 0) && (table.rightFrozenColCount = null !== (_h = this.options.rightFrozenColCount) && void 0 !== _h ? _h : 0), 
-        this.stateManager.setFrozenCol(this.internalProps.frozenColCount));
+        this.stateManager.setFrozenCol(this.internalProps.frozenColCount), this.stateManager.setFrozenRow(this.frozenRowCount));
     }
     _getSortFuncFromHeaderOption(columns, field, fieldKey) {}
     get rowHierarchyType() {
         return this.internalProps.layoutMap.rowHierarchyType;
     }
+    get columnHierarchyType() {
+        return this.internalProps.layoutMap.columnHierarchyType;
+    }
     _syncHierarchyState(sourceNode, targetNode) {
         var _a, _b;
         sourceNode.value === targetNode.value && sourceNode.dimensionKey === targetNode.dimensionKey && (targetNode.hierarchyState = null !== (_a = targetNode.hierarchyState) && void 0 !== _a ? _a : (null == targetNode ? void 0 : targetNode.children) ? sourceNode.hierarchyState : void 0, 
@@ -650,19 +655,25 @@ export class PivotTable extends BaseTable {
     }
     _refreshHierarchyState(col, row, recalculateColWidths = !0, beforeUpdateCell) {
         var _a, _b;
+        this.frozenColCount, this.frozenRowCount;
+        const visibleStartRow = this.getBodyVisibleRowRange().rowStart;
+        this.internalProps._oldRowCount = this.rowCount, this.internalProps._oldColCount = this.colCount;
         let notFillWidth = !1, notFillHeight = !1;
         this.stateManager.updateHoverIcon(col, row, void 0, void 0);
         const checkHasChart = this.internalProps.layoutMap.checkHasChart();
         checkHasChart && (this.autoFillWidth && (notFillWidth = this.getAllColsWidth() <= this.tableNoFrameWidth), 
         this.autoFillHeight && (notFillHeight = this.getAllRowsHeight() <= this.tableNoFrameHeight));
-        const result = this.internalProps.layoutMap.toggleHierarchyState(col, row);
-        beforeUpdateCell && beforeUpdateCell(), this.refreshRowColCount(), this.clearCellStyleCache(), 
-        this.scenegraph.updateHierarchyIcon(col, row), null === (_a = this.reactCustomLayout) || void 0 === _a || _a.clearCache(), 
-        this.scenegraph.updateRow(result.removeCellPositions, result.addCellPositions, result.updateCellPositions, recalculateColWidths), 
+        const result = this.internalProps.layoutMap.isRowHeader(col, row) ? this.internalProps.layoutMap.toggleHierarchyState(col, row) : this.internalProps.layoutMap.toggleHierarchyStateForColumnTree(col, row);
+        beforeUpdateCell && beforeUpdateCell(), this.refreshRowColCount();
+        this.frozenColCount, this.frozenRowCount;
+        this.clearCellStyleCache(), "tree" === this.rowHierarchyType && this.scenegraph.updateHierarchyIcon(col, row), 
+        null === (_a = this.reactCustomLayout) || void 0 === _a || _a.clearCache(), "grid-tree" !== this.rowHierarchyType && "grid-tree" !== this.columnHierarchyType ? this.scenegraph.updateRow(result.removeCellPositionsRowDirection, result.addCellPositionsRowDirection, result.updateCellPositionsRowDirection, recalculateColWidths) : (this.scenegraph.clearCells(), 
+        this.clearCellStyleCache(), this.scenegraph.createSceneGraph(), this.scrollToRow(visibleStartRow)), 
         null === (_b = this.reactCustomLayout) || void 0 === _b || _b.updateAllCustomCell(), 
         checkHasChart && (this.autoFillWidth && !notFillWidth && (notFillWidth = this.getAllColsWidth() <= this.tableNoFrameWidth), 
         this.autoFillHeight && !notFillHeight && (notFillHeight = this.getAllRowsHeight() <= this.tableNoFrameHeight), 
-        ("adaptive" === this.widthMode || notFillWidth || "adaptive" === this.heightMode || notFillHeight) && this.scenegraph.updateChartSizeForResizeColWidth(-1));
+        ("adaptive" === this.widthMode || notFillWidth || "adaptive" === this.heightMode || notFillHeight) && this.scenegraph.updateChartSizeForResizeColWidth(-1)), 
+        this.internalProps._oldRowCount = void 0, this.internalProps._oldColCount = void 0;
     }
     getHeaderCellAddressByPath(dimensionPaths) {
         return this.internalProps.layoutMap.getPivotCellAdress(dimensionPaths);
@@ -694,9 +705,6 @@ export class PivotTable extends BaseTable {
     getCellHeaderTreeNodes(col, row) {
         return this.internalProps.layoutMap.getCellHeaderPathsWithTreeNode(col, row);
     }
-    _hasHierarchyTreeHeader() {
-        return "tree" === this.internalProps.layoutMap.rowHierarchyType;
-    }
     getMenuInfo(col, row, type) {
         const dimensionInfos = this.internalProps.layoutMap.getPivotDimensionInfo(col, row);
         return {
@@ -708,7 +716,7 @@ export class PivotTable extends BaseTable {
         };
     }
     setRecords(records) {
-        var _a, _b, _c, _d, _e, _f, _g;
+        var _a, _b, _c, _d, _e, _f, _g, _h;
         const oldHoverState = {
             col: this.stateManager.hover.cellPos.col,
             row: this.stateManager.hover.cellPos.row
@@ -725,9 +733,9 @@ export class PivotTable extends BaseTable {
         }, records)); else {
             let columnDimensionTree, rowDimensionTree;
             this.dataset.setRecords(records), options.columnTree ? columnDimensionTree = internalProps.layoutMap.columnDimensionTree : (!1 !== options.indicatorsAsCol && options.indicators && this.dataset.colHeaderTree && deleteHideIndicatorNode(this.dataset.colHeaderTree, options.indicators, !1, this), 
-            columnDimensionTree = new DimensionTree(null !== (_c = this.dataset.colHeaderTree) && void 0 !== _c ? _c : [], this.layoutNodeId)), 
+            columnDimensionTree = new DimensionTree(null !== (_c = this.dataset.colHeaderTree) && void 0 !== _c ? _c : [], this.layoutNodeId, this.options.columnHierarchyType, "grid" !== this.options.columnHierarchyType ? null !== (_d = this.options.columnExpandLevel) && void 0 !== _d ? _d : 1 : void 0)), 
             options.rowTree ? rowDimensionTree = internalProps.layoutMap.rowDimensionTree : (!1 === options.indicatorsAsCol && this.dataset.rowHeaderTree && options.indicators && deleteHideIndicatorNode(this.dataset.rowHeaderTree, options.indicators, !1, this), 
-            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)), 
+            rowDimensionTree = new DimensionTree(null !== (_e = this.dataset.rowHeaderTree) && void 0 !== _e ? _e : [], this.layoutNodeId, this.options.rowHierarchyType, "grid" !== this.options.rowHierarchyType ? null !== (_f = this.options.rowExpandLevel) && void 0 !== _f ? _f : 1 : void 0)), 
             internalProps.layoutMap = new PivotHeaderLayoutMap(this, this.dataset, columnDimensionTree, rowDimensionTree), 
             this.pivotSortState = [], options.pivotSortState && (this.pivotSortState = options.pivotSortState);
         }
@@ -735,9 +743,9 @@ export class PivotTable extends BaseTable {
         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(), 
-        this.options.emptyTip) if (this.internalProps.emptyTip) null === (_f = this.internalProps.emptyTip) || void 0 === _f || _f.resetVisible(); else {
+        this.options.emptyTip) if (this.internalProps.emptyTip) null === (_g = this.internalProps.emptyTip) || void 0 === _g || _g.resetVisible(); else {
             const EmptyTip = Factory.getComponent("emptyTip");
-            this.internalProps.emptyTip = new EmptyTip(this.options.emptyTip, this), null === (_g = this.internalProps.emptyTip) || void 0 === _g || _g.resetVisible();
+            this.internalProps.emptyTip = new EmptyTip(this.options.emptyTip, this), null === (_h = this.internalProps.emptyTip) || void 0 === _h || _h.resetVisible();
         }
     }
     startEditCell(col, row, value) {