@visactor/vtable 0.26.0-alpha.1 → 1.0.0-alpha.3

package/cjs/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,uCAA4D;AA8F1D,4FA9FO,qBAAW,OA8FP;AA7Fb,IAAA,4BAAkB,GAAE,CAAC;AAErB,kDAAoC;AAqDlC,sBAAK;AApDP,6CAA+B;AAqD7B,oBAAI;AApDN,6CAA+B;AA4E7B,oBAAI;AA3EN,+CAAiC;AACjC,qDAAuC;AA+ErC,4BAAQ;AA9EV,iDAAmC;AAwEjC,wBAAM;AAvER,yEAA2D;AAiFzD,wCAAc;AA3DhB,2CAAwC;AA2BtC,0FA3BO,qBAAS,OA2BP;AA1BX,6CAA0C;AA4BxC,2FA5BO,uBAAU,OA4BP;AA3BZ,6CAA0C;AA8BxC,2FA9BO,uBAAU,OA8BP;AA5BZ,8DAAgD;AAwD9C,oCAAY;AAtDd,wEAAoE;AAuDlE,2FAvDO,wBAAU,OAuDP;AAtDZ,gGAAqF;AAuDnF,4FAvDO,iCAAW,OAuDP;AAtDb,kEAA+F;AAyD7F,mGAzDO,iCAAkB,OAyDP;AADlB,yGAxD2B,uCAAwB,OAwD3B;AAnD1B,uDAAwD;AAA/C,gHAAA,eAAe,OAAA;AACxB,+CAA6B;AAEhB,QAAA,OAAO,GAAG,gBAAgB,CAAC;AAqDxC,SAAS,QAAQ;IAGf,OAAO,KAAK,CAAC,GAAG,EAAE,CAAC;AACrB,CAAC;AArBC,4BAAQ;AAuBV,SAAS,WAAW;IAClB,QAAQ,CAAC,QAAQ,EAAE,CAAC;AAGtB,CAAC;AA1BC,kCAAW;AA2Bb,KAAK,CAAC,eAAe,CAAC","file":"index.js","sourcesContent":["/* eslint-disable sort-imports */\nimport { graphicUtil, registerForVrender } from './vrender';\nregisterForVrender();\n\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\nimport { updateCell } from './scenegraph/group-creater/cell-helper';\nimport { renderChart } from './scenegraph/graphic/contributions/chart-render-helper';\nimport { restoreMeasureText, setCustomAlphabetCharSet } from './scenegraph/utils/text-measure';\n\n// import { container, loadCanvasPicker } from '@src/vrender';\n// loadCanvasPicker(container);\n\nexport { getDataCellPath } from './tools/get-data-path';\nexport * from './render/jsx';\n\nexport const version = \"0.26.0-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  updateCell,\n  renderChart,\n  graphicUtil,\n  setCustomAlphabetCharSet,\n  restoreMeasureText\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,uCAA4D;AA8F1D,4FA9FO,qBAAW,OA8FP;AA7Fb,IAAA,4BAAkB,GAAE,CAAC;AAErB,kDAAoC;AAqDlC,sBAAK;AApDP,6CAA+B;AAqD7B,oBAAI;AApDN,6CAA+B;AA4E7B,oBAAI;AA3EN,+CAAiC;AACjC,qDAAuC;AA+ErC,4BAAQ;AA9EV,iDAAmC;AAwEjC,wBAAM;AAvER,yEAA2D;AAiFzD,wCAAc;AA3DhB,2CAAwC;AA2BtC,0FA3BO,qBAAS,OA2BP;AA1BX,6CAA0C;AA4BxC,2FA5BO,uBAAU,OA4BP;AA3BZ,6CAA0C;AA8BxC,2FA9BO,uBAAU,OA8BP;AA5BZ,8DAAgD;AAwD9C,oCAAY;AAtDd,wEAAoE;AAuDlE,2FAvDO,wBAAU,OAuDP;AAtDZ,gGAAqF;AAuDnF,4FAvDO,iCAAW,OAuDP;AAtDb,kEAA+F;AAyD7F,mGAzDO,iCAAkB,OAyDP;AADlB,yGAxD2B,uCAAwB,OAwD3B;AAnD1B,uDAAwD;AAA/C,gHAAA,eAAe,OAAA;AACxB,+CAA6B;AAEhB,QAAA,OAAO,GAAG,eAAe,CAAC;AAqDvC,SAAS,QAAQ;IAGf,OAAO,KAAK,CAAC,GAAG,EAAE,CAAC;AACrB,CAAC;AArBC,4BAAQ;AAuBV,SAAS,WAAW;IAClB,QAAQ,CAAC,QAAQ,EAAE,CAAC;AAGtB,CAAC;AA1BC,kCAAW;AA2Bb,KAAK,CAAC,eAAe,CAAC","file":"index.js","sourcesContent":["/* eslint-disable sort-imports */\nimport { graphicUtil, registerForVrender } from './vrender';\nregisterForVrender();\n\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\nimport { updateCell } from './scenegraph/group-creater/cell-helper';\nimport { renderChart } from './scenegraph/graphic/contributions/chart-render-helper';\nimport { restoreMeasureText, setCustomAlphabetCharSet } from './scenegraph/utils/text-measure';\n\n// import { container, loadCanvasPicker } from '@src/vrender';\n// loadCanvasPicker(container);\n\nexport { getDataCellPath } from './tools/get-data-path';\nexport * from './render/jsx';\n\nexport const version = \"1.0.0-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  updateCell,\n  renderChart,\n  graphicUtil,\n  setCustomAlphabetCharSet,\n  restoreMeasureText\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/cjs/layout/layout-helper.d.ts

@@ -1,5 +1,5 @@
 import type { PivotTable } from '../PivotTable';
-import type { PivotTableConstructorOptions } from '../ts-types';
+import type { PivotTableConstructorOptions, IHeaderTreeDefine, IIndicator } from '../ts-types';
 import type { SimpleHeaderLayoutMap } from './simple-header-layout';
 import { DimensionTree } from './tree-helper';
 export declare function checkHasAggregation(layoutMap: SimpleHeaderLayoutMap): boolean;
@@ -10,8 +10,7 @@ export declare function parseColKeyRowKeyForPivotTable(table: PivotTable, option
     rowKeys: string[];
     columnKeys: string[];
     indicatorKeys: string[];
-    isNeedResetColumnDimensionTree: boolean;
-    isNeedResetRowDimensionTree: boolean;
     columnDimensionTree: DimensionTree;
     rowDimensionTree: DimensionTree;
 };
+export declare function supplementIndicatorNodesForCustomTree(customTree: IHeaderTreeDefine[], indicators: (string | IIndicator)[]): IHeaderTreeDefine[];

package/cjs/layout/layout-helper.js

@@ -2,9 +2,9 @@
 
 Object.defineProperty(exports, "__esModule", {
     value: !0
-}), exports.parseColKeyRowKeyForPivotTable = exports.checkHasTreeDefine = exports.checkHasAggregationOnBottom = exports.checkHasAggregationOnTop = exports.checkHasAggregation = void 0;
+}), exports.supplementIndicatorNodesForCustomTree = exports.parseColKeyRowKeyForPivotTable = exports.checkHasTreeDefine = exports.checkHasAggregationOnBottom = exports.checkHasAggregationOnTop = exports.checkHasAggregation = void 0;
 
-const global_1 = require("../tools/global"), ts_types_1 = require("../ts-types"), tree_helper_1 = require("./tree-helper");
+const ts_types_1 = require("../ts-types"), tree_helper_1 = require("./tree-helper");
 
 function checkHasAggregation(layoutMap) {
     const columnObjects = layoutMap.columnObjects;
@@ -46,15 +46,15 @@ function checkHasTreeDefine(layoutMap) {
 }
 
 function parseColKeyRowKeyForPivotTable(table, options) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r;
-    let columnDimensionTree, rowDimensionTree, isNeedResetColumnDimensionTree = !0, isNeedResetRowDimensionTree = !0;
-    options.columnTree && (columnDimensionTree = new tree_helper_1.DimensionTree(null !== (_a = table.internalProps.columnTree) && void 0 !== _a ? _a : [], table.layoutNodeId), 
-    isNeedResetColumnDimensionTree = !1 !== table.options.indicatorsAsCol && !columnDimensionTree.dimensionKeys.contain(global_1.IndicatorDimensionKeyPlaceholder) && (null === (_b = options.indicators) || void 0 === _b ? void 0 : _b.length) >= 1), 
-    options.rowTree && (rowDimensionTree = new tree_helper_1.DimensionTree(null !== (_c = table.internalProps.rowTree) && void 0 !== _c ? _c : [], table.layoutNodeId, table.options.rowHierarchyType, "tree" === table.options.rowHierarchyType ? null !== (_d = table.options.rowExpandLevel) && void 0 !== _d ? _d : 1 : void 0), 
-    isNeedResetRowDimensionTree = !1 === table.options.indicatorsAsCol && !rowDimensionTree.dimensionKeys.contain(global_1.IndicatorDimensionKeyPlaceholder) && (null === (_e = options.indicators) || void 0 === _e ? void 0 : _e.length) >= 1);
-    const rowKeys = (null === (_f = null == rowDimensionTree ? void 0 : rowDimensionTree.dimensionKeys) || void 0 === _f ? void 0 : _f.count) ? rowDimensionTree.dimensionKeys.valueArr() : null !== (_h = null === (_g = options.rows) || void 0 === _g ? void 0 : _g.reduce(((keys, rowObj) => ("string" == typeof rowObj ? keys.push(rowObj) : keys.push(rowObj.dimensionKey), 
-    keys)), [])) && void 0 !== _h ? _h : [], columnKeys = (null === (_j = null == columnDimensionTree ? void 0 : columnDimensionTree.dimensionKeys) || void 0 === _j ? void 0 : _j.count) ? columnDimensionTree.dimensionKeys.valueArr() : null !== (_l = null === (_k = options.columns) || void 0 === _k ? void 0 : _k.reduce(((keys, columnObj) => ("string" == typeof columnObj ? keys.push(columnObj) : keys.push(columnObj.dimensionKey), 
-    keys)), [])) && void 0 !== _l ? _l : [], indicatorKeys = null !== (_o = null === (_m = options.indicators) || void 0 === _m ? void 0 : _m.reduce(((keys, indicatorObj) => {
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p;
+    let columnDimensionTree, rowDimensionTree;
+    options.columnTree && (!1 !== table.options.indicatorsAsCol && !1 !== table.options.supplementIndicatorNodes && (table.internalProps.columnTree = supplementIndicatorNodesForCustomTree(table.internalProps.columnTree, options.indicators)), 
+    columnDimensionTree = new tree_helper_1.DimensionTree(null !== (_a = table.internalProps.columnTree) && void 0 !== _a ? _a : [], table.layoutNodeId)), 
+    options.rowTree && (!1 === table.options.indicatorsAsCol && !1 !== table.options.supplementIndicatorNodes && (table.internalProps.rowTree = supplementIndicatorNodesForCustomTree(table.internalProps.rowTree, options.indicators)), 
+    rowDimensionTree = new tree_helper_1.DimensionTree(null !== (_b = table.internalProps.rowTree) && void 0 !== _b ? _b : [], table.layoutNodeId, table.options.rowHierarchyType, "tree" === table.options.rowHierarchyType ? null !== (_c = table.options.rowExpandLevel) && void 0 !== _c ? _c : 1 : void 0));
+    const rowKeys = (null === (_d = null == rowDimensionTree ? void 0 : rowDimensionTree.dimensionKeys) || void 0 === _d ? void 0 : _d.count) ? rowDimensionTree.dimensionKeys.valueArr() : null !== (_f = null === (_e = options.rows) || void 0 === _e ? void 0 : _e.reduce(((keys, rowObj) => ("string" == typeof rowObj ? keys.push(rowObj) : keys.push(rowObj.dimensionKey), 
+    keys)), [])) && void 0 !== _f ? _f : [], columnKeys = (null === (_g = null == columnDimensionTree ? void 0 : columnDimensionTree.dimensionKeys) || void 0 === _g ? void 0 : _g.count) ? columnDimensionTree.dimensionKeys.valueArr() : 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) => {
         var _a, _b;
         return "string" == typeof indicatorObj ? keys.push(indicatorObj) : (keys.push(indicatorObj.indicatorKey), 
         indicatorObj.chartSpec && ((null === (_a = table.internalProps.dataConfig) || void 0 === _a ? void 0 : _a.aggregationRules) ? null === (_b = table.internalProps.dataConfig) || void 0 === _b || _b.aggregationRules.push({
@@ -72,8 +72,8 @@ function parseColKeyRowKeyForPivotTable(table, options) {
                 aggregationType: ts_types_1.AggregationType.NONE
             } ]
         })), keys;
-    }), [])) && void 0 !== _o ? _o : [];
-    return "tree" === options.rowHierarchyType && (null !== (_q = null === (_p = options.extensionRows) || void 0 === _p ? void 0 : _p.length) && void 0 !== _q ? _q : 0) >= 1 && (null === (_r = options.extensionRows) || void 0 === _r || _r.forEach((extensionRow => {
+    }), [])) && void 0 !== _l ? _l : [];
+    return "tree" === options.rowHierarchyType && (null !== (_o = null === (_m = options.extensionRows) || void 0 === _m ? void 0 : _m.length) && void 0 !== _o ? _o : 0) >= 1 && (null === (_p = options.extensionRows) || void 0 === _p || _p.forEach((extensionRow => {
         const extension_rowKeys = [];
         extensionRow.rows.forEach((row => {
             "string" == typeof row ? extension_rowKeys.push(row) : extension_rowKeys.push(row.dimensionKey);
@@ -82,14 +82,40 @@ function parseColKeyRowKeyForPivotTable(table, options) {
         rowKeys: rowKeys,
         columnKeys: columnKeys,
         indicatorKeys: indicatorKeys,
-        isNeedResetColumnDimensionTree: isNeedResetColumnDimensionTree,
-        isNeedResetRowDimensionTree: isNeedResetRowDimensionTree,
         columnDimensionTree: columnDimensionTree,
         rowDimensionTree: rowDimensionTree
     };
 }
 
+function supplementIndicatorNodesForCustomTree(customTree, indicators) {
+    const checkNode = (nodes, isHasIndicator) => {
+        nodes.forEach((node => {
+            var _a;
+            node.indicatorKey || isHasIndicator || (null === (_a = node.children) || void 0 === _a ? void 0 : _a.length) && node.children ? node.children && Array.isArray(node.children) && checkNode(node.children, isHasIndicator || !!node.indicatorKey) : node.children = null == indicators ? void 0 : indicators.map((indicator => {
+                var _a;
+                return "string" == typeof indicator ? {
+                    indicatorKey: indicator,
+                    value: indicator
+                } : {
+                    indicatorKey: indicator.indicatorKey,
+                    value: null !== (_a = indicator.title) && void 0 !== _a ? _a : indicator.indicatorKey
+                };
+            }));
+        }));
+    };
+    return (null == customTree ? void 0 : customTree.length) ? checkNode(customTree, !1) : customTree = null == indicators ? void 0 : indicators.map((indicator => {
+        var _a;
+        return "string" == typeof indicator ? {
+            indicatorKey: indicator,
+            value: indicator
+        } : {
+            indicatorKey: indicator.indicatorKey,
+            value: null !== (_a = indicator.title) && void 0 !== _a ? _a : indicator.indicatorKey
+        };
+    })), customTree;
+}
+
 exports.checkHasAggregation = checkHasAggregation, exports.checkHasAggregationOnTop = checkHasAggregationOnTop, 
 exports.checkHasAggregationOnBottom = checkHasAggregationOnBottom, exports.checkHasTreeDefine = checkHasTreeDefine, 
-exports.parseColKeyRowKeyForPivotTable = parseColKeyRowKeyForPivotTable;
+exports.parseColKeyRowKeyForPivotTable = parseColKeyRowKeyForPivotTable, exports.supplementIndicatorNodesForCustomTree = supplementIndicatorNodesForCustomTree;
 //# sourceMappingURL=layout-helper.js.map

package/cjs/layout/layout-helper.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/layout/layout-helper.ts"],"names":[],"mappings":"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","file":"layout-helper.js","sourcesContent":["import type { PivotTable } from '../PivotTable';\nimport { IndicatorDimensionKeyPlaceholder } from '../tools/global';\nimport { AggregationType } from '../ts-types';\nimport type { PivotTableConstructorOptions, Aggregation } from '../ts-types';\nimport type { ColumnData } from '../ts-types/list-table/layout-map/api';\nimport type { IChartColumnIndicator } from '../ts-types/pivot-table/indicator/chart-indicator';\nimport type { SimpleHeaderLayoutMap } from './simple-header-layout';\nimport type { ITreeLayoutHeadNode } from './tree-helper';\nimport { DimensionTree } from './tree-helper';\n\nexport function checkHasAggregation(layoutMap: SimpleHeaderLayoutMap) {\n  const columnObjects = layoutMap.columnObjects;\n  for (let i = 0; i < columnObjects.length; i++) {\n    const column = columnObjects[i];\n    if ((column as ColumnData)?.aggregation) {\n      return true;\n    }\n  }\n  return false;\n}\n\nexport function checkHasAggregationOnTop(layoutMap: SimpleHeaderLayoutMap) {\n  const columnObjects = layoutMap.columnObjects;\n  let count = 0;\n  for (let i = 0; i < columnObjects.length; i++) {\n    const column = columnObjects[i];\n    if ((column as ColumnData)?.aggregation) {\n      if (Array.isArray((column as ColumnData)?.aggregation)) {\n        count = Math.max(\n          count,\n          ((column as ColumnData).aggregation as Array<Aggregation>).filter(item => item.showOnTop === true).length\n        );\n      } else if (((column as ColumnData).aggregation as Aggregation).showOnTop === true) {\n        count = Math.max(count, 1);\n      }\n    }\n  }\n  return count;\n}\n\nexport function checkHasAggregationOnBottom(layoutMap: SimpleHeaderLayoutMap) {\n  const columnObjects = layoutMap.columnObjects;\n  let count = 0;\n  for (let i = 0; i < columnObjects.length; i++) {\n    const column = columnObjects[i];\n    if ((column as ColumnData)?.aggregation) {\n      if (Array.isArray((column as ColumnData)?.aggregation)) {\n        count = Math.max(\n          count,\n          ((column as ColumnData).aggregation as Array<Aggregation>).filter(item => item.showOnTop === false).length\n        );\n      } else if (((column as ColumnData).aggregation as Aggregation).showOnTop === false) {\n        count = Math.max(count, 1);\n      }\n    }\n  }\n  return count;\n}\n\nexport function checkHasTreeDefine(layoutMap: SimpleHeaderLayoutMap) {\n  const columnObjects = layoutMap.columnObjects;\n  for (let i = 0; i < columnObjects.length; i++) {\n    const column = columnObjects[i];\n    if ((column as ColumnData)?.define?.tree) {\n      return true;\n    }\n  }\n  return false;\n}\n\nexport function parseColKeyRowKeyForPivotTable(table: PivotTable, options: PivotTableConstructorOptions) {\n  let columnDimensionTree;\n  let rowDimensionTree;\n  let isNeedResetColumnDimensionTree = true;\n  let isNeedResetRowDimensionTree = true;\n  if (options.columnTree) {\n    columnDimensionTree = new DimensionTree(\n      (table.internalProps.columnTree as ITreeLayoutHeadNode[]) ?? [],\n      table.layoutNodeId\n    );\n    if (\n      table.options.indicatorsAsCol !== false &&\n      !columnDimensionTree.dimensionKeys.contain(IndicatorDimensionKeyPlaceholder) &&\n      options.indicators?.length >= 1\n    ) {\n      isNeedResetColumnDimensionTree = true;\n    } else {\n      isNeedResetColumnDimensionTree = false;\n    }\n  }\n  if (options.rowTree) {\n    rowDimensionTree = new DimensionTree(\n      (table.internalProps.rowTree as ITreeLayoutHeadNode[]) ?? [],\n      table.layoutNodeId,\n      table.options.rowHierarchyType,\n      table.options.rowHierarchyType === 'tree' ? table.options.rowExpandLevel ?? 1 : undefined\n    );\n    if (\n      table.options.indicatorsAsCol === false &&\n      !rowDimensionTree.dimensionKeys.contain(IndicatorDimensionKeyPlaceholder) &&\n      options.indicators?.length >= 1\n    ) {\n      isNeedResetRowDimensionTree = true;\n    } else {\n      isNeedResetRowDimensionTree = false;\n    }\n  }\n  const rowKeys = rowDimensionTree?.dimensionKeys?.count\n    ? rowDimensionTree.dimensionKeys.valueArr()\n    : options.rows?.reduce((keys: string[], rowObj) => {\n        if (typeof rowObj === 'string') {\n          keys.push(rowObj);\n        } else {\n          keys.push(rowObj.dimensionKey);\n        }\n        return keys;\n      }, []) ?? [];\n  const columnKeys = columnDimensionTree?.dimensionKeys?.count\n    ? columnDimensionTree.dimensionKeys.valueArr()\n    : options.columns?.reduce((keys: string[], columnObj) => {\n        if (typeof columnObj === 'string') {\n          keys.push(columnObj);\n        } else {\n          keys.push(columnObj.dimensionKey);\n        }\n        return keys;\n      }, []) ?? [];\n  const indicatorKeys =\n    options.indicators?.reduce((keys: string[], indicatorObj) => {\n      if (typeof indicatorObj === 'string') {\n        keys.push(indicatorObj);\n      } else {\n        keys.push(indicatorObj.indicatorKey);\n        if ((indicatorObj as IChartColumnIndicator).chartSpec) {\n          if (table.internalProps.dataConfig?.aggregationRules) {\n            table.internalProps.dataConfig?.aggregationRules.push({\n              field: indicatorObj.indicatorKey,\n              indicatorKey: indicatorObj.indicatorKey,\n              aggregationType: AggregationType.NONE\n            });\n          } else if (table.internalProps.dataConfig) {\n            table.internalProps.dataConfig.aggregationRules = [\n              {\n                field: indicatorObj.indicatorKey,\n                indicatorKey: indicatorObj.indicatorKey,\n                aggregationType: AggregationType.NONE\n              }\n            ];\n          } else {\n            table.internalProps.dataConfig = {\n              aggregationRules: [\n                {\n                  field: indicatorObj.indicatorKey,\n                  indicatorKey: indicatorObj.indicatorKey,\n                  aggregationType: AggregationType.NONE\n                }\n              ]\n            };\n          }\n        }\n      }\n      return keys;\n    }, []) ?? [];\n  if (options.rowHierarchyType === 'tree' && (options.extensionRows?.length ?? 0) >= 1) {\n    options.extensionRows?.forEach(extensionRow => {\n      const extension_rowKeys: string[] = [];\n      extensionRow.rows.forEach(row => {\n        if (typeof row === 'string') {\n          extension_rowKeys.push(row);\n        } else {\n          extension_rowKeys.push(row.dimensionKey);\n        }\n      });\n      rowKeys.push(...extension_rowKeys);\n    });\n  }\n  return {\n    rowKeys,\n    columnKeys,\n    indicatorKeys,\n    isNeedResetColumnDimensionTree,\n    isNeedResetRowDimensionTree,\n    columnDimensionTree,\n    rowDimensionTree\n  };\n}\n"]}
+{"version":3,"sources":["../src/layout/layout-helper.ts"],"names":[],"mappings":"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","file":"layout-helper.js","sourcesContent":["import type { PivotTable } from '../PivotTable';\nimport { IndicatorDimensionKeyPlaceholder } from '../tools/global';\nimport { AggregationType } from '../ts-types';\nimport type { PivotTableConstructorOptions, Aggregation, IHeaderTreeDefine, IIndicator } from '../ts-types';\nimport type { ColumnData } from '../ts-types/list-table/layout-map/api';\nimport type { IChartColumnIndicator } from '../ts-types/pivot-table/indicator/chart-indicator';\nimport type { SimpleHeaderLayoutMap } from './simple-header-layout';\nimport type { ITreeLayoutHeadNode } from './tree-helper';\nimport { DimensionTree } from './tree-helper';\n\nexport function checkHasAggregation(layoutMap: SimpleHeaderLayoutMap) {\n  const columnObjects = layoutMap.columnObjects;\n  for (let i = 0; i < columnObjects.length; i++) {\n    const column = columnObjects[i];\n    if ((column as ColumnData)?.aggregation) {\n      return true;\n    }\n  }\n  return false;\n}\n\nexport function checkHasAggregationOnTop(layoutMap: SimpleHeaderLayoutMap) {\n  const columnObjects = layoutMap.columnObjects;\n  let count = 0;\n  for (let i = 0; i < columnObjects.length; i++) {\n    const column = columnObjects[i];\n    if ((column as ColumnData)?.aggregation) {\n      if (Array.isArray((column as ColumnData)?.aggregation)) {\n        count = Math.max(\n          count,\n          ((column as ColumnData).aggregation as Array<Aggregation>).filter(item => item.showOnTop === true).length\n        );\n      } else if (((column as ColumnData).aggregation as Aggregation).showOnTop === true) {\n        count = Math.max(count, 1);\n      }\n    }\n  }\n  return count;\n}\n\nexport function checkHasAggregationOnBottom(layoutMap: SimpleHeaderLayoutMap) {\n  const columnObjects = layoutMap.columnObjects;\n  let count = 0;\n  for (let i = 0; i < columnObjects.length; i++) {\n    const column = columnObjects[i];\n    if ((column as ColumnData)?.aggregation) {\n      if (Array.isArray((column as ColumnData)?.aggregation)) {\n        count = Math.max(\n          count,\n          ((column as ColumnData).aggregation as Array<Aggregation>).filter(item => item.showOnTop === false).length\n        );\n      } else if (((column as ColumnData).aggregation as Aggregation).showOnTop === false) {\n        count = Math.max(count, 1);\n      }\n    }\n  }\n  return count;\n}\n\nexport function checkHasTreeDefine(layoutMap: SimpleHeaderLayoutMap) {\n  const columnObjects = layoutMap.columnObjects;\n  for (let i = 0; i < columnObjects.length; i++) {\n    const column = columnObjects[i];\n    if ((column as ColumnData)?.define?.tree) {\n      return true;\n    }\n  }\n  return false;\n}\n\nexport function parseColKeyRowKeyForPivotTable(table: PivotTable, options: PivotTableConstructorOptions) {\n  let columnDimensionTree;\n  let rowDimensionTree;\n  // let isNeedResetColumnDimensionTree = true;\n  // let isNeedResetRowDimensionTree = true;\n  if (options.columnTree) {\n    if (table.options.indicatorsAsCol !== false && table.options.supplementIndicatorNodes !== false) {\n      table.internalProps.columnTree = supplementIndicatorNodesForCustomTree(\n        table.internalProps.columnTree,\n        options.indicators\n      );\n    }\n    columnDimensionTree = new DimensionTree(\n      (table.internalProps.columnTree as ITreeLayoutHeadNode[]) ?? [],\n      table.layoutNodeId\n    );\n\n    // if (\n    //   table.options.supplementIndicatorNodes !== false &&\n    //   table.options.indicatorsAsCol !== false &&\n    //   !columnDimensionTree.dimensionKeys.contain(IndicatorDimensionKeyPlaceholder) &&\n    //   options.indicators?.length >= 1\n    // ) {\n    //   isNeedResetColumnDimensionTree = true;\n    // } else {\n    //   isNeedResetColumnDimensionTree = false;\n    // }\n    // } else {\n    //   if (options.indicatorsAsCol !== false) {\n    //     table.internalProps.columnTree = supplementIndicatorNodesForCustomTree([], options.indicators);\n    //   }\n  }\n  if (options.rowTree) {\n    if (table.options.indicatorsAsCol === false && table.options.supplementIndicatorNodes !== false) {\n      table.internalProps.rowTree = supplementIndicatorNodesForCustomTree(\n        table.internalProps.rowTree,\n        options.indicators\n      );\n    }\n    rowDimensionTree = new DimensionTree(\n      (table.internalProps.rowTree as ITreeLayoutHeadNode[]) ?? [],\n      table.layoutNodeId,\n      table.options.rowHierarchyType,\n      table.options.rowHierarchyType === 'tree' ? table.options.rowExpandLevel ?? 1 : undefined\n    );\n    // if (\n    //   table.options.supplementIndicatorNodes !== false &&\n    //   table.options.indicatorsAsCol === false &&\n    //   !rowDimensionTree.dimensionKeys.contain(IndicatorDimensionKeyPlaceholder) &&\n    //   options.indicators?.length >= 1\n    // ) {\n    //   isNeedResetRowDimensionTree = true;\n    // } else {\n    //   isNeedResetRowDimensionTree = false;\n    // }\n    // } else {\n    //   if (options.indicatorsAsCol === false) {\n    //     table.internalProps.rowTree = supplementIndicatorNodesForCustomTree([], options.indicators);\n    //   }\n  }\n  const rowKeys = rowDimensionTree?.dimensionKeys?.count\n    ? rowDimensionTree.dimensionKeys.valueArr()\n    : options.rows?.reduce((keys: string[], rowObj) => {\n        if (typeof rowObj === 'string') {\n          keys.push(rowObj);\n        } else {\n          keys.push(rowObj.dimensionKey);\n        }\n        return keys;\n      }, []) ?? [];\n  const columnKeys = columnDimensionTree?.dimensionKeys?.count\n    ? columnDimensionTree.dimensionKeys.valueArr()\n    : options.columns?.reduce((keys: string[], columnObj) => {\n        if (typeof columnObj === 'string') {\n          keys.push(columnObj);\n        } else {\n          keys.push(columnObj.dimensionKey);\n        }\n        return keys;\n      }, []) ?? [];\n  const indicatorKeys =\n    options.indicators?.reduce((keys: string[], indicatorObj) => {\n      if (typeof indicatorObj === 'string') {\n        keys.push(indicatorObj);\n      } else {\n        keys.push(indicatorObj.indicatorKey);\n        if ((indicatorObj as IChartColumnIndicator).chartSpec) {\n          if (table.internalProps.dataConfig?.aggregationRules) {\n            table.internalProps.dataConfig?.aggregationRules.push({\n              field: indicatorObj.indicatorKey,\n              indicatorKey: indicatorObj.indicatorKey,\n              aggregationType: AggregationType.NONE\n            });\n          } else if (table.internalProps.dataConfig) {\n            table.internalProps.dataConfig.aggregationRules = [\n              {\n                field: indicatorObj.indicatorKey,\n                indicatorKey: indicatorObj.indicatorKey,\n                aggregationType: AggregationType.NONE\n              }\n            ];\n          } else {\n            table.internalProps.dataConfig = {\n              aggregationRules: [\n                {\n                  field: indicatorObj.indicatorKey,\n                  indicatorKey: indicatorObj.indicatorKey,\n                  aggregationType: AggregationType.NONE\n                }\n              ]\n            };\n          }\n        }\n      }\n      return keys;\n    }, []) ?? [];\n  if (options.rowHierarchyType === 'tree' && (options.extensionRows?.length ?? 0) >= 1) {\n    options.extensionRows?.forEach(extensionRow => {\n      const extension_rowKeys: string[] = [];\n      extensionRow.rows.forEach(row => {\n        if (typeof row === 'string') {\n          extension_rowKeys.push(row);\n        } else {\n          extension_rowKeys.push(row.dimensionKey);\n        }\n      });\n      rowKeys.push(...extension_rowKeys);\n    });\n  }\n  return {\n    rowKeys,\n    columnKeys,\n    indicatorKeys,\n    // isNeedResetColumnDimensionTree,\n    // isNeedResetRowDimensionTree,\n    columnDimensionTree,\n    rowDimensionTree\n  };\n}\n\nexport function supplementIndicatorNodesForCustomTree(\n  customTree: IHeaderTreeDefine[],\n  indicators: (string | IIndicator)[]\n) {\n  const checkNode = (nodes: IHeaderTreeDefine[], isHasIndicator: boolean) => {\n    nodes.forEach((node: IHeaderTreeDefine) => {\n      if (\n        !node.indicatorKey &&\n        !isHasIndicator &&\n        (!(node.children as IHeaderTreeDefine[])?.length || !node.children)\n      ) {\n        node.children = indicators?.map((indicator: IIndicator | string): { indicatorKey: string; value: string } => {\n          if (typeof indicator === 'string') {\n            return { indicatorKey: indicator, value: indicator };\n          }\n          return { indicatorKey: indicator.indicatorKey, value: indicator.title ?? indicator.indicatorKey };\n        });\n      } else if (node.children && Array.isArray(node.children)) {\n        checkNode(node.children, isHasIndicator || !!node.indicatorKey);\n      }\n    });\n  };\n  if (customTree?.length) {\n    checkNode(customTree, false);\n  } else {\n    customTree = indicators?.map((indicator: IIndicator | string): { indicatorKey: string; value: string } => {\n      if (typeof indicator === 'string') {\n        return { indicatorKey: indicator, value: indicator };\n      }\n      return { indicatorKey: indicator.indicatorKey, value: indicator.title ?? indicator.indicatorKey };\n    });\n  }\n  return customTree;\n}\n"]}

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

@@ -18,6 +18,10 @@ export declare class PivotHeaderLayoutMap implements LayoutMapAPI {
     cornerHeaderObjs: HeaderData[];
     columnHeaderObjs: HeaderData[];
     rowHeaderObjs: HeaderData[];
+    private _cornerHeaderCellFullPathIds;
+    private _columnHeaderCellFullPathIds;
+    private _rowHeaderCellFullPathIds;
+    private _rowHeaderCellFullPathIds_FULL;
     private _cornerHeaderCellIds;
     private _columnHeaderCellIds;
     private _rowHeaderCellIds;
@@ -227,4 +231,5 @@ export declare class PivotHeaderLayoutMap implements LayoutMapAPI {
     getSeriesNumberHeader(col: number, row: number): SeriesNumberColumnData;
     getSeriesNumberBody(col: number, row: number): SeriesNumberColumnData;
     changeTreeNodeTitle(col: number, row: number, value: string): void;
+    generateCellIdsConsiderHideHeader(): void;
 }

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

@@ -13,15 +13,17 @@ class PivotHeaderLayoutMap {
     constructor(table, dataset, columnDimensionTree, rowDimensionTree) {
         var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p;
         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, 
-        this.hideIndicatorName = !1, this._showRowHeader = !0, this._showColumnHeader = !0, 
-        this._indicatorShowType = "column", this.rowHierarchyTextStartAlignment = !1, this.rowDimensionKeys = [], 
-        this.colDimensionKeys = [], this.indicatorKeys = [], this.indicatorDimensionKey = global_1.IndicatorDimensionKeyPlaceholder, 
-        this._rowHeaderExtensionTree = {}, this._extensionRowDimensionKeys = [], this.fullRowDimensionKeys = [], 
-        this.leftRowSeriesNumberColumnCount = 0, this.rightRowSeriesNumberColumnCount = 0, 
-        this.sharedVar = table.layoutNodeId, this._table = table, "tree" === table.options.rowHierarchyType && (this.extensionRows = table.options.extensionRows), 
+        this._cornerHeaderCellFullPathIds = [], this._columnHeaderCellFullPathIds = [], 
+        this._rowHeaderCellFullPathIds = [], this._rowHeaderCellFullPathIds_FULL = [], this._cornerHeaderCellIds = [], 
+        this._columnHeaderCellIds = [], this._rowHeaderCellIds = [], this._rowHeaderCellIds_FULL = [], 
+        this._columnWidths = [], this.columnPaths = [], this._headerObjects = [], this._headerObjectMap = {}, 
+        this._indicators = [], this.indicatorsAsCol = !0, this.hideIndicatorName = !1, this._showRowHeader = !0, 
+        this._showColumnHeader = !0, this._indicatorShowType = "column", this.rowHierarchyTextStartAlignment = !1, 
+        this.rowDimensionKeys = [], this.colDimensionKeys = [], this.indicatorKeys = [], 
+        this.indicatorDimensionKey = global_1.IndicatorDimensionKeyPlaceholder, this._rowHeaderExtensionTree = {}, 
+        this._extensionRowDimensionKeys = [], this.fullRowDimensionKeys = [], this.leftRowSeriesNumberColumnCount = 0, 
+        this.rightRowSeriesNumberColumnCount = 0, this.sharedVar = table.layoutNodeId, this._table = table, 
+        "tree" === table.options.rowHierarchyType && (this.extensionRows = table.options.extensionRows), 
         this.dataset = dataset, this._largeCellRangeCache = [], 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 : [], 
@@ -52,8 +54,8 @@ class PivotHeaderLayoutMap {
                 if (!axes.length || axes.every((axis => axis.orient !== (this.indicatorsAsCol ? "top" : "right") || !1 !== axis.visible))) return !0;
             }
             return !1;
-        }))), this.resetColumnHeaderLevelCount(), this._rowHeaderCellIds_FULL = (0, util_1.transpose)(this._rowHeaderCellIds_FULL), 
-        "tree" === table.options.rowHierarchyType && (null === (_o = this.extensionRows) || void 0 === _o ? void 0 : _o.length) >= 1 && (this.generateExtensionRowTree(), 
+        }))), this.resetColumnHeaderLevelCount(), this._rowHeaderCellFullPathIds_FULL = (0, 
+        util_1.transpose)(this._rowHeaderCellFullPathIds_FULL), "tree" === table.options.rowHierarchyType && (null === (_o = this.extensionRows) || void 0 === _o ? void 0 : _o.length) >= 1 && (this.generateExtensionRowTree(), 
         this.extensionRows.forEach((extensionRow => {
             const rowKeys = [];
             extensionRow.rows.forEach((row => {
@@ -76,8 +78,9 @@ class PivotHeaderLayoutMap {
         } else this.cornerHeaderObjs = this._addCornerHeaders(null, void 0);
         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 => {
+        this.generateCellIdsConsiderHideHeader(), this.setPagination(table.options.pagination), 
+        this._table.isPivotChart() && (this._chartItemSpanSize = 0, this._chartItemBandSize = 0, 
+        this._indicators.find((indicatorObject => {
             var _a, _b, _c, _d, _e, _f, _g, _h;
             (null === (_a = null == indicatorObject ? void 0 : indicatorObject.style) || void 0 === _a ? void 0 : _a.padding) && (this._chartPadding = indicatorObject.style.padding), 
             (null === (_b = indicatorObject.chartSpec) || void 0 === _b ? void 0 : _b.barWidth) && "number" == typeof indicatorObject.chartSpec.barWidth && (this._chartItemSpanSize = null === (_c = indicatorObject.chartSpec) || void 0 === _c ? void 0 : _c.barWidth);
@@ -121,11 +124,11 @@ class PivotHeaderLayoutMap {
     }
     _generateColHeaderIds() {
         var _a, _b, _c, _d, _e, _f;
-        if ((null === (_a = this.columnDimensionTree.tree.children) || void 0 === _a ? void 0 : _a.length) >= 1 && this._addHeaders(this._columnHeaderCellIds, 0, this.columnDimensionTree.tree.children, [], this.columnHeaderObjs), 
+        if ((null === (_a = this.columnDimensionTree.tree.children) || void 0 === _a ? void 0 : _a.length) >= 1 && this._addHeaders(this._columnHeaderCellFullPathIds, 0, this.columnDimensionTree.tree.children, [], this.columnHeaderObjs), 
         this.columnHeaderTitle) {
             this.sharedVar.seqId = Math.max(this.sharedVar.seqId, this._headerObjects.length);
             const id = ++this.sharedVar.seqId, firstRowIds = Array(this.colCount - this.rowHeaderLevelCount).fill(id);
-            this._columnHeaderCellIds.unshift(firstRowIds);
+            this._columnHeaderCellFullPathIds.unshift(firstRowIds);
             const cell = {
                 id: id,
                 title: "string" == typeof this.columnHeaderTitle.title ? this.columnHeaderTitle.title : this.columnsDefine.reduce(((title, value) => "string" == typeof value ? title : title + (title ? `/${value.title}` : `${value.title}`)), ""),
@@ -143,11 +146,11 @@ class PivotHeaderLayoutMap {
     }
     _generateRowHeaderIds() {
         var _a, _b, _c, _d, _e, _f, _g, _h;
-        if ((null === (_a = this.rowDimensionTree.tree.children) || void 0 === _a ? void 0 : _a.length) >= 1 && ("tree" === this.rowHierarchyType ? this._addHeadersForTreeMode(this._rowHeaderCellIds_FULL, 0, this.rowDimensionTree.tree.children, [], this.rowDimensionTree.totalLevel, !0, this.rowsDefine, this.rowHeaderObjs) : this._addHeaders(this._rowHeaderCellIds_FULL, 0, this.rowDimensionTree.tree.children, [], this.rowHeaderObjs)), 
+        if ((null === (_a = this.rowDimensionTree.tree.children) || void 0 === _a ? void 0 : _a.length) >= 1 && ("tree" === this.rowHierarchyType ? this._addHeadersForTreeMode(this._rowHeaderCellFullPathIds_FULL, 0, this.rowDimensionTree.tree.children, [], this.rowDimensionTree.totalLevel, !0, this.rowsDefine, this.rowHeaderObjs) : this._addHeaders(this._rowHeaderCellFullPathIds_FULL, 0, this.rowDimensionTree.tree.children, [], this.rowHeaderObjs)), 
         this.rowHeaderTitle) {
             this.sharedVar.seqId = Math.max(this.sharedVar.seqId, this._headerObjects.length);
-            const id = ++this.sharedVar.seqId, firstColIds = Array(null !== (_c = null === (_b = this._rowHeaderCellIds_FULL[0]) || void 0 === _b ? void 0 : _b.length) && void 0 !== _c ? _c : this.rowDimensionTree.tree.size).fill(id);
-            this._rowHeaderCellIds_FULL.unshift(firstColIds);
+            const id = ++this.sharedVar.seqId, firstColIds = Array(null !== (_c = null === (_b = this._rowHeaderCellFullPathIds_FULL[0]) || void 0 === _b ? void 0 : _b.length) && void 0 !== _c ? _c : this.rowDimensionTree.tree.size).fill(id);
+            this._rowHeaderCellFullPathIds_FULL.unshift(firstColIds);
             const cell = {
                 id: id,
                 title: "string" == typeof this.rowHeaderTitle.title ? this.rowHeaderTitle.title : this.rowsDefine.reduce(((title, value) => "string" == typeof value ? title : title + (title ? `/${value.title}` : `${value.title}`)), ""),
@@ -216,10 +219,10 @@ class PivotHeaderLayoutMap {
                 description: null == dimensionInfo ? void 0 : dimensionInfo.cornerDescription
             };
             if (results[id] = cell, this._headerObjects[id] = cell, "column" === this.cornerSetting.titleOnDimension) {
-                this._cornerHeaderCellIds[key] || (this._cornerHeaderCellIds[key] = []);
-                for (let r = 0; r < this.rowHeaderLevelCount; r++) this._cornerHeaderCellIds[key][r] = id;
-            } 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;
+                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,
@@ -236,15 +239,15 @@ class PivotHeaderLayoutMap {
                 }
             };
             results[id] = cell, this._headerObjects[id] = cell;
-            for (let r = 0; r < this.columnHeaderLevelCount; r++) for (let j = 0; j < this.rowHeaderLevelCount; j++) this._cornerHeaderCellIds[r] || (this._cornerHeaderCellIds[r] = []), 
-            this._cornerHeaderCellIds[r][j] = id;
+            for (let r = 0; r < this.columnHeaderLevelCount; r++) for (let j = 0; j < this.rowHeaderLevelCount; j++) this._cornerHeaderCellFullPathIds[r] || (this._cornerHeaderCellFullPathIds[r] = []), 
+            this._cornerHeaderCellFullPathIds[r][j] = id;
         }
         return results;
     }
     generateExtensionRowTree() {
         this.extensionRows.forEach(((extensionRow, indexP) => {
-            const old_rowHeaderCellIds = this._rowHeaderCellIds_FULL;
-            this._rowHeaderCellIds_FULL = [], old_rowHeaderCellIds.forEach(((row_ids, index) => {
+            const old_rowHeaderCellIds = this._rowHeaderCellFullPathIds_FULL;
+            this._rowHeaderCellFullPathIds_FULL = [], old_rowHeaderCellIds.forEach(((row_ids, index) => {
                 const key = row_ids[row_ids.length - 1];
                 let tree, rowExtensionDimensionTree;
                 if (this.colIndex = 0, "function" == typeof extensionRow.rowTree) {
@@ -259,7 +262,7 @@ class PivotHeaderLayoutMap {
                 this._rowHeaderExtensionTree[key] = rowExtensionDimensionTree);
                 const extensionRowTreeHeaderIds = [];
                 this._addHeadersForTreeMode(extensionRowTreeHeaderIds, 0, rowExtensionDimensionTree.tree.children, [], rowExtensionDimensionTree.totalLevel, !0, extensionRow.rows, this.rowHeaderObjs);
-                for (let i = 0; i < extensionRowTreeHeaderIds[0].length; i++) this._rowHeaderCellIds_FULL.push(row_ids.concat(extensionRowTreeHeaderIds[0][i]));
+                for (let i = 0; i < extensionRowTreeHeaderIds[0].length; i++) this._rowHeaderCellFullPathIds_FULL.push(row_ids.concat(extensionRowTreeHeaderIds[0][i]));
             }));
         }));
     }
@@ -476,7 +479,7 @@ class PivotHeaderLayoutMap {
             get_chart_spec_1.checkHasCartesianChart)(this.indicatorsDefine) && (count -= 1), 
             void (this.columnHeaderLevelCount = count);
         }
-        this.columnHeaderLevelCount = 0;
+        this.columnHeaderLevelCount = this.indicatorsAsCol ? this.hideIndicatorName ? 0 : 1 : 0;
     }
     resetRowHeaderLevelCount() {
         var _a, _b;
@@ -600,7 +603,7 @@ class PivotHeaderLayoutMap {
         const paths = this.getCellHeaderPaths(_col, _row);
         if (this.indicatorsAsCol) {
             const indicatorKey = null === (_b = null === (_a = paths.colHeaderPaths) || void 0 === _a ? void 0 : _a.find((colPath => colPath.indicatorKey))) || void 0 === _b ? void 0 : _b.indicatorKey;
-            return null !== (_e = null !== (_d = null === (_c = this._indicators) || void 0 === _c ? void 0 : _c.find((indicator => indicator.indicatorKey === indicatorKey))) && void 0 !== _d ? _d : this._indicators[0]) && void 0 !== _e ? _e : {
+            return (0, vutils_1.isValid)(indicatorKey) && null !== (_e = null !== (_d = null === (_c = this._indicators) || void 0 === _c ? void 0 : _c.find((indicator => indicator.indicatorKey === indicatorKey))) && void 0 !== _d ? _d : this._indicators[0]) && void 0 !== _e ? _e : {
                 id: "",
                 field: void 0,
                 indicatorKey: void 0,
@@ -609,7 +612,7 @@ class PivotHeaderLayoutMap {
             };
         }
         const indicatorKey = null === (_g = null === (_f = paths.rowHeaderPaths) || void 0 === _f ? void 0 : _f.find((rowPath => rowPath.indicatorKey))) || void 0 === _g ? void 0 : _g.indicatorKey;
-        return null !== (_k = null !== (_j = null === (_h = this._indicators) || void 0 === _h ? void 0 : _h.find((indicator => indicator.indicatorKey === indicatorKey))) && void 0 !== _j ? _j : this._indicators[0]) && void 0 !== _k ? _k : {
+        return (0, vutils_1.isValid)(indicatorKey) && null !== (_k = null !== (_j = null === (_h = this._indicators) || void 0 === _h ? void 0 : _h.find((indicator => indicator.indicatorKey === indicatorKey))) && void 0 !== _j ? _j : this._indicators[0]) && void 0 !== _k ? _k : {
             id: "",
             field: void 0,
             indicatorKey: void 0,
@@ -711,7 +714,7 @@ class PivotHeaderLayoutMap {
         let colPath = [], rowPath = [];
         if (row >= 0 && recordCol >= 0 && (colPath = this.columnDimensionTree.getTreePath(recordCol, this.showHeader && this.showColumnHeader ? row - (this.columnHeaderTitle ? 1 : 0) : this.columnDimensionTree.totalLevel)), 
         col >= 0 && recordRow >= 0) if ("tree" === this.rowHierarchyType) {
-            const row_pathIds = this._rowHeaderCellIds[recordRow];
+            const row_pathIds = this._rowHeaderCellFullPathIds[recordRow];
             let findTree = this.rowDimensionTree, level = 0;
             for (;findTree; ) {
                 const pathIds = [];
@@ -791,18 +794,18 @@ class PivotHeaderLayoutMap {
     }
     toggleHierarchyState(col, row) {
         var _a, _b, _c, _d, _e, _f;
-        const oldRowHeaderCellIds = this._rowHeaderCellIds_FULL.slice(0), oldRowHeaderCellPositons = oldRowHeaderCellIds.map(((id, row) => ({
+        const oldRowHeaderCellIds = this._rowHeaderCellFullPathIds_FULL.slice(0), oldRowHeaderCellPositons = oldRowHeaderCellIds.map(((id, row) => ({
             col: col,
             row: row + this.columnHeaderLevelCount
         }))), hd = this.getHeader(col, row);
         if (hd.define.hierarchyState = hd.define.hierarchyState === ts_types_1.HierarchyState.collapse ? ts_types_1.HierarchyState.expand : ts_types_1.HierarchyState.collapse, 
-        this.rowDimensionTree.reset(this.rowDimensionTree.tree.children, !0), this._rowHeaderCellIds_FULL = [], 
+        this.rowDimensionTree.reset(this.rowDimensionTree.tree.children, !0), this._rowHeaderCellFullPathIds_FULL = [], 
         this.rowDimensionKeys = this.rowDimensionTree.dimensionKeys.valueArr(), this.fullRowDimensionKeys = [], 
         this.fullRowDimensionKeys = this.fullRowDimensionKeys.concat(this.rowDimensionKeys), 
-        this._addHeadersForTreeMode(this._rowHeaderCellIds_FULL, 0, this.rowDimensionTree.tree.children, [], this.rowDimensionTree.totalLevel, !0, this.rowsDefine, this.rowHeaderObjs), 
+        this._addHeadersForTreeMode(this._rowHeaderCellFullPathIds_FULL, 0, this.rowDimensionTree.tree.children, [], this.rowDimensionTree.totalLevel, !0, this.rowsDefine, this.rowHeaderObjs), 
         this.rowHeaderTitle) {
             const id = ++this.sharedVar.seqId, firstColIds = Array(this.rowCount - this.columnHeaderLevelCount).fill(id);
-            this._rowHeaderCellIds_FULL.unshift(firstColIds);
+            this._rowHeaderCellFullPathIds_FULL.unshift(firstColIds);
             const cell = {
                 id: id,
                 title: "string" == typeof this.rowHeaderTitle.title ? this.rowHeaderTitle.title : this.rowsDefine.reduce(((title, value) => "string" == typeof value ? title : title + (title ? `/${value.title}` : `${value.title}`)), ""),
@@ -819,12 +822,13 @@ class PivotHeaderLayoutMap {
             };
             this.rowHeaderObjs.push(cell), this._headerObjects[id] = cell;
         }
-        this._rowHeaderCellIds_FULL = (0, util_1.transpose)(this._rowHeaderCellIds_FULL), 
+        this._rowHeaderCellFullPathIds_FULL = (0, util_1.transpose)(this._rowHeaderCellFullPathIds_FULL), 
         "tree" === this.rowHierarchyType && (null === (_f = this.extensionRows) || void 0 === _f ? void 0 : _f.length) >= 1 && this.generateExtensionRowTree(), 
         this.colIndex = 0, this._headerObjectMap = this._headerObjects.reduce(((o, e) => (o[e.id] = e, 
         o)), {}), this._CellHeaderPathMap = new Map, this._largeCellRangeCache.length = 0;
-        const diffCell = (0, diff_cell_1.diffCellAddress)(col, row, oldRowHeaderCellIds.map((oldCellId => oldCellId[col - this.leftRowSeriesNumberColumnCount])), this._rowHeaderCellIds_FULL.map((newCellId => newCellId[col - this.leftRowSeriesNumberColumnCount])), oldRowHeaderCellPositons, this);
-        return this._rowHeaderCellIds = this._rowHeaderCellIds_FULL.slice(), diffCell;
+        const diffCell = (0, diff_cell_1.diffCellAddress)(col, row, oldRowHeaderCellIds.map((oldCellId => oldCellId[col - this.leftRowSeriesNumberColumnCount])), this._rowHeaderCellFullPathIds_FULL.map((newCellId => newCellId[col - this.leftRowSeriesNumberColumnCount])), oldRowHeaderCellPositons, this);
+        return this.generateCellIdsConsiderHideHeader(), this.setPagination(this.pagination), 
+        diffCell;
     }
     isHeaderForColWidth(col, row) {
         return this.isHeader(col, row);
@@ -964,10 +968,10 @@ class PivotHeaderLayoutMap {
                 const targetCellRange = this.getCellRange(target.col, sourceCellRange.start.row);
                 if (targetIndex = target.col >= source.col ? targetCellRange.end.col - sourceSize + 1 : targetCellRange.start.col, 
                 targetIndex === sourceCellRange.start.col) return null;
-                for (let row = 0; row < this._columnHeaderCellIds.length; row++) {
-                    const sourceIds = this._columnHeaderCellIds[row].splice(sourceCellRange.start.col - this.rowHeaderLevelCount - this.leftRowSeriesNumberColumnCount, sourceSize);
+                for (let row = 0; row < this._columnHeaderCellFullPathIds.length; row++) {
+                    const sourceIds = this._columnHeaderCellFullPathIds[row].splice(sourceCellRange.start.col - this.rowHeaderLevelCount - this.leftRowSeriesNumberColumnCount, sourceSize);
                     sourceIds.unshift(targetIndex - this.rowHeaderLevelCount - this.leftRowSeriesNumberColumnCount, 0), 
-                    Array.prototype.splice.apply(this._columnHeaderCellIds[row], sourceIds);
+                    Array.prototype.splice.apply(this._columnHeaderCellFullPathIds[row], sourceIds);
                 }
                 const sourceColumns = this._columnWidths.splice(sourceCellRange.start.col - this.leftRowSeriesNumberColumnCount, sourceSize);
                 return sourceColumns.unshift(targetIndex - this.leftRowSeriesNumberColumnCount, 0), 
@@ -988,8 +992,12 @@ class PivotHeaderLayoutMap {
                 targetIndex === sourceCellRange.start.row - this.columnHeaderLevelCount) return null;
                 const sourceIds = this._rowHeaderCellIds.splice(sourceCellRange.start.row - this.columnHeaderLevelCount, sourceSize);
                 sourceIds.unshift(targetIndex - this.currentPageStartIndex, 0), Array.prototype.splice.apply(this._rowHeaderCellIds, sourceIds);
+                const sourceIds0 = this._rowHeaderCellFullPathIds.splice(sourceCellRange.start.row - this.columnHeaderLevelCount, sourceSize);
+                sourceIds0.unshift(targetIndex - this.currentPageStartIndex, 0), Array.prototype.splice.apply(this._rowHeaderCellFullPathIds, sourceIds0);
                 const sourceIds_FULL = this._rowHeaderCellIds_FULL.splice(sourceCellRange.start.row - this.columnHeaderLevelCount + this.currentPageStartIndex, sourceSize);
-                return sourceIds_FULL.unshift(targetIndex, 0), Array.prototype.splice.apply(this._rowHeaderCellIds_FULL, sourceIds_FULL), 
+                sourceIds_FULL.unshift(targetIndex, 0), Array.prototype.splice.apply(this._rowHeaderCellIds_FULL, sourceIds_FULL);
+                const sourceIds_FULL0 = this._rowHeaderCellFullPathIds_FULL.splice(sourceCellRange.start.row - this.columnHeaderLevelCount + this.currentPageStartIndex, sourceSize);
+                return sourceIds_FULL0.unshift(targetIndex, 0), Array.prototype.splice.apply(this._rowHeaderCellFullPathIds_FULL, sourceIds_FULL0), 
                 this.rowDimensionTree.movePosition(sourceRowHeaderPaths.length - 1, sourceCellRange.start.row - this.columnHeaderLevelCount, targetIndex + (target.row > source.row ? sourceRowHeaderNode.size - 1 : 0)), 
                 this.rowDimensionTree.reset(this.rowDimensionTree.tree.children, !0), this._CellHeaderPathMap = new Map, 
                 this._largeCellRangeCache.length = 0, {
@@ -1140,17 +1148,19 @@ class PivotHeaderLayoutMap {
         return (0, get_chart_spec_1.getChartDataId)(col, row, this);
     }
     setPagination(pagination) {
-        var _a, _b, _c, _d, _e;
+        var _a, _b, _c, _d, _e, _f, _g;
         if (this.clearCellRangeMap(), this.pagination = pagination, "grid" === this.rowHierarchyType && (0, 
         vutils_1.isValid)(null === (_a = this.pagination) || void 0 === _a ? void 0 : _a.perPageCount) && (0, 
         vutils_1.isValid)(null === (_b = this.pagination) || void 0 === _b ? void 0 : _b.currentPage)) {
             !1 === this.indicatorsAsCol && (this.pagination.perPageCount = Math.ceil(this.pagination.perPageCount / this.indicatorKeys.length) * this.indicatorKeys.length);
             const {perPageCount: perPageCount, currentPage: currentPage} = this.pagination;
             this.currentPageStartIndex = perPageCount * (currentPage || 0), this.currentPageEndIndex = this.currentPageStartIndex + perPageCount, 
-            this._rowHeaderCellIds = null === (_c = this._rowHeaderCellIds_FULL) || void 0 === _c ? void 0 : _c.slice(this.currentPageStartIndex, this.currentPageEndIndex);
+            this._rowHeaderCellIds = null === (_c = this._rowHeaderCellIds_FULL) || void 0 === _c ? void 0 : _c.slice(this.currentPageStartIndex, this.currentPageEndIndex), 
+            this._rowHeaderCellFullPathIds = null === (_d = this._rowHeaderCellFullPathIds_FULL) || void 0 === _d ? void 0 : _d.slice(this.currentPageStartIndex, this.currentPageEndIndex);
         } else this.currentPageStartIndex = 0, this.currentPageEndIndex = this._rowHeaderCellIds_FULL.length, 
-        this._rowHeaderCellIds = null === (_d = this._rowHeaderCellIds_FULL) || void 0 === _d ? void 0 : _d.slice(this.currentPageStartIndex, this.currentPageEndIndex);
-        this.pagination && (this.pagination.totalCount = null === (_e = this._rowHeaderCellIds_FULL) || void 0 === _e ? void 0 : _e.length);
+        this._rowHeaderCellIds = null === (_e = this._rowHeaderCellIds_FULL) || void 0 === _e ? void 0 : _e.slice(this.currentPageStartIndex, this.currentPageEndIndex), 
+        this._rowHeaderCellFullPathIds = null === (_f = this._rowHeaderCellFullPathIds_FULL) || void 0 === _f ? void 0 : _f.slice(this.currentPageStartIndex, this.currentPageEndIndex);
+        this.pagination && (this.pagination.totalCount = null === (_g = this._rowHeaderCellIds_FULL) || void 0 === _g ? void 0 : _g.length);
     }
     release() {
         var _a;
@@ -1365,14 +1375,14 @@ class PivotHeaderLayoutMap {
     }
     resetHeaderTree() {
         var _a, _b;
-        this._rowHeaderCellIds_FULL = [], this._columnHeaderCellIds = [];
+        this._rowHeaderCellFullPathIds_FULL = [], this._columnHeaderCellIds = [];
         const dataset = this.dataset;
         this.rowTree = dataset.rowHeaderTree, this.columnTree = dataset.colHeaderTree, this.columnDimensionTree = new tree_helper_1.DimensionTree(null !== (_a = this.columnTree) && void 0 !== _a ? _a : [], this.sharedVar), 
         this.rowDimensionTree = new tree_helper_1.DimensionTree(null !== (_b = this.rowTree) && void 0 !== _b ? _b : [], this.sharedVar, this.rowHierarchyType, "tree" === this.rowHierarchyType ? this.rowExpandLevel : void 0), 
         this._generateColHeaderIds(), this.colIndex = 0, this._generateRowHeaderIds(), this.resetColumnHeaderLevelCount(), 
-        this._rowHeaderCellIds_FULL = (0, util_1.transpose)(this._rowHeaderCellIds_FULL), 
+        this._rowHeaderCellFullPathIds_FULL = (0, util_1.transpose)(this._rowHeaderCellFullPathIds_FULL), 
         this._headerObjectMap = this._headerObjects.reduce(((o, e) => (o[e.id] = e, o)), {}), 
-        this.setPagination(this.pagination);
+        this.generateCellIdsConsiderHideHeader(), this.setPagination(this.pagination);
     }
     isSeriesNumberInHeader(col, row) {
         return this.leftRowSeriesNumberColumnCount > 0 && col >= 0 && row >= 0 && col < this.leftRowSeriesNumberColumnCount && row < this.headerLevelCount || this.rightRowSeriesNumberColumnCount > 0 && row >= 0 && col >= this.colCount - this.rightRowSeriesNumberColumnCount && row < this.headerLevelCount;
@@ -1396,6 +1406,38 @@ class PivotHeaderLayoutMap {
         const id = this.getCellId(col, row);
         this._headerObjectMap[id].title = value;
     }
+    generateCellIdsConsiderHideHeader() {
+        if (this._columnHeaderCellIds = this._columnHeaderCellFullPathIds.slice(), !this.showColumnHeader) if (this.indicatorsAsCol && !this.hideIndicatorName) {
+            const indicatorIndex = this.colDimensionKeys.indexOf(global_1.IndicatorDimensionKeyPlaceholder), indicatorIds = this._columnHeaderCellIds.splice(indicatorIndex, 1);
+            this._columnHeaderCellIds.splice(0, this._columnHeaderCellIds.length), this._columnHeaderCellIds.push(indicatorIds[0]);
+        } else this._columnHeaderCellIds.splice(0, this._columnHeaderCellIds.length);
+        if (this._rowHeaderCellIds_FULL = this._rowHeaderCellFullPathIds_FULL.slice(), !this.showRowHeader) if (this.indicatorsAsCol || this.hideIndicatorName) this._rowHeaderCellIds_FULL.forEach(((cellIds, index) => {
+            const _cellIds = cellIds.slice();
+            _cellIds.splice(0, _cellIds.length), this._rowHeaderCellIds_FULL[index] = _cellIds;
+        })); else {
+            const indicatorIndex = this.rowDimensionKeys.indexOf(global_1.IndicatorDimensionKeyPlaceholder);
+            this._rowHeaderCellIds_FULL.forEach(((cellIds, index) => {
+                const _cellIds = cellIds.slice(), indicator = _cellIds.splice(indicatorIndex, 1);
+                _cellIds.splice(0, _cellIds.length), _cellIds.push(indicator[0]), this._rowHeaderCellIds_FULL[index] = _cellIds;
+            }));
+        }
+        if (this._rowHeaderCellIds = this._rowHeaderCellIds_FULL.slice(), this._cornerHeaderCellIds = this._cornerHeaderCellFullPathIds.slice(), 
+        0 === this.rowHeaderLevelCount || 0 === this.columnHeaderLevelCount) this._cornerHeaderCellIds = []; else if ("row" !== this.cornerSetting.titleOnDimension || this.showRowHeader) {
+            if ("column" === this.cornerSetting.titleOnDimension && !this.showColumnHeader) if (this.indicatorsAsCol && !this.hideIndicatorName) {
+                const indicatorIndex = this.colDimensionKeys.indexOf(global_1.IndicatorDimensionKeyPlaceholder), indicatorIds = this._cornerHeaderCellIds.splice(indicatorIndex, 1);
+                this._cornerHeaderCellIds.splice(0, this._cornerHeaderCellIds.length), this._cornerHeaderCellIds.push(indicatorIds[0]);
+            } else this._cornerHeaderCellIds.splice(0, this._cornerHeaderCellIds.length);
+        } else if (this.indicatorsAsCol || this.hideIndicatorName) this._cornerHeaderCellIds.forEach(((cellIds, index) => {
+            const _cellIds = cellIds.slice();
+            _cellIds.splice(0, _cellIds.length), this._cornerHeaderCellIds[index] = _cellIds;
+        })); else {
+            const indicatorIndex = this.rowDimensionKeys.indexOf(global_1.IndicatorDimensionKeyPlaceholder);
+            this._cornerHeaderCellIds.forEach(((cellIds, index) => {
+                const _cellIds = cellIds.slice(), indicator = _cellIds.splice(indicatorIndex, 1);
+                _cellIds.splice(0, _cellIds.length), _cellIds.push(indicator[0]), this._cornerHeaderCellIds[index] = _cellIds;
+            }));
+        }
+    }
 }
 
 function scaleWholeRangeSize(count, bandwidth, paddingInner, paddingOuter) {