@visactor/vtable 0.9.2 → 0.9.3-alpha.1

package/cjs/scenegraph/graphic/contributions/group-contribution-render.js

@@ -17,7 +17,7 @@ let SplitGroupBeforeRenderContribution = class {
         this.time = vrender_1.BaseRenderContributionTime.beforeFillStroke, this.useStyle = !0, 
         this.order = 0;
     }
-    drawShape(group, context, x, y, doFill, doStroke, fVisible, sVisible, groupAttribute, fillCb, strokeCb, doFillOrStroke) {
+    drawShape(group, context, x, y, doFill, doStroke, fVisible, sVisible, groupAttribute, drawContext, fillCb, strokeCb, doFillOrStroke) {
         const {stroke: stroke = groupAttribute.stroke, strokeArrayWidth: strokeArrayWidth = groupAttribute.strokeArrayWidth, strokeArrayColor: strokeArrayColor = groupAttribute.strokeArrayColor} = group.attribute;
         stroke && (Array.isArray(strokeArrayWidth) || Array.isArray(strokeArrayColor)) && (doFillOrStroke.doStroke = !1);
     }
@@ -31,10 +31,18 @@ let SplitGroupAfterRenderContribution = class {
         this.time = vrender_1.BaseRenderContributionTime.afterFillStroke, this.useStyle = !0, 
         this.order = 0;
     }
-    drawShape(group, context, x, y, doFill, doStroke, fVisible, sVisible, groupAttribute, fillCb, strokeCb) {
+    drawShape(group, context, x, y, doFill, doStroke, fVisible, sVisible, groupAttribute, drawContext, fillCb, strokeCb) {
         const {width: width = groupAttribute.width, height: height = groupAttribute.height, stroke: stroke = groupAttribute.stroke, strokeArrayColor: strokeArrayColor = groupAttribute.strokeArrayColor, strokeArrayWidth: strokeArrayWidth = groupAttribute.strokeArrayWidth, lineWidth: lineWidth = groupAttribute.lineWidth, strokeColor: strokeColor = groupAttribute.stroke} = group.attribute;
-        stroke && (Array.isArray(strokeArrayWidth) || 0 !== lineWidth) && (Array.isArray(strokeArrayColor) || Array.isArray(strokeArrayWidth)) && (("number" == typeof lineWidth && 1 & lineWidth || Array.isArray(strokeArrayWidth) && strokeArrayWidth.some((width => 1 & width))) && (x = Math.floor(x) + .5, 
-        y = Math.floor(y) + .5), renderStroke(group, context, x, y, groupAttribute, stroke, strokeArrayWidth || lineWidth, strokeArrayColor || strokeColor, Math.ceil(width), Math.ceil(height)));
+        if (!stroke || !Array.isArray(strokeArrayWidth) && 0 === lineWidth) return;
+        let widthForStroke, heightForStroke;
+        if (Array.isArray(strokeArrayColor) || Array.isArray(strokeArrayWidth)) {
+            if ("number" == typeof lineWidth && 1 & lineWidth || Array.isArray(strokeArrayWidth) && strokeArrayWidth.some((width => 1 & width))) {
+                x = Math.floor(x) + .5, y = Math.floor(y) + .5;
+                const {width: widthFroDraw, height: heightFroDraw} = getCellSizeForDraw(group, Math.ceil(width), Math.ceil(height));
+                widthForStroke = widthFroDraw, heightForStroke = heightFroDraw;
+            } else widthForStroke = Math.ceil(width), heightForStroke = Math.ceil(height);
+            renderStroke(group, context, x, y, groupAttribute, stroke, strokeArrayWidth || lineWidth, strokeArrayColor || strokeColor, widthForStroke, heightForStroke);
+        }
     }
 };
 
@@ -96,7 +104,7 @@ let DashGroupBeforeRenderContribution = class {
         this.time = vrender_1.BaseRenderContributionTime.beforeFillStroke, this.useStyle = !0, 
         this.order = 0;
     }
-    drawShape(group, context, x, y, doFill, doStroke, fVisible, sVisible, groupAttribute, fillCb, strokeCb, doFillOrStroke) {
+    drawShape(group, context, x, y, doFill, doStroke, fVisible, sVisible, groupAttribute, drawContext, fillCb, strokeCb, doFillOrStroke) {
         const {lineDash: lineDash = groupAttribute.lineDash, stroke: stroke = groupAttribute.stroke, strokeArrayColor: strokeArrayColor = groupAttribute.strokeArrayColor, strokeArrayWidth: strokeArrayWidth = groupAttribute.strokeArrayWidth} = group.attribute;
         stroke && Array.isArray(lineDash) && lineDash.length && !Array.isArray(strokeArrayColor) && !Array.isArray(strokeArrayWidth) && (doFillOrStroke.doStroke = !1);
     }
@@ -110,19 +118,23 @@ let DashGroupAfterRenderContribution = class {
         this.time = vrender_1.BaseRenderContributionTime.afterFillStroke, this.useStyle = !0, 
         this.order = 0;
     }
-    drawShape(group, context, x, y, doFill, doStroke, fVisible, sVisible, groupAttribute, fillCb, strokeCb) {
+    drawShape(group, context, x, y, doFill, doStroke, fVisible, sVisible, groupAttribute, drawContext, fillCb, strokeCb) {
         const {lineDash: lineDash = groupAttribute.lineDash, stroke: stroke = groupAttribute.stroke, strokeArrayColor: strokeArrayColor = groupAttribute.strokeArrayColor, strokeArrayWidth: strokeArrayWidth = groupAttribute.strokeArrayWidth, lineWidth: lineWidth = groupAttribute.lineWidth} = group.attribute;
         if (!stroke || !Array.isArray(lineDash) || !lineDash.length || Array.isArray(strokeArrayColor) || Array.isArray(strokeArrayWidth)) return;
-        let {width: width = groupAttribute.width, height: height = groupAttribute.height} = group.attribute;
-        width = Math.ceil(width), height = Math.ceil(height), 1 & lineWidth && (x = Math.floor(x) + .5, 
-        y = Math.floor(y) + .5), context.setStrokeStyle(group, group.attribute, x, y, groupAttribute), 
-        context.beginPath(), context.moveTo(x, y), context.lineTo(x + width, y), context.lineDashOffset = context.currentMatrix.e / context.currentMatrix.a, 
-        context.stroke(), context.beginPath(), context.moveTo(x + width, y), context.lineTo(x + width, y + height), 
+        let widthForStroke, heightForStroke, {width: width = groupAttribute.width, height: height = groupAttribute.height} = group.attribute;
+        if (width = Math.ceil(width), height = Math.ceil(height), 1 & lineWidth) {
+            x = Math.floor(x) + .5, y = Math.floor(y) + .5;
+            const {width: widthFroDraw, height: heightFroDraw} = getCellSizeForDraw(group, Math.ceil(width), Math.ceil(height));
+            widthForStroke = widthFroDraw, heightForStroke = heightFroDraw;
+        } else widthForStroke = Math.ceil(width), heightForStroke = Math.ceil(height);
+        context.setStrokeStyle(group, group.attribute, x, y, groupAttribute), context.beginPath(), 
+        context.moveTo(x, y), context.lineTo(x + widthForStroke, y), context.lineDashOffset = context.currentMatrix.e / context.currentMatrix.a, 
+        context.stroke(), context.beginPath(), context.moveTo(x + widthForStroke, y), context.lineTo(x + widthForStroke, y + heightForStroke), 
         context.lineDashOffset = context.currentMatrix.f / context.currentMatrix.d, context.stroke(), 
-        context.beginPath(), context.moveTo(x, y + height), context.lineTo(x + width, y + height), 
+        context.beginPath(), context.moveTo(x, y + heightForStroke), context.lineTo(x + widthForStroke, y + heightForStroke), 
         context.lineDashOffset = context.currentMatrix.e / context.currentMatrix.a, context.stroke(), 
-        context.beginPath(), context.moveTo(x, y), context.lineTo(x, y + height), context.lineDashOffset = context.currentMatrix.f / context.currentMatrix.d, 
-        context.stroke();
+        context.beginPath(), context.moveTo(x, y), context.lineTo(x, y + heightForStroke), 
+        context.lineDashOffset = context.currentMatrix.f / context.currentMatrix.d, context.stroke();
     }
 };
 
@@ -134,7 +146,7 @@ let AdjustPosGroupBeforeRenderContribution = class {
         this.time = vrender_1.BaseRenderContributionTime.beforeFillStroke, this.useStyle = !0, 
         this.order = 0;
     }
-    drawShape(group, context, x, y, doFill, doStroke, fVisible, sVisible, groupAttribute, fillCb, strokeCb, doFillOrStroke) {
+    drawShape(group, context, x, y, doFill, doStroke, fVisible, sVisible, groupAttribute, drawContext, fillCb, strokeCb, doFillOrStroke) {
         const {lineWidth: lineWidth = groupAttribute.lineWidth, stroke: stroke = groupAttribute.stroke, lineDash: lineDash = groupAttribute.lineDash, strokeArrayWidth: strokeArrayWidth = groupAttribute.strokeArrayWidth, strokeArrayColor: strokeArrayColor = groupAttribute.strokeArrayColor} = group.attribute;
         stroke && Array.isArray(lineDash) && !lineDash.length && !Array.isArray(strokeArrayColor) && !Array.isArray(strokeArrayWidth) && 1 & lineWidth && (doFillOrStroke.doStroke = !1);
     }
@@ -148,18 +160,11 @@ let AdjustPosGroupAfterRenderContribution = class {
         this.time = vrender_1.BaseRenderContributionTime.afterFillStroke, this.useStyle = !0, 
         this.order = 0;
     }
-    drawShape(group, context, x, y, doFill, doStroke, fVisible, sVisible, groupAttribute, fillCb, strokeCb) {
-        const {lineWidth: lineWidth = groupAttribute.lineWidth, stroke: stroke = groupAttribute.stroke, lineDash: lineDash = groupAttribute.lineDash, strokeArrayWidth: strokeArrayWidth = groupAttribute.strokeArrayWidth, strokeArrayColor: strokeArrayColor = groupAttribute.strokeArrayColor} = group.attribute;
-        let {width: width = groupAttribute.width, height: height = groupAttribute.height} = group.attribute;
-        if (width = Math.ceil(width), height = Math.ceil(height), stroke && Array.isArray(lineDash) && !lineDash.length && !Array.isArray(strokeArrayColor) && !Array.isArray(strokeArrayWidth) && 1 & lineWidth) {
-            if ("cell" === group.role) {
-                const table = group.stage.table;
-                let col = group.col, row = group.row;
-                const mergeInfo = (0, get_cell_merge_1.getCellMergeInfo)(table, col, row);
-                mergeInfo && (col = mergeInfo.end.col, row = mergeInfo.end.row), (table && col === table.colCount - 1 || table && col === table.frozenColCount - 1 && table.scrollLeft) && (width -= 1), 
-                (table && row === table.rowCount - 1 || table && row === table.frozenRowCount - 1 && table.scrollTop) && (height -= 1);
-            }
-            context.beginPath(), x = Math.floor(x) + .5, y = Math.floor(y) + .5, context.rect(x, y, width, height), 
+    drawShape(group, context, x, y, doFill, doStroke, fVisible, sVisible, groupAttribute, drawContext, fillCb, strokeCb) {
+        const {lineWidth: lineWidth = groupAttribute.lineWidth, stroke: stroke = groupAttribute.stroke, lineDash: lineDash = groupAttribute.lineDash, strokeArrayWidth: strokeArrayWidth = groupAttribute.strokeArrayWidth, strokeArrayColor: strokeArrayColor = groupAttribute.strokeArrayColor} = group.attribute, {width: width = groupAttribute.width, height: height = groupAttribute.height} = group.attribute;
+        if (stroke && Array.isArray(lineDash) && !lineDash.length && !Array.isArray(strokeArrayColor) && !Array.isArray(strokeArrayWidth) && 1 & lineWidth) {
+            const {width: widthFroDraw, height: heightFroDraw} = getCellSizeForDraw(group, Math.ceil(width), Math.ceil(height));
+            context.beginPath(), x = Math.floor(x) + .5, y = Math.floor(y) + .5, context.rect(x, y, widthFroDraw, heightFroDraw), 
             context.setStrokeStyle(group, group.attribute, x, y, groupAttribute), context.stroke();
         }
     }
@@ -173,7 +178,7 @@ let AdjustColorGroupBeforeRenderContribution = class {
         this.time = vrender_1.BaseRenderContributionTime.beforeFillStroke, this.useStyle = !0, 
         this.order = 0;
     }
-    drawShape(group, context, x, y, doFill, doStroke, fVisible, sVisible, groupAttribute, fillCb, strokeCb, doFillOrStroke) {
+    drawShape(group, context, x, y, doFill, doStroke, fVisible, sVisible, groupAttribute, drawContext, fillCb, strokeCb, doFillOrStroke) {
         if ("cell" === group.role) {
             const table = group.stage.table, hoverColor = (0, is_cell_hover_1.getCellHoverColor)(group, table);
             hoverColor && (group.oldColor = group.attribute.fill, group.attribute.fill = hoverColor);
@@ -189,11 +194,25 @@ let AdjustColorGroupAfterRenderContribution = class {
         this.time = vrender_1.BaseRenderContributionTime.afterFillStroke, this.useStyle = !0, 
         this.order = 0;
     }
-    drawShape(group, context, x, y, doFill, doStroke, fVisible, sVisible, groupAttribute, fillCb, strokeCb) {
+    drawShape(group, context, x, y, doFill, doStroke, fVisible, sVisible, groupAttribute, drawContext, fillCb, strokeCb) {
         "oldColor" in group && (group.attribute.fill = group.oldColor, delete group.oldColor);
     }
 };
 
+function getCellSizeForDraw(group, width, height) {
+    const table = group.stage.table;
+    if ("cell" === group.role) {
+        let col = group.col, row = group.row;
+        const mergeInfo = (0, get_cell_merge_1.getCellMergeInfo)(table, col, row);
+        mergeInfo && (col = mergeInfo.end.col, row = mergeInfo.end.row), (table && col === table.colCount - 1 || table && col === table.frozenColCount - 1 && table.scrollLeft) && (width -= 1), 
+        (table && row === table.rowCount - 1 || table && row === table.frozenRowCount - 1 && table.scrollTop) && (height -= 1);
+    } else "corner-frozen" === group.role && (table.scrollLeft && (width -= 1), table.scrollTop && (height -= 1));
+    return {
+        width: width,
+        height: height
+    };
+}
+
 AdjustColorGroupAfterRenderContribution = __decorate([ (0, inversify_1.injectable)() ], AdjustColorGroupAfterRenderContribution), 
 exports.AdjustColorGroupAfterRenderContribution = AdjustColorGroupAfterRenderContribution;
 //# sourceMappingURL=group-contribution-render.js.map

package/cjs/scenegraph/graphic/contributions/group-contribution-render.js.map

@@ -1 +1 @@
-{"version":3,"sources":["scenegraph/graphic/contributions/group-contribution-render.ts"],"names":[],"mappings":"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","file":"group-contribution-render.js","sourcesContent":["import { injectable } from 'inversify';\nimport type {\n  IGroup,\n  IContext2d,\n  IGroupGraphicAttribute,\n  IMarkAttribute,\n  IGraphicAttribute,\n  IThemeAttribute,\n  IGroupRenderContribution\n} from '@visactor/vrender';\nimport { BaseRenderContributionTime } from '@visactor/vrender';\nimport type { Group } from '../group';\nimport { getCellHoverColor } from '../../../state/hover/is-cell-hover';\nimport type { BaseTableAPI } from '../../../ts-types/base-table';\nimport { getQuadProps } from '../../utils/padding';\nimport { getCellMergeInfo } from '../../utils/get-cell-merge';\n\n// const highlightDash: number[] = [];\n\n// SplitGroupContribution处理分段渲染stroke\n// stroke/strokeArrayWidth/strokeArrayColor 为数组时调用\n@injectable()\nexport class SplitGroupBeforeRenderContribution implements IGroupRenderContribution {\n  time: BaseRenderContributionTime = BaseRenderContributionTime.beforeFillStroke;\n  useStyle = true;\n  order = 0;\n  drawShape(\n    group: IGroup,\n    context: IContext2d,\n    x: number,\n    y: number,\n    doFill: boolean,\n    doStroke: boolean,\n    fVisible: boolean,\n    sVisible: boolean,\n    groupAttribute: Required<IGroupGraphicAttribute>,\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    doFillOrStroke?: { doFill: boolean; doStroke: boolean }\n  ) {\n    const {\n      stroke = groupAttribute.stroke,\n      strokeArrayWidth = (groupAttribute as any).strokeArrayWidth,\n      strokeArrayColor = (groupAttribute as any).strokeArrayColor\n      // highlightStroke = (groupAttribute as any).highlightStroke,\n      // highlightStrokeArrayWidth = (groupAttribute as any).highlightStrokeArrayWidth,\n      // width = groupAttribute.width,\n      // height = groupAttribute.height,\n    } = group.attribute as any;\n\n    if (stroke && (Array.isArray(strokeArrayWidth) || Array.isArray(strokeArrayColor))) {\n      doFillOrStroke.doStroke = false;\n    }\n\n    // if (highlightStroke) {\n    //   // 依据highlightStroke信息调整clip范围，以实现在单个单元格显示highlight border\n    //   let xDist = x;\n    //   let yDist = y;\n    //   let widthDist = width;\n    //   let heightDist = height;\n    //   if (highlightStroke[0] && highlightStrokeArrayWidth[0]) {\n    //     // top\n    //     yDist -= highlightStrokeArrayWidth[0] / 2;\n    //     heightDist += highlightStrokeArrayWidth[0] / 2;\n    //   }\n    //   if (highlightStroke[1] && highlightStrokeArrayWidth[1]) {\n    //     // right\n    //     widthDist += highlightStrokeArrayWidth[1] / 2;\n    //   }\n    //   if (highlightStroke[2] && highlightStrokeArrayWidth[2]) {\n    //     // bottom\n    //     heightDist += highlightStrokeArrayWidth[2] / 2;\n    //   }\n    //   if (highlightStroke[3] && highlightStrokeArrayWidth[3]) {\n    //     // left\n    //     xDist -= highlightStrokeArrayWidth[3] / 2;\n    //     widthDist += highlightStrokeArrayWidth[3] / 2;\n    //   }\n\n    //   context.beginPath();\n    //   context.rect(xDist, yDist, widthDist, heightDist);\n    // }\n  }\n}\n@injectable()\nexport class SplitGroupAfterRenderContribution implements IGroupRenderContribution {\n  time: BaseRenderContributionTime = BaseRenderContributionTime.afterFillStroke;\n  useStyle = true;\n  order = 0;\n  drawShape(\n    group: IGroup,\n    context: IContext2d,\n    x: number,\n    y: number,\n    doFill: boolean,\n    doStroke: boolean,\n    fVisible: boolean,\n    sVisible: boolean,\n    groupAttribute: Required<IGroupGraphicAttribute>,\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 {\n      width = groupAttribute.width,\n      height = groupAttribute.height,\n      // 基础border\n      stroke = groupAttribute.stroke,\n      strokeArrayColor = (groupAttribute as any).strokeArrayColor,\n      strokeArrayWidth = (groupAttribute as any).strokeArrayWidth,\n\n      lineWidth = groupAttribute.lineWidth,\n      strokeColor = groupAttribute.stroke\n      // // select & hover border\n      // highlightStroke = (groupAttribute as any).highlightStroke,\n      // highlightStrokeArrayColor = (groupAttribute as any).highlightStrokeArrayColor,\n      // highlightStrokeArrayWidth = (groupAttribute as any).highlightStrokeArrayWidth,\n      // highlightStrokeArrayPart = (groupAttribute as any).highlightStrokeArrayPart,\n    } = group.attribute as any;\n\n    // lineWidth === 0 不绘制\n    if (!stroke || (!Array.isArray(strokeArrayWidth) && lineWidth === 0)) {\n      return;\n    }\n\n    if (Array.isArray(strokeArrayColor) || Array.isArray(strokeArrayWidth)) {\n      if (\n        (typeof lineWidth === 'number' && lineWidth & 1) ||\n        (Array.isArray(strokeArrayWidth) && strokeArrayWidth.some(width => width & 1))\n      ) {\n        x = Math.floor(x) + 0.5;\n        y = Math.floor(y) + 0.5;\n      }\n      renderStroke(\n        group,\n        context,\n        x,\n        y,\n        groupAttribute,\n        stroke,\n        strokeArrayWidth || lineWidth,\n        strokeArrayColor || strokeColor,\n        Math.ceil(width),\n        Math.ceil(height)\n      );\n    }\n  }\n}\n\n/**\n * @description: 判断线宽是否需要分别渲染（线宽不同）\n * @param {number} widthArray\n * @return {*}\n */\nexport function getWidthInfo(widthArray: number[] | number) {\n  if (!Array.isArray(widthArray)) {\n    return {\n      isSplitDraw: false,\n      width: widthArray\n    };\n  }\n\n  let temp;\n  for (let i = 0; i < widthArray.length; i++) {\n    const width = widthArray[i];\n    if (width) {\n      if (!temp) {\n        temp = width;\n      } else if (width !== temp) {\n        return {\n          isSplitDraw: true\n        };\n      }\n    }\n  }\n\n  return {\n    isSplitDraw: false,\n    width: temp\n  };\n}\n\nexport function renderStroke(\n  group: IGroup,\n  context: IContext2d,\n  x: number,\n  y: number,\n  groupAttribute: Required<IGroupGraphicAttribute>,\n  stroke: boolean | [boolean, boolean, boolean, boolean],\n  strokeArrayWidth: [number, number, number, number] | undefined,\n  strokeArrayColor: [string, string, string, string] | undefined,\n  width: number,\n  height: number,\n  isHighlight?: boolean,\n  part?: ([number, number] | undefined)[]\n) {\n  const widthInfo = getWidthInfo(strokeArrayWidth);\n  const isWidthNumber = !Array.isArray(strokeArrayWidth);\n  const isStrokeTrue = !Array.isArray(stroke);\n  // 渲染部分线段，part: [[0, 0.5], undifined, undifined, undifined]\n  // 同样上右下左，范围0-1，[0, 0.5]即只渲染前一半\n  const isPart = Array.isArray(part);\n  const isSplitDraw = Array.isArray(strokeArrayColor) || widthInfo.isSplitDraw;\n\n  context.setStrokeStyle(group, group.attribute, x, y, groupAttribute);\n  // if (isHighlight) {\n  //   context.setLineDash(highlightDash);\n  //   context.lineCap = 'square';\n  // }\n  const lineDash = context.getLineDash();\n  let isDash = false;\n  if (lineDash.length) {\n    isDash = true;\n  }\n  // 单独处理每条边界，目前不考虑圆角\n  context.beginPath();\n  context.moveTo(x, y);\n\n  // top\n  if ((isStrokeTrue || stroke[0]) && (isWidthNumber || strokeArrayWidth[0])) {\n    // context.lineTo(x + width, y);\n    if (isPart && Array.isArray(part[0])) {\n      context.moveTo(x + width * part[0][0], y);\n      context.lineTo(x + width * (part[0][1] - part[0][0]), y);\n      context.moveTo(x + width, y);\n    } else {\n      context.moveTo(x, y);\n      context.lineTo(x + width, y);\n    }\n    if ((isSplitDraw || isDash) && (!strokeArrayColor || strokeArrayColor[0])) {\n      if (strokeArrayColor) {\n        context.strokeStyle = strokeArrayColor[0];\n      }\n      if (!isWidthNumber) {\n        context.lineWidth = strokeArrayWidth[0];\n      }\n      context.lineDashOffset = context.currentMatrix.e / context.currentMatrix.a;\n      context.stroke();\n      context.beginPath();\n      context.moveTo(x + width, y);\n    }\n  } else {\n    context.moveTo(x + width, y);\n  }\n  // right\n  if ((isStrokeTrue || stroke[1]) && (isWidthNumber || strokeArrayWidth[1])) {\n    // context.lineTo(x + width, y + height);\n    if (isPart && Array.isArray(part[1])) {\n      context.moveTo(x + width, y + height * part[1][0]);\n      context.lineTo(x + width, y + height * (part[1][1] - part[1][0]));\n      context.moveTo(x + width, y + height);\n    } else {\n      context.moveTo(x + width, y);\n      context.lineTo(x + width, y + height);\n    }\n    if ((isSplitDraw || isDash) && (!strokeArrayColor || strokeArrayColor[1])) {\n      if (strokeArrayColor) {\n        context.strokeStyle = strokeArrayColor[1];\n      }\n      if (!isWidthNumber) {\n        context.lineWidth = strokeArrayWidth[1];\n      }\n      context.lineDashOffset = context.currentMatrix.f / context.currentMatrix.d;\n      context.stroke();\n      context.beginPath();\n      context.moveTo(x + width, y + height);\n    }\n  } else {\n    context.moveTo(x + width, y + height);\n  }\n  // bottom\n  if ((isStrokeTrue || stroke[2]) && (isWidthNumber || strokeArrayWidth[2])) {\n    // context.lineTo(x, y + height);\n    if (isPart && Array.isArray(part[2])) {\n      context.moveTo(x + width * part[2][0], y + height);\n      context.lineTo(x + width * (part[2][1] - part[2][0]), y + height);\n      context.moveTo(x, y + height);\n    } else {\n      context.moveTo(x, y + height);\n      context.lineTo(x + width, y + height);\n    }\n    if ((isSplitDraw || isDash) && (!strokeArrayColor || strokeArrayColor[2])) {\n      if (strokeArrayColor) {\n        context.strokeStyle = strokeArrayColor[2];\n      }\n      if (!isWidthNumber) {\n        context.lineWidth = strokeArrayWidth[2];\n      }\n      context.lineDashOffset = context.currentMatrix.e / context.currentMatrix.a;\n      context.stroke();\n      context.beginPath();\n      context.moveTo(x, y + height);\n    }\n  } else {\n    context.moveTo(x, y + height);\n  }\n  // left\n  if ((isStrokeTrue || stroke[3]) && (isWidthNumber || strokeArrayWidth[3])) {\n    // context.lineTo(x, y);\n    if (isPart && Array.isArray(part[3])) {\n      context.moveTo(x, y + height * part[3][0]);\n      context.lineTo(x, y + height * (part[3][1] - part[3][0]));\n      context.moveTo(x, y);\n    } else {\n      context.moveTo(x, y);\n      context.lineTo(x, y + height);\n    }\n    if ((isSplitDraw || isDash) && (!strokeArrayColor || strokeArrayColor[3])) {\n      if (strokeArrayColor) {\n        context.strokeStyle = strokeArrayColor[3];\n      }\n      if (!isWidthNumber) {\n        context.lineWidth = strokeArrayWidth[3];\n      }\n      context.lineDashOffset = context.currentMatrix.f / context.currentMatrix.d;\n      context.stroke();\n      context.beginPath();\n      context.moveTo(x, y);\n    }\n  } else {\n    context.moveTo(x, y);\n  }\n\n  if (!isSplitDraw && !isDash) {\n    // context.strokeStyle = strokeArrayColor;\n    if (!isWidthNumber && widthInfo.width) {\n      context.lineWidth = widthInfo.width;\n    }\n    context.stroke();\n  }\n}\n\n// DashGroupContribution处理虚线边框对齐\n// lineDash 为非空数组时调用\n@injectable()\nexport class DashGroupBeforeRenderContribution implements IGroupRenderContribution {\n  time: BaseRenderContributionTime = BaseRenderContributionTime.beforeFillStroke;\n  useStyle = true;\n  order = 0;\n  drawShape(\n    group: IGroup,\n    context: IContext2d,\n    x: number,\n    y: number,\n    doFill: boolean,\n    doStroke: boolean,\n    fVisible: boolean,\n    sVisible: boolean,\n    groupAttribute: Required<IGroupGraphicAttribute>,\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    doFillOrStroke?: { doFill: boolean; doStroke: boolean }\n  ) {\n    const {\n      lineDash = groupAttribute.lineDash,\n      stroke = groupAttribute.stroke,\n      strokeArrayColor = (groupAttribute as any).strokeArrayColor,\n      strokeArrayWidth = (groupAttribute as any).strokeArrayWidth\n    } = group.attribute as any;\n\n    if (\n      stroke &&\n      Array.isArray(lineDash) &&\n      lineDash.length &&\n      !Array.isArray(strokeArrayColor) &&\n      !Array.isArray(strokeArrayWidth)\n    ) {\n      doFillOrStroke.doStroke = false;\n    }\n  }\n}\n@injectable()\nexport class DashGroupAfterRenderContribution implements IGroupRenderContribution {\n  time: BaseRenderContributionTime = BaseRenderContributionTime.afterFillStroke;\n  useStyle = true;\n  order = 0;\n  drawShape(\n    group: IGroup,\n    context: IContext2d,\n    x: number,\n    y: number,\n    doFill: boolean,\n    doStroke: boolean,\n    fVisible: boolean,\n    sVisible: boolean,\n    groupAttribute: Required<IGroupGraphicAttribute>,\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 {\n      lineDash = groupAttribute.lineDash,\n      stroke = groupAttribute.stroke,\n      strokeArrayColor = (groupAttribute as any).strokeArrayColor,\n      strokeArrayWidth = (groupAttribute as any).strokeArrayWidth,\n      lineWidth = groupAttribute.lineWidth\n    } = group.attribute as any;\n\n    if (\n      !stroke ||\n      !(Array.isArray(lineDash) && lineDash.length) ||\n      Array.isArray(strokeArrayColor) ||\n      Array.isArray(strokeArrayWidth)\n    ) {\n      return;\n    }\n\n    // const { width = groupAttribute.width, height = groupAttribute.height } = group.attribute;\n    let { width = groupAttribute.width, height = groupAttribute.height } = group.attribute;\n    width = Math.ceil(width);\n    height = Math.ceil(height);\n\n    if (lineWidth & 1) {\n      x = Math.floor(x) + 0.5;\n      y = Math.floor(y) + 0.5;\n    }\n    context.setStrokeStyle(group, group.attribute, x, y, groupAttribute);\n    // 分段设置lineDashOffset，实现虚线边框对齐\n    // top\n    context.beginPath();\n    context.moveTo(x, y);\n    context.lineTo(x + width, y);\n    context.lineDashOffset = context.currentMatrix.e / context.currentMatrix.a;\n    context.stroke();\n\n    // right\n    context.beginPath();\n    context.moveTo(x + width, y);\n    context.lineTo(x + width, y + height);\n    context.lineDashOffset = context.currentMatrix.f / context.currentMatrix.d;\n    context.stroke();\n\n    // bottom\n    context.beginPath();\n    context.moveTo(x, y + height);\n    context.lineTo(x + width, y + height);\n    context.lineDashOffset = context.currentMatrix.e / context.currentMatrix.a;\n    context.stroke();\n\n    // left\n    context.beginPath();\n    context.moveTo(x, y);\n    context.lineTo(x, y + height);\n    context.lineDashOffset = context.currentMatrix.f / context.currentMatrix.d;\n    context.stroke();\n  }\n}\n\n// AdjustPosGroupContribution处理线宽为奇数时stroke位置偏移0.5px\n// lineWidth 为奇数时调用\n@injectable()\nexport class AdjustPosGroupBeforeRenderContribution implements IGroupRenderContribution {\n  time: BaseRenderContributionTime = BaseRenderContributionTime.beforeFillStroke;\n  useStyle = true;\n  order = 0;\n  drawShape(\n    group: IGroup,\n    context: IContext2d,\n    x: number,\n    y: number,\n    doFill: boolean,\n    doStroke: boolean,\n    fVisible: boolean,\n    sVisible: boolean,\n    groupAttribute: Required<IGroupGraphicAttribute>,\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    doFillOrStroke?: { doFill: boolean; doStroke: boolean }\n  ) {\n    const {\n      lineWidth = groupAttribute.lineWidth,\n      stroke = groupAttribute.stroke,\n      lineDash = groupAttribute.lineDash,\n      // width = groupAttribute.width,\n      // height = groupAttribute.height,\n      strokeArrayWidth = (groupAttribute as any).strokeArrayWidth,\n      strokeArrayColor = (groupAttribute as any).strokeArrayColor\n    } = group.attribute as any;\n\n    if (\n      stroke &&\n      Array.isArray(lineDash) &&\n      !lineDash.length && // 非虚线\n      !Array.isArray(strokeArrayColor) &&\n      !Array.isArray(strokeArrayWidth) &&\n      lineWidth & 1 // 奇数线宽\n    ) {\n      doFillOrStroke.doStroke = false;\n    }\n  }\n}\n\n@injectable()\nexport class AdjustPosGroupAfterRenderContribution implements IGroupRenderContribution {\n  time: BaseRenderContributionTime = BaseRenderContributionTime.afterFillStroke;\n  useStyle = true;\n  order = 0;\n  drawShape(\n    group: IGroup,\n    context: IContext2d,\n    x: number,\n    y: number,\n    doFill: boolean,\n    doStroke: boolean,\n    fVisible: boolean,\n    sVisible: boolean,\n    groupAttribute: Required<IGroupGraphicAttribute>,\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 {\n      lineWidth = groupAttribute.lineWidth,\n      stroke = groupAttribute.stroke,\n      lineDash = groupAttribute.lineDash,\n      strokeArrayWidth = (groupAttribute as any).strokeArrayWidth,\n      strokeArrayColor = (groupAttribute as any).strokeArrayColor\n    } = group.attribute as any;\n\n    let { width = groupAttribute.width, height = groupAttribute.height } = group.attribute;\n    width = Math.ceil(width);\n    height = Math.ceil(height);\n\n    if (\n      stroke &&\n      Array.isArray(lineDash) &&\n      !lineDash.length && // 非虚线\n      !Array.isArray(strokeArrayColor) &&\n      !Array.isArray(strokeArrayWidth) &&\n      lineWidth & 1 // 奇数线宽\n    ) {\n      if (group.role === 'cell') {\n        const table = (group.stage as any).table as BaseTableAPI;\n        let col = (group as any).col as number;\n        let row = (group as any).row as number;\n        const mergeInfo = getCellMergeInfo(table, col, row);\n        if (mergeInfo) {\n          col = mergeInfo.end.col;\n          row = mergeInfo.end.row;\n        }\n\n        if (table && col === table.colCount - 1) {\n          width -= 1;\n        } else if (table && col === table.frozenColCount - 1 && table.scrollLeft) {\n          width -= 1;\n        }\n        if (table && row === table.rowCount - 1) {\n          height -= 1;\n        } else if (table && row === table.frozenRowCount - 1 && table.scrollTop) {\n          height -= 1;\n        }\n      }\n      context.beginPath();\n      x = Math.floor(x) + 0.5;\n      y = Math.floor(y) + 0.5;\n      context.rect(x, y, width, height);\n      context.setStrokeStyle(group, group.attribute, x, y, groupAttribute);\n      context.stroke();\n    }\n  }\n}\n\n@injectable()\nexport class AdjustColorGroupBeforeRenderContribution implements IGroupRenderContribution {\n  time: BaseRenderContributionTime = BaseRenderContributionTime.beforeFillStroke;\n  useStyle = true;\n  order = 0;\n  drawShape(\n    group: IGroup,\n    context: IContext2d,\n    x: number,\n    y: number,\n    doFill: boolean,\n    doStroke: boolean,\n    fVisible: boolean,\n    sVisible: boolean,\n    groupAttribute: Required<IGroupGraphicAttribute>,\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    doFillOrStroke?: { doFill: boolean; doStroke: boolean }\n  ) {\n    // 处理hover颜色\n    if ((group as Group).role === 'cell') {\n      const table = (group.stage as any).table as BaseTableAPI;\n      const hoverColor = getCellHoverColor(group as Group, table);\n      if (hoverColor) {\n        (group as any).oldColor = group.attribute.fill;\n        group.attribute.fill = hoverColor;\n      }\n    }\n  }\n}\n\n@injectable()\nexport class AdjustColorGroupAfterRenderContribution implements IGroupRenderContribution {\n  time: BaseRenderContributionTime = BaseRenderContributionTime.afterFillStroke;\n  useStyle = true;\n  order = 0;\n  drawShape(\n    group: IGroup,\n    context: IContext2d,\n    x: number,\n    y: number,\n    doFill: boolean,\n    doStroke: boolean,\n    fVisible: boolean,\n    sVisible: boolean,\n    groupAttribute: Required<IGroupGraphicAttribute>,\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    // 处理hover颜色\n    if ('oldColor' in group) {\n      group.attribute.fill = group.oldColor as any;\n      delete group.oldColor;\n    }\n  }\n}\n"]}
+{"version":3,"sources":["scenegraph/graphic/contributions/group-contribution-render.ts"],"names":[],"mappings":"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","file":"group-contribution-render.js","sourcesContent":["import { injectable } from 'inversify';\nimport type {\n  IGroup,\n  IContext2d,\n  IGroupGraphicAttribute,\n  IMarkAttribute,\n  IGraphicAttribute,\n  IThemeAttribute,\n  IGroupRenderContribution,\n  IDrawContext\n} from '@visactor/vrender';\nimport { BaseRenderContributionTime } from '@visactor/vrender';\nimport type { Group } from '../group';\nimport { getCellHoverColor } from '../../../state/hover/is-cell-hover';\nimport type { BaseTableAPI } from '../../../ts-types/base-table';\nimport { getQuadProps } from '../../utils/padding';\nimport { getCellMergeInfo } from '../../utils/get-cell-merge';\n\n// const highlightDash: number[] = [];\n\n// SplitGroupContribution处理分段渲染stroke\n// stroke/strokeArrayWidth/strokeArrayColor 为数组时调用\n@injectable()\nexport class SplitGroupBeforeRenderContribution implements IGroupRenderContribution {\n  time: BaseRenderContributionTime = BaseRenderContributionTime.beforeFillStroke;\n  useStyle = true;\n  order = 0;\n  drawShape(\n    group: IGroup,\n    context: IContext2d,\n    x: number,\n    y: number,\n    doFill: boolean,\n    doStroke: boolean,\n    fVisible: boolean,\n    sVisible: boolean,\n    groupAttribute: Required<IGroupGraphicAttribute>,\n    drawContext: IDrawContext,\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    doFillOrStroke?: { doFill: boolean; doStroke: boolean }\n  ) {\n    const {\n      stroke = groupAttribute.stroke,\n      strokeArrayWidth = (groupAttribute as any).strokeArrayWidth,\n      strokeArrayColor = (groupAttribute as any).strokeArrayColor\n      // highlightStroke = (groupAttribute as any).highlightStroke,\n      // highlightStrokeArrayWidth = (groupAttribute as any).highlightStrokeArrayWidth,\n      // width = groupAttribute.width,\n      // height = groupAttribute.height,\n    } = group.attribute as any;\n\n    if (stroke && (Array.isArray(strokeArrayWidth) || Array.isArray(strokeArrayColor))) {\n      doFillOrStroke.doStroke = false;\n    }\n\n    // if (highlightStroke) {\n    //   // 依据highlightStroke信息调整clip范围，以实现在单个单元格显示highlight border\n    //   let xDist = x;\n    //   let yDist = y;\n    //   let widthDist = width;\n    //   let heightDist = height;\n    //   if (highlightStroke[0] && highlightStrokeArrayWidth[0]) {\n    //     // top\n    //     yDist -= highlightStrokeArrayWidth[0] / 2;\n    //     heightDist += highlightStrokeArrayWidth[0] / 2;\n    //   }\n    //   if (highlightStroke[1] && highlightStrokeArrayWidth[1]) {\n    //     // right\n    //     widthDist += highlightStrokeArrayWidth[1] / 2;\n    //   }\n    //   if (highlightStroke[2] && highlightStrokeArrayWidth[2]) {\n    //     // bottom\n    //     heightDist += highlightStrokeArrayWidth[2] / 2;\n    //   }\n    //   if (highlightStroke[3] && highlightStrokeArrayWidth[3]) {\n    //     // left\n    //     xDist -= highlightStrokeArrayWidth[3] / 2;\n    //     widthDist += highlightStrokeArrayWidth[3] / 2;\n    //   }\n\n    //   context.beginPath();\n    //   context.rect(xDist, yDist, widthDist, heightDist);\n    // }\n  }\n}\n@injectable()\nexport class SplitGroupAfterRenderContribution implements IGroupRenderContribution {\n  time: BaseRenderContributionTime = BaseRenderContributionTime.afterFillStroke;\n  useStyle = true;\n  order = 0;\n  drawShape(\n    group: IGroup,\n    context: IContext2d,\n    x: number,\n    y: number,\n    doFill: boolean,\n    doStroke: boolean,\n    fVisible: boolean,\n    sVisible: boolean,\n    groupAttribute: Required<IGroupGraphicAttribute>,\n    drawContext: IDrawContext,\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 {\n      width = groupAttribute.width,\n      height = groupAttribute.height,\n      // 基础border\n      stroke = groupAttribute.stroke,\n      strokeArrayColor = (groupAttribute as any).strokeArrayColor,\n      strokeArrayWidth = (groupAttribute as any).strokeArrayWidth,\n\n      lineWidth = groupAttribute.lineWidth,\n      strokeColor = groupAttribute.stroke\n      // // select & hover border\n      // highlightStroke = (groupAttribute as any).highlightStroke,\n      // highlightStrokeArrayColor = (groupAttribute as any).highlightStrokeArrayColor,\n      // highlightStrokeArrayWidth = (groupAttribute as any).highlightStrokeArrayWidth,\n      // highlightStrokeArrayPart = (groupAttribute as any).highlightStrokeArrayPart,\n    } = group.attribute as any;\n\n    // lineWidth === 0 不绘制\n    if (!stroke || (!Array.isArray(strokeArrayWidth) && lineWidth === 0)) {\n      return;\n    }\n\n    let widthForStroke;\n    let heightForStroke;\n    if (Array.isArray(strokeArrayColor) || Array.isArray(strokeArrayWidth)) {\n      if (\n        (typeof lineWidth === 'number' && lineWidth & 1) ||\n        (Array.isArray(strokeArrayWidth) && strokeArrayWidth.some(width => width & 1))\n      ) {\n        x = Math.floor(x) + 0.5;\n        y = Math.floor(y) + 0.5;\n\n        const { width: widthFroDraw, height: heightFroDraw } = getCellSizeForDraw(\n          group,\n          Math.ceil(width),\n          Math.ceil(height)\n        );\n        widthForStroke = widthFroDraw;\n        heightForStroke = heightFroDraw;\n      } else {\n        widthForStroke = Math.ceil(width);\n        heightForStroke = Math.ceil(height);\n      }\n      renderStroke(\n        group,\n        context,\n        x,\n        y,\n        groupAttribute,\n        stroke,\n        strokeArrayWidth || lineWidth,\n        strokeArrayColor || strokeColor,\n        // Math.ceil(width),\n        // Math.ceil(height)\n        widthForStroke,\n        heightForStroke\n      );\n    }\n  }\n}\n\n/**\n * @description: 判断线宽是否需要分别渲染（线宽不同）\n * @param {number} widthArray\n * @return {*}\n */\nexport function getWidthInfo(widthArray: number[] | number) {\n  if (!Array.isArray(widthArray)) {\n    return {\n      isSplitDraw: false,\n      width: widthArray\n    };\n  }\n\n  let temp;\n  for (let i = 0; i < widthArray.length; i++) {\n    const width = widthArray[i];\n    if (width) {\n      if (!temp) {\n        temp = width;\n      } else if (width !== temp) {\n        return {\n          isSplitDraw: true\n        };\n      }\n    }\n  }\n\n  return {\n    isSplitDraw: false,\n    width: temp\n  };\n}\n\nexport function renderStroke(\n  group: IGroup,\n  context: IContext2d,\n  x: number,\n  y: number,\n  groupAttribute: Required<IGroupGraphicAttribute>,\n  stroke: boolean | [boolean, boolean, boolean, boolean],\n  strokeArrayWidth: [number, number, number, number] | undefined,\n  strokeArrayColor: [string, string, string, string] | undefined,\n  width: number,\n  height: number,\n  isHighlight?: boolean,\n  part?: ([number, number] | undefined)[]\n) {\n  const widthInfo = getWidthInfo(strokeArrayWidth);\n  const isWidthNumber = !Array.isArray(strokeArrayWidth);\n  const isStrokeTrue = !Array.isArray(stroke);\n  // 渲染部分线段，part: [[0, 0.5], undifined, undifined, undifined]\n  // 同样上右下左，范围0-1，[0, 0.5]即只渲染前一半\n  const isPart = Array.isArray(part);\n  const isSplitDraw = Array.isArray(strokeArrayColor) || widthInfo.isSplitDraw;\n\n  context.setStrokeStyle(group, group.attribute, x, y, groupAttribute);\n  // if (isHighlight) {\n  //   context.setLineDash(highlightDash);\n  //   context.lineCap = 'square';\n  // }\n  const lineDash = context.getLineDash();\n  let isDash = false;\n  if (lineDash.length) {\n    isDash = true;\n  }\n  // 单独处理每条边界，目前不考虑圆角\n  context.beginPath();\n  context.moveTo(x, y);\n\n  // top\n  if ((isStrokeTrue || stroke[0]) && (isWidthNumber || strokeArrayWidth[0])) {\n    // context.lineTo(x + width, y);\n    if (isPart && Array.isArray(part[0])) {\n      context.moveTo(x + width * part[0][0], y);\n      context.lineTo(x + width * (part[0][1] - part[0][0]), y);\n      context.moveTo(x + width, y);\n    } else {\n      context.moveTo(x, y);\n      context.lineTo(x + width, y);\n    }\n    if ((isSplitDraw || isDash) && (!strokeArrayColor || strokeArrayColor[0])) {\n      if (strokeArrayColor) {\n        context.strokeStyle = strokeArrayColor[0];\n      }\n      if (!isWidthNumber) {\n        context.lineWidth = strokeArrayWidth[0];\n      }\n      context.lineDashOffset = context.currentMatrix.e / context.currentMatrix.a;\n      context.stroke();\n      context.beginPath();\n      context.moveTo(x + width, y);\n    }\n  } else {\n    context.moveTo(x + width, y);\n  }\n  // right\n  if ((isStrokeTrue || stroke[1]) && (isWidthNumber || strokeArrayWidth[1])) {\n    // context.lineTo(x + width, y + height);\n    if (isPart && Array.isArray(part[1])) {\n      context.moveTo(x + width, y + height * part[1][0]);\n      context.lineTo(x + width, y + height * (part[1][1] - part[1][0]));\n      context.moveTo(x + width, y + height);\n    } else {\n      context.moveTo(x + width, y);\n      context.lineTo(x + width, y + height);\n    }\n    if ((isSplitDraw || isDash) && (!strokeArrayColor || strokeArrayColor[1])) {\n      if (strokeArrayColor) {\n        context.strokeStyle = strokeArrayColor[1];\n      }\n      if (!isWidthNumber) {\n        context.lineWidth = strokeArrayWidth[1];\n      }\n      context.lineDashOffset = context.currentMatrix.f / context.currentMatrix.d;\n      context.stroke();\n      context.beginPath();\n      context.moveTo(x + width, y + height);\n    }\n  } else {\n    context.moveTo(x + width, y + height);\n  }\n  // bottom\n  if ((isStrokeTrue || stroke[2]) && (isWidthNumber || strokeArrayWidth[2])) {\n    // context.lineTo(x, y + height);\n    if (isPart && Array.isArray(part[2])) {\n      context.moveTo(x + width * part[2][0], y + height);\n      context.lineTo(x + width * (part[2][1] - part[2][0]), y + height);\n      context.moveTo(x, y + height);\n    } else {\n      context.moveTo(x, y + height);\n      context.lineTo(x + width, y + height);\n    }\n    if ((isSplitDraw || isDash) && (!strokeArrayColor || strokeArrayColor[2])) {\n      if (strokeArrayColor) {\n        context.strokeStyle = strokeArrayColor[2];\n      }\n      if (!isWidthNumber) {\n        context.lineWidth = strokeArrayWidth[2];\n      }\n      context.lineDashOffset = context.currentMatrix.e / context.currentMatrix.a;\n      context.stroke();\n      context.beginPath();\n      context.moveTo(x, y + height);\n    }\n  } else {\n    context.moveTo(x, y + height);\n  }\n  // left\n  if ((isStrokeTrue || stroke[3]) && (isWidthNumber || strokeArrayWidth[3])) {\n    // context.lineTo(x, y);\n    if (isPart && Array.isArray(part[3])) {\n      context.moveTo(x, y + height * part[3][0]);\n      context.lineTo(x, y + height * (part[3][1] - part[3][0]));\n      context.moveTo(x, y);\n    } else {\n      context.moveTo(x, y);\n      context.lineTo(x, y + height);\n    }\n    if ((isSplitDraw || isDash) && (!strokeArrayColor || strokeArrayColor[3])) {\n      if (strokeArrayColor) {\n        context.strokeStyle = strokeArrayColor[3];\n      }\n      if (!isWidthNumber) {\n        context.lineWidth = strokeArrayWidth[3];\n      }\n      context.lineDashOffset = context.currentMatrix.f / context.currentMatrix.d;\n      context.stroke();\n      context.beginPath();\n      context.moveTo(x, y);\n    }\n  } else {\n    context.moveTo(x, y);\n  }\n\n  if (!isSplitDraw && !isDash) {\n    // context.strokeStyle = strokeArrayColor;\n    if (!isWidthNumber && widthInfo.width) {\n      context.lineWidth = widthInfo.width;\n    }\n    context.stroke();\n  }\n}\n\n// DashGroupContribution处理虚线边框对齐\n// lineDash 为非空数组时调用\n@injectable()\nexport class DashGroupBeforeRenderContribution implements IGroupRenderContribution {\n  time: BaseRenderContributionTime = BaseRenderContributionTime.beforeFillStroke;\n  useStyle = true;\n  order = 0;\n  drawShape(\n    group: IGroup,\n    context: IContext2d,\n    x: number,\n    y: number,\n    doFill: boolean,\n    doStroke: boolean,\n    fVisible: boolean,\n    sVisible: boolean,\n    groupAttribute: Required<IGroupGraphicAttribute>,\n    drawContext: IDrawContext,\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    doFillOrStroke?: { doFill: boolean; doStroke: boolean }\n  ) {\n    const {\n      lineDash = groupAttribute.lineDash,\n      stroke = groupAttribute.stroke,\n      strokeArrayColor = (groupAttribute as any).strokeArrayColor,\n      strokeArrayWidth = (groupAttribute as any).strokeArrayWidth\n    } = group.attribute as any;\n\n    if (\n      stroke &&\n      Array.isArray(lineDash) &&\n      lineDash.length &&\n      !Array.isArray(strokeArrayColor) &&\n      !Array.isArray(strokeArrayWidth)\n    ) {\n      doFillOrStroke.doStroke = false;\n    }\n  }\n}\n@injectable()\nexport class DashGroupAfterRenderContribution implements IGroupRenderContribution {\n  time: BaseRenderContributionTime = BaseRenderContributionTime.afterFillStroke;\n  useStyle = true;\n  order = 0;\n  drawShape(\n    group: IGroup,\n    context: IContext2d,\n    x: number,\n    y: number,\n    doFill: boolean,\n    doStroke: boolean,\n    fVisible: boolean,\n    sVisible: boolean,\n    groupAttribute: Required<IGroupGraphicAttribute>,\n    drawContext: IDrawContext,\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 {\n      lineDash = groupAttribute.lineDash,\n      stroke = groupAttribute.stroke,\n      strokeArrayColor = (groupAttribute as any).strokeArrayColor,\n      strokeArrayWidth = (groupAttribute as any).strokeArrayWidth,\n      lineWidth = groupAttribute.lineWidth\n    } = group.attribute as any;\n\n    if (\n      !stroke ||\n      !(Array.isArray(lineDash) && lineDash.length) ||\n      Array.isArray(strokeArrayColor) ||\n      Array.isArray(strokeArrayWidth)\n    ) {\n      return;\n    }\n\n    // const { width = groupAttribute.width, height = groupAttribute.height } = group.attribute;\n    let { width = groupAttribute.width, height = groupAttribute.height } = group.attribute;\n    width = Math.ceil(width);\n    height = Math.ceil(height);\n\n    let widthForStroke;\n    let heightForStroke;\n    if (lineWidth & 1) {\n      x = Math.floor(x) + 0.5;\n      y = Math.floor(y) + 0.5;\n\n      const { width: widthFroDraw, height: heightFroDraw } = getCellSizeForDraw(\n        group,\n        Math.ceil(width),\n        Math.ceil(height)\n      );\n      widthForStroke = widthFroDraw;\n      heightForStroke = heightFroDraw;\n    } else {\n      widthForStroke = Math.ceil(width);\n      heightForStroke = Math.ceil(height);\n    }\n    context.setStrokeStyle(group, group.attribute, x, y, groupAttribute);\n    // 分段设置lineDashOffset，实现虚线边框对齐\n    // top\n    context.beginPath();\n    context.moveTo(x, y);\n    context.lineTo(x + widthForStroke, y);\n    context.lineDashOffset = context.currentMatrix.e / context.currentMatrix.a;\n    context.stroke();\n\n    // right\n    context.beginPath();\n    context.moveTo(x + widthForStroke, y);\n    context.lineTo(x + widthForStroke, y + heightForStroke);\n    context.lineDashOffset = context.currentMatrix.f / context.currentMatrix.d;\n    context.stroke();\n\n    // bottom\n    context.beginPath();\n    context.moveTo(x, y + heightForStroke);\n    context.lineTo(x + widthForStroke, y + heightForStroke);\n    context.lineDashOffset = context.currentMatrix.e / context.currentMatrix.a;\n    context.stroke();\n\n    // left\n    context.beginPath();\n    context.moveTo(x, y);\n    context.lineTo(x, y + heightForStroke);\n    context.lineDashOffset = context.currentMatrix.f / context.currentMatrix.d;\n    context.stroke();\n  }\n}\n\n// AdjustPosGroupContribution处理线宽为奇数时stroke位置偏移0.5px\n// lineWidth 为奇数时调用\n@injectable()\nexport class AdjustPosGroupBeforeRenderContribution implements IGroupRenderContribution {\n  time: BaseRenderContributionTime = BaseRenderContributionTime.beforeFillStroke;\n  useStyle = true;\n  order = 0;\n  drawShape(\n    group: IGroup,\n    context: IContext2d,\n    x: number,\n    y: number,\n    doFill: boolean,\n    doStroke: boolean,\n    fVisible: boolean,\n    sVisible: boolean,\n    groupAttribute: Required<IGroupGraphicAttribute>,\n    drawContext: IDrawContext,\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    doFillOrStroke?: { doFill: boolean; doStroke: boolean }\n  ) {\n    const {\n      lineWidth = groupAttribute.lineWidth,\n      stroke = groupAttribute.stroke,\n      lineDash = groupAttribute.lineDash,\n      // width = groupAttribute.width,\n      // height = groupAttribute.height,\n      strokeArrayWidth = (groupAttribute as any).strokeArrayWidth,\n      strokeArrayColor = (groupAttribute as any).strokeArrayColor\n    } = group.attribute as any;\n\n    if (\n      stroke &&\n      Array.isArray(lineDash) &&\n      !lineDash.length && // 非虚线\n      !Array.isArray(strokeArrayColor) &&\n      !Array.isArray(strokeArrayWidth) &&\n      lineWidth & 1 // 奇数线宽\n    ) {\n      doFillOrStroke.doStroke = false;\n    }\n  }\n}\n\n@injectable()\nexport class AdjustPosGroupAfterRenderContribution implements IGroupRenderContribution {\n  time: BaseRenderContributionTime = BaseRenderContributionTime.afterFillStroke;\n  useStyle = true;\n  order = 0;\n  drawShape(\n    group: IGroup,\n    context: IContext2d,\n    x: number,\n    y: number,\n    doFill: boolean,\n    doStroke: boolean,\n    fVisible: boolean,\n    sVisible: boolean,\n    groupAttribute: Required<IGroupGraphicAttribute>,\n    drawContext: IDrawContext,\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 {\n      lineWidth = groupAttribute.lineWidth,\n      stroke = groupAttribute.stroke,\n      lineDash = groupAttribute.lineDash,\n      strokeArrayWidth = (groupAttribute as any).strokeArrayWidth,\n      strokeArrayColor = (groupAttribute as any).strokeArrayColor\n    } = group.attribute as any;\n\n    const { width = groupAttribute.width, height = groupAttribute.height } = group.attribute;\n    // width = Math.ceil(width);\n    // height = Math.ceil(height);\n\n    if (\n      stroke &&\n      Array.isArray(lineDash) &&\n      !lineDash.length && // 非虚线\n      !Array.isArray(strokeArrayColor) &&\n      !Array.isArray(strokeArrayWidth) &&\n      lineWidth & 1 // 奇数线宽\n    ) {\n      // if (group.role === 'cell') {\n      //   const table = (group.stage as any).table as BaseTableAPI;\n      //   let col = (group as any).col as number;\n      //   let row = (group as any).row as number;\n      //   const mergeInfo = getCellMergeInfo(table, col, row);\n      //   if (mergeInfo) {\n      //     col = mergeInfo.end.col;\n      //     row = mergeInfo.end.row;\n      //   }\n\n      //   if (table && col === table.colCount - 1) {\n      //     width -= 1;\n      //   } else if (table && col === table.frozenColCount - 1 && table.scrollLeft) {\n      //     width -= 1;\n      //   }\n      //   if (table && row === table.rowCount - 1) {\n      //     height -= 1;\n      //   } else if (table && row === table.frozenRowCount - 1 && table.scrollTop) {\n      //     height -= 1;\n      //   }\n      // }\n      const { width: widthFroDraw, height: heightFroDraw } = getCellSizeForDraw(\n        group,\n        Math.ceil(width),\n        Math.ceil(height)\n      );\n      context.beginPath();\n      x = Math.floor(x) + 0.5;\n      y = Math.floor(y) + 0.5;\n      context.rect(x, y, widthFroDraw, heightFroDraw);\n      context.setStrokeStyle(group, group.attribute, x, y, groupAttribute);\n      context.stroke();\n    }\n  }\n}\n\n@injectable()\nexport class AdjustColorGroupBeforeRenderContribution implements IGroupRenderContribution {\n  time: BaseRenderContributionTime = BaseRenderContributionTime.beforeFillStroke;\n  useStyle = true;\n  order = 0;\n  drawShape(\n    group: IGroup,\n    context: IContext2d,\n    x: number,\n    y: number,\n    doFill: boolean,\n    doStroke: boolean,\n    fVisible: boolean,\n    sVisible: boolean,\n    groupAttribute: Required<IGroupGraphicAttribute>,\n    drawContext: IDrawContext,\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    doFillOrStroke?: { doFill: boolean; doStroke: boolean }\n  ) {\n    // 处理hover颜色\n    if ((group as Group).role === 'cell') {\n      const table = (group.stage as any).table as BaseTableAPI;\n      const hoverColor = getCellHoverColor(group as Group, table);\n      if (hoverColor) {\n        (group as any).oldColor = group.attribute.fill;\n        group.attribute.fill = hoverColor;\n      }\n    }\n  }\n}\n\n@injectable()\nexport class AdjustColorGroupAfterRenderContribution implements IGroupRenderContribution {\n  time: BaseRenderContributionTime = BaseRenderContributionTime.afterFillStroke;\n  useStyle = true;\n  order = 0;\n  drawShape(\n    group: IGroup,\n    context: IContext2d,\n    x: number,\n    y: number,\n    doFill: boolean,\n    doStroke: boolean,\n    fVisible: boolean,\n    sVisible: boolean,\n    groupAttribute: Required<IGroupGraphicAttribute>,\n    drawContext: IDrawContext,\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    // 处理hover颜色\n    if ('oldColor' in group) {\n      group.attribute.fill = group.oldColor as any;\n      delete group.oldColor;\n    }\n  }\n}\n\nfunction getCellSizeForDraw(group: any, width: number, height: number) {\n  const table = group.stage.table as BaseTableAPI;\n  if (group.role === 'cell') {\n    let col = group.col as number;\n    let row = group.row as number;\n    const mergeInfo = getCellMergeInfo(table, col, row);\n    if (mergeInfo) {\n      col = mergeInfo.end.col;\n      row = mergeInfo.end.row;\n    }\n\n    if (table && col === table.colCount - 1) {\n      width -= 1;\n    } else if (table && col === table.frozenColCount - 1 && table.scrollLeft) {\n      width -= 1;\n    }\n    if (table && row === table.rowCount - 1) {\n      height -= 1;\n    } else if (table && row === table.frozenRowCount - 1 && table.scrollTop) {\n      height -= 1;\n    }\n  } else if (group.role === 'corner-frozen') {\n    if (table.scrollLeft) {\n      width -= 1;\n    }\n    if (table.scrollTop) {\n      height -= 1;\n    }\n  }\n  return { width, height };\n}\n"]}

package/cjs/scenegraph/graphic/contributions/image-contribution-render.d.ts

@@ -1,10 +1,10 @@
-import type { IImage, IContext2d, IImageGraphicAttribute, IMarkAttribute, IGraphicAttribute, IThemeAttribute, IImageRenderContribution } from '@visactor/vrender';
+import type { IImage, IContext2d, IImageGraphicAttribute, IMarkAttribute, IGraphicAttribute, IThemeAttribute, IImageRenderContribution, IDrawContext } from '@visactor/vrender';
 import { BaseRenderContributionTime } from '@visactor/vrender';
 export declare class BeforeImageRenderContribution implements IImageRenderContribution {
     time: BaseRenderContributionTime;
     useStyle: boolean;
     order: number;
-    drawShape(image: IImage, context: IContext2d, x: number, y: number, doFill: boolean, doStroke: boolean, fVisible: boolean, sVisible: boolean, imageAttribute: Required<IImageGraphicAttribute>, fillCb?: (ctx: IContext2d, markAttribute: Partial<IMarkAttribute & IGraphicAttribute>, themeAttribute: IThemeAttribute) => boolean, strokeCb?: (ctx: IContext2d, markAttribute: Partial<IMarkAttribute & IGraphicAttribute>, themeAttribute: IThemeAttribute) => boolean, doFillOrStroke?: {
+    drawShape(image: IImage, context: IContext2d, x: number, y: number, doFill: boolean, doStroke: boolean, fVisible: boolean, sVisible: boolean, imageAttribute: Required<IImageGraphicAttribute>, drawContext: IDrawContext, fillCb?: (ctx: IContext2d, markAttribute: Partial<IMarkAttribute & IGraphicAttribute>, themeAttribute: IThemeAttribute) => boolean, strokeCb?: (ctx: IContext2d, markAttribute: Partial<IMarkAttribute & IGraphicAttribute>, themeAttribute: IThemeAttribute) => boolean, doFillOrStroke?: {
         doFill: boolean;
         doStroke: boolean;
     }): void;
@@ -13,7 +13,7 @@ export declare class AfterImageRenderContribution implements IImageRenderContrib
     time: BaseRenderContributionTime;
     useStyle: boolean;
     order: number;
-    drawShape(image: IImage, context: IContext2d, x: number, y: number, doFill: boolean, doStroke: boolean, fVisible: boolean, sVisible: boolean, imageAttribute: Required<IImageGraphicAttribute>, fillCb?: (ctx: IContext2d, markAttribute: Partial<IMarkAttribute & IGraphicAttribute>, themeAttribute: IThemeAttribute) => boolean, strokeCb?: (ctx: IContext2d, markAttribute: Partial<IMarkAttribute & IGraphicAttribute>, themeAttribute: IThemeAttribute) => boolean, doFillOrStroke?: {
+    drawShape(image: IImage, context: IContext2d, x: number, y: number, doFill: boolean, doStroke: boolean, fVisible: boolean, sVisible: boolean, imageAttribute: Required<IImageGraphicAttribute>, drawContext: IDrawContext, fillCb?: (ctx: IContext2d, markAttribute: Partial<IMarkAttribute & IGraphicAttribute>, themeAttribute: IThemeAttribute) => boolean, strokeCb?: (ctx: IContext2d, markAttribute: Partial<IMarkAttribute & IGraphicAttribute>, themeAttribute: IThemeAttribute) => boolean, doFillOrStroke?: {
         doFill: boolean;
         doStroke: boolean;
     }): void;

package/cjs/scenegraph/graphic/contributions/image-contribution-render.js

@@ -17,7 +17,7 @@ let BeforeImageRenderContribution = class {
         this.time = vrender_1.BaseRenderContributionTime.beforeFillStroke, this.useStyle = !0, 
         this.order = 0;
     }
-    drawShape(image, context, x, y, doFill, doStroke, fVisible, sVisible, imageAttribute, fillCb, strokeCb, doFillOrStroke) {
+    drawShape(image, context, x, y, doFill, doStroke, fVisible, sVisible, imageAttribute, drawContext, fillCb, strokeCb, doFillOrStroke) {
         const {shape: shape} = image.attribute;
         if ("circle" === shape) {
             const {width: width = imageAttribute.width, height: height = imageAttribute.height} = image.attribute;
@@ -35,7 +35,7 @@ let AfterImageRenderContribution = class {
         this.time = vrender_1.BaseRenderContributionTime.afterFillStroke, this.useStyle = !0, 
         this.order = 0;
     }
-    drawShape(image, context, x, y, doFill, doStroke, fVisible, sVisible, imageAttribute, fillCb, strokeCb, doFillOrStroke) {
+    drawShape(image, context, x, y, doFill, doStroke, fVisible, sVisible, imageAttribute, drawContext, fillCb, strokeCb, doFillOrStroke) {
         const {shape: shape} = image.attribute;
         "circle" === shape && context.restore();
     }

package/cjs/scenegraph/graphic/contributions/image-contribution-render.js.map

@@ -1 +1 @@
-{"version":3,"sources":["scenegraph/graphic/contributions/image-contribution-render.ts"],"names":[],"mappings":";;;;;;;;;AAAA,yCAAuC;AAUvC,+CAA+D;AAOxD,IAAM,6BAA6B,GAAnC,MAAM,6BAA6B;IAAnC;QACL,SAAI,GAA+B,oCAA0B,CAAC,gBAAgB,CAAC;QAC/E,aAAQ,GAAG,IAAI,CAAC;QAChB,UAAK,GAAG,CAAC,CAAC;IAoCZ,CAAC;IAnCC,SAAS,CACP,KAAa,EACb,OAAmB,EACnB,CAAS,EACT,CAAS,EACT,MAAe,EACf,QAAiB,EACjB,QAAiB,EACjB,QAAiB,EACjB,cAAgD,EAChD,MAIY,EACZ,QAIY,EACZ,cAAuD;QAEvD,MAAM,EAAE,KAAK,EAAE,GAAG,KAAK,CAAC,SAAgB,CAAC;QAEzC,IAAI,KAAK,KAAK,QAAQ,EAAE;YACtB,MAAM,EAAE,KAAK,GAAG,cAAc,CAAC,KAAK,EAAE,MAAM,GAAG,cAAc,CAAC,MAAM,EAAE,GAAG,KAAK,CAAC,SAAS,CAAC;YAEzF,OAAO,CAAC,SAAS,EAAE,CAAC;YACpB,OAAO,CAAC,GAAG,CAAC,CAAC,GAAG,KAAK,GAAG,CAAC,EAAE,CAAC,GAAG,MAAM,GAAG,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,EAAE,CAAC,CAAC;YACxF,OAAO,CAAC,SAAS,EAAE,CAAC;YAEpB,OAAO,CAAC,IAAI,EAAE,CAAC;YACf,OAAO,CAAC,IAAI,EAAE,CAAC;SAChB;IACH,CAAC;CACF,CAAA;AAvCY,6BAA6B;IADzC,IAAA,sBAAU,GAAE;GACA,6BAA6B,CAuCzC;AAvCY,sEAA6B;AA0CnC,IAAM,4BAA4B,GAAlC,MAAM,4BAA4B;IAAlC;QACL,SAAI,GAA+B,oCAA0B,CAAC,eAAe,CAAC;QAC9E,aAAQ,GAAG,IAAI,CAAC;QAChB,UAAK,GAAG,CAAC,CAAC;IA6BZ,CAAC;IA5BC,SAAS,CACP,KAAa,EACb,OAAmB,EACnB,CAAS,EACT,CAAS,EACT,MAAe,EACf,QAAiB,EACjB,QAAiB,EACjB,QAAiB,EACjB,cAAgD,EAChD,MAIY,EACZ,QAIY,EACZ,cAAuD;QAEvD,MAAM,EAAE,KAAK,EAAE,GAAG,KAAK,CAAC,SAAgB,CAAC;QAEzC,IAAI,KAAK,KAAK,QAAQ,EAAE;YACtB,OAAO,CAAC,OAAO,EAAE,CAAC;SACnB;IACH,CAAC;CACF,CAAA;AAhCY,4BAA4B;IADxC,IAAA,sBAAU,GAAE;GACA,4BAA4B,CAgCxC;AAhCY,oEAA4B","file":"image-contribution-render.js","sourcesContent":["import { injectable } from 'inversify';\nimport type {\n  IImage,\n  IContext2d,\n  IImageGraphicAttribute,\n  IMarkAttribute,\n  IGraphicAttribute,\n  IThemeAttribute,\n  IImageRenderContribution\n} from '@visactor/vrender';\nimport { BaseRenderContributionTime } from '@visactor/vrender';\n\n/**\n * @description: image支持绘制部分形状\n * @return {*}\n */\n@injectable()\nexport class BeforeImageRenderContribution implements IImageRenderContribution {\n  time: BaseRenderContributionTime = BaseRenderContributionTime.beforeFillStroke;\n  useStyle = true;\n  order = 0;\n  drawShape(\n    image: IImage,\n    context: IContext2d,\n    x: number,\n    y: number,\n    doFill: boolean,\n    doStroke: boolean,\n    fVisible: boolean,\n    sVisible: boolean,\n    imageAttribute: Required<IImageGraphicAttribute>,\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    doFillOrStroke?: { doFill: boolean; doStroke: boolean }\n  ) {\n    const { shape } = image.attribute as any;\n\n    if (shape === 'circle') {\n      const { width = imageAttribute.width, height = imageAttribute.height } = image.attribute;\n\n      context.beginPath();\n      context.arc(x + width / 2, y + height / 2, Math.min(width, height) / 2, 0, 2 * Math.PI);\n      context.closePath();\n\n      context.save();\n      context.clip();\n    }\n  }\n}\n\n@injectable()\nexport class AfterImageRenderContribution implements IImageRenderContribution {\n  time: BaseRenderContributionTime = BaseRenderContributionTime.afterFillStroke;\n  useStyle = true;\n  order = 0;\n  drawShape(\n    image: IImage,\n    context: IContext2d,\n    x: number,\n    y: number,\n    doFill: boolean,\n    doStroke: boolean,\n    fVisible: boolean,\n    sVisible: boolean,\n    imageAttribute: Required<IImageGraphicAttribute>,\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    doFillOrStroke?: { doFill: boolean; doStroke: boolean }\n  ) {\n    const { shape } = image.attribute as any;\n\n    if (shape === 'circle') {\n      context.restore();\n    }\n  }\n}\n"]}
+{"version":3,"sources":["scenegraph/graphic/contributions/image-contribution-render.ts"],"names":[],"mappings":";;;;;;;;;AAAA,yCAAuC;AAWvC,+CAA+D;AAOxD,IAAM,6BAA6B,GAAnC,MAAM,6BAA6B;IAAnC;QACL,SAAI,GAA+B,oCAA0B,CAAC,gBAAgB,CAAC;QAC/E,aAAQ,GAAG,IAAI,CAAC;QAChB,UAAK,GAAG,CAAC,CAAC;IAqCZ,CAAC;IApCC,SAAS,CACP,KAAa,EACb,OAAmB,EACnB,CAAS,EACT,CAAS,EACT,MAAe,EACf,QAAiB,EACjB,QAAiB,EACjB,QAAiB,EACjB,cAAgD,EAChD,WAAyB,EACzB,MAIY,EACZ,QAIY,EACZ,cAAuD;QAEvD,MAAM,EAAE,KAAK,EAAE,GAAG,KAAK,CAAC,SAAgB,CAAC;QAEzC,IAAI,KAAK,KAAK,QAAQ,EAAE;YACtB,MAAM,EAAE,KAAK,GAAG,cAAc,CAAC,KAAK,EAAE,MAAM,GAAG,cAAc,CAAC,MAAM,EAAE,GAAG,KAAK,CAAC,SAAS,CAAC;YAEzF,OAAO,CAAC,SAAS,EAAE,CAAC;YACpB,OAAO,CAAC,GAAG,CAAC,CAAC,GAAG,KAAK,GAAG,CAAC,EAAE,CAAC,GAAG,MAAM,GAAG,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,EAAE,CAAC,CAAC;YACxF,OAAO,CAAC,SAAS,EAAE,CAAC;YAEpB,OAAO,CAAC,IAAI,EAAE,CAAC;YACf,OAAO,CAAC,IAAI,EAAE,CAAC;SAChB;IACH,CAAC;CACF,CAAA;AAxCY,6BAA6B;IADzC,IAAA,sBAAU,GAAE;GACA,6BAA6B,CAwCzC;AAxCY,sEAA6B;AA2CnC,IAAM,4BAA4B,GAAlC,MAAM,4BAA4B;IAAlC;QACL,SAAI,GAA+B,oCAA0B,CAAC,eAAe,CAAC;QAC9E,aAAQ,GAAG,IAAI,CAAC;QAChB,UAAK,GAAG,CAAC,CAAC;IA8BZ,CAAC;IA7BC,SAAS,CACP,KAAa,EACb,OAAmB,EACnB,CAAS,EACT,CAAS,EACT,MAAe,EACf,QAAiB,EACjB,QAAiB,EACjB,QAAiB,EACjB,cAAgD,EAChD,WAAyB,EACzB,MAIY,EACZ,QAIY,EACZ,cAAuD;QAEvD,MAAM,EAAE,KAAK,EAAE,GAAG,KAAK,CAAC,SAAgB,CAAC;QAEzC,IAAI,KAAK,KAAK,QAAQ,EAAE;YACtB,OAAO,CAAC,OAAO,EAAE,CAAC;SACnB;IACH,CAAC;CACF,CAAA;AAjCY,4BAA4B;IADxC,IAAA,sBAAU,GAAE;GACA,4BAA4B,CAiCxC;AAjCY,oEAA4B","file":"image-contribution-render.js","sourcesContent":["import { injectable } from 'inversify';\nimport type {\n  IImage,\n  IContext2d,\n  IImageGraphicAttribute,\n  IMarkAttribute,\n  IGraphicAttribute,\n  IThemeAttribute,\n  IImageRenderContribution,\n  IDrawContext\n} from '@visactor/vrender';\nimport { BaseRenderContributionTime } from '@visactor/vrender';\n\n/**\n * @description: image支持绘制部分形状\n * @return {*}\n */\n@injectable()\nexport class BeforeImageRenderContribution implements IImageRenderContribution {\n  time: BaseRenderContributionTime = BaseRenderContributionTime.beforeFillStroke;\n  useStyle = true;\n  order = 0;\n  drawShape(\n    image: IImage,\n    context: IContext2d,\n    x: number,\n    y: number,\n    doFill: boolean,\n    doStroke: boolean,\n    fVisible: boolean,\n    sVisible: boolean,\n    imageAttribute: Required<IImageGraphicAttribute>,\n    drawContext: IDrawContext,\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    doFillOrStroke?: { doFill: boolean; doStroke: boolean }\n  ) {\n    const { shape } = image.attribute as any;\n\n    if (shape === 'circle') {\n      const { width = imageAttribute.width, height = imageAttribute.height } = image.attribute;\n\n      context.beginPath();\n      context.arc(x + width / 2, y + height / 2, Math.min(width, height) / 2, 0, 2 * Math.PI);\n      context.closePath();\n\n      context.save();\n      context.clip();\n    }\n  }\n}\n\n@injectable()\nexport class AfterImageRenderContribution implements IImageRenderContribution {\n  time: BaseRenderContributionTime = BaseRenderContributionTime.afterFillStroke;\n  useStyle = true;\n  order = 0;\n  drawShape(\n    image: IImage,\n    context: IContext2d,\n    x: number,\n    y: number,\n    doFill: boolean,\n    doStroke: boolean,\n    fVisible: boolean,\n    sVisible: boolean,\n    imageAttribute: Required<IImageGraphicAttribute>,\n    drawContext: IDrawContext,\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    doFillOrStroke?: { doFill: boolean; doStroke: boolean }\n  ) {\n    const { shape } = image.attribute as any;\n\n    if (shape === 'circle') {\n      context.restore();\n    }\n  }\n}\n"]}

package/cjs/scenegraph/graphic/contributions/rect-contribution-render.d.ts

@@ -1,10 +1,10 @@
-import type { IRect, IContext2d, IRectGraphicAttribute, IMarkAttribute, IGraphicAttribute, IThemeAttribute, IRectRenderContribution } from '@visactor/vrender';
+import type { IRect, IContext2d, IRectGraphicAttribute, IMarkAttribute, IGraphicAttribute, IThemeAttribute, IRectRenderContribution, IDrawContext } from '@visactor/vrender';
 import { BaseRenderContributionTime } from '@visactor/vrender';
 export declare class SplitRectBeforeRenderContribution implements IRectRenderContribution {
     time: BaseRenderContributionTime;
     useStyle: boolean;
     order: number;
-    drawShape(rect: IRect, context: IContext2d, x: number, y: number, doFill: boolean, doStroke: boolean, fVisible: boolean, sVisible: boolean, rectAttribute: Required<IRectGraphicAttribute>, fillCb?: (ctx: IContext2d, markAttribute: Partial<IMarkAttribute & IGraphicAttribute>, themeAttribute: IThemeAttribute) => boolean, strokeCb?: (ctx: IContext2d, markAttribute: Partial<IMarkAttribute & IGraphicAttribute>, themeAttribute: IThemeAttribute) => boolean, doFillOrStroke?: {
+    drawShape(rect: IRect, context: IContext2d, x: number, y: number, doFill: boolean, doStroke: boolean, fVisible: boolean, sVisible: boolean, rectAttribute: Required<IRectGraphicAttribute>, drawContext: IDrawContext, fillCb?: (ctx: IContext2d, markAttribute: Partial<IMarkAttribute & IGraphicAttribute>, themeAttribute: IThemeAttribute) => boolean, strokeCb?: (ctx: IContext2d, markAttribute: Partial<IMarkAttribute & IGraphicAttribute>, themeAttribute: IThemeAttribute) => boolean, doFillOrStroke?: {
         doFill: boolean;
         doStroke: boolean;
     }): void;
@@ -13,5 +13,5 @@ export declare class SplitRectAfterRenderContribution implements IRectRenderCont
     time: BaseRenderContributionTime;
     useStyle: boolean;
     order: number;
-    drawShape(rect: IRect, context: IContext2d, x: number, y: number, doFill: boolean, doStroke: boolean, fVisible: boolean, sVisible: boolean, rectAttribute: Required<IRectGraphicAttribute>, fillCb?: (ctx: IContext2d, markAttribute: Partial<IMarkAttribute & IGraphicAttribute>, themeAttribute: IThemeAttribute) => boolean, strokeCb?: (ctx: IContext2d, markAttribute: Partial<IMarkAttribute & IGraphicAttribute>, themeAttribute: IThemeAttribute) => boolean): void;
+    drawShape(rect: IRect, context: IContext2d, x: number, y: number, doFill: boolean, doStroke: boolean, fVisible: boolean, sVisible: boolean, rectAttribute: Required<IRectGraphicAttribute>, drawContext: IDrawContext, 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/rect-contribution-render.js

@@ -17,7 +17,7 @@ let SplitRectBeforeRenderContribution = class {
         this.time = vrender_1.BaseRenderContributionTime.beforeFillStroke, this.useStyle = !0, 
         this.order = 0;
     }
-    drawShape(rect, context, x, y, doFill, doStroke, fVisible, sVisible, rectAttribute, fillCb, strokeCb, doFillOrStroke) {
+    drawShape(rect, context, x, y, doFill, doStroke, fVisible, sVisible, rectAttribute, drawContext, fillCb, strokeCb, doFillOrStroke) {
         const {stroke: stroke = rectAttribute.stroke, strokeArrayWidth: strokeArrayWidth = rectAttribute.strokeArrayWidth, strokeArrayColor: strokeArrayColor = rectAttribute.strokeArrayColor} = rect.attribute;
         stroke && (Array.isArray(stroke) || Array.isArray(strokeArrayWidth) || Array.isArray(strokeArrayColor)) && (doFillOrStroke.doStroke = !1);
     }
@@ -31,7 +31,7 @@ let SplitRectAfterRenderContribution = class {
         this.time = vrender_1.BaseRenderContributionTime.afterFillStroke, this.useStyle = !0, 
         this.order = 0;
     }
-    drawShape(rect, context, x, y, doFill, doStroke, fVisible, sVisible, rectAttribute, fillCb, strokeCb) {
+    drawShape(rect, context, x, y, doFill, doStroke, fVisible, sVisible, rectAttribute, drawContext, fillCb, strokeCb) {
         const {width: width = rectAttribute.width, height: height = rectAttribute.height, stroke: stroke = rectAttribute.stroke, strokeArrayColor: strokeArrayColor = rectAttribute.strokeArrayColor, strokeArrayWidth: strokeArrayWidth = rectAttribute.strokeArrayWidth, lineWidth: lineWidth = rectAttribute.lineWidth, strokeColor: strokeColor = rectAttribute.stroke} = rect.attribute;
         stroke && (Array.isArray(strokeArrayWidth) || 0 !== lineWidth) && (Array.isArray(stroke) || Array.isArray(strokeArrayColor) || Array.isArray(strokeArrayWidth)) && (("number" == typeof lineWidth && 1 & lineWidth || Array.isArray(strokeArrayWidth) && strokeArrayWidth.some((width => 1 & width))) && (x = Math.floor(x) + .5, 
         y = Math.floor(y) + .5), (0, group_contribution_render_1.renderStroke)(rect, context, x, y, rectAttribute, stroke, strokeArrayWidth || lineWidth, strokeArrayColor || strokeColor, Math.ceil(width), Math.ceil(height)));

package/cjs/scenegraph/graphic/contributions/rect-contribution-render.js.map

@@ -1 +1 @@
-{"version":3,"sources":["scenegraph/graphic/contributions/rect-contribution-render.ts"],"names":[],"mappings":"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","file":"rect-contribution-render.js","sourcesContent":["import { injectable } from 'inversify';\nimport type {\n  IRect,\n  IContext2d,\n  IRectGraphicAttribute,\n  IMarkAttribute,\n  IGraphicAttribute,\n  IThemeAttribute,\n  IRectRenderContribution,\n  IGroup,\n  IGroupGraphicAttribute\n} from '@visactor/vrender';\nimport { BaseRenderContributionTime } from '@visactor/vrender';\nimport { renderStroke } from './group-contribution-render';\n\n@injectable()\nexport class SplitRectBeforeRenderContribution implements IRectRenderContribution {\n  time: BaseRenderContributionTime = BaseRenderContributionTime.beforeFillStroke;\n  useStyle: boolean = true;\n  order: number = 0;\n  drawShape(\n    rect: IRect,\n    context: IContext2d,\n    x: number,\n    y: number,\n    doFill: boolean,\n    doStroke: boolean,\n    fVisible: boolean,\n    sVisible: boolean,\n    rectAttribute: Required<IRectGraphicAttribute>,\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    doFillOrStroke?: { doFill: boolean; doStroke: boolean }\n  ) {\n    // const { stroke = rectAttribute.stroke } = group.attribute as any;\n\n    // if (Array.isArray(stroke)) {\n    //   doFillOrStroke.doStroke = false;\n    // }\n\n    const {\n      stroke = rectAttribute.stroke,\n      strokeArrayWidth = (rectAttribute as any).strokeArrayWidth,\n      strokeArrayColor = (rectAttribute as any).strokeArrayColor\n    } = rect.attribute as any;\n\n    if (stroke && (Array.isArray(stroke) || Array.isArray(strokeArrayWidth) || Array.isArray(strokeArrayColor))) {\n      doFillOrStroke.doStroke = false;\n    }\n  }\n}\n\n@injectable()\nexport class SplitRectAfterRenderContribution implements IRectRenderContribution {\n  time: BaseRenderContributionTime = BaseRenderContributionTime.afterFillStroke;\n  useStyle: boolean = true;\n  order: number = 0;\n  drawShape(\n    rect: IRect,\n    context: IContext2d,\n    x: number,\n    y: number,\n    doFill: boolean,\n    doStroke: boolean,\n    fVisible: boolean,\n    sVisible: boolean,\n    rectAttribute: Required<IRectGraphicAttribute>,\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 {\n    //   width = rectAttribute.width,\n    //   height = rectAttribute.height,\n    //   stroke = rectAttribute.stroke\n    // } = group.attribute as any;\n\n    // if (!Array.isArray(stroke)) {\n    //   return;\n    // }\n\n    // context.setStrokeStyle(group, group.attribute, x, y, rectAttribute);\n    // // 单独处理每条边界，目前不考虑圆角\n    // context.beginPath();\n    // context.moveTo(x, y);\n    // // top\n    // if (stroke[0]) {\n    //   context.lineTo(x + width, y);\n    // } else {\n    //   context.moveTo(x + width, y);\n    // }\n    // // right\n    // if (stroke[1]) {\n    //   context.lineTo(x + width, y + height);\n    // } else {\n    //   context.moveTo(x + width, y + height);\n    // }\n    // // bottom\n    // if (stroke[2]) {\n    //   context.lineTo(x, y + height);\n    // } else {\n    //   context.moveTo(x, y + height);\n    // }\n    // // left\n    // if (stroke[3]) {\n    //   // 没有close path是，起点和终点不连续，需要调整y保证不出现缺口\n    //   const adjustY = stroke[0] ? y - context.lineWidth / 2 : y;\n    //   context.lineTo(x, adjustY);\n    // } else {\n    //   context.moveTo(x, y);\n    // }\n\n    // context.stroke();\n\n    const {\n      width = rectAttribute.width,\n      height = rectAttribute.height,\n      // 基础border\n      stroke = rectAttribute.stroke,\n      strokeArrayColor = (rectAttribute as any).strokeArrayColor,\n      strokeArrayWidth = (rectAttribute as any).strokeArrayWidth,\n\n      lineWidth = rectAttribute.lineWidth,\n      strokeColor = rectAttribute.stroke\n      // // select & hover border\n      // highlightStroke = (rectAttribute as any).highlightStroke,\n      // highlightStrokeArrayColor = (rectAttribute as any).highlightStrokeArrayColor,\n      // highlightStrokeArrayWidth = (rectAttribute as any).highlightStrokeArrayWidth,\n      // highlightStrokeArrayPart = (rectAttribute as any).highlightStrokeArrayPart,\n    } = rect.attribute as any;\n\n    if (!stroke || (!Array.isArray(strokeArrayWidth) && lineWidth === 0)) {\n      return;\n    }\n\n    if (Array.isArray(stroke) || Array.isArray(strokeArrayColor) || Array.isArray(strokeArrayWidth)) {\n      // let dx = 0;\n      // let dy = 0;\n      if (\n        (typeof lineWidth === 'number' && lineWidth & 1) ||\n        (Array.isArray(strokeArrayWidth) && strokeArrayWidth.some(width => width & 1))\n      ) {\n        x = Math.floor(x) + 0.5;\n        y = Math.floor(y) + 0.5;\n      }\n      renderStroke(\n        rect as IGroup,\n        context,\n        x,\n        y,\n        rectAttribute as Required<IGroupGraphicAttribute>,\n        stroke,\n        strokeArrayWidth || lineWidth,\n        strokeArrayColor || strokeColor,\n        Math.ceil(width),\n        Math.ceil(height)\n      );\n    }\n  }\n}\n\n// 判断是否为整数，如果是整数，需要偏移0.5px\nfunction isInteger(num: number) {\n  return num % 1 === 0;\n}\n"]}
+{"version":3,"sources":["scenegraph/graphic/contributions/rect-contribution-render.ts"],"names":[],"mappings":"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","file":"rect-contribution-render.js","sourcesContent":["import { injectable } from 'inversify';\nimport type {\n  IRect,\n  IContext2d,\n  IRectGraphicAttribute,\n  IMarkAttribute,\n  IGraphicAttribute,\n  IThemeAttribute,\n  IRectRenderContribution,\n  IGroup,\n  IGroupGraphicAttribute,\n  IDrawContext\n} from '@visactor/vrender';\nimport { BaseRenderContributionTime } from '@visactor/vrender';\nimport { renderStroke } from './group-contribution-render';\n\n@injectable()\nexport class SplitRectBeforeRenderContribution implements IRectRenderContribution {\n  time: BaseRenderContributionTime = BaseRenderContributionTime.beforeFillStroke;\n  useStyle: boolean = true;\n  order: number = 0;\n  drawShape(\n    rect: IRect,\n    context: IContext2d,\n    x: number,\n    y: number,\n    doFill: boolean,\n    doStroke: boolean,\n    fVisible: boolean,\n    sVisible: boolean,\n    rectAttribute: Required<IRectGraphicAttribute>,\n    drawContext: IDrawContext,\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    doFillOrStroke?: { doFill: boolean; doStroke: boolean }\n  ) {\n    // const { stroke = rectAttribute.stroke } = group.attribute as any;\n\n    // if (Array.isArray(stroke)) {\n    //   doFillOrStroke.doStroke = false;\n    // }\n\n    const {\n      stroke = rectAttribute.stroke,\n      strokeArrayWidth = (rectAttribute as any).strokeArrayWidth,\n      strokeArrayColor = (rectAttribute as any).strokeArrayColor\n    } = rect.attribute as any;\n\n    if (stroke && (Array.isArray(stroke) || Array.isArray(strokeArrayWidth) || Array.isArray(strokeArrayColor))) {\n      doFillOrStroke.doStroke = false;\n    }\n  }\n}\n\n@injectable()\nexport class SplitRectAfterRenderContribution implements IRectRenderContribution {\n  time: BaseRenderContributionTime = BaseRenderContributionTime.afterFillStroke;\n  useStyle: boolean = true;\n  order: number = 0;\n  drawShape(\n    rect: IRect,\n    context: IContext2d,\n    x: number,\n    y: number,\n    doFill: boolean,\n    doStroke: boolean,\n    fVisible: boolean,\n    sVisible: boolean,\n    rectAttribute: Required<IRectGraphicAttribute>,\n    drawContext: IDrawContext,\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 {\n    //   width = rectAttribute.width,\n    //   height = rectAttribute.height,\n    //   stroke = rectAttribute.stroke\n    // } = group.attribute as any;\n\n    // if (!Array.isArray(stroke)) {\n    //   return;\n    // }\n\n    // context.setStrokeStyle(group, group.attribute, x, y, rectAttribute);\n    // // 单独处理每条边界，目前不考虑圆角\n    // context.beginPath();\n    // context.moveTo(x, y);\n    // // top\n    // if (stroke[0]) {\n    //   context.lineTo(x + width, y);\n    // } else {\n    //   context.moveTo(x + width, y);\n    // }\n    // // right\n    // if (stroke[1]) {\n    //   context.lineTo(x + width, y + height);\n    // } else {\n    //   context.moveTo(x + width, y + height);\n    // }\n    // // bottom\n    // if (stroke[2]) {\n    //   context.lineTo(x, y + height);\n    // } else {\n    //   context.moveTo(x, y + height);\n    // }\n    // // left\n    // if (stroke[3]) {\n    //   // 没有close path是，起点和终点不连续，需要调整y保证不出现缺口\n    //   const adjustY = stroke[0] ? y - context.lineWidth / 2 : y;\n    //   context.lineTo(x, adjustY);\n    // } else {\n    //   context.moveTo(x, y);\n    // }\n\n    // context.stroke();\n\n    const {\n      width = rectAttribute.width,\n      height = rectAttribute.height,\n      // 基础border\n      stroke = rectAttribute.stroke,\n      strokeArrayColor = (rectAttribute as any).strokeArrayColor,\n      strokeArrayWidth = (rectAttribute as any).strokeArrayWidth,\n\n      lineWidth = rectAttribute.lineWidth,\n      strokeColor = rectAttribute.stroke\n      // // select & hover border\n      // highlightStroke = (rectAttribute as any).highlightStroke,\n      // highlightStrokeArrayColor = (rectAttribute as any).highlightStrokeArrayColor,\n      // highlightStrokeArrayWidth = (rectAttribute as any).highlightStrokeArrayWidth,\n      // highlightStrokeArrayPart = (rectAttribute as any).highlightStrokeArrayPart,\n    } = rect.attribute as any;\n\n    if (!stroke || (!Array.isArray(strokeArrayWidth) && lineWidth === 0)) {\n      return;\n    }\n\n    if (Array.isArray(stroke) || Array.isArray(strokeArrayColor) || Array.isArray(strokeArrayWidth)) {\n      // let dx = 0;\n      // let dy = 0;\n      if (\n        (typeof lineWidth === 'number' && lineWidth & 1) ||\n        (Array.isArray(strokeArrayWidth) && strokeArrayWidth.some(width => width & 1))\n      ) {\n        x = Math.floor(x) + 0.5;\n        y = Math.floor(y) + 0.5;\n      }\n      renderStroke(\n        rect as IGroup,\n        context,\n        x,\n        y,\n        rectAttribute as Required<IGroupGraphicAttribute>,\n        stroke,\n        strokeArrayWidth || lineWidth,\n        strokeArrayColor || strokeColor,\n        Math.ceil(width),\n        Math.ceil(height)\n      );\n    }\n  }\n}\n\n// 判断是否为整数，如果是整数，需要偏移0.5px\nfunction isInteger(num: number) {\n  return num % 1 === 0;\n}\n"]}

package/cjs/scenegraph/graphic/text.d.ts

@@ -0,0 +1,15 @@
+import type { ITextGraphicAttribute } from '@visactor/vrender';
+import { Text } from '@visactor/vrender';
+export interface IWrapTextGraphicAttribute extends ITextGraphicAttribute {
+    heightLimit?: number;
+    lineClamp?: number;
+    autoWrapText?: boolean;
+}
+export declare class WrapText extends Text {
+    attribute: IWrapTextGraphicAttribute;
+    constructor(params: IWrapTextGraphicAttribute);
+    updateSingallineAABBBounds(text: number | string): import("@visactor/vutils").AABBBounds;
+    updateMultilineAABBBounds(text: (number | string)[]): import("@visactor/vutils").AABBBounds;
+    needUpdateTags(keys: string[]): boolean;
+    needUpdateTag(key: string): boolean;
+}

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

@@ -4,9 +4,10 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.updateCell = exports.createCell = void 0;
 
-const global_1 = require("../../tools/global"), custom_1 = require("../component/custom"), group_1 = require("../graphic/group"), get_prop_1 = require("../utils/get-prop"), chart_cell_1 = require("./cell-type/chart-cell"), image_cell_1 = require("./cell-type/image-cell"), progress_bar_cell_1 = require("./cell-type/progress-bar-cell"), spark_line_cell_1 = require("./cell-type/spark-line-cell"), text_cell_1 = require("./cell-type/text-cell"), video_cell_1 = require("./cell-type/video-cell"), tableHelper_1 = require("../../core/tableHelper"), helper_1 = require("../../tools/helper"), deal_promise_data_1 = require("../utils/deal-promise-data");
+const global_1 = require("../../tools/global"), custom_1 = require("../component/custom"), group_1 = require("../graphic/group"), get_prop_1 = require("../utils/get-prop"), chart_cell_1 = require("./cell-type/chart-cell"), image_cell_1 = require("./cell-type/image-cell"), progress_bar_cell_1 = require("./cell-type/progress-bar-cell"), spark_line_cell_1 = require("./cell-type/spark-line-cell"), text_cell_1 = require("./cell-type/text-cell"), video_cell_1 = require("./cell-type/video-cell"), tableHelper_1 = require("../../core/tableHelper"), helper_1 = require("../../tools/helper"), deal_promise_data_1 = require("../utils/deal-promise-data"), axis_1 = require("../../components/axis/axis");
 
 function createCell(type, define, table, col, row, colWidth, bgColorFunc, cellWidth, cellHeight, columnGroup, y, padding, textAlign, textBaseline, mayHaveIcon, isMerge, range, cellTheme) {
+    var _a, _b;
     let cellGroup;
     if ("text" === type || "link" === type) {
         if ("link" === type) {
@@ -33,15 +34,20 @@ function createCell(type, define, table, col, row, colWidth, bgColorFunc, cellWi
         if ("body" !== table.getCellType(col, row) ? (customRender = null == define ? void 0 : define.headerCustomRender, 
         customLayout = null == define ? void 0 : define.headerCustomLayout) : (customRender = (null == define ? void 0 : define.customRender) || table.customRender, 
         customLayout = null == define ? void 0 : define.customLayout), customLayout || customRender) {
-            const {autoRowHeight: autoRowHeight} = table.internalProps, customResult = (0, custom_1.dealWithCustom)(customLayout, customRender, col, row, table.getColWidth(col), table.getRowHeight(row), !1, autoRowHeight, table);
+            const customResult = (0, custom_1.dealWithCustom)(customLayout, customRender, col, row, table.getColWidth(col), table.getRowHeight(row), !1, "autoHeight" === table.heightMode, table);
             customElementsGroup = customResult.elementsGroup, renderDefault = customResult.renderDefault;
         }
         cellGroup = (0, text_cell_1.createCellGroup)(table, columnGroup, 0, y, col, row, colWidth, cellWidth, cellHeight, padding, textAlign, textBaseline, mayHaveIcon, customElementsGroup, renderDefault, cellTheme), 
         isMerge && (cellGroup.mergeCol = range.end.col, cellGroup.mergeRow = range.end.row);
+        const axisConfig = table.internalProps.layoutMap.getAxisConfigInPivotChart(col, row);
+        if (axisConfig) {
+            const axis = new axis_1.CartesianAxis(axisConfig, cellGroup.attribute.width, cellGroup.attribute.height, table);
+            cellGroup.clear(), cellGroup.appendChild(axis.component), axis.overlap();
+        } else table.internalProps.layoutMap.isEmpty(col, row) && cellGroup.clear();
     } else if ("image" === type) cellGroup = (0, image_cell_1.createImageCellGroup)(columnGroup, 0, y, col, row, table.getColWidth(col), table.getRowHeight(row), define.keepAspectRatio, define.imageAutoSizing, padding, textAlign, textBaseline, table, cellTheme); else if ("video" === type) cellGroup = (0, 
     video_cell_1.createVideoCellGroup)(columnGroup, 0, y, col, row, table.getColWidth(col), table.getRowHeight(row), define.keepAspectRatio, define.imageAutoSizing, padding, textAlign, textBaseline, table, cellTheme); else if ("chart" === type) {
         const chartInstance = table.internalProps.layoutMap.getChartInstance(col, row);
-        cellGroup = (0, chart_cell_1.createChartCellGroup)(null, columnGroup, 0, y, col, row, table.getColWidth(col), table.getRowHeight(row), padding, table.getCellValue(col, row), define.chartType, define.chartSpec, chartInstance, table, cellTheme);
+        cellGroup = (0, chart_cell_1.createChartCellGroup)(null, columnGroup, 0, y, col, row, table.getColWidth(col), table.getRowHeight(row), padding, table.getCellValue(col, row), define.chartModule, table.isPivotChart() ? table.internalProps.layoutMap.getChartSpec(col, row) : define.chartSpec, chartInstance, null !== (_b = null === (_a = table.internalProps.layoutMap) || void 0 === _a ? void 0 : _a.getChartDataId(col, row)) && void 0 !== _b ? _b : "data", table, cellTheme);
     } else if ("progressbar" === type) {
         const style = table._getCellStyle(col, row), value = table.getCellValue(col, row), dataValue = table.getCellOriginValue(col, row);
         cellGroup = (0, text_cell_1.createCellGroup)(table, columnGroup, 0, y, col, row, colWidth, cellWidth, cellHeight, padding, textAlign, textBaseline, !1, null, !0, cellTheme);