@visactor/vtable 1.4.2-beta.0 → 1.5.0

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

@@ -14,7 +14,7 @@ import { cloneDeep, isArray, isValid } from "@visactor/vutils";
 
 import { getQuadProps } from "../scenegraph/utils/padding";
 
-import { getAxisConfigInPivotChart } from "./chart-helper/get-axis-config";
+import { Factory } from "../core/factory";
 
 const defaultDimension = {
     startInTotal: 0,
@@ -24,7 +24,7 @@ const defaultDimension = {
 export class PivotHeaderLayoutMap {
     constructor(table, dataset, columnDimensionTree, rowDimensionTree) {
         var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t;
-        if (this.colIndex = 0, this._showHeader = !0, this.columnHeaderObjs = [], this.rowHeaderObjs = [], 
+        this.colIndex = 0, this._showHeader = !0, this.columnHeaderObjs = [], this.rowHeaderObjs = [], 
         this._cornerHeaderCellFullPathIds = [], this._columnHeaderCellFullPathIds = [], 
         this._rowHeaderCellFullPathIds = [], this._rowHeaderCellFullPathIds_FULL = [], this._cornerHeaderCellIds = [], 
         this._columnHeaderCellIds = [], this._rowHeaderCellIds = [], this._rowHeaderCellIds_FULL = [], 
@@ -73,23 +73,21 @@ export class PivotHeaderLayoutMap {
             extensionRow.rows.forEach((row => {
                 "string" == typeof row ? rowKeys.push(row) : rowKeys.push(row.dimensionKey);
             })), this._extensionRowDimensionKeys.push(rowKeys), this.fullRowDimensionKeys = this.fullRowDimensionKeys.concat(rowKeys);
-        }))), this.sharedVar.seqId = Math.max(this.sharedVar.seqId, this._headerObjects.length), 
-        "column" === this.cornerSetting.titleOnDimension) {
-            let colDimensionKeys = this.columnDimensionTree.dimensionKeysIncludeVirtual.valueArr();
-            !this.dataset || 0 !== (null !== (_q = null === (_p = this.dataset.records) || void 0 === _p ? void 0 : _p.length) && void 0 !== _q ? _q : 0) || this.dataset.customColTree || this.dataset.customRowTree || (colDimensionKeys = this.columnsDefine.map((define => "string" == typeof define ? define : define.dimensionKey)), 
-            this.indicatorsAsCol && colDimensionKeys.push(this.indicatorDimensionKey)), this.cornerHeaderObjs = this._addCornerHeaders(this.columnHeaderTitle ? [ "" ].concat(colDimensionKeys) : colDimensionKeys, this.columnsDefine);
-        } else if ("row" === this.cornerSetting.titleOnDimension) if ("tree" === this.rowHierarchyType && (null === (_r = this.extensionRows) || void 0 === _r ? void 0 : _r.length) >= 1) {
+        }))), this.sharedVar.seqId = Math.max(this.sharedVar.seqId, this._headerObjects.length);
+        let rowDimensionKeys, colDimensionKeys = this.columnDimensionTree.dimensionKeysIncludeVirtual.valueArr();
+        !this.dataset || 0 !== (null !== (_q = null === (_p = this.dataset.records) || void 0 === _p ? void 0 : _p.length) && void 0 !== _q ? _q : 0) || this.dataset.customColTree || this.dataset.customRowTree || (colDimensionKeys = this.columnsDefine.map((define => "string" == typeof define ? define : define.dimensionKey)), 
+        this.indicatorsAsCol && colDimensionKeys.push(this.indicatorDimensionKey)), colDimensionKeys = this.columnHeaderTitle ? [ "" ].concat(colDimensionKeys) : colDimensionKeys;
+        let extensionRowDimensions = [];
+        if ("tree" === this.rowHierarchyType && (null === (_r = this.extensionRows) || void 0 === _r ? void 0 : _r.length) >= 1) {
             const rowTreeFirstKey = [];
             rowTreeFirstKey.push(this.rowDimensionKeys[0]), this._extensionRowDimensionKeys.forEach((extensionRowKeys => {
                 rowTreeFirstKey.push(extensionRowKeys[0]);
-            }));
-            const extensionRowDimensions = this.extensionRows.reduce(((dimensions, cur) => dimensions.concat(cur.rows)), []);
-            this.cornerHeaderObjs = this._addCornerHeaders(this.rowHeaderTitle ? [ "" ].concat(rowTreeFirstKey) : rowTreeFirstKey, this.rowsDefine.concat(extensionRowDimensions));
-        } else {
-            let rowDimensionKeys = this.rowDimensionTree.dimensionKeysIncludeVirtual.valueArr();
-            !this.dataset || 0 !== (null !== (_t = null === (_s = this.dataset.records) || void 0 === _s ? void 0 : _s.length) && void 0 !== _t ? _t : 0) || this.dataset.customColTree || this.dataset.customRowTree || (rowDimensionKeys = this.rowsDefine.map((define => "string" == typeof define ? define : define.dimensionKey)), 
-            this.indicatorsAsCol || rowDimensionKeys.push(this.indicatorDimensionKey)), this.cornerHeaderObjs = this._addCornerHeaders(this.rowHeaderTitle ? [ "" ].concat(rowDimensionKeys) : rowDimensionKeys, this.rowsDefine);
-        } else this.cornerHeaderObjs = this._addCornerHeaders(null, void 0);
+            })), extensionRowDimensions = this.extensionRows.reduce(((dimensions, cur) => dimensions.concat(cur.rows)), []), 
+            rowDimensionKeys = this.rowHeaderTitle ? [ "" ].concat(rowTreeFirstKey) : rowTreeFirstKey;
+        } else rowDimensionKeys = this.rowDimensionTree.dimensionKeysIncludeVirtual.valueArr(), 
+        !this.dataset || 0 !== (null !== (_t = null === (_s = this.dataset.records) || void 0 === _s ? void 0 : _s.length) && void 0 !== _t ? _t : 0) || this.dataset.customColTree || this.dataset.customRowTree || (rowDimensionKeys = this.rowsDefine.map((define => "string" == typeof define ? define : define.dimensionKey)), 
+        this.indicatorsAsCol || rowDimensionKeys.push(this.indicatorDimensionKey)), rowDimensionKeys = this.rowHeaderTitle ? [ "" ].concat(rowDimensionKeys) : rowDimensionKeys;
+        this.cornerHeaderObjs = this._addCornerHeaders(colDimensionKeys, rowDimensionKeys, this.columnsDefine.concat(...this.rowsDefine, ...extensionRowDimensions)), 
         this.colIndex = 0, this._headerObjectMap = this._headerObjects.reduce(((o, e) => (o[e.id] = e, 
         o)), {}), this.indicatorsAsCol && !this.hideIndicatorName ? this._indicatorShowType = "column" : this.indicatorsAsCol || this.hideIndicatorName ? this._indicatorShowType = "none" : this._indicatorShowType = "row", 
         this.generateCellIdsConsiderHideHeader(), this.setPagination(table.options.pagination), 
@@ -220,49 +218,180 @@ export class PivotHeaderLayoutMap {
             dealHeaderForTreeMode(hd, _headerCellIds, results, roots, row, totalLevel, show, dimensions, this);
         }
     }
-    _addCornerHeaders(dimensionKeys, dimensions) {
-        var _a;
+    _addCornerHeaders(colDimensionKeys, rowDimensionKeys, dimensions) {
+        var _a, _b;
         const results = [];
-        if (dimensionKeys) dimensionKeys.forEach(((dimensionKey, key) => {
-            var _a, _b;
-            const id = ++this.sharedVar.seqId, dimensionInfo = dimensions.find((dimension => "string" != typeof dimension && dimension.dimensionKey === dimensionKey)), cell = {
-                id: id,
-                title: dimensionKey === this.indicatorDimensionKey ? this.indicatorTitle : dimensionInfo ? dimensionInfo.title : "axis" === dimensionKey ? "" : dimensionKey,
-                field: dimensionKey,
-                style: this.cornerSetting.headerStyle,
-                headerType: null !== (_a = this.cornerSetting.headerType) && void 0 !== _a ? _a : "text",
-                showSort: null == dimensionInfo ? void 0 : dimensionInfo.showSortInCorner,
-                sort: null == dimensionInfo ? void 0 : dimensionInfo.sort,
-                define: {
+        if ("all" === this.cornerSetting.titleOnDimension) if (this.indicatorsAsCol) {
+            let indicatorAtIndex = -1;
+            colDimensionKeys && colDimensionKeys.forEach(((dimensionKey, key) => {
+                var _a, _b;
+                dimensionKey === this.indicatorDimensionKey && (indicatorAtIndex = key);
+                const id = ++this.sharedVar.seqId, dimensionInfo = dimensions.find((dimension => "string" != typeof dimension && dimension.dimensionKey === dimensionKey)), cell = {
+                    id: id,
+                    title: dimensionKey === this.indicatorDimensionKey ? this.indicatorTitle : dimensionInfo ? dimensionInfo.title : "axis" === dimensionKey ? "" : dimensionKey,
+                    field: dimensionKey,
+                    style: this.cornerSetting.headerStyle,
+                    headerType: null !== (_a = this.cornerSetting.headerType) && void 0 !== _a ? _a : "text",
                     showSort: null == dimensionInfo ? void 0 : dimensionInfo.showSortInCorner,
                     sort: null == dimensionInfo ? void 0 : dimensionInfo.sort,
-                    dimensionKey: dimensionKey,
-                    id: id,
-                    value: dimensionKey,
-                    headerEditor: this.cornerSetting.headerEditor,
-                    disableHeaderHover: !!this.cornerSetting.disableHeaderHover,
-                    disableHeaderSelect: !!this.cornerSetting.disableHeaderSelect
-                },
-                dropDownMenu: null == dimensionInfo ? void 0 : dimensionInfo.cornerDropDownMenu,
-                pivotInfo: {
-                    value: null !== (_b = null == dimensionInfo ? void 0 : dimensionInfo.title) && void 0 !== _b ? _b : "",
-                    dimensionKey: dimensionKey,
-                    isPivotCorner: !0
-                },
-                description: null == dimensionInfo ? void 0 : dimensionInfo.cornerDescription
-            };
-            if (results[id] = cell, this._headerObjects[id] = cell, "column" === this.cornerSetting.titleOnDimension) {
-                this._cornerHeaderCellFullPathIds[key] || (this._cornerHeaderCellFullPathIds[key] = []);
+                    define: {
+                        showSort: null == dimensionInfo ? void 0 : dimensionInfo.showSortInCorner,
+                        sort: null == dimensionInfo ? void 0 : dimensionInfo.sort,
+                        dimensionKey: dimensionKey,
+                        id: id,
+                        value: dimensionKey,
+                        headerEditor: this.cornerSetting.headerEditor,
+                        disableHeaderHover: !!this.cornerSetting.disableHeaderHover,
+                        disableHeaderSelect: !!this.cornerSetting.disableHeaderSelect
+                    },
+                    dropDownMenu: null == dimensionInfo ? void 0 : dimensionInfo.cornerDropDownMenu,
+                    pivotInfo: {
+                        value: null !== (_b = null == dimensionInfo ? void 0 : dimensionInfo.title) && void 0 !== _b ? _b : "",
+                        dimensionKey: dimensionKey,
+                        isPivotCorner: !0
+                    },
+                    description: null == dimensionInfo ? void 0 : dimensionInfo.cornerDescription
+                };
+                results[id] = cell, this._headerObjects[id] = cell, this._cornerHeaderCellFullPathIds[key] || (this._cornerHeaderCellFullPathIds[key] = []);
                 for (let r = 0; r < this.rowHeaderLevelCount; r++) this._cornerHeaderCellFullPathIds[key][r] = id;
-            } else if ("row" === this.cornerSetting.titleOnDimension) for (let r = 0; r < this.columnHeaderLevelCount; r++) this._cornerHeaderCellFullPathIds[r] || (this._cornerHeaderCellFullPathIds[r] = []), 
-            this._cornerHeaderCellFullPathIds[r][key] = id;
-        })); else {
+            })), rowDimensionKeys && rowDimensionKeys.forEach(((dimensionKey, key) => {
+                var _a, _b;
+                const id = ++this.sharedVar.seqId, dimensionInfo = dimensions.find((dimension => "string" != typeof dimension && dimension.dimensionKey === dimensionKey)), cell = {
+                    id: id,
+                    title: dimensionKey === this.indicatorDimensionKey ? this.indicatorTitle : dimensionInfo ? dimensionInfo.title : "axis" === dimensionKey ? "" : dimensionKey,
+                    field: dimensionKey,
+                    style: this.cornerSetting.headerStyle,
+                    headerType: null !== (_a = this.cornerSetting.headerType) && void 0 !== _a ? _a : "text",
+                    showSort: null == dimensionInfo ? void 0 : dimensionInfo.showSortInCorner,
+                    sort: null == dimensionInfo ? void 0 : dimensionInfo.sort,
+                    define: {
+                        showSort: null == dimensionInfo ? void 0 : dimensionInfo.showSortInCorner,
+                        sort: null == dimensionInfo ? void 0 : dimensionInfo.sort,
+                        dimensionKey: dimensionKey,
+                        id: id,
+                        value: dimensionKey,
+                        headerEditor: this.cornerSetting.headerEditor,
+                        disableHeaderHover: !!this.cornerSetting.disableHeaderHover,
+                        disableHeaderSelect: !!this.cornerSetting.disableHeaderSelect
+                    },
+                    dropDownMenu: null == dimensionInfo ? void 0 : dimensionInfo.cornerDropDownMenu,
+                    pivotInfo: {
+                        value: null !== (_b = null == dimensionInfo ? void 0 : dimensionInfo.title) && void 0 !== _b ? _b : "",
+                        dimensionKey: dimensionKey,
+                        isPivotCorner: !0
+                    },
+                    description: null == dimensionInfo ? void 0 : dimensionInfo.cornerDescription
+                };
+                results[id] = cell, this._headerObjects[id] = cell, this._cornerHeaderCellFullPathIds[indicatorAtIndex] || (this._cornerHeaderCellFullPathIds[indicatorAtIndex] = []), 
+                this._cornerHeaderCellFullPathIds[indicatorAtIndex][key] = id;
+            }));
+        } else {
+            let indicatorAtIndex = -1;
+            rowDimensionKeys && rowDimensionKeys.forEach(((dimensionKey, key) => {
+                var _a, _b;
+                dimensionKey === this.indicatorDimensionKey && (indicatorAtIndex = key);
+                const id = ++this.sharedVar.seqId, dimensionInfo = dimensions.find((dimension => "string" != typeof dimension && dimension.dimensionKey === dimensionKey)), cell = {
+                    id: id,
+                    title: dimensionKey === this.indicatorDimensionKey ? this.indicatorTitle : dimensionInfo ? dimensionInfo.title : "axis" === dimensionKey ? "" : dimensionKey,
+                    field: dimensionKey,
+                    style: this.cornerSetting.headerStyle,
+                    headerType: null !== (_a = this.cornerSetting.headerType) && void 0 !== _a ? _a : "text",
+                    showSort: null == dimensionInfo ? void 0 : dimensionInfo.showSortInCorner,
+                    sort: null == dimensionInfo ? void 0 : dimensionInfo.sort,
+                    define: {
+                        showSort: null == dimensionInfo ? void 0 : dimensionInfo.showSortInCorner,
+                        sort: null == dimensionInfo ? void 0 : dimensionInfo.sort,
+                        dimensionKey: dimensionKey,
+                        id: id,
+                        value: dimensionKey,
+                        headerEditor: this.cornerSetting.headerEditor,
+                        disableHeaderHover: !!this.cornerSetting.disableHeaderHover,
+                        disableHeaderSelect: !!this.cornerSetting.disableHeaderSelect
+                    },
+                    dropDownMenu: null == dimensionInfo ? void 0 : dimensionInfo.cornerDropDownMenu,
+                    pivotInfo: {
+                        value: null !== (_b = null == dimensionInfo ? void 0 : dimensionInfo.title) && void 0 !== _b ? _b : "",
+                        dimensionKey: dimensionKey,
+                        isPivotCorner: !0
+                    },
+                    description: null == dimensionInfo ? void 0 : dimensionInfo.cornerDescription
+                };
+                results[id] = cell, this._headerObjects[id] = cell;
+                for (let r = 0; r < this.columnHeaderLevelCount; r++) this._cornerHeaderCellFullPathIds[r] || (this._cornerHeaderCellFullPathIds[r] = []), 
+                this._cornerHeaderCellFullPathIds[r][key] = id;
+            })), colDimensionKeys && colDimensionKeys.forEach(((dimensionKey, key) => {
+                var _a, _b;
+                const id = ++this.sharedVar.seqId, dimensionInfo = dimensions.find((dimension => "string" != typeof dimension && dimension.dimensionKey === dimensionKey)), cell = {
+                    id: id,
+                    title: dimensionKey === this.indicatorDimensionKey ? this.indicatorTitle : dimensionInfo ? dimensionInfo.title : "axis" === dimensionKey ? "" : dimensionKey,
+                    field: dimensionKey,
+                    style: this.cornerSetting.headerStyle,
+                    headerType: null !== (_a = this.cornerSetting.headerType) && void 0 !== _a ? _a : "text",
+                    showSort: null == dimensionInfo ? void 0 : dimensionInfo.showSortInCorner,
+                    sort: null == dimensionInfo ? void 0 : dimensionInfo.sort,
+                    define: {
+                        showSort: null == dimensionInfo ? void 0 : dimensionInfo.showSortInCorner,
+                        sort: null == dimensionInfo ? void 0 : dimensionInfo.sort,
+                        dimensionKey: dimensionKey,
+                        id: id,
+                        value: dimensionKey,
+                        headerEditor: this.cornerSetting.headerEditor,
+                        disableHeaderHover: !!this.cornerSetting.disableHeaderHover,
+                        disableHeaderSelect: !!this.cornerSetting.disableHeaderSelect
+                    },
+                    dropDownMenu: null == dimensionInfo ? void 0 : dimensionInfo.cornerDropDownMenu,
+                    pivotInfo: {
+                        value: null !== (_b = null == dimensionInfo ? void 0 : dimensionInfo.title) && void 0 !== _b ? _b : "",
+                        dimensionKey: dimensionKey,
+                        isPivotCorner: !0
+                    },
+                    description: null == dimensionInfo ? void 0 : dimensionInfo.cornerDescription
+                };
+                results[id] = cell, this._headerObjects[id] = cell, this._cornerHeaderCellFullPathIds[key][indicatorAtIndex] = id;
+            }));
+        } else if ("row" === this.cornerSetting.titleOnDimension || "column" === this.cornerSetting.titleOnDimension) {
+            const dimensionKeys = "row" === (null === (_a = this.cornerSetting) || void 0 === _a ? void 0 : _a.titleOnDimension) ? rowDimensionKeys : colDimensionKeys;
+            dimensionKeys && dimensionKeys.forEach(((dimensionKey, key) => {
+                var _a, _b;
+                const id = ++this.sharedVar.seqId, dimensionInfo = dimensions.find((dimension => "string" != typeof dimension && dimension.dimensionKey === dimensionKey)), cell = {
+                    id: id,
+                    title: dimensionKey === this.indicatorDimensionKey ? this.indicatorTitle : dimensionInfo ? dimensionInfo.title : "axis" === dimensionKey ? "" : dimensionKey,
+                    field: dimensionKey,
+                    style: this.cornerSetting.headerStyle,
+                    headerType: null !== (_a = this.cornerSetting.headerType) && void 0 !== _a ? _a : "text",
+                    showSort: null == dimensionInfo ? void 0 : dimensionInfo.showSortInCorner,
+                    sort: null == dimensionInfo ? void 0 : dimensionInfo.sort,
+                    define: {
+                        showSort: null == dimensionInfo ? void 0 : dimensionInfo.showSortInCorner,
+                        sort: null == dimensionInfo ? void 0 : dimensionInfo.sort,
+                        dimensionKey: dimensionKey,
+                        id: id,
+                        value: dimensionKey,
+                        headerEditor: this.cornerSetting.headerEditor,
+                        disableHeaderHover: !!this.cornerSetting.disableHeaderHover,
+                        disableHeaderSelect: !!this.cornerSetting.disableHeaderSelect
+                    },
+                    dropDownMenu: null == dimensionInfo ? void 0 : dimensionInfo.cornerDropDownMenu,
+                    pivotInfo: {
+                        value: null !== (_b = null == dimensionInfo ? void 0 : dimensionInfo.title) && void 0 !== _b ? _b : "",
+                        dimensionKey: dimensionKey,
+                        isPivotCorner: !0
+                    },
+                    description: null == dimensionInfo ? void 0 : dimensionInfo.cornerDescription
+                };
+                if (results[id] = cell, this._headerObjects[id] = cell, "column" === this.cornerSetting.titleOnDimension) {
+                    this._cornerHeaderCellFullPathIds[key] || (this._cornerHeaderCellFullPathIds[key] = []);
+                    for (let r = 0; r < this.rowHeaderLevelCount; r++) this._cornerHeaderCellFullPathIds[key][r] = id;
+                } else if ("row" === this.cornerSetting.titleOnDimension) for (let r = 0; r < this.columnHeaderLevelCount; r++) this._cornerHeaderCellFullPathIds[r] || (this._cornerHeaderCellFullPathIds[r] = []), 
+                this._cornerHeaderCellFullPathIds[r][key] = id;
+            }));
+        } else {
             const id = ++this.sharedVar.seqId, cell = {
                 id: id,
                 title: "",
                 field: "维度名称",
                 style: this.cornerSetting.headerStyle,
-                headerType: null !== (_a = this.cornerSetting.headerType) && void 0 !== _a ? _a : "text",
+                headerType: null !== (_b = this.cornerSetting.headerType) && void 0 !== _b ? _b : "text",
                 define: {
                     dimensionKey: "维度名称",
                     id: id,
@@ -509,8 +638,8 @@ export class PivotHeaderLayoutMap {
             if (this._table.isPivotChart() && this.indicatorsAsCol && !(null === (_b = null === (_a = this.dataset) || void 0 === _a ? void 0 : _a.colKeys) || void 0 === _b ? void 0 : _b.length) && 0 === (null === (_d = null === (_c = this.columnDimensionTree) || void 0 === _c ? void 0 : _c.tree) || void 0 === _d ? void 0 : _d.level) && !this.hasTwoIndicatorAxes) return void (this.columnHeaderLevelCount = 0);
             let count = this.indicatorsAsCol && this.hideIndicatorName && this.colDimensionKeys[this.colDimensionKeys.length - 1] === this.indicatorDimensionKey ? this.columnDimensionTree.totalLevel - 1 : this.columnDimensionTree.totalLevel;
             return this.columnHeaderTitle && (count += 1), this._table.isPivotChart() && this.indicatorsAsCol && !this.hasTwoIndicatorAxes && checkHasCartesianChart(this.indicatorsDefine) && (count -= 1), 
-            0 !== count || !this.dataset || this.dataset.customColTree || this.dataset.customRowTree ? !this.dataset || 0 !== (null !== (_j = null === (_h = this.dataset.records) || void 0 === _h ? void 0 : _h.length) && void 0 !== _j ? _j : 0) || this.dataset.customColTree || this.dataset.customRowTree || "column" === this.cornerSetting.titleOnDimension && (count = null !== (_k = this.columnsDefine.length) && void 0 !== _k ? _k : 0, 
-            !this.hideIndicatorName && this.indicatorsAsCol && count++) : "row" === this.cornerSetting.titleOnDimension ? count = 1 : 0 === (null !== (_f = null === (_e = this.dataset.records) || void 0 === _e ? void 0 : _e.length) && void 0 !== _f ? _f : 0) && "column" === this.cornerSetting.titleOnDimension && (count = null !== (_g = this.columnsDefine.length) && void 0 !== _g ? _g : 0), 
+            0 !== count || !this.dataset || this.dataset.customColTree || this.dataset.customRowTree ? !this.dataset || 0 !== (null !== (_j = null === (_h = this.dataset.records) || void 0 === _h ? void 0 : _h.length) && void 0 !== _j ? _j : 0) || this.dataset.customColTree || this.dataset.customRowTree || "column" !== this.cornerSetting.titleOnDimension && "all" !== this.cornerSetting.titleOnDimension || (count = null !== (_k = this.columnsDefine.length) && void 0 !== _k ? _k : 0, 
+            !this.hideIndicatorName && this.indicatorsAsCol && count++) : "row" === this.cornerSetting.titleOnDimension ? count = 1 : 0 !== (null !== (_f = null === (_e = this.dataset.records) || void 0 === _e ? void 0 : _e.length) && void 0 !== _f ? _f : 0) || "column" !== this.cornerSetting.titleOnDimension && "all" !== this.cornerSetting.titleOnDimension || (count = null !== (_g = this.columnsDefine.length) && void 0 !== _g ? _g : 0), 
             void (this.columnHeaderLevelCount = count);
         }
         this.columnHeaderLevelCount = this.indicatorsAsCol ? this.hideIndicatorName ? 0 : 1 : 0;
@@ -525,8 +654,8 @@ export class PivotHeaderLayoutMap {
             const rowLevelCount = this.rowDimensionTree.totalLevel;
             let count = rowLevelCount;
             return this.indicatorsAsCol || this.hideIndicatorName && this.rowDimensionKeys[this.rowDimensionKeys.length - 1] === this.indicatorDimensionKey && (count = rowLevelCount - 1), 
-            this.rowHeaderTitle && (count += 1), 0 !== count || !this.dataset || this.dataset.customColTree || this.dataset.customRowTree ? !this.dataset || 0 !== (null !== (_g = null === (_f = this.dataset.records) || void 0 === _f ? void 0 : _f.length) && void 0 !== _g ? _g : 0) || this.dataset.customColTree || this.dataset.customRowTree || "row" === this.cornerSetting.titleOnDimension && (count = this.rowsDefine.length, 
-            this.hideIndicatorName || this.indicatorsAsCol || count++) : "column" === this.cornerSetting.titleOnDimension ? count = 1 : 0 === (null !== (_d = null === (_c = this.dataset.records) || void 0 === _c ? void 0 : _c.length) && void 0 !== _d ? _d : 0) && "row" === this.cornerSetting.titleOnDimension && (count = null !== (_e = this.rowsDefine.length) && void 0 !== _e ? _e : 0), 
+            this.rowHeaderTitle && (count += 1), 0 !== count || !this.dataset || this.dataset.customColTree || this.dataset.customRowTree ? !this.dataset || 0 !== (null !== (_g = null === (_f = this.dataset.records) || void 0 === _f ? void 0 : _f.length) && void 0 !== _g ? _g : 0) || this.dataset.customColTree || this.dataset.customRowTree || "row" !== this.cornerSetting.titleOnDimension && "all" !== this.cornerSetting.titleOnDimension || (count = this.rowsDefine.length, 
+            this.hideIndicatorName || this.indicatorsAsCol || count++) : "column" === this.cornerSetting.titleOnDimension ? count = 1 : 0 !== (null !== (_d = null === (_c = this.dataset.records) || void 0 === _c ? void 0 : _c.length) && void 0 !== _d ? _d : 0) || "row" !== this.cornerSetting.titleOnDimension && "all" !== this.cornerSetting.titleOnDimension || (count = null !== (_e = this.rowsDefine.length) && void 0 !== _e ? _e : 0), 
             void (this.rowHeaderLevelCount = count);
         }
         this.rowHeaderLevelCount = this.indicatorsAsCol || this.hideIndicatorName ? 0 : 1;
@@ -1157,7 +1286,9 @@ export class PivotHeaderLayoutMap {
         return "column" === type ? null === (_a = this.columnsDefine) || void 0 === _a ? void 0 : _a.find((dimension => "string" != typeof dimension && dimension.dimensionKey === dimensionKey)) : "row" === type ? null === (_b = this.rowsDefine) || void 0 === _b ? void 0 : _b.find((dimension => "string" != typeof dimension && dimension.dimensionKey === dimensionKey)) : void 0;
     }
     getAxisConfigInPivotChart(col, row) {
-        if ((this.isFrozenColumn(col, row) || this.isRightFrozenColumn(col, row)) && isHasCartesianChartInline(col, row, "row", this) || (this.isFrozenRow(col, row) || this.isBottomFrozenRow(col, row)) && isHasCartesianChartInline(col, row, "col", this)) return getAxisConfigInPivotChart(col, row, this);
+        if ((this.isFrozenColumn(col, row) || this.isRightFrozenColumn(col, row)) && isHasCartesianChartInline(col, row, "row", this) || (this.isFrozenRow(col, row) || this.isBottomFrozenRow(col, row)) && isHasCartesianChartInline(col, row, "col", this)) {
+            return Factory.getFunction("getAxisConfigInPivotChart")(col, row, this);
+        }
     }
     isEmpty(col, row) {
         return !!this._table.isPivotChart() && (!!this.isLeftBottomCorner(col, row) || (!!this.isRightBottomCorner(col, row) || !!this.isRightTopCorner(col, row)));
@@ -1268,12 +1399,12 @@ export class PivotHeaderLayoutMap {
                     var _a;
                     if (this._table._selectedDataItemsInChart.length >= 1) {
                         return !!this._table._selectedDataItemsInChart.find((item => {
-                            for (const itemKey in item) if (item[itemKey] !== datum[itemKey]) return !1;
+                            for (const itemKey in item) if ("object" != typeof item[itemKey] && item[itemKey] !== datum[itemKey]) return !1;
                             return !0;
                         }));
                     }
                     if (null === (_a = this._table._selectedDimensionInChart) || void 0 === _a ? void 0 : _a.length) {
-                        return !!this._table._selectedDimensionInChart.every((item => datum[item.key] === item.value));
+                        return !!this._table._selectedDimensionInChart.every((item => "object" == typeof item.value || datum[item.key] === item.value));
                     }
                     return !1;
                 }
@@ -1283,12 +1414,12 @@ export class PivotHeaderLayoutMap {
                     var _a;
                     if (this._table._selectedDataItemsInChart.length >= 1) {
                         return !this._table._selectedDataItemsInChart.find((item => {
-                            for (const itemKey in item) if (item[itemKey] !== datum[itemKey]) return !1;
+                            for (const itemKey in item) if ("object" != typeof item[itemKey] && item[itemKey] !== datum[itemKey]) return !1;
                             return !0;
                         }));
                     }
                     if (null === (_a = this._table._selectedDimensionInChart) || void 0 === _a ? void 0 : _a.length) {
-                        return !this._table._selectedDimensionInChart.every((item => datum[item.key] === item.value));
+                        return !this._table._selectedDimensionInChart.every((item => "object" == typeof item.value || datum[item.key] === item.value));
                     }
                     return !1;
                 }