@visactor/vtable 0.9.1-alpha.3 → 0.9.1-alpha.5

package/es/scenegraph/group-creater/cell-type/spark-line-cell.js

@@ -32,7 +32,6 @@ export function createSparkLineCellGroup(cellGroup, columnGroup, xOrigin, yOrigi
 }
 
 function createSparkLine(col, row, width, height, padding, table) {
-    var _a, _b;
     let sparklineSpec, chartGroup;
     const chartSpecRaw = table.internalProps.layoutMap.getBody(col, row).sparklineSpec, dataValue = table.getCellValue(col, row);
     if (!Array.isArray(dataValue)) return;
@@ -102,8 +101,8 @@ function createSparkLine(col, row, width, height, padding, table) {
     line.max = yScale.range()[1];
     const symbolGroup = chartGroup.getChildByName("sparkline-symbol-group");
     if (symbolGroup) {
-        const isShowIsolatedPoint = (null === (_a = sparklineSpec.point) || void 0 === _a ? void 0 : _a.visible) && "isolatedPoint" === sparklineSpec.pointShowRule;
-        if ((null === (_b = sparklineSpec.point) || void 0 === _b ? void 0 : _b.visible) && "all" === sparklineSpec.pointShowRule) for (let i = 0; i < items.length; i++) {
+        const isShowIsolatedPoint = "isolatedPoint" === sparklineSpec.pointShowRule;
+        if ("all" === sparklineSpec.pointShowRule) for (let i = 0; i < items.length; i++) {
             const {x: x, y: y, defined: defined} = items[i];
             if (defined) {
                 const symbol = createSymbol({
@@ -127,7 +126,7 @@ function createSparkLine(col, row, width, height, padding, table) {
 }
 
 function createChartGroup(spec, x, y, width, height) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x;
     let specObj;
     specObj = "function" == typeof spec ? spec(null) : spec;
     const group = new Group({
@@ -142,11 +141,11 @@ function createChartGroup(spec, x, y, width, height) {
         const line = createLine({
             x: 0,
             y: 0,
-            curveType: (null !== (_a = specObj.smooth) && void 0 !== _a ? _a : "linear" === (null === (_c = null === (_b = specObj.line) || void 0 === _b ? void 0 : _b.style) || void 0 === _c ? void 0 : _c.interpolate)) ? "linear" : "monotoneX",
-            stroke: null !== (_f = null === (_e = null === (_d = specObj.line) || void 0 === _d ? void 0 : _d.style) || void 0 === _e ? void 0 : _e.stroke) && void 0 !== _f ? _f : "blue",
-            lineWidth: null !== (_j = null === (_h = null === (_g = specObj.line) || void 0 === _g ? void 0 : _g.style) || void 0 === _h ? void 0 : _h.strokeWidth) && void 0 !== _j ? _j : 2
+            curveType: specObj.smooth ? "monotoneX" : "linear",
+            stroke: null !== (_c = null === (_b = null === (_a = specObj.line) || void 0 === _a ? void 0 : _a.style) || void 0 === _b ? void 0 : _b.stroke) && void 0 !== _c ? _c : "blue",
+            lineWidth: null !== (_f = null === (_e = null === (_d = specObj.line) || void 0 === _d ? void 0 : _d.style) || void 0 === _e ? void 0 : _e.strokeWidth) && void 0 !== _f ? _f : 2
         });
-        line.name = "sparkline-line", group.addChild(line), specObj.crosshair && (line.hover = null !== (_l = null === (_k = specObj.crosshair) || void 0 === _k ? void 0 : _k.style) && void 0 !== _l ? _l : {
+        line.name = "sparkline-line", group.addChild(line), specObj.crosshair && (line.hover = null !== (_h = null === (_g = specObj.crosshair) || void 0 === _g ? void 0 : _g.style) && void 0 !== _h ? _h : {
             stroke: "#000",
             interpolate: "linear"
         });
@@ -160,13 +159,13 @@ function createChartGroup(spec, x, y, width, height) {
         });
         symbolGroup.name = "sparkline-symbol-group", symbolGroup.setTheme({
             symbol: {
-                stroke: null !== (_p = null === (_o = null === (_m = specObj.point) || void 0 === _m ? void 0 : _m.style) || void 0 === _o ? void 0 : _o.stroke) && void 0 !== _p ? _p : "#000",
-                lineWidth: null !== (_s = null === (_r = null === (_q = specObj.point) || void 0 === _q ? void 0 : _q.style) || void 0 === _r ? void 0 : _r.strokeWidth) && void 0 !== _s ? _s : 1,
-                fill: null !== (_v = null === (_u = null === (_t = specObj.point) || void 0 === _t ? void 0 : _t.style) || void 0 === _u ? void 0 : _u.fill) && void 0 !== _v ? _v : "#000",
-                size: 2 * (null !== (_y = null === (_x = null === (_w = specObj.point) || void 0 === _w ? void 0 : _w.style) || void 0 === _x ? void 0 : _x.size) && void 0 !== _y ? _y : 3),
+                stroke: null !== (_l = null === (_k = null === (_j = specObj.point) || void 0 === _j ? void 0 : _j.style) || void 0 === _k ? void 0 : _k.stroke) && void 0 !== _l ? _l : "#000",
+                lineWidth: null !== (_p = null === (_o = null === (_m = specObj.point) || void 0 === _m ? void 0 : _m.style) || void 0 === _o ? void 0 : _o.strokeWidth) && void 0 !== _p ? _p : 1,
+                fill: null !== (_s = null === (_r = null === (_q = specObj.point) || void 0 === _q ? void 0 : _q.style) || void 0 === _r ? void 0 : _r.fill) && void 0 !== _s ? _s : "#000",
+                size: 2 * (null !== (_v = null === (_u = null === (_t = specObj.point) || void 0 === _t ? void 0 : _t.style) || void 0 === _u ? void 0 : _u.size) && void 0 !== _v ? _v : 3),
                 symbolType: "circle"
             }
-        }), group.addChild(symbolGroup), symbolGroup.hover = null !== (_0 = null === (_z = specObj.point) || void 0 === _z ? void 0 : _z.hover) && void 0 !== _0 && _0;
+        }), group.addChild(symbolGroup), symbolGroup.hover = null !== (_x = null === (_w = specObj.point) || void 0 === _w ? void 0 : _w.hover) && void 0 !== _x && _x;
     }
     return group;
 }

package/es/scenegraph/group-creater/cell-type/spark-line-cell.js.map

@@ -1 +1 @@
-{"version":3,"sources":["scenegraph/group-creater/cell-type/spark-line-cell.ts"],"names":[],"mappings":"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","file":"spark-line-cell.js","sourcesContent":["import type { ILine, ISymbol } from '@visactor/vrender';\nimport { createLine, createSymbol } from '@visactor/vrender';\nimport { PointScale, LinearScale } from '@visactor/vscale';\nimport { isValid } from '../../../tools/util';\nimport { Group } from '../../graphic/group';\nimport type { CellInfo, SparklineSpec } from '../../../ts-types';\nimport { getCellTheme } from './text-cell';\nimport type { BaseTableAPI } from '../../../ts-types/base-table';\n\nconst xScale: PointScale = new PointScale();\nconst yScale: LinearScale = new LinearScale();\n\nexport function createSparkLineCellGroup(\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  table: BaseTableAPI\n) {\n  const cellTheme = getCellTheme(table, col, row);\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\n      strokeArrayWidth: (cellTheme?.group as any)?.strokeArrayWidth ?? undefined,\n      strokeArrayColor: (cellTheme?.group as any)?.strokeArrayColor ?? undefined,\n      cursor: (cellTheme?.group as any)?.cursor ?? undefined,\n\n      lineCap: 'square',\n\n      clip: true\n    } as any);\n    cellGroup.role = 'cell';\n    cellGroup.col = col;\n    cellGroup.row = row;\n    columnGroup.addChild(cellGroup);\n  }\n\n  // chart\n  const chartGroup = createSparkLine(col, row, width, height, padding, table);\n  if (chartGroup) {\n    cellGroup.appendChild(chartGroup);\n  }\n\n  return cellGroup;\n}\n\nfunction createSparkLine(\n  col: number,\n  row: number,\n  width: number,\n  height: number,\n  padding: number[],\n  table: BaseTableAPI\n): Group | undefined {\n  //获取场景树对象，根据当前单元格位置更改其位置\n  //待定 TODO group需要设置shape属性吗\n  let sparklineSpec: SparklineSpec;\n  let chartGroup: Group;\n  const chartSpecRaw = table.internalProps.layoutMap.getBody(col, row).sparklineSpec;\n  const dataValue = table.getCellValue(col, row) as unknown as any[];\n\n  if (!Array.isArray(dataValue)) {\n    return undefined;\n  }\n\n  const x = padding[3];\n  const y = padding[0];\n  width -= padding[1] + padding[3];\n  height -= padding[0] + padding[2];\n  const left = 0;\n  // const top = y;\n  // const right = x + width;\n  const bottom = height;\n  if (typeof chartSpecRaw === 'function') {\n    // 动态组织spec\n    const arg = {\n      col,\n      row,\n      dataValue: table.getCellOriginValue(col, row) || '',\n      value: table.getCellValue(col, row) || '',\n      rect: table.getCellRangeRelativeRect(table.getCellRange(col, row)),\n      table\n    };\n    sparklineSpec = chartSpecRaw(arg);\n    chartGroup = createChartGroup(sparklineSpec, x, y, width, height);\n  } else {\n    sparklineSpec = chartSpecRaw;\n    chartGroup = createChartGroup(chartSpecRaw, x, y, width, height);\n  }\n\n  // #region scale对x y轴映射\n  const items: { x: number; y: number; defined?: boolean }[] = [];\n  const dataItems: any[] = [];\n\n  let xField;\n  let yField;\n  if (typeof sparklineSpec.xField === 'object') {\n    xScale.domain(sparklineSpec.xField.domain);\n    xField = sparklineSpec.xField.field;\n  } else if (typeof sparklineSpec.xField === 'string') {\n    const indexValues = dataValue.map((value: any) => value[sparklineSpec.xField as string]);\n    xScale.domain(indexValues);\n    xField = sparklineSpec.xField;\n  } else {\n    // xField未配置 data为数值数组的情况\n    if (Array.isArray(dataValue)) {\n      xScale.domain(Array.from({ length: dataValue.length }, (_, i) => i));\n      xField = sparklineSpec.xField;\n    }\n  }\n  xScale.range([0, width]);\n\n  if (typeof sparklineSpec.yField === 'object') {\n    yScale.domain(sparklineSpec.yField.domain);\n    yField = sparklineSpec.yField.field;\n  } else if (typeof sparklineSpec.yField === 'string') {\n    // string类型 自动计算出domain\n    const values = dataValue.map((value: any) => value[sparklineSpec.yField as string]);\n    yScale.domain([Math.min(...values), Math.max(...values)]);\n    yField = sparklineSpec.yField;\n  } else {\n    // yField未配置 检查data是否为数值数组\n    if (Array.isArray(dataValue) && dataValue.every((value: any) => typeof value === 'number')) {\n      yScale.domain([Math.min(...dataValue), Math.max(...dataValue)]);\n      yField = sparklineSpec.yField;\n    }\n  }\n  yScale.range([0, height]);\n\n  if (typeof sparklineSpec.xField === 'object' && Array.isArray(sparklineSpec.xField.domain)) {\n    // 如果xField.domain合法，需要按需补充null值点\n    const values = dataValue.map((value: any) => value[(sparklineSpec.xField as any).field]);\n    const domain = sparklineSpec.xField.domain;\n    for (let i = 0; i < domain.length; i++) {\n      let valid = false;\n      for (let j = 0; j < values.length; j++) {\n        // eslint-disable-next-line eqeqeq\n        if (domain[i] == values[j]) {\n          const data: any = dataValue[j];\n          // 无效数据不进行scale，避免null被解析为0\n          if (!isValid(data[xField]) || !isValid(data[yField])) {\n            break;\n          }\n          items.push({\n            x: left + xScale.scale(data[xField]),\n            y: bottom - yScale.scale(data[yField]),\n            defined: isValid(data[yField])\n          });\n          dataItems.push(data); //收集原始数据\n          valid = true;\n          break;\n        }\n      }\n\n      if (!valid) {\n        // 该domain的index没有在数据中，补充无效点\n        items.push({\n          x: left + xScale.scale(domain[i]),\n          y: 0,\n          defined: false\n        });\n        dataItems.push({ [xField]: domain[i], [yField]: null });\n      }\n    }\n  } else {\n    for (let i = 0; i < dataValue.length; i++) {\n      const data: any = dataValue[i];\n      items.push({\n        x: left + xScale.scale(xField ? data[xField] : i),\n        y: bottom - yScale.scale(yField ? data[yField] : data),\n        defined: isValid(yField ? data[yField] : data),\n        rawData: data\n      } as any);\n      dataItems.push(data);\n    }\n  }\n  // #endregion\n\n  // 更新线节点属性\n  const line = chartGroup.getChildByName('sparkline-line') as ILine;\n  if (line) {\n    line.setAttribute('points', items);\n  }\n  (line as any).bandwidth = xScale.step();\n  (line as any).min = yScale.range()[0];\n  (line as any).max = yScale.range()[1];\n\n  // 更新symbol节点属性\n  const symbolGroup = chartGroup.getChildByName('sparkline-symbol-group') as ILine;\n  if (symbolGroup) {\n    const isShowIsolatedPoint = sparklineSpec.point?.visible && sparklineSpec.pointShowRule === 'isolatedPoint';\n    if (sparklineSpec.point?.visible && sparklineSpec.pointShowRule === 'all') {\n      for (let i = 0; i < items.length; i++) {\n        const { x, y, defined } = items[i];\n        if (defined) {\n          const symbol: ISymbol = createSymbol({ x, y });\n          symbolGroup.appendChild(symbol);\n        }\n      }\n    } else if (isShowIsolatedPoint) {\n      // 处理孤立点显示\n      for (let i = 0; i < items.length; i++) {\n        const { x, y, defined } = items[i];\n        if (defined && (!items[i - 1] || !items[i - 1].defined) && (!items[i + 1] || !items[i + 1].defined)) {\n          // 规范孤立数据显示Symbol的spec api\n          const symbol: ISymbol = createSymbol({ x, y });\n          symbolGroup.appendChild(symbol);\n        }\n      }\n    }\n  }\n  return chartGroup;\n}\n\nfunction createChartGroup(\n  spec: SparklineSpec | ((arg: CellInfo) => SparklineSpec),\n  x: number,\n  y: number,\n  width: number,\n  height: number\n): Group {\n  let specObj: SparklineSpec;\n  if (typeof spec === 'function') {\n    // specObj = spec.apply(null, null);\n    specObj = spec(null);\n  } else {\n    specObj = spec;\n  }\n  // 生成根节点\n  const group = new Group({\n    x,\n    y,\n    width,\n    height,\n    stroke: false,\n    fill: false\n  });\n  group.name = 'sparkline';\n\n  if (specObj.type === 'line') {\n    // 生成line\n    const line = createLine({\n      x: 0,\n      y: 0,\n      curveType: specObj.smooth ?? specObj.line?.style?.interpolate === 'linear' ? 'linear' : 'monotoneX',\n      stroke: specObj.line?.style?.stroke ?? 'blue',\n      lineWidth: specObj.line?.style?.strokeWidth ?? 2\n    });\n    line.name = 'sparkline-line';\n    group.addChild(line);\n    if (specObj.crosshair) {\n      (line as any).hover = specObj.crosshair?.style ?? {\n        stroke: '#000',\n        interpolate: 'linear'\n      };\n    }\n\n    // 生成symbol\n    const symbolGroup = new Group({\n      x: 0,\n      y: 0,\n      width,\n      height,\n      stroke: false,\n      fill: false\n    });\n    symbolGroup.name = 'sparkline-symbol-group';\n    symbolGroup.setTheme({\n      symbol: {\n        stroke: specObj.point?.style?.stroke ?? '#000',\n        lineWidth: specObj.point?.style?.strokeWidth ?? 1,\n        fill: specObj.point?.style?.fill ?? '#000',\n        size: (specObj.point?.style?.size ?? 3) * 2, // 之前配置的是圆半径\n        symbolType: 'circle'\n      }\n    });\n    group.addChild(symbolGroup);\n    (symbolGroup as any).hover = specObj.point?.hover ?? false;\n  }\n  return group;\n}\n"]}
+{"version":3,"sources":["scenegraph/group-creater/cell-type/spark-line-cell.ts"],"names":[],"mappings":"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","file":"spark-line-cell.js","sourcesContent":["import type { ILine, ISymbol } from '@visactor/vrender';\nimport { createLine, createSymbol } from '@visactor/vrender';\nimport { PointScale, LinearScale } from '@visactor/vscale';\nimport { isValid } from '../../../tools/util';\nimport { Group } from '../../graphic/group';\nimport type { CellInfo, SparklineSpec } from '../../../ts-types';\nimport { getCellTheme } from './text-cell';\nimport type { BaseTableAPI } from '../../../ts-types/base-table';\n\nconst xScale: PointScale = new PointScale();\nconst yScale: LinearScale = new LinearScale();\n\nexport function createSparkLineCellGroup(\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  table: BaseTableAPI\n) {\n  const cellTheme = getCellTheme(table, col, row);\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\n      strokeArrayWidth: (cellTheme?.group as any)?.strokeArrayWidth ?? undefined,\n      strokeArrayColor: (cellTheme?.group as any)?.strokeArrayColor ?? undefined,\n      cursor: (cellTheme?.group as any)?.cursor ?? undefined,\n\n      lineCap: 'square',\n\n      clip: true\n    } as any);\n    cellGroup.role = 'cell';\n    cellGroup.col = col;\n    cellGroup.row = row;\n    columnGroup.addChild(cellGroup);\n  }\n\n  // chart\n  const chartGroup = createSparkLine(col, row, width, height, padding, table);\n  if (chartGroup) {\n    cellGroup.appendChild(chartGroup);\n  }\n\n  return cellGroup;\n}\n\nfunction createSparkLine(\n  col: number,\n  row: number,\n  width: number,\n  height: number,\n  padding: number[],\n  table: BaseTableAPI\n): Group | undefined {\n  //获取场景树对象，根据当前单元格位置更改其位置\n  //待定 TODO group需要设置shape属性吗\n  let sparklineSpec: SparklineSpec;\n  let chartGroup: Group;\n  const chartSpecRaw = table.internalProps.layoutMap.getBody(col, row).sparklineSpec;\n  const dataValue = table.getCellValue(col, row) as unknown as any[];\n\n  if (!Array.isArray(dataValue)) {\n    return undefined;\n  }\n\n  const x = padding[3];\n  const y = padding[0];\n  width -= padding[1] + padding[3];\n  height -= padding[0] + padding[2];\n  const left = 0;\n  // const top = y;\n  // const right = x + width;\n  const bottom = height;\n  if (typeof chartSpecRaw === 'function') {\n    // 动态组织spec\n    const arg = {\n      col,\n      row,\n      dataValue: table.getCellOriginValue(col, row) || '',\n      value: table.getCellValue(col, row) || '',\n      rect: table.getCellRangeRelativeRect(table.getCellRange(col, row)),\n      table\n    };\n    sparklineSpec = chartSpecRaw(arg);\n    chartGroup = createChartGroup(sparklineSpec, x, y, width, height);\n  } else {\n    sparklineSpec = chartSpecRaw;\n    chartGroup = createChartGroup(chartSpecRaw, x, y, width, height);\n  }\n\n  // #region scale对x y轴映射\n  const items: { x: number; y: number; defined?: boolean }[] = [];\n  const dataItems: any[] = [];\n\n  let xField;\n  let yField;\n  if (typeof sparklineSpec.xField === 'object') {\n    xScale.domain(sparklineSpec.xField.domain);\n    xField = sparklineSpec.xField.field;\n  } else if (typeof sparklineSpec.xField === 'string') {\n    const indexValues = dataValue.map((value: any) => value[sparklineSpec.xField as string]);\n    xScale.domain(indexValues);\n    xField = sparklineSpec.xField;\n  } else {\n    // xField未配置 data为数值数组的情况\n    if (Array.isArray(dataValue)) {\n      xScale.domain(Array.from({ length: dataValue.length }, (_, i) => i));\n      xField = sparklineSpec.xField;\n    }\n  }\n  xScale.range([0, width]);\n\n  if (typeof sparklineSpec.yField === 'object') {\n    yScale.domain(sparklineSpec.yField.domain);\n    yField = sparklineSpec.yField.field;\n  } else if (typeof sparklineSpec.yField === 'string') {\n    // string类型 自动计算出domain\n    const values = dataValue.map((value: any) => value[sparklineSpec.yField as string]);\n    yScale.domain([Math.min(...values), Math.max(...values)]);\n    yField = sparklineSpec.yField;\n  } else {\n    // yField未配置 检查data是否为数值数组\n    if (Array.isArray(dataValue) && dataValue.every((value: any) => typeof value === 'number')) {\n      yScale.domain([Math.min(...dataValue), Math.max(...dataValue)]);\n      yField = sparklineSpec.yField;\n    }\n  }\n  yScale.range([0, height]);\n\n  if (typeof sparklineSpec.xField === 'object' && Array.isArray(sparklineSpec.xField.domain)) {\n    // 如果xField.domain合法，需要按需补充null值点\n    const values = dataValue.map((value: any) => value[(sparklineSpec.xField as any).field]);\n    const domain = sparklineSpec.xField.domain;\n    for (let i = 0; i < domain.length; i++) {\n      let valid = false;\n      for (let j = 0; j < values.length; j++) {\n        // eslint-disable-next-line eqeqeq\n        if (domain[i] == values[j]) {\n          const data: any = dataValue[j];\n          // 无效数据不进行scale，避免null被解析为0\n          if (!isValid(data[xField]) || !isValid(data[yField])) {\n            break;\n          }\n          items.push({\n            x: left + xScale.scale(data[xField]),\n            y: bottom - yScale.scale(data[yField]),\n            defined: isValid(data[yField])\n          });\n          dataItems.push(data); //收集原始数据\n          valid = true;\n          break;\n        }\n      }\n\n      if (!valid) {\n        // 该domain的index没有在数据中，补充无效点\n        items.push({\n          x: left + xScale.scale(domain[i]),\n          y: 0,\n          defined: false\n        });\n        dataItems.push({ [xField]: domain[i], [yField]: null });\n      }\n    }\n  } else {\n    for (let i = 0; i < dataValue.length; i++) {\n      const data: any = dataValue[i];\n      items.push({\n        x: left + xScale.scale(xField ? data[xField] : i),\n        y: bottom - yScale.scale(yField ? data[yField] : data),\n        defined: isValid(yField ? data[yField] : data),\n        rawData: data\n      } as any);\n      dataItems.push(data);\n    }\n  }\n  // #endregion\n\n  // 更新线节点属性\n  const line = chartGroup.getChildByName('sparkline-line') as ILine;\n  if (line) {\n    line.setAttribute('points', items);\n  }\n  (line as any).bandwidth = xScale.step();\n  (line as any).min = yScale.range()[0];\n  (line as any).max = yScale.range()[1];\n\n  // 更新symbol节点属性\n  const symbolGroup = chartGroup.getChildByName('sparkline-symbol-group') as ILine;\n  if (symbolGroup) {\n    const isShowIsolatedPoint = sparklineSpec.pointShowRule === 'isolatedPoint';\n    if (sparklineSpec.pointShowRule === 'all') {\n      for (let i = 0; i < items.length; i++) {\n        const { x, y, defined } = items[i];\n        if (defined) {\n          const symbol: ISymbol = createSymbol({ x, y });\n          symbolGroup.appendChild(symbol);\n        }\n      }\n    } else if (isShowIsolatedPoint) {\n      // 处理孤立点显示\n      for (let i = 0; i < items.length; i++) {\n        const { x, y, defined } = items[i];\n        if (defined && (!items[i - 1] || !items[i - 1].defined) && (!items[i + 1] || !items[i + 1].defined)) {\n          // 规范孤立数据显示Symbol的spec api\n          const symbol: ISymbol = createSymbol({ x, y });\n          symbolGroup.appendChild(symbol);\n        }\n      }\n    }\n  }\n  return chartGroup;\n}\n\nfunction createChartGroup(\n  spec: SparklineSpec | ((arg: CellInfo) => SparklineSpec),\n  x: number,\n  y: number,\n  width: number,\n  height: number\n): Group {\n  let specObj: SparklineSpec;\n  if (typeof spec === 'function') {\n    // specObj = spec.apply(null, null);\n    specObj = spec(null);\n  } else {\n    specObj = spec;\n  }\n  // 生成根节点\n  const group = new Group({\n    x,\n    y,\n    width,\n    height,\n    stroke: false,\n    fill: false\n  });\n  group.name = 'sparkline';\n\n  if (specObj.type === 'line') {\n    // 生成line\n    const line = createLine({\n      x: 0,\n      y: 0,\n      curveType: specObj.smooth ? 'monotoneX' : 'linear',\n      stroke: specObj.line?.style?.stroke ?? 'blue',\n      lineWidth: specObj.line?.style?.strokeWidth ?? 2\n    });\n    line.name = 'sparkline-line';\n    group.addChild(line);\n    if (specObj.crosshair) {\n      (line as any).hover = specObj.crosshair?.style ?? {\n        stroke: '#000',\n        interpolate: 'linear'\n      };\n    }\n\n    // 生成symbol\n    const symbolGroup = new Group({\n      x: 0,\n      y: 0,\n      width,\n      height,\n      stroke: false,\n      fill: false\n    });\n    symbolGroup.name = 'sparkline-symbol-group';\n    symbolGroup.setTheme({\n      symbol: {\n        stroke: specObj.point?.style?.stroke ?? '#000',\n        lineWidth: specObj.point?.style?.strokeWidth ?? 1,\n        fill: specObj.point?.style?.fill ?? '#000',\n        size: (specObj.point?.style?.size ?? 3) * 2, // 之前配置的是圆半径\n        symbolType: 'circle'\n      }\n    });\n    group.addChild(symbolGroup);\n    (symbolGroup as any).hover = specObj.point?.hover ?? false;\n  }\n  return group;\n}\n"]}

package/es/scenegraph/group-creater/cell-type/text-cell.d.ts

@@ -1,5 +1,5 @@
 import type { IThemeSpec } from '@visactor/vrender';
 import { Group } from '../../graphic/group';
 import type { BaseTableAPI } from '../../../ts-types/base-table';
-export declare function createCellGroup(table: BaseTableAPI, columnGroup: Group, xOrigin: number, yOrigin: number, col: number, row: number, colWidth: number | 'auto', cellWidth: number, cellHeight: number, padding: number[], textAlign: CanvasTextAlign, textBaseline: CanvasTextBaseline, mayHaveIcon: boolean, isfunctionalProps: boolean, renderDefault: boolean, cellTheme?: IThemeSpec): Group;
+export declare function createCellGroup(table: BaseTableAPI, columnGroup: Group, xOrigin: number, yOrigin: number, col: number, row: number, colWidth: number | 'auto', cellWidth: number, cellHeight: number, padding: number[], textAlign: CanvasTextAlign, textBaseline: CanvasTextBaseline, mayHaveIcon: boolean, isfunctionalProps: boolean, customElementsGroup: Group, renderDefault: boolean, cellTheme?: IThemeSpec): Group;
 export declare function getCellTheme(table: BaseTableAPI, col: number, row: number, cellTheme?: IThemeSpec): IThemeSpec | undefined;

package/es/scenegraph/group-creater/cell-type/text-cell.js

@@ -10,7 +10,7 @@ import { createCellContent } from "../../utils/text-icon-layout";
 
 import { getStyleTheme } from "../../../core/tableHelper";
 
-export function createCellGroup(table, columnGroup, xOrigin, yOrigin, col, row, colWidth, cellWidth, cellHeight, padding, textAlign, textBaseline, mayHaveIcon, isfunctionalProps, renderDefault, cellTheme) {
+export function createCellGroup(table, columnGroup, xOrigin, yOrigin, col, row, colWidth, cellWidth, cellHeight, padding, textAlign, textBaseline, mayHaveIcon, isfunctionalProps, customElementsGroup, renderDefault, cellTheme) {
     var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t;
     isfunctionalProps && (cellTheme = getCellTheme(table, col, row, cellTheme));
     const headerStyle = table._getCellStyle(col, row), functionalPadding = getFunctionalProp("padding", headerStyle, col, row, table);
@@ -31,10 +31,10 @@ export function createCellGroup(table, columnGroup, xOrigin, yOrigin, col, row,
         clip: !0
     });
     if (cellGroup.role = "cell", cellGroup.col = col, cellGroup.row = row, columnGroup.addChild(cellGroup), 
-    renderDefault) {
+    customElementsGroup && cellGroup.appendChild(customElementsGroup), renderDefault) {
         const textStr = table.getCellValue(col, row);
         let icons;
-        if (mayHaveIcon && (icons = table.getCellIcons(col, row)), createCellContent(cellGroup, icons, textStr, padding, autoColWidth, autoRowHeight, autoWrapText, "number" == typeof lineClamp ? lineClamp : void 0, cellWidth, cellHeight, textAlign, textBaseline, cellTheme), 
+        if (mayHaveIcon && (icons = table.getCellIcons(col, row)), createCellContent(cellGroup, icons, textStr, padding, autoColWidth, autoRowHeight, autoWrapText, "number" == typeof lineClamp ? lineClamp : void 0, cellWidth, cellHeight, textAlign, textBaseline, table, cellTheme), 
         null === (_t = null == cellTheme ? void 0 : cellTheme._vtable) || void 0 === _t ? void 0 : _t.marked) {
             const mark = createArc({
                 x: cellGroup.attribute.width,
@@ -48,7 +48,10 @@ export function createCellGroup(table, columnGroup, xOrigin, yOrigin, col, row,
             mark.name = "mark", cellGroup.appendChild(mark);
         }
     }
-    return cellGroup;
+    return customElementsGroup && cellGroup.setAttributes({
+        width: Math.max(cellGroup.attribute.width, customElementsGroup.attribute.width),
+        height: Math.max(cellGroup.attribute.height, customElementsGroup.attribute.height)
+    }), cellGroup;
 }
 
 export function getCellTheme(table, col, row, cellTheme) {

package/es/scenegraph/group-creater/cell-type/text-cell.js.map

@@ -1 +1 @@
-{"version":3,"sources":["scenegraph/group-creater/cell-type/text-cell.ts"],"names":[],"mappings":"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","file":"text-cell.js","sourcesContent":["/* eslint-disable no-undef */\nimport type { IThemeSpec } from '@visactor/vrender';\nimport { createArc } from '@visactor/vrender';\nimport { isValid } from '../../../tools/util';\nimport { Group } from '../../graphic/group';\n// import { parseFont } from '../../utils/font';\nimport { getFunctionalProp } from '../../utils/get-prop';\nimport { createCellContent } from '../../utils/text-icon-layout';\nimport type { BaseTableAPI } from '../../../ts-types/base-table';\nimport { getStyleTheme } from '../../../core/tableHelper';\n\n/**\n * @description: 创建单元格场景节点\n * @param {Group} columnGroup 列Group\n * @param {number} xOrigin 起始x坐标\n * @param {number} yOrigin 起始y坐标\n * @param {number} col\n * @param {number} row\n * @param {BaseTableAPI} table\n * @param {number | 'auto'} colWidth 配置列宽\n * @param {number} padding 单元格padding\n * @param {CanvasTextAlign} textAlign\n * @param {CanvasTextBaseline} textBaseline\n * @param {boolean} noWrap 不进行折行（default column type）\n * @param {IThemeSpec} cellTheme 单元格主题\n * @return {Group}\n */\nexport function createCellGroup(\n  table: BaseTableAPI,\n  columnGroup: Group,\n  xOrigin: number,\n  yOrigin: number,\n  col: number,\n  row: number,\n  // rowHeight: number,\n  colWidth: number | 'auto',\n  cellWidth: number,\n  cellHeight: number,\n  padding: number[],\n  textAlign: CanvasTextAlign,\n  textBaseline: CanvasTextBaseline,\n  mayHaveIcon: boolean,\n  isfunctionalProps: boolean,\n  renderDefault: boolean,\n  cellTheme?: IThemeSpec\n): Group {\n  // 处理函数样式\n  if (isfunctionalProps) {\n    cellTheme = getCellTheme(table, col, row, cellTheme);\n  }\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  if (cellTheme?.text?.textAlign) {\n    textAlign = cellTheme?.text?.textAlign;\n  }\n  if (cellTheme?.text?.textBaseline) {\n    textBaseline = cellTheme?.text?.textBaseline;\n  }\n  const { autoRowHeight } = table.internalProps;\n  const autoColWidth = colWidth === 'auto';\n  const autoWrapText = headerStyle.autoWrapText ?? table.internalProps.autoWrapText;\n  const lineClamp = headerStyle.lineClamp;\n\n  // cell\n  const cellGroup = new Group({\n    x: xOrigin,\n    y: yOrigin,\n    width: cellWidth,\n    height: cellHeight,\n    // 背景相关，cell背景由cellGroup绘制\n    lineWidth: cellTheme?.group?.lineWidth ?? undefined,\n    fill: cellTheme?.group?.fill ?? undefined,\n    stroke: cellTheme?.group?.stroke ?? undefined,\n    strokeArrayWidth: (cellTheme?.group as any)?.strokeArrayWidth ?? undefined,\n    strokeArrayColor: (cellTheme?.group as any)?.strokeArrayColor ?? undefined,\n    cursor: (cellTheme?.group as any)?.cursor ?? undefined,\n\n    lineCap: 'square',\n\n    clip: true\n  } as any);\n  cellGroup.role = 'cell';\n  cellGroup.col = col;\n  cellGroup.row = row;\n  columnGroup.addChild(cellGroup);\n\n  if (renderDefault) {\n    const textStr: string = table.getCellValue(col, row);\n\n    let icons;\n    if (mayHaveIcon) {\n      icons = table.getCellIcons(col, row);\n    }\n\n    createCellContent(\n      cellGroup,\n      icons,\n      textStr,\n      padding as any,\n      autoColWidth,\n      autoRowHeight,\n      autoWrapText,\n      typeof lineClamp === 'number' ? lineClamp : undefined,\n      // autoColWidth ? 0 : colWidth,\n      // table.getRowHeight(row),\n      cellWidth,\n      cellHeight,\n      textAlign,\n      textBaseline,\n      cellTheme\n    );\n\n    if ((cellTheme as any)?._vtable?.marked) {\n      const mark = createArc({\n        x: cellGroup.attribute.width,\n        y: 0,\n        startAngle: Math.PI / 2,\n        endAngle: Math.PI,\n        outerRadius: 6,\n        fill: '#3073F2',\n        pickable: false\n      });\n      mark.name = 'mark';\n\n      cellGroup.appendChild(mark);\n    }\n  }\n\n  return cellGroup;\n}\n\n/**\n * @description: 获取函数式赋值的样式，记录在cellTheme中\n * @param {BaseTableAPI} table\n * @param {number} col\n * @param {number} row\n * @param {IThemeSpec} cellTheme\n * @return {IThemeSpec | undefined}\n */\nexport function getCellTheme(\n  table: BaseTableAPI,\n  col: number,\n  row: number,\n  cellTheme?: IThemeSpec\n): IThemeSpec | undefined {\n  // get column header style\n  const headerStyle = table._getCellStyle(col, row);\n\n  const theme = getStyleTheme(headerStyle, table, col, row, getFunctionalProp).theme;\n\n  for (const prop in theme.group) {\n    if (isValid(theme.group[prop])) {\n      if (!cellTheme) {\n        cellTheme = {};\n      }\n\n      if (!cellTheme.group) {\n        cellTheme.group = {};\n      }\n\n      cellTheme.group[prop] = theme.group[prop];\n    }\n  }\n\n  for (const prop in theme.text) {\n    if (isValid(theme.text[prop])) {\n      if (!cellTheme) {\n        cellTheme = {};\n      }\n\n      if (!cellTheme.text) {\n        cellTheme.text = {};\n      }\n\n      cellTheme.text[prop] = theme.text[prop];\n    }\n  }\n\n  for (const prop in theme._vtable) {\n    if (isValid(theme._vtable[prop])) {\n      if (!cellTheme) {\n        cellTheme = {};\n      }\n\n      if (!(cellTheme as any)._vtable) {\n        (cellTheme as any)._vtable = {};\n      }\n\n      (cellTheme as any)._vtable[prop] = theme._vtable[prop];\n    }\n  }\n  return cellTheme;\n}\n"]}
+{"version":3,"sources":["scenegraph/group-creater/cell-type/text-cell.ts"],"names":[],"mappings":"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","file":"text-cell.js","sourcesContent":["/* eslint-disable no-undef */\nimport type { IThemeSpec } from '@visactor/vrender';\nimport { createArc } from '@visactor/vrender';\nimport { isValid } from '../../../tools/util';\nimport { Group } from '../../graphic/group';\n// import { parseFont } from '../../utils/font';\nimport { getFunctionalProp } from '../../utils/get-prop';\nimport { createCellContent } from '../../utils/text-icon-layout';\nimport type { BaseTableAPI } from '../../../ts-types/base-table';\nimport { getStyleTheme } from '../../../core/tableHelper';\n\n/**\n * @description: 创建单元格场景节点\n * @param {Group} columnGroup 列Group\n * @param {number} xOrigin 起始x坐标\n * @param {number} yOrigin 起始y坐标\n * @param {number} col\n * @param {number} row\n * @param {BaseTableAPI} table\n * @param {number | 'auto'} colWidth 配置列宽\n * @param {number} padding 单元格padding\n * @param {CanvasTextAlign} textAlign\n * @param {CanvasTextBaseline} textBaseline\n * @param {boolean} noWrap 不进行折行（default column type）\n * @param {IThemeSpec} cellTheme 单元格主题\n * @return {Group}\n */\nexport function createCellGroup(\n  table: BaseTableAPI,\n  columnGroup: Group,\n  xOrigin: number,\n  yOrigin: number,\n  col: number,\n  row: number,\n  // rowHeight: number,\n  colWidth: number | 'auto',\n  cellWidth: number,\n  cellHeight: number,\n  padding: number[],\n  textAlign: CanvasTextAlign,\n  textBaseline: CanvasTextBaseline,\n  mayHaveIcon: boolean,\n  isfunctionalProps: boolean,\n  customElementsGroup: Group,\n  renderDefault: boolean,\n  cellTheme?: IThemeSpec\n): Group {\n  // 处理函数样式\n  if (isfunctionalProps) {\n    cellTheme = getCellTheme(table, col, row, cellTheme);\n  }\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  if (cellTheme?.text?.textAlign) {\n    textAlign = cellTheme?.text?.textAlign;\n  }\n  if (cellTheme?.text?.textBaseline) {\n    textBaseline = cellTheme?.text?.textBaseline;\n  }\n  const { autoRowHeight } = table.internalProps;\n  const autoColWidth = colWidth === 'auto';\n  const autoWrapText = headerStyle.autoWrapText ?? table.internalProps.autoWrapText;\n  const lineClamp = headerStyle.lineClamp;\n\n  // cell\n  const cellGroup = new Group({\n    x: xOrigin,\n    y: yOrigin,\n    width: cellWidth,\n    height: cellHeight,\n    // 背景相关，cell背景由cellGroup绘制\n    lineWidth: cellTheme?.group?.lineWidth ?? undefined,\n    fill: cellTheme?.group?.fill ?? undefined,\n    stroke: cellTheme?.group?.stroke ?? undefined,\n    strokeArrayWidth: (cellTheme?.group as any)?.strokeArrayWidth ?? undefined,\n    strokeArrayColor: (cellTheme?.group as any)?.strokeArrayColor ?? undefined,\n    cursor: (cellTheme?.group as any)?.cursor ?? undefined,\n\n    lineCap: 'square',\n\n    clip: true\n  } as any);\n  cellGroup.role = 'cell';\n  cellGroup.col = col;\n  cellGroup.row = row;\n  columnGroup.addChild(cellGroup);\n  if (customElementsGroup) {\n    cellGroup.appendChild(customElementsGroup);\n  }\n  if (renderDefault) {\n    const textStr: string = table.getCellValue(col, row);\n    let icons;\n    if (mayHaveIcon) {\n      icons = table.getCellIcons(col, row);\n    }\n\n    createCellContent(\n      cellGroup,\n      icons,\n      textStr,\n      padding as any,\n      autoColWidth,\n      autoRowHeight,\n      autoWrapText,\n      typeof lineClamp === 'number' ? lineClamp : undefined,\n      // autoColWidth ? 0 : colWidth,\n      // table.getRowHeight(row),\n      cellWidth,\n      cellHeight,\n      textAlign,\n      textBaseline,\n      table,\n      cellTheme\n    );\n\n    if ((cellTheme as any)?._vtable?.marked) {\n      const mark = createArc({\n        x: cellGroup.attribute.width,\n        y: 0,\n        startAngle: Math.PI / 2,\n        endAngle: Math.PI,\n        outerRadius: 6,\n        fill: '#3073F2',\n        pickable: false\n      });\n      mark.name = 'mark';\n\n      cellGroup.appendChild(mark);\n    }\n  }\n  if (customElementsGroup) {\n    cellGroup.setAttributes({\n      width: Math.max(cellGroup.attribute.width, customElementsGroup.attribute.width),\n      height: Math.max(cellGroup.attribute.height, customElementsGroup.attribute.height)\n    });\n  }\n  return cellGroup;\n}\n\n/**\n * @description: 获取函数式赋值的样式，记录在cellTheme中\n * @param {BaseTableAPI} table\n * @param {number} col\n * @param {number} row\n * @param {IThemeSpec} cellTheme\n * @return {IThemeSpec | undefined}\n */\nexport function getCellTheme(\n  table: BaseTableAPI,\n  col: number,\n  row: number,\n  cellTheme?: IThemeSpec\n): IThemeSpec | undefined {\n  // get column header style\n  const headerStyle = table._getCellStyle(col, row);\n\n  const theme = getStyleTheme(headerStyle, table, col, row, getFunctionalProp).theme;\n\n  for (const prop in theme.group) {\n    if (isValid(theme.group[prop])) {\n      if (!cellTheme) {\n        cellTheme = {};\n      }\n\n      if (!cellTheme.group) {\n        cellTheme.group = {};\n      }\n\n      cellTheme.group[prop] = theme.group[prop];\n    }\n  }\n\n  for (const prop in theme.text) {\n    if (isValid(theme.text[prop])) {\n      if (!cellTheme) {\n        cellTheme = {};\n      }\n\n      if (!cellTheme.text) {\n        cellTheme.text = {};\n      }\n\n      cellTheme.text[prop] = theme.text[prop];\n    }\n  }\n\n  for (const prop in theme._vtable) {\n    if (isValid(theme._vtable[prop])) {\n      if (!cellTheme) {\n        cellTheme = {};\n      }\n\n      if (!(cellTheme as any)._vtable) {\n        (cellTheme as any)._vtable = {};\n      }\n\n      (cellTheme as any)._vtable[prop] = theme._vtable[prop];\n    }\n  }\n  return cellTheme;\n}\n"]}

package/es/scenegraph/group-creater/cell-type/video-cell.js

@@ -67,7 +67,7 @@ export function createVideoCellGroup(columnGroup, xOrigin, yOrigin, col, row, wi
             image: regedIcons.play.svg,
             cursor: regedIcons.play.cursor
         });
-        playIcon.role = "play-icon", cellGroup.appendChild(playIcon), table.scenegraph.updateNextFrame();
+        playIcon.name = "play-icon", cellGroup.appendChild(playIcon), table.scenegraph.updateNextFrame();
     })), video.onerror = () => {
         image.image = regedIcons.damage_pic.svg;
     }, video.src = value, video.setAttribute("preload", "auto");

package/es/scenegraph/group-creater/cell-type/video-cell.js.map

@@ -1 +1 @@
-{"version":3,"sources":["scenegraph/group-creater/cell-type/video-cell.ts"],"names":[],"mappings":"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","file":"video-cell.js","sourcesContent":["/* eslint-disable no-undef */\nimport type { Cursor, IImage, IThemeSpec } from '@visactor/vrender';\nimport { createRect, createImage } from '@visactor/vrender';\nimport * as icons from '../../../icons';\nimport { Group } from '../../graphic/group';\nimport { calcKeepAspectRatioSize } from '../../utils/keep-aspect-ratio';\nimport { Icon } from '../../graphic/icon';\nimport { calcStartPosition } from '../../utils/cell-pos';\nimport { _adjustWidthHeight } from './image-cell';\nimport { getFunctionalProp, getProp } from '../../utils/get-prop';\nimport { isValid } from '../../../tools/util';\nimport { getCellTheme } from './text-cell';\nimport type { BaseTableAPI } from '../../../ts-types/base-table';\n\nconst regedIcons = icons.get();\n\nexport function createVideoCellGroup(\n  columnGroup: Group,\n  xOrigin: number,\n  yOrigin: number,\n  col: number,\n  row: number,\n  width: number,\n  height: number,\n  keepAspectRatio: boolean,\n  imageAutoSizing: boolean,\n  padding: [number, number, number, number],\n  textAlign: CanvasTextAlign,\n  textBaseline: CanvasTextBaseline,\n  table: BaseTableAPI,\n  cellTheme?: IThemeSpec\n) {\n  cellTheme = getCellTheme(table, col, row, cellTheme);\n  const headerStyle = table._getCellStyle(col, row); // to be fixed\n  const functionalPadding = getFunctionalProp('padding', headerStyle, col, row, table);\n  // const margin = getProp('padding', headerStyle, col, row, table);\n  if (isValid(functionalPadding)) {\n    padding = functionalPadding;\n  }\n  if (cellTheme?.text?.textAlign) {\n    textAlign = cellTheme?.text?.textAlign;\n  }\n  if (cellTheme?.text?.textBaseline) {\n    textBaseline = cellTheme?.text?.textBaseline;\n  }\n\n  // cell\n  const cellGroup = new Group({\n    x: xOrigin,\n    y: yOrigin,\n    width,\n    height,\n    // childrenPickable: false,\n\n    // 背景相关，cell背景由cellGroup绘制\n    lineWidth: cellTheme?.group?.lineWidth ?? undefined,\n    fill: cellTheme?.group?.fill ?? undefined,\n    stroke: cellTheme?.group?.stroke ?? undefined,\n    strokeArrayWidth: (cellTheme?.group as any)?.strokeArrayWidth ?? undefined,\n    strokeArrayColor: (cellTheme?.group as any)?.strokeArrayColor ?? undefined,\n    cursor: (cellTheme?.group as any)?.cursor ?? undefined,\n\n    lineCap: 'square',\n\n    clip: true\n  } as any);\n  cellGroup.role = 'cell';\n  cellGroup.col = col;\n  cellGroup.row = row;\n  columnGroup.addChild(cellGroup);\n\n  // video\n  const value = table.getCellValue(col, row);\n  const video = document.createElement('video');\n  video.addEventListener('loadeddata', (): void => {\n    if (imageAutoSizing) {\n      _adjustWidthHeight(col, row, video.videoWidth, video.videoHeight, table.scenegraph, padding);\n    }\n    const width = cellGroup.attribute.width;\n    const height = cellGroup.attribute.height;\n    // 更新宽高\n    if (keepAspectRatio) {\n      const { width: videoWidth, height: videoHeight } = calcKeepAspectRatioSize(\n        video.videoWidth,\n        video.videoHeight,\n        width - padding[1] - padding[3],\n        height - padding[0] - padding[2]\n      );\n      const pos = calcStartPosition(0, 0, width, height, videoWidth, videoHeight, textAlign, textBaseline, padding);\n\n      image.setAttributes({\n        width: videoWidth,\n        height: videoHeight,\n        x: pos.x,\n        y: pos.y\n      });\n    } else {\n      image.setAttributes({\n        x: padding[3],\n        y: padding[0],\n        width: width - padding[1] - padding[3],\n        height: height - padding[2] - padding[0]\n      });\n    }\n\n    const left = 0;\n    const top = 0;\n    // 播放按钮\n    const iconSize = Math.floor(Math.min(width - padding[1] - padding[3], height - padding[2] - padding[0]) / 2);\n    const anchorX =\n      left + (width > image.attribute.width ? image.attribute.x - left + image.attribute.width / 2 : width / 2);\n    const anchorY =\n      top + (height > image.attribute.height ? image.attribute.y - top + image.attribute.height / 2 : height / 2);\n\n    const playIcon: Icon = new Icon({\n      x: anchorX - iconSize / 2,\n      y: anchorY - iconSize / 2,\n      width: iconSize,\n      height: iconSize,\n      image: (regedIcons.play as any).svg,\n      cursor: (regedIcons.play as any).cursor\n    });\n    playIcon.role = 'play-icon';\n    cellGroup.appendChild(playIcon);\n    // 触发重绘\n    table.scenegraph.updateNextFrame();\n  });\n  video.onerror = (): void => {\n    // image.setAttribute('image', (regedIcons.damage_pic as any).svg);\n    (image as any).image = (regedIcons.damage_pic as any).svg;\n  };\n  video.src = value;\n  video.setAttribute('preload', 'auto');\n\n  const image: IImage = createImage({\n    x: padding[3],\n    y: padding[0],\n    width: width - padding[1] - padding[3],\n    height: height - padding[2] - padding[0],\n    image: video as any,\n    cursor: 'pointer' as Cursor\n  });\n  image.name = 'image';\n  cellGroup.appendChild(image);\n\n  return cellGroup;\n}\n"]}
+{"version":3,"sources":["scenegraph/group-creater/cell-type/video-cell.ts"],"names":[],"mappings":"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","file":"video-cell.js","sourcesContent":["/* eslint-disable no-undef */\nimport type { Cursor, IImage, IThemeSpec } from '@visactor/vrender';\nimport { createRect, createImage } from '@visactor/vrender';\nimport * as icons from '../../../icons';\nimport { Group } from '../../graphic/group';\nimport { calcKeepAspectRatioSize } from '../../utils/keep-aspect-ratio';\nimport { Icon } from '../../graphic/icon';\nimport { calcStartPosition } from '../../utils/cell-pos';\nimport { _adjustWidthHeight } from './image-cell';\nimport { getFunctionalProp, getProp } from '../../utils/get-prop';\nimport { isValid } from '../../../tools/util';\nimport { getCellTheme } from './text-cell';\nimport type { BaseTableAPI } from '../../../ts-types/base-table';\n\nconst regedIcons = icons.get();\n\nexport function createVideoCellGroup(\n  columnGroup: Group,\n  xOrigin: number,\n  yOrigin: number,\n  col: number,\n  row: number,\n  width: number,\n  height: number,\n  keepAspectRatio: boolean,\n  imageAutoSizing: boolean,\n  padding: [number, number, number, number],\n  textAlign: CanvasTextAlign,\n  textBaseline: CanvasTextBaseline,\n  table: BaseTableAPI,\n  cellTheme?: IThemeSpec\n) {\n  cellTheme = getCellTheme(table, col, row, cellTheme);\n  const headerStyle = table._getCellStyle(col, row); // to be fixed\n  const functionalPadding = getFunctionalProp('padding', headerStyle, col, row, table);\n  // const margin = getProp('padding', headerStyle, col, row, table);\n  if (isValid(functionalPadding)) {\n    padding = functionalPadding;\n  }\n  if (cellTheme?.text?.textAlign) {\n    textAlign = cellTheme?.text?.textAlign;\n  }\n  if (cellTheme?.text?.textBaseline) {\n    textBaseline = cellTheme?.text?.textBaseline;\n  }\n\n  // cell\n  const cellGroup = new Group({\n    x: xOrigin,\n    y: yOrigin,\n    width,\n    height,\n    // childrenPickable: false,\n\n    // 背景相关，cell背景由cellGroup绘制\n    lineWidth: cellTheme?.group?.lineWidth ?? undefined,\n    fill: cellTheme?.group?.fill ?? undefined,\n    stroke: cellTheme?.group?.stroke ?? undefined,\n    strokeArrayWidth: (cellTheme?.group as any)?.strokeArrayWidth ?? undefined,\n    strokeArrayColor: (cellTheme?.group as any)?.strokeArrayColor ?? undefined,\n    cursor: (cellTheme?.group as any)?.cursor ?? undefined,\n\n    lineCap: 'square',\n\n    clip: true\n  } as any);\n  cellGroup.role = 'cell';\n  cellGroup.col = col;\n  cellGroup.row = row;\n  columnGroup.addChild(cellGroup);\n\n  // video\n  const value = table.getCellValue(col, row);\n  const video = document.createElement('video');\n  video.addEventListener('loadeddata', (): void => {\n    if (imageAutoSizing) {\n      _adjustWidthHeight(col, row, video.videoWidth, video.videoHeight, table.scenegraph, padding);\n    }\n    const width = cellGroup.attribute.width;\n    const height = cellGroup.attribute.height;\n    // 更新宽高\n    if (keepAspectRatio) {\n      const { width: videoWidth, height: videoHeight } = calcKeepAspectRatioSize(\n        video.videoWidth,\n        video.videoHeight,\n        width - padding[1] - padding[3],\n        height - padding[0] - padding[2]\n      );\n      const pos = calcStartPosition(0, 0, width, height, videoWidth, videoHeight, textAlign, textBaseline, padding);\n\n      image.setAttributes({\n        width: videoWidth,\n        height: videoHeight,\n        x: pos.x,\n        y: pos.y\n      });\n    } else {\n      image.setAttributes({\n        x: padding[3],\n        y: padding[0],\n        width: width - padding[1] - padding[3],\n        height: height - padding[2] - padding[0]\n      });\n    }\n\n    const left = 0;\n    const top = 0;\n    // 播放按钮\n    const iconSize = Math.floor(Math.min(width - padding[1] - padding[3], height - padding[2] - padding[0]) / 2);\n    const anchorX =\n      left + (width > image.attribute.width ? image.attribute.x - left + image.attribute.width / 2 : width / 2);\n    const anchorY =\n      top + (height > image.attribute.height ? image.attribute.y - top + image.attribute.height / 2 : height / 2);\n\n    const playIcon: Icon = new Icon({\n      x: anchorX - iconSize / 2,\n      y: anchorY - iconSize / 2,\n      width: iconSize,\n      height: iconSize,\n      image: (regedIcons.play as any).svg,\n      cursor: (regedIcons.play as any).cursor\n    });\n    playIcon.name = 'play-icon';\n    cellGroup.appendChild(playIcon);\n    // 触发重绘\n    table.scenegraph.updateNextFrame();\n  });\n  video.onerror = (): void => {\n    // image.setAttribute('image', (regedIcons.damage_pic as any).svg);\n    (image as any).image = (regedIcons.damage_pic as any).svg;\n  };\n  video.src = value;\n  video.setAttribute('preload', 'auto');\n\n  const image: IImage = createImage({\n    x: padding[3],\n    y: padding[0],\n    width: width - padding[1] - padding[3],\n    height: height - padding[2] - padding[0],\n    image: video as any,\n    cursor: 'pointer' as Cursor\n  });\n  image.name = 'image';\n  cellGroup.appendChild(image);\n\n  return cellGroup;\n}\n"]}

package/es/scenegraph/group-creater/column-helper.d.ts

@@ -1,9 +1,9 @@
 import type { IThemeSpec } from '@visactor/vrender';
-import type { CellType, ICustomLayout, ICustomRender } from '../../ts-types';
+import type { CellType } from '../../ts-types';
 import { Group } from '../graphic/group';
-import type { MergeMap } from './column';
+import type { MergeMap } from '../scenegraph';
 import type { BaseTableAPI } from '../../ts-types/base-table';
-export declare function createComplexColumn(columnGroup: Group, col: number, colWidth: number, rowStart: number, rowEnd: number, mergeMap: MergeMap, defaultRowHeight: number | number[], table: BaseTableAPI, cellType: CellType, rowLimit?: number, customRender?: ICustomRender, customLayout?: ICustomLayout): {
+export declare function createComplexColumn(columnGroup: Group, col: number, colWidth: number, rowStart: number, rowEnd: number, mergeMap: MergeMap, defaultRowHeight: number | number[], table: BaseTableAPI, cellType: CellType, rowLimit?: number): {
     width: number;
     height: number;
 };

package/es/scenegraph/group-creater/column-helper.js

@@ -6,8 +6,12 @@ import { createCell } from "./cell-helper";
 
 import { getStyleTheme } from "../../core/tableHelper";
 
-export function createComplexColumn(columnGroup, col, colWidth, rowStart, rowEnd, mergeMap, defaultRowHeight, table, cellType, rowLimit, customRender, customLayout) {
-    var _a, _b, _c, _d, _e, _f;
+import { isPromise } from "../../tools/helper";
+
+import { dealPromiseData } from "../utils/deal-promise-data";
+
+export function createComplexColumn(columnGroup, col, colWidth, rowStart, rowEnd, mergeMap, defaultRowHeight, table, cellType, rowLimit) {
+    var _a, _b, _c, _d, _e;
     let padding, textAlign, textBaseline, maxWidth = 0, isfunctionalProps = !1;
     const useColumnTheme = (table.isListTable() && !table.scenegraph.transpose || table.isPivotTable() && table.internalProps.layoutMap.indicatorsAsCol) && "body" === cellType;
     if (useColumnTheme) if (columnGroup.childrenCount) {
@@ -29,9 +33,9 @@ export function createComplexColumn(columnGroup, col, colWidth, rowStart, rowEnd
         mappingRule.bgColor && (bgColorFunc = mappingRule.bgColor.mapping);
     })));
     let y = 0;
-    (null === (_f = columnGroup.lastChild) || void 0 === _f ? void 0 : _f.attribute) && (y = columnGroup.lastChild.attribute.y + columnGroup.lastChild.attribute.height);
+    columnGroup.colHeight && (y = columnGroup.colHeight);
     for (let j = rowStart; j <= rowEnd; j++) {
-        const row = j, define = "body" !== cellType ? table.getHeaderDefine(col, row) : table.getBodyColumnDefine(col, row), mayHaveIcon = "body" !== cellType || !!(null == define ? void 0 : define.icon);
+        const row = j, define = "body" !== cellType ? table.getHeaderDefine(col, row) : table.getBodyColumnDefine(col, row), mayHaveIcon = "body" !== cellType || (!!(null == define ? void 0 : define.icon) || !!(null == define ? void 0 : define.tree));
         let cellTheme;
         if (!useColumnTheme) {
             const headerStyle = table._getCellStyle(col, row);
@@ -57,20 +61,31 @@ export function createComplexColumn(columnGroup, col, colWidth, rowStart, rowEnd
             });
         }
         if (mergeResult) {
-            const cellGroup = new Group({
+            const height = mergeResult.cellHeight / (range.end.row - range.start.row + 1), cellGroup = new Group({
                 x: 0,
                 y: y,
                 width: 0,
-                height: 0,
+                height: height,
                 visible: !1,
                 pickable: !1
             });
             cellGroup.role = "shadow-cell", cellGroup.col = col, cellGroup.row = row, cellGroup.mergeCol = range.start.col, 
-            cellGroup.mergeRow = range.start.row, columnGroup.addChild(cellGroup), range = table.getCellRange(col, row), 
-            y += mergeResult.cellHeight / (range.end.row - range.start.row + 1), maxWidth = Math.max(maxWidth, mergeResult.cellWidth);
+            cellGroup.mergeRow = range.start.row, columnGroup.addChild(cellGroup), columnGroup.updateColumnRowNumber(row), 
+            columnGroup.updateColumnHeight(height), range = table.getCellRange(col, row), y += height, 
+            maxWidth = Math.max(maxWidth, mergeResult.cellWidth);
         } else {
-            const height = createCell(type, define, table, col, row, colWidth, bgColorFunc, customRender, customLayout, cellWidth, cellHeight, columnGroup, y, padding, textAlign, textBaseline, mayHaveIcon, isfunctionalProps, isMerge, range, cellTheme).attribute.height;
-            y += isMerge ? height / (range.end.row - range.start.row + 1) : height;
+            const value = table.getCellValue(col, row);
+            if (isPromise(value)) {
+                dealPromiseData(value, table, createCell.bind(null, type, define, table, col, row, colWidth, bgColorFunc, cellWidth, cellHeight, columnGroup, y, padding, textAlign, textBaseline, mayHaveIcon, isfunctionalProps, isMerge, range, cellTheme)), 
+                columnGroup.updateColumnRowNumber(row);
+                const height = isMerge ? table.getRowHeight(row) / (range.end.row - range.start.row + 1) : table.getRowHeight(row);
+                columnGroup.updateColumnHeight(height), y += height;
+            } else {
+                const cellGroup = createCell(type, define, table, col, row, colWidth, bgColorFunc, cellWidth, cellHeight, columnGroup, y, padding, textAlign, textBaseline, mayHaveIcon, isfunctionalProps, isMerge, range, cellTheme);
+                columnGroup.updateColumnRowNumber(row);
+                const height = isMerge ? cellGroup.attribute.height / (range.end.row - range.start.row + 1) : cellGroup.attribute.height;
+                columnGroup.updateColumnHeight(height), y += height;
+            }
         }
         if (rowLimit && row > rowLimit) break;
     }

package/es/scenegraph/group-creater/column-helper.js.map

@@ -1 +1 @@
-{"version":3,"sources":["scenegraph/group-creater/column-helper.ts"],"names":[],"mappings":"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","file":"column-helper.js","sourcesContent":["/* eslint-disable no-undef */\nimport type { IThemeSpec } from '@visactor/vrender';\nimport type {\n  CellType,\n  FullExtendStyle,\n  ICustomLayout,\n  ICustomRender,\n  MappingRule,\n  TextColumnDefine\n} from '../../ts-types';\nimport { Group } from '../graphic/group';\nimport { getProp, getRawProp } from '../utils/get-prop';\nimport type { MergeMap } from './column';\nimport { getPadding } from '../utils/padding';\nimport { parseFont } from '../utils/font';\nimport type { PivotHeaderLayoutMap } from '../../layout/pivot-header-layout';\nimport { createCell } from './cell-helper';\nimport type { BaseTableAPI, PivotTableProtected } from '../../ts-types/base-table';\nimport { getStyleTheme } from '../../core/tableHelper';\n/**\n * 创建复合列 同一列支持创建不同类型单元格\n * @param columnGroup 列Group\n * @param col\n * @param colWidth 配置列宽\n * @param rowStart\n * @param rowEnd\n * @param mergeMap merge单元格信息\n * @param defaultRowHeight\n * @param table\n * @param cellType\n * @param rowLimit\n * @param customRender\n * @param customLayout\n * @returns\n */\nexport function createComplexColumn(\n  columnGroup: Group,\n  col: number,\n  colWidth: number,\n  rowStart: number,\n  rowEnd: number,\n  mergeMap: MergeMap,\n  defaultRowHeight: number | number[],\n  table: BaseTableAPI,\n  cellType: CellType,\n  rowLimit?: number,\n  customRender?: ICustomRender,\n  customLayout?: ICustomLayout\n) {\n  let maxWidth = 0;\n  let padding;\n  let textAlign;\n  let textBaseline;\n  let isfunctionalProps = false;\n  /** useColumnTheme 判断是否可以使用columnTheme */\n  const useColumnTheme =\n    ((table.isListTable() && !table.scenegraph.transpose) ||\n      (table.isPivotTable() && (table.internalProps.layoutMap as PivotHeaderLayoutMap).indicatorsAsCol)) &&\n    cellType === 'body';\n\n  if (useColumnTheme) {\n    if (!columnGroup.childrenCount) {\n      // 只在首屏生效\n      const { theme: columnTheme, hasFunctionPros } = getColumnGroupTheme(col, colWidth, table);\n      isfunctionalProps = hasFunctionPros;\n      // get column header style\n      if (columnTheme._vtable.padding) {\n        padding = columnTheme._vtable.padding;\n      }\n      if (columnTheme.text.textAlign) {\n        textAlign = columnTheme.text.textAlign;\n      }\n      if (columnTheme.text.textBaseline) {\n        textBaseline = columnTheme.text.textBaseline;\n      }\n      columnGroup.setTheme(columnTheme);\n    } else if (columnGroup.theme) {\n      const style = table._getCellStyle(col, table.columnHeaderLevelCount); // to be fixed\n      const { hasFunctionPros } = getStyleTheme(style, table, col, table.columnHeaderLevelCount, getRawProp, false);\n      isfunctionalProps = hasFunctionPros;\n      const columnTheme = columnGroup.theme.userTheme as any;\n      // 渐进加载时获取\n      if (columnTheme._vtable.padding) {\n        padding = columnTheme._vtable.padding;\n      }\n      if (columnTheme.text.textAlign) {\n        textAlign = columnTheme.text.textAlign;\n      }\n      if (columnTheme.text.textBaseline) {\n        textBaseline = columnTheme.text.textBaseline;\n      }\n    }\n  }\n  let bgColorFunc: Function;\n  // 判断是否有mapping  遍历dataset中mappingRules\n  if ((table.internalProps as PivotTableProtected)?.dataConfig?.mappingRules && cellType === 'body') {\n    (table.internalProps as PivotTableProtected)?.dataConfig?.mappingRules?.forEach(\n      (mappingRule: MappingRule, i: number) => {\n        if (mappingRule.bgColor) {\n          bgColorFunc = mappingRule.bgColor.mapping;\n        }\n      }\n    );\n  }\n  let y = 0;\n  if ((columnGroup.lastChild as Group)?.attribute) {\n    // 支持插入单元格\n    y = (columnGroup.lastChild as Group).attribute.y + (columnGroup.lastChild as Group).attribute.height;\n  }\n\n  for (let j = rowStart; j <= rowEnd; j++) {\n    const row = j;\n    const define = cellType !== 'body' ? table.getHeaderDefine(col, row) : table.getBodyColumnDefine(col, row);\n    const mayHaveIcon = cellType !== 'body' ? true : !!define?.icon;\n    let cellTheme;\n    if (!useColumnTheme) {\n      const headerStyle = table._getCellStyle(col, row);\n      cellTheme = getStyleTheme(headerStyle, table, col, row, getProp).theme;\n      cellTheme.group.width = colWidth;\n      cellTheme.group.height = Array.isArray(defaultRowHeight) ? defaultRowHeight[row] : defaultRowHeight;\n      if (cellTheme._vtable.padding) {\n        padding = cellTheme._vtable.padding;\n      }\n      if (cellTheme.text.textAlign) {\n        textAlign = cellTheme.text.textAlign;\n      }\n      if (cellTheme.text.textBaseline) {\n        textBaseline = cellTheme.text.textBaseline;\n      }\n    }\n    // margin = getProp('margin', headerStyle, col, 0, table)\n\n    let cellGroup;\n    let cellWidth = colWidth;\n    let cellHeight = table.internalProps.autoRowHeight ? 0 : table.getRowHeight(row);\n    const type =\n      (table.isHeader(col, row) ? table._getHeaderLayoutMap(col, row).headerType : table.getBodyColumnType(col, row)) ||\n      'text';\n    // 处理单元格合并\n    let mergeResult;\n    let range;\n    let isMerge;\n    if (cellType !== 'body' || (define as TextColumnDefine)?.mergeCell) {\n      // 只有表头或者column配置合并单元格后再进行信息获取\n      range = table.getCellRange(col, row);\n      isMerge = range.start.col !== range.end.col || range.start.row !== range.end.row;\n      // 所有Merge单元格，只保留左上角一个真实的单元格，其他使用空Group占位\n      if (isMerge) {\n        cellWidth = 0;\n        cellHeight = 0;\n        mergeResult = mergeMap.get(`${range.start.col},${range.start.row};${range.end.col},${range.end.row}`);\n        if (!mergeResult) {\n          for (let col = range.start.col; col <= range.end.col; col++) {\n            cellWidth += table.getColWidth(col);\n          }\n\n          // let cellHeight = 0;\n          for (let i = range.start.row; i <= range.end.row; i++) {\n            cellHeight += table.getRowHeight(i);\n          }\n\n          mergeMap.set(`${range.start.col},${range.start.row};${range.end.col},${range.end.row}`, {\n            x: 0,\n            y,\n            cellWidth,\n            cellHeight\n          });\n        }\n      }\n    }\n\n    // let cellWidth = 0;\n    // let cellHeight = 0;\n    if (mergeResult) {\n      // 已有Merge单元格，使用空Group占位\n      const cellGroup = new Group({\n        x: 0,\n        y,\n        width: 0,\n        height: 0,\n        visible: false,\n        pickable: false\n      });\n      cellGroup.role = 'shadow-cell';\n      cellGroup.col = col;\n      cellGroup.row = row;\n      cellGroup.mergeCol = range.start.col;\n      cellGroup.mergeRow = range.start.row;\n      columnGroup.addChild(cellGroup);\n      range = table.getCellRange(col, row);\n      y += mergeResult.cellHeight / (range.end.row - range.start.row + 1);\n      maxWidth = Math.max(maxWidth, mergeResult.cellWidth);\n    } else {\n      const cellGroup = createCell(\n        type,\n        define,\n        table,\n        col,\n        row,\n        colWidth,\n        bgColorFunc,\n        customRender,\n        customLayout,\n        cellWidth,\n        cellHeight,\n        columnGroup,\n        y,\n        padding,\n        textAlign,\n        textBaseline,\n        mayHaveIcon,\n        isfunctionalProps,\n        isMerge,\n        range,\n        cellTheme\n      );\n      const height = cellGroup.attribute.height;\n      y += isMerge ? height / (range.end.row - range.start.row + 1) : height;\n    }\n    if (rowLimit && row > rowLimit) {\n      break;\n    }\n  }\n\n  columnGroup.setAttribute('width', colWidth);\n  return {\n    width: colWidth,\n    height: y\n  };\n}\n\n/**\n * 获取列分组主题\n * @param col 列索引\n * @param colWidth 列宽\n * @param table 表格实例\n * @returns 列分组主题\n */\nexport function getColumnGroupTheme(\n  col: number,\n  colWidth: number,\n  table: BaseTableAPI\n): { theme: IThemeSpec & { _vtable: any }; hasFunctionPros: boolean } {\n  const style = table._getCellStyle(col, table.columnHeaderLevelCount); // to be fixed\n  const { theme: columnTheme, hasFunctionPros } = getStyleTheme(\n    style,\n    table,\n    col,\n    table.columnHeaderLevelCount,\n    getRawProp\n  );\n\n  // get column header style\n  columnTheme.group.width = colWidth;\n  columnTheme.group.height = 0;\n  return { theme: columnTheme, hasFunctionPros };\n}\n"]}
+{"version":3,"sources":["scenegraph/group-creater/column-helper.ts"],"names":[],"mappings":"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","file":"column-helper.js","sourcesContent":["/* eslint-disable no-undef */\nimport type { IThemeSpec } from '@visactor/vrender';\nimport type {\n  CellType,\n  FullExtendStyle,\n  ICustomLayout,\n  ICustomRender,\n  MappingRule,\n  TextColumnDefine\n} from '../../ts-types';\nimport { Group } from '../graphic/group';\nimport { getProp, getRawProp } from '../utils/get-prop';\nimport type { MergeMap } from '../scenegraph';\nimport type { PivotHeaderLayoutMap } from '../../layout/pivot-header-layout';\nimport { createCell } from './cell-helper';\nimport type { BaseTableAPI, PivotTableProtected } from '../../ts-types/base-table';\nimport { getStyleTheme } from '../../core/tableHelper';\nimport { isPromise } from '../../tools/helper';\nimport { dealPromiseData } from '../utils/deal-promise-data';\n/**\n * 创建复合列 同一列支持创建不同类型单元格\n * @param columnGroup 列Group\n * @param col\n * @param colWidth 配置列宽\n * @param rowStart\n * @param rowEnd\n * @param mergeMap merge单元格信息\n * @param defaultRowHeight\n * @param table\n * @param cellType\n * @param rowLimit\n * @param customRender\n * @param customLayout\n * @returns\n */\nexport function createComplexColumn(\n  columnGroup: Group,\n  col: number,\n  colWidth: number,\n  rowStart: number,\n  rowEnd: number,\n  mergeMap: MergeMap,\n  defaultRowHeight: number | number[],\n  table: BaseTableAPI,\n  cellType: CellType,\n  rowLimit?: number\n) {\n  let maxWidth = 0;\n  let padding;\n  let textAlign;\n  let textBaseline;\n  let isfunctionalProps = false;\n  /** useColumnTheme 判断是否可以使用columnTheme */\n  const useColumnTheme =\n    ((table.isListTable() && !table.scenegraph.transpose) ||\n      (table.isPivotTable() && (table.internalProps.layoutMap as PivotHeaderLayoutMap).indicatorsAsCol)) &&\n    cellType === 'body';\n\n  if (useColumnTheme) {\n    if (!columnGroup.childrenCount) {\n      // 只在首屏生效\n      const { theme: columnTheme, hasFunctionPros } = getColumnGroupTheme(col, colWidth, table);\n      isfunctionalProps = hasFunctionPros;\n      // get column header style\n      if (columnTheme._vtable.padding) {\n        padding = columnTheme._vtable.padding;\n      }\n      if (columnTheme.text.textAlign) {\n        textAlign = columnTheme.text.textAlign;\n      }\n      if (columnTheme.text.textBaseline) {\n        textBaseline = columnTheme.text.textBaseline;\n      }\n      columnGroup.setTheme(columnTheme);\n    } else if (columnGroup.theme) {\n      const style = table._getCellStyle(col, table.columnHeaderLevelCount); // to be fixed\n      const { hasFunctionPros } = getStyleTheme(style, table, col, table.columnHeaderLevelCount, getRawProp, false);\n      isfunctionalProps = hasFunctionPros;\n      const columnTheme = columnGroup.theme.userTheme as any;\n      // 渐进加载时获取\n      if (columnTheme._vtable.padding) {\n        padding = columnTheme._vtable.padding;\n      }\n      if (columnTheme.text.textAlign) {\n        textAlign = columnTheme.text.textAlign;\n      }\n      if (columnTheme.text.textBaseline) {\n        textBaseline = columnTheme.text.textBaseline;\n      }\n    }\n  }\n  let bgColorFunc: Function;\n  // 判断是否有mapping  遍历dataset中mappingRules\n  if ((table.internalProps as PivotTableProtected)?.dataConfig?.mappingRules && cellType === 'body') {\n    (table.internalProps as PivotTableProtected)?.dataConfig?.mappingRules?.forEach(\n      (mappingRule: MappingRule, i: number) => {\n        if (mappingRule.bgColor) {\n          bgColorFunc = mappingRule.bgColor.mapping;\n        }\n      }\n    );\n  }\n  // insert cell into column group top\n  let y = 0;\n  if (columnGroup.colHeight) {\n    // insert cell into column group bottom\n    y = columnGroup.colHeight;\n  }\n\n  for (let j = rowStart; j <= rowEnd; j++) {\n    const row = j;\n    const define = cellType !== 'body' ? table.getHeaderDefine(col, row) : table.getBodyColumnDefine(col, row);\n    const mayHaveIcon = cellType !== 'body' ? true : !!define?.icon || !!define?.tree;\n    let cellTheme;\n    if (!useColumnTheme) {\n      const headerStyle = table._getCellStyle(col, row);\n      cellTheme = getStyleTheme(headerStyle, table, col, row, getProp).theme;\n      cellTheme.group.width = colWidth;\n      cellTheme.group.height = Array.isArray(defaultRowHeight) ? defaultRowHeight[row] : defaultRowHeight;\n      if (cellTheme._vtable.padding) {\n        padding = cellTheme._vtable.padding;\n      }\n      if (cellTheme.text.textAlign) {\n        textAlign = cellTheme.text.textAlign;\n      }\n      if (cellTheme.text.textBaseline) {\n        textBaseline = cellTheme.text.textBaseline;\n      }\n    }\n    // margin = getProp('margin', headerStyle, col, 0, table)\n\n    let cellGroup;\n    let cellWidth = colWidth;\n    let cellHeight = table.internalProps.autoRowHeight ? 0 : table.getRowHeight(row);\n    const type =\n      (table.isHeader(col, row) ? table._getHeaderLayoutMap(col, row).headerType : table.getBodyColumnType(col, row)) ||\n      'text';\n    // 处理单元格合并\n    let mergeResult;\n    let range;\n    let isMerge;\n    if (cellType !== 'body' || (define as TextColumnDefine)?.mergeCell) {\n      // 只有表头或者column配置合并单元格后再进行信息获取\n      range = table.getCellRange(col, row);\n      isMerge = range.start.col !== range.end.col || range.start.row !== range.end.row;\n      // 所有Merge单元格，只保留左上角一个真实的单元格，其他使用空Group占位\n      if (isMerge) {\n        cellWidth = 0;\n        cellHeight = 0;\n        mergeResult = mergeMap.get(`${range.start.col},${range.start.row};${range.end.col},${range.end.row}`);\n        if (!mergeResult) {\n          for (let col = range.start.col; col <= range.end.col; col++) {\n            cellWidth += table.getColWidth(col);\n          }\n\n          // let cellHeight = 0;\n          for (let i = range.start.row; i <= range.end.row; i++) {\n            cellHeight += table.getRowHeight(i);\n          }\n\n          mergeMap.set(`${range.start.col},${range.start.row};${range.end.col},${range.end.row}`, {\n            x: 0,\n            y,\n            cellWidth,\n            cellHeight\n          });\n        }\n      }\n    }\n\n    // let cellWidth = 0;\n    // let cellHeight = 0;\n    if (mergeResult) {\n      const height = mergeResult.cellHeight / (range.end.row - range.start.row + 1);\n      // 已有Merge单元格，使用空Group占位\n      const cellGroup = new Group({\n        x: 0,\n        y,\n        width: 0,\n        height,\n        visible: false,\n        pickable: false\n      });\n      cellGroup.role = 'shadow-cell';\n      cellGroup.col = col;\n      cellGroup.row = row;\n      cellGroup.mergeCol = range.start.col;\n      cellGroup.mergeRow = range.start.row;\n      columnGroup.addChild(cellGroup);\n      columnGroup.updateColumnRowNumber(row);\n      columnGroup.updateColumnHeight(height);\n      range = table.getCellRange(col, row);\n      y += height;\n      maxWidth = Math.max(maxWidth, mergeResult.cellWidth);\n    } else {\n      // deal with promise data\n      const value = table.getCellValue(col, row);\n      if (isPromise(value)) {\n        dealPromiseData(\n          value,\n          table,\n          createCell.bind(\n            null,\n            type,\n            define,\n            table,\n            col,\n            row,\n            colWidth,\n            bgColorFunc,\n            cellWidth,\n            cellHeight,\n            columnGroup,\n            y,\n            padding,\n            textAlign,\n            textBaseline,\n            mayHaveIcon,\n            isfunctionalProps,\n            isMerge,\n            range,\n            cellTheme\n          )\n        );\n        columnGroup.updateColumnRowNumber(row);\n        // const height = table.getRowHeight(row);\n        const height = isMerge\n          ? table.getRowHeight(row) / (range.end.row - range.start.row + 1)\n          : table.getRowHeight(row);\n        columnGroup.updateColumnHeight(height);\n        y += height;\n      } else {\n        const cellGroup = createCell(\n          type,\n          define,\n          table,\n          col,\n          row,\n          colWidth,\n          bgColorFunc,\n          cellWidth,\n          cellHeight,\n          columnGroup,\n          y,\n          padding,\n          textAlign,\n          textBaseline,\n          mayHaveIcon,\n          isfunctionalProps,\n          isMerge,\n          range,\n          cellTheme\n        );\n        columnGroup.updateColumnRowNumber(row);\n        // const height = cellGroup.attribute.height;\n        const height = isMerge\n          ? cellGroup.attribute.height / (range.end.row - range.start.row + 1)\n          : cellGroup.attribute.height;\n        columnGroup.updateColumnHeight(height);\n        y += height;\n      }\n    }\n    if (rowLimit && row > rowLimit) {\n      break;\n    }\n  }\n\n  columnGroup.setAttribute('width', colWidth);\n  return {\n    width: colWidth,\n    height: y\n  };\n}\n\n/**\n * 获取列分组主题\n * @param col 列索引\n * @param colWidth 列宽\n * @param table 表格实例\n * @returns 列分组主题\n */\nexport function getColumnGroupTheme(\n  col: number,\n  colWidth: number,\n  table: BaseTableAPI\n): { theme: IThemeSpec & { _vtable: any }; hasFunctionPros: boolean } {\n  const style = table._getCellStyle(col, table.columnHeaderLevelCount); // to be fixed\n  const { theme: columnTheme, hasFunctionPros } = getStyleTheme(\n    style,\n    table,\n    col,\n    table.columnHeaderLevelCount,\n    getRawProp\n  );\n\n  // get column header style\n  columnTheme.group.width = colWidth;\n  columnTheme.group.height = 0;\n  return { theme: columnTheme, hasFunctionPros };\n}\n"]}

package/es/scenegraph/group-creater/column.d.ts

@@ -1,12 +1,6 @@
 import type { CellType } from '../../ts-types';
 import type { BaseTableAPI } from '../../ts-types/base-table';
 import { Group } from '../graphic/group';
-export type MergeMap = Map<string, {
-    x: number;
-    y: number;
-    cellWidth: number;
-    cellHeight: number;
-}>;
 export declare function createCornerHeaderColGroup(cornerHeaderGroup: Group, xOrigin: number, yOrigin: number, table: BaseTableAPI): void;
 export declare function createColHeaderColGroup(colHeaderGroup: Group, xOrigin: number, yOrigin: number, table: BaseTableAPI): void;
 export declare function createRowHeaderColGroup(rowHeaderGroup: Group, xOrigin: number, yOrigin: number, table: BaseTableAPI): void;

package/es/scenegraph/group-creater/column.js

@@ -20,7 +20,7 @@ export function createBodyColGroup(bodyGroup, xOrigin, yOrigin, table) {
 
 export function createColGroup(containerGroup, xOrigin, yOrigin, colStart, colEnd, rowStart, rowEnd, cellType, table, rowLimit) {
     if (colStart > colEnd || rowStart > rowEnd) return;
-    const {layoutMap: layoutMap, defaultRowHeight: defaultRowHeight, defaultHeaderRowHeight: defaultHeaderRowHeight, defaultColWidth: defaultColWidth} = table.internalProps, mergeMap = new Map;
+    const {layoutMap: layoutMap, defaultRowHeight: defaultRowHeight, defaultHeaderRowHeight: defaultHeaderRowHeight, defaultColWidth: defaultColWidth} = table.internalProps;
     let x = 0, heightMax = 0;
     for (let i = colStart; i <= colEnd; i++) {
         const col = i, colWidth = table.getColWidth(col), columnGroup = new Group({
@@ -31,17 +31,8 @@ export function createColGroup(containerGroup, xOrigin, yOrigin, colStart, colEn
             clip: !1,
             pickable: !1
         });
-        let customRender, customLayout;
-        if (columnGroup.role = "column", columnGroup.col = i, containerGroup.addChild(columnGroup), 
-        "body" !== cellType) {
-            const define = table.getHeaderDefine(col, rowStart);
-            customRender = null == define ? void 0 : define.headerCustomRender, customLayout = null == define ? void 0 : define.headerCustomLayout;
-        } else {
-            const define = table.getBodyColumnDefine(col, rowStart);
-            customRender = (null == define ? void 0 : define.customRender) || table.customRender, 
-            customLayout = null == define ? void 0 : define.customLayout;
-        }
-        const {width: default2Width, height: default2Height} = createComplexColumn(columnGroup, col, colWidth, rowStart, rowEnd, mergeMap, "columnHeader" === cellType && null != defaultHeaderRowHeight ? defaultHeaderRowHeight : defaultRowHeight, table, cellType, rowLimit, customRender, customLayout);
+        columnGroup.role = "column", columnGroup.col = i, containerGroup.addChild(columnGroup);
+        const {width: default2Width, height: default2Height} = createComplexColumn(columnGroup, col, colWidth, rowStart, rowEnd, table.scenegraph.mergeMap, "columnHeader" === cellType && null != defaultHeaderRowHeight ? defaultHeaderRowHeight : defaultRowHeight, table, cellType, rowLimit);
         x += default2Width, heightMax = Math.max(heightMax, default2Height);
     }
     containerGroup.setAttribute("width", x), containerGroup.setAttribute("height", heightMax);

package/es/scenegraph/group-creater/column.js.map

@@ -1 +1 @@
-{"version":3,"sources":["scenegraph/group-creater/column.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AACzC,OAAO,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AAmBtD,MAAM,UAAU,0BAA0B,CACxC,iBAAwB,EACxB,OAAe,EACf,OAAe,EACf,KAAmB;IAEnB,cAAc,CACZ,iBAAiB,EACjB,OAAO,EACP,OAAO,EACP,CAAC,EACD,KAAK,CAAC,mBAAmB,GAAG,CAAC,EAC7B,CAAC,EACD,KAAK,CAAC,sBAAsB,GAAG,CAAC,EAChC,cAAc,EACd,KAAK,CACN,CAAC;AACJ,CAAC;AAUD,MAAM,UAAU,uBAAuB,CAAC,cAAqB,EAAE,OAAe,EAAE,OAAe,EAAE,KAAmB;IAClH,cAAc,CACZ,cAAc,EACd,OAAO,EACP,OAAO,EACP,KAAK,CAAC,mBAAmB,EACzB,KAAK,CAAC,QAAQ,GAAG,CAAC,EAClB,CAAC,EACD,KAAK,CAAC,sBAAsB,GAAG,CAAC,EAChC,cAAc,EACd,KAAK,CACN,CAAC;AACJ,CAAC;AAUD,MAAM,UAAU,uBAAuB,CAAC,cAAqB,EAAE,OAAe,EAAE,OAAe,EAAE,KAAmB;IAClH,cAAc,CACZ,cAAc,EACd,OAAO,EACP,OAAO,EACP,CAAC,EACD,KAAK,CAAC,mBAAmB,GAAG,CAAC,EAC7B,KAAK,CAAC,sBAAsB,EAC5B,KAAK,CAAC,QAAQ,GAAG,CAAC,EAClB,WAAW,EACX,KAAK,CACN,CAAC;AACJ,CAAC;AAUD,MAAM,UAAU,kBAAkB,CAAC,SAAgB,EAAE,OAAe,EAAE,OAAe,EAAE,KAAmB;IACxG,cAAc,CACZ,SAAS,EACT,OAAO,EACP,OAAO,EACP,KAAK,CAAC,mBAAmB,EACzB,KAAK,CAAC,QAAQ,GAAG,CAAC,EAClB,KAAK,CAAC,sBAAsB,EAC5B,KAAK,CAAC,QAAQ,GAAG,CAAC,EAClB,MAAM,EACN,KAAK,CACN,CAAC;AACJ,CAAC;AAeD,MAAM,UAAU,cAAc,CAC5B,cAAqB,EACrB,OAAe,EACf,OAAe,EACf,QAAgB,EAChB,MAAc,EACd,QAAgB,EAChB,MAAc,EACd,QAAkB,EAClB,KAAmB,EACnB,QAAiB;IAEjB,IAAI,QAAQ,GAAG,MAAM,IAAI,QAAQ,GAAG,MAAM,EAAE;QAC1C,OAAO;KACR;IACD,MAAM,EAAE,SAAS,EAAE,gBAAgB,EAAE,sBAAsB,EAAE,eAAe,EAAE,GAAG,KAAK,CAAC,aAAa,CAAC;IACrG,MAAM,QAAQ,GAAa,IAAI,GAAG,EAAE,CAAC;IACrC,IAAI,CAAC,GAAG,CAAC,CAAC;IACV,IAAI,SAAS,GAAG,CAAC,CAAC;IAClB,KAAK,IAAI,CAAC,GAAG,QAAQ,EAAE,CAAC,IAAI,MAAM,EAAE,CAAC,EAAE,EAAE;QACvC,MAAM,GAAG,GAAG,CAAC,CAAC;QAWd,MAAM,QAAQ,GAAG,KAAK,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;QAExC,MAAM,WAAW,GAAG,IAAI,KAAK,CAAC;YAC5B,CAAC,EAAE,OAAO,GAAG,CAAC;YACd,CAAC,EAAE,OAAO;YACV,KAAK,EAAE,QAAQ;YACf,MAAM,EAAE,CAAC;YACT,IAAI,EAAE,KAAK;YACX,QAAQ,EAAE,KAAK;SAChB,CAAC,CAAC;QACH,WAAW,CAAC,IAAI,GAAG,QAAQ,CAAC;QAC5B,WAAW,CAAC,GAAG,GAAG,CAAC,CAAC;QACpB,cAAc,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;QAErC,IAAI,YAAY,CAAC;QACjB,IAAI,YAAY,CAAC;QAEjB,IAAI,QAAQ,KAAK,MAAM,EAAE;YACvB,MAAM,MAAM,GAAG,KAAK,CAAC,eAAe,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;YACpD,YAAY,GAAG,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,kBAAkB,CAAC;YAC1C,YAAY,GAAG,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,kBAAkB,CAAC;SAC3C;aAAM;YACL,MAAM,MAAM,GAAG,KAAK,CAAC,mBAAmB,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;YACxD,YAAY,GAAG,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,YAAY,KAAI,KAAK,CAAC,YAAY,CAAC;YAC1D,YAAY,GAAG,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,YAAY,CAAC;SACrC;QACD,MAAM,EAAE,KAAK,EAAE,aAAa,EAAE,MAAM,EAAE,cAAc,EAAE,GAAG,mBAAmB,CAC1E,WAAW,EACX,GAAG,EACH,QAAQ,EACR,QAAQ,EACR,MAAM,EACN,QAAQ,EACR,QAAQ,KAAK,cAAc,CAAC,CAAC,CAAC,sBAAsB,aAAtB,sBAAsB,cAAtB,sBAAsB,GAAI,gBAAgB,CAAC,CAAC,CAAC,gBAAgB,EAC3F,KAAK,EACL,QAAQ,EACR,QAAQ,EACR,YAAY,EACZ,YAAY,CACb,CAAC;QACF,CAAC,IAAI,aAAa,CAAC;QACnB,SAAS,GAAG,IAAI,CAAC,GAAG,CAAC,SAAS,EAAE,cAAc,CAAC,CAAC;KACjD;IAED,cAAc,CAAC,YAAY,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;IACxC,cAAc,CAAC,YAAY,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC;AACnD,CAAC","file":"column.js","sourcesContent":["import type { CellType } from '../../ts-types';\nimport type { BaseTableAPI } from '../../ts-types/base-table';\nimport { Group } from '../graphic/group';\nimport { createComplexColumn } from './column-helper';\n\nexport type MergeMap = Map<\n  string,\n  {\n    x: number;\n    y: number;\n    cellWidth: number;\n    cellHeight: number;\n  }\n>;\n/**\n * @description: 处理全部角表头\n * @param {Group} colHeaderGroup 列表头容器Group\n * @param {number} xOrigin x起始坐标\n * @param {number} yOrigin y起始坐标\n * @param {BaseTableAPI} table\n * @return {*}\n */\nexport function createCornerHeaderColGroup(\n  cornerHeaderGroup: Group,\n  xOrigin: number,\n  yOrigin: number,\n  table: BaseTableAPI\n) {\n  createColGroup(\n    cornerHeaderGroup,\n    xOrigin,\n    yOrigin,\n    0, // colStart\n    table.rowHeaderLevelCount - 1, // colEnd\n    0, // rowStart\n    table.columnHeaderLevelCount - 1, // rowEnd\n    'cornerHeader', // CellType\n    table\n  );\n}\n\n/**\n * @description: 处理全部列表头\n * @param {Group} colHeaderGroup 列表头容器Group\n * @param {number} xOrigin x起始坐标\n * @param {number} yOrigin y起始坐标\n * @param {BaseTableAPI} table\n * @return {*}\n */\nexport function createColHeaderColGroup(colHeaderGroup: Group, xOrigin: number, yOrigin: number, table: BaseTableAPI) {\n  createColGroup(\n    colHeaderGroup,\n    xOrigin,\n    yOrigin,\n    table.rowHeaderLevelCount, // colStart\n    table.colCount - 1, // colEnd\n    0, // rowStart\n    table.columnHeaderLevelCount - 1, // rowEnd\n    'columnHeader', // isHeader\n    table\n  );\n}\n\n/**\n * @description: 处理全部行表头\n * @param {Group} rowHeaderGroup 行表头容器Group\n * @param {number} xOrigin x起始坐标\n * @param {number} yOrigin y起始坐标\n * @param {BaseTableAPI} table\n * @return {*}\n */\nexport function createRowHeaderColGroup(rowHeaderGroup: Group, xOrigin: number, yOrigin: number, table: BaseTableAPI) {\n  createColGroup(\n    rowHeaderGroup,\n    xOrigin,\n    yOrigin,\n    0, // colStart\n    table.rowHeaderLevelCount - 1, // colEnd\n    table.columnHeaderLevelCount, // rowStart\n    table.rowCount - 1, // rowEnd\n    'rowHeader', // isHeader\n    table\n  );\n}\n\n/**\n * @description: 处理内容单元格\n * @param {Group} bodyGroup 内容容器Group\n * @param {number} xOrigin x起始坐标\n * @param {number} yOrigin y起始坐标\n * @param {BaseTableAPI} table\n * @return {*}\n */\nexport function createBodyColGroup(bodyGroup: Group, xOrigin: number, yOrigin: number, table: BaseTableAPI) {\n  createColGroup(\n    bodyGroup,\n    xOrigin,\n    yOrigin,\n    table.rowHeaderLevelCount, // colStart\n    table.colCount - 1, // colEnd\n    table.columnHeaderLevelCount, // rowStart\n    table.rowCount - 1, // rowEnd\n    'body', // isHeader\n    table\n  );\n}\n\n/**\n * @description: 生成一个列的场景节点\n * @param {Group} containerGroup 列容器Group\n * @param {number} xOrigin x起始坐标\n * @param {number} yOrigin y起始坐标\n * @param {number} colStart 起始col\n * @param {number} colEnd 结束col\n * @param {number} rowStart 起始row\n * @param {number} rowEnd 结束row\n * @param {boolean} isHeader 是否是表头\n * @param {BaseTableAPI} table\n * @return {*}\n */\nexport function createColGroup(\n  containerGroup: Group,\n  xOrigin: number,\n  yOrigin: number,\n  colStart: number,\n  colEnd: number,\n  rowStart: number,\n  rowEnd: number,\n  cellType: CellType,\n  table: BaseTableAPI,\n  rowLimit?: number\n) {\n  if (colStart > colEnd || rowStart > rowEnd) {\n    return;\n  }\n  const { layoutMap, defaultRowHeight, defaultHeaderRowHeight, defaultColWidth } = table.internalProps;\n  const mergeMap: MergeMap = new Map();\n  let x = 0;\n  let heightMax = 0;\n  for (let i = colStart; i <= colEnd; i++) {\n    const col = i;\n\n    // 宽度模式\n    // const { width: defineWidth } = layoutMap.columnWidths?.[col] || { width: defaultColWidth };\n    // const width = table.getColWidth(col);\n    // const colWidth: number | 'auto' =\n    //   defineWidth === 'auto' ||\n    //   table.scenegraph.transpose ||\n    //   (table.widthMode === 'autoWidth' && !defineWidth)\n    //     ? 'auto'\n    //     : width;\n    const colWidth = table.getColWidth(col);\n\n    const columnGroup = new Group({\n      x: xOrigin + x,\n      y: yOrigin,\n      width: colWidth,\n      height: 0,\n      clip: false,\n      pickable: false\n    });\n    columnGroup.role = 'column';\n    columnGroup.col = i;\n    containerGroup.addChild(columnGroup);\n\n    let customRender;\n    let customLayout;\n\n    if (cellType !== 'body') {\n      const define = table.getHeaderDefine(col, rowStart);\n      customRender = define?.headerCustomRender;\n      customLayout = define?.headerCustomLayout;\n    } else {\n      const define = table.getBodyColumnDefine(col, rowStart);\n      customRender = define?.customRender || table.customRender;\n      customLayout = define?.customLayout;\n    }\n    const { width: default2Width, height: default2Height } = createComplexColumn(\n      columnGroup,\n      col,\n      colWidth,\n      rowStart,\n      rowEnd,\n      mergeMap,\n      cellType === 'columnHeader' ? defaultHeaderRowHeight ?? defaultRowHeight : defaultRowHeight,\n      table,\n      cellType,\n      rowLimit,\n      customRender,\n      customLayout\n    );\n    x += default2Width;\n    heightMax = Math.max(heightMax, default2Height);\n  }\n  // 更新containerGroup尺寸\n  containerGroup.setAttribute('width', x);\n  containerGroup.setAttribute('height', heightMax);\n}\n"]}
+{"version":3,"sources":["scenegraph/group-creater/column.ts"],"names":[],"mappings":"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","file":"column.js","sourcesContent":["import type { CellType } from '../../ts-types';\nimport type { BaseTableAPI } from '../../ts-types/base-table';\nimport { Group } from '../graphic/group';\nimport { createComplexColumn } from './column-helper';\n\n/**\n * @description: 处理全部角表头\n * @param {Group} colHeaderGroup 列表头容器Group\n * @param {number} xOrigin x起始坐标\n * @param {number} yOrigin y起始坐标\n * @param {BaseTableAPI} table\n * @return {*}\n */\nexport function createCornerHeaderColGroup(\n  cornerHeaderGroup: Group,\n  xOrigin: number,\n  yOrigin: number,\n  table: BaseTableAPI\n) {\n  createColGroup(\n    cornerHeaderGroup,\n    xOrigin,\n    yOrigin,\n    0, // colStart\n    table.rowHeaderLevelCount - 1, // colEnd\n    0, // rowStart\n    table.columnHeaderLevelCount - 1, // rowEnd\n    'cornerHeader', // CellType\n    table\n  );\n}\n\n/**\n * @description: 处理全部列表头\n * @param {Group} colHeaderGroup 列表头容器Group\n * @param {number} xOrigin x起始坐标\n * @param {number} yOrigin y起始坐标\n * @param {BaseTableAPI} table\n * @return {*}\n */\nexport function createColHeaderColGroup(colHeaderGroup: Group, xOrigin: number, yOrigin: number, table: BaseTableAPI) {\n  createColGroup(\n    colHeaderGroup,\n    xOrigin,\n    yOrigin,\n    table.rowHeaderLevelCount, // colStart\n    table.colCount - 1, // colEnd\n    0, // rowStart\n    table.columnHeaderLevelCount - 1, // rowEnd\n    'columnHeader', // isHeader\n    table\n  );\n}\n\n/**\n * @description: 处理全部行表头\n * @param {Group} rowHeaderGroup 行表头容器Group\n * @param {number} xOrigin x起始坐标\n * @param {number} yOrigin y起始坐标\n * @param {BaseTableAPI} table\n * @return {*}\n */\nexport function createRowHeaderColGroup(rowHeaderGroup: Group, xOrigin: number, yOrigin: number, table: BaseTableAPI) {\n  createColGroup(\n    rowHeaderGroup,\n    xOrigin,\n    yOrigin,\n    0, // colStart\n    table.rowHeaderLevelCount - 1, // colEnd\n    table.columnHeaderLevelCount, // rowStart\n    table.rowCount - 1, // rowEnd\n    'rowHeader', // isHeader\n    table\n  );\n}\n\n/**\n * @description: 处理内容单元格\n * @param {Group} bodyGroup 内容容器Group\n * @param {number} xOrigin x起始坐标\n * @param {number} yOrigin y起始坐标\n * @param {BaseTableAPI} table\n * @return {*}\n */\nexport function createBodyColGroup(bodyGroup: Group, xOrigin: number, yOrigin: number, table: BaseTableAPI) {\n  createColGroup(\n    bodyGroup,\n    xOrigin,\n    yOrigin,\n    table.rowHeaderLevelCount, // colStart\n    table.colCount - 1, // colEnd\n    table.columnHeaderLevelCount, // rowStart\n    table.rowCount - 1, // rowEnd\n    'body', // isHeader\n    table\n  );\n}\n\n/**\n * @description: 生成一个列的场景节点\n * @param {Group} containerGroup 列容器Group\n * @param {number} xOrigin x起始坐标\n * @param {number} yOrigin y起始坐标\n * @param {number} colStart 起始col\n * @param {number} colEnd 结束col\n * @param {number} rowStart 起始row\n * @param {number} rowEnd 结束row\n * @param {boolean} isHeader 是否是表头\n * @param {BaseTableAPI} table\n * @return {*}\n */\nexport function createColGroup(\n  containerGroup: Group,\n  xOrigin: number,\n  yOrigin: number,\n  colStart: number,\n  colEnd: number,\n  rowStart: number,\n  rowEnd: number,\n  cellType: CellType,\n  table: BaseTableAPI,\n  rowLimit?: number\n) {\n  if (colStart > colEnd || rowStart > rowEnd) {\n    return;\n  }\n  const { layoutMap, defaultRowHeight, defaultHeaderRowHeight, defaultColWidth } = table.internalProps;\n  let x = 0;\n  let heightMax = 0;\n  for (let i = colStart; i <= colEnd; i++) {\n    const col = i;\n\n    // 宽度模式\n    // const { width: defineWidth } = layoutMap.columnWidths?.[col] || { width: defaultColWidth };\n    // const width = table.getColWidth(col);\n    // const colWidth: number | 'auto' =\n    //   defineWidth === 'auto' ||\n    //   table.scenegraph.transpose ||\n    //   (table.widthMode === 'autoWidth' && !defineWidth)\n    //     ? 'auto'\n    //     : width;\n    const colWidth = table.getColWidth(col);\n\n    const columnGroup = new Group({\n      x: xOrigin + x,\n      y: yOrigin,\n      width: colWidth,\n      height: 0,\n      clip: false,\n      pickable: false\n    });\n    columnGroup.role = 'column';\n    columnGroup.col = i;\n    containerGroup.addChild(columnGroup);\n    const { width: default2Width, height: default2Height } = createComplexColumn(\n      columnGroup,\n      col,\n      colWidth,\n      rowStart,\n      rowEnd,\n      table.scenegraph.mergeMap,\n      cellType === 'columnHeader' ? defaultHeaderRowHeight ?? defaultRowHeight : defaultRowHeight,\n      table,\n      cellType,\n      rowLimit\n    );\n    x += default2Width;\n    heightMax = Math.max(heightMax, default2Height);\n  }\n  // 更新containerGroup尺寸\n  containerGroup.setAttribute('width', x);\n  containerGroup.setAttribute('height', heightMax);\n}\n"]}

package/es/scenegraph/group-creater/progress/proxy.d.ts

@@ -1,9 +1,7 @@
 import type { BaseTableAPI } from '../../../ts-types/base-table';
 import type { Group } from '../../graphic/group';
-import type { Scenegraph } from '../../scenegraph';
 export declare class SceneProxy {
     table: BaseTableAPI;
-    scenegraph: Scenegraph;
     currentRow: number;
     totalRow: number;
     rowLimit: number;