@visactor/vtable 0.15.5-alpha.1 → 0.15.5-alpha.3

package/es/index.d.ts

@@ -12,7 +12,7 @@ import type { MousePointerCellEvent } from './ts-types/events';
 import * as CustomLayout from './render/layout';
 export { getDataCellPath } from './tools/get-data-path';
 export * from './render/jsx';
-export declare const version = "0.15.5-alpha.1";
+export declare const version = "0.15.5-alpha.3";
 export { TYPES, core, ListTable, ListTableConstructorOptions, PivotTable, PivotTableConstructorOptions, PivotChartConstructorOptions, PivotChart, IHeaderTreeDefine, IDimension, IIndicator, ITitleDefine, ICornerDefine, ColumnsDefine, ColumnDefine, LinkColumnDefine, ChartColumnDefine, ImageColumnDefine, SparklineColumnDefine, ProgressbarColumnDefine, TextColumnDefine, GroupColumnDefine, TextAlignType, TextBaselineType, themes, data, MousePointerCellEvent, getIcons, clearGlobal, register, DataStatistics, CustomLayout };
 declare function getIcons(): {
     [key: string]: TYPES.ColumnIconOption;

package/es/index.js

@@ -24,7 +24,7 @@ export { getDataCellPath } from "./tools/get-data-path";
 
 export * from "./render/jsx";
 
-export const version = "0.15.5-alpha.1";
+export const version = "0.15.5-alpha.3";
 
 export { TYPES, core, ListTable, PivotTable, PivotChart, themes, data, getIcons, clearGlobal, register, DataStatistics, CustomLayout };
 

package/es/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/index.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,KAAK,MAAM,YAAY,CAAC;AACpC,OAAO,KAAK,IAAI,MAAM,QAAQ,CAAC;AAC/B,OAAO,KAAK,IAAI,MAAM,QAAQ,CAAC;AAC/B,OAAO,KAAK,KAAK,MAAM,SAAS,CAAC;AACjC,OAAO,KAAK,QAAQ,MAAM,YAAY,CAAC;AACvC,OAAO,KAAK,MAAM,MAAM,UAAU,CAAC;AACnC,OAAO,KAAK,cAAc,MAAM,0BAA0B,CAAC;AAsB3D,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC1C,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAE1C,OAAO,KAAK,YAAY,MAAM,iBAAiB,CAAC;AAKhD,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AACxD,cAAc,cAAc,CAAC;AAE7B,MAAM,CAAC,MAAM,OAAO,GAAG,gBAAgB,CAAC;AAIxC,OAAO,EAKL,KAAK,EACL,IAAI,EACJ,SAAS,EAET,UAAU,EAGV,UAAU,EAiBV,MAAM,EACN,IAAI,EAEJ,QAAQ,EACR,WAAW,EAEX,QAAQ,EAIR,cAAc,EACd,YAAY,EACb,CAAC;AAGF,SAAS,QAAQ;IAGf,OAAO,KAAK,CAAC,GAAG,EAAE,CAAC;AACrB,CAAC;AAED,SAAS,WAAW;IAClB,QAAQ,CAAC,QAAQ,EAAE,CAAC;AAGtB,CAAC;AACD,KAAK,CAAC,eAAe,CAAC","file":"index.js","sourcesContent":["/* eslint-disable sort-imports */\nimport * as TYPES from './ts-types';\nimport * as core from './core';\nimport * as data from './data';\nimport * as icons from './icons';\nimport * as register from './register';\nimport * as themes from './themes';\nimport * as DataStatistics from './dataset/DataStatistics';\nimport type {\n  ColumnDefine,\n  ColumnsDefine,\n  LinkColumnDefine,\n  ChartColumnDefine,\n  ImageColumnDefine,\n  SparklineColumnDefine,\n  ProgressbarColumnDefine,\n  TextColumnDefine,\n  GroupColumnDefine,\n  ListTableConstructorOptions,\n  PivotTableConstructorOptions,\n  PivotChartConstructorOptions,\n  IHeaderTreeDefine,\n  IDimension,\n  IIndicator,\n  ITitleDefine,\n  ICornerDefine,\n  TextAlignType,\n  TextBaselineType\n} from './ts-types';\nimport { ListTable } from './ListTable';\nimport { PivotTable } from './PivotTable';\nimport { PivotChart } from './PivotChart';\nimport type { MousePointerCellEvent } from './ts-types/events';\nimport * as CustomLayout from './render/layout';\n\n// import { container, loadCanvasPicker } from '@visactor/vrender';\n// loadCanvasPicker(container);\n\nexport { getDataCellPath } from './tools/get-data-path';\nexport * from './render/jsx';\n\nexport const version = \"0.15.5-alpha.1\";\n/**\n * @namespace VTable\n */\nexport {\n  /**\n   * Types\n   * @namespace VTable.TYPES\n   */\n  TYPES,\n  core,\n  ListTable,\n  ListTableConstructorOptions,\n  PivotTable,\n  PivotTableConstructorOptions,\n  PivotChartConstructorOptions,\n  PivotChart,\n  IHeaderTreeDefine,\n  IDimension,\n  IIndicator,\n  ITitleDefine,\n  ICornerDefine,\n  ColumnsDefine,\n  ColumnDefine,\n  LinkColumnDefine,\n  ChartColumnDefine,\n  ImageColumnDefine,\n  SparklineColumnDefine,\n  ProgressbarColumnDefine,\n  TextColumnDefine,\n  GroupColumnDefine,\n  TextAlignType,\n  TextBaselineType,\n  themes,\n  data,\n  MousePointerCellEvent,\n  getIcons,\n  clearGlobal,\n  //plugin registers\n  register,\n  /**\n   * 暂不推荐使用\n   */\n  DataStatistics,\n  CustomLayout\n};\n\n/** @private */\nfunction getIcons(): {\n  [key: string]: TYPES.ColumnIconOption;\n} {\n  return icons.get();\n}\n/** 清理内部的全局变量 如注册的icon theme等 以及共享的header column类实例 */\nfunction clearGlobal() {\n  register.clearAll();\n  // headers.type.clearGlobal();\n  // columns.type.clearGlobal();\n}\nTYPES.AggregationType;\n"]}
+{"version":3,"sources":["../src/index.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,KAAK,MAAM,YAAY,CAAC;AACpC,OAAO,KAAK,IAAI,MAAM,QAAQ,CAAC;AAC/B,OAAO,KAAK,IAAI,MAAM,QAAQ,CAAC;AAC/B,OAAO,KAAK,KAAK,MAAM,SAAS,CAAC;AACjC,OAAO,KAAK,QAAQ,MAAM,YAAY,CAAC;AACvC,OAAO,KAAK,MAAM,MAAM,UAAU,CAAC;AACnC,OAAO,KAAK,cAAc,MAAM,0BAA0B,CAAC;AAsB3D,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC1C,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAE1C,OAAO,KAAK,YAAY,MAAM,iBAAiB,CAAC;AAKhD,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AACxD,cAAc,cAAc,CAAC;AAE7B,MAAM,CAAC,MAAM,OAAO,GAAG,gBAAgB,CAAC;AAIxC,OAAO,EAKL,KAAK,EACL,IAAI,EACJ,SAAS,EAET,UAAU,EAGV,UAAU,EAiBV,MAAM,EACN,IAAI,EAEJ,QAAQ,EACR,WAAW,EAEX,QAAQ,EAIR,cAAc,EACd,YAAY,EACb,CAAC;AAGF,SAAS,QAAQ;IAGf,OAAO,KAAK,CAAC,GAAG,EAAE,CAAC;AACrB,CAAC;AAED,SAAS,WAAW;IAClB,QAAQ,CAAC,QAAQ,EAAE,CAAC;AAGtB,CAAC;AACD,KAAK,CAAC,eAAe,CAAC","file":"index.js","sourcesContent":["/* eslint-disable sort-imports */\nimport * as TYPES from './ts-types';\nimport * as core from './core';\nimport * as data from './data';\nimport * as icons from './icons';\nimport * as register from './register';\nimport * as themes from './themes';\nimport * as DataStatistics from './dataset/DataStatistics';\nimport type {\n  ColumnDefine,\n  ColumnsDefine,\n  LinkColumnDefine,\n  ChartColumnDefine,\n  ImageColumnDefine,\n  SparklineColumnDefine,\n  ProgressbarColumnDefine,\n  TextColumnDefine,\n  GroupColumnDefine,\n  ListTableConstructorOptions,\n  PivotTableConstructorOptions,\n  PivotChartConstructorOptions,\n  IHeaderTreeDefine,\n  IDimension,\n  IIndicator,\n  ITitleDefine,\n  ICornerDefine,\n  TextAlignType,\n  TextBaselineType\n} from './ts-types';\nimport { ListTable } from './ListTable';\nimport { PivotTable } from './PivotTable';\nimport { PivotChart } from './PivotChart';\nimport type { MousePointerCellEvent } from './ts-types/events';\nimport * as CustomLayout from './render/layout';\n\n// import { container, loadCanvasPicker } from '@visactor/vrender';\n// loadCanvasPicker(container);\n\nexport { getDataCellPath } from './tools/get-data-path';\nexport * from './render/jsx';\n\nexport const version = \"0.15.5-alpha.3\";\n/**\n * @namespace VTable\n */\nexport {\n  /**\n   * Types\n   * @namespace VTable.TYPES\n   */\n  TYPES,\n  core,\n  ListTable,\n  ListTableConstructorOptions,\n  PivotTable,\n  PivotTableConstructorOptions,\n  PivotChartConstructorOptions,\n  PivotChart,\n  IHeaderTreeDefine,\n  IDimension,\n  IIndicator,\n  ITitleDefine,\n  ICornerDefine,\n  ColumnsDefine,\n  ColumnDefine,\n  LinkColumnDefine,\n  ChartColumnDefine,\n  ImageColumnDefine,\n  SparklineColumnDefine,\n  ProgressbarColumnDefine,\n  TextColumnDefine,\n  GroupColumnDefine,\n  TextAlignType,\n  TextBaselineType,\n  themes,\n  data,\n  MousePointerCellEvent,\n  getIcons,\n  clearGlobal,\n  //plugin registers\n  register,\n  /**\n   * 暂不推荐使用\n   */\n  DataStatistics,\n  CustomLayout\n};\n\n/** @private */\nfunction getIcons(): {\n  [key: string]: TYPES.ColumnIconOption;\n} {\n  return icons.get();\n}\n/** 清理内部的全局变量 如注册的icon theme等 以及共享的header column类实例 */\nfunction clearGlobal() {\n  register.clearAll();\n  // headers.type.clearGlobal();\n  // columns.type.clearGlobal();\n}\nTYPES.AggregationType;\n"]}

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

@@ -2,13 +2,14 @@ import type { CellAddress, CellRange, IPivotTableCellHeaderPaths, LayoutObjectId
 import type { HeaderData, IndicatorData, LayoutMapAPI, WidthData } from '../ts-types/list-table/layout-map/api';
 import type { PivotTable } from '../PivotTable';
 import type { PivotChart } from '../PivotChart';
-import type { LayouTreeNode } from './pivot-layout-helper';
+import type { LayouTreeNode, IPivotLayoutHeadNode } from './pivot-layout-helper';
 import { DimensionTree } from './pivot-layout-helper';
 import type { Dataset } from '../dataset/dataset';
-export declare const sharedVar: {
-    seqId: number;
-};
 export declare class PivotHeaderLayoutMap implements LayoutMapAPI {
+    sharedVar: {
+        seqId: number;
+    };
+    colIndex: number;
     _showHeader: boolean;
     rowDimensionTree: DimensionTree;
     columnDimensionTree: DimensionTree;
@@ -28,9 +29,9 @@ export declare class PivotHeaderLayoutMap implements LayoutMapAPI {
     columnsDefine: (IColumnDimension | string)[];
     indicatorsDefine: (IIndicator | string)[];
     columnPaths: number[][];
-    private _headerObjects;
+    _headerObjects: HeaderData[];
     private _headerObjectMap;
-    private _indicators;
+    _indicators: IndicatorData[];
     indicatorTitle: string;
     indicatorsAsCol: boolean;
     hideIndicatorName: boolean;
@@ -64,8 +65,8 @@ export declare class PivotHeaderLayoutMap implements LayoutMapAPI {
     _chartItemBandSize: number;
     _chartPadding?: number | number[];
     constructor(table: PivotTable | PivotChart, dataset: Dataset);
-    private _addHeaders;
-    private _addHeadersForTreeMode;
+    _addHeaders(_headerCellIds: number[][], row: number, header: IPivotLayoutHeadNode[], roots: number[]): HeaderData[];
+    _addHeadersForTreeMode(_headerCellIds: number[][], row: number, header: IPivotLayoutHeadNode[], roots: number[], totalLevel: number, show: boolean, dimensions: (IDimension | string)[]): HeaderData[];
     private _addCornerHeaders;
     private generateExtensionRowTree;
     private setColumnWidths;

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

@@ -8,7 +8,7 @@ import { diffCellAddress } from "../tools/diff-cell";
 
 import { getChartAxes, getChartDataId, getChartSpec, getRawChartSpec } from "./chart-helper/get-chart-spec";
 
-import { DimensionTree, countLayoutTree, generateLayoutTree } from "./pivot-layout-helper";
+import { DimensionTree, countLayoutTree, dealHeader, dealHeaderForTreeMode, generateLayoutTree } from "./pivot-layout-helper";
 
 import { cloneDeep, isArray, isValid } from "@visactor/vutils";
 
@@ -16,12 +16,6 @@ import { getQuadProps } from "../scenegraph/utils/padding";
 
 import { getAxisConfigInPivotChart } from "./chart-helper/get-axis-config";
 
-export const sharedVar = {
-    seqId: 0
-};
-
-let colIndex = 0;
-
 const defaultDimension = {
     startInTotal: 0,
     level: 0
@@ -30,7 +24,7 @@ const defaultDimension = {
 export class PivotHeaderLayoutMap {
     constructor(table, dataset) {
         var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y;
-        if (this._showHeader = !0, this.columnHeaderObjs = [], this.rowHeaderObjs = [], 
+        if (this.colIndex = 0, this._showHeader = !0, this.columnHeaderObjs = [], this.rowHeaderObjs = [], 
         this._cornerHeaderCellIds = [], this._columnHeaderCellIds = [], this._rowHeaderCellIds = [], 
         this._rowHeaderCellIds_FULL = [], this._columnWidths = [], this.columnPaths = [], 
         this._headerObjects = [], this._headerObjectMap = {}, this._indicators = [], this.indicatorsAsCol = !0, 
@@ -38,7 +32,9 @@ export class PivotHeaderLayoutMap {
         this._indicatorShowType = "column", this.rowDimensionKeys = [], this.colDimensionKeys = [], 
         this.indicatorKeys = [], this.indicatorDimensionKey = IndicatorDimensionKeyPlaceholder, 
         this._rowHeaderExtensionTree = {}, this._extensionRowDimensionKeys = [], this.fullRowDimensionKeys = [], 
-        this._table = table, "tree" === table.options.rowHierarchyType && (this.extensionRows = table.options.extensionRows), 
+        this.sharedVar = {
+            seqId: 0
+        }, this._table = table, "tree" === table.options.rowHierarchyType && (this.extensionRows = table.options.extensionRows), 
         this.dataset = dataset, this._CellHeaderPathMap = new Map, this.rowTree = table.internalProps.rowTree, 
         this.columnTree = table.internalProps.columnTree, this.rowsDefine = null !== (_a = table.internalProps.rows) && void 0 !== _a ? _a : [], 
         this.columnsDefine = null !== (_b = table.internalProps.columns) && void 0 !== _b ? _b : [], 
@@ -71,13 +67,13 @@ export class PivotHeaderLayoutMap {
         }
         if (null === (_o = this.indicatorsDefine) || void 0 === _o || _o.forEach((indicator => {
             "string" == typeof indicator ? this.indicatorKeys.push(indicator) : this.indicatorKeys.push(indicator.indicatorKey);
-        })), this.columnDimensionTree = new DimensionTree(null !== (_p = this.columnTree) && void 0 !== _p ? _p : []), 
-        this.rowDimensionTree = new DimensionTree(null !== (_q = this.rowTree) && void 0 !== _q ? _q : [], this.rowHierarchyType, "tree" === this.rowHierarchyType ? this.rowExpandLevel : void 0), 
+        })), this.columnDimensionTree = new DimensionTree(null !== (_p = this.columnTree) && void 0 !== _p ? _p : [], this.sharedVar), 
+        this.rowDimensionTree = new DimensionTree(null !== (_q = this.rowTree) && void 0 !== _q ? _q : [], this.sharedVar, this.rowHierarchyType, "tree" === this.rowHierarchyType ? this.rowExpandLevel : void 0), 
         this.colDimensionKeys = this.columnDimensionTree.dimensionKeys.valueArr(), this.rowDimensionKeys = this.rowDimensionTree.dimensionKeys.valueArr(), 
         this.fullRowDimensionKeys = this.fullRowDimensionKeys.concat(this.rowDimensionKeys), 
         this.resetRowHeaderLevelCount(), (null === (_r = this.columnDimensionTree.tree.children) || void 0 === _r ? void 0 : _r.length) >= 1 && (this.columnHeaderObjs = this._addHeaders(this._columnHeaderCellIds, 0, this.columnDimensionTree.tree.children, [])), 
         this.columnHeaderTitle) {
-            const id = ++sharedVar.seqId, firstRowIds = Array(this.colCount - this.rowHeaderLevelCount).fill(id);
+            const id = ++this.sharedVar.seqId, firstRowIds = Array(this.colCount - this.rowHeaderLevelCount).fill(id);
             this._columnHeaderCellIds.unshift(firstRowIds);
             const cell = {
                 id: id,
@@ -91,9 +87,9 @@ export class PivotHeaderLayoutMap {
             };
             this.columnHeaderObjs.push(cell), this._headerObjects[id] = cell;
         }
-        if (colIndex = 0, (null === (_t = this.rowDimensionTree.tree.children) || void 0 === _t ? void 0 : _t.length) >= 1 && (this.rowHeaderObjs = "tree" === this.rowHierarchyType ? this._addHeadersForTreeMode(this._rowHeaderCellIds_FULL, 0, this.rowDimensionTree.tree.children, [], this.rowDimensionTree.totalLevel, !0, this.rowsDefine) : this._addHeaders(this._rowHeaderCellIds_FULL, 0, this.rowDimensionTree.tree.children, [])), 
+        if (this.colIndex = 0, (null === (_t = this.rowDimensionTree.tree.children) || void 0 === _t ? void 0 : _t.length) >= 1 && (this.rowHeaderObjs = "tree" === this.rowHierarchyType ? this._addHeadersForTreeMode(this._rowHeaderCellIds_FULL, 0, this.rowDimensionTree.tree.children, [], this.rowDimensionTree.totalLevel, !0, this.rowsDefine) : this._addHeaders(this._rowHeaderCellIds_FULL, 0, this.rowDimensionTree.tree.children, [])), 
         this.rowHeaderTitle) {
-            const id = ++sharedVar.seqId, firstColIds = Array(null !== (_v = null === (_u = this._rowHeaderCellIds_FULL[0]) || void 0 === _u ? void 0 : _u.length) && void 0 !== _v ? _v : this.rowDimensionTree.tree.size).fill(id);
+            const id = ++this.sharedVar.seqId, firstColIds = Array(null !== (_v = null === (_u = this._rowHeaderCellIds_FULL[0]) || void 0 === _u ? void 0 : _u.length) && void 0 !== _v ? _v : this.rowDimensionTree.tree.size).fill(id);
             this._rowHeaderCellIds_FULL.unshift(firstColIds);
             const cell = {
                 id: id,
@@ -123,7 +119,7 @@ export class PivotHeaderLayoutMap {
             const extensionRowDimensions = this.extensionRows.reduce(((dimensions, cur) => dimensions.concat(cur.rows)), []);
             this.cornerHeaderObjs = this._addCornerHeaders(this.rowHeaderTitle ? [ "" ].concat(rowTreeFirstKey) : rowTreeFirstKey, this.rowsDefine.concat(extensionRowDimensions));
         } else this.cornerHeaderObjs = this._addCornerHeaders(this.rowHeaderTitle ? [ "" ].concat(this.rowDimensionKeys) : this.rowDimensionKeys, this.rowsDefine); else this.cornerHeaderObjs = this._addCornerHeaders(null, void 0);
-        colIndex = 0, this._headerObjectMap = this._headerObjects.reduce(((o, e) => (o[e.id] = e, 
+        this.colIndex = 0, this._headerObjectMap = this._headerObjects.reduce(((o, e) => (o[e.id] = e, 
         o)), {}), this.indicatorsAsCol && !this.hideIndicatorName ? this._indicatorShowType = "column" : this.indicatorsAsCol || this.hideIndicatorName ? this._indicatorShowType = "none" : this._indicatorShowType = "row", 
         this.setPagination(table.options.pagination), this._table.isPivotChart() && (this._chartItemSpanSize = 0, 
         this._chartItemBandSize = 0, this._indicators.find((indicatorObject => {
@@ -139,126 +135,41 @@ export class PivotHeaderLayoutMap {
         }))), this.setColumnWidths();
     }
     _addHeaders(_headerCellIds, row, header, roots) {
+        const _this = this;
         const results = [];
-        return _headerCellIds[row] || function(row) {
+        _headerCellIds[row] || function(row) {
             const newRow = _headerCellIds[row] = [];
-            if (0 === colIndex) return newRow;
+            if (0 === _this.colIndex) return newRow;
             const prev = _headerCellIds[row - 1];
             for (let col = 0; col < (null == prev ? void 0 : prev.length); col++) newRow[col] = prev[col];
-        }(row), header.forEach((hd => {
-            var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x;
-            const id = hd.id, dimensionInfo = null !== (_b = null === (_a = this.rowsDefine) || void 0 === _a ? void 0 : _a.find((dimension => "string" != typeof dimension && dimension.dimensionKey === hd.dimensionKey))) && void 0 !== _b ? _b : null === (_c = this.columnsDefine) || void 0 === _c ? void 0 : _c.find((dimension => "string" != typeof dimension && dimension.dimensionKey === hd.dimensionKey)), indicatorInfo = null === (_d = this.indicatorsDefine) || void 0 === _d ? void 0 : _d.find((indicator => "string" != typeof indicator && (hd.indicatorKey ? indicator.indicatorKey === hd.indicatorKey : indicator.title === hd.value))), cell = {
-                id: id,
-                title: null !== (_e = hd.value) && void 0 !== _e ? _e : null == indicatorInfo ? void 0 : indicatorInfo.title,
-                field: hd.dimensionKey,
-                style: "function" == typeof (null === (_f = null != indicatorInfo ? indicatorInfo : dimensionInfo) || void 0 === _f ? void 0 : _f.headerStyle) ? null === (_g = null != indicatorInfo ? indicatorInfo : dimensionInfo) || void 0 === _g ? void 0 : _g.headerStyle : Object.assign({}, null === (_h = null != indicatorInfo ? indicatorInfo : dimensionInfo) || void 0 === _h ? void 0 : _h.headerStyle),
-                headerType: null !== (_k = null !== (_j = null == indicatorInfo ? void 0 : indicatorInfo.headerType) && void 0 !== _j ? _j : null == dimensionInfo ? void 0 : dimensionInfo.headerType) && void 0 !== _k ? _k : "text",
-                headerIcon: null !== (_l = null == indicatorInfo ? void 0 : indicatorInfo.headerIcon) && void 0 !== _l ? _l : null == dimensionInfo ? void 0 : dimensionInfo.headerIcon,
-                define: Object.assign({}, hd, null != indicatorInfo ? indicatorInfo : dimensionInfo),
-                fieldFormat: null !== (_m = null == indicatorInfo ? void 0 : indicatorInfo.headerFormat) && void 0 !== _m ? _m : null == dimensionInfo ? void 0 : dimensionInfo.headerFormat,
-                dropDownMenu: null !== (_o = null == indicatorInfo ? void 0 : indicatorInfo.dropDownMenu) && void 0 !== _o ? _o : null == dimensionInfo ? void 0 : dimensionInfo.dropDownMenu,
-                pivotInfo: {
-                    value: hd.value,
-                    dimensionKey: hd.dimensionKey,
-                    isPivotCorner: !1
-                },
-                width: null == dimensionInfo ? void 0 : dimensionInfo.width,
-                minWidth: null == dimensionInfo ? void 0 : dimensionInfo.minWidth,
-                maxWidth: null == dimensionInfo ? void 0 : dimensionInfo.maxWidth,
-                showSort: null !== (_p = null == indicatorInfo ? void 0 : indicatorInfo.showSort) && void 0 !== _p ? _p : null == dimensionInfo ? void 0 : dimensionInfo.showSort,
-                description: null == dimensionInfo ? void 0 : dimensionInfo.description
-            };
-            indicatorInfo ? (indicatorInfo.customRender && (hd.customRender = indicatorInfo.customRender), 
-            isValid(null === (_q = this._indicators) || void 0 === _q ? void 0 : _q.find((indicator => indicator.indicatorKey === indicatorInfo.indicatorKey))) || null === (_r = this._indicators) || void 0 === _r || _r.push({
-                id: ++sharedVar.seqId,
-                indicatorKey: indicatorInfo.indicatorKey,
-                field: indicatorInfo.indicatorKey,
-                fieldFormat: null == indicatorInfo ? void 0 : indicatorInfo.format,
-                cellType: null !== (_t = null !== (_s = null == indicatorInfo ? void 0 : indicatorInfo.cellType) && void 0 !== _s ? _s : null == indicatorInfo ? void 0 : indicatorInfo.columnType) && void 0 !== _t ? _t : "text",
-                chartModule: "chartModule" in indicatorInfo ? indicatorInfo.chartModule : null,
-                chartSpec: "chartSpec" in indicatorInfo ? indicatorInfo.chartSpec : null,
-                sparklineSpec: "sparklineSpec" in indicatorInfo ? indicatorInfo.sparklineSpec : null,
-                style: null == indicatorInfo ? void 0 : indicatorInfo.style,
-                icon: null == indicatorInfo ? void 0 : indicatorInfo.icon,
-                define: Object.assign({}, hd, indicatorInfo, {
-                    dragHeader: null == dimensionInfo ? void 0 : dimensionInfo.dragHeader
-                }),
-                width: null == indicatorInfo ? void 0 : indicatorInfo.width,
-                minWidth: null == indicatorInfo ? void 0 : indicatorInfo.minWidth,
-                maxWidth: null == indicatorInfo ? void 0 : indicatorInfo.maxWidth,
-                disableColumnResize: null == indicatorInfo ? void 0 : indicatorInfo.disableColumnResize
-            })) : hd.indicatorKey && (isValid(null === (_u = this._indicators) || void 0 === _u ? void 0 : _u.find((indicator => indicator.indicatorKey === hd.indicatorKey))) || null === (_v = this._indicators) || void 0 === _v || _v.push({
-                id: ++sharedVar.seqId,
-                indicatorKey: hd.indicatorKey,
-                field: hd.indicatorKey,
-                cellType: "text",
-                define: Object.assign({}, hd)
-            })), results[id] = cell, this._headerObjects[id] = cell, _headerCellIds[row][colIndex] = id;
-            for (let r = row - 1; r >= 0; r--) _headerCellIds[r][colIndex] = roots[r];
-            if ((null === (_w = hd.children) || void 0 === _w ? void 0 : _w.length) >= 1) this._addHeaders(_headerCellIds, row + 1, null !== (_x = hd.children) && void 0 !== _x ? _x : [], [ ...roots, id ]).forEach((c => results.push(c))); else {
-                for (let r = row + 1; r < _headerCellIds.length; r++) _headerCellIds[r][colIndex] = id;
-                colIndex++;
-            }
-        })), results;
+        }(row);
+        for (let i = 0; i < header.length; i++) {
+            const hd = header[i];
+            dealHeader(hd, _headerCellIds, results, roots, row, this);
+        }
+        return results;
     }
     _addHeadersForTreeMode(_headerCellIds, row, header, roots, totalLevel, show, dimensions) {
+        const _this = this;
         const results = [];
-        return _headerCellIds[row] || function(row) {
+        _headerCellIds[row] || function(row) {
             const newRow = _headerCellIds[row] = [];
-            if (0 === colIndex) return newRow;
+            if (0 === _this.colIndex) return newRow;
             const prev = _headerCellIds[row - 1];
             for (let col = 0; col < (null == prev ? void 0 : prev.length); col++) newRow[col] = prev[col];
-        }(row), header.forEach((hd => {
-            var _a, _b, _c, _d;
-            const id = hd.id, dimensionInfo = dimensions.find((dimension => "string" != typeof dimension && dimension.dimensionKey === hd.dimensionKey)), cell = {
-                id: id,
-                title: hd.value,
-                field: hd.dimensionKey,
-                style: hd.level + 1 === totalLevel || "function" == typeof (null == dimensionInfo ? void 0 : dimensionInfo.headerStyle) ? null == dimensionInfo ? void 0 : dimensionInfo.headerStyle : Object.assign({}, null == dimensionInfo ? void 0 : dimensionInfo.headerStyle, {
-                    textAlign: "left"
-                }),
-                headerType: null !== (_a = null == dimensionInfo ? void 0 : dimensionInfo.headerType) && void 0 !== _a ? _a : "text",
-                headerIcon: null == dimensionInfo ? void 0 : dimensionInfo.headerIcon,
-                define: Object.assign(hd, {
-                    linkJump: null == dimensionInfo ? void 0 : dimensionInfo.linkJump,
-                    linkDetect: null == dimensionInfo ? void 0 : dimensionInfo.linkDetect,
-                    templateLink: null == dimensionInfo ? void 0 : dimensionInfo.templateLink,
-                    keepAspectRatio: null !== (_b = null == dimensionInfo ? void 0 : dimensionInfo.keepAspectRatio) && void 0 !== _b && _b,
-                    imageAutoSizing: null == dimensionInfo ? void 0 : dimensionInfo.imageAutoSizing,
-                    headerCustomRender: null == dimensionInfo ? void 0 : dimensionInfo.headerCustomRender,
-                    headerCustomLayout: null == dimensionInfo ? void 0 : dimensionInfo.headerCustomLayout,
-                    dragHeader: null == dimensionInfo ? void 0 : dimensionInfo.dragHeader
-                }),
-                fieldFormat: null == dimensionInfo ? void 0 : dimensionInfo.headerFormat,
-                dropDownMenu: null == dimensionInfo ? void 0 : dimensionInfo.dropDownMenu,
-                pivotInfo: {
-                    value: hd.value,
-                    dimensionKey: hd.dimensionKey,
-                    isPivotCorner: !1
-                },
-                hierarchyLevel: hd.level,
-                dimensionTotalLevel: totalLevel,
-                hierarchyState: hd.level + 1 === totalLevel ? void 0 : hd.hierarchyState,
-                width: null == dimensionInfo ? void 0 : dimensionInfo.width,
-                minWidth: null == dimensionInfo ? void 0 : dimensionInfo.minWidth,
-                maxWidth: null == dimensionInfo ? void 0 : dimensionInfo.maxWidth,
-                parentCellId: roots[roots.length - 1]
-            };
-            results[id] = cell, this._headerObjects[id] = cell, _headerCellIds[row][colIndex] = id;
-            for (let r = row - 1; r >= 0; r--) _headerCellIds[r][colIndex] = roots[r];
-            if (hd.hierarchyState === HierarchyState.expand && (null === (_c = hd.children) || void 0 === _c ? void 0 : _c.length) >= 1) show && colIndex++, 
-            this._addHeadersForTreeMode(_headerCellIds, row, null !== (_d = hd.children) && void 0 !== _d ? _d : [], [ ...roots, id ], totalLevel, show && hd.hierarchyState === HierarchyState.expand, dimensions).forEach((c => results.push(c))); else {
-                show && colIndex++;
-                for (let r = row + 1; r < _headerCellIds.length; r++) _headerCellIds[r][colIndex] = id;
-            }
-        })), results;
+        }(row);
+        for (let i = 0; i < header.length; i++) {
+            const hd = header[i];
+            dealHeaderForTreeMode(hd, _headerCellIds, results, roots, row, totalLevel, show, dimensions, this);
+        }
+        return results;
     }
     _addCornerHeaders(dimensionKeys, dimensions) {
         var _a;
         const results = [];
         if (dimensionKeys) dimensionKeys.forEach(((dimensionKey, key) => {
             var _a, _b;
-            const id = ++sharedVar.seqId, dimensionInfo = dimensions.find((dimension => "string" != typeof dimension && dimension.dimensionKey === dimensionKey)), cell = {
+            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: "维度名称",
@@ -283,7 +194,7 @@ export class PivotHeaderLayoutMap {
             } else if ("row" === this.cornerSetting.titleOnDimension) for (let r = 0; r < this.columnHeaderLevelCount; r++) this._cornerHeaderCellIds[r] || (this._cornerHeaderCellIds[r] = []), 
             this._cornerHeaderCellIds[r][key] = id;
         })); else {
-            const id = ++sharedVar.seqId, cell = {
+            const id = ++this.sharedVar.seqId, cell = {
                 id: id,
                 title: "",
                 field: "维度名称",
@@ -307,7 +218,7 @@ export class PivotHeaderLayoutMap {
             this._rowHeaderCellIds_FULL = [], old_rowHeaderCellIds.forEach(((row_ids, index) => {
                 const key = row_ids[row_ids.length - 1];
                 let tree, rowExtensionDimensionTree;
-                if (colIndex = 0, "function" == typeof extensionRow.rowTree) {
+                if (this.colIndex = 0, "function" == typeof extensionRow.rowTree) {
                     const fullCellIds = this.findFullCellIds(row_ids);
                     tree = extensionRow.rowTree(fullCellIds.map((id => ({
                         dimensionKey: this._headerObjects[id].field,
@@ -315,7 +226,7 @@ export class PivotHeaderLayoutMap {
                     }))));
                 } else tree = cloneDeep(extensionRow.rowTree);
                 this._rowHeaderExtensionTree[key] ? (this._rowHeaderExtensionTree[key].reset(this._rowHeaderExtensionTree[key].tree.children, !0), 
-                rowExtensionDimensionTree = this._rowHeaderExtensionTree[key]) : (rowExtensionDimensionTree = new DimensionTree(null != tree ? tree : [], this.rowHierarchyType, void 0), 
+                rowExtensionDimensionTree = this._rowHeaderExtensionTree[key]) : (rowExtensionDimensionTree = new DimensionTree(null != tree ? tree : [], this.sharedVar, this.rowHierarchyType, void 0), 
                 this._rowHeaderExtensionTree[key] = rowExtensionDimensionTree);
                 const extensionRowTreeHeaderIds = [];
                 this._addHeadersForTreeMode(extensionRowTreeHeaderIds, 0, rowExtensionDimensionTree.tree.children, [], rowExtensionDimensionTree.totalLevel, !0, extensionRow.rows);
@@ -804,7 +715,7 @@ export class PivotHeaderLayoutMap {
         this.rowDimensionTree.reset(this.rowDimensionTree.tree.children, !0), this._rowHeaderCellIds_FULL = [], 
         this.rowHeaderObjs = this._addHeadersForTreeMode(this._rowHeaderCellIds_FULL, 0, this.rowDimensionTree.tree.children, [], this.rowDimensionTree.totalLevel, !0, this.rowsDefine), 
         this.rowHeaderTitle) {
-            const id = ++sharedVar.seqId, firstColIds = Array(this.rowCount - this.columnHeaderLevelCount).fill(id);
+            const id = ++this.sharedVar.seqId, firstColIds = Array(this.rowCount - this.columnHeaderLevelCount).fill(id);
             this._rowHeaderCellIds_FULL.unshift(firstColIds);
             const cell = {
                 id: id,
@@ -821,7 +732,7 @@ export class PivotHeaderLayoutMap {
             this.rowHeaderObjs.push(cell), this._headerObjects[id] = cell;
         }
         this._rowHeaderCellIds_FULL = transpose(this._rowHeaderCellIds_FULL), "tree" === this.rowHierarchyType && (null === (_b = this.extensionRows) || void 0 === _b ? void 0 : _b.length) >= 1 && this.generateExtensionRowTree(), 
-        colIndex = 0, this._headerObjectMap = this._headerObjects.reduce(((o, e) => (o[e.id] = e, 
+        this.colIndex = 0, this._headerObjectMap = this._headerObjects.reduce(((o, e) => (o[e.id] = e, 
         o)), {}), this._CellHeaderPathMap = new Map;
         const diffCell = diffCellAddress(col, row, oldRowHeaderCellIds.map((oldCellId => oldCellId[col])), this._rowHeaderCellIds_FULL.map((newCellId => newCellId[col])), oldRowHeaderCellPositons, this);
         return this._rowHeaderCellIds = this._rowHeaderCellIds_FULL, diffCell;
@@ -922,11 +833,8 @@ export class PivotHeaderLayoutMap {
     }
     getRowHeaderCellAddressByCellId(cellId) {
         let col, row;
-        if (this._rowHeaderCellIds.find(((cellIds, rowIndex) => {
-            const finded = cellIds.find(((id, colIndex) => id === cellId && (col = colIndex, 
-            !0)));
-            return !!finded && (row = rowIndex, !0);
-        })), isValid(col) && isValid(row)) return {
+        if (this._rowHeaderCellIds.find(((cellIds, rowIndex) => !!cellIds.find(((id, colIndex) => id === cellId && (col = colIndex, 
+        !0))) && (row = rowIndex, !0))), isValid(col) && isValid(row)) return {
             col: col,
             row: row + this.columnHeaderLevelCount
         };