@visactor/vtable 0.9.1 → 0.9.2-alpha.1

package/cjs/scenegraph/graphic/chart.js.map

@@ -1 +1 @@
-{"version":3,"sources":["scenegraph/graphic/chart.ts"],"names":[],"mappings":"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","file":"chart.js","sourcesContent":["import type { GraphicType, IGroupGraphicAttribute } from '@visactor/vrender';\nimport { genNumberType, Group } from '@visactor/vrender';\nimport { Bounds } from '@visactor/vutils';\nimport type { BaseTableAPI } from '../../ts-types/base-table';\n\ninterface IChartGraphicAttribute extends IGroupGraphicAttribute {\n  canvas: HTMLCanvasElement;\n  dataId: string;\n  data: any;\n  spec: any;\n  ClassType: any;\n  chartInstance: any;\n  cellPadding: number[];\n  viewBox: {\n    x1: number;\n    y1: number;\n    x2: number;\n    y2: number;\n  };\n}\n\nexport const CHART_NUMBER_TYPE = genNumberType();\n\nexport class Chart extends Group {\n  type: GraphicType = 'chart' as any;\n  declare attribute: IChartGraphicAttribute;\n  chartInstance: any;\n  activeChartInstance: any;\n  active: boolean;\n  cacheCanvas: HTMLCanvasElement; // HTMLCanvasElement\n\n  constructor(params: IChartGraphicAttribute) {\n    super(params);\n    this.numberType = CHART_NUMBER_TYPE;\n\n    // 创建chart\n    if (!params.chartInstance) {\n      const ctx = params.canvas.getContext('2d');\n      this.chartInstance = new params.ClassType(params.spec, {\n        renderCanvas: params.canvas,\n        mode: 'desktop-browser',\n        canvasControled: false,\n        viewBox: params.viewBox,\n        interactive: false,\n        animation: false\n      });\n      this.chartInstance.renderSync();\n    } else {\n      this.chartInstance = params.chartInstance;\n    }\n\n    // this.chart.load().then((cache) => {\n    //   this.cacheCanvas = cache;\n    //   this.deactivate();\n    // });\n  }\n  /**\n   * 激活该图表元素\n   * @param table\n   */\n  activate(table: BaseTableAPI) {\n    this.active = true;\n    // this.chart = new TestChart(this.attribute.spec);\n    // const ctx = this.attribute.canvas.getContext('2d');\n    const { x1, y1, x2, y2 } = this.attribute.viewBox;\n    //获取渲染区域的bound 考虑被表头遮住部分的情况\n    const tableBound = table.scenegraph.tableGroup.globalAABBBounds;\n    const bodyBound = new Bounds();\n    bodyBound.x1 = tableBound.x1 + table.getFrozenColsWidth();\n    bodyBound.x2 = tableBound.x2;\n    bodyBound.y1 = tableBound.y1 + table.getFrozenRowsHeight();\n    bodyBound.y2 = tableBound.y2;\n    const clipBound = bodyBound.intersect({\n      x1: x1 - table.scrollLeft,\n      x2: x2 - table.scrollLeft,\n      y1: y1 - table.scrollTop,\n      y2: y2 - table.scrollTop\n    });\n    this.activeChartInstance = new this.attribute.ClassType(this.attribute.spec, {\n      renderCanvas: this.attribute.canvas,\n      mode: 'desktop-browser',\n      canvasControled: false,\n      viewBox: {\n        x1: x1 - table.scrollLeft,\n        x2: x2 - table.scrollLeft,\n        y1: y1 - table.scrollTop,\n        y2: y2 - table.scrollTop\n      },\n      animation: false,\n      interactive: true,\n      beforeRender: (stage: any) => {\n        const ctx = stage.window.getContext();\n        ctx.inuse = true;\n        ctx.clearMatrix();\n        ctx.setTransformForCurrent(true);\n        ctx.beginPath();\n        ctx.rect(clipBound.x1, clipBound.y1, clipBound.x2 - clipBound.x1, clipBound.y2 - clipBound.y1);\n        ctx.clip();\n      },\n      afterRender(stage: any) {\n        const ctx = stage.window.getContext();\n        ctx.inuse = false;\n      }\n    });\n    // this.activeChartInstance.updateData('data', this.attribute.data);\n    this.activeChartInstance.renderSync();\n  }\n  /**\n   * 图表失去焦点\n   * @param table\n   */\n  deactivate() {\n    this.active = false;\n    this.activeChartInstance.release();\n    this.activeChartInstance = null;\n  }\n}\n"]}
+{"version":3,"sources":["scenegraph/graphic/chart.ts"],"names":[],"mappings":"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","file":"chart.js","sourcesContent":["import type { GraphicType, IGroupGraphicAttribute } from '@visactor/vrender';\nimport { genNumberType, Group } from '@visactor/vrender';\nimport { Bounds, cloneDeep } from '@visactor/vutils';\nimport type { BaseTableAPI } from '../../ts-types/base-table';\nimport type { PivotChart } from '../../PivotChart';\nimport { clearChartCacheImage, updateChartSize } from '../refresh-node/update-chart';\nimport type { PivotLayoutMap } from '../../layout/pivot-layout';\n\ninterface IChartGraphicAttribute extends IGroupGraphicAttribute {\n  canvas: HTMLCanvasElement;\n  dataId: string;\n  data: any;\n  spec: any;\n  axes: any;\n  ClassType: any;\n  chartInstance: any;\n  cellPadding: number[];\n  viewBox: {\n    x1: number;\n    y1: number;\n    x2: number;\n    y2: number;\n  };\n}\n\nexport const CHART_NUMBER_TYPE = genNumberType();\n\nexport class Chart extends Group {\n  type: GraphicType = 'chart' as any;\n  declare attribute: IChartGraphicAttribute;\n  chartInstance: any;\n  activeChartInstance: any;\n  active: boolean;\n  cacheCanvas: HTMLCanvasElement; // HTMLCanvasElement\n\n  constructor(params: IChartGraphicAttribute) {\n    super(params);\n    this.numberType = CHART_NUMBER_TYPE;\n\n    // 创建chart\n    if (!params.chartInstance) {\n      const ctx = params.canvas.getContext('2d');\n      params.chartInstance = this.chartInstance = new params.ClassType(params.spec, {\n        renderCanvas: params.canvas,\n        mode: 'desktop-browser',\n        canvasControled: false,\n        viewBox: params.viewBox,\n        interactive: false,\n        animation: false\n      });\n      this.chartInstance.renderSync();\n    } else {\n      this.chartInstance = params.chartInstance;\n    }\n\n    // this.chart.load().then((cache) => {\n    //   this.cacheCanvas = cache;\n    //   this.deactivate();\n    // });\n  }\n  /**\n   * 激活该图表元素\n   * @param table\n   */\n  activate(table: BaseTableAPI) {\n    this.active = true;\n    // this.chart = new TestChart(this.attribute.spec);\n    // const ctx = this.attribute.canvas.getContext('2d');\n    const { x1, y1, x2, y2 } = this.attribute.viewBox;\n    //获取渲染区域的bound 考虑被表头遮住部分的情况\n    const tableBound = table.scenegraph.tableGroup.globalAABBBounds;\n    const bodyBound = new Bounds();\n    bodyBound.x1 = tableBound.x1 + table.getFrozenColsWidth();\n    bodyBound.x2 = tableBound.x2 - table.getRightFrozenColsWidth();\n    bodyBound.y1 = tableBound.y1 + table.getFrozenRowsHeight();\n    bodyBound.y2 = tableBound.y2 - table.getBottomFrozenRowsHeight();\n    const clipBound = bodyBound.intersect({\n      x1: x1 - table.scrollLeft,\n      x2: x2 - table.scrollLeft,\n      y1: y1 - table.scrollTop,\n      y2: y2 - table.scrollTop\n    });\n    this.activeChartInstance = new this.attribute.ClassType(this.attribute.spec, {\n      renderCanvas: this.attribute.canvas,\n      mode: 'desktop-browser',\n      canvasControled: false,\n      viewBox: {\n        x1: x1 - table.scrollLeft,\n        x2: x2 - table.scrollLeft,\n        y1: y1 - table.scrollTop,\n        y2: y2 - table.scrollTop\n      },\n      animation: false,\n      interactive: true,\n      beforeRender: (stage: any) => {\n        const ctx = stage.window.getContext();\n        ctx.inuse = true;\n        ctx.clearMatrix();\n        ctx.setTransformForCurrent(true);\n        ctx.beginPath();\n        ctx.rect(clipBound.x1, clipBound.y1, clipBound.x2 - clipBound.x1, clipBound.y2 - clipBound.y1);\n        ctx.clip();\n      },\n      afterRender(stage: any) {\n        const ctx = stage.window.getContext();\n        ctx.inuse = false;\n      }\n    });\n    // this.activeChartInstance.updateData('data', this.attribute.data);\n    this.activeChartInstance.renderSync();\n\n    (table.internalProps.layoutMap as any)?.updateDataStateToActiveChartInstance?.(this.activeChartInstance);\n    this.activeChartInstance.on('click', (params: any) => {\n      console.log('click captured', params);\n      if (Chart.temp) {\n        table.scenegraph.updateChartState(params?.datum);\n      }\n    });\n    this.activeChartInstance.on('brushEnd', (params: any) => {\n      console.log('brushEnd captured', params);\n      table.scenegraph.updateChartState(params?.value?.inBrushData);\n      Chart.temp = 0;\n      setTimeout(() => {\n        Chart.temp = 1;\n      }, 0);\n    });\n    (table as PivotChart)._bindChartEvent?.(this.activeChartInstance);\n    console.log('active');\n  }\n  static temp: number = 1;\n  /**\n   * 图表失去焦点\n   * @param table\n   */\n  deactivate() {\n    this.active = false;\n    this.activeChartInstance.release();\n    this.activeChartInstance = null;\n    console.log('deactivate');\n  }\n  /** 更新图表对应数据 */\n  updateData(data: any) {\n    this.attribute.data = data;\n  }\n}\n"]}

package/cjs/scenegraph/graphic/contributions/chart-render.js

@@ -20,13 +20,25 @@ let DefaultCanvasChartRender = class {
     }
     drawShape(chart, context, x, y, drawContext, params, fillCb, strokeCb) {
         const groupAttribute = (0, vrender_1.getTheme)(chart, null == params ? void 0 : params.theme).group, {dataId: dataId, data: data, viewBox: viewBox} = chart.attribute, {width: width = groupAttribute.width, height: height = groupAttribute.height} = chart.attribute, {chartInstance: chartInstance, active: active, cacheCanvas: cacheCanvas, activeChartInstance: activeChartInstance} = chart;
-        if (!active && cacheCanvas) context.drawImage(cacheCanvas, x, y, width, height); else if (activeChartInstance) activeChartInstance.updateDataSync("data", data); else {
-            chartInstance.updateViewBox({
+        if (!active && cacheCanvas) context.drawImage(cacheCanvas, x, y, width, height); else if (activeChartInstance) activeChartInstance.updateDataSync("data", null != data ? data : []); else {
+            const {axes: axes} = chart.attribute;
+            axes.forEach(((axis, index) => {
+                var _a, _b, _c, _d;
+                if ("linear" === axis.type) {
+                    chartInstance._chart._components[index]._domain = {
+                        min: null !== (_b = null === (_a = axis.range) || void 0 === _a ? void 0 : _a.min) && void 0 !== _b ? _b : 0,
+                        max: null !== (_d = null === (_c = axis.range) || void 0 === _c ? void 0 : _c.max) && void 0 !== _d ? _d : 0
+                    };
+                } else if ("band" === axis.type) {
+                    const chartAxis = chartInstance._chart._components[index];
+                    chartAxis._spec.domain = axis.domain.slice(0), chartAxis.updateScaleDomain();
+                }
+            })), chartInstance.updateViewBox({
                 x1: viewBox.x1 - chart.getRootNode().table.scrollLeft,
                 x2: viewBox.x2 - chart.getRootNode().table.scrollLeft,
                 y1: viewBox.y1 - chart.getRootNode().table.scrollTop,
                 y2: viewBox.y2 - chart.getRootNode().table.scrollTop
-            }), chartInstance.updateDataSync(dataId, data);
+            }), chartInstance.updateDataSync(dataId, null != data ? data : []);
             const sg = chartInstance.getStage();
             chart.cacheCanvas = sg.toCanvas();
         }

package/cjs/scenegraph/graphic/contributions/chart-render.js.map

@@ -1 +1 @@
-{"version":3,"sources":["scenegraph/graphic/contributions/chart-render.ts"],"names":[],"mappings":"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","file":"chart-render.js","sourcesContent":["import type {\n  IGraphicAttribute,\n  IContext2d,\n  IDrawContext,\n  IGraphicRender,\n  IGraphicRenderDrawParams,\n  IMarkAttribute,\n  IRenderService,\n  IThemeAttribute\n} from '@visactor/vrender';\nimport { ContributionProvider, getTheme, IGroupRenderContribution, createImage } from '@visactor/vrender';\nimport { inject, injectable, named } from 'inversify';\nimport type { Chart } from '../chart';\nimport { CHART_NUMBER_TYPE } from '../chart';\n\nexport const ChartRender = Symbol.for('ChartRender');\nexport const ChartRenderContribution = Symbol.for('ChartRenderContribution');\n\n@injectable()\nexport class DefaultCanvasChartRender implements IGraphicRender {\n  type: 'chart';\n  numberType: number = CHART_NUMBER_TYPE;\n\n  drawShape(\n    chart: Chart,\n    context: IContext2d,\n    x: number,\n    y: number,\n    drawContext: IDrawContext,\n    params?: IGraphicRenderDrawParams,\n    fillCb?: (\n      ctx: IContext2d,\n      markAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n      themeAttribute: IThemeAttribute\n    ) => boolean,\n    strokeCb?: (\n      ctx: IContext2d,\n      markAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n      themeAttribute: IThemeAttribute\n    ) => boolean\n  ) {\n    const groupAttribute = getTheme(chart, params?.theme).group;\n\n    const { dataId, data, viewBox } = chart.attribute;\n    const { width = groupAttribute.width, height = groupAttribute.height } = chart.attribute;\n\n    const { chartInstance, active, cacheCanvas, activeChartInstance } = chart;\n    // console.log('render chart', chart.parent.col, chart.parent.row, viewBox, cacheCanvas);\n    if (!active && cacheCanvas) {\n      context.drawImage(cacheCanvas, x, y, width, height);\n    } else if (activeChartInstance) {\n      activeChartInstance.updateDataSync('data', data);\n    } else {\n      // console.log('viewBox', viewBox);\n      chartInstance.updateViewBox({\n        x1: viewBox.x1 - (chart.getRootNode() as any).table.scrollLeft,\n        x2: viewBox.x2 - (chart.getRootNode() as any).table.scrollLeft,\n        y1: viewBox.y1 - (chart.getRootNode() as any).table.scrollTop,\n        y2: viewBox.y2 - (chart.getRootNode() as any).table.scrollTop\n      });\n      chartInstance.updateDataSync(dataId, data);\n      const sg = chartInstance.getStage();\n      chart.cacheCanvas = sg.toCanvas(); // 截图空白问题 因为开启了动画 首屏截图是无数据的TODO\n    }\n  }\n\n  draw(chart: Chart, renderService: IRenderService, drawContext: IDrawContext, params?: IGraphicRenderDrawParams) {\n    const { context } = drawContext;\n    if (!context) {\n      return;\n    }\n    // debugger;\n    const { clip } = chart.attribute;\n    if (clip) {\n      context.save();\n    } else {\n      context.highPerformanceSave();\n    }\n    // group直接transform\n    context.transformFromMatrix(chart.transMatrix, true);\n\n    context.beginPath();\n    // 如果跳过绘制，那就不绘制\n    if (params.skipDraw) {\n      this.drawShape(\n        chart,\n        context,\n        0,\n        0,\n        drawContext,\n        params,\n        () => false,\n        () => false\n      );\n    } else {\n      this.drawShape(chart, context, 0, 0, drawContext);\n    }\n\n    // 绘制子元素的时候要添加scroll\n    const chartAttribute = getTheme(chart, params?.theme).group;\n    const { scrollX = chartAttribute.scrollX, scrollY = chartAttribute.scrollY } = chart.attribute;\n    if (scrollX || scrollY) {\n      context.translate(scrollX, scrollY);\n    }\n    let p: any;\n    if (params && params.drawingCb) {\n      p = params.drawingCb();\n    }\n    if (p && p.then) {\n      p.then(() => {\n        if (clip) {\n          context.restore();\n        } else {\n          context.highPerformanceRestore();\n        }\n      });\n    } else if (clip) {\n      context.restore();\n    } else {\n      context.highPerformanceRestore();\n    }\n  }\n}\n"]}
+{"version":3,"sources":["scenegraph/graphic/contributions/chart-render.ts"],"names":[],"mappings":"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","file":"chart-render.js","sourcesContent":["import type {\n  IGraphicAttribute,\n  IContext2d,\n  IDrawContext,\n  IGraphicRender,\n  IGraphicRenderDrawParams,\n  IMarkAttribute,\n  IRenderService,\n  IThemeAttribute\n} from '@visactor/vrender';\nimport { ContributionProvider, getTheme, IGroupRenderContribution, createImage } from '@visactor/vrender';\nimport { inject, injectable, named } from 'inversify';\nimport type { Chart } from '../chart';\nimport { CHART_NUMBER_TYPE } from '../chart';\n\nexport const ChartRender = Symbol.for('ChartRender');\nexport const ChartRenderContribution = Symbol.for('ChartRenderContribution');\n\n@injectable()\nexport class DefaultCanvasChartRender implements IGraphicRender {\n  type: 'chart';\n  numberType: number = CHART_NUMBER_TYPE;\n\n  drawShape(\n    chart: Chart,\n    context: IContext2d,\n    x: number,\n    y: number,\n    drawContext: IDrawContext,\n    params?: IGraphicRenderDrawParams,\n    fillCb?: (\n      ctx: IContext2d,\n      markAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n      themeAttribute: IThemeAttribute\n    ) => boolean,\n    strokeCb?: (\n      ctx: IContext2d,\n      markAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n      themeAttribute: IThemeAttribute\n    ) => boolean\n  ) {\n    const groupAttribute = getTheme(chart, params?.theme).group;\n\n    const { dataId, data, viewBox } = chart.attribute;\n    const { width = groupAttribute.width, height = groupAttribute.height } = chart.attribute;\n\n    const { chartInstance, active, cacheCanvas, activeChartInstance } = chart;\n    // console.log('render chart', chart.parent.col, chart.parent.row, viewBox, cacheCanvas);\n    if (!active && cacheCanvas) {\n      context.drawImage(cacheCanvas, x, y, width, height);\n    } else if (activeChartInstance) {\n      activeChartInstance.updateDataSync('data', data ?? []);\n    } else {\n      // console.log('viewBox', viewBox);\n      const { axes } = chart.attribute;\n      axes.forEach((axis: any, index: number) => {\n        if (axis.type === 'linear') {\n          const chartAxis = chartInstance._chart._components[index];\n          chartAxis._domain = {\n            min: axis.range?.min ?? 0,\n            max: axis.range?.max ?? 0\n          };\n        } else if (axis.type === 'band') {\n          const chartAxis = chartInstance._chart._components[index];\n          chartAxis._spec.domain = axis.domain.slice(0);\n          chartAxis.updateScaleDomain();\n        }\n      });\n      chartInstance.updateViewBox({\n        x1: viewBox.x1 - (chart.getRootNode() as any).table.scrollLeft,\n        x2: viewBox.x2 - (chart.getRootNode() as any).table.scrollLeft,\n        y1: viewBox.y1 - (chart.getRootNode() as any).table.scrollTop,\n        y2: viewBox.y2 - (chart.getRootNode() as any).table.scrollTop\n      });\n      chartInstance.updateDataSync(dataId, data ?? []);\n      const sg = chartInstance.getStage();\n      chart.cacheCanvas = sg.toCanvas(); // 截图空白问题 因为开启了动画 首屏截图是无数据的TODO\n    }\n  }\n\n  draw(chart: Chart, renderService: IRenderService, drawContext: IDrawContext, params?: IGraphicRenderDrawParams) {\n    const { context } = drawContext;\n    if (!context) {\n      return;\n    }\n    // debugger;\n    const { clip } = chart.attribute;\n    if (clip) {\n      context.save();\n    } else {\n      context.highPerformanceSave();\n    }\n    // group直接transform\n    context.transformFromMatrix(chart.transMatrix, true);\n\n    context.beginPath();\n    // 如果跳过绘制，那就不绘制\n    if (params.skipDraw) {\n      this.drawShape(\n        chart,\n        context,\n        0,\n        0,\n        drawContext,\n        params,\n        () => false,\n        () => false\n      );\n    } else {\n      this.drawShape(chart, context, 0, 0, drawContext);\n    }\n\n    // 绘制子元素的时候要添加scroll\n    const chartAttribute = getTheme(chart, params?.theme).group;\n    const { scrollX = chartAttribute.scrollX, scrollY = chartAttribute.scrollY } = chart.attribute;\n    if (scrollX || scrollY) {\n      context.translate(scrollX, scrollY);\n    }\n    let p: any;\n    if (params && params.drawingCb) {\n      p = params.drawingCb();\n    }\n    if (p && p.then) {\n      p.then(() => {\n        if (clip) {\n          context.restore();\n        } else {\n          context.highPerformanceRestore();\n        }\n      });\n    } else if (clip) {\n      context.restore();\n    } else {\n      context.highPerformanceRestore();\n    }\n  }\n}\n"]}

package/cjs/scenegraph/graphic/text.js

@@ -11,10 +11,10 @@ class WrapText extends vrender_1.Text {
         super(params);
     }
     updateSingallineAABBBounds(text) {
-        var _a, _b, _c;
+        var _a, _b;
         const textTheme = (0, vrender_1.getTheme)(this).text;
         let width, str;
-        const buf = 2, attribute = this.attribute, {maxLineWidth: maxLineWidth = textTheme.maxLineWidth, ellipsis: ellipsis = textTheme.ellipsis, textAlign: textAlign = textTheme.textAlign, textBaseline: textBaseline = textTheme.textBaseline, fontSize: fontSize = textTheme.fontSize, fontFamily: fontFamily = textTheme.fontFamily, stroke: stroke = textTheme.stroke, lineHeight: lineHeight = (null !== (_a = attribute.lineHeight) && void 0 !== _a ? _a : (null !== (_c = null !== (_b = attribute.fontSize) && void 0 !== _b ? _b : textTheme.lineHeight) && void 0 !== _c ? _c : textTheme.fontSize) + buf), lineWidth: lineWidth = textTheme.lineWidth} = attribute;
+        const attribute = this.attribute, {maxLineWidth: maxLineWidth = textTheme.maxLineWidth, ellipsis: ellipsis = textTheme.ellipsis, textAlign: textAlign = textTheme.textAlign, textBaseline: textBaseline = textTheme.textBaseline, fontSize: fontSize = textTheme.fontSize, fontFamily: fontFamily = textTheme.fontFamily, stroke: stroke = textTheme.stroke, lineHeight: lineHeight = (null !== (_b = null !== (_a = attribute.lineHeight) && void 0 !== _a ? _a : attribute.fontSize) && void 0 !== _b ? _b : textTheme.fontSize), lineWidth: lineWidth = textTheme.lineWidth} = attribute;
         if (!this.shouldUpdateShape() && this.cache) {
             width = this.cache.clipedWidth;
             const dx = (0, vrender_1.textDrawOffsetX)(textAlign, width), dy = (0, vrender_1.textLayoutOffsetY)(textBaseline, lineHeight, fontSize);
@@ -46,9 +46,9 @@ class WrapText extends vrender_1.Text {
         this._AABBBounds;
     }
     updateMultilineAABBBounds(text) {
-        var _a, _b, _c, _d;
-        const textTheme = (0, vrender_1.getTheme)(this).text, {fontFamily: fontFamily = textTheme.fontFamily, textAlign: textAlign = textTheme.textAlign, textBaseline: textBaseline = textTheme.textBaseline, fontSize: fontSize = textTheme.fontSize, lineHeight: lineHeight = (null !== (_c = null !== (_b = null !== (_a = this.attribute.lineHeight) && void 0 !== _a ? _a : this.attribute.fontSize) && void 0 !== _b ? _b : textTheme.lineHeight) && void 0 !== _c ? _c : textTheme.fontSize), ellipsis: ellipsis = textTheme.ellipsis, maxLineWidth: maxLineWidth, stroke: stroke = textTheme.stroke, lineWidth: lineWidth = textTheme.lineWidth, heightLimit: heightLimit = -1, lineClamp: lineClamp = textTheme.lineClamp, autoWrapText: autoWrapText = textTheme.autoWrapText} = this.attribute;
-        if (!this.shouldUpdateShape() && (null === (_d = this.cache) || void 0 === _d ? void 0 : _d.layoutData)) {
+        var _a, _b, _c;
+        const textTheme = (0, vrender_1.getTheme)(this).text, {fontFamily: fontFamily = textTheme.fontFamily, textAlign: textAlign = textTheme.textAlign, textBaseline: textBaseline = textTheme.textBaseline, fontSize: fontSize = textTheme.fontSize, lineHeight: lineHeight = (null !== (_b = null !== (_a = this.attribute.lineHeight) && void 0 !== _a ? _a : this.attribute.fontSize) && void 0 !== _b ? _b : textTheme.fontSize), ellipsis: ellipsis = textTheme.ellipsis, maxLineWidth: maxLineWidth, stroke: stroke = textTheme.stroke, lineWidth: lineWidth = textTheme.lineWidth, heightLimit: heightLimit = -1, lineClamp: lineClamp = textTheme.lineClamp, autoWrapText: autoWrapText = textTheme.autoWrapText} = this.attribute;
+        if (!this.shouldUpdateShape() && (null === (_c = this.cache) || void 0 === _c ? void 0 : _c.layoutData)) {
             const bbox = this.cache.layoutData.bbox;
             return this._AABBBounds.set(bbox.xOffset, bbox.yOffset, bbox.xOffset + bbox.width, bbox.yOffset + bbox.height), 
             stroke && this._AABBBounds.expand(lineWidth / 2), this._AABBBounds;

package/cjs/scenegraph/graphic/text.js.map

@@ -1 +1 @@
-{"version":3,"sources":["scenegraph/graphic/text.ts"],"names":[],"mappings":"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","file":"text.js","sourcesContent":["import type { ITextGraphicAttribute, LayoutItemType } from '@visactor/vrender';\nimport { getTheme, graphicUtil, Text, CanvasTextLayout, textDrawOffsetX, textLayoutOffsetY } from '@visactor/vrender';\nimport type { Bounds } from '@visactor/vutils';\nimport { textMeasure } from '../utils/measure-text';\n\n/* WrapText功能/dist/core/contributions/textMeasure/layout\n * 1. 按照宽度限制自动折行或显示省略号\n * 2. 高度限制控制显示内容及省略号\n */\n\nconst WRAP_TEXT_UPDATE_TAG_KEY = ['heightLimit', 'lineClamp', 'autoWrapText'];\n\nexport interface IWrapTextGraphicAttribute extends ITextGraphicAttribute {\n  // widthLimit: number;\n  heightLimit?: number;\n  lineClamp?: number;\n  autoWrapText?: boolean;\n}\n\nexport class WrapText extends Text {\n  declare attribute: IWrapTextGraphicAttribute;\n\n  // eslint-disable-next-line no-useless-constructor\n  constructor(params: IWrapTextGraphicAttribute) {\n    super(params);\n  }\n\n  /**\n   * 计算单行文字的bounds，可以缓存长度以及截取的文字\n   * @param text\n   */\n  updateSingallineAABBBounds(text: number | string) {\n    const textTheme = getTheme(this).text;\n    // const textMeasure = graphicUtil.textMeasure;\n    let width: number;\n    let str: string;\n    const buf = 2;\n    const attribute = this.attribute;\n    const {\n      maxLineWidth = textTheme.maxLineWidth,\n      ellipsis = textTheme.ellipsis,\n      textAlign = textTheme.textAlign,\n      textBaseline = textTheme.textBaseline,\n      fontSize = textTheme.fontSize,\n      fontFamily = textTheme.fontFamily,\n      stroke = textTheme.stroke,\n      lineHeight = attribute.lineHeight ?? (attribute.fontSize ?? textTheme.lineHeight ?? textTheme.fontSize) + buf,\n      lineWidth = textTheme.lineWidth\n    } = attribute;\n\n    if (!this.shouldUpdateShape() && this.cache) {\n      width = this.cache.clipedWidth;\n      const dx = textDrawOffsetX(textAlign, width);\n      const dy = textLayoutOffsetY(textBaseline, lineHeight, fontSize);\n      this._AABBBounds.set(dx, dy, dx + width, dy + lineHeight);\n      if (stroke) {\n        this._AABBBounds.expand(lineWidth / 2);\n      }\n      return this._AABBBounds;\n    }\n\n    if (Number.isFinite(maxLineWidth)) {\n      if (ellipsis) {\n        const strEllipsis = (ellipsis === true ? textTheme.ellipsis : ellipsis) as string;\n        const data = textMeasure.clipTextWithSuffix(\n          text.toString(),\n          { fontSize, fontFamily },\n          maxLineWidth,\n          strEllipsis\n        );\n        str = data.str;\n        width = data.width;\n      } else {\n        const data = textMeasure.clipText(text.toString(), { fontSize, fontFamily }, maxLineWidth);\n        str = data.str;\n        width = data.width;\n      }\n      this.cache.clipedText = str;\n      this.cache.clipedWidth = width;\n      // todo 计算原本的宽度\n    } else {\n      width = textMeasure.measureTextWidth(text.toString(), { fontSize, fontFamily });\n      this.cache.clipedText = text.toString();\n      this.cache.clipedWidth = width;\n    }\n    this.clearUpdateShapeTag();\n\n    const dx = textDrawOffsetX(textAlign, width);\n    const dy = textLayoutOffsetY(textBaseline, lineHeight, fontSize);\n    this._AABBBounds.set(dx, dy, dx + width, dy + lineHeight);\n\n    if (stroke) {\n      this._AABBBounds.expand(lineWidth / 2);\n    }\n\n    return this._AABBBounds;\n  }\n\n  /**\n   * 计算多行文字的bounds，缓存每行文字的布局位置\n   * 自动折行params.text是数组，因此只重新updateMultilineAABBBounds\n   * @param text\n   */\n  updateMultilineAABBBounds(text: (number | string)[]) {\n    const textTheme = getTheme(this).text;\n    const {\n      fontFamily = textTheme.fontFamily,\n      textAlign = textTheme.textAlign,\n      textBaseline = textTheme.textBaseline,\n      fontSize = textTheme.fontSize,\n      lineHeight = this.attribute.lineHeight ?? this.attribute.fontSize ?? textTheme.lineHeight ?? textTheme.fontSize,\n      ellipsis = textTheme.ellipsis,\n      maxLineWidth,\n      stroke = textTheme.stroke,\n      lineWidth = textTheme.lineWidth,\n      // widthLimit,\n      heightLimit = -1,\n      lineClamp = (textTheme as any).lineClamp,\n      autoWrapText = (textTheme as any).autoWrapText\n    } = this.attribute;\n\n    if (!this.shouldUpdateShape() && this.cache?.layoutData) {\n      const bbox = this.cache.layoutData.bbox;\n      this._AABBBounds.set(bbox.xOffset, bbox.yOffset, bbox.xOffset + bbox.width, bbox.yOffset + bbox.height);\n      if (stroke) {\n        this._AABBBounds.expand(lineWidth / 2);\n      }\n      return this._AABBBounds;\n    }\n\n    // const textMeasure = graphicUtil.textMeasure;\n    const layoutObj = new CanvasTextLayout(fontFamily, { fontSize, fontFamily }, textMeasure as any) as any;\n\n    // layoutObj内逻辑\n    const lines = text.map(l => l.toString()) as string[];\n    const linesLayout: LayoutItemType[] = [];\n    const bboxWH: [number, number] = [0, 0];\n\n    let lineCountLimit = Infinity;\n    if (heightLimit > 0) {\n      lineCountLimit = Math.max(Math.floor(heightLimit / lineHeight), 1);\n    }\n    if (lineClamp) {\n      // 处理行数限制\n      lineCountLimit = Math.min(lineCountLimit, lineClamp);\n    }\n\n    if (!autoWrapText) {\n      // 使用所有行中最长的作为lineWidth\n      let lineWidth = 0;\n      for (let i = 0, len = lines.length; i < len; i++) {\n        // 判断是否超过高度限制\n        if (i < lineCountLimit) {\n          // 当前行为最后一行\n          const clip = layoutObj.textMeasure.clipTextWithSuffix(\n            lines[i],\n            layoutObj.textOptions,\n            maxLineWidth,\n            ellipsis\n          );\n          linesLayout.push({\n            str: clip.str,\n            width: clip.width\n          });\n          lineWidth = Math.max(lineWidth, clip.width);\n        }\n      }\n      bboxWH[0] = lineWidth;\n    } else if (typeof maxLineWidth === 'number' && maxLineWidth !== Infinity) {\n      // widthLimit > 0\n      if (maxLineWidth > 0) {\n        for (let i = 0; i < lines.length; i++) {\n          const str = lines[i] as string;\n          // // 测量当前行宽度\n          // width = Math.min(\n          //   layoutObj.textMeasure.measureTextWidth(str, layoutObj.textOptions),\n          //   maxLineWidth\n          // );\n\n          // 判断是否超过高度限制\n          if (i === lineCountLimit - 1) {\n            // 当前行为最后一行\n            const clip = layoutObj.textMeasure.clipTextWithSuffix(str, layoutObj.textOptions, maxLineWidth, ellipsis);\n            linesLayout.push({\n              str: clip.str,\n              width: clip.width\n            });\n            break; // 不处理后续行\n          }\n\n          // 测量截断位置\n          const clip = layoutObj.textMeasure.clipText(str, layoutObj.textOptions, maxLineWidth);\n          if (str !== '' && clip.str === '') {\n            // 宽度限制不足一个字符，至少截取一个字符\n            clip.str = str.substring(0, 1);\n            clip.width = textMeasure.measureTextWidth(clip.str, { fontSize, fontFamily });\n          }\n\n          linesLayout.push({\n            str: clip.str,\n            width: clip.width\n          });\n          if (clip.str.length === str.length) {\n            // 不需要截断\n          } else {\n            const newStr = str.substring(clip.str.length);\n            lines.splice(i + 1, 0, newStr);\n          }\n        }\n      }\n      // bboxWH[0] = maxLineWidth;\n      let maxWidth = 0;\n      linesLayout.forEach(layout => {\n        maxWidth = Math.max(maxWidth, layout.width);\n      });\n      bboxWH[0] = maxWidth;\n    } else {\n      // 使用所有行中最长的作为lineWidth\n      let lineWidth = 0;\n      let width: number;\n      let text: string;\n      for (let i = 0, len = lines.length; i < len; i++) {\n        // 判断是否超过高度限制\n        if (i === lineCountLimit - 1) {\n          // 当前行为最后一行\n          const clip = layoutObj.textMeasure.clipTextWithSuffix(\n            lines[i],\n            layoutObj.textOptions,\n            maxLineWidth,\n            ellipsis\n          );\n          linesLayout.push({\n            str: clip.str,\n            width: clip.width\n          });\n          lineWidth = Math.max(lineWidth, clip.width);\n          break; // 不处理后续行\n        }\n\n        text = lines[i] as string;\n        width = layoutObj.textMeasure.measureTextWidth(text, layoutObj.textOptions);\n        lineWidth = Math.max(lineWidth, width);\n        linesLayout.push({ str: text, width });\n      }\n      bboxWH[0] = lineWidth;\n    }\n    bboxWH[1] = linesLayout.length * lineHeight;\n\n    const bbox = {\n      xOffset: 0,\n      yOffset: 0,\n      width: bboxWH[0],\n      height: bboxWH[1]\n    };\n\n    layoutObj.LayoutBBox(bbox, textAlign, textBaseline as any);\n\n    const layoutData = layoutObj.layoutWithBBox(bbox, linesLayout, textAlign, textBaseline as any, lineHeight);\n\n    // const layoutData = layoutObj.GetLayoutByLines(\n    //   text,\n    //   textAlign,\n    //   textBaseline as any,\n    //   lineHeight,\n    //   ellipsis === true ? (DefaultTextAttribute.ellipsis as string) : ellipsis || undefined,\n    //   maxLineWidth\n    // );\n    // const { bbox } = layoutData;\n    this.cache.layoutData = layoutData;\n    this.clearUpdateShapeTag();\n    this._AABBBounds.set(bbox.xOffset, bbox.yOffset, bbox.xOffset + bbox.width, bbox.yOffset + bbox.height);\n\n    if (stroke) {\n      this._AABBBounds.expand(lineWidth / 2);\n    }\n\n    return this._AABBBounds;\n  }\n\n  needUpdateTags(keys: string[]): boolean {\n    for (let i = 0; i < WRAP_TEXT_UPDATE_TAG_KEY.length; i++) {\n      const attrKey = WRAP_TEXT_UPDATE_TAG_KEY[i];\n      if (keys.indexOf(attrKey) !== -1) {\n        return true;\n      }\n    }\n    return super.needUpdateTags(keys);\n  }\n  needUpdateTag(key: string): boolean {\n    for (let i = 0; i < WRAP_TEXT_UPDATE_TAG_KEY.length; i++) {\n      const attrKey = WRAP_TEXT_UPDATE_TAG_KEY[i];\n      if (key === attrKey) {\n        return true;\n      }\n    }\n    return super.needUpdateTag(key);\n  }\n}\n"]}
+{"version":3,"sources":["scenegraph/graphic/text.ts"],"names":[],"mappings":"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","file":"text.js","sourcesContent":["import type { ITextGraphicAttribute, LayoutItemType } from '@visactor/vrender';\nimport { getTheme, graphicUtil, Text, CanvasTextLayout, textDrawOffsetX, textLayoutOffsetY } from '@visactor/vrender';\nimport type { Bounds } from '@visactor/vutils';\nimport { textMeasure } from '../utils/measure-text';\n\n/* WrapText功能/dist/core/contributions/textMeasure/layout\n * 1. 按照宽度限制自动折行或显示省略号\n * 2. 高度限制控制显示内容及省略号\n */\n\nconst WRAP_TEXT_UPDATE_TAG_KEY = ['heightLimit', 'lineClamp', 'autoWrapText'];\n\nexport interface IWrapTextGraphicAttribute extends ITextGraphicAttribute {\n  // widthLimit: number;\n  heightLimit?: number;\n  lineClamp?: number;\n  autoWrapText?: boolean;\n}\n\nexport class WrapText extends Text {\n  declare attribute: IWrapTextGraphicAttribute;\n\n  // eslint-disable-next-line no-useless-constructor\n  constructor(params: IWrapTextGraphicAttribute) {\n    super(params);\n  }\n\n  /**\n   * 计算单行文字的bounds，可以缓存长度以及截取的文字\n   * @param text\n   */\n  updateSingallineAABBBounds(text: number | string) {\n    const textTheme = getTheme(this).text;\n    // const textMeasure = graphicUtil.textMeasure;\n    let width: number;\n    let str: string;\n    const attribute = this.attribute;\n    const {\n      maxLineWidth = textTheme.maxLineWidth,\n      ellipsis = textTheme.ellipsis,\n      textAlign = textTheme.textAlign,\n      textBaseline = textTheme.textBaseline,\n      fontSize = textTheme.fontSize,\n      fontFamily = textTheme.fontFamily,\n      stroke = textTheme.stroke,\n      lineHeight = attribute.lineHeight ?? attribute.fontSize ?? textTheme.fontSize,\n      lineWidth = textTheme.lineWidth\n    } = attribute;\n\n    if (!this.shouldUpdateShape() && this.cache) {\n      width = this.cache.clipedWidth;\n      const dx = textDrawOffsetX(textAlign, width);\n      const dy = textLayoutOffsetY(textBaseline, lineHeight, fontSize);\n      this._AABBBounds.set(dx, dy, dx + width, dy + lineHeight);\n      if (stroke) {\n        this._AABBBounds.expand(lineWidth / 2);\n      }\n      return this._AABBBounds;\n    }\n\n    if (Number.isFinite(maxLineWidth)) {\n      if (ellipsis) {\n        const strEllipsis = (ellipsis === true ? textTheme.ellipsis : ellipsis) as string;\n        const data = textMeasure.clipTextWithSuffix(\n          text.toString(),\n          { fontSize, fontFamily },\n          maxLineWidth,\n          strEllipsis\n        );\n        str = data.str;\n        width = data.width;\n      } else {\n        const data = textMeasure.clipText(text.toString(), { fontSize, fontFamily }, maxLineWidth);\n        str = data.str;\n        width = data.width;\n      }\n      this.cache.clipedText = str;\n      this.cache.clipedWidth = width;\n      // todo 计算原本的宽度\n    } else {\n      width = textMeasure.measureTextWidth(text.toString(), { fontSize, fontFamily });\n      this.cache.clipedText = text.toString();\n      this.cache.clipedWidth = width;\n    }\n    this.clearUpdateShapeTag();\n\n    const dx = textDrawOffsetX(textAlign, width);\n    const dy = textLayoutOffsetY(textBaseline, lineHeight, fontSize);\n    this._AABBBounds.set(dx, dy, dx + width, dy + lineHeight);\n\n    if (stroke) {\n      this._AABBBounds.expand(lineWidth / 2);\n    }\n\n    return this._AABBBounds;\n  }\n\n  /**\n   * 计算多行文字的bounds，缓存每行文字的布局位置\n   * 自动折行params.text是数组，因此只重新updateMultilineAABBBounds\n   * @param text\n   */\n  updateMultilineAABBBounds(text: (number | string)[]) {\n    const textTheme = getTheme(this).text;\n    const {\n      fontFamily = textTheme.fontFamily,\n      textAlign = textTheme.textAlign,\n      textBaseline = textTheme.textBaseline,\n      fontSize = textTheme.fontSize,\n      lineHeight = this.attribute.lineHeight ?? this.attribute.fontSize ?? textTheme.fontSize,\n      ellipsis = textTheme.ellipsis,\n      maxLineWidth,\n      stroke = textTheme.stroke,\n      lineWidth = textTheme.lineWidth,\n      // widthLimit,\n      heightLimit = -1,\n      lineClamp = (textTheme as any).lineClamp,\n      autoWrapText = (textTheme as any).autoWrapText\n    } = this.attribute;\n\n    if (!this.shouldUpdateShape() && this.cache?.layoutData) {\n      const bbox = this.cache.layoutData.bbox;\n      this._AABBBounds.set(bbox.xOffset, bbox.yOffset, bbox.xOffset + bbox.width, bbox.yOffset + bbox.height);\n      if (stroke) {\n        this._AABBBounds.expand(lineWidth / 2);\n      }\n      return this._AABBBounds;\n    }\n\n    // const textMeasure = graphicUtil.textMeasure;\n    const layoutObj = new CanvasTextLayout(fontFamily, { fontSize, fontFamily }, textMeasure as any) as any;\n\n    // layoutObj内逻辑\n    const lines = text.map(l => l.toString()) as string[];\n    const linesLayout: LayoutItemType[] = [];\n    const bboxWH: [number, number] = [0, 0];\n\n    let lineCountLimit = Infinity;\n    if (heightLimit > 0) {\n      lineCountLimit = Math.max(Math.floor(heightLimit / lineHeight), 1);\n    }\n    if (lineClamp) {\n      // 处理行数限制\n      lineCountLimit = Math.min(lineCountLimit, lineClamp);\n    }\n\n    if (!autoWrapText) {\n      // 使用所有行中最长的作为lineWidth\n      let lineWidth = 0;\n      for (let i = 0, len = lines.length; i < len; i++) {\n        // 判断是否超过高度限制\n        if (i < lineCountLimit) {\n          // 当前行为最后一行\n          const clip = layoutObj.textMeasure.clipTextWithSuffix(\n            lines[i],\n            layoutObj.textOptions,\n            maxLineWidth,\n            ellipsis\n          );\n          linesLayout.push({\n            str: clip.str,\n            width: clip.width\n          });\n          lineWidth = Math.max(lineWidth, clip.width);\n        }\n      }\n      bboxWH[0] = lineWidth;\n    } else if (typeof maxLineWidth === 'number' && maxLineWidth !== Infinity) {\n      // widthLimit > 0\n      if (maxLineWidth > 0) {\n        for (let i = 0; i < lines.length; i++) {\n          const str = lines[i] as string;\n          // // 测量当前行宽度\n          // width = Math.min(\n          //   layoutObj.textMeasure.measureTextWidth(str, layoutObj.textOptions),\n          //   maxLineWidth\n          // );\n\n          // 判断是否超过高度限制\n          if (i === lineCountLimit - 1) {\n            // 当前行为最后一行\n            const clip = layoutObj.textMeasure.clipTextWithSuffix(str, layoutObj.textOptions, maxLineWidth, ellipsis);\n            linesLayout.push({\n              str: clip.str,\n              width: clip.width\n            });\n            break; // 不处理后续行\n          }\n\n          // 测量截断位置\n          const clip = layoutObj.textMeasure.clipText(str, layoutObj.textOptions, maxLineWidth);\n          if (str !== '' && clip.str === '') {\n            // 宽度限制不足一个字符，至少截取一个字符\n            clip.str = str.substring(0, 1);\n            clip.width = textMeasure.measureTextWidth(clip.str, { fontSize, fontFamily });\n          }\n\n          linesLayout.push({\n            str: clip.str,\n            width: clip.width\n          });\n          if (clip.str.length === str.length) {\n            // 不需要截断\n          } else {\n            const newStr = str.substring(clip.str.length);\n            lines.splice(i + 1, 0, newStr);\n          }\n        }\n      }\n      // bboxWH[0] = maxLineWidth;\n      let maxWidth = 0;\n      linesLayout.forEach(layout => {\n        maxWidth = Math.max(maxWidth, layout.width);\n      });\n      bboxWH[0] = maxWidth;\n    } else {\n      // 使用所有行中最长的作为lineWidth\n      let lineWidth = 0;\n      let width: number;\n      let text: string;\n      for (let i = 0, len = lines.length; i < len; i++) {\n        // 判断是否超过高度限制\n        if (i === lineCountLimit - 1) {\n          // 当前行为最后一行\n          const clip = layoutObj.textMeasure.clipTextWithSuffix(\n            lines[i],\n            layoutObj.textOptions,\n            maxLineWidth,\n            ellipsis\n          );\n          linesLayout.push({\n            str: clip.str,\n            width: clip.width\n          });\n          lineWidth = Math.max(lineWidth, clip.width);\n          break; // 不处理后续行\n        }\n\n        text = lines[i] as string;\n        width = layoutObj.textMeasure.measureTextWidth(text, layoutObj.textOptions);\n        lineWidth = Math.max(lineWidth, width);\n        linesLayout.push({ str: text, width });\n      }\n      bboxWH[0] = lineWidth;\n    }\n    bboxWH[1] = linesLayout.length * lineHeight;\n\n    const bbox = {\n      xOffset: 0,\n      yOffset: 0,\n      width: bboxWH[0],\n      height: bboxWH[1]\n    };\n\n    layoutObj.LayoutBBox(bbox, textAlign, textBaseline as any);\n\n    const layoutData = layoutObj.layoutWithBBox(bbox, linesLayout, textAlign, textBaseline as any, lineHeight);\n\n    // const layoutData = layoutObj.GetLayoutByLines(\n    //   text,\n    //   textAlign,\n    //   textBaseline as any,\n    //   lineHeight,\n    //   ellipsis === true ? (DefaultTextAttribute.ellipsis as string) : ellipsis || undefined,\n    //   maxLineWidth\n    // );\n    // const { bbox } = layoutData;\n    this.cache.layoutData = layoutData;\n    this.clearUpdateShapeTag();\n    this._AABBBounds.set(bbox.xOffset, bbox.yOffset, bbox.xOffset + bbox.width, bbox.yOffset + bbox.height);\n\n    if (stroke) {\n      this._AABBBounds.expand(lineWidth / 2);\n    }\n\n    return this._AABBBounds;\n  }\n\n  needUpdateTags(keys: string[]): boolean {\n    for (let i = 0; i < WRAP_TEXT_UPDATE_TAG_KEY.length; i++) {\n      const attrKey = WRAP_TEXT_UPDATE_TAG_KEY[i];\n      if (keys.indexOf(attrKey) !== -1) {\n        return true;\n      }\n    }\n    return super.needUpdateTags(keys);\n  }\n  needUpdateTag(key: string): boolean {\n    for (let i = 0; i < WRAP_TEXT_UPDATE_TAG_KEY.length; i++) {\n      const attrKey = WRAP_TEXT_UPDATE_TAG_KEY[i];\n      if (key === attrKey) {\n        return true;\n      }\n    }\n    return super.needUpdateTag(key);\n  }\n}\n"]}

package/cjs/scenegraph/group-creater/cell-helper.d.ts

@@ -2,5 +2,5 @@ import type { IThemeSpec } from '@visactor/vrender';
 import type { CellRange, ColumnDefine, ColumnTypeOption } from '../../ts-types';
 import { Group } from '../graphic/group';
 import type { BaseTableAPI } from '../../ts-types/base-table';
-export declare function createCell(type: ColumnTypeOption, define: ColumnDefine, table: BaseTableAPI, col: number, row: number, colWidth: number, bgColorFunc: Function, cellWidth: number, cellHeight: number, columnGroup: Group, y: number, padding: [number, number, number, number], textAlign: CanvasTextAlign, textBaseline: CanvasTextBaseline, mayHaveIcon: boolean, isfunctionalProps: boolean, isMerge: boolean, range: CellRange, cellTheme?: IThemeSpec): Group;
+export declare function createCell(type: ColumnTypeOption, define: ColumnDefine, table: BaseTableAPI, col: number, row: number, colWidth: number, bgColorFunc: Function, cellWidth: number, cellHeight: number, columnGroup: Group, y: number, padding: [number, number, number, number], textAlign: CanvasTextAlign, textBaseline: CanvasTextBaseline, mayHaveIcon: boolean, isMerge: boolean, range: CellRange, cellTheme: IThemeSpec): Group;
 export declare function updateCell(col: number, row: number, table: BaseTableAPI, addNew?: boolean): Group;

package/cjs/scenegraph/group-creater/cell-helper.js

@@ -4,9 +4,9 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.updateCell = exports.createCell = void 0;
 
-const global_1 = require("../../tools/global"), custom_1 = require("../component/custom"), group_1 = require("../graphic/group"), get_prop_1 = require("../utils/get-prop"), chart_cell_1 = require("./cell-type/chart-cell"), image_cell_1 = require("./cell-type/image-cell"), progress_bar_cell_1 = require("./cell-type/progress-bar-cell"), spark_line_cell_1 = require("./cell-type/spark-line-cell"), text_cell_1 = require("./cell-type/text-cell"), video_cell_1 = require("./cell-type/video-cell"), tableHelper_1 = require("../../core/tableHelper"), helper_1 = require("../../tools/helper"), deal_promise_data_1 = require("../utils/deal-promise-data");
+const global_1 = require("../../tools/global"), custom_1 = require("../component/custom"), group_1 = require("../graphic/group"), get_prop_1 = require("../utils/get-prop"), chart_cell_1 = require("./cell-type/chart-cell"), image_cell_1 = require("./cell-type/image-cell"), progress_bar_cell_1 = require("./cell-type/progress-bar-cell"), spark_line_cell_1 = require("./cell-type/spark-line-cell"), text_cell_1 = require("./cell-type/text-cell"), video_cell_1 = require("./cell-type/video-cell"), tableHelper_1 = require("../../core/tableHelper"), helper_1 = require("../../tools/helper"), deal_promise_data_1 = require("../utils/deal-promise-data"), axis_1 = require("../../components/axis/axis");
 
-function createCell(type, define, table, col, row, colWidth, bgColorFunc, cellWidth, cellHeight, columnGroup, y, padding, textAlign, textBaseline, mayHaveIcon, isfunctionalProps, isMerge, range, cellTheme) {
+function createCell(type, define, table, col, row, colWidth, bgColorFunc, cellWidth, cellHeight, columnGroup, y, padding, textAlign, textBaseline, mayHaveIcon, isMerge, range, cellTheme) {
     let cellGroup;
     if ("text" === type || "link" === type) {
         if ("link" === type) {
@@ -33,25 +33,32 @@ function createCell(type, define, table, col, row, colWidth, bgColorFunc, cellWi
         if ("body" !== table.getCellType(col, row) ? (customRender = null == define ? void 0 : define.headerCustomRender, 
         customLayout = null == define ? void 0 : define.headerCustomLayout) : (customRender = (null == define ? void 0 : define.customRender) || table.customRender, 
         customLayout = null == define ? void 0 : define.customLayout), customLayout || customRender) {
-            const {autoRowHeight: autoRowHeight} = table.internalProps, customResult = (0, custom_1.dealWithCustom)(customLayout, customRender, col, row, table.getColWidth(col), table.getRowHeight(row), !1, autoRowHeight, table);
+            const customResult = (0, custom_1.dealWithCustom)(customLayout, customRender, col, row, table.getColWidth(col), table.getRowHeight(row), !1, "autoHeight" === table.heightMode, table);
             customElementsGroup = customResult.elementsGroup, renderDefault = customResult.renderDefault;
         }
-        cellGroup = (0, text_cell_1.createCellGroup)(table, columnGroup, 0, y, col, row, colWidth, cellWidth, cellHeight, padding, textAlign, textBaseline, mayHaveIcon, isfunctionalProps, customElementsGroup, renderDefault, cellTheme), 
+        cellGroup = (0, text_cell_1.createCellGroup)(table, columnGroup, 0, y, col, row, colWidth, cellWidth, cellHeight, padding, textAlign, textBaseline, mayHaveIcon, customElementsGroup, renderDefault, cellTheme), 
         isMerge && (cellGroup.mergeCol = range.end.col, cellGroup.mergeRow = range.end.row);
+        const axisConfig = table.internalProps.layoutMap.getAxisConfigInPivotChart(col, row);
+        if (axisConfig) {
+            const axis = new axis_1.CartesianAxis(axisConfig, cellGroup.attribute.width, cellGroup.attribute.height, table);
+            cellGroup.clear(), cellGroup.appendChild(axis.component), axis.overlap();
+        } else table.internalProps.layoutMap.isEmpty(col, row) && cellGroup.clear();
     } else if ("image" === type) cellGroup = (0, image_cell_1.createImageCellGroup)(columnGroup, 0, y, col, row, table.getColWidth(col), table.getRowHeight(row), define.keepAspectRatio, define.imageAutoSizing, padding, textAlign, textBaseline, table, cellTheme); else if ("video" === type) cellGroup = (0, 
-    video_cell_1.createVideoCellGroup)(columnGroup, 0, y, col, row, table.getColWidth(col), table.getRowHeight(row), define.keepAspectRatio, define.imageAutoSizing, padding, textAlign, textBaseline, table, cellTheme); else if ("chart" === type) cellGroup = (0, 
-    chart_cell_1.createChartCellGroup)(null, columnGroup, 0, y, col, row, table.getColWidth(col), table.getRowHeight(row), padding, table.getCellValue(col, row), define.chartType, define.chartSpec, columnGroup.attribute.chartInstance, table); else if ("progressbar" === type) {
+    video_cell_1.createVideoCellGroup)(columnGroup, 0, y, col, row, table.getColWidth(col), table.getRowHeight(row), define.keepAspectRatio, define.imageAutoSizing, padding, textAlign, textBaseline, table, cellTheme); else if ("chart" === type) {
+        const chartInstance = table.internalProps.layoutMap.getChartInstance(col, row);
+        cellGroup = (0, chart_cell_1.createChartCellGroup)(null, columnGroup, 0, y, col, row, table.getColWidth(col), table.getRowHeight(row), padding, table.getCellValue(col, row), define.chartType, table.isPivotChart() ? table.internalProps.layoutMap.getChartSpec(col, row) : define.chartSpec, chartInstance, table, cellTheme);
+    } else if ("progressbar" === type) {
         const style = table._getCellStyle(col, row), value = table.getCellValue(col, row), dataValue = table.getCellOriginValue(col, row);
-        cellGroup = (0, text_cell_1.createCellGroup)(table, columnGroup, 0, y, col, row, colWidth, cellWidth, cellHeight, padding, textAlign, textBaseline, !1, !0, null, !0, cellTheme);
+        cellGroup = (0, text_cell_1.createCellGroup)(table, columnGroup, 0, y, col, row, colWidth, cellWidth, cellHeight, padding, textAlign, textBaseline, !1, null, !0, cellTheme);
         const progressBarGroup = (0, progress_bar_cell_1.createProgressBarCell)(define, style, colWidth, value, dataValue, col, row, padding, table);
         cellGroup.insertBefore(progressBarGroup, cellGroup.firstChild);
-    } else "sparkline" === type && (cellGroup = (0, spark_line_cell_1.createSparkLineCellGroup)(null, columnGroup, 0, y, col, row, cellWidth, cellHeight, padding, table));
+    } else "sparkline" === type && (cellGroup = (0, spark_line_cell_1.createSparkLineCellGroup)(null, columnGroup, 0, y, col, row, cellWidth, cellHeight, padding, table, cellTheme));
     return cellGroup;
 }
 
 function updateCell(col, row, table, addNew) {
     var _a, _b, _c, _d, _e;
-    const oldCellGroup = table.scenegraph.getCell(col, row, !0), type = table.isHeader(col, row) ? table._getHeaderLayoutMap(col, row).headerType : table.getBodyColumnType(col, row), cellType = table.getCellType(col, row), define = "body" !== cellType ? table.getHeaderDefine(col, row) : table.getBodyColumnDefine(col, row);
+    const oldCellGroup = table.scenegraph.highPerformanceGetCell(col, row, !0), type = table.isHeader(col, row) ? table._getHeaderLayoutMap(col, row).headerType : table.getBodyColumnType(col, row), cellType = table.getCellType(col, row), define = "body" !== cellType ? table.getHeaderDefine(col, row) : table.getBodyColumnDefine(col, row);
     let isMerge, range, newCellGroup;
     if (("body" !== cellType || (null == define ? void 0 : define.mergeCell)) && (range = table.getCellRange(col, row), 
     isMerge = range.start.col !== range.end.col || range.start.row !== range.end.row), 
@@ -67,7 +74,7 @@ function updateCell(col, row, table, addNew) {
         cellHeight = table.getRowsHeight(range.start.row, range.end.row)) : (cellWidth = table.getColWidth(col), 
         cellHeight = table.getRowHeight(row));
         const value = table.getCellValue(col, row);
-        (0, helper_1.isPromise)(value) ? (oldCellGroup.removeAllChild(), (0, deal_promise_data_1.dealPromiseData)(value, table, updateCellContent.bind(null, type, define, table, col, row, bgColorFunc, customRender, customLayout, cellWidth, cellHeight, oldCellGroup, padding, textAlign, textBaseline, mayHaveIcon, isMerge, range, addNew, cellTheme))) : newCellGroup = updateCellContent(type, define, table, col, row, bgColorFunc, cellWidth, cellHeight, oldCellGroup, padding, textAlign, textBaseline, mayHaveIcon, isMerge, range, addNew, cellTheme);
+        (0, helper_1.isPromise)(value) ? (oldCellGroup.removeAllChild(), (0, deal_promise_data_1.dealPromiseData)(value, table, updateCellContent.bind(null, type, define, table, col, row, bgColorFunc, cellWidth, cellHeight, oldCellGroup, padding, textAlign, textBaseline, mayHaveIcon, isMerge, range, addNew, cellTheme))) : newCellGroup = updateCellContent(type, define, table, col, row, bgColorFunc, cellWidth, cellHeight, oldCellGroup, padding, textAlign, textBaseline, mayHaveIcon, isMerge, range, addNew, cellTheme);
     } else newCellGroup = new group_1.Group({
         x: 0,
         y: addNew ? 0 : oldCellGroup.attribute.y,
@@ -82,8 +89,10 @@ function updateCell(col, row, table, addNew) {
 }
 
 function updateCellContent(type, define, table, col, row, bgColorFunc, cellWidth, cellHeight, oldCellGroup, padding, textAlign, textBaseline, mayHaveIcon, isMerge, range, addNew, cellTheme) {
-    const newCellGroup = createCell(type, define, table, col, row, table.getColWidth(col), bgColorFunc, cellWidth, cellHeight, addNew ? table.scenegraph.getColGroup(col) : oldCellGroup.parent, addNew ? 0 : oldCellGroup.attribute.y, padding, textAlign, textBaseline, mayHaveIcon, !1, isMerge, range, cellTheme);
-    return addNew || (oldCellGroup.parent.insertAfter(newCellGroup, oldCellGroup), oldCellGroup.parent.removeChild(oldCellGroup)), 
+    var _a, _b;
+    const newCellGroup = createCell(type, define, table, col, row, table.getColWidth(col), bgColorFunc, cellWidth, cellHeight, addNew ? table.scenegraph.getColGroup(col) : oldCellGroup.parent, addNew ? 0 : oldCellGroup.attribute.y, padding, textAlign, textBaseline, mayHaveIcon, isMerge, range, cellTheme);
+    return addNew || (oldCellGroup.parent.insertAfter(newCellGroup, oldCellGroup), oldCellGroup.parent.removeChild(oldCellGroup), 
+    (null === (_a = table.scenegraph) || void 0 === _a ? void 0 : _a.proxy.cellCache.get(col)) && (null === (_b = table.scenegraph) || void 0 === _b || _b.proxy.cellCache.set(col, newCellGroup))), 
     newCellGroup;
 }
 

package/cjs/scenegraph/group-creater/cell-helper.js.map

@@ -1 +1 @@
-{"version":3,"sources":["scenegraph/group-creater/cell-helper.ts"],"names":[],"mappings":"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","file":"cell-helper.js","sourcesContent":["import type { Cursor, IThemeSpec } from '@visactor/vrender';\nimport type { ProgressBarStyle } from '../../body-helper/style/ProgressBarStyle';\nimport { regUrl } from '../../tools/global';\nimport type {\n  CellRange,\n  ChartColumnDefine,\n  ColumnDefine,\n  ColumnTypeOption,\n  ICustomRender,\n  ImageColumnDefine,\n  MappingRule,\n  ProgressbarColumnDefine,\n  TextColumnDefine\n} from '../../ts-types';\nimport { dealWithCustom } from '../component/custom';\nimport { Group } from '../graphic/group';\nimport { getProp } from '../utils/get-prop';\nimport { createChartCellGroup } from './cell-type/chart-cell';\nimport { createImageCellGroup } from './cell-type/image-cell';\nimport { createProgressBarCell } from './cell-type/progress-bar-cell';\nimport { createSparkLineCellGroup } from './cell-type/spark-line-cell';\nimport { createCellGroup } from './cell-type/text-cell';\nimport { createVideoCellGroup } from './cell-type/video-cell';\nimport type { ICustomLayoutFuc } from '../../ts-types/customLayout';\nimport type { BaseTableAPI, PivotTableProtected } from '../../ts-types/base-table';\nimport { getStyleTheme } from '../../core/tableHelper';\nimport { isPromise } from '../../tools/helper';\nimport { dealPromiseData } from '../utils/deal-promise-data';\n\nexport function createCell(\n  type: ColumnTypeOption,\n  define: ColumnDefine,\n  table: BaseTableAPI,\n  col: number,\n  row: number,\n  colWidth: number,\n  bgColorFunc: Function,\n  cellWidth: number,\n  cellHeight: number,\n  columnGroup: Group,\n  y: number,\n  padding: [number, number, number, number],\n  textAlign: CanvasTextAlign,\n  textBaseline: CanvasTextBaseline,\n  mayHaveIcon: boolean,\n  isfunctionalProps: boolean,\n  isMerge: boolean,\n  range: CellRange,\n  cellTheme?: IThemeSpec\n): Group {\n  let cellGroup: Group;\n  if (type === 'text' || type === 'link') {\n    if (type === 'link') {\n      //如果是超链接 颜色按照linkColor绘制 TODO：放到方法_getCellStyle中\n      // const columnDefine = table.getHeaderDefine(col, row);\n      const cellValue = table.getCellValue(col, row);\n      const headerStyle = table._getCellStyle(col, row);\n\n      if (\n        type === 'link' &&\n        (('templateLink' in define && define.templateLink) ||\n          !('linkDetect' in define && define.linkDetect) ||\n          regUrl.test(cellValue))\n      ) {\n        if (cellTheme) {\n          cellTheme.text.fill = getProp('linkColor', headerStyle, col, row, table);\n          (cellTheme as any).group.cursor = 'pointer';\n        } else {\n          cellTheme = {\n            text: {\n              fill: getProp('linkColor', headerStyle, col, row, table)\n            },\n            group: {\n              cursor: 'pointer' as Cursor\n            }\n          };\n        }\n      }\n    }\n    // 判断是否有mapping  遍历dataset中mappingRules 但这里还需要根据fieldName来判断\n    if (bgColorFunc) {\n      const cellValue = table.getCellOriginValue(col, row);\n      const bgColor = bgColorFunc(table, cellValue);\n      if (bgColor) {\n        if (cellTheme) {\n          cellTheme.group.fill = bgColor;\n        } else {\n          cellTheme = {\n            group: {\n              fill: bgColor\n            }\n          };\n        }\n      }\n    }\n\n    let customElementsGroup;\n    let renderDefault = true;\n    let customRender;\n    let customLayout;\n    const cellType = table.getCellType(col, row);\n    if (cellType !== 'body') {\n      customRender = define?.headerCustomRender;\n      customLayout = define?.headerCustomLayout;\n    } else {\n      customRender = define?.customRender || table.customRender;\n      customLayout = define?.customLayout;\n    }\n\n    if (customLayout || customRender) {\n      const { autoRowHeight } = table.internalProps;\n      const customResult = dealWithCustom(\n        customLayout,\n        customRender,\n        col,\n        row,\n        table.getColWidth(col),\n        table.getRowHeight(row),\n        false,\n        autoRowHeight,\n        table\n      );\n      customElementsGroup = customResult.elementsGroup;\n      renderDefault = customResult.renderDefault;\n    }\n    cellGroup = createCellGroup(\n      table,\n      columnGroup,\n      0,\n      y,\n      col,\n      row,\n      colWidth,\n      cellWidth,\n      cellHeight,\n      padding,\n      textAlign,\n      textBaseline,\n      mayHaveIcon,\n      isfunctionalProps,\n      customElementsGroup,\n      renderDefault,\n      cellTheme\n    );\n    if (isMerge) {\n      cellGroup.mergeCol = range.end.col;\n      cellGroup.mergeRow = range.end.row;\n    }\n  } else if (type === 'image') {\n    // 创建图片单元格\n    cellGroup = createImageCellGroup(\n      columnGroup,\n      0,\n      y,\n      col,\n      row,\n      table.getColWidth(col),\n      table.getRowHeight(row),\n      (define as ImageColumnDefine).keepAspectRatio,\n      (define as ImageColumnDefine).imageAutoSizing,\n      padding,\n      textAlign,\n      textBaseline,\n      table,\n      cellTheme\n    );\n  } else if (type === 'video') {\n    // 创建视频单元格\n    cellGroup = createVideoCellGroup(\n      columnGroup,\n      0,\n      y,\n      col,\n      row,\n      table.getColWidth(col),\n      table.getRowHeight(row),\n      (define as ImageColumnDefine).keepAspectRatio,\n      (define as ImageColumnDefine).imageAutoSizing,\n      padding,\n      textAlign,\n      textBaseline,\n      table,\n      cellTheme\n    );\n  } else if (type === 'chart') {\n    cellGroup = createChartCellGroup(\n      null,\n      columnGroup,\n      0,\n      y,\n      col,\n      row,\n      table.getColWidth(col),\n      table.getRowHeight(row),\n      padding,\n      table.getCellValue(col, row),\n      (define as ChartColumnDefine).chartType,\n      (define as ChartColumnDefine).chartSpec,\n      (columnGroup.attribute as any).chartInstance,\n      table\n    );\n  } else if (type === 'progressbar') {\n    const style = table._getCellStyle(col, row) as ProgressBarStyle;\n    const value = table.getCellValue(col, row);\n    const dataValue = table.getCellOriginValue(col, row);\n    // 创建基础文字单元格\n    cellGroup = createCellGroup(\n      table,\n      columnGroup,\n      0,\n      y,\n      col,\n      row,\n      colWidth,\n      cellWidth,\n      cellHeight,\n      padding,\n      textAlign,\n      textBaseline,\n      false,\n      true,\n      null,\n      true,\n      cellTheme\n    );\n\n    // 创建bar group\n    const progressBarGroup = createProgressBarCell(\n      define as ProgressbarColumnDefine,\n      style,\n      colWidth,\n      value,\n      dataValue,\n      col,\n      row,\n      padding,\n      table\n    );\n    // 进度图插入到文字前，绘制在文字下\n    cellGroup.insertBefore(progressBarGroup, cellGroup.firstChild);\n  } else if (type === 'sparkline') {\n    cellGroup = createSparkLineCellGroup(null, columnGroup, 0, y, col, row, cellWidth, cellHeight, padding, table);\n  }\n\n  return cellGroup;\n}\n\nexport function updateCell(col: number, row: number, table: BaseTableAPI, addNew?: boolean) {\n  const oldCellGroup = table.scenegraph.getCell(col, row, true);\n\n  const type = table.isHeader(col, row)\n    ? table._getHeaderLayoutMap(col, row).headerType\n    : table.getBodyColumnType(col, row);\n  const cellType = table.getCellType(col, row);\n  const define = cellType !== 'body' ? table.getHeaderDefine(col, row) : table.getBodyColumnDefine(col, row);\n\n  let isMerge;\n  let range;\n  if (cellType !== 'body' || (define as TextColumnDefine)?.mergeCell) {\n    // 只有表头或者column配置合并单元格后再进行信息获取\n    range = table.getCellRange(col, row);\n    isMerge = range.start.col !== range.end.col || range.start.row !== range.end.row;\n  }\n\n  let newCellGroup;\n  if (isMerge && (col !== range.start.col || row !== range.start.row)) {\n    // 合并单元格的非起始单元格不需要绘制\n    newCellGroup = new Group({\n      x: 0,\n      y: addNew ? 0 : oldCellGroup.attribute.y,\n      width: 0,\n      height: 0,\n      visible: false,\n      pickable: false\n    });\n    newCellGroup.role = 'shadow-cell';\n    newCellGroup.col = col;\n    newCellGroup.row = row;\n    newCellGroup.mergeCol = range.start.col;\n    newCellGroup.mergeRow = range.start.row;\n\n    if (!addNew) {\n      oldCellGroup.parent.insertAfter(newCellGroup, oldCellGroup);\n      oldCellGroup.parent.removeChild(oldCellGroup);\n    }\n  } else {\n    const mayHaveIcon = cellType !== 'body' ? true : !!define?.icon || !!define?.tree;\n    const headerStyle = table._getCellStyle(col, row);\n    const cellTheme = getStyleTheme(headerStyle, table, col, row, getProp).theme;\n    const padding = cellTheme._vtable.padding;\n    const textAlign = cellTheme._vtable.textAlign;\n    const textBaseline = cellTheme._vtable.textBaseline;\n\n    let bgColorFunc: Function;\n    // 判断是否有mapping  遍历dataset中mappingRules\n    if ((table.internalProps as PivotTableProtected)?.dataConfig?.mappingRules && cellType === 'body') {\n      (table.internalProps as PivotTableProtected)?.dataConfig?.mappingRules?.forEach(\n        (mappingRule: MappingRule, i: number) => {\n          if (mappingRule.bgColor) {\n            bgColorFunc = mappingRule.bgColor.mapping;\n          }\n        }\n      );\n    }\n\n    let customRender;\n    let customLayout;\n    if (cellType !== 'body') {\n      customRender = define?.headerCustomRender;\n      customLayout = define?.headerCustomLayout;\n    } else {\n      customRender = define?.customRender || table.customRender;\n      customLayout = define?.customLayout;\n    }\n\n    let cellWidth;\n    let cellHeight;\n    if (range) {\n      cellWidth = table.getColsWidth(range.start.col, range.end.col);\n      cellHeight = table.getRowsHeight(range.start.row, range.end.row);\n    } else {\n      cellWidth = table.getColWidth(col);\n      cellHeight = table.getRowHeight(row);\n    }\n\n    // deal with promise data\n    const value = table.getCellValue(col, row);\n    if (isPromise(value)) {\n      // clear cell content sync\n      oldCellGroup.removeAllChild();\n\n      // update cell content async\n      dealPromiseData(\n        value,\n        table,\n        updateCellContent.bind(\n          null,\n          type,\n          define,\n          table,\n          col,\n          row,\n          bgColorFunc,\n          customRender,\n          customLayout,\n          cellWidth,\n          cellHeight,\n          oldCellGroup,\n          padding,\n          textAlign,\n          textBaseline,\n          mayHaveIcon,\n          isMerge,\n          range,\n          addNew,\n          cellTheme\n        )\n      );\n    } else {\n      newCellGroup = updateCellContent(\n        type,\n        define,\n        table,\n        col,\n        row,\n        bgColorFunc,\n        cellWidth,\n        cellHeight,\n        oldCellGroup,\n        padding,\n        textAlign,\n        textBaseline,\n        mayHaveIcon,\n        isMerge,\n        range,\n        addNew,\n        cellTheme\n      );\n    }\n  }\n\n  return newCellGroup;\n}\n\nfunction updateCellContent(\n  type: ColumnTypeOption,\n  define: ColumnDefine,\n  table: BaseTableAPI,\n  col: number,\n  row: number,\n  bgColorFunc: Function,\n  cellWidth: number,\n  cellHeight: number,\n  oldCellGroup: Group,\n  padding: [number, number, number, number],\n  textAlign: CanvasTextAlign,\n  textBaseline: CanvasTextBaseline,\n  mayHaveIcon: boolean,\n  isMerge: boolean,\n  range: CellRange,\n  addNew: boolean,\n  cellTheme?: IThemeSpec\n) {\n  const newCellGroup = createCell(\n    type,\n    define,\n    table,\n    col,\n    row,\n    table.getColWidth(col),\n    bgColorFunc,\n    cellWidth,\n    cellHeight,\n    // oldCellGroup.parent,\n    addNew ? table.scenegraph.getColGroup(col) : oldCellGroup.parent,\n    // oldCellGroup.attribute.y,\n    addNew ? 0 : oldCellGroup.attribute.y,\n    padding,\n    textAlign,\n    textBaseline,\n    mayHaveIcon,\n    false,\n    isMerge,\n    range,\n    cellTheme\n  );\n  if (!addNew) {\n    oldCellGroup.parent.insertAfter(newCellGroup, oldCellGroup);\n    oldCellGroup.parent.removeChild(oldCellGroup);\n  }\n  return newCellGroup;\n}\n"]}
+{"version":3,"sources":["scenegraph/group-creater/cell-helper.ts"],"names":[],"mappings":"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","file":"cell-helper.js","sourcesContent":["import type { Cursor, IThemeSpec } from '@visactor/vrender';\nimport type { ProgressBarStyle } from '../../body-helper/style/ProgressBarStyle';\nimport { regUrl } from '../../tools/global';\nimport type {\n  CellRange,\n  ChartColumnDefine,\n  ColumnDefine,\n  ColumnTypeOption,\n  ICustomRender,\n  ImageColumnDefine,\n  MappingRule,\n  ProgressbarColumnDefine,\n  TextColumnDefine\n} from '../../ts-types';\nimport { dealWithCustom } from '../component/custom';\nimport { Group } from '../graphic/group';\nimport { getProp } from '../utils/get-prop';\nimport { createChartCellGroup } from './cell-type/chart-cell';\nimport { createImageCellGroup } from './cell-type/image-cell';\nimport { createProgressBarCell } from './cell-type/progress-bar-cell';\nimport { createSparkLineCellGroup } from './cell-type/spark-line-cell';\nimport { createCellGroup } from './cell-type/text-cell';\nimport { createVideoCellGroup } from './cell-type/video-cell';\nimport type { ICustomLayoutFuc } from '../../ts-types/customLayout';\nimport type { BaseTableAPI, PivotTableProtected } from '../../ts-types/base-table';\nimport { getStyleTheme } from '../../core/tableHelper';\nimport { isPromise } from '../../tools/helper';\nimport { dealPromiseData } from '../utils/deal-promise-data';\nimport { CartesianAxis } from '../../components/axis/axis';\nimport type { PivotLayoutMap } from '../../layout/pivot-layout';\n\nexport function createCell(\n  type: ColumnTypeOption,\n  define: ColumnDefine,\n  table: BaseTableAPI,\n  col: number,\n  row: number,\n  colWidth: number,\n  bgColorFunc: Function,\n  cellWidth: number,\n  cellHeight: number,\n  columnGroup: Group,\n  y: number,\n  padding: [number, number, number, number],\n  textAlign: CanvasTextAlign,\n  textBaseline: CanvasTextBaseline,\n  mayHaveIcon: boolean,\n  isMerge: boolean,\n  range: CellRange,\n  cellTheme: IThemeSpec\n): Group {\n  let cellGroup: Group;\n  if (type === 'text' || type === 'link') {\n    if (type === 'link') {\n      //如果是超链接 颜色按照linkColor绘制 TODO：放到方法_getCellStyle中\n      // const columnDefine = table.getHeaderDefine(col, row);\n      const cellValue = table.getCellValue(col, row);\n      const headerStyle = table._getCellStyle(col, row);\n\n      if (\n        type === 'link' &&\n        (('templateLink' in define && define.templateLink) ||\n          !('linkDetect' in define && define.linkDetect) ||\n          regUrl.test(cellValue))\n      ) {\n        if (cellTheme) {\n          cellTheme.text.fill = getProp('linkColor', headerStyle, col, row, table);\n          (cellTheme as any).group.cursor = 'pointer';\n        } else {\n          cellTheme = {\n            text: {\n              fill: getProp('linkColor', headerStyle, col, row, table)\n            },\n            group: {\n              cursor: 'pointer' as Cursor\n            }\n          };\n        }\n      }\n    }\n    // 判断是否有mapping  遍历dataset中mappingRules 但这里还需要根据fieldName来判断\n    if (bgColorFunc) {\n      const cellValue = table.getCellOriginValue(col, row);\n      const bgColor = bgColorFunc(table, cellValue);\n      if (bgColor) {\n        if (cellTheme) {\n          cellTheme.group.fill = bgColor;\n        } else {\n          cellTheme = {\n            group: {\n              fill: bgColor\n            }\n          };\n        }\n      }\n    }\n\n    let customElementsGroup;\n    let renderDefault = true;\n    let customRender;\n    let customLayout;\n    const cellType = table.getCellType(col, row);\n    if (cellType !== 'body') {\n      customRender = define?.headerCustomRender;\n      customLayout = define?.headerCustomLayout;\n    } else {\n      customRender = define?.customRender || table.customRender;\n      customLayout = define?.customLayout;\n    }\n\n    if (customLayout || customRender) {\n      // const { autoRowHeight } = table.internalProps;\n      const customResult = dealWithCustom(\n        customLayout,\n        customRender,\n        col,\n        row,\n        table.getColWidth(col),\n        table.getRowHeight(row),\n        false,\n        table.heightMode === 'autoHeight',\n        table\n      );\n      customElementsGroup = customResult.elementsGroup;\n      renderDefault = customResult.renderDefault;\n    }\n    cellGroup = createCellGroup(\n      table,\n      columnGroup,\n      0,\n      y,\n      col,\n      row,\n      colWidth,\n      cellWidth,\n      cellHeight,\n      padding,\n      textAlign,\n      textBaseline,\n      mayHaveIcon,\n      customElementsGroup,\n      renderDefault,\n      cellTheme\n    );\n    if (isMerge) {\n      cellGroup.mergeCol = range.end.col;\n      cellGroup.mergeRow = range.end.row;\n    }\n\n    const axisConfig = table.internalProps.layoutMap.getAxisConfigInPivotChart(col, row);\n    if (axisConfig) {\n      const axis = new CartesianAxis(axisConfig, cellGroup.attribute.width, cellGroup.attribute.height, table);\n      cellGroup.clear();\n      cellGroup.appendChild(axis.component);\n      axis.overlap();\n    } else if (table.internalProps.layoutMap.isEmpty(col, row)) {\n      cellGroup.clear();\n    }\n\n    // if ((define as any)?.isAxis && cellType === 'columnHeader') {\n    //   cellGroup.setAttribute('clip', false);\n    //   const axis = new CartesianAxis(\n    //     {\n    //       orient: 'top',\n    //       type: 'band',\n    //       data: ['A', 'B', 'C'],\n    //       title: {\n    //         visible: true,\n    //         text: 'X Axis'\n    //       }\n    //     },\n    //     cellGroup.attribute.width,\n    //     cellGroup.attribute.height,\n    //     table\n    //   );\n    //   cellGroup.clear();\n    //   // axis.component.setAttribute('y', 40);\n    //   cellGroup.appendChild(axis.component);\n    // } else if ((define as any)?.isAxis && cellType === 'rowHeader') {\n    //   cellGroup.setAttribute('clip', false);\n    //   const axis = new CartesianAxis(\n    //     {\n    //       orient: 'left',\n    //       type: 'linear',\n    //       range: { min: 0, max: 30 },\n    //       label: {\n    //         flush: true\n    //       },\n    //       grid: {\n    //         visible: true\n    //       },\n    //       title: {\n    //         visible: true,\n    //         text: 'Y Axis'\n    //       }\n    //     },\n    //     cellGroup.attribute.width,\n    //     cellGroup.attribute.height,\n    //     table\n    //   );\n    //   cellGroup.clear();\n    //   // axis.component.setAttribute('x', 80);\n    //   cellGroup.appendChild(axis.component);\n    //   axis.overlap();\n    // }\n  } else if (type === 'image') {\n    // 创建图片单元格\n    cellGroup = createImageCellGroup(\n      columnGroup,\n      0,\n      y,\n      col,\n      row,\n      table.getColWidth(col),\n      table.getRowHeight(row),\n      (define as ImageColumnDefine).keepAspectRatio,\n      (define as ImageColumnDefine).imageAutoSizing,\n      padding,\n      textAlign,\n      textBaseline,\n      table,\n      cellTheme\n    );\n  } else if (type === 'video') {\n    // 创建视频单元格\n    cellGroup = createVideoCellGroup(\n      columnGroup,\n      0,\n      y,\n      col,\n      row,\n      table.getColWidth(col),\n      table.getRowHeight(row),\n      (define as ImageColumnDefine).keepAspectRatio,\n      (define as ImageColumnDefine).imageAutoSizing,\n      padding,\n      textAlign,\n      textBaseline,\n      table,\n      cellTheme\n    );\n  } else if (type === 'chart') {\n    const chartInstance = table.internalProps.layoutMap.getChartInstance(col, row);\n    cellGroup = createChartCellGroup(\n      null,\n      columnGroup,\n      0,\n      y,\n      col,\n      row,\n      table.getColWidth(col),\n      table.getRowHeight(row),\n      padding,\n      table.getCellValue(col, row),\n      (define as ChartColumnDefine).chartType,\n      table.isPivotChart()\n        ? (table.internalProps.layoutMap as PivotLayoutMap).getChartSpec(col, row)\n        : (define as ChartColumnDefine).chartSpec,\n      chartInstance,\n      table,\n      cellTheme\n    );\n  } else if (type === 'progressbar') {\n    const style = table._getCellStyle(col, row) as ProgressBarStyle;\n    const value = table.getCellValue(col, row);\n    const dataValue = table.getCellOriginValue(col, row);\n    // 创建基础文字单元格\n    cellGroup = createCellGroup(\n      table,\n      columnGroup,\n      0,\n      y,\n      col,\n      row,\n      colWidth,\n      cellWidth,\n      cellHeight,\n      padding,\n      textAlign,\n      textBaseline,\n      false,\n      null,\n      true,\n      cellTheme\n    );\n\n    // 创建bar group\n    const progressBarGroup = createProgressBarCell(\n      define as ProgressbarColumnDefine,\n      style,\n      colWidth,\n      value,\n      dataValue,\n      col,\n      row,\n      padding,\n      table\n    );\n    // 进度图插入到文字前，绘制在文字下\n    cellGroup.insertBefore(progressBarGroup, cellGroup.firstChild);\n  } else if (type === 'sparkline') {\n    cellGroup = createSparkLineCellGroup(\n      null,\n      columnGroup,\n      0,\n      y,\n      col,\n      row,\n      cellWidth,\n      cellHeight,\n      padding,\n      table,\n      cellTheme\n    );\n  }\n\n  return cellGroup;\n}\n\nexport function updateCell(col: number, row: number, table: BaseTableAPI, addNew?: boolean) {\n  // const oldCellGroup = table.scenegraph.getCell(col, row, true);\n  const oldCellGroup = table.scenegraph.highPerformanceGetCell(col, row, true);\n\n  const type = table.isHeader(col, row)\n    ? table._getHeaderLayoutMap(col, row).headerType\n    : table.getBodyColumnType(col, row);\n  const cellType = table.getCellType(col, row);\n  const define = cellType !== 'body' ? table.getHeaderDefine(col, row) : table.getBodyColumnDefine(col, row);\n\n  let isMerge;\n  let range;\n  if (cellType !== 'body' || (define as TextColumnDefine)?.mergeCell) {\n    // 只有表头或者column配置合并单元格后再进行信息获取\n    range = table.getCellRange(col, row);\n    isMerge = range.start.col !== range.end.col || range.start.row !== range.end.row;\n  }\n\n  let newCellGroup;\n  if (isMerge && (col !== range.start.col || row !== range.start.row)) {\n    // 合并单元格的非起始单元格不需要绘制\n    newCellGroup = new Group({\n      x: 0,\n      y: addNew ? 0 : oldCellGroup.attribute.y,\n      width: 0,\n      height: 0,\n      visible: false,\n      pickable: false\n    });\n    newCellGroup.role = 'shadow-cell';\n    newCellGroup.col = col;\n    newCellGroup.row = row;\n    newCellGroup.mergeCol = range.start.col;\n    newCellGroup.mergeRow = range.start.row;\n\n    if (!addNew) {\n      oldCellGroup.parent.insertAfter(newCellGroup, oldCellGroup);\n      oldCellGroup.parent.removeChild(oldCellGroup);\n    }\n  } else {\n    const mayHaveIcon = cellType !== 'body' ? true : !!define?.icon || !!define?.tree;\n    const headerStyle = table._getCellStyle(col, row);\n    const cellTheme = getStyleTheme(headerStyle, table, col, row, getProp).theme;\n    const padding = cellTheme._vtable.padding;\n    const textAlign = cellTheme._vtable.textAlign;\n    const textBaseline = cellTheme._vtable.textBaseline;\n\n    let bgColorFunc: Function;\n    // 判断是否有mapping  遍历dataset中mappingRules\n    if ((table.internalProps as PivotTableProtected)?.dataConfig?.mappingRules && cellType === 'body') {\n      (table.internalProps as PivotTableProtected)?.dataConfig?.mappingRules?.forEach(\n        (mappingRule: MappingRule, i: number) => {\n          if (mappingRule.bgColor) {\n            bgColorFunc = mappingRule.bgColor.mapping;\n          }\n        }\n      );\n    }\n\n    let customRender;\n    let customLayout;\n    if (cellType !== 'body') {\n      customRender = define?.headerCustomRender;\n      customLayout = define?.headerCustomLayout;\n    } else {\n      customRender = define?.customRender || table.customRender;\n      customLayout = define?.customLayout;\n    }\n\n    let cellWidth;\n    let cellHeight;\n    if (range) {\n      cellWidth = table.getColsWidth(range.start.col, range.end.col);\n      cellHeight = table.getRowsHeight(range.start.row, range.end.row);\n    } else {\n      cellWidth = table.getColWidth(col);\n      cellHeight = table.getRowHeight(row);\n    }\n\n    // deal with promise data\n    const value = table.getCellValue(col, row);\n    if (isPromise(value)) {\n      // clear cell content sync\n      oldCellGroup.removeAllChild();\n\n      // update cell content async\n      dealPromiseData(\n        value,\n        table,\n        updateCellContent.bind(\n          null,\n          type,\n          define,\n          table,\n          col,\n          row,\n          bgColorFunc,\n          cellWidth,\n          cellHeight,\n          oldCellGroup,\n          padding,\n          textAlign,\n          textBaseline,\n          mayHaveIcon,\n          isMerge,\n          range,\n          addNew,\n          cellTheme\n        )\n      );\n    } else {\n      newCellGroup = updateCellContent(\n        type,\n        define,\n        table,\n        col,\n        row,\n        bgColorFunc,\n        cellWidth,\n        cellHeight,\n        oldCellGroup,\n        padding,\n        textAlign,\n        textBaseline,\n        mayHaveIcon,\n        isMerge,\n        range,\n        addNew,\n        cellTheme\n      );\n    }\n  }\n\n  return newCellGroup;\n}\n\nfunction updateCellContent(\n  type: ColumnTypeOption,\n  define: ColumnDefine,\n  table: BaseTableAPI,\n  col: number,\n  row: number,\n  bgColorFunc: Function,\n  cellWidth: number,\n  cellHeight: number,\n  oldCellGroup: Group,\n  padding: [number, number, number, number],\n  textAlign: CanvasTextAlign,\n  textBaseline: CanvasTextBaseline,\n  mayHaveIcon: boolean,\n  isMerge: boolean,\n  range: CellRange,\n  addNew: boolean,\n  cellTheme?: IThemeSpec\n) {\n  const newCellGroup = createCell(\n    type,\n    define,\n    table,\n    col,\n    row,\n    table.getColWidth(col),\n    bgColorFunc,\n    cellWidth,\n    cellHeight,\n    // oldCellGroup.parent,\n    addNew ? table.scenegraph.getColGroup(col) : oldCellGroup.parent,\n    // oldCellGroup.attribute.y,\n    addNew ? 0 : oldCellGroup.attribute.y,\n    padding,\n    textAlign,\n    textBaseline,\n    mayHaveIcon,\n    isMerge,\n    range,\n    cellTheme\n  );\n  if (!addNew) {\n    oldCellGroup.parent.insertAfter(newCellGroup, oldCellGroup);\n    oldCellGroup.parent.removeChild(oldCellGroup);\n\n    // update cache\n    if (table.scenegraph?.proxy.cellCache.get(col)) {\n      table.scenegraph?.proxy.cellCache.set(col, newCellGroup);\n    }\n  }\n  return newCellGroup;\n}\n"]}

package/cjs/scenegraph/group-creater/cell-type/chart-cell.d.ts

@@ -1,3 +1,4 @@
 import { Group } from '../../graphic/group';
 import type { BaseTableAPI } from '../../../ts-types/base-table';
-export declare function createChartCellGroup(cellGroup: Group | null, columnGroup: Group, xOrigin: number, yOrigin: number, col: number, row: number, width: number, height: number, padding: number[], dataValue: string, chartType: any, chartSpec: any, chartInstance: any, table: BaseTableAPI): Group;
+import type { IThemeSpec } from '@visactor/vrender';
+export declare function createChartCellGroup(cellGroup: Group | null, columnGroup: Group, xOrigin: number, yOrigin: number, col: number, row: number, width: number, height: number, padding: number[], dataValue: string, chartType: any, chartSpec: any, chartInstance: any, table: BaseTableAPI, cellTheme: IThemeSpec): Group;

package/cjs/scenegraph/group-creater/cell-type/chart-cell.js

@@ -29,11 +29,11 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.createChartCellGroup = void 0;
 
-const group_1 = require("../../graphic/group"), text_cell_1 = require("./text-cell"), chart_1 = require("../../graphic/chart"), registerChartTypes = __importStar(require("../../../chartType")), get_prop_1 = require("../../utils/get-prop"), util_1 = require("../../../tools/util");
+const group_1 = require("../../graphic/group"), chart_1 = require("../../graphic/chart"), registerChartTypes = __importStar(require("../../../chartType")), get_prop_1 = require("../../utils/get-prop"), util_1 = require("../../../tools/util");
 
-function createChartCellGroup(cellGroup, columnGroup, xOrigin, yOrigin, col, row, width, height, padding, dataValue, chartType, chartSpec, chartInstance, table) {
+function createChartCellGroup(cellGroup, columnGroup, xOrigin, yOrigin, col, row, width, height, padding, dataValue, chartType, chartSpec, chartInstance, table, cellTheme) {
     var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
-    const ClassType = registerChartTypes.get()[chartType], cellTheme = (0, text_cell_1.getCellTheme)(table, col, row), headerStyle = table._getCellStyle(col, row), functionalPadding = (0, 
+    const ClassType = registerChartTypes.get()[chartType], headerStyle = table._getCellStyle(col, row), functionalPadding = (0, 
     get_prop_1.getFunctionalProp)("padding", headerStyle, col, row, table);
     (0, util_1.isValid)(functionalPadding) && (padding = functionalPadding), cellGroup || ((cellGroup = new group_1.Group({
         x: xOrigin,
@@ -68,9 +68,10 @@ function createChartCellGroup(cellGroup, columnGroup, xOrigin, yOrigin, col, row
             x2: Math.ceil(cellGroup.globalAABBBounds.x1 + width - padding[1] + table.scrollLeft),
             y1: Math.ceil(cellGroup.globalAABBBounds.y1 + padding[0] + table.scrollTop),
             y2: Math.ceil(cellGroup.globalAABBBounds.y1 + height - padding[2] + table.scrollTop)
-        }
+        },
+        axes: table.internalProps.layoutMap.getChartAxes(col, row)
     });
-    return cellGroup.appendChild(chartGroup), columnGroup.setAttribute("chartInstance", chartGroup.chartInstance), 
+    return cellGroup.appendChild(chartGroup), table.internalProps.layoutMap.setChartInstance(col, row, chartGroup.chartInstance), 
     cellGroup;
 }
 

package/cjs/scenegraph/group-creater/cell-type/chart-cell.js.map

@@ -1 +1 @@
-{"version":3,"sources":["scenegraph/group-creater/cell-type/chart-cell.ts"],"names":[],"mappings":"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","file":"chart-cell.js","sourcesContent":["import { Group } from '../../graphic/group';\nimport { getCellTheme } from './text-cell';\nimport { Chart } from '../../graphic/chart';\nimport * as registerChartTypes from '../../../chartType';\nimport { getFunctionalProp } from '../../utils/get-prop';\nimport { isValid } from '../../../tools/util';\nimport type { BaseTableAPI } from '../../../ts-types/base-table';\nexport function createChartCellGroup(\n  cellGroup: Group | null,\n  columnGroup: Group,\n  xOrigin: number,\n  yOrigin: number,\n  col: number,\n  row: number,\n  width: number,\n  height: number,\n  padding: number[],\n  dataValue: string,\n  chartType: any,\n  chartSpec: any,\n  chartInstance: any,\n  table: BaseTableAPI\n) {\n  // 获取注册的chart图表类型\n  const registerCharts = registerChartTypes.get();\n  const ClassType = registerCharts[chartType];\n  const cellTheme = getCellTheme(table, col, row);\n  const headerStyle = table._getCellStyle(col, row); // to be fixed\n  const functionalPadding = getFunctionalProp('padding', headerStyle, col, row, table);\n  if (isValid(functionalPadding)) {\n    padding = functionalPadding;\n  }\n  // cell\n  if (!cellGroup) {\n    cellGroup = new Group({\n      x: xOrigin,\n      y: yOrigin,\n      width,\n      height,\n\n      // 背景相关，cell背景由cellGroup绘制\n      lineWidth: cellTheme?.group?.lineWidth ?? undefined,\n      fill: cellTheme?.group?.fill ?? undefined,\n      stroke: cellTheme?.group?.stroke ?? undefined,\n      strokeArrayWidth: (cellTheme?.group as any)?.strokeArrayWidth ?? undefined,\n      strokeArrayColor: (cellTheme?.group as any)?.strokeArrayColor ?? undefined,\n      cursor: (cellTheme?.group as any)?.cursor ?? undefined,\n\n      lineCap: 'square',\n\n      clip: true\n    } as any);\n    cellGroup.role = 'cell';\n    cellGroup.col = col;\n    cellGroup.row = row;\n    columnGroup.addChild(cellGroup);\n  }\n  cellGroup.AABBBounds.width(); // TODO 需要底层VRender修改\n  // chart\n  const chartGroup = new Chart({\n    stroke: false,\n    x: padding[3],\n    y: padding[0],\n    canvas: table.canvas,\n    spec: chartSpec,\n    ClassType,\n    width: width - padding[3] - padding[1],\n    height: height - padding[2] - padding[0],\n    chartInstance,\n    dataId: 'data',\n    data: table.getCellValue(col, row),\n    cellPadding: padding,\n    viewBox: {\n      x1: Math.ceil(cellGroup.globalAABBBounds.x1 + padding[3] + table.scrollLeft),\n      x2: Math.ceil(cellGroup.globalAABBBounds.x1 + width - padding[1] + table.scrollLeft),\n      y1: Math.ceil(cellGroup.globalAABBBounds.y1 + padding[0] + table.scrollTop),\n      y2: Math.ceil(cellGroup.globalAABBBounds.y1 + height - padding[2] + table.scrollTop)\n    }\n    // clipRect: {\n    //   left: cellGroup.globalAABBBounds.x1 + (table as any).tableX + padding[3],\n    //   top: cellGroup.globalAABBBounds.y1 + (table as any).tableY + padding[0],\n    //   width: width - padding[1] - padding[3], //cellGroup.globalAABBBounds.width() - padding[1] - padding[3],\n    //   height: height - padding[0] - padding[2],\n    // },\n  });\n\n  // 调试使用\n  // (chartGroup as Group).onBeforeAttributeUpdate = (val: any) => {\n  //   if (val.y === 9.5) {\n  //     console.log('ffffff------------------', val);\n  //   }\n  // };\n  cellGroup.appendChild(chartGroup);\n  // 将生成的实例存到columnGroup中 已共享\n  columnGroup.setAttribute('chartInstance', chartGroup.chartInstance);\n\n  // 调试问题使用\n  // if (col === 2) {\n  //   columnGroup.AABBBounds.width();\n  //   chartGroup.AABBBounds.width();\n  //   console.log(\n  //     'set viewbox y1',\n  //     Math.ceil(cellGroup.globalAABBBounds.y1 + padding[0] + table.scrollTop),\n  //     chartGroup.globalAABBBounds.height()\n  //   );\n\n  //   console.log(\n  //     'create chart',\n  //     columnGroup,\n  //     columnGroup.globalAABBBounds.y1,\n  //     cellGroup.globalAABBBounds.y1,\n  //     chartGroup.globalAABBBounds.y1\n  //   );\n  // }\n  return cellGroup;\n}\n"]}
+{"version":3,"sources":["scenegraph/group-creater/cell-type/chart-cell.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+CAA4C;AAC5C,+CAA4C;AAC5C,uEAAyD;AACzD,mDAAyD;AACzD,8CAA8C;AAG9C,SAAgB,oBAAoB,CAClC,SAAuB,EACvB,WAAkB,EAClB,OAAe,EACf,OAAe,EACf,GAAW,EACX,GAAW,EACX,KAAa,EACb,MAAc,EACd,OAAiB,EACjB,SAAiB,EACjB,SAAc,EACd,SAAc,EACd,aAAkB,EAClB,KAAmB,EACnB,SAAqB;;IAGrB,MAAM,cAAc,GAAG,kBAAkB,CAAC,GAAG,EAAE,CAAC;IAChD,MAAM,SAAS,GAAG,cAAc,CAAC,SAAS,CAAC,CAAC;IAC5C,MAAM,WAAW,GAAG,KAAK,CAAC,aAAa,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;IAClD,MAAM,iBAAiB,GAAG,IAAA,4BAAiB,EAAC,SAAS,EAAE,WAAW,EAAE,GAAG,EAAE,GAAG,EAAE,KAAK,CAAC,CAAC;IACrF,IAAI,IAAA,cAAO,EAAC,iBAAiB,CAAC,EAAE;QAC9B,OAAO,GAAG,iBAAiB,CAAC;KAC7B;IAED,IAAI,CAAC,SAAS,EAAE;QACd,SAAS,GAAG,IAAI,aAAK,CAAC;YACpB,CAAC,EAAE,OAAO;YACV,CAAC,EAAE,OAAO;YACV,KAAK;YACL,MAAM;YAGN,SAAS,EAAE,MAAA,MAAA,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,KAAK,0CAAE,SAAS,mCAAI,SAAS;YACnD,IAAI,EAAE,MAAA,MAAA,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,KAAK,0CAAE,IAAI,mCAAI,SAAS;YACzC,MAAM,EAAE,MAAA,MAAA,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,KAAK,0CAAE,MAAM,mCAAI,SAAS;YAC7C,gBAAgB,EAAE,MAAA,MAAC,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,KAAa,0CAAE,gBAAgB,mCAAI,SAAS;YAC1E,gBAAgB,EAAE,MAAA,MAAC,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,KAAa,0CAAE,gBAAgB,mCAAI,SAAS;YAC1E,MAAM,EAAE,MAAA,MAAC,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,KAAa,0CAAE,MAAM,mCAAI,SAAS;YAEtD,OAAO,EAAE,QAAQ;YAEjB,IAAI,EAAE,IAAI;SACJ,CAAC,CAAC;QACV,SAAS,CAAC,IAAI,GAAG,MAAM,CAAC;QACxB,SAAS,CAAC,GAAG,GAAG,GAAG,CAAC;QACpB,SAAS,CAAC,GAAG,GAAG,GAAG,CAAC;QACpB,WAAW,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;KACjC;IACD,SAAS,CAAC,UAAU,CAAC,KAAK,EAAE,CAAC;IAE7B,MAAM,UAAU,GAAG,IAAI,aAAK,CAAC;QAC3B,MAAM,EAAE,KAAK;QACb,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC;QACb,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC;QACb,MAAM,EAAE,KAAK,CAAC,MAAM;QACpB,IAAI,EAAE,SAAS;QACf,SAAS;QACT,KAAK,EAAE,KAAK,GAAG,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC;QACtC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC;QACxC,aAAa;QACb,MAAM,EAAE,MAAM;QACd,IAAI,EAAE,KAAK,CAAC,YAAY,CAAC,GAAG,EAAE,GAAG,CAAC;QAClC,WAAW,EAAE,OAAO;QACpB,OAAO,EAAE;YACP,EAAE,EAAE,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,gBAAgB,CAAC,EAAE,GAAG,OAAO,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC,UAAU,CAAC;YAC5E,EAAE,EAAE,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,gBAAgB,CAAC,EAAE,GAAG,KAAK,GAAG,OAAO,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC,UAAU,CAAC;YACpF,EAAE,EAAE,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,gBAAgB,CAAC,EAAE,GAAG,OAAO,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC,SAAS,CAAC;YAC3E,EAAE,EAAE,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,gBAAgB,CAAC,EAAE,GAAG,MAAM,GAAG,OAAO,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC,SAAS,CAAC;SACrF;QACD,IAAI,EAAE,KAAK,CAAC,aAAa,CAAC,SAAS,CAAC,YAAY,CAAC,GAAG,EAAE,GAAG,CAAC;KAO3D,CAAC,CAAC;IACH,SAAS,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC;IAElC,KAAK,CAAC,aAAa,CAAC,SAAS,CAAC,gBAAgB,CAAC,GAAG,EAAE,GAAG,EAAE,UAAU,CAAC,aAAa,CAAC,CAAC;IAEnF,OAAO,SAAS,CAAC;AACnB,CAAC;AApFD,oDAoFC","file":"chart-cell.js","sourcesContent":["import { Group } from '../../graphic/group';\nimport { Chart } from '../../graphic/chart';\nimport * as registerChartTypes from '../../../chartType';\nimport { getFunctionalProp } from '../../utils/get-prop';\nimport { isValid } from '../../../tools/util';\nimport type { BaseTableAPI } from '../../../ts-types/base-table';\nimport type { IThemeSpec } from '@visactor/vrender';\nexport function createChartCellGroup(\n  cellGroup: Group | null,\n  columnGroup: Group,\n  xOrigin: number,\n  yOrigin: number,\n  col: number,\n  row: number,\n  width: number,\n  height: number,\n  padding: number[],\n  dataValue: string,\n  chartType: any,\n  chartSpec: any,\n  chartInstance: any,\n  table: BaseTableAPI,\n  cellTheme: IThemeSpec\n) {\n  // 获取注册的chart图表类型\n  const registerCharts = registerChartTypes.get();\n  const ClassType = registerCharts[chartType];\n  const headerStyle = table._getCellStyle(col, row); // to be fixed\n  const functionalPadding = getFunctionalProp('padding', headerStyle, col, row, table);\n  if (isValid(functionalPadding)) {\n    padding = functionalPadding;\n  }\n  // cell\n  if (!cellGroup) {\n    cellGroup = new Group({\n      x: xOrigin,\n      y: yOrigin,\n      width,\n      height,\n\n      // 背景相关，cell背景由cellGroup绘制\n      lineWidth: cellTheme?.group?.lineWidth ?? undefined,\n      fill: cellTheme?.group?.fill ?? undefined,\n      stroke: cellTheme?.group?.stroke ?? undefined,\n      strokeArrayWidth: (cellTheme?.group as any)?.strokeArrayWidth ?? undefined,\n      strokeArrayColor: (cellTheme?.group as any)?.strokeArrayColor ?? undefined,\n      cursor: (cellTheme?.group as any)?.cursor ?? undefined,\n\n      lineCap: 'square',\n\n      clip: true\n    } as any);\n    cellGroup.role = 'cell';\n    cellGroup.col = col;\n    cellGroup.row = row;\n    columnGroup.addChild(cellGroup);\n  }\n  cellGroup.AABBBounds.width(); // TODO 需要底层VRender修改\n  // chart\n  const chartGroup = new Chart({\n    stroke: false,\n    x: padding[3],\n    y: padding[0],\n    canvas: table.canvas,\n    spec: chartSpec,\n    ClassType,\n    width: width - padding[3] - padding[1],\n    height: height - padding[2] - padding[0],\n    chartInstance,\n    dataId: 'data',\n    data: table.getCellValue(col, row),\n    cellPadding: padding,\n    viewBox: {\n      x1: Math.ceil(cellGroup.globalAABBBounds.x1 + padding[3] + table.scrollLeft),\n      x2: Math.ceil(cellGroup.globalAABBBounds.x1 + width - padding[1] + table.scrollLeft),\n      y1: Math.ceil(cellGroup.globalAABBBounds.y1 + padding[0] + table.scrollTop),\n      y2: Math.ceil(cellGroup.globalAABBBounds.y1 + height - padding[2] + table.scrollTop)\n    },\n    axes: table.internalProps.layoutMap.getChartAxes(col, row)\n    // clipRect: {\n    //   left: cellGroup.globalAABBBounds.x1 + (table as any).tableX + padding[3],\n    //   top: cellGroup.globalAABBBounds.y1 + (table as any).tableY + padding[0],\n    //   width: width - padding[1] - padding[3], //cellGroup.globalAABBBounds.width() - padding[1] - padding[3],\n    //   height: height - padding[0] - padding[2],\n    // },\n  });\n  cellGroup.appendChild(chartGroup);\n  // 将生成的实例存到layoutMap中 共享\n  table.internalProps.layoutMap.setChartInstance(col, row, chartGroup.chartInstance);\n\n  return cellGroup;\n}\n"]}

package/cjs/scenegraph/group-creater/cell-type/image-cell.d.ts

@@ -2,6 +2,6 @@ import type { IThemeSpec } from '@visactor/vrender';
 import type { BaseTableAPI } from '../../../ts-types';
 import { Group } from '../../graphic/group';
 import type { Scenegraph } from '../../scenegraph';
-export declare function createImageCellGroup(columnGroup: Group, xOrigin: number, yOrigin: number, col: number, row: number, width: number, height: number, keepAspectRatio: boolean, imageAutoSizing: boolean, padding: [number, number, number, number], textAlign: CanvasTextAlign, textBaseline: CanvasTextBaseline, table: BaseTableAPI, cellTheme?: IThemeSpec): Group;
+export declare function createImageCellGroup(columnGroup: Group, xOrigin: number, yOrigin: number, col: number, row: number, width: number, height: number, keepAspectRatio: boolean, imageAutoSizing: boolean, padding: [number, number, number, number], textAlign: CanvasTextAlign, textBaseline: CanvasTextBaseline, table: BaseTableAPI, cellTheme: IThemeSpec): Group;
 export declare function _adjustWidthHeight(col: number, row: number, width: number, height: number, scene: Scenegraph, padding: [number, number, number, number]): boolean;
 export declare function updateImageCellContentWhileResize(cellGroup: Group, col: number, row: number, table: BaseTableAPI): void;

package/cjs/scenegraph/group-creater/cell-type/image-cell.js

@@ -29,11 +29,10 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.updateImageCellContentWhileResize = exports._adjustWidthHeight = exports.createImageCellGroup = void 0;
 
-const vrender_1 = require("@visactor/vrender"), icons = __importStar(require("../../../icons")), group_1 = require("../../graphic/group"), keep_aspect_ratio_1 = require("../../utils/keep-aspect-ratio"), cell_pos_1 = require("../../utils/cell-pos"), get_prop_1 = require("../../utils/get-prop"), text_cell_1 = require("./text-cell"), util_1 = require("../../../tools/util"), padding_1 = require("../../utils/padding"), regedIcons = icons.get();
+const vrender_1 = require("@visactor/vrender"), icons = __importStar(require("../../../icons")), group_1 = require("../../graphic/group"), keep_aspect_ratio_1 = require("../../utils/keep-aspect-ratio"), cell_pos_1 = require("../../utils/cell-pos"), get_prop_1 = require("../../utils/get-prop"), util_1 = require("../../../tools/util"), padding_1 = require("../../utils/padding"), regedIcons = icons.get();
 
 function createImageCellGroup(columnGroup, xOrigin, yOrigin, col, row, width, height, keepAspectRatio, imageAutoSizing, padding, textAlign, textBaseline, table, cellTheme) {
     var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r;
-    cellTheme = (0, text_cell_1.getCellTheme)(table, col, row, cellTheme);
     const headerStyle = table._getCellStyle(col, row), functionalPadding = (0, get_prop_1.getFunctionalProp)("padding", headerStyle, col, row, table);
     (0, util_1.isValid)(functionalPadding) && (padding = functionalPadding), (null === (_a = null == cellTheme ? void 0 : cellTheme.text) || void 0 === _a ? void 0 : _a.textAlign) && (textAlign = null === (_b = null == cellTheme ? void 0 : cellTheme.text) || void 0 === _b ? void 0 : _b.textAlign), 
     (null === (_c = null == cellTheme ? void 0 : cellTheme.text) || void 0 === _c ? void 0 : _c.textBaseline) && (textBaseline = null === (_d = null == cellTheme ? void 0 : cellTheme.text) || void 0 === _d ? void 0 : _d.textBaseline);