@visactor/vtable 0.9.2-alpha.3 → 0.9.3-alpha.0

package/es/event/pivot-chart/axis-hover.js

@@ -0,0 +1,33 @@
+import { TABLE_EVENT_TYPE } from "../../core/TABLE_EVENT_TYPE";
+
+export function bindAxisHoverEvent(table) {
+    table.isPivotChart() && (table.listen(TABLE_EVENT_TYPE.MOUSEENTER_CELL, (e => {
+        table.scenegraph.getCell(e.col, e.row).forEachChildren((child => {
+            if ("axis" === child.name) {
+                const position = getAxisPosition(e.col, e.row, table.internalProps.layoutMap);
+                e.axisPosition = position, table.fireListeners(TABLE_EVENT_TYPE.MOUSEENTER_AXIS, e);
+            }
+        }));
+    })), table.listen(TABLE_EVENT_TYPE.MOUSELEAVE_CELL, (e => {
+        table.scenegraph.getCell(e.col, e.row).forEachChildren((child => {
+            if ("axis" === child.name) {
+                const position = getAxisPosition(e.col, e.row, table.internalProps.layoutMap);
+                e.axisPosition = position, table.fireListeners(TABLE_EVENT_TYPE.MOUSELEAVE_AXIS, e);
+            }
+        }));
+    })));
+}
+
+function getAxisPosition(col, row, layout) {
+    if (layout.indicatorsAsCol) {
+        if (layout.hasTwoIndicatorAxes && row === layout.columnHeaderLevelCount - 1 && col >= layout.rowHeaderLevelCount && col < layout.colCount - layout.rightFrozenColCount) return "top";
+        if (row === layout.rowCount - layout.bottomFrozenRowCount && col >= layout.rowHeaderLevelCount && col < layout.colCount - layout.rightFrozenColCount) return "bottom";
+        if (col === layout.rowHeaderLevelCount - 1 && row >= layout.rowHeaderLevelCount && row < layout.rowCount - layout.bottomFrozenRowCount) return "left";
+    } else {
+        if (col === layout.rowHeaderLevelCount - 1 && row >= layout.columnHeaderLevelCount && row < layout.rowCount - layout.bottomFrozenRowCount) return "left";
+        if (col === layout.colCount - layout.rightFrozenColCount && row >= layout.columnHeaderLevelCount && row < layout.rowCount - layout.bottomFrozenRowCount) return "right";
+        if (row === layout.rowCount - layout.bottomFrozenRowCount && col >= layout.rowHeaderLevelCount && col < layout.colCount - layout.rightFrozenColCount) return "bottom";
+    }
+    return "bottom";
+}
+//# sourceMappingURL=axis-hover.js.map

package/es/event/pivot-chart/axis-hover.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["event/pivot-chart/axis-hover.ts"],"names":[],"mappings":"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","file":"axis-hover.js","sourcesContent":["import { TABLE_EVENT_TYPE } from '../../core/TABLE_EVENT_TYPE';\nimport type { PivotLayoutMap } from '../../layout/pivot-layout';\nimport type { BaseTableAPI } from '../../ts-types/base-table';\n\nexport function bindAxisHoverEvent(table: BaseTableAPI) {\n  if (!table.isPivotChart()) {\n    return;\n  }\n\n  table.listen(TABLE_EVENT_TYPE.MOUSEENTER_CELL, e => {\n    const cellGroup = table.scenegraph.getCell(e.col, e.row);\n    cellGroup.forEachChildren(child => {\n      if (child.name === 'axis') {\n        const position = getAxisPosition(e.col, e.row, table.internalProps.layoutMap as PivotLayoutMap);\n        (e as any).axisPosition = position;\n        table.fireListeners(TABLE_EVENT_TYPE.MOUSEENTER_AXIS, e as any);\n      }\n    });\n  });\n\n  table.listen(TABLE_EVENT_TYPE.MOUSELEAVE_CELL, e => {\n    const cellGroup = table.scenegraph.getCell(e.col, e.row);\n    cellGroup.forEachChildren(child => {\n      if (child.name === 'axis') {\n        const position = getAxisPosition(e.col, e.row, table.internalProps.layoutMap as PivotLayoutMap);\n        (e as any).axisPosition = position;\n        table.fireListeners(TABLE_EVENT_TYPE.MOUSELEAVE_AXIS, e as any);\n      }\n    });\n  });\n}\n\nfunction getAxisPosition(col: number, row: number, layout: PivotLayoutMap) {\n  if (layout.indicatorsAsCol) {\n    if (\n      layout.hasTwoIndicatorAxes &&\n      row === layout.columnHeaderLevelCount - 1 &&\n      col >= layout.rowHeaderLevelCount &&\n      col < layout.colCount - layout.rightFrozenColCount\n    ) {\n      return 'top';\n    } else if (\n      row === layout.rowCount - layout.bottomFrozenRowCount &&\n      col >= layout.rowHeaderLevelCount &&\n      col < layout.colCount - layout.rightFrozenColCount\n    ) {\n      return 'bottom';\n    } else if (\n      col === layout.rowHeaderLevelCount - 1 &&\n      row >= layout.rowHeaderLevelCount &&\n      row < layout.rowCount - layout.bottomFrozenRowCount\n    ) {\n      return 'left';\n    }\n  } else {\n    if (\n      col === layout.rowHeaderLevelCount - 1 &&\n      row >= layout.columnHeaderLevelCount &&\n      row < layout.rowCount - layout.bottomFrozenRowCount\n    ) {\n      return 'left';\n    } else if (\n      col === layout.colCount - layout.rightFrozenColCount &&\n      row >= layout.columnHeaderLevelCount &&\n      row < layout.rowCount - layout.bottomFrozenRowCount\n    ) {\n      return 'right';\n    } else if (\n      row === layout.rowCount - layout.bottomFrozenRowCount &&\n      col >= layout.rowHeaderLevelCount &&\n      col < layout.colCount - layout.rightFrozenColCount\n    ) {\n      return 'bottom';\n    }\n  }\n  return 'bottom';\n}\n"]}

package/es/event/scroll.js

@@ -11,16 +11,17 @@ export function handleWhell(event, state) {
 }
 
 function optimizeScrollXY(x, y, ratio) {
+    var _a, _b;
     const angle = Math.abs(x / y), deltaX = angle <= .5 ? 0 : x, deltaY = angle > 2 ? 0 : y;
-    return [ Math.ceil(deltaX * ratio.horizontal), Math.ceil(deltaY * ratio.vertical) ];
+    return [ Math.ceil(deltaX * (null !== (_a = ratio.horizontal) && void 0 !== _a ? _a : 0)), Math.ceil(deltaY * (null !== (_b = ratio.vertical) && void 0 !== _b ? _b : 0)) ];
 }
 
 export function isVerticalScrollable(deltaY, state) {
-    return !isScrollToTop(deltaY, state) && !isScrollToBottom(deltaY, state);
+    return 0 != state.table.getAllRowsHeight() - state.table.scenegraph.height && (!isScrollToTop(deltaY, state) && !isScrollToBottom(deltaY, state));
 }
 
 export function isHorizontalScrollable(deltaX, state) {
-    return !isScrollToLeft(deltaX, state) && !isScrollToRight(deltaX, state);
+    return 0 != state.table.getAllColsWidth() - state.table.scenegraph.width && (!isScrollToLeft(deltaX, state) && !isScrollToRight(deltaX, state));
 }
 
 function isScrollToTop(deltaY, state) {

package/es/event/scroll.js.map

@@ -1 +1 @@
-{"version":3,"sources":["event/scroll.ts"],"names":[],"mappings":"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","file":"scroll.js","sourcesContent":["import type { StateManeger } from '../state/state';\n\nexport function handleWhell(event: WheelEvent, state: StateManeger) {\n  let { deltaX, deltaY } = event;\n  // 如果按住了shift 则进行横向滚动 纵向不滚动\n  if (event.shiftKey && event.deltaY) {\n    //mac电脑按住shift 鼠标滚动deltaX和deltaY是自动互换的，所以此逻辑只针对windows电脑有效及mac触摸板有效\n    deltaX = deltaY;\n    deltaY = 0;\n  }\n  const [optimizedDeltaX, optimizedDeltaY] = optimizeScrollXY(deltaX, deltaY, { horizontal: 1, vertical: 1 });\n\n  if (optimizedDeltaX) {\n    state.setScrollLeft(state.scroll.horizontalBarPos + optimizedDeltaX);\n    state.showHorizontalScrollBar(true);\n  }\n  if (optimizedDeltaY) {\n    state.setScrollTop(state.scroll.verticalBarPos + optimizedDeltaY);\n    state.showVerticalScrollBar(true);\n  }\n\n  if (\n    event.cancelable &&\n    ((deltaY !== 0 && isVerticalScrollable(deltaY, state)) || (deltaX !== 0 && isHorizontalScrollable(deltaX, state)))\n  ) {\n    event.preventDefault();\n  }\n}\n\ninterface ScrollSpeedRatio {\n  horizontal?: number;\n  vertical?: number;\n}\n\n/**\n * 优化滚动方向，对于小角度的滚动，固定为一个方向\n * @param x\n * @param y\n * @param ratio\n */\nfunction optimizeScrollXY(x: number, y: number, ratio: ScrollSpeedRatio): [number, number] {\n  const ANGLE = 2; // 调参 根据斜率来调整xy方向的划分\n  const angle = Math.abs(x / y);\n\n  // 经过滚动优化之后的 x, y\n  const deltaX = angle <= 1 / ANGLE ? 0 : x;\n  const deltaY = angle > ANGLE ? 0 : y;\n\n  return [Math.ceil(deltaX * ratio.horizontal), Math.ceil(deltaY * ratio.vertical)];\n}\n\nexport function isVerticalScrollable(deltaY: number, state: StateManeger) {\n  return !isScrollToTop(deltaY, state) && !isScrollToBottom(deltaY, state);\n}\n\nexport function isHorizontalScrollable(deltaX: number, state: StateManeger) {\n  return !isScrollToLeft(deltaX, state) && !isScrollToRight(deltaX, state);\n}\n\nfunction isScrollToTop(deltaY: number, state: StateManeger) {\n  const totalHeight = state.table.getAllRowsHeight() - state.table.scenegraph.height;\n  return totalHeight !== 0 && deltaY <= 0 && state.scroll.verticalBarPos < 1;\n}\n\nfunction isScrollToBottom(deltaY: number, state: StateManeger) {\n  const totalHeight = state.table.getAllRowsHeight() - state.table.scenegraph.height;\n  return totalHeight !== 0 && deltaY >= 0 && Math.abs(state.scroll.verticalBarPos - totalHeight) < 1;\n}\n\nfunction isScrollToLeft(deltaX: number, state: StateManeger) {\n  const totalWidth = state.table.getAllColsWidth() - state.table.scenegraph.width;\n  return totalWidth !== 0 && deltaX <= 0 && state.scroll.horizontalBarPos < 1;\n}\n\nfunction isScrollToRight(deltaX: number, state: StateManeger) {\n  const totalWidth = state.table.getAllColsWidth() - state.table.scenegraph.width;\n  return totalWidth !== 0 && deltaX >= 0 && Math.abs(state.scroll.horizontalBarPos - totalWidth) < 1;\n}\n"]}
+{"version":3,"sources":["event/scroll.ts"],"names":[],"mappings":"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","file":"scroll.js","sourcesContent":["import type { StateManeger } from '../state/state';\n\nexport function handleWhell(event: WheelEvent, state: StateManeger) {\n  let { deltaX, deltaY } = event;\n  // 如果按住了shift 则进行横向滚动 纵向不滚动\n  if (event.shiftKey && event.deltaY) {\n    //mac电脑按住shift 鼠标滚动deltaX和deltaY是自动互换的，所以此逻辑只针对windows电脑有效及mac触摸板有效\n    deltaX = deltaY;\n    deltaY = 0;\n  }\n  const [optimizedDeltaX, optimizedDeltaY] = optimizeScrollXY(deltaX, deltaY, { horizontal: 1, vertical: 1 });\n\n  if (optimizedDeltaX) {\n    state.setScrollLeft(state.scroll.horizontalBarPos + optimizedDeltaX);\n    state.showHorizontalScrollBar(true);\n  }\n  if (optimizedDeltaY) {\n    state.setScrollTop(state.scroll.verticalBarPos + optimizedDeltaY);\n    state.showVerticalScrollBar(true);\n  }\n\n  if (\n    event.cancelable &&\n    ((deltaY !== 0 && isVerticalScrollable(deltaY, state)) || (deltaX !== 0 && isHorizontalScrollable(deltaX, state)))\n  ) {\n    event.preventDefault();\n  }\n}\n\ninterface ScrollSpeedRatio {\n  horizontal?: number;\n  vertical?: number;\n}\n\n/**\n * 优化滚动方向，对于小角度的滚动，固定为一个方向\n * @param x\n * @param y\n * @param ratio\n */\nfunction optimizeScrollXY(x: number, y: number, ratio: ScrollSpeedRatio): [number, number] {\n  const ANGLE = 2; // 调参 根据斜率来调整xy方向的划分\n  const angle = Math.abs(x / y);\n\n  // 经过滚动优化之后的 x, y\n  const deltaX = angle <= 1 / ANGLE ? 0 : x;\n  const deltaY = angle > ANGLE ? 0 : y;\n\n  return [Math.ceil(deltaX * (ratio.horizontal ?? 0)), Math.ceil(deltaY * (ratio.vertical ?? 0))];\n}\n\nexport function isVerticalScrollable(deltaY: number, state: StateManeger) {\n  const totalHeight = state.table.getAllRowsHeight() - state.table.scenegraph.height;\n  if (totalHeight === 0) {\n    return false;\n  }\n  return !isScrollToTop(deltaY, state) && !isScrollToBottom(deltaY, state);\n}\n\nexport function isHorizontalScrollable(deltaX: number, state: StateManeger) {\n  const totalWidth = state.table.getAllColsWidth() - state.table.scenegraph.width;\n  if (totalWidth === 0) {\n    return false;\n  }\n  return !isScrollToLeft(deltaX, state) && !isScrollToRight(deltaX, state);\n}\n\nfunction isScrollToTop(deltaY: number, state: StateManeger) {\n  const totalHeight = state.table.getAllRowsHeight() - state.table.scenegraph.height;\n  return totalHeight !== 0 && deltaY <= 0 && state.scroll.verticalBarPos < 1;\n}\n\nfunction isScrollToBottom(deltaY: number, state: StateManeger) {\n  const totalHeight = state.table.getAllRowsHeight() - state.table.scenegraph.height;\n  return totalHeight !== 0 && deltaY >= 0 && Math.abs(state.scroll.verticalBarPos - totalHeight) < 1;\n}\n\nfunction isScrollToLeft(deltaX: number, state: StateManeger) {\n  const totalWidth = state.table.getAllColsWidth() - state.table.scenegraph.width;\n  return totalWidth !== 0 && deltaX <= 0 && state.scroll.horizontalBarPos < 1;\n}\n\nfunction isScrollToRight(deltaX: number, state: StateManeger) {\n  const totalWidth = state.table.getAllColsWidth() - state.table.scenegraph.width;\n  return totalWidth !== 0 && deltaX >= 0 && Math.abs(state.scroll.horizontalBarPos - totalWidth) < 1;\n}\n"]}

package/es/event/sparkline-event.js

@@ -14,5 +14,4 @@ export function bindSparklineHoverEvent(table) {
     })), table.listen(TABLE_EVENT_TYPE.MOUSELEAVE_TABLE, (e => {
         table.stateManeger.updateSparklineHoverPose(-1, -1, 0, 0);
     })));
-}
-//# sourceMappingURL=sparkline-event.js.map
+}

package/es/event/util.js

@@ -20,4 +20,5 @@ function getTargetCell(target) {
         target = target.parent;
     }
     return null;
-}
+}
+//# sourceMappingURL=util.js.map

package/es/index.d.ts

@@ -10,7 +10,7 @@ import { PivotTable } from './PivotTable';
 import { PivotChart } from './PivotChart';
 import type { MousePointerCellEvent } from './ts-types/events';
 import * as CustomLayout from './render/layout';
-export declare const version = "0.9.2-alpha.3";
+export declare const version = "0.9.3-alpha.0";
 export { TYPES, core, ListTable, ListTableConstructorOptions, PivotTable, PivotTableConstructorOptions, PivotChartConstructorOptions, PivotChart, IHeaderTreeDefine, IDimension, ColumnsDefine, ColumnDefine, LinkColumnDefine, ChartColumnDefine, ImageColumnDefine, SparklineColumnDefine, ProgressbarColumnDefine, TextColumnDefine, GroupColumnDefine, themes, data, MousePointerCellEvent, getIcons, clearGlobal, register, DataStatistics, CustomLayout };
 declare function getIcons(): {
     [key: string]: TYPES.ColumnIconOption;

package/es/index.js

@@ -20,7 +20,7 @@ import { PivotChart } from "./PivotChart";
 
 import * as CustomLayout from "./render/layout";
 
-export const version = "0.9.2-alpha.3";
+export const version = "0.9.3-alpha.0";
 
 export { TYPES, core, ListTable, PivotTable, PivotChart, themes, data, getIcons, clearGlobal, register, DataStatistics, CustomLayout };
 

package/es/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["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;AAiB3D,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;AAChD,MAAM,CAAC,MAAM,OAAO,GAAG,eAAe,CAAC;AAIvC,OAAO,EAKL,KAAK,EACL,IAAI,EACJ,SAAS,EAET,UAAU,EAGV,UAAU,EAYV,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} 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';\nexport const version = \"0.9.2-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  ColumnsDefine,\n  ColumnDefine,\n  LinkColumnDefine,\n  ChartColumnDefine,\n  ImageColumnDefine,\n  SparklineColumnDefine,\n  ProgressbarColumnDefine,\n  TextColumnDefine,\n  GroupColumnDefine,\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":["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;AAiB3D,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;AAChD,MAAM,CAAC,MAAM,OAAO,GAAG,eAAe,CAAC;AAIvC,OAAO,EAKL,KAAK,EACL,IAAI,EACJ,SAAS,EAET,UAAU,EAGV,UAAU,EAYV,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} 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';\nexport const version = \"0.9.3-alpha.0\";\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  ColumnsDefine,\n  ColumnDefine,\n  LinkColumnDefine,\n  ChartColumnDefine,\n  ImageColumnDefine,\n  SparklineColumnDefine,\n  ProgressbarColumnDefine,\n  TextColumnDefine,\n  GroupColumnDefine,\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-chart → chart-helper}/get-axis-config.js

@@ -5,7 +5,7 @@ export function getAxisConfigInPivotChart(col, row, layout) {
         if (layout.hasTwoIndicatorAxes && row === layout.columnHeaderLevelCount - 1 && col >= layout.rowHeaderLevelCount && col < layout.colCount - layout.rightFrozenColCount) {
             const defaultKey = layout.getIndicatorKeyInChartSpec(col, layout.columnHeaderLevelCount - 1)[1];
             if (!defaultKey) return;
-            const data = layout.dataset.collectedValues[defaultKey + "_align"] ? layout.dataset.collectedValues[defaultKey + "_align"] : layout.dataset.collectedValues[defaultKey], index = layout.getRecordIndexByCol(col), range = data[layout.getColKeysPath()[index][layout.columnHeaderLevelCount - 1 - layout.topAxesCount]], axisOption = layout._table.pivotChartAxes.find((axisOption => "top" === axisOption.orient));
+            const data = layout.dataset.collectedValues[defaultKey + "_align"] ? layout.dataset.collectedValues[defaultKey + "_align"] : layout.dataset.collectedValues[defaultKey], index = layout.getRecordIndexByCol(col), range = data[layout.getColKeysPath()[index][Math.max(0, layout.columnHeaderLevelCount - 1 - layout.topAxesCount)]], axisOption = layout._table.pivotChartAxes.find((axisOption => "top" === axisOption.orient));
             if (!1 === (null == axisOption ? void 0 : axisOption.visible)) return;
             return merge({}, axisOption, {
                 orient: "top",
@@ -20,7 +20,7 @@ export function getAxisConfigInPivotChart(col, row, layout) {
             });
         }
         if (row === layout.rowCount - layout.bottomFrozenRowCount && col >= layout.rowHeaderLevelCount && col < layout.colCount - layout.rightFrozenColCount) {
-            const indicatorKeys = layout.getIndicatorKeyInChartSpec(col, row), defaultKey = indicatorKeys[0], data = layout.dataset.collectedValues[defaultKey + "_align"] ? layout.dataset.collectedValues[defaultKey + "_align"] : layout.dataset.collectedValues[defaultKey], index = layout.getRecordIndexByCol(col), range = data[layout.getColKeysPath()[index][layout.columnHeaderLevelCount - 1 - layout.topAxesCount]];
+            const indicatorKeys = layout.getIndicatorKeyInChartSpec(col, row), defaultKey = indicatorKeys[0], data = layout.dataset.collectedValues[defaultKey + "_align"] ? layout.dataset.collectedValues[defaultKey + "_align"] : layout.dataset.collectedValues[defaultKey], index = layout.getRecordIndexByCol(col), range = data[layout.getColKeysPath()[index][Math.max(0, layout.columnHeaderLevelCount - 1 - layout.topAxesCount)]];
             let indicatorInfo = null;
             indicatorKeys.forEach((key => {
                 const info = layout.getIndicatorInfo(key);
@@ -55,7 +55,7 @@ export function getAxisConfigInPivotChart(col, row, layout) {
         }
     } else {
         if (col === layout.rowHeaderLevelCount - 1 && row >= layout.columnHeaderLevelCount && row < layout.rowCount - layout.bottomFrozenRowCount) {
-            const indicatorKeys = layout.getIndicatorKeyInChartSpec(col, row), defaultKey = indicatorKeys[0], data = layout.dataset.collectedValues[defaultKey + "_align"] ? layout.dataset.collectedValues[defaultKey + "_align"] : layout.dataset.collectedValues[defaultKey], index = layout.getRecordIndexByRow(row), range = data[layout.getRowKeysPath()[index][layout.rowHeaderLevelCount - 1 - layout.leftAxesCount]];
+            const indicatorKeys = layout.getIndicatorKeyInChartSpec(col, row), defaultKey = indicatorKeys[0], data = layout.dataset.collectedValues[defaultKey + "_align"] ? layout.dataset.collectedValues[defaultKey + "_align"] : layout.dataset.collectedValues[defaultKey], index = layout.getRecordIndexByRow(row), range = data[layout.getRowKeysPath()[index][Math.max(0, layout.rowHeaderLevelCount - 1 - layout.leftAxesCount)]];
             let indicatorInfo = null;
             indicatorKeys.forEach((key => {
                 const info = layout.getIndicatorInfo(key);
@@ -79,7 +79,7 @@ export function getAxisConfigInPivotChart(col, row, layout) {
         if (col === layout.colCount - layout.rightFrozenColCount && row >= layout.columnHeaderLevelCount && row < layout.rowCount - layout.bottomFrozenRowCount) {
             const defaultKey = layout.getIndicatorKeyInChartSpec(layout.rowHeaderLevelCount - 1, row)[1];
             if (!defaultKey) return;
-            const data = layout.dataset.collectedValues[defaultKey + "_align"] ? layout.dataset.collectedValues[defaultKey + "_align"] : layout.dataset.collectedValues[defaultKey], index = layout.getRecordIndexByRow(row), range = data[layout.getRowKeysPath()[index][layout.rowHeaderLevelCount - 1 - layout.leftAxesCount]], axisOption = layout._table.pivotChartAxes.find((axisOption => "right" === axisOption.orient));
+            const data = layout.dataset.collectedValues[defaultKey + "_align"] ? layout.dataset.collectedValues[defaultKey + "_align"] : layout.dataset.collectedValues[defaultKey], index = layout.getRecordIndexByRow(row), range = data[layout.getRowKeysPath()[index][Math.max(0, layout.rowHeaderLevelCount - 1 - layout.leftAxesCount)]], axisOption = layout._table.pivotChartAxes.find((axisOption => "right" === axisOption.orient));
             if (!1 === (null == axisOption ? void 0 : axisOption.visible)) return;
             return merge({}, axisOption, {
                 orient: "right",

package/es/layout/chart-helper/get-axis-config.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["layout/chart-helper/get-axis-config.ts"],"names":[],"mappings":"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","file":"get-axis-config.js","sourcesContent":["import { merge } from '@visactor/vutils';\nimport type { PivotLayoutMap } from '../pivot-layout';\nimport type { ITableAxisOption } from '../../ts-types/component/axis';\nimport type { PivotChart } from '../../PivotChart';\n\nexport function getAxisConfigInPivotChart(col: number, row: number, layout: PivotLayoutMap): any {\n  if (!layout._table.isPivotChart()) {\n    return undefined;\n  }\n\n  // 是否是指标\n  if (layout.indicatorsAsCol) {\n    if (\n      layout.hasTwoIndicatorAxes &&\n      row === layout.columnHeaderLevelCount - 1 &&\n      col >= layout.rowHeaderLevelCount &&\n      col < layout.colCount - layout.rightFrozenColCount\n    ) {\n      const indicatorKeys = layout.getIndicatorKeyInChartSpec(col, layout.columnHeaderLevelCount - 1);\n      const defaultKey = indicatorKeys[1];\n      if (!defaultKey) {\n        return undefined;\n      }\n      // const data = layout.dataset.collectedValues[defaultKey];\n      const data = layout.dataset.collectedValues[defaultKey + '_align']\n        ? layout.dataset.collectedValues[defaultKey + '_align']\n        : layout.dataset.collectedValues[defaultKey];\n      const index = layout.getRecordIndexByCol(col);\n      const range =\n        data[layout.getColKeysPath()[index][Math.max(0, layout.columnHeaderLevelCount - 1 - layout.topAxesCount)]];\n\n      const axisOption = ((layout._table as PivotChart).pivotChartAxes as ITableAxisOption[]).find(axisOption => {\n        return axisOption.orient === 'top';\n      });\n      if (axisOption?.visible === false) {\n        return;\n      }\n      // 顶部副指标轴\n      return merge({}, axisOption, {\n        orient: 'top',\n        type: 'linear',\n        range: range,\n        label: {\n          flush: true\n        },\n        // grid: {\n        //   visible: true\n        // },\n        title: {\n          visible: false\n        }\n      });\n    } else if (\n      row === layout.rowCount - layout.bottomFrozenRowCount &&\n      col >= layout.rowHeaderLevelCount &&\n      col < layout.colCount - layout.rightFrozenColCount\n    ) {\n      const indicatorKeys = layout.getIndicatorKeyInChartSpec(col, row);\n      const defaultKey = indicatorKeys[0];\n      // const data = layout.dataset.collectedValues[defaultKey];\n      const data = layout.dataset.collectedValues[defaultKey + '_align']\n        ? layout.dataset.collectedValues[defaultKey + '_align']\n        : layout.dataset.collectedValues[defaultKey];\n      const index = layout.getRecordIndexByCol(col);\n      const range =\n        data[layout.getColKeysPath()[index][Math.max(0, layout.columnHeaderLevelCount - 1 - layout.topAxesCount)]];\n      let indicatorInfo = null;\n      indicatorKeys.forEach(key => {\n        const info = layout.getIndicatorInfo(key);\n        if (info) {\n          indicatorInfo = info;\n        }\n      });\n\n      const axisOption = ((layout._table as PivotChart).pivotChartAxes as ITableAxisOption[]).find(axisOption => {\n        return axisOption.orient === 'bottom';\n      });\n      if (axisOption?.visible === false) {\n        return;\n      }\n      // 底侧指标轴\n      return merge({}, axisOption, {\n        orient: 'bottom',\n        type: 'linear',\n        range: range,\n        label: {\n          flush: true\n        },\n        // grid: {\n        //   visible: true\n        // },\n        title: {\n          // visible: true,\n          text: (indicatorInfo as any)?.caption,\n          autoRotate: true\n        }\n      });\n    } else if (\n      col === layout.rowHeaderLevelCount - 1 &&\n      row >= layout.rowHeaderLevelCount &&\n      row < layout.rowCount - layout.bottomFrozenRowCount\n    ) {\n      const rowDimensionKey = layout.getDimensionKeyInChartSpec(layout.rowHeaderLevelCount, row)[0];\n      const data = layout.dataset.collectedValues[rowDimensionKey];\n\n      const recordRow = layout.getRecordIndexByRow(row);\n      const rowPath = layout.getRowKeysPath()[recordRow];\n      const domain = data[rowPath[rowPath.length - 1]] as Set<string>;\n\n      const axisOption = ((layout._table as PivotChart).pivotChartAxes as ITableAxisOption[]).find(axisOption => {\n        return axisOption.orient === 'left';\n      });\n      if (axisOption?.visible === false) {\n        return;\n      }\n      // 左侧维度轴\n      return merge({}, axisOption, {\n        orient: 'left',\n        type: 'band',\n        data: Array.from(domain).reverse(),\n        title: {\n          visible: false\n        }\n      });\n    }\n  } else {\n    if (\n      col === layout.rowHeaderLevelCount - 1 &&\n      row >= layout.columnHeaderLevelCount &&\n      row < layout.rowCount - layout.bottomFrozenRowCount\n    ) {\n      const indicatorKeys = layout.getIndicatorKeyInChartSpec(col, row);\n      const defaultKey = indicatorKeys[0];\n      // const data = layout.dataset.collectedValues[defaultKey];\n      const data = layout.dataset.collectedValues[defaultKey + '_align']\n        ? layout.dataset.collectedValues[defaultKey + '_align']\n        : layout.dataset.collectedValues[defaultKey];\n      const index = layout.getRecordIndexByRow(row);\n      const range =\n        data[layout.getRowKeysPath()[index][Math.max(0, layout.rowHeaderLevelCount - 1 - layout.leftAxesCount)]];\n      let indicatorInfo = null;\n      indicatorKeys.forEach(key => {\n        const info = layout.getIndicatorInfo(key);\n        if (info) {\n          indicatorInfo = info;\n        }\n      });\n\n      const axisOption = ((layout._table as PivotChart).pivotChartAxes as ITableAxisOption[]).find(axisOption => {\n        return axisOption.orient === 'left';\n      });\n      if (axisOption?.visible === false) {\n        return;\n      }\n      // 左侧指标轴\n      return merge({}, axisOption, {\n        orient: 'left',\n        type: 'linear',\n        range: range,\n        label: {\n          flush: true\n        },\n        // grid: {\n        //   visible: true\n        // },\n        title: {\n          // visible: true,\n          text: (indicatorInfo as any)?.caption,\n          autoRotate: true\n        }\n      });\n    } else if (\n      col === layout.colCount - layout.rightFrozenColCount &&\n      row >= layout.columnHeaderLevelCount &&\n      row < layout.rowCount - layout.bottomFrozenRowCount\n    ) {\n      const indicatorKeys = layout.getIndicatorKeyInChartSpec(layout.rowHeaderLevelCount - 1, row);\n      const defaultKey = indicatorKeys[1];\n      if (!defaultKey) {\n        return undefined;\n      }\n      // const data = layout.dataset.collectedValues[defaultKey];\n      const data = layout.dataset.collectedValues[defaultKey + '_align']\n        ? layout.dataset.collectedValues[defaultKey + '_align']\n        : layout.dataset.collectedValues[defaultKey];\n      const index = layout.getRecordIndexByRow(row);\n      const range =\n        data[layout.getRowKeysPath()[index][Math.max(0, layout.rowHeaderLevelCount - 1 - layout.leftAxesCount)]];\n\n      const axisOption = ((layout._table as PivotChart).pivotChartAxes as ITableAxisOption[]).find(axisOption => {\n        return axisOption.orient === 'right';\n      });\n      if (axisOption?.visible === false) {\n        return;\n      }\n      // 右侧副指标轴\n      return merge({}, axisOption, {\n        orient: 'right',\n        type: 'linear',\n        range: range,\n        label: {\n          flush: true\n        },\n        // grid: {\n        //   visible: true\n        // },\n        title: {\n          visible: false\n        }\n      });\n    } else if (\n      row === layout.rowCount - layout.bottomFrozenRowCount &&\n      col >= layout.rowHeaderLevelCount &&\n      col < layout.colCount - layout.rightFrozenColCount\n    ) {\n      // const indicatorKeys = layout.getIndicatorKeyInChartSpec(col, row);\n\n      const columnDimensionKey = layout.getDimensionKeyInChartSpec(col, layout.columnHeaderLevelCount)[0];\n      const data = layout.dataset.collectedValues[columnDimensionKey];\n\n      const recordCol = layout.getRecordIndexByCol(col);\n      const colPath = layout.getColKeysPath()[recordCol];\n      const domain = data[colPath[colPath.length - 1]] as Set<string>;\n\n      const axisOption = ((layout._table as PivotChart).pivotChartAxes as ITableAxisOption[]).find(axisOption => {\n        return axisOption.orient === 'bottom';\n      });\n      if (axisOption?.visible === false) {\n        return;\n      }\n      // 底部维度轴\n      return merge({}, axisOption, {\n        orient: 'bottom',\n        type: 'band',\n        data: Array.from(domain),\n        title: {\n          visible: false\n        }\n      });\n    }\n  }\n\n  return undefined;\n}\n"]}

package/es/layout/chart-helper/get-chart-spec.d.ts

@@ -0,0 +1,7 @@
+import type { PivotLayoutMap } from '../pivot-layout';
+import type { PivotHeaderLayoutMap } from '../pivot-header-layout';
+import type { SimpleHeaderLayoutMap } from '../simple-header-layout';
+export declare function getRawChartSpec(col: number, row: number, layout: PivotLayoutMap | PivotHeaderLayoutMap): any;
+export declare function getChartSpec(col: number, row: number, layout: PivotLayoutMap): any;
+export declare function getChartAxes(col: number, row: number, layout: PivotLayoutMap): any;
+export declare function getChartDataId(col: number, row: number, layout: PivotLayoutMap | PivotHeaderLayoutMap | SimpleHeaderLayoutMap): string | Record<string, string>;

package/es/layout/{pivot-chart → chart-helper}/get-chart-spec.js

@@ -25,7 +25,7 @@ export function getChartAxes(col, row, layout) {
     if (layout.indicatorsAsCol) {
         const indicatorKeys = layout.getIndicatorKeyInChartSpec(col, row), colIndex = layout.getRecordIndexByCol(col);
         indicatorKeys.forEach(((key, index) => {
-            const range = (layout.dataset.collectedValues[key + "_align"] ? layout.dataset.collectedValues[key + "_align"] : layout.dataset.collectedValues[key])[layout.getColKeysPath()[colIndex][layout.columnHeaderLevelCount - 1 - layout.topAxesCount]], axisOption = layout._table.pivotChartAxes.find((axisOption => axisOption.orient === (0 === index ? "bottom" : "top")));
+            const range = (layout.dataset.collectedValues[key + "_align"] ? layout.dataset.collectedValues[key + "_align"] : layout.dataset.collectedValues[key])[layout.getColKeysPath()[colIndex][Math.max(0, layout.columnHeaderLevelCount - 1 - layout.topAxesCount)]], axisOption = layout._table.pivotChartAxes.find((axisOption => axisOption.orient === (0 === index ? "bottom" : "top")));
             axes.push(merge({}, axisOption, {
                 type: "linear",
                 orient: 0 === index ? "bottom" : "top",
@@ -39,7 +39,7 @@ export function getChartAxes(col, row, layout) {
                 seriesIndex: index
             }));
         }));
-        const rowDimensionKey = layout.getDimensionKeyInChartSpec(layout.rowHeaderLevelCount, col)[0], data = layout.dataset.collectedValues[rowDimensionKey], recordRow = layout.getRecordIndexByRow(row), rowPath = layout.getRowKeysPath()[recordRow], domain = data[rowPath[rowPath.length - 1]], axisOption = layout._table.pivotChartAxes.find((axisOption => "left" === axisOption.orient));
+        const rowDimensionKey = layout.getDimensionKeyInChartSpec(layout.rowHeaderLevelCount, col)[0], data = layout.dataset.cacheCollectedValues[rowDimensionKey] || layout.dataset.collectedValues[rowDimensionKey], recordRow = layout.getRecordIndexByRow(row), rowPath = layout.getRowKeysPath()[recordRow], domain = data[rowPath[rowPath.length - 1]], axisOption = layout._table.pivotChartAxes.find((axisOption => "left" === axisOption.orient));
         axes.push(merge({}, axisOption, {
             type: "band",
             orient: "left",
@@ -65,7 +65,7 @@ export function getChartAxes(col, row, layout) {
     } else {
         const indicatorKeys = layout.getIndicatorKeyInChartSpec(col, row), rowIndex = layout.getRecordIndexByRow(row);
         indicatorKeys.forEach(((key, index) => {
-            const range = (layout.dataset.collectedValues[key + "_align"] ? layout.dataset.collectedValues[key + "_align"] : layout.dataset.collectedValues[key])[layout.getRowKeysPath()[rowIndex][layout.rowHeaderLevelCount - 1 - layout.leftAxesCount]], axisOption = layout._table.pivotChartAxes.find((axisOption => axisOption.orient === (0 === index ? "left" : "right")));
+            const range = (layout.dataset.collectedValues[key + "_align"] ? layout.dataset.collectedValues[key + "_align"] : layout.dataset.collectedValues[key])[layout.getRowKeysPath()[rowIndex][Math.max(0, layout.rowHeaderLevelCount - 1 - layout.leftAxesCount)]], axisOption = layout._table.pivotChartAxes.find((axisOption => axisOption.orient === (0 === index ? "left" : "right")));
             axes.push(merge({}, axisOption, {
                 type: "linear",
                 orient: 0 === index ? "left" : "right",
@@ -79,7 +79,7 @@ export function getChartAxes(col, row, layout) {
                 seriesIndex: index
             }));
         }));
-        const columnDimensionKey = layout.getDimensionKeyInChartSpec(col, layout.columnHeaderLevelCount)[0], data = layout.dataset.collectedValues[columnDimensionKey], recordCol = layout.getRecordIndexByCol(col), colPath = layout.getColKeysPath()[recordCol], domain = data[colPath[colPath.length - 1]], axisOption = layout._table.pivotChartAxes.find((axisOption => "bottom" === axisOption.orient));
+        const columnDimensionKey = layout.getDimensionKeyInChartSpec(col, layout.columnHeaderLevelCount)[0], data = layout.dataset.cacheCollectedValues[columnDimensionKey] || layout.dataset.collectedValues[columnDimensionKey], recordCol = layout.getRecordIndexByCol(col), colPath = layout.getColKeysPath()[recordCol], domain = data[colPath[colPath.length - 1]], axisOption = layout._table.pivotChartAxes.find((axisOption => "bottom" === axisOption.orient));
         axes.push(merge({}, axisOption, {
             type: "band",
             orient: "bottom",
@@ -106,4 +106,21 @@ export function getChartAxes(col, row, layout) {
     }
     return axes;
 }
+
+export function getChartDataId(col, row, layout) {
+    var _a;
+    const chartSpec = layout.getRawChartSpec(col, row);
+    if (null == chartSpec ? void 0 : chartSpec.series) {
+        const dataIdfield = {};
+        return (null === (_a = chartSpec.data) || void 0 === _a ? void 0 : _a.id) && (dataIdfield[chartSpec.data.id] = void 0), 
+        null == chartSpec || chartSpec.series.forEach((seriesSpec => {
+            var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
+            if (!(null === (_a = seriesSpec.data) || void 0 === _a ? void 0 : _a.fromDataId)) if (null === (_b = seriesSpec.data) || void 0 === _b ? void 0 : _b.transforms) dataIdfield[null !== (_l = null !== (_j = null === (_h = seriesSpec.data) || void 0 === _h ? void 0 : _h.id) && void 0 !== _j ? _j : null === (_k = chartSpec.data) || void 0 === _k ? void 0 : _k.id) && void 0 !== _l ? _l : "data"] = void 0; else {
+                const seriesField = "horizontal" === seriesSpec.direction ? seriesSpec.xField : seriesSpec.yField;
+                dataIdfield[null !== (_f = null !== (_d = null === (_c = seriesSpec.data) || void 0 === _c ? void 0 : _c.id) && void 0 !== _d ? _d : null === (_e = chartSpec.data) || void 0 === _e ? void 0 : _e.id) && void 0 !== _f ? _f : "data"] = (null === (_g = seriesSpec.data) || void 0 === _g ? void 0 : _g.id) ? seriesField : void 0;
+            }
+        })), dataIdfield;
+    }
+    return chartSpec.data.id;
+}
 //# sourceMappingURL=get-chart-spec.js.map

package/es/layout/chart-helper/get-chart-spec.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["layout/chart-helper/get-chart-spec.ts"],"names":[],"mappings":"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","file":"get-chart-spec.js","sourcesContent":["import { cloneDeep, merge } from '@visactor/vutils';\nimport type { PivotLayoutMap } from '../pivot-layout';\nimport type { PivotChart } from '../../PivotChart';\nimport type { ITableAxisOption } from '../../ts-types/component/axis';\nimport type { PivotHeaderLayoutMap } from '../pivot-header-layout';\nimport type { SimpleHeaderLayoutMap } from '../simple-header-layout';\n\nexport function getRawChartSpec(col: number, row: number, layout: PivotLayoutMap | PivotHeaderLayoutMap): any {\n  const paths = layout.getCellHeaderPaths(col, row);\n  let indicatorObj;\n  if (layout.indicatorsAsCol) {\n    const indicatorKey = paths.colHeaderPaths.find(colPath => colPath.indicatorKey)?.indicatorKey;\n    indicatorObj = layout.columnObjects.find(indicator => indicator.indicatorKey === indicatorKey);\n  } else {\n    const indicatorKey = paths.rowHeaderPaths.find(rowPath => rowPath.indicatorKey)?.indicatorKey;\n    indicatorObj = layout.columnObjects.find(indicator => indicator.indicatorKey === indicatorKey);\n  }\n  // const indicatorKeys: string[] = [];\n  const chartSpec = indicatorObj?.chartSpec;\n\n  return chartSpec;\n}\n\nexport function getChartSpec(col: number, row: number, layout: PivotLayoutMap): any {\n  let chartSpec = layout.getRawChartSpec(col, row);\n  if (chartSpec) {\n    chartSpec = cloneDeep(chartSpec);\n    chartSpec.axes = layout.getChartAxes(col, row);\n    chartSpec.padding = 0;\n    return chartSpec;\n  }\n  return null;\n}\n\nexport function getChartAxes(col: number, row: number, layout: PivotLayoutMap): any {\n  const axes = [];\n  if (layout.indicatorsAsCol) {\n    const indicatorKeys = layout.getIndicatorKeyInChartSpec(col, row);\n    const colIndex = layout.getRecordIndexByCol(col);\n    indicatorKeys.forEach((key, index) => {\n      // const data = layout.dataset.collectedValues[key];\n      const data = layout.dataset.collectedValues[key + '_align']\n        ? layout.dataset.collectedValues[key + '_align']\n        : layout.dataset.collectedValues[key];\n      const range =\n        data[layout.getColKeysPath()[colIndex][Math.max(0, layout.columnHeaderLevelCount - 1 - layout.topAxesCount)]];\n      const axisOption = ((layout._table as PivotChart).pivotChartAxes as ITableAxisOption[]).find(axisOption => {\n        return axisOption.orient === (index === 0 ? 'bottom' : 'top');\n      });\n      axes.push(\n        merge({}, axisOption, {\n          type: 'linear',\n          orient: index === 0 ? 'bottom' : 'top',\n          // visible: true,\n          label: { visible: false },\n          title: { visible: false },\n          range,\n          seriesIndex: index\n        })\n      );\n    });\n\n    const rowDimensionKey = layout.getDimensionKeyInChartSpec(layout.rowHeaderLevelCount, col)[0];\n    const data =\n      layout.dataset.cacheCollectedValues[rowDimensionKey] || layout.dataset.collectedValues[rowDimensionKey];\n    const recordRow = layout.getRecordIndexByRow(row);\n    const rowPath = layout.getRowKeysPath()[recordRow];\n    const domain = data[rowPath[rowPath.length - 1]] as Set<string>;\n    const axisOption = ((layout._table as PivotChart).pivotChartAxes as ITableAxisOption[]).find(axisOption => {\n      return axisOption.orient === 'left';\n    });\n    axes.push(\n      merge({}, axisOption, {\n        type: 'band',\n        orient: 'left',\n        // visible: true,\n        label: { visible: false, space: 0 },\n        domainLine: { visible: false },\n        tick: { visible: false },\n        subTick: { visible: false },\n        title: { visible: false },\n        // height: -1,\n        width: -1,\n        // autoIndent: false,\n        domain: Array.from(domain)\n      })\n    );\n  } else {\n    const indicatorKeys = layout.getIndicatorKeyInChartSpec(col, row);\n    const rowIndex = layout.getRecordIndexByRow(row);\n    indicatorKeys.forEach((key, index) => {\n      const data = layout.dataset.collectedValues[key + '_align']\n        ? layout.dataset.collectedValues[key + '_align']\n        : layout.dataset.collectedValues[key];\n      const range =\n        data[layout.getRowKeysPath()[rowIndex][Math.max(0, layout.rowHeaderLevelCount - 1 - layout.leftAxesCount)]];\n      const axisOption = ((layout._table as PivotChart).pivotChartAxes as ITableAxisOption[]).find(axisOption => {\n        return axisOption.orient === (index === 0 ? 'left' : 'right');\n      });\n      axes.push(\n        merge({}, axisOption, {\n          type: 'linear',\n          orient: index === 0 ? 'left' : 'right',\n          // visible: true,\n          label: { visible: false },\n          title: { visible: false },\n          range,\n          seriesIndex: index\n          // grid: index === 0 ? undefined : { visible: false }\n        })\n      );\n    });\n\n    const columnDimensionKey = layout.getDimensionKeyInChartSpec(col, layout.columnHeaderLevelCount)[0];\n    const data =\n      layout.dataset.cacheCollectedValues[columnDimensionKey] || layout.dataset.collectedValues[columnDimensionKey];\n    const recordCol = layout.getRecordIndexByCol(col);\n    const colPath = layout.getColKeysPath()[recordCol];\n    const domain = data[colPath[colPath.length - 1]] as Set<string>;\n    const axisOption = ((layout._table as PivotChart).pivotChartAxes as ITableAxisOption[]).find(axisOption => {\n      return axisOption.orient === 'bottom';\n    });\n    axes.push(\n      merge({}, axisOption, {\n        type: 'band',\n        orient: 'bottom',\n        visible: true,\n        label: { visible: false, space: 0 },\n        domainLine: { visible: false },\n        tick: { visible: false },\n        subTick: { visible: false },\n        title: { visible: false },\n        height: -1,\n        // autoIndent: false,\n        domain: Array.from(domain)\n      })\n    );\n  }\n  return axes;\n}\n/**\n *  获取单元格对应spec的dataId。\n * 如果是spec外层的dataId,则是string,否则通过series获取到的是Record<string, string> => <dataId, series-chart的指标key用于过滤数据>\n * @param col\n * @param row\n * @param layout\n * @returns\n */\nexport function getChartDataId(\n  col: number,\n  row: number,\n  layout: PivotLayoutMap | PivotHeaderLayoutMap | SimpleHeaderLayoutMap\n): string | Record<string, string> {\n  const chartSpec = layout.getRawChartSpec(col, row);\n  // 如果chartSpec配置了组合图 series 则需要考虑 series中存在的多个指标\n  if (chartSpec?.series) {\n    const dataIdfield: Record<string, string> = {};\n\n    if (chartSpec.data?.id) {\n      dataIdfield[chartSpec.data.id] = undefined;\n    }\n    chartSpec?.series.forEach((seriesSpec: any) => {\n      if (!seriesSpec.data?.fromDataId) {\n        if (!seriesSpec.data?.transforms) {\n          const seriesField = seriesSpec.direction === 'horizontal' ? seriesSpec.xField : seriesSpec.yField;\n          dataIdfield[seriesSpec.data?.id ?? chartSpec.data?.id ?? 'data'] = seriesSpec.data?.id\n            ? seriesField\n            : undefined;\n        } else {\n          dataIdfield[seriesSpec.data?.id ?? chartSpec.data?.id ?? 'data'] = undefined;\n        }\n      }\n    });\n    return dataIdfield;\n  }\n  return chartSpec.data.id;\n}\n"]}

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

@@ -162,5 +162,7 @@ export declare class PivotHeaderLayoutMap implements LayoutMapAPI {
     getAxisConfigInPivotChart(col: number, row: number): any;
     isEmpty(col: number, row: number): boolean;
     getChartAxes(col: number, row: number): any[];
+    getRawChartSpec(col: number, row: number): any;
+    getChartDataId(col: number, row: number): any;
 }
 export {};

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

@@ -8,6 +8,8 @@ import { IndicatorDimensionKeyPlaceholder } from "../tools/global";
 
 import { diffCellAddress } from "../tools/diff-cell";
 
+import { getChartDataId, getRawChartSpec } from "./chart-helper/get-chart-spec";
+
 class DimensionTree {
     constructor(tree, hierarchyType = "grid", rowExpandLevel = void 0) {
         this.sizeIncludeParent = !1, this.tree = {
@@ -185,7 +187,7 @@ export class PivotHeaderLayoutMap {
                 field: indicatorInfo.indicatorKey,
                 fieldFormat: null == indicatorInfo ? void 0 : indicatorInfo.format,
                 columnType: null !== (_q = null == indicatorInfo ? void 0 : indicatorInfo.columnType) && void 0 !== _q ? _q : "text",
-                chartType: "chartType" in indicatorInfo ? indicatorInfo.chartType : null,
+                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,
@@ -943,5 +945,11 @@ export class PivotHeaderLayoutMap {
     getChartAxes(col, row) {
         return [];
     }
+    getRawChartSpec(col, row) {
+        return getRawChartSpec(col, row, this);
+    }
+    getChartDataId(col, row) {
+        return getChartDataId(col, row, this);
+    }
 }
 //# sourceMappingURL=pivot-header-layout.js.map