@visactor/vtable 0.19.1 → 0.19.2-alpha.1

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

@@ -22,7 +22,25 @@ function renderChart(chart) {
     var _a, _b, _c, _d, _e, _f;
     const {axes: axes, dataId: dataId, data: data, spec: spec} = chart.attribute, {chartInstance: chartInstance} = chart, viewBox = chart.getViewBox();
     viewBox.x2 <= viewBox.x1 && (viewBox.x2 = viewBox.x1 + 1), viewBox.y2 <= viewBox.y1 && (viewBox.y2 = viewBox.y1 + 1), 
-    null == axes || axes.forEach(((axis, index) => {
+    chartInstance.updateViewBox({
+        x1: 0,
+        x2: viewBox.x2 - viewBox.x1,
+        y1: 0,
+        y2: viewBox.y2 - viewBox.y1
+    }, !1, !1);
+    const chartStage = chartInstance.getStage(), matrix = chart.globalTransMatrix.clone(), stageMatrix = chart.stage.window.getViewBoxTransform();
+    matrix.multiply(stageMatrix.a, stageMatrix.b, stageMatrix.c, stageMatrix.d, stageMatrix.e, stageMatrix.f), 
+    chartStage.window.setViewBoxTransform && chartStage.window.setViewBoxTransform(matrix.a, matrix.b, matrix.c, matrix.d, matrix.e, matrix.f);
+    const {table: table} = chart.getRootNode();
+    let updateSpec = !1;
+    if (table.options.specFormat) {
+        const formatResult = table.options.specFormat(chart.attribute.spec);
+        if (formatResult.needFormatSpec && formatResult.spec) {
+            const spec = formatResult.spec;
+            chartInstance.updateSpecSync(spec), updateSpec = !0;
+        }
+    }
+    if (!updateSpec) if (null == axes || axes.forEach(((axis, index) => {
         var _a, _b, _c, _d;
         "band" === axis.type ? chartInstance.updateModelSpec({
             type: "axes",
@@ -36,13 +54,7 @@ function renderChart(chart) {
             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
         }, !0);
-    })), 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
-    }, !1, !1);
-    if (null === (_b = null === (_a = chart.getRootNode().table.internalProps.layoutMap) || void 0 === _a ? void 0 : _a.updateDataStateToActiveChartInstance) || void 0 === _b || _b.call(_a, chartInstance), 
+    })), null === (_b = null === (_a = table.internalProps.layoutMap) || void 0 === _a ? void 0 : _a.updateDataStateToActiveChartInstance) || void 0 === _b || _b.call(_a, chartInstance), 
     "string" == typeof dataId) chartInstance.updateDataSync(dataId, null != data ? data : []); else {
         const dataBatch = [];
         for (const dataIdStr in dataId) {

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

@@ -1 +1 @@
-{"version":3,"sources":["../src/scenegraph/graphic/contributions/chart-render-helper.ts"],"names":[],"mappings":"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","file":"chart-render-helper.js","sourcesContent":["import type { IStage } from './../../../vrender';\nimport type { Chart } from '../chart';\nimport { Bounds, isValid } from '@visactor/vutils';\nimport type { BaseTableAPI } from '../../../ts-types/base-table';\nexport const cancelRenderChartQueue = false;\nexport const chartRenderKeys: string[] = [];\nexport const chartRenderQueueList: Chart[] = [];\ninterface chartRenderQueueItem {\n  chart: Chart;\n}\n//每次消费的图表数量\nlet batchRenderChartCount = 5;\nlet isHandlingChartQueue = false;\nexport function setBatchRenderChartCount(count: number) {\n  if (isValid(count)) {\n    batchRenderChartCount = count;\n  }\n}\nexport function IsHandlingChartQueue() {\n  return isHandlingChartQueue;\n}\nexport function renderChart(chart: Chart) {\n  const { axes, dataId, data, spec } = chart.attribute;\n  const { chartInstance } = chart;\n  const viewBox = chart.getViewBox();\n\n  // avoid canvas size 0\n  if (viewBox.x2 <= viewBox.x1) {\n    viewBox.x2 = viewBox.x1 + 1;\n  }\n  if (viewBox.y2 <= viewBox.y1) {\n    viewBox.y2 = viewBox.y1 + 1;\n  }\n\n  axes?.forEach((axis: any, index: number) => {\n    if (axis.type === 'band') {\n      // const chartAxis = chartInstance._chart._components[index];\n      // chartAxis._spec.domain = axis.domain.slice(0);\n      // chartAxis.updateScaleDomain();\n      chartInstance.updateModelSpec({ type: 'axes', index }, { domain: axis.domain.slice(0) }, true);\n    } else {\n      // const chartAxis = chartInstance._chart._components[index];\n      // chartAxis._domain = {\n      //   min: axis.range?.min ?? 0,\n      //   max: axis.range?.max ?? 0\n      // };\n      chartInstance.updateModelSpecSync(\n        { type: 'axes', index },\n        { min: axis.range?.min ?? 0, max: axis.range?.max ?? 0 },\n        true\n      );\n    }\n  });\n\n  chartInstance.updateViewBox(\n    {\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    false,\n    false\n  );\n\n  // to be fixed: update state everytimes render, need be fix by vchart\n  const table = (chart.getRootNode() as any).table as BaseTableAPI;\n  (table.internalProps.layoutMap as any)?.updateDataStateToActiveChartInstance?.(chartInstance);\n\n  if (typeof dataId === 'string') {\n    chartInstance.updateDataSync(dataId, data ?? []);\n  } else {\n    const dataBatch = [];\n    for (const dataIdStr in dataId) {\n      const dataIdAndField = dataId[dataIdStr];\n      const series = spec.series.find((item: any) => item?.data?.id === dataIdStr);\n      dataBatch.push({\n        id: dataIdStr,\n        values: dataIdAndField\n          ? data?.filter((item: any) => {\n              return item.hasOwnProperty(dataIdAndField);\n            }) ?? []\n          : data ?? [],\n        fields: series?.data?.fields\n      });\n      // 判断是否有updateFullDataSync 木有的话 还是循环调用updateDataSync\n      if (!chartInstance.updateFullDataSync) {\n        chartInstance.updateDataSync(\n          dataIdStr,\n          dataIdAndField\n            ? data?.filter((item: any) => {\n                return item.hasOwnProperty(dataIdAndField);\n              }) ?? []\n            : data ?? []\n        );\n      }\n    }\n    chartInstance.updateFullDataSync?.(dataBatch);\n  }\n  const sg = chartInstance.getStage();\n  cacheStageCanvas(sg, chart);\n  // chart.cacheCanvas = sg.toCanvas();\n\n  // debugger;\n  // chart.cacheCanvas[] = sg.toCanvas(fullImage, viewBox);\n  // chart.cacheCanvas = sg.toCanvas(false, {\n  //   x1: 0,\n  //   y1: 0,\n  //   x2: 500,\n  //   y2: 300,\n  //   width: () => 500,\n  //   height: () => 300\n  // });\n  // 截图空白问题 因为开启了动画 首屏截图是无数据的TODO\n}\n\nexport function startRenderChartQueue(table: any) {\n  isHandlingChartQueue = true;\n\n  // 检查是否还有未渲染的图表\n  if (chartRenderQueueList.length > 0) {\n    // 使用 requestAnimationFrame 或 setTimeout 来调度下一批图表的渲染\n    // requestAnimationFrame(() => renderChartQueue(table));\n    requestAnimationFrame(() => {\n      // 从集合中获取要渲染的图表上下文\n      const chartsToRender = chartRenderQueueList.splice(0, batchRenderChartCount);\n      chartRenderKeys.splice(0, batchRenderChartCount);\n      // 渲染图表\n      chartsToRender.forEach(chart => {\n        // 在正确的位置渲染图表\n        renderChart(chart);\n        chart.addUpdateBoundTag();\n      });\n      table.render();\n      startRenderChartQueue(table);\n    });\n    // setTimeout(() => {\n    //   // debugger;\n    //   renderChartQueue(table);\n    // }, 0);\n  } else {\n    isHandlingChartQueue = false;\n  }\n}\n\nconst cacheCanvasSizeLimit = 2000;\nfunction cacheStageCanvas(stage: IStage, chart: Chart) {\n  const { viewWidth, viewHeight } = stage;\n  if (viewWidth < cacheCanvasSizeLimit && viewHeight < cacheCanvasSizeLimit) {\n    chart.cacheCanvas = stage.toCanvas();\n    return;\n  }\n\n  const rows = Math.ceil(viewHeight / cacheCanvasSizeLimit);\n  const columns = Math.ceil(viewWidth / cacheCanvasSizeLimit);\n\n  const cacheCanvas = [];\n  for (let row = 0; row < rows; row++) {\n    for (let col = 0; col < columns; col++) {\n      const startX = col * cacheCanvasSizeLimit;\n      const startY = row * cacheCanvasSizeLimit;\n      const endX = startX + cacheCanvasSizeLimit > viewWidth ? viewWidth : startX + cacheCanvasSizeLimit;\n      const endY = startY + cacheCanvasSizeLimit > viewHeight ? viewHeight : startY + cacheCanvasSizeLimit;\n      const width = endX - startX;\n      const height = endY - startY;\n      const bounds = new Bounds();\n      bounds.setValue(startX, startY, endX, endY);\n\n      const canvas = stage.toCanvas(false, bounds);\n      cacheCanvas.push({\n        canvas,\n        x: startX,\n        y: startY,\n        width,\n        height\n      });\n    }\n  }\n\n  chart.cacheCanvas = cacheCanvas;\n}\n"]}
+{"version":3,"sources":["../src/scenegraph/graphic/contributions/chart-render-helper.ts"],"names":[],"mappings":"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","file":"chart-render-helper.js","sourcesContent":["import type { IStage } from './../../../vrender';\nimport type { Chart } from '../chart';\nimport { Bounds, isValid } from '@visactor/vutils';\nimport type { BaseTableAPI } from '../../../ts-types/base-table';\nexport const cancelRenderChartQueue = false;\nexport const chartRenderKeys: string[] = [];\nexport const chartRenderQueueList: Chart[] = [];\ninterface chartRenderQueueItem {\n  chart: Chart;\n}\n//每次消费的图表数量\nlet batchRenderChartCount = 5;\nlet isHandlingChartQueue = false;\nexport function setBatchRenderChartCount(count: number) {\n  if (isValid(count)) {\n    batchRenderChartCount = count;\n  }\n}\nexport function IsHandlingChartQueue() {\n  return isHandlingChartQueue;\n}\nexport function renderChart(chart: Chart) {\n  const { axes, dataId, data, spec } = chart.attribute;\n  const { chartInstance } = chart;\n  const viewBox = chart.getViewBox();\n\n  // avoid canvas size 0\n  if (viewBox.x2 <= viewBox.x1) {\n    viewBox.x2 = viewBox.x1 + 1;\n  }\n  if (viewBox.y2 <= viewBox.y1) {\n    viewBox.y2 = viewBox.y1 + 1;\n  }\n\n  // use vrender trasnform, viewbox starts from 0,0\n  chartInstance.updateViewBox(\n    // {\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    {\n      x1: 0,\n      x2: viewBox.x2 - viewBox.x1,\n      y1: 0,\n      y2: viewBox.y2 - viewBox.y1\n    },\n    false,\n    false\n  );\n\n  const chartStage = chartInstance.getStage();\n  const matrix = chart.globalTransMatrix.clone();\n  const stageMatrix = chart.stage.window.getViewBoxTransform();\n  matrix.multiply(stageMatrix.a, stageMatrix.b, stageMatrix.c, stageMatrix.d, stageMatrix.e, stageMatrix.f);\n  chartStage.window.setViewBoxTransform &&\n    chartStage.window.setViewBoxTransform(matrix.a, matrix.b, matrix.c, matrix.d, matrix.e, matrix.f);\n\n  const { table } = chart.getRootNode() as any;\n\n  let updateSpec = false;\n  if (table.options.specFormat) {\n    const formatResult = table.options.specFormat(chart.attribute.spec);\n    if (formatResult.needFormatSpec && formatResult.spec) {\n      const spec = formatResult.spec;\n      chartInstance.updateSpecSync(spec);\n      updateSpec = true;\n    }\n  }\n\n  if (!updateSpec) {\n    axes?.forEach((axis: any, index: number) => {\n      if (axis.type === 'band') {\n        // const chartAxis = chartInstance._chart._components[index];\n        // chartAxis._spec.domain = axis.domain.slice(0);\n        // chartAxis.updateScaleDomain();\n        chartInstance.updateModelSpec({ type: 'axes', index }, { domain: axis.domain.slice(0) }, true);\n      } else {\n        // const chartAxis = chartInstance._chart._components[index];\n        // chartAxis._domain = {\n        //   min: axis.range?.min ?? 0,\n        //   max: axis.range?.max ?? 0\n        // };\n        chartInstance.updateModelSpecSync(\n          { type: 'axes', index },\n          { min: axis.range?.min ?? 0, max: axis.range?.max ?? 0 },\n          true\n        );\n      }\n    });\n\n    // to be fixed: update state everytimes render, need be fix by vchart\n    (table.internalProps.layoutMap as any)?.updateDataStateToActiveChartInstance?.(chartInstance);\n\n    if (typeof dataId === 'string') {\n      chartInstance.updateDataSync(dataId, data ?? []);\n    } else {\n      const dataBatch = [];\n      for (const dataIdStr in dataId) {\n        const dataIdAndField = dataId[dataIdStr];\n        const series = spec.series.find((item: any) => item?.data?.id === dataIdStr);\n        dataBatch.push({\n          id: dataIdStr,\n          values: dataIdAndField\n            ? data?.filter((item: any) => {\n                return item.hasOwnProperty(dataIdAndField);\n              }) ?? []\n            : data ?? [],\n          fields: series?.data?.fields\n        });\n        // 判断是否有updateFullDataSync 木有的话 还是循环调用updateDataSync\n        if (!chartInstance.updateFullDataSync) {\n          chartInstance.updateDataSync(\n            dataIdStr,\n            dataIdAndField\n              ? data?.filter((item: any) => {\n                  return item.hasOwnProperty(dataIdAndField);\n                }) ?? []\n              : data ?? []\n          );\n        }\n      }\n      chartInstance.updateFullDataSync?.(dataBatch);\n    }\n  }\n\n  const sg = chartInstance.getStage();\n  cacheStageCanvas(sg, chart);\n  // chart.cacheCanvas = sg.toCanvas();\n\n  // debugger;\n  // chart.cacheCanvas[] = sg.toCanvas(fullImage, viewBox);\n  // chart.cacheCanvas = sg.toCanvas(false, {\n  //   x1: 0,\n  //   y1: 0,\n  //   x2: 500,\n  //   y2: 300,\n  //   width: () => 500,\n  //   height: () => 300\n  // });\n  // 截图空白问题 因为开启了动画 首屏截图是无数据的TODO\n}\n\nexport function startRenderChartQueue(table: any) {\n  isHandlingChartQueue = true;\n\n  // 检查是否还有未渲染的图表\n  if (chartRenderQueueList.length > 0) {\n    // 使用 requestAnimationFrame 或 setTimeout 来调度下一批图表的渲染\n    // requestAnimationFrame(() => renderChartQueue(table));\n    requestAnimationFrame(() => {\n      // 从集合中获取要渲染的图表上下文\n      const chartsToRender = chartRenderQueueList.splice(0, batchRenderChartCount);\n      chartRenderKeys.splice(0, batchRenderChartCount);\n      // 渲染图表\n      chartsToRender.forEach(chart => {\n        // 在正确的位置渲染图表\n        renderChart(chart);\n        chart.addUpdateBoundTag();\n      });\n      table.render();\n      startRenderChartQueue(table);\n    });\n    // setTimeout(() => {\n    //   // debugger;\n    //   renderChartQueue(table);\n    // }, 0);\n  } else {\n    isHandlingChartQueue = false;\n  }\n}\n\nconst cacheCanvasSizeLimit = 2000;\nfunction cacheStageCanvas(stage: IStage, chart: Chart) {\n  const { viewWidth, viewHeight } = stage;\n  if (viewWidth < cacheCanvasSizeLimit && viewHeight < cacheCanvasSizeLimit) {\n    chart.cacheCanvas = stage.toCanvas();\n    return;\n  }\n\n  const rows = Math.ceil(viewHeight / cacheCanvasSizeLimit);\n  const columns = Math.ceil(viewWidth / cacheCanvasSizeLimit);\n\n  const cacheCanvas = [];\n  for (let row = 0; row < rows; row++) {\n    for (let col = 0; col < columns; col++) {\n      const startX = col * cacheCanvasSizeLimit;\n      const startY = row * cacheCanvasSizeLimit;\n      const endX = startX + cacheCanvasSizeLimit > viewWidth ? viewWidth : startX + cacheCanvasSizeLimit;\n      const endY = startY + cacheCanvasSizeLimit > viewHeight ? viewHeight : startY + cacheCanvasSizeLimit;\n      const width = endX - startX;\n      const height = endY - startY;\n      const bounds = new Bounds();\n      bounds.setValue(startX, startY, endX, endY);\n\n      const canvas = stage.toCanvas(false, bounds);\n      cacheCanvas.push({\n        canvas,\n        x: startX,\n        y: startY,\n        width,\n        height\n      });\n    }\n  }\n\n  chart.cacheCanvas = cacheCanvas;\n}\n"]}

package/cjs/scenegraph/graphic/contributions/chart-render.d.ts

@@ -1,8 +1,9 @@
 import type { IGraphicAttribute, IContext2d, IDrawContext, IGraphicRender, IGraphicRenderDrawParams, IMarkAttribute, IRenderService, IThemeAttribute } from './../../../vrender';
+import { BaseRender } from './../../../vrender';
 import type { Chart } from '../chart';
 export declare const ChartRender: unique symbol;
 export declare const ChartRenderContribution: unique symbol;
-export declare class DefaultCanvasChartRender implements IGraphicRender {
+export declare class DefaultCanvasChartRender extends BaseRender<Chart> implements IGraphicRender {
     type: 'chart';
     numberType: number;
     drawShape(chart: Chart, context: IContext2d, x: number, y: number, drawContext: IDrawContext, params?: IGraphicRenderDrawParams, fillCb?: (ctx: IContext2d, markAttribute: Partial<IMarkAttribute & IGraphicAttribute>, themeAttribute: IThemeAttribute) => boolean, strokeCb?: (ctx: IContext2d, markAttribute: Partial<IMarkAttribute & IGraphicAttribute>, themeAttribute: IThemeAttribute) => boolean): void;

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

@@ -14,42 +14,58 @@ const vrender_1 = require("./../../../vrender"), chart_1 = require("../chart"),
 
 exports.ChartRender = Symbol.for("ChartRender"), exports.ChartRenderContribution = Symbol.for("ChartRenderContribution");
 
-let DefaultCanvasChartRender = class {
+let DefaultCanvasChartRender = class extends vrender_1.BaseRender {
     constructor() {
-        this.numberType = chart_1.CHART_NUMBER_TYPE;
+        super(...arguments), this.numberType = chart_1.CHART_NUMBER_TYPE;
     }
     drawShape(chart, context, x, y, drawContext, params, fillCb, strokeCb) {
         var _a, _b, _c, _d;
         const groupAttribute = (0, vrender_1.getTheme)(chart, null == params ? void 0 : params.theme).group, {dataId: dataId, data: data, spec: spec} = chart.attribute, {width: width = groupAttribute.width, height: height = groupAttribute.height} = (chart.getViewBox(), 
-        chart.attribute), {chartInstance: chartInstance, active: active, cacheCanvas: cacheCanvas, activeChartInstance: activeChartInstance} = chart;
+        chart.attribute), {table: table} = chart.getRootNode(), {chartInstance: chartInstance, active: active, cacheCanvas: cacheCanvas, activeChartInstance: activeChartInstance} = chart;
         if (!active && cacheCanvas) (0, vutils_1.isArray)(cacheCanvas) ? cacheCanvas.forEach((singleCacheCanvas => {
             const {x: x, y: y, width: width, height: height, canvas: canvas} = singleCacheCanvas;
             context.drawImage(canvas, x, y, width, height);
-        })) : context.drawImage(cacheCanvas, x, y, width, height); else if (activeChartInstance) if ("string" == typeof dataId) activeChartInstance.updateDataSync(dataId, null != data ? data : []); else {
-            const dataBatch = [];
-            for (const dataIdStr in dataId) {
-                const dataIdAndField = dataId[dataIdStr], series = spec.series.find((item => {
-                    var _a;
-                    return (null === (_a = null == item ? void 0 : item.data) || void 0 === _a ? void 0 : _a.id) === dataIdStr;
-                }));
-                dataBatch.push({
-                    id: dataIdStr,
-                    values: dataIdAndField ? null !== (_a = null == data ? void 0 : data.filter((item => item.hasOwnProperty(dataIdAndField)))) && void 0 !== _a ? _a : [] : null != data ? data : [],
-                    fields: null === (_b = null == series ? void 0 : series.data) || void 0 === _b ? void 0 : _b.fields
-                }), chartInstance.updateFullDataSync || activeChartInstance.updateDataSync(dataIdStr, dataIdAndField ? null !== (_c = null == data ? void 0 : data.filter((item => item.hasOwnProperty(dataIdAndField)))) && void 0 !== _c ? _c : [] : null != data ? data : []);
+        })) : context.drawImage(cacheCanvas, x, y, width, height); else if (activeChartInstance) {
+            if (table.options.specFormat) {
+                const formatResult = table.options.specFormat(chart.attribute.spec);
+                if (formatResult.needFormatSpec && formatResult.spec) {
+                    const spec = formatResult.spec;
+                    return void activeChartInstance.updateSpecSync(spec);
+                }
             }
-            null === (_d = activeChartInstance.updateFullDataSync) || void 0 === _d || _d.call(activeChartInstance, dataBatch);
-        } else chart.getRootNode().table.internalProps.renderChartAsync ? (-1 === chart_render_helper_1.chartRenderKeys.indexOf(`${chart.parent.col}+${chart.parent.row}`) && (chart_render_helper_1.chartRenderKeys.push(`${chart.parent.col}+${chart.parent.row}`), 
+            const viewBox = chart.getViewBox();
+            activeChartInstance.updateViewBox({
+                x1: 0,
+                x2: viewBox.x2 - viewBox.x1,
+                y1: 0,
+                y2: viewBox.y2 - viewBox.y1
+            }, !1, !1);
+            const chartStage = activeChartInstance.getStage();
+            chartStage.needRender = !0;
+            const matrix = chart.globalTransMatrix.clone(), stageMatrix = chart.stage.window.getViewBoxTransform();
+            if (matrix.multiply(stageMatrix.a, stageMatrix.b, stageMatrix.c, stageMatrix.d, stageMatrix.e, stageMatrix.f), 
+            chartStage.window.setViewBoxTransform(matrix.a, matrix.b, matrix.c, matrix.d, matrix.e, matrix.f), 
+            "string" == typeof dataId) activeChartInstance.updateDataSync(dataId, null != data ? data : []); else {
+                const dataBatch = [];
+                for (const dataIdStr in dataId) {
+                    const dataIdAndField = dataId[dataIdStr], series = spec.series.find((item => {
+                        var _a;
+                        return (null === (_a = null == item ? void 0 : item.data) || void 0 === _a ? void 0 : _a.id) === dataIdStr;
+                    }));
+                    dataBatch.push({
+                        id: dataIdStr,
+                        values: dataIdAndField ? null !== (_a = null == data ? void 0 : data.filter((item => item.hasOwnProperty(dataIdAndField)))) && void 0 !== _a ? _a : [] : null != data ? data : [],
+                        fields: null === (_b = null == series ? void 0 : series.data) || void 0 === _b ? void 0 : _b.fields
+                    }), chartInstance.updateFullDataSync || activeChartInstance.updateDataSync(dataIdStr, dataIdAndField ? null !== (_c = null == data ? void 0 : data.filter((item => item.hasOwnProperty(dataIdAndField)))) && void 0 !== _c ? _c : [] : null != data ? data : []);
+                }
+                null === (_d = activeChartInstance.updateFullDataSync) || void 0 === _d || _d.call(activeChartInstance, dataBatch);
+            }
+        } else table.internalProps.renderChartAsync ? (-1 === chart_render_helper_1.chartRenderKeys.indexOf(`${chart.parent.col}+${chart.parent.row}`) && (chart_render_helper_1.chartRenderKeys.push(`${chart.parent.col}+${chart.parent.row}`), 
         chart_render_helper_1.chartRenderQueueList.push(chart)), (0, chart_render_helper_1.IsHandlingChartQueue)() || (0, 
-        chart_render_helper_1.startRenderChartQueue)(chart.getRootNode().table)) : (0, chart_render_helper_1.renderChart)(chart);
+        chart_render_helper_1.startRenderChartQueue)(table)) : (0, chart_render_helper_1.renderChart)(chart);
     }
     draw(chart, renderService, drawContext, params) {
-        const {context: context} = drawContext;
-        if (!context) return;
-        const {clip: clip} = chart.attribute;
-        clip ? context.save() : context.highPerformanceSave(), context.transformFromMatrix(chart.transMatrix, !0), 
-        context.beginPath(), params.skipDraw ? this.drawShape(chart, context, 0, 0, drawContext, params, (() => !1), (() => !1)) : this.drawShape(chart, context, 0, 0, drawContext), 
-        clip ? context.restore() : context.highPerformanceRestore();
+        this._draw(chart, {}, !1, drawContext, params);
     }
 };
 

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

@@ -1 +1 @@
-{"version":3,"sources":["../src/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 './../../../vrender';\nimport {\n  ContributionProvider,\n  getTheme,\n  IGroupRenderContribution,\n  createImage,\n  inject,\n  injectable,\n  named\n} from './../../../vrender';\nimport type { Chart } from '../chart';\nimport { CHART_NUMBER_TYPE } from '../chart';\nimport {\n  IsHandlingChartQueue,\n  chartRenderKeys,\n  chartRenderQueueList,\n  renderChart,\n  startRenderChartQueue\n} from './chart-render-helper';\nimport { isArray } from '@visactor/vutils';\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, spec } = chart.attribute;\n    const viewBox = chart.getViewBox();\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      if (isArray(cacheCanvas)) {\n        cacheCanvas.forEach(singleCacheCanvas => {\n          const { x, y, width, height, canvas } = singleCacheCanvas;\n          context.drawImage(canvas, x, y, width, height);\n        });\n      } else {\n        context.drawImage(cacheCanvas, x, y, width, height);\n      }\n    } else if (activeChartInstance) {\n      if (typeof dataId === 'string') {\n        activeChartInstance.updateDataSync(dataId, data ?? []);\n      } else {\n        const dataBatch = [];\n        // 如果是组合图有series系列 需要组个设置数据 这里的data包括的单元格完整数据 需要根据key过滤\n        for (const dataIdStr in dataId) {\n          const dataIdAndField = dataId[dataIdStr];\n          const series = spec.series.find((item: any) => item?.data?.id === dataIdStr);\n          dataBatch.push({\n            id: dataIdStr,\n            values: dataIdAndField\n              ? data?.filter((item: any) => {\n                  return item.hasOwnProperty(dataIdAndField);\n                }) ?? []\n              : data ?? [],\n            fields: series?.data?.fields\n          });\n          if (!chartInstance.updateFullDataSync) {\n            activeChartInstance.updateDataSync(\n              dataIdStr,\n              dataIdAndField\n                ? data?.filter((item: any) => {\n                    return item.hasOwnProperty(dataIdAndField);\n                  }) ?? []\n                : data ?? []\n            );\n          }\n        }\n        activeChartInstance.updateFullDataSync?.(dataBatch);\n      }\n    } else {\n      if ((chart.getRootNode() as any).table.internalProps.renderChartAsync) {\n        if (chartRenderKeys.indexOf(`${chart.parent.col}+${chart.parent.row}`) === -1) {\n          chartRenderKeys.push(`${chart.parent.col}+${chart.parent.row}`);\n          chartRenderQueueList.push(chart);\n        }\n        //判断是否已经开启渲染队列\n        if (!IsHandlingChartQueue()) {\n          startRenderChartQueue((chart.getRootNode() as any).table);\n        }\n      } else {\n        renderChart(chart);\n      }\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    if (clip) {\n      context.restore();\n    } else {\n      context.highPerformanceRestore();\n    }\n  }\n}\n"]}
+{"version":3,"sources":["../src/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 './../../../vrender';\nimport {\n  ContributionProvider,\n  getTheme,\n  IGroupRenderContribution,\n  createImage,\n  inject,\n  injectable,\n  named,\n  BaseRender\n} from './../../../vrender';\nimport type { Chart } from '../chart';\nimport { CHART_NUMBER_TYPE } from '../chart';\nimport {\n  IsHandlingChartQueue,\n  chartRenderKeys,\n  chartRenderQueueList,\n  renderChart,\n  startRenderChartQueue\n} from './chart-render-helper';\nimport { isArray } from '@visactor/vutils';\n\nexport const ChartRender = Symbol.for('ChartRender');\nexport const ChartRenderContribution = Symbol.for('ChartRenderContribution');\n\n@injectable()\nexport class DefaultCanvasChartRender extends BaseRender<Chart> 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    // console.log(chart.parent.col, chart.parent.row);\n    // if (chart.parent.col !== 2 || chart.parent.row !== 2) {\n    //   return;\n    // }\n    const groupAttribute = getTheme(chart, params?.theme).group;\n\n    const { dataId, data, spec } = chart.attribute;\n    const viewBox = chart.getViewBox();\n    const { width = groupAttribute.width, height = groupAttribute.height } = chart.attribute;\n    const { table } = chart.getRootNode() as any;\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      if (isArray(cacheCanvas)) {\n        cacheCanvas.forEach(singleCacheCanvas => {\n          const { x, y, width, height, canvas } = singleCacheCanvas;\n          context.drawImage(canvas, x, y, width, height);\n        });\n      } else {\n        context.drawImage(cacheCanvas, x, y, width, height);\n      }\n    } else if (activeChartInstance) {\n      if (table.options.specFormat) {\n        const formatResult = table.options.specFormat(chart.attribute.spec);\n        if (formatResult.needFormatSpec && formatResult.spec) {\n          const spec = formatResult.spec;\n          activeChartInstance.updateSpecSync(spec);\n          return;\n        }\n      }\n\n      const viewBox = chart.getViewBox();\n      activeChartInstance.updateViewBox(\n        // {\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        {\n          x1: 0,\n          x2: viewBox.x2 - viewBox.x1,\n          y1: 0,\n          y2: viewBox.y2 - viewBox.y1\n        },\n        false,\n        false\n      );\n      // console.log(viewBox);\n\n      const chartStage = activeChartInstance.getStage();\n      chartStage.needRender = true;\n      // chartStage.background = 'red';\n      const matrix = chart.globalTransMatrix.clone();\n      const stageMatrix = chart.stage.window.getViewBoxTransform();\n      matrix.multiply(stageMatrix.a, stageMatrix.b, stageMatrix.c, stageMatrix.d, stageMatrix.e, stageMatrix.f);\n      chartStage.window.setViewBoxTransform(matrix.a, matrix.b, matrix.c, matrix.d, matrix.e, matrix.f);\n\n      if (typeof dataId === 'string') {\n        activeChartInstance.updateDataSync(dataId, data ?? []);\n      } else {\n        const dataBatch = [];\n        // 如果是组合图有series系列 需要组个设置数据 这里的data包括的单元格完整数据 需要根据key过滤\n        for (const dataIdStr in dataId) {\n          const dataIdAndField = dataId[dataIdStr];\n          const series = spec.series.find((item: any) => item?.data?.id === dataIdStr);\n          dataBatch.push({\n            id: dataIdStr,\n            values: dataIdAndField\n              ? data?.filter((item: any) => {\n                  return item.hasOwnProperty(dataIdAndField);\n                }) ?? []\n              : data ?? [],\n            fields: series?.data?.fields\n          });\n          if (!chartInstance.updateFullDataSync) {\n            activeChartInstance.updateDataSync(\n              dataIdStr,\n              dataIdAndField\n                ? data?.filter((item: any) => {\n                    return item.hasOwnProperty(dataIdAndField);\n                  }) ?? []\n                : data ?? []\n            );\n          }\n        }\n        activeChartInstance.updateFullDataSync?.(dataBatch);\n      }\n      // debugger;\n      // console.log(drawContext.context.canvas.toDataURL());\n    } else {\n      if (table.internalProps.renderChartAsync) {\n        if (chartRenderKeys.indexOf(`${chart.parent.col}+${chart.parent.row}`) === -1) {\n          chartRenderKeys.push(`${chart.parent.col}+${chart.parent.row}`);\n          chartRenderQueueList.push(chart);\n        }\n        //判断是否已经开启渲染队列\n        if (!IsHandlingChartQueue()) {\n          startRenderChartQueue(table);\n        }\n      } else {\n        renderChart(chart);\n      }\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  //   if (clip) {\n  //     context.restore();\n  //   } else {\n  //     context.highPerformanceRestore();\n  //   }\n  // }\n  draw(chart: Chart, renderService: IRenderService, drawContext: IDrawContext, params?: IGraphicRenderDrawParams) {\n    // const circleAttribute = getTheme(circle, params?.theme).circle;\n    this._draw(chart, {} as any, false, drawContext, params);\n  }\n}\n"]}

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

@@ -68,7 +68,8 @@ function createChartCellGroup(cellGroup, columnGroup, xOrigin, yOrigin, col, row
         data: table.getCellValue(col, row),
         cellPadding: padding,
         dpr: table.internalProps.pixelRatio,
-        axes: table.isPivotChart() ? table.internalProps.layoutMap.getChartAxes(col, row) : []
+        axes: table.isPivotChart() ? table.internalProps.layoutMap.getChartAxes(col, row) : [],
+        tableChartOption: table.options.chartOption
     });
     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":["../src/scenegraph/group-creater/cell-type/chart-cell.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+CAA4C;AAC5C,+CAA4C;AAC5C,yEAA2D;AAC3D,mDAAyD;AACzD,6CAA2C;AAG3C,SAAgB,oBAAoB,CAClC,SAAuB,EACvB,WAAkB,EAClB,OAAe,EACf,OAAe,EACf,GAAW,EACX,GAAW,EACX,KAAa,EACb,MAAc,EACd,OAAiB,EACjB,SAAiB,EACjB,WAAgB,EAChB,SAAc,EACd,aAAkB,EAClB,MAAuC,EACvC,KAAmB,EACnB,SAAqB;;IAGrB,MAAM,cAAc,GAAG,kBAAkB,CAAC,GAAG,EAAE,CAAC;IAChD,MAAM,SAAS,GAAG,cAAc,CAAC,WAAW,CAAC,CAAC;IAC9C,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,gBAAO,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;YACtD,QAAQ,EAAE,MAAA,MAAA,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,KAAK,0CAAE,QAAQ,mCAAI,SAAS;YAEjD,OAAO,EAAE,QAAQ;YAEjB,IAAI,EAAE,IAAI;YAEV,YAAY,EAAE,SAAS,CAAC,KAAK,CAAC,YAAY;SACpC,CAAC,CAAC;QACV,SAAS,CAAC,IAAI,GAAG,MAAM,CAAC;QACxB,SAAS,CAAC,GAAG,GAAG,GAAG,CAAC;QACpB,SAAS,CAAC,GAAG,GAAG,GAAG,CAAC;QAEpB,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,YAAY,CAAC,SAAS,CAAC,CAAC;KACtC;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;QAEb,MAAM,EAAE,MAAA,KAAK,CAAC,MAAM,mCAAK,KAAK,CAAC,UAAU,CAAC,KAAK,CAAC,MAAM,CAAC,UAAU,EAAE,CAAC,MAAuC;QAC3G,IAAI,EAAE,KAAK,CAAC,OAAO,CAAC,IAAI;QACxB,UAAU,EAAE,KAAK,CAAC,OAAO,CAAC,UAAU;QACpC,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;QACN,IAAI,EAAE,KAAK,CAAC,YAAY,CAAC,GAAG,EAAE,GAAG,CAAC;QAClC,WAAW,EAAE,OAAO;QACpB,GAAG,EAAE,KAAK,CAAC,aAAa,CAAC,UAAU;QAOnC,IAAI,EAAE,KAAK,CAAC,YAAY,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,aAAa,CAAC,SAAS,CAAC,YAAY,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE;KAOvF,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;AA7FD,oDA6FC","file":"chart-cell.js","sourcesContent":["import { Group } from '../../graphic/group';\nimport { Chart } from '../../graphic/chart';\nimport * as registerChartTypes from '../../../chartModule';\nimport { getFunctionalProp } from '../../utils/get-prop';\nimport { isValid } from '@visactor/vutils';\nimport type { BaseTableAPI } from '../../../ts-types/base-table';\nimport type { IThemeSpec } from './../../../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  chartModule: any,\n  chartSpec: any,\n  chartInstance: any,\n  dataId: string | Record<string, string>,\n  table: BaseTableAPI,\n  cellTheme: IThemeSpec\n) {\n  // 获取注册的chart图表类型\n  const registerCharts = registerChartTypes.get();\n  const ClassType = registerCharts[chartModule];\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      lineDash: cellTheme?.group?.lineDash ?? undefined,\n\n      lineCap: 'square',\n\n      clip: true,\n\n      cornerRadius: cellTheme.group.cornerRadius\n    } as any);\n    cellGroup.role = 'cell';\n    cellGroup.col = col;\n    cellGroup.row = row;\n    // columnGroup?.addChild(cellGroup);\n    columnGroup?.addCellGroup(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    canvas: table.canvas ?? (table.scenegraph.stage.window.getContext().canvas as unknown as HTMLCanvasElement),\n    mode: table.options.mode,\n    modeParams: table.options.modeParams,\n    spec: chartSpec,\n    ClassType,\n    width: width - padding[3] - padding[1],\n    height: height - padding[2] - padding[0],\n    chartInstance,\n    dataId,\n    data: table.getCellValue(col, row),\n    cellPadding: padding,\n    dpr: table.internalProps.pixelRatio,\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.isPivotChart() ? 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"]}
+{"version":3,"sources":["../src/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 { Chart } from '../../graphic/chart';\nimport * as registerChartTypes from '../../../chartModule';\nimport { getFunctionalProp } from '../../utils/get-prop';\nimport { isValid } from '@visactor/vutils';\nimport type { BaseTableAPI } from '../../../ts-types/base-table';\nimport type { IThemeSpec } from './../../../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  chartModule: any,\n  chartSpec: any,\n  chartInstance: any,\n  dataId: string | Record<string, string>,\n  table: BaseTableAPI,\n  cellTheme: IThemeSpec\n) {\n  // 获取注册的chart图表类型\n  const registerCharts = registerChartTypes.get();\n  const ClassType = registerCharts[chartModule];\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      lineDash: cellTheme?.group?.lineDash ?? undefined,\n\n      lineCap: 'square',\n\n      clip: true,\n\n      cornerRadius: cellTheme.group.cornerRadius\n    } as any);\n    cellGroup.role = 'cell';\n    cellGroup.col = col;\n    cellGroup.row = row;\n    // columnGroup?.addChild(cellGroup);\n    columnGroup?.addCellGroup(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    canvas: table.canvas ?? (table.scenegraph.stage.window.getContext().canvas as unknown as HTMLCanvasElement),\n    mode: table.options.mode,\n    modeParams: table.options.modeParams,\n    spec: chartSpec,\n    ClassType,\n    width: width - padding[3] - padding[1],\n    height: height - padding[2] - padding[0],\n    chartInstance,\n    dataId,\n    data: table.getCellValue(col, row),\n    cellPadding: padding,\n    dpr: table.internalProps.pixelRatio,\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.isPivotChart() ? 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    tableChartOption: table.options.chartOption\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/layout/compute-col-width.js

@@ -150,7 +150,7 @@ function computeCustomRenderWidth(col, row, table) {
     const customRender = table.getCustomRender(col, row), customLayout = table.getCustomLayout(col, row);
     if (customRender || customLayout) {
         let spanCol = 1, width = 0, renderDefault = !1, enableCellPadding = !1;
-        if (table.isHeader(col, row) || (null === (_a = table.getBodyColumnDefine(col, row)) || void 0 === _a ? void 0 : _a.mergeCell)) {
+        if (table.isHeader(col, row) || (null === (_a = table.getBodyColumnDefine(col, row)) || void 0 === _a ? void 0 : _a.mergeCell) || table.hasCustomMerge()) {
             const cellRange = table.getCellRange(col, row);
             spanCol = cellRange.end.col - cellRange.start.col + 1;
         }
@@ -213,7 +213,7 @@ function computeTextWidth(col, row, cellType, table) {
         }));
     }
     let spanCol = 1;
-    if (table.isHeader(col, row) || (null === (_a = table.getBodyColumnDefine(col, row)) || void 0 === _a ? void 0 : _a.mergeCell)) {
+    if (table.isHeader(col, row) || (null === (_a = table.getBodyColumnDefine(col, row)) || void 0 === _a ? void 0 : _a.mergeCell) || table.hasCustomMerge()) {
         const cellRange = table.getCellRange(col, row);
         spanCol = cellRange.end.col - cellRange.start.col + 1;
     }

package/cjs/scenegraph/layout/compute-col-width.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/scenegraph/layout/compute-col-width.ts"],"names":[],"mappings":"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","file":"compute-col-width.js","sourcesContent":["import type { SimpleHeaderLayoutMap } from '../../layout';\nimport type { ColumnTypeOption, TextColumnDefine } from '../../ts-types';\nimport { HierarchyState, IconPosition } from '../../ts-types';\nimport * as calc from '../../tools/calc';\nimport { validToString } from '../../tools/util';\nimport { getQuadProps } from '../utils/padding';\nimport { getProp } from '../utils/get-prop';\nimport type { BaseTableAPI } from '../../ts-types/base-table';\nimport type { PivotHeaderLayoutMap } from '../../layout/pivot-header-layout';\nimport { getAxisConfigInPivotChart } from '../../layout/chart-helper/get-axis-config';\nimport { computeAxisComponentWidth } from '../../components/axis/get-axis-component-size';\nimport { Group as VGroup } from './../../vrender';\nimport { isObject } from '@visactor/vutils';\nimport { decodeReactDom, dealPercentCalc } from '../component/custom';\n\nexport function computeColsWidth(table: BaseTableAPI, colStart?: number, colEnd?: number, update?: boolean): void {\n  const time = typeof window !== 'undefined' ? window.performance.now() : 0;\n  colStart = colStart ?? 0;\n  colEnd = colEnd ?? table.colCount - 1;\n  // table._clearColRangeWidthsMap();\n  // clear colRangeWidthsMap\n  if (colStart === 0 && colEnd === table.colCount - 1) {\n    table._clearColRangeWidthsMap();\n    // } else {\n    //   for (let col = colStart; col <= colEnd; col++) {\n    //     table._clearColRangeWidthsMap(col);\n    //   }\n  }\n\n  const oldColWidths: number[] = [];\n  const newWidths: number[] = [];\n  if (update) {\n    for (let col = 0; col < table.colCount; col++) {\n      oldColWidths[col] = table.getColWidth(col);\n    }\n  }\n  for (let col = colStart; col <= colEnd; col++) {\n    let maxWidth;\n    if (\n      !table.internalProps.transpose &&\n      table.internalProps.layoutMap.columnWidths?.[col]?.columnWidthComputeMode === 'only-header' &&\n      'showHeader' in table.internalProps.layoutMap\n    ) {\n      const temp = table.internalProps.layoutMap.showHeader;\n      table.internalProps.layoutMap.showHeader = true;\n      maxWidth = computeColWidth(col, 0, table.internalProps.layoutMap.headerLevelCount - 1, table);\n      table.internalProps.layoutMap.showHeader = temp;\n    } else if (\n      !table.internalProps.transpose &&\n      table.internalProps.layoutMap.columnWidths?.[col]?.columnWidthComputeMode === 'only-body'\n    ) {\n      maxWidth = computeColWidth(\n        col,\n        table.internalProps.layoutMap.getBodyRange().start.row,\n        table.internalProps.layoutMap.getBodyRange().end.row,\n        table\n      );\n    } else {\n      maxWidth = computeColWidth(col, 0, table.rowCount - 1, table);\n    }\n\n    table._setColContentWidth(col, maxWidth);\n\n    const oldWidth = table.getColWidth(col);\n    if (oldWidth !== maxWidth) {\n      table._clearColRangeWidthsMap(col);\n    }\n    if (update) {\n      newWidths[col] = Math.round(table._adjustColWidth(col, maxWidth));\n    } else {\n      table._setColWidth(col, table._adjustColWidth(col, maxWidth), false, true);\n    }\n  }\n\n  // 处理adaptive宽度\n  if (table.widthMode === 'adaptive') {\n    // const rowHeaderWidth = table.getColsWidth(0, table.rowHeaderLevelCount - 1);\n    // const rightHeaderWidth = table.isPivotChart() ? table.getRightFrozenColsWidth() : 0;\n    // const totalDrawWidth = table.tableNoFrameWidth - rowHeaderWidth - rightHeaderWidth;\n\n    table._clearColRangeWidthsMap();\n    const canvasWidth = table.tableNoFrameWidth;\n    let actualHeaderWidth = 0;\n    for (let col = 0; col < table.colCount; col++) {\n      const colWidth = update ? newWidths[col] : table.getColWidth(col);\n      if (\n        col < table.rowHeaderLevelCount ||\n        (table.isPivotChart() && col >= table.colCount - table.rightFrozenColCount)\n      ) {\n        actualHeaderWidth += colWidth;\n      }\n    }\n    const startCol = table.rowHeaderLevelCount;\n    const endCol = table.isPivotChart() ? table.colCount - table.rightFrozenColCount : table.colCount;\n    getAdaptiveWidth(canvasWidth - actualHeaderWidth, startCol, endCol, update, newWidths, table);\n    // const canvasWidth = table.internalProps.canvas.width;\n    // const rowHeaderWidth = table.getColsWidth(0, table.rowHeaderLevelCount - 1);\n    // const rightHeaderWidth = table.isPivotChart() ? table.getRightFrozenColsWidth() : 0;\n    // const totalDrawWidth = table.tableNoFrameWidth - rowHeaderWidth - rightHeaderWidth;\n    // const startCol = table.rowHeaderLevelCount;\n    // const endCol = table.isPivotChart() ? table.colCount - table.rightFrozenColCount : table.colCount;\n    // let actualWidth = 0;\n    // for (let col = startCol; col < endCol; col++) {\n    //   actualWidth += update ? newWidths[col] : table.getColWidth(col);\n    // }\n    // const factor = totalDrawWidth / actualWidth;\n    // for (let col = startCol; col < endCol; col++) {\n    //   let colWidth;\n    //   if (col === endCol - 1) {\n    //     colWidth =\n    //       totalDrawWidth -\n    //       (update\n    //         ? newWidths.reduce((acr, cur, index) => {\n    //             if (index >= startCol && index <= endCol - 2) {\n    //               return acr + cur;\n    //             }\n    //             return acr;\n    //           }, 0)\n    //         : table.getColsWidth(startCol, endCol - 2));\n    //   } else {\n    //     colWidth = Math.round((update ? newWidths[col] : table.getColWidth(col)) * factor);\n    //   }\n    //   if (update) {\n    //     newWidths[col] = table._adjustColWidth(col, colWidth);\n    //   } else {\n    //     table._setColWidth(col, table._adjustColWidth(col, colWidth), false, true);\n    //   }\n    // }\n  } else if (table.autoFillWidth) {\n    table._clearColRangeWidthsMap();\n    const canvasWidth = table.tableNoFrameWidth;\n    let actualHeaderWidth = 0;\n    let actualWidth = 0;\n    for (let col = 0; col < table.colCount; col++) {\n      const colWidth = update ? newWidths[col] : table.getColWidth(col);\n      if (\n        col < table.rowHeaderLevelCount ||\n        (table.isPivotChart() && col >= table.colCount - table.rightFrozenColCount)\n      ) {\n        actualHeaderWidth += colWidth;\n      }\n      actualWidth += colWidth;\n    }\n    // 如果内容宽度小于canvas宽度，执行adaptive放大\n    if (actualWidth < canvasWidth && actualWidth > actualHeaderWidth) {\n      const startCol = table.rowHeaderLevelCount;\n      const endCol = table.isPivotChart() ? table.colCount - table.rightFrozenColCount : table.colCount;\n      getAdaptiveWidth(canvasWidth - actualHeaderWidth, startCol, endCol, update, newWidths, table);\n    }\n\n    // // 如果内容宽度小于canvas宽度，执行adaptive放大\n    // if (actualWidth < canvasWidth && actualWidth - actualHeaderWidth > 0) {\n    //   const factor = (canvasWidth - actualHeaderWidth) / (actualWidth - actualHeaderWidth);\n    //   for (let col = table.frozenColCount; col < table.colCount - table.rightFrozenColCount; col++) {\n    //     let colWidth;\n    //     if (col === table.colCount - table.rightFrozenColCount - 1) {\n    //       colWidth =\n    //         canvasWidth -\n    //         actualHeaderWidth -\n    //         (update\n    //           ? newWidths.reduce((acr, cur, index) => {\n    //               if (index >= table.frozenColCount && index <= table.colCount - table.rightFrozenColCount - 2) {\n    //                 return acr + cur;\n    //               }\n    //               return acr;\n    //             }, 0)\n    //           : table.getColsWidth(table.frozenColCount, table.colCount - table.rightFrozenColCount - 2));\n    //     } else {\n    //       colWidth = Math.round((update ? newWidths[col] : table.getColWidth(col)) * factor);\n    //     }\n    //     if (update) {\n    //       // newWidths[col] = newWidths[col] * factor;\n    //       newWidths[col] = table._adjustColWidth(col, colWidth);\n    //     } else {\n    //       // table.setColWidth(col, table.getColWidth(col) * factor, false, true);\n    //       table._setColWidth(col, table._adjustColWidth(col, colWidth), false, true);\n    //     }\n    //   }\n    // }\n  }\n  // console.log('computeColsWidth  time:', (typeof window !== 'undefined' ? window.performance.now() : 0) - time);\n\n  if (update) {\n    for (let col = 0; col < table.colCount; col++) {\n      // newColWidth could not be in column min max range possibly\n      // const newColWidth = table._adjustColWidth(col, newWidths[col]) ?? table.getColWidth(col);\n      const newColWidth = newWidths[col] ?? table.getColWidth(col);\n      if (newColWidth !== oldColWidths[col]) {\n        // update the column width in scenegraph\n        table._setColWidth(col, newColWidth, false, true);\n        // table.scenegraph.updateColWidth(col, newColWidth - oldColWidths[col], true, true);\n      }\n    }\n    table.stateManager.checkFrozen();\n    for (let col = 0; col < table.colCount; col++) {\n      // newColWidth could not be in column min max range possibly\n      // const newColWidth = table._adjustColWidth(col, newWidths[col]) ?? table.getColWidth(col);\n      const newColWidth = table.getColWidth(col);\n      if (newColWidth !== oldColWidths[col]) {\n        // update the column width in scenegraph\n        // table._setColWidth(col, newColWidth);\n        table.scenegraph.updateColWidth(col, newColWidth - oldColWidths[col], true, true);\n      }\n    }\n    table.scenegraph.updateContainer();\n  }\n  // console.log('computeColsWidth  time:', (typeof window !== 'undefined' ? window.performance.now() : 0) - time, colStart, colEnd);\n}\n\n/**\n * @description: 计算列宽\n * @param {number} col\n * @param {number} startRow\n * @param {number} endRow\n * @param {BaseTableAPI} table\n * @param {boolean} forceCompute\n * @return {*}\n */\nexport function computeColWidth(\n  col: number,\n  startRow: number,\n  endRow: number,\n  table: BaseTableAPI,\n  forceCompute: boolean = false //forceCompute如果设置为true 即便不是自动列宽的列也会按内容计算列宽\n): number {\n  // const { layoutMap, transpose } = table.internalProps;\n  // let { width } = layoutMap?.getColumnWidthDefined(col) ?? {};\n\n  // if (transpose) {\n  //   // 转置模式\n  //   if (table.widthMode === 'standard') {\n  //     // return table.getColWidth(col);\n  //     // standard模式使用默认值\n  //     if (table.isRowHeader(col, 0) || table.isCornerHeader(col, 0)) {\n  //       const defaultWidth = Array.isArray(table.defaultHeaderColWidth)\n  //         ? table.defaultHeaderColWidth[col] ?? table.defaultColWidth\n  //         : table.defaultHeaderColWidth;\n  //       if (defaultWidth === 'auto') {\n  //         widthfffff = 'auto';\n  //       } else {\n  //         return defaultWidth;\n  //       }\n  //     }\n\n  //     if (widthfffff !== 'auto') {\n  //       // if (width && (typeof width === 'string' || width > 0)) return width;\n  //       if (typeof widthfffff === 'string') {\n  //         return calc.toPx(widthfffff, table.internalProps.calcWidthContext);\n  //       } else if (widthfffff) {\n  //         return widthfffff;\n  //       }\n  //       return table.defaultColWidth;\n  //     }\n  //   } else if (\n  //     table.widthMode === 'adaptive' &&\n  //     col === 0 &&\n  //     widthfffff !== 'auto' &&\n  //     (layoutMap as SimpleHeaderLayoutMap)?.showHeader\n  //   ) {\n  //     // ToBeFixed hack逻辑，转置第一列列宽为header[0]\n  //     if (typeof widthfffff === 'string') {\n  //       return calc.toPx(widthfffff, table.internalProps.calcWidthContext);\n  //     } else if (widthfffff) {\n  //       return widthfffff;\n  //     }\n  //   }\n  //   // autoWidth adaptive 需要计算内容宽度\n  //   // do nothing\n  // } else if (widthfffff !== 'auto' && table.widthMode !== 'autoWidth' && !forceCompute) {\n  //   // if (width && (typeof width === 'string' || width > 0)) return width;\n  //   if (typeof widthfffff === 'string') {\n  //     return calc.toPx(widthfffff, table.internalProps.calcWidthContext);\n  //   } else if (widthfffff) {\n  //     return widthfffff;\n  //   }\n  //   //是透视表的行表头部分 则宽度按defaultHeaderColWidth设置\n  //   const defaultWidth = table.getColWidthDefine(col);\n  //   if (defaultWidth !== 'auto') {\n  //     return table.getColWidth(col);\n  //   }\n  // }\n  const width = getColWidthDefinedWidthResizedWidth(col, table);\n  if (forceCompute && !table.internalProps.transpose) {\n    return computeAutoColWidth(width, col, startRow, endRow, forceCompute, table);\n  } else if (typeof width === 'number') {\n    return width;\n  } else if (width !== 'auto' && typeof width === 'string') {\n    // return calc.toPx(width, table.internalProps.calcWidthContext);\n    return table._adjustColWidth(col, table._colWidthDefineToPxWidth(width));\n  }\n  return computeAutoColWidth(width, col, startRow, endRow, forceCompute, table);\n}\n\n/**\n * @description: 计算width: auto情况下的列宽\n * @param {number} col\n * @param {number} startRow\n * @param {number} endRow\n * @param {boolean} forceCompute\n * @param {BaseTableAPI} table\n * @return {*}\n */\nfunction computeAutoColWidth(\n  widthDeifne: string | number,\n  col: number,\n  startRow: number,\n  endRow: number,\n  forceCompute: boolean,\n  table: BaseTableAPI\n): number {\n  // 处理 auto width\n  let maxWidth = 0;\n  let deltaRow = 1;\n  let prepareDeltaRow = 1; // 当计算完表头单元格的宽度后再采用采用逻辑，prepareDeltaRow这个值为期body部分做准备\n  if (endRow - startRow > 5000) {\n    // 超过5000行启动列宽自动计算采样\n    prepareDeltaRow = Math.ceil((endRow - startRow) / 5000);\n  }\n  // 如果是透视图\n  if (table.isPivotChart() && col >= table.rowHeaderLevelCount && col < table.colCount - table.rightFrozenColCount) {\n    if (!(table.internalProps.layoutMap as PivotHeaderLayoutMap).indicatorsAsCol) {\n      //并且指标是以行展示 计算列宽需要根据x轴的值域范围\n      const optimunWidth = (table.internalProps.layoutMap as PivotHeaderLayoutMap).getOptimunWidthForChart(col);\n      if (optimunWidth > 0) {\n        return optimunWidth;\n      }\n    } else {\n      //直接拿表头的默认列宽\n      return table.defaultColWidth;\n    }\n  }\n\n  for (let row = startRow; row <= endRow; row += deltaRow) {\n    // 判断透视图轴组件\n    if (table.isPivotChart()) {\n      const layout = table.internalProps.layoutMap as PivotHeaderLayoutMap;\n      const axisConfig = getAxisConfigInPivotChart(col, row, layout);\n      if (axisConfig) {\n        const axisWidth = computeAxisComponentWidth(axisConfig, table);\n        if (typeof axisWidth === 'number') {\n          maxWidth = Math.max(axisWidth, maxWidth);\n          continue;\n        }\n      } else if (\n        layout.isLeftBottomCorner(col, row) ||\n        layout.isRightTopCorner(col, row) ||\n        layout.isRightBottomCorner(col, row)\n      ) {\n        // 透视图三角为无效单元格，不参与宽度计算\n        continue;\n      }\n    }\n\n    // 判断CustomRender\n    const customWidth = computeCustomRenderWidth(col, row, table);\n    if (customWidth) {\n      maxWidth = Math.max(customWidth.width, maxWidth);\n      if (!customWidth.renderDefault) {\n        continue;\n      }\n    }\n\n    // 判断透视表如果在指标\n    // const indicatorWidth = computeIndicatorWidth(col, row, forceCompute, table);\n    // const indicatorWidth = table.internalProps.layoutMap.getColumnWidthDefined(col);\n    const indicatorWidth = widthDeifne;\n    if (typeof indicatorWidth === 'number' && table.widthMode === 'standard' && !forceCompute) {\n      maxWidth = Math.max(indicatorWidth, maxWidth);\n      continue;\n    }\n\n    const cellType = table.isHeader(col, row)\n      ? table._getHeaderLayoutMap(col, row)?.headerType\n      : table.getBodyColumnType(col, row);\n    if (cellType !== 'text' && cellType !== 'link' && cellType !== 'progressbar' && cellType !== 'checkbox') {\n      // text&link&progressbar测量文字宽度\n      // image&video&sparkline使用默认宽度\n      maxWidth = Math.max(maxWidth, table.getColWidthDefinedNumber(col) || 0);\n      continue;\n    }\n\n    // 处理树形展开\n    let cellHierarchyIndent = 0;\n    const layoutMap = table.internalProps.layoutMap;\n    //判断是否为表头\n    if (layoutMap.isHeader(col, row)) {\n      const hd = layoutMap.getHeader(col, row);\n      // 如果某级表头设置了only-body，在计算表头内容宽度时跳过改级表头\n      if (hd?.define?.columnWidthComputeMode === 'only-body') {\n        continue;\n      }\n      if (hd?.hierarchyLevel) {\n        cellHierarchyIndent = (hd.hierarchyLevel ?? 0) * ((layoutMap as PivotHeaderLayoutMap).rowHierarchyIndent ?? 0);\n      }\n    } else {\n      deltaRow = prepareDeltaRow;\n      // 基本表格表身body单元格 如果是树形展开 需要考虑缩进值\n      // const cellHierarchyState = table.getHierarchyState(col, row);\n      // if (cellHierarchyState === HierarchyState.expand || cellHierarchyState === HierarchyState.collapse) {\n      const define = table.getBodyColumnDefine(col, row);\n      if (define?.tree) {\n        const indexArr = table.dataSource.getIndexKey(table.getRecordShowIndexByCell(col, row));\n        cellHierarchyIndent =\n          Array.isArray(indexArr) && table.getHierarchyState(col, row) !== HierarchyState.none\n            ? (indexArr.length - 1) * ((layoutMap as SimpleHeaderLayoutMap).hierarchyIndent ?? 0)\n            : 0;\n      }\n    }\n\n    // 测量文字宽度\n    const textWidth = computeTextWidth(col, row, cellType, table);\n    maxWidth = Math.max(textWidth + cellHierarchyIndent, maxWidth);\n    //在前面设置了采用规则的情况下，为了确保底部冻结的每一行都测到\n    if (\n      deltaRow > 1 &&\n      table.bottomFrozenRowCount > 0 &&\n      row < table.rowCount - table.bottomFrozenRowCount &&\n      row + deltaRow >= table.rowCount - table.bottomFrozenRowCount\n    ) {\n      row = table.rowCount - table.bottomFrozenRowCount - deltaRow;\n      deltaRow = 1;\n      prepareDeltaRow = 1;\n    }\n  }\n\n  // 处理宽度限制\n  const colMinWidth = table.getMinColWidth(col);\n  const colMaxWidth = table.getMaxColWidth(col);\n  if (maxWidth < colMinWidth) {\n    return colMinWidth;\n  } else if (maxWidth > colMaxWidth) {\n    return colMaxWidth;\n  }\n  return maxWidth;\n}\n\n/**\n * @description: 计算customRender相关列宽\n * @param {number} col\n * @param {number} row\n * @param {BaseTableAPI} table\n * @return {*}\n */\nfunction computeCustomRenderWidth(col: number, row: number, table: BaseTableAPI) {\n  const customRender = table.getCustomRender(col, row);\n  const customLayout = table.getCustomLayout(col, row);\n  if (customRender || customLayout) {\n    let spanCol = 1;\n    let width = 0;\n    let renderDefault = false;\n    let enableCellPadding = false;\n    if (table.isHeader(col, row) || (table.getBodyColumnDefine(col, row) as TextColumnDefine)?.mergeCell) {\n      const cellRange = table.getCellRange(col, row);\n      spanCol = cellRange.end.col - cellRange.start.col + 1;\n    }\n    const arg = {\n      col,\n      row,\n      dataValue: table.getCellOriginValue(col, row),\n      value: table.getCellValue(col, row) || '',\n      rect: getCellRect(col, row, table),\n      table\n    };\n    if (customLayout) {\n      // 处理customLayout\n      const customLayoutObj = customLayout(arg);\n      if (customLayoutObj.rootContainer instanceof VGroup) {\n        customLayoutObj.rootContainer = decodeReactDom(customLayoutObj.rootContainer);\n        dealPercentCalc(customLayoutObj.rootContainer, 0, table.getRowHeight(row));\n        customLayoutObj.rootContainer.setStage(table.scenegraph.stage);\n        width = (customLayoutObj.rootContainer as VGroup).AABBBounds.width() ?? 0;\n        renderDefault = customLayoutObj.renderDefault;\n        enableCellPadding = customLayoutObj.enableCellPadding;\n      } else {\n        width = 0;\n      }\n    } else if (typeof customRender === 'function') {\n      // 处理customRender\n      const customRenderObj = customRender(arg);\n      width = customRenderObj?.expectedWidth ?? 0;\n      renderDefault = customRenderObj?.renderDefault;\n    } else {\n      width = customRender?.expectedWidth ?? 0;\n      renderDefault = customRender?.renderDefault;\n    }\n    if (enableCellPadding) {\n      const actStyle = table._getCellStyle(col, row);\n      const padding = getQuadProps(getProp('padding', actStyle, col, row, table));\n      width += padding[1] + padding[3];\n    }\n    return {\n      width: width / spanCol,\n      renderDefault\n    };\n  }\n  return undefined;\n}\n\n/**\n * @description: 计算指标相关列宽\n * @param {number} col\n * @param {number} row\n * @param {boolean} forceCompute\n * @param {BaseTableAPI} table\n * @return {*}\n */\nfunction computeIndicatorWidth(\n  col: number,\n  row: number,\n  forceCompute: boolean,\n  table: BaseTableAPI\n): number | undefined {\n  const { layoutMap } = table.internalProps;\n  if (table.isPivotTable() && (layoutMap as PivotHeaderLayoutMap).isColumnIndicatorHeader(col, row)) {\n    // 透视表如果在指标中配置了宽度，使用该宽度作为指标单元格及下面内容单元格的列宽\n    const body = layoutMap.getBody(col, row);\n    if (body && body.width && body.width !== 'auto' && !forceCompute) {\n      const width = Math.round(calc.toPx(body.width, table.internalProps.calcWidthContext));\n      return width;\n    }\n  }\n  return undefined;\n}\n\n/**\n * @description: 计算文字宽度\n * @param {number} col\n * @param {number} row\n * @param {BaseTableAPI} table\n * @return {*}\n */\nfunction computeTextWidth(col: number, row: number, cellType: ColumnTypeOption, table: BaseTableAPI): number {\n  let maxWidth = 0;\n  const cellValue = table.getCellValue(col, row);\n  // const dataValue = table.getCellOriginValue(col, row);\n  const actStyle = table._getCellStyle(col, row);\n  let iconWidth = 0;\n\n  // const define = table.getBodyColumnDefine(col, row);\n  // const mayHaveIcon = table.getCellLocation(col, row) !== 'body' ? true : !!define?.icon || !!define?.tree;\n\n  let mayHaveIcon = false;\n  if (table.getCellLocation(col, row) !== 'body') {\n    mayHaveIcon = true;\n  } else {\n    const define = table.getBodyColumnDefine(col, row);\n    mayHaveIcon = !!define?.icon || !!define?.tree;\n  }\n  if (mayHaveIcon) {\n    const icons = table.getCellIcons(col, row);\n    icons?.forEach(icon => {\n      if (icon.positionType !== IconPosition.absoluteRight) {\n        iconWidth += (icon.width ?? 0) + (icon.marginLeft ?? 0) + (icon.marginRight ?? 0);\n      }\n    });\n  }\n\n  let spanCol = 1;\n  if (table.isHeader(col, row) || (table.getBodyColumnDefine(col, row) as TextColumnDefine)?.mergeCell) {\n    const cellRange = table.getCellRange(col, row);\n    spanCol = cellRange.end.col - cellRange.start.col + 1;\n  }\n\n  const padding = getQuadProps(getProp('padding', actStyle, col, row, table));\n  const paddingWidth = padding[1] + padding[3]; // + cellHierarchyIndent\n\n  const fontSize = getProp('fontSize', actStyle, col, row, table);\n  const fontFamily = getProp('fontFamily', actStyle, col, row, table);\n  const fontWeight = getProp('fontWeight', actStyle, col, row, table);\n  let text;\n  if (cellType === 'checkbox') {\n    text = isObject(cellValue) ? (cellValue as any).text : cellValue;\n  } else {\n    text = cellValue;\n  }\n  const lines = validToString(text).split('\\n') || [];\n  if (lines.length >= 1) {\n    // eslint-disable-next-line no-loop-func\n    lines.forEach((line: string) => {\n      const width = table.measureText(line.slice(0, table.options.maxCharactersNumber || 200), {\n        fontSize,\n        fontFamily,\n        fontWeight\n      }).width;\n      maxWidth = Math.max(\n        // 最大字符上限控制测量的字符\n        (width + paddingWidth + 4 + iconWidth) / spanCol, // 这里+4为列宽测量结果的buffer\n        maxWidth\n      );\n    });\n  } else {\n    maxWidth = Math.max(\n      // 最大字符上限控制测量的字符\n      (paddingWidth + 4 + iconWidth) / spanCol,\n      maxWidth\n    );\n  }\n  // 判断是否需要限制最大宽度 之前写死的450 需要使用配置来判断\n  if (table.internalProps.limitMaxAutoWidth !== false) {\n    maxWidth = Math.min(\n      typeof table.internalProps.limitMaxAutoWidth === 'number' ? table.internalProps.limitMaxAutoWidth : 450,\n      maxWidth\n    );\n  }\n\n  if (cellType === 'checkbox') {\n    const size = getProp('size', actStyle, col, row, table);\n    maxWidth += size;\n\n    if (text) {\n      const spaceBetweenTextAndIcon = getProp('spaceBetweenTextAndIcon', actStyle, col, row, table);\n      maxWidth += spaceBetweenTextAndIcon;\n    }\n  }\n\n  return maxWidth;\n}\n\nfunction getCellRect(col: number, row: number, table: BaseTableAPI) {\n  return {\n    left: 0,\n    top: 0,\n    right: table.getColWidth(col),\n    bottom: table.getRowHeight(row),\n    width: 0,\n    height: 0\n  };\n}\n\nfunction getColWidthDefinedWidthResizedWidth(col: number, table: BaseTableAPI) {\n  const widthDefined = table.getColWidthDefined(col);\n  if (table.internalProps._widthResizedColMap.has(col)) {\n    return table.getColWidth(col);\n  }\n  return widthDefined;\n}\n\nexport function getAdaptiveWidth(\n  totalDrawWidth: number,\n  startCol: number,\n  endColPlus1: number,\n  update: boolean,\n  newWidths: number[],\n  table: BaseTableAPI,\n  fromScenegraph?: boolean\n) {\n  let actualWidth = 0;\n  const adaptiveColumns: number[] = [];\n  for (let col = startCol; col < endColPlus1; col++) {\n    const width = update ? newWidths[col] : table.getColWidth(col);\n    const maxWidth = table.getMaxColWidth(col);\n    const minWidth = table.getMinColWidth(col);\n    if (width !== maxWidth && width !== minWidth) {\n      actualWidth += width;\n      adaptiveColumns.push(col);\n    } else {\n      // fixed width, do not adaptive\n      totalDrawWidth -= width;\n    }\n  }\n\n  const factor = totalDrawWidth / actualWidth;\n\n  for (let i = 0; i < adaptiveColumns.length; i++) {\n    const col = adaptiveColumns[i];\n    let colWidth;\n    if (i === adaptiveColumns.length - 1) {\n      colWidth =\n        totalDrawWidth -\n        adaptiveColumns.reduce((acr, cur, index) => {\n          if (cur !== col) {\n            return acr + (update ? newWidths[cur] : table.getColWidth(cur));\n          }\n          return acr;\n        }, 0);\n    } else {\n      colWidth = Math.round((update ? newWidths[col] : table.getColWidth(col)) * factor);\n    }\n    if (update) {\n      newWidths[col] = table._adjustColWidth(col, colWidth);\n    } else if (fromScenegraph) {\n      table.scenegraph.setColWidth(col, table._adjustColWidth(col, colWidth));\n    } else {\n      table._setColWidth(col, table._adjustColWidth(col, colWidth), false, true);\n    }\n  }\n}\n"]}
+{"version":3,"sources":["../src/scenegraph/layout/compute-col-width.ts"],"names":[],"mappings":"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","file":"compute-col-width.js","sourcesContent":["import type { SimpleHeaderLayoutMap } from '../../layout';\nimport type { ColumnTypeOption, TextColumnDefine } from '../../ts-types';\nimport { HierarchyState, IconPosition } from '../../ts-types';\nimport * as calc from '../../tools/calc';\nimport { validToString } from '../../tools/util';\nimport { getQuadProps } from '../utils/padding';\nimport { getProp } from '../utils/get-prop';\nimport type { BaseTableAPI } from '../../ts-types/base-table';\nimport type { PivotHeaderLayoutMap } from '../../layout/pivot-header-layout';\nimport { getAxisConfigInPivotChart } from '../../layout/chart-helper/get-axis-config';\nimport { computeAxisComponentWidth } from '../../components/axis/get-axis-component-size';\nimport { Group as VGroup } from './../../vrender';\nimport { isObject } from '@visactor/vutils';\nimport { decodeReactDom, dealPercentCalc } from '../component/custom';\n\nexport function computeColsWidth(table: BaseTableAPI, colStart?: number, colEnd?: number, update?: boolean): void {\n  const time = typeof window !== 'undefined' ? window.performance.now() : 0;\n  colStart = colStart ?? 0;\n  colEnd = colEnd ?? table.colCount - 1;\n  // table._clearColRangeWidthsMap();\n  // clear colRangeWidthsMap\n  if (colStart === 0 && colEnd === table.colCount - 1) {\n    table._clearColRangeWidthsMap();\n    // } else {\n    //   for (let col = colStart; col <= colEnd; col++) {\n    //     table._clearColRangeWidthsMap(col);\n    //   }\n  }\n\n  const oldColWidths: number[] = [];\n  const newWidths: number[] = [];\n  if (update) {\n    for (let col = 0; col < table.colCount; col++) {\n      oldColWidths[col] = table.getColWidth(col);\n    }\n  }\n  for (let col = colStart; col <= colEnd; col++) {\n    let maxWidth;\n    if (\n      !table.internalProps.transpose &&\n      table.internalProps.layoutMap.columnWidths?.[col]?.columnWidthComputeMode === 'only-header' &&\n      'showHeader' in table.internalProps.layoutMap\n    ) {\n      const temp = table.internalProps.layoutMap.showHeader;\n      table.internalProps.layoutMap.showHeader = true;\n      maxWidth = computeColWidth(col, 0, table.internalProps.layoutMap.headerLevelCount - 1, table);\n      table.internalProps.layoutMap.showHeader = temp;\n    } else if (\n      !table.internalProps.transpose &&\n      table.internalProps.layoutMap.columnWidths?.[col]?.columnWidthComputeMode === 'only-body'\n    ) {\n      maxWidth = computeColWidth(\n        col,\n        table.internalProps.layoutMap.getBodyRange().start.row,\n        table.internalProps.layoutMap.getBodyRange().end.row,\n        table\n      );\n    } else {\n      maxWidth = computeColWidth(col, 0, table.rowCount - 1, table);\n    }\n\n    table._setColContentWidth(col, maxWidth);\n\n    const oldWidth = table.getColWidth(col);\n    if (oldWidth !== maxWidth) {\n      table._clearColRangeWidthsMap(col);\n    }\n    if (update) {\n      newWidths[col] = Math.round(table._adjustColWidth(col, maxWidth));\n    } else {\n      table._setColWidth(col, table._adjustColWidth(col, maxWidth), false, true);\n    }\n  }\n\n  // 处理adaptive宽度\n  if (table.widthMode === 'adaptive') {\n    // const rowHeaderWidth = table.getColsWidth(0, table.rowHeaderLevelCount - 1);\n    // const rightHeaderWidth = table.isPivotChart() ? table.getRightFrozenColsWidth() : 0;\n    // const totalDrawWidth = table.tableNoFrameWidth - rowHeaderWidth - rightHeaderWidth;\n\n    table._clearColRangeWidthsMap();\n    const canvasWidth = table.tableNoFrameWidth;\n    let actualHeaderWidth = 0;\n    for (let col = 0; col < table.colCount; col++) {\n      const colWidth = update ? newWidths[col] : table.getColWidth(col);\n      if (\n        col < table.rowHeaderLevelCount ||\n        (table.isPivotChart() && col >= table.colCount - table.rightFrozenColCount)\n      ) {\n        actualHeaderWidth += colWidth;\n      }\n    }\n    const startCol = table.rowHeaderLevelCount;\n    const endCol = table.isPivotChart() ? table.colCount - table.rightFrozenColCount : table.colCount;\n    getAdaptiveWidth(canvasWidth - actualHeaderWidth, startCol, endCol, update, newWidths, table);\n    // const canvasWidth = table.internalProps.canvas.width;\n    // const rowHeaderWidth = table.getColsWidth(0, table.rowHeaderLevelCount - 1);\n    // const rightHeaderWidth = table.isPivotChart() ? table.getRightFrozenColsWidth() : 0;\n    // const totalDrawWidth = table.tableNoFrameWidth - rowHeaderWidth - rightHeaderWidth;\n    // const startCol = table.rowHeaderLevelCount;\n    // const endCol = table.isPivotChart() ? table.colCount - table.rightFrozenColCount : table.colCount;\n    // let actualWidth = 0;\n    // for (let col = startCol; col < endCol; col++) {\n    //   actualWidth += update ? newWidths[col] : table.getColWidth(col);\n    // }\n    // const factor = totalDrawWidth / actualWidth;\n    // for (let col = startCol; col < endCol; col++) {\n    //   let colWidth;\n    //   if (col === endCol - 1) {\n    //     colWidth =\n    //       totalDrawWidth -\n    //       (update\n    //         ? newWidths.reduce((acr, cur, index) => {\n    //             if (index >= startCol && index <= endCol - 2) {\n    //               return acr + cur;\n    //             }\n    //             return acr;\n    //           }, 0)\n    //         : table.getColsWidth(startCol, endCol - 2));\n    //   } else {\n    //     colWidth = Math.round((update ? newWidths[col] : table.getColWidth(col)) * factor);\n    //   }\n    //   if (update) {\n    //     newWidths[col] = table._adjustColWidth(col, colWidth);\n    //   } else {\n    //     table._setColWidth(col, table._adjustColWidth(col, colWidth), false, true);\n    //   }\n    // }\n  } else if (table.autoFillWidth) {\n    table._clearColRangeWidthsMap();\n    const canvasWidth = table.tableNoFrameWidth;\n    let actualHeaderWidth = 0;\n    let actualWidth = 0;\n    for (let col = 0; col < table.colCount; col++) {\n      const colWidth = update ? newWidths[col] : table.getColWidth(col);\n      if (\n        col < table.rowHeaderLevelCount ||\n        (table.isPivotChart() && col >= table.colCount - table.rightFrozenColCount)\n      ) {\n        actualHeaderWidth += colWidth;\n      }\n      actualWidth += colWidth;\n    }\n    // 如果内容宽度小于canvas宽度，执行adaptive放大\n    if (actualWidth < canvasWidth && actualWidth > actualHeaderWidth) {\n      const startCol = table.rowHeaderLevelCount;\n      const endCol = table.isPivotChart() ? table.colCount - table.rightFrozenColCount : table.colCount;\n      getAdaptiveWidth(canvasWidth - actualHeaderWidth, startCol, endCol, update, newWidths, table);\n    }\n\n    // // 如果内容宽度小于canvas宽度，执行adaptive放大\n    // if (actualWidth < canvasWidth && actualWidth - actualHeaderWidth > 0) {\n    //   const factor = (canvasWidth - actualHeaderWidth) / (actualWidth - actualHeaderWidth);\n    //   for (let col = table.frozenColCount; col < table.colCount - table.rightFrozenColCount; col++) {\n    //     let colWidth;\n    //     if (col === table.colCount - table.rightFrozenColCount - 1) {\n    //       colWidth =\n    //         canvasWidth -\n    //         actualHeaderWidth -\n    //         (update\n    //           ? newWidths.reduce((acr, cur, index) => {\n    //               if (index >= table.frozenColCount && index <= table.colCount - table.rightFrozenColCount - 2) {\n    //                 return acr + cur;\n    //               }\n    //               return acr;\n    //             }, 0)\n    //           : table.getColsWidth(table.frozenColCount, table.colCount - table.rightFrozenColCount - 2));\n    //     } else {\n    //       colWidth = Math.round((update ? newWidths[col] : table.getColWidth(col)) * factor);\n    //     }\n    //     if (update) {\n    //       // newWidths[col] = newWidths[col] * factor;\n    //       newWidths[col] = table._adjustColWidth(col, colWidth);\n    //     } else {\n    //       // table.setColWidth(col, table.getColWidth(col) * factor, false, true);\n    //       table._setColWidth(col, table._adjustColWidth(col, colWidth), false, true);\n    //     }\n    //   }\n    // }\n  }\n  // console.log('computeColsWidth  time:', (typeof window !== 'undefined' ? window.performance.now() : 0) - time);\n\n  if (update) {\n    for (let col = 0; col < table.colCount; col++) {\n      // newColWidth could not be in column min max range possibly\n      // const newColWidth = table._adjustColWidth(col, newWidths[col]) ?? table.getColWidth(col);\n      const newColWidth = newWidths[col] ?? table.getColWidth(col);\n      if (newColWidth !== oldColWidths[col]) {\n        // update the column width in scenegraph\n        table._setColWidth(col, newColWidth, false, true);\n        // table.scenegraph.updateColWidth(col, newColWidth - oldColWidths[col], true, true);\n      }\n    }\n    table.stateManager.checkFrozen();\n    for (let col = 0; col < table.colCount; col++) {\n      // newColWidth could not be in column min max range possibly\n      // const newColWidth = table._adjustColWidth(col, newWidths[col]) ?? table.getColWidth(col);\n      const newColWidth = table.getColWidth(col);\n      if (newColWidth !== oldColWidths[col]) {\n        // update the column width in scenegraph\n        // table._setColWidth(col, newColWidth);\n        table.scenegraph.updateColWidth(col, newColWidth - oldColWidths[col], true, true);\n      }\n    }\n    table.scenegraph.updateContainer();\n  }\n  // console.log('computeColsWidth  time:', (typeof window !== 'undefined' ? window.performance.now() : 0) - time, colStart, colEnd);\n}\n\n/**\n * @description: 计算列宽\n * @param {number} col\n * @param {number} startRow\n * @param {number} endRow\n * @param {BaseTableAPI} table\n * @param {boolean} forceCompute\n * @return {*}\n */\nexport function computeColWidth(\n  col: number,\n  startRow: number,\n  endRow: number,\n  table: BaseTableAPI,\n  forceCompute: boolean = false //forceCompute如果设置为true 即便不是自动列宽的列也会按内容计算列宽\n): number {\n  // const { layoutMap, transpose } = table.internalProps;\n  // let { width } = layoutMap?.getColumnWidthDefined(col) ?? {};\n\n  // if (transpose) {\n  //   // 转置模式\n  //   if (table.widthMode === 'standard') {\n  //     // return table.getColWidth(col);\n  //     // standard模式使用默认值\n  //     if (table.isRowHeader(col, 0) || table.isCornerHeader(col, 0)) {\n  //       const defaultWidth = Array.isArray(table.defaultHeaderColWidth)\n  //         ? table.defaultHeaderColWidth[col] ?? table.defaultColWidth\n  //         : table.defaultHeaderColWidth;\n  //       if (defaultWidth === 'auto') {\n  //         widthfffff = 'auto';\n  //       } else {\n  //         return defaultWidth;\n  //       }\n  //     }\n\n  //     if (widthfffff !== 'auto') {\n  //       // if (width && (typeof width === 'string' || width > 0)) return width;\n  //       if (typeof widthfffff === 'string') {\n  //         return calc.toPx(widthfffff, table.internalProps.calcWidthContext);\n  //       } else if (widthfffff) {\n  //         return widthfffff;\n  //       }\n  //       return table.defaultColWidth;\n  //     }\n  //   } else if (\n  //     table.widthMode === 'adaptive' &&\n  //     col === 0 &&\n  //     widthfffff !== 'auto' &&\n  //     (layoutMap as SimpleHeaderLayoutMap)?.showHeader\n  //   ) {\n  //     // ToBeFixed hack逻辑，转置第一列列宽为header[0]\n  //     if (typeof widthfffff === 'string') {\n  //       return calc.toPx(widthfffff, table.internalProps.calcWidthContext);\n  //     } else if (widthfffff) {\n  //       return widthfffff;\n  //     }\n  //   }\n  //   // autoWidth adaptive 需要计算内容宽度\n  //   // do nothing\n  // } else if (widthfffff !== 'auto' && table.widthMode !== 'autoWidth' && !forceCompute) {\n  //   // if (width && (typeof width === 'string' || width > 0)) return width;\n  //   if (typeof widthfffff === 'string') {\n  //     return calc.toPx(widthfffff, table.internalProps.calcWidthContext);\n  //   } else if (widthfffff) {\n  //     return widthfffff;\n  //   }\n  //   //是透视表的行表头部分 则宽度按defaultHeaderColWidth设置\n  //   const defaultWidth = table.getColWidthDefine(col);\n  //   if (defaultWidth !== 'auto') {\n  //     return table.getColWidth(col);\n  //   }\n  // }\n  const width = getColWidthDefinedWidthResizedWidth(col, table);\n  if (forceCompute && !table.internalProps.transpose) {\n    return computeAutoColWidth(width, col, startRow, endRow, forceCompute, table);\n  } else if (typeof width === 'number') {\n    return width;\n  } else if (width !== 'auto' && typeof width === 'string') {\n    // return calc.toPx(width, table.internalProps.calcWidthContext);\n    return table._adjustColWidth(col, table._colWidthDefineToPxWidth(width));\n  }\n  return computeAutoColWidth(width, col, startRow, endRow, forceCompute, table);\n}\n\n/**\n * @description: 计算width: auto情况下的列宽\n * @param {number} col\n * @param {number} startRow\n * @param {number} endRow\n * @param {boolean} forceCompute\n * @param {BaseTableAPI} table\n * @return {*}\n */\nfunction computeAutoColWidth(\n  widthDeifne: string | number,\n  col: number,\n  startRow: number,\n  endRow: number,\n  forceCompute: boolean,\n  table: BaseTableAPI\n): number {\n  // 处理 auto width\n  let maxWidth = 0;\n  let deltaRow = 1;\n  let prepareDeltaRow = 1; // 当计算完表头单元格的宽度后再采用采用逻辑，prepareDeltaRow这个值为期body部分做准备\n  if (endRow - startRow > 5000) {\n    // 超过5000行启动列宽自动计算采样\n    prepareDeltaRow = Math.ceil((endRow - startRow) / 5000);\n  }\n  // 如果是透视图\n  if (table.isPivotChart() && col >= table.rowHeaderLevelCount && col < table.colCount - table.rightFrozenColCount) {\n    if (!(table.internalProps.layoutMap as PivotHeaderLayoutMap).indicatorsAsCol) {\n      //并且指标是以行展示 计算列宽需要根据x轴的值域范围\n      const optimunWidth = (table.internalProps.layoutMap as PivotHeaderLayoutMap).getOptimunWidthForChart(col);\n      if (optimunWidth > 0) {\n        return optimunWidth;\n      }\n    } else {\n      //直接拿表头的默认列宽\n      return table.defaultColWidth;\n    }\n  }\n\n  for (let row = startRow; row <= endRow; row += deltaRow) {\n    // 判断透视图轴组件\n    if (table.isPivotChart()) {\n      const layout = table.internalProps.layoutMap as PivotHeaderLayoutMap;\n      const axisConfig = getAxisConfigInPivotChart(col, row, layout);\n      if (axisConfig) {\n        const axisWidth = computeAxisComponentWidth(axisConfig, table);\n        if (typeof axisWidth === 'number') {\n          maxWidth = Math.max(axisWidth, maxWidth);\n          continue;\n        }\n      } else if (\n        layout.isLeftBottomCorner(col, row) ||\n        layout.isRightTopCorner(col, row) ||\n        layout.isRightBottomCorner(col, row)\n      ) {\n        // 透视图三角为无效单元格，不参与宽度计算\n        continue;\n      }\n    }\n\n    // 判断CustomRender\n    const customWidth = computeCustomRenderWidth(col, row, table);\n    if (customWidth) {\n      maxWidth = Math.max(customWidth.width, maxWidth);\n      if (!customWidth.renderDefault) {\n        continue;\n      }\n    }\n\n    // 判断透视表如果在指标\n    // const indicatorWidth = computeIndicatorWidth(col, row, forceCompute, table);\n    // const indicatorWidth = table.internalProps.layoutMap.getColumnWidthDefined(col);\n    const indicatorWidth = widthDeifne;\n    if (typeof indicatorWidth === 'number' && table.widthMode === 'standard' && !forceCompute) {\n      maxWidth = Math.max(indicatorWidth, maxWidth);\n      continue;\n    }\n\n    const cellType = table.isHeader(col, row)\n      ? table._getHeaderLayoutMap(col, row)?.headerType\n      : table.getBodyColumnType(col, row);\n    if (cellType !== 'text' && cellType !== 'link' && cellType !== 'progressbar' && cellType !== 'checkbox') {\n      // text&link&progressbar测量文字宽度\n      // image&video&sparkline使用默认宽度\n      maxWidth = Math.max(maxWidth, table.getColWidthDefinedNumber(col) || 0);\n      continue;\n    }\n\n    // 处理树形展开\n    let cellHierarchyIndent = 0;\n    const layoutMap = table.internalProps.layoutMap;\n    //判断是否为表头\n    if (layoutMap.isHeader(col, row)) {\n      const hd = layoutMap.getHeader(col, row);\n      // 如果某级表头设置了only-body，在计算表头内容宽度时跳过改级表头\n      if (hd?.define?.columnWidthComputeMode === 'only-body') {\n        continue;\n      }\n      if (hd?.hierarchyLevel) {\n        cellHierarchyIndent = (hd.hierarchyLevel ?? 0) * ((layoutMap as PivotHeaderLayoutMap).rowHierarchyIndent ?? 0);\n      }\n    } else {\n      deltaRow = prepareDeltaRow;\n      // 基本表格表身body单元格 如果是树形展开 需要考虑缩进值\n      // const cellHierarchyState = table.getHierarchyState(col, row);\n      // if (cellHierarchyState === HierarchyState.expand || cellHierarchyState === HierarchyState.collapse) {\n      const define = table.getBodyColumnDefine(col, row);\n      if (define?.tree) {\n        const indexArr = table.dataSource.getIndexKey(table.getRecordShowIndexByCell(col, row));\n        cellHierarchyIndent =\n          Array.isArray(indexArr) && table.getHierarchyState(col, row) !== HierarchyState.none\n            ? (indexArr.length - 1) * ((layoutMap as SimpleHeaderLayoutMap).hierarchyIndent ?? 0)\n            : 0;\n      }\n    }\n\n    // 测量文字宽度\n    const textWidth = computeTextWidth(col, row, cellType, table);\n    maxWidth = Math.max(textWidth + cellHierarchyIndent, maxWidth);\n    //在前面设置了采用规则的情况下，为了确保底部冻结的每一行都测到\n    if (\n      deltaRow > 1 &&\n      table.bottomFrozenRowCount > 0 &&\n      row < table.rowCount - table.bottomFrozenRowCount &&\n      row + deltaRow >= table.rowCount - table.bottomFrozenRowCount\n    ) {\n      row = table.rowCount - table.bottomFrozenRowCount - deltaRow;\n      deltaRow = 1;\n      prepareDeltaRow = 1;\n    }\n  }\n\n  // 处理宽度限制\n  const colMinWidth = table.getMinColWidth(col);\n  const colMaxWidth = table.getMaxColWidth(col);\n  if (maxWidth < colMinWidth) {\n    return colMinWidth;\n  } else if (maxWidth > colMaxWidth) {\n    return colMaxWidth;\n  }\n  return maxWidth;\n}\n\n/**\n * @description: 计算customRender相关列宽\n * @param {number} col\n * @param {number} row\n * @param {BaseTableAPI} table\n * @return {*}\n */\nfunction computeCustomRenderWidth(col: number, row: number, table: BaseTableAPI) {\n  const customRender = table.getCustomRender(col, row);\n  const customLayout = table.getCustomLayout(col, row);\n  if (customRender || customLayout) {\n    let spanCol = 1;\n    let width = 0;\n    let renderDefault = false;\n    let enableCellPadding = false;\n    if (\n      table.isHeader(col, row) ||\n      (table.getBodyColumnDefine(col, row) as TextColumnDefine)?.mergeCell ||\n      table.hasCustomMerge()\n    ) {\n      const cellRange = table.getCellRange(col, row);\n      spanCol = cellRange.end.col - cellRange.start.col + 1;\n    }\n    const arg = {\n      col,\n      row,\n      dataValue: table.getCellOriginValue(col, row),\n      value: table.getCellValue(col, row) || '',\n      rect: getCellRect(col, row, table),\n      table\n    };\n    if (customLayout) {\n      // 处理customLayout\n      const customLayoutObj = customLayout(arg);\n      if (customLayoutObj.rootContainer instanceof VGroup) {\n        customLayoutObj.rootContainer = decodeReactDom(customLayoutObj.rootContainer);\n        dealPercentCalc(customLayoutObj.rootContainer, 0, table.getRowHeight(row));\n        customLayoutObj.rootContainer.setStage(table.scenegraph.stage);\n        width = (customLayoutObj.rootContainer as VGroup).AABBBounds.width() ?? 0;\n        renderDefault = customLayoutObj.renderDefault;\n        enableCellPadding = customLayoutObj.enableCellPadding;\n      } else {\n        width = 0;\n      }\n    } else if (typeof customRender === 'function') {\n      // 处理customRender\n      const customRenderObj = customRender(arg);\n      width = customRenderObj?.expectedWidth ?? 0;\n      renderDefault = customRenderObj?.renderDefault;\n    } else {\n      width = customRender?.expectedWidth ?? 0;\n      renderDefault = customRender?.renderDefault;\n    }\n    if (enableCellPadding) {\n      const actStyle = table._getCellStyle(col, row);\n      const padding = getQuadProps(getProp('padding', actStyle, col, row, table));\n      width += padding[1] + padding[3];\n    }\n    return {\n      width: width / spanCol,\n      renderDefault\n    };\n  }\n  return undefined;\n}\n\n/**\n * @description: 计算指标相关列宽\n * @param {number} col\n * @param {number} row\n * @param {boolean} forceCompute\n * @param {BaseTableAPI} table\n * @return {*}\n */\nfunction computeIndicatorWidth(\n  col: number,\n  row: number,\n  forceCompute: boolean,\n  table: BaseTableAPI\n): number | undefined {\n  const { layoutMap } = table.internalProps;\n  if (table.isPivotTable() && (layoutMap as PivotHeaderLayoutMap).isColumnIndicatorHeader(col, row)) {\n    // 透视表如果在指标中配置了宽度，使用该宽度作为指标单元格及下面内容单元格的列宽\n    const body = layoutMap.getBody(col, row);\n    if (body && body.width && body.width !== 'auto' && !forceCompute) {\n      const width = Math.round(calc.toPx(body.width, table.internalProps.calcWidthContext));\n      return width;\n    }\n  }\n  return undefined;\n}\n\n/**\n * @description: 计算文字宽度\n * @param {number} col\n * @param {number} row\n * @param {BaseTableAPI} table\n * @return {*}\n */\nfunction computeTextWidth(col: number, row: number, cellType: ColumnTypeOption, table: BaseTableAPI): number {\n  let maxWidth = 0;\n  const cellValue = table.getCellValue(col, row);\n  // const dataValue = table.getCellOriginValue(col, row);\n  const actStyle = table._getCellStyle(col, row);\n  let iconWidth = 0;\n\n  // const define = table.getBodyColumnDefine(col, row);\n  // const mayHaveIcon = table.getCellLocation(col, row) !== 'body' ? true : !!define?.icon || !!define?.tree;\n\n  let mayHaveIcon = false;\n  if (table.getCellLocation(col, row) !== 'body') {\n    mayHaveIcon = true;\n  } else {\n    const define = table.getBodyColumnDefine(col, row);\n    mayHaveIcon = !!define?.icon || !!define?.tree;\n  }\n  if (mayHaveIcon) {\n    const icons = table.getCellIcons(col, row);\n    icons?.forEach(icon => {\n      if (icon.positionType !== IconPosition.absoluteRight) {\n        iconWidth += (icon.width ?? 0) + (icon.marginLeft ?? 0) + (icon.marginRight ?? 0);\n      }\n    });\n  }\n\n  let spanCol = 1;\n  if (\n    table.isHeader(col, row) ||\n    (table.getBodyColumnDefine(col, row) as TextColumnDefine)?.mergeCell ||\n    table.hasCustomMerge()\n  ) {\n    const cellRange = table.getCellRange(col, row);\n    spanCol = cellRange.end.col - cellRange.start.col + 1;\n  }\n\n  const padding = getQuadProps(getProp('padding', actStyle, col, row, table));\n  const paddingWidth = padding[1] + padding[3]; // + cellHierarchyIndent\n\n  const fontSize = getProp('fontSize', actStyle, col, row, table);\n  const fontFamily = getProp('fontFamily', actStyle, col, row, table);\n  const fontWeight = getProp('fontWeight', actStyle, col, row, table);\n  let text;\n  if (cellType === 'checkbox') {\n    text = isObject(cellValue) ? (cellValue as any).text : cellValue;\n  } else {\n    text = cellValue;\n  }\n  const lines = validToString(text).split('\\n') || [];\n  if (lines.length >= 1) {\n    // eslint-disable-next-line no-loop-func\n    lines.forEach((line: string) => {\n      const width = table.measureText(line.slice(0, table.options.maxCharactersNumber || 200), {\n        fontSize,\n        fontFamily,\n        fontWeight\n      }).width;\n      maxWidth = Math.max(\n        // 最大字符上限控制测量的字符\n        (width + paddingWidth + 4 + iconWidth) / spanCol, // 这里+4为列宽测量结果的buffer\n        maxWidth\n      );\n    });\n  } else {\n    maxWidth = Math.max(\n      // 最大字符上限控制测量的字符\n      (paddingWidth + 4 + iconWidth) / spanCol,\n      maxWidth\n    );\n  }\n  // 判断是否需要限制最大宽度 之前写死的450 需要使用配置来判断\n  if (table.internalProps.limitMaxAutoWidth !== false) {\n    maxWidth = Math.min(\n      typeof table.internalProps.limitMaxAutoWidth === 'number' ? table.internalProps.limitMaxAutoWidth : 450,\n      maxWidth\n    );\n  }\n\n  if (cellType === 'checkbox') {\n    const size = getProp('size', actStyle, col, row, table);\n    maxWidth += size;\n\n    if (text) {\n      const spaceBetweenTextAndIcon = getProp('spaceBetweenTextAndIcon', actStyle, col, row, table);\n      maxWidth += spaceBetweenTextAndIcon;\n    }\n  }\n\n  return maxWidth;\n}\n\nfunction getCellRect(col: number, row: number, table: BaseTableAPI) {\n  return {\n    left: 0,\n    top: 0,\n    right: table.getColWidth(col),\n    bottom: table.getRowHeight(row),\n    width: 0,\n    height: 0\n  };\n}\n\nfunction getColWidthDefinedWidthResizedWidth(col: number, table: BaseTableAPI) {\n  const widthDefined = table.getColWidthDefined(col);\n  if (table.internalProps._widthResizedColMap.has(col)) {\n    return table.getColWidth(col);\n  }\n  return widthDefined;\n}\n\nexport function getAdaptiveWidth(\n  totalDrawWidth: number,\n  startCol: number,\n  endColPlus1: number,\n  update: boolean,\n  newWidths: number[],\n  table: BaseTableAPI,\n  fromScenegraph?: boolean\n) {\n  let actualWidth = 0;\n  const adaptiveColumns: number[] = [];\n  for (let col = startCol; col < endColPlus1; col++) {\n    const width = update ? newWidths[col] : table.getColWidth(col);\n    const maxWidth = table.getMaxColWidth(col);\n    const minWidth = table.getMinColWidth(col);\n    if (width !== maxWidth && width !== minWidth) {\n      actualWidth += width;\n      adaptiveColumns.push(col);\n    } else {\n      // fixed width, do not adaptive\n      totalDrawWidth -= width;\n    }\n  }\n\n  const factor = totalDrawWidth / actualWidth;\n\n  for (let i = 0; i < adaptiveColumns.length; i++) {\n    const col = adaptiveColumns[i];\n    let colWidth;\n    if (i === adaptiveColumns.length - 1) {\n      colWidth =\n        totalDrawWidth -\n        adaptiveColumns.reduce((acr, cur, index) => {\n          if (cur !== col) {\n            return acr + (update ? newWidths[cur] : table.getColWidth(cur));\n          }\n          return acr;\n        }, 0);\n    } else {\n      colWidth = Math.round((update ? newWidths[col] : table.getColWidth(col)) * factor);\n    }\n    if (update) {\n      newWidths[col] = table._adjustColWidth(col, colWidth);\n    } else if (fromScenegraph) {\n      table.scenegraph.setColWidth(col, table._adjustColWidth(col, colWidth));\n    } else {\n      table._setColWidth(col, table._adjustColWidth(col, colWidth), false, true);\n    }\n  }\n}\n"]}

package/cjs/scenegraph/layout/compute-row-height.js

@@ -180,7 +180,7 @@ function computeCustomRenderHeight(col, row, table) {
     const customRender = table.getCustomRender(col, row), customLayout = table.getCustomLayout(col, row);
     if (customRender || customLayout) {
         let spanRow = 1, height = 0, renderDefault = !1, enableCellPadding = !1;
-        if (table.isHeader(col, row) || (null === (_a = table.getBodyColumnDefine(col, row)) || void 0 === _a ? void 0 : _a.mergeCell)) {
+        if (table.isHeader(col, row) || (null === (_a = table.getBodyColumnDefine(col, row)) || void 0 === _a ? void 0 : _a.mergeCell) || table.hasCustomMerge()) {
             const cellRange = table.getCellRange(col, row);
             spanRow = cellRange.end.row - cellRange.start.row + 1;
         }
@@ -240,7 +240,7 @@ function computeTextHeight(col, row, cellType, table) {
         }));
     }
     let spanRow = 1, endCol = col;
-    if (table.isHeader(col, row) || (null === (_a = table.getBodyColumnDefine(col, row)) || void 0 === _a ? void 0 : _a.mergeCell)) {
+    if (table.isHeader(col, row) || (null === (_a = table.getBodyColumnDefine(col, row)) || void 0 === _a ? void 0 : _a.mergeCell) || table.hasCustomMerge()) {
         const cellRange = table.getCellRange(col, row);
         spanRow = cellRange.end.row - cellRange.start.row + 1, col = cellRange.start.col, 
         endCol = cellRange.end.col;