@visactor/vrender 0.14.5 → 0.15.0-alpha.1

package/cjs/render/contributions/render/contributions/circle-contribution-render.js

@@ -18,28 +18,26 @@ let DefaultCircleRenderContribution = class {
         this.order = 0;
     }
     drawShape(circle, context, x, y, doFill, doStroke, fVisible, sVisible, circleAttribute, drawContext, fillCb, strokeCb) {
-        const {outerBorder: outerBorder, innerBorder: innerBorder} = circle.attribute, doOuterBorder = outerBorder && !1 !== outerBorder.visible, doInnerBorder = innerBorder && !1 !== innerBorder.visible;
-        if (!doOuterBorder && !doInnerBorder) return;
-        const {radius: radius = circleAttribute.radius, startAngle: startAngle = circleAttribute.startAngle, endAngle: endAngle = circleAttribute.endAngle, opacity: opacity = circleAttribute.opacity, x: originX = circleAttribute.x, y: originY = circleAttribute.y, scaleX: scaleX = circleAttribute.scaleX, scaleY: scaleY = circleAttribute.scaleY} = circle.attribute, doStrokeOuter = !(!outerBorder || !outerBorder.stroke), doStrokeInner = !(!innerBorder || !innerBorder.stroke);
-        if (doOuterBorder) {
+        const {radius: radius = circleAttribute.radius, startAngle: startAngle = circleAttribute.startAngle, endAngle: endAngle = circleAttribute.endAngle, opacity: opacity = circleAttribute.opacity, outerBorder: outerBorder, innerBorder: innerBorder} = circle.attribute;
+        if (outerBorder) {
             const {distance: distance = circleAttribute.outerBorder.distance} = outerBorder, dw = (0, 
             canvas_utils_1.getScaledStroke)(context, distance, context.dpr);
             if (context.beginPath(), context.arc(x, y, radius + dw, startAngle, endAngle), context.closePath(), 
             context.setShadowStyle && context.setShadowStyle(circle, circle.attribute, circleAttribute), 
-            strokeCb) strokeCb(context, outerBorder, circleAttribute.outerBorder); else if (doStrokeOuter) {
+            strokeCb) strokeCb(context, outerBorder, circleAttribute.outerBorder); else if (sVisible) {
                 const lastOpacity = circleAttribute.outerBorder.opacity;
-                circleAttribute.outerBorder.opacity = opacity, context.setStrokeStyle(circle, outerBorder, (originX - x) / scaleX, (originY - y) / scaleY, circleAttribute.outerBorder), 
+                circleAttribute.outerBorder.opacity = opacity, context.setStrokeStyle(circle, outerBorder, x, y, circleAttribute.outerBorder), 
                 circleAttribute.outerBorder.opacity = lastOpacity, context.stroke();
             }
         }
-        if (doInnerBorder) {
+        if (innerBorder) {
             const {distance: distance = circleAttribute.innerBorder.distance} = innerBorder, dw = (0, 
             canvas_utils_1.getScaledStroke)(context, distance, context.dpr);
             if (context.beginPath(), context.arc(x, y, radius - dw, startAngle, endAngle), context.closePath(), 
             context.setShadowStyle && context.setShadowStyle(circle, circle.attribute, circleAttribute), 
-            strokeCb) strokeCb(context, innerBorder, circleAttribute.innerBorder); else if (doStrokeInner) {
+            strokeCb) strokeCb(context, innerBorder, circleAttribute.innerBorder); else if (sVisible) {
                 const lastOpacity = circleAttribute.innerBorder.opacity;
-                circleAttribute.innerBorder.opacity = opacity, context.setStrokeStyle(circle, innerBorder, (originX - x) / scaleX, (originY - y) / scaleY, circleAttribute.innerBorder), 
+                circleAttribute.innerBorder.opacity = opacity, context.setStrokeStyle(circle, innerBorder, x, y, circleAttribute.innerBorder), 
                 circleAttribute.innerBorder.opacity = lastOpacity, context.stroke();
             }
         }

package/cjs/render/contributions/render/contributions/circle-contribution-render.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/render/contributions/render/contributions/circle-contribution-render.ts"],"names":[],"mappings":"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","file":"circle-contribution-render.js","sourcesContent":["import { injectable } from 'inversify';\nimport type {\n  IGraphicAttribute,\n  IContext2d,\n  IMarkAttribute,\n  ICircle,\n  ICircleGraphicAttribute,\n  IThemeAttribute,\n  ICircleRenderContribution,\n  IDrawContext\n} from '../../../../interface';\nimport { getScaledStroke } from '../../../../common/canvas-utils';\nimport {\n  DefaultBaseBackgroundRenderContribution,\n  DefaultBaseTextureRenderContribution\n} from './base-contribution-render';\nimport { BaseRenderContributionTime } from '../../../../common/enums';\n\n@injectable()\nexport class DefaultCircleRenderContribution implements ICircleRenderContribution {\n  time: BaseRenderContributionTime = BaseRenderContributionTime.afterFillStroke;\n  useStyle: boolean = true;\n  order: number = 0;\n  drawShape(\n    circle: ICircle,\n    context: IContext2d,\n    x: number,\n    y: number,\n    doFill: boolean,\n    doStroke: boolean,\n    fVisible: boolean,\n    sVisible: boolean,\n    circleAttribute: Required<ICircleGraphicAttribute>,\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 { outerBorder, innerBorder } = circle.attribute;\n    const doOuterBorder = outerBorder && outerBorder.visible !== false;\n    const doInnerBorder = innerBorder && innerBorder.visible !== false;\n    if (!(doOuterBorder || doInnerBorder)) {\n      return;\n    }\n    const {\n      radius = circleAttribute.radius,\n      startAngle = circleAttribute.startAngle,\n      endAngle = circleAttribute.endAngle,\n      opacity = circleAttribute.opacity,\n      x: originX = circleAttribute.x,\n      y: originY = circleAttribute.y,\n      scaleX = circleAttribute.scaleX,\n      scaleY = circleAttribute.scaleY\n    } = circle.attribute;\n\n    const doStrokeOuter = !!(outerBorder && outerBorder.stroke);\n    const doStrokeInner = !!(innerBorder && innerBorder.stroke);\n\n    if (doOuterBorder) {\n      const { distance = circleAttribute.outerBorder.distance } = outerBorder;\n      const d = getScaledStroke(context, distance as number, context.dpr);\n      const dw = d;\n      context.beginPath();\n      context.arc(x, y, radius + dw, startAngle, endAngle);\n      context.closePath();\n\n      // shadow\n      context.setShadowStyle && context.setShadowStyle(circle, circle.attribute, circleAttribute);\n\n      if (strokeCb) {\n        strokeCb(context, outerBorder, circleAttribute.outerBorder);\n      } else if (doStrokeOuter) {\n        // 存在stroke\n        const lastOpacity = (circleAttribute.outerBorder as any).opacity;\n        (circleAttribute.outerBorder as any).opacity = opacity;\n        context.setStrokeStyle(\n          circle,\n          outerBorder,\n          (originX - x) / scaleX,\n          (originY - y) / scaleY,\n          circleAttribute.outerBorder as any\n        );\n        (circleAttribute.outerBorder as any).opacity = lastOpacity;\n        context.stroke();\n      }\n    }\n\n    if (doInnerBorder) {\n      const { distance = circleAttribute.innerBorder.distance } = innerBorder;\n      const d = getScaledStroke(context, distance as number, context.dpr);\n      const dw = d;\n\n      context.beginPath();\n      context.arc(x, y, radius - dw, startAngle, endAngle);\n      context.closePath();\n\n      // shadow\n      context.setShadowStyle && context.setShadowStyle(circle, circle.attribute, circleAttribute);\n\n      if (strokeCb) {\n        strokeCb(context, innerBorder, circleAttribute.innerBorder);\n      } else if (doStrokeInner) {\n        // 存在stroke\n        const lastOpacity = (circleAttribute.innerBorder as any).opacity;\n        (circleAttribute.innerBorder as any).opacity = opacity;\n        context.setStrokeStyle(\n          circle,\n          innerBorder,\n          (originX - x) / scaleX,\n          (originY - y) / scaleY,\n          circleAttribute.innerBorder as any\n        );\n        (circleAttribute.innerBorder as any).opacity = lastOpacity;\n        context.stroke();\n      }\n    }\n  }\n}\n\n@injectable()\nexport class DefaultCircleBackgroundRenderContribution\n  extends DefaultBaseBackgroundRenderContribution\n  implements ICircleRenderContribution\n{\n  time: BaseRenderContributionTime = BaseRenderContributionTime.beforeFillStroke;\n}\n\n@injectable()\nexport class DefaultCircleTextureRenderContribution\n  extends DefaultBaseTextureRenderContribution\n  implements ICircleRenderContribution\n{\n  time: BaseRenderContributionTime = BaseRenderContributionTime.afterFillStroke;\n}\n"]}
+{"version":3,"sources":["../../src/render/contributions/render/contributions/circle-contribution-render.ts"],"names":[],"mappings":"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","file":"circle-contribution-render.js","sourcesContent":["import { injectable } from 'inversify';\nimport type {\n  IGraphicAttribute,\n  IContext2d,\n  IMarkAttribute,\n  ICircle,\n  ICircleGraphicAttribute,\n  IThemeAttribute,\n  ICircleRenderContribution,\n  IDrawContext\n} from '../../../../interface';\nimport { getScaledStroke } from '../../../../common/canvas-utils';\nimport {\n  DefaultBaseBackgroundRenderContribution,\n  DefaultBaseTextureRenderContribution\n} from './base-contribution-render';\nimport { BaseRenderContributionTime } from '../../../../common/enums';\n\n@injectable()\nexport class DefaultCircleRenderContribution implements ICircleRenderContribution {\n  time: BaseRenderContributionTime = BaseRenderContributionTime.afterFillStroke;\n  useStyle: boolean = true;\n  order: number = 0;\n  drawShape(\n    circle: ICircle,\n    context: IContext2d,\n    x: number,\n    y: number,\n    doFill: boolean,\n    doStroke: boolean,\n    fVisible: boolean,\n    sVisible: boolean,\n    circleAttribute: Required<ICircleGraphicAttribute>,\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      radius = circleAttribute.radius,\n      startAngle = circleAttribute.startAngle,\n      endAngle = circleAttribute.endAngle,\n      opacity = circleAttribute.opacity,\n      outerBorder,\n      innerBorder\n    } = circle.attribute;\n\n    if (outerBorder) {\n      const { distance = circleAttribute.outerBorder.distance } = outerBorder;\n      const d = getScaledStroke(context, distance as number, context.dpr);\n      const dw = d;\n      context.beginPath();\n      context.arc(x, y, radius + dw, startAngle, endAngle);\n      context.closePath();\n\n      // shadow\n      context.setShadowStyle && context.setShadowStyle(circle, circle.attribute, circleAttribute);\n\n      if (strokeCb) {\n        strokeCb(context, outerBorder, circleAttribute.outerBorder);\n      } else if (sVisible) {\n        // 存在stroke\n        const lastOpacity = (circleAttribute.outerBorder as any).opacity;\n        (circleAttribute.outerBorder as any).opacity = opacity;\n        context.setStrokeStyle(circle, outerBorder, x, y, circleAttribute.outerBorder as any);\n        (circleAttribute.outerBorder as any).opacity = lastOpacity;\n        context.stroke();\n      }\n    }\n\n    if (innerBorder) {\n      const { distance = circleAttribute.innerBorder.distance } = innerBorder;\n      const d = getScaledStroke(context, distance as number, context.dpr);\n      const dw = d;\n\n      context.beginPath();\n      context.arc(x, y, radius - dw, startAngle, endAngle);\n      context.closePath();\n\n      // shadow\n      context.setShadowStyle && context.setShadowStyle(circle, circle.attribute, circleAttribute);\n\n      if (strokeCb) {\n        strokeCb(context, innerBorder, circleAttribute.innerBorder);\n      } else if (sVisible) {\n        // 存在stroke\n        const lastOpacity = (circleAttribute.innerBorder as any).opacity;\n        (circleAttribute.innerBorder as any).opacity = opacity;\n        context.setStrokeStyle(circle, innerBorder, x, y, circleAttribute.innerBorder as any);\n        (circleAttribute.innerBorder as any).opacity = lastOpacity;\n        context.stroke();\n      }\n    }\n  }\n}\n\n@injectable()\nexport class DefaultCircleBackgroundRenderContribution\n  extends DefaultBaseBackgroundRenderContribution\n  implements ICircleRenderContribution\n{\n  time: BaseRenderContributionTime = BaseRenderContributionTime.beforeFillStroke;\n}\n\n@injectable()\nexport class DefaultCircleTextureRenderContribution\n  extends DefaultBaseTextureRenderContribution\n  implements ICircleRenderContribution\n{\n  time: BaseRenderContributionTime = BaseRenderContributionTime.afterFillStroke;\n}\n"]}

package/cjs/render/contributions/render/contributions/rect-contribution-render.js

@@ -18,32 +18,30 @@ let DefaultRectRenderContribution = class {
         this.order = 0;
     }
     drawShape(rect, context, x, y, doFill, doStroke, fVisible, sVisible, rectAttribute, drawContext, fillCb, strokeCb) {
-        const {outerBorder: outerBorder, innerBorder: innerBorder} = rect.attribute, doOuterBorder = outerBorder && !1 !== outerBorder.visible, doInnerBorder = innerBorder && !1 !== innerBorder.visible;
-        if (!doOuterBorder && !doInnerBorder) return;
-        const {width: width = rectAttribute.width, height: height = rectAttribute.height, cornerRadius: cornerRadius = rectAttribute.cornerRadius, opacity: opacity = rectAttribute.opacity, x: originX = rectAttribute.x, y: originY = rectAttribute.y, scaleX: scaleX = rectAttribute.scaleX, scaleY: scaleY = rectAttribute.scaleY} = rect.attribute, doStrokeOuter = !(!outerBorder || !outerBorder.stroke), doStrokeInner = !(!innerBorder || !innerBorder.stroke);
-        if (doOuterBorder) {
+        const {width: width = rectAttribute.width, height: height = rectAttribute.height, cornerRadius: cornerRadius = rectAttribute.cornerRadius, opacity: opacity = rectAttribute.opacity, outerBorder: outerBorder, innerBorder: innerBorder} = rect.attribute;
+        if (outerBorder) {
             const {distance: distance = rectAttribute.outerBorder.distance} = outerBorder, d = (0, 
             canvas_utils_1.getScaledStroke)(context, distance, context.dpr), nextX = x - d, nextY = y - d, dw = 2 * d;
             if (0 === cornerRadius || (0, vutils_1.isArray)(cornerRadius) && cornerRadius.every((num => 0 === num)) ? (context.beginPath(), 
             context.rect(nextX, nextY, width + dw, height + dw)) : (context.beginPath(), (0, 
             rect_1.createRectPath)(context, nextX, nextY, width + dw, height + dw, cornerRadius)), 
             context.setShadowStyle && context.setShadowStyle(rect, rect.attribute, rectAttribute), 
-            strokeCb) strokeCb(context, outerBorder, rectAttribute.outerBorder); else if (doStrokeOuter) {
+            strokeCb) strokeCb(context, outerBorder, rectAttribute.outerBorder); else if (sVisible) {
                 const lastOpacity = rectAttribute.outerBorder.opacity;
-                rectAttribute.outerBorder.opacity = opacity, context.setStrokeStyle(rect, outerBorder, (originX - x) / scaleX, (originY - y) / scaleY, rectAttribute.outerBorder), 
+                rectAttribute.outerBorder.opacity = opacity, context.setStrokeStyle(rect, outerBorder, x, y, rectAttribute.outerBorder), 
                 rectAttribute.outerBorder.opacity = lastOpacity, context.stroke();
             }
         }
-        if (doInnerBorder) {
+        if (innerBorder) {
             const {distance: distance = rectAttribute.innerBorder.distance} = innerBorder, d = (0, 
             canvas_utils_1.getScaledStroke)(context, distance, context.dpr), nextX = x + d, nextY = y + d, dw = 2 * d;
             if (0 === cornerRadius || (0, vutils_1.isArray)(cornerRadius) && cornerRadius.every((num => 0 === num)) ? (context.beginPath(), 
             context.rect(nextX, nextY, width - dw, height - dw)) : (context.beginPath(), (0, 
             rect_1.createRectPath)(context, nextX, nextY, width - dw, height - dw, cornerRadius)), 
             context.setShadowStyle && context.setShadowStyle(rect, rect.attribute, rectAttribute), 
-            strokeCb) strokeCb(context, innerBorder, rectAttribute.innerBorder); else if (doStrokeInner) {
+            strokeCb) strokeCb(context, innerBorder, rectAttribute.innerBorder); else if (sVisible) {
                 const lastOpacity = rectAttribute.innerBorder.opacity;
-                rectAttribute.innerBorder.opacity = opacity, context.setStrokeStyle(rect, innerBorder, (originX - x) / scaleX, (originY - y) / scaleY, rectAttribute.innerBorder), 
+                rectAttribute.innerBorder.opacity = opacity, context.setStrokeStyle(rect, innerBorder, x, y, rectAttribute.innerBorder), 
                 rectAttribute.innerBorder.opacity = lastOpacity, context.stroke();
             }
         }

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

@@ -1 +1 @@
-{"version":3,"sources":["../../src/render/contributions/render/contributions/rect-contribution-render.ts"],"names":[],"mappings":"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","file":"rect-contribution-render.js","sourcesContent":["import { isArray } from '@visactor/vutils';\nimport { injectable } from 'inversify';\nimport type {\n  IGraphicAttribute,\n  IContext2d,\n  IMarkAttribute,\n  IRect,\n  IRectGraphicAttribute,\n  IThemeAttribute,\n  IRectRenderContribution,\n  IDrawContext\n} from '../../../../interface';\nimport { getScaledStroke } from '../../../../common/canvas-utils';\nimport {\n  DefaultBaseBackgroundRenderContribution,\n  DefaultBaseTextureRenderContribution\n} from './base-contribution-render';\nimport { createRectPath } from '../../../../common/shape/rect';\nimport { BaseRenderContributionTime } from '../../../../common/enums';\n\n@injectable()\nexport class DefaultRectRenderContribution 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 { outerBorder, innerBorder } = rect.attribute;\n    const doOuterBorder = outerBorder && outerBorder.visible !== false;\n    const doInnerBorder = innerBorder && innerBorder.visible !== false;\n    if (!(doOuterBorder || doInnerBorder)) {\n      return;\n    }\n    const {\n      width = rectAttribute.width,\n      height = rectAttribute.height,\n      cornerRadius = rectAttribute.cornerRadius,\n      opacity = rectAttribute.opacity,\n      x: originX = rectAttribute.x,\n      y: originY = rectAttribute.y,\n      scaleX = rectAttribute.scaleX,\n      scaleY = rectAttribute.scaleY\n    } = rect.attribute;\n\n    const doStrokeOuter = !!(outerBorder && outerBorder.stroke);\n    const doStrokeInner = !!(innerBorder && innerBorder.stroke);\n\n    if (doOuterBorder) {\n      const { distance = rectAttribute.outerBorder.distance } = outerBorder;\n      const d = getScaledStroke(context, distance as number, context.dpr);\n      const nextX = x - d;\n      const nextY = y - d;\n      const dw = d * 2;\n      if (cornerRadius === 0 || (isArray(cornerRadius) && (<number[]>cornerRadius).every(num => num === 0))) {\n        // 不需要处理圆角\n        context.beginPath();\n        context.rect(nextX, nextY, width + dw, height + dw);\n      } else {\n        context.beginPath();\n\n        // 测试后，cache对于重绘性能提升不大，但是在首屏有一定性能损耗，因此rect不再使用cache\n        createRectPath(context, nextX, nextY, width + dw, height + dw, cornerRadius);\n      }\n\n      // shadow\n      context.setShadowStyle && context.setShadowStyle(rect, rect.attribute, rectAttribute);\n\n      if (strokeCb) {\n        strokeCb(context, outerBorder, rectAttribute.outerBorder);\n      } else if (doStrokeOuter) {\n        // 存在stroke\n        const lastOpacity = (rectAttribute.outerBorder as any).opacity;\n        (rectAttribute.outerBorder as any).opacity = opacity;\n        context.setStrokeStyle(\n          rect,\n          outerBorder,\n          (originX - x) / scaleX,\n          (originY - y) / scaleY,\n          rectAttribute.outerBorder as any\n        );\n        (rectAttribute.outerBorder as any).opacity = lastOpacity;\n        context.stroke();\n      }\n    }\n\n    if (doInnerBorder) {\n      const { distance = rectAttribute.innerBorder.distance } = innerBorder;\n      const d = getScaledStroke(context, distance as number, context.dpr);\n      const nextX = x + d;\n      const nextY = y + d;\n      const dw = d * 2;\n      if (cornerRadius === 0 || (isArray(cornerRadius) && (<number[]>cornerRadius).every(num => num === 0))) {\n        // 不需要处理圆角\n        context.beginPath();\n        context.rect(nextX, nextY, width - dw, height - dw);\n      } else {\n        context.beginPath();\n\n        // 测试后，cache对于重绘性能提升不大，但是在首屏有一定性能损耗，因此rect不再使用cache\n        createRectPath(context, nextX, nextY, width - dw, height - dw, cornerRadius);\n      }\n\n      // shadow\n      context.setShadowStyle && context.setShadowStyle(rect, rect.attribute, rectAttribute);\n\n      if (strokeCb) {\n        strokeCb(context, innerBorder, rectAttribute.innerBorder);\n      } else if (doStrokeInner) {\n        // 存在stroke\n        const lastOpacity = (rectAttribute.innerBorder as any).opacity;\n        (rectAttribute.innerBorder as any).opacity = opacity;\n        context.setStrokeStyle(\n          rect,\n          innerBorder,\n          (originX - x) / scaleX,\n          (originY - y) / scaleY,\n          rectAttribute.innerBorder as any\n        );\n        (rectAttribute.innerBorder as any).opacity = lastOpacity;\n        context.stroke();\n      }\n    }\n  }\n}\n\n@injectable()\nexport class DefaultRectBackgroundRenderContribution\n  extends DefaultBaseBackgroundRenderContribution\n  implements IRectRenderContribution\n{\n  time: BaseRenderContributionTime = BaseRenderContributionTime.beforeFillStroke;\n}\n\n@injectable()\nexport class DefaultRectTextureRenderContribution\n  extends DefaultBaseTextureRenderContribution\n  implements IRectRenderContribution\n{\n  time: BaseRenderContributionTime = BaseRenderContributionTime.afterFillStroke;\n}\n\n@injectable()\nexport class SplitRectBeforeRenderContribution implements IRectRenderContribution {\n  time: BaseRenderContributionTime = BaseRenderContributionTime.beforeFillStroke;\n  useStyle: boolean = true;\n  order: number = 0;\n  drawShape(\n    group: IRect,\n    context: IContext2d,\n    x: number,\n    y: number,\n    doFill: boolean,\n    doStroke: boolean,\n    fVisible: boolean,\n    sVisible: boolean,\n    groupAttribute: 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 = groupAttribute.stroke } = group.attribute as any;\n\n    // 数组且存在为false的项目，那就不绘制\n    if (Array.isArray(stroke) && stroke.some(s => s === false)) {\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    groupAttribute: 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 = groupAttribute.width,\n      height = groupAttribute.height,\n      stroke = groupAttribute.stroke\n    } = rect.attribute as any;\n\n    // 不是数组\n    if (!(Array.isArray(stroke) && stroke.some(s => s === false))) {\n      return;\n    }\n\n    context.setStrokeStyle(rect, rect.attribute, x, y, groupAttribute);\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}\n"]}
+{"version":3,"sources":["../../src/render/contributions/render/contributions/rect-contribution-render.ts"],"names":[],"mappings":"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","file":"rect-contribution-render.js","sourcesContent":["import { isArray } from '@visactor/vutils';\nimport { injectable } from 'inversify';\nimport type {\n  IGraphicAttribute,\n  IContext2d,\n  IMarkAttribute,\n  IRect,\n  IRectGraphicAttribute,\n  IThemeAttribute,\n  IRectRenderContribution,\n  IDrawContext\n} from '../../../../interface';\nimport { getScaledStroke } from '../../../../common/canvas-utils';\nimport {\n  DefaultBaseBackgroundRenderContribution,\n  DefaultBaseTextureRenderContribution\n} from './base-contribution-render';\nimport { createRectPath } from '../../../../common/shape/rect';\nimport { BaseRenderContributionTime } from '../../../../common/enums';\n\n@injectable()\nexport class DefaultRectRenderContribution 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      cornerRadius = rectAttribute.cornerRadius,\n      opacity = rectAttribute.opacity,\n      outerBorder,\n      innerBorder\n    } = rect.attribute;\n\n    if (outerBorder) {\n      const { distance = rectAttribute.outerBorder.distance } = outerBorder;\n      const d = getScaledStroke(context, distance as number, context.dpr);\n      const nextX = x - d;\n      const nextY = y - d;\n      const dw = d * 2;\n      if (cornerRadius === 0 || (isArray(cornerRadius) && (<number[]>cornerRadius).every(num => num === 0))) {\n        // 不需要处理圆角\n        context.beginPath();\n        context.rect(nextX, nextY, width + dw, height + dw);\n      } else {\n        context.beginPath();\n\n        // 测试后，cache对于重绘性能提升不大，但是在首屏有一定性能损耗，因此rect不再使用cache\n        createRectPath(context, nextX, nextY, width + dw, height + dw, cornerRadius);\n      }\n\n      // shadow\n      context.setShadowStyle && context.setShadowStyle(rect, rect.attribute, rectAttribute);\n\n      if (strokeCb) {\n        strokeCb(context, outerBorder, rectAttribute.outerBorder);\n      } else if (sVisible) {\n        // 存在stroke\n        const lastOpacity = (rectAttribute.outerBorder as any).opacity;\n        (rectAttribute.outerBorder as any).opacity = opacity;\n        context.setStrokeStyle(rect, outerBorder, x, y, rectAttribute.outerBorder as any);\n        (rectAttribute.outerBorder as any).opacity = lastOpacity;\n        context.stroke();\n      }\n    }\n\n    if (innerBorder) {\n      const { distance = rectAttribute.innerBorder.distance } = innerBorder;\n      const d = getScaledStroke(context, distance as number, context.dpr);\n      const nextX = x + d;\n      const nextY = y + d;\n      const dw = d * 2;\n      if (cornerRadius === 0 || (isArray(cornerRadius) && (<number[]>cornerRadius).every(num => num === 0))) {\n        // 不需要处理圆角\n        context.beginPath();\n        context.rect(nextX, nextY, width - dw, height - dw);\n      } else {\n        context.beginPath();\n\n        // 测试后，cache对于重绘性能提升不大，但是在首屏有一定性能损耗，因此rect不再使用cache\n        createRectPath(context, nextX, nextY, width - dw, height - dw, cornerRadius);\n      }\n\n      // shadow\n      context.setShadowStyle && context.setShadowStyle(rect, rect.attribute, rectAttribute);\n\n      if (strokeCb) {\n        strokeCb(context, innerBorder, rectAttribute.innerBorder);\n      } else if (sVisible) {\n        // 存在stroke\n        const lastOpacity = (rectAttribute.innerBorder as any).opacity;\n        (rectAttribute.innerBorder as any).opacity = opacity;\n        context.setStrokeStyle(rect, innerBorder, x, y, rectAttribute.innerBorder as any);\n        (rectAttribute.innerBorder as any).opacity = lastOpacity;\n        context.stroke();\n      }\n    }\n  }\n}\n\n@injectable()\nexport class DefaultRectBackgroundRenderContribution\n  extends DefaultBaseBackgroundRenderContribution\n  implements IRectRenderContribution\n{\n  time: BaseRenderContributionTime = BaseRenderContributionTime.beforeFillStroke;\n}\n\n@injectable()\nexport class DefaultRectTextureRenderContribution\n  extends DefaultBaseTextureRenderContribution\n  implements IRectRenderContribution\n{\n  time: BaseRenderContributionTime = BaseRenderContributionTime.afterFillStroke;\n}\n\n@injectable()\nexport class SplitRectBeforeRenderContribution implements IRectRenderContribution {\n  time: BaseRenderContributionTime = BaseRenderContributionTime.beforeFillStroke;\n  useStyle: boolean = true;\n  order: number = 0;\n  drawShape(\n    group: IRect,\n    context: IContext2d,\n    x: number,\n    y: number,\n    doFill: boolean,\n    doStroke: boolean,\n    fVisible: boolean,\n    sVisible: boolean,\n    groupAttribute: 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 = groupAttribute.stroke } = group.attribute as any;\n\n    // 数组且存在为false的项目，那就不绘制\n    if (Array.isArray(stroke) && stroke.some(s => s === false)) {\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    groupAttribute: 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 = groupAttribute.width,\n      height = groupAttribute.height,\n      stroke = groupAttribute.stroke\n    } = rect.attribute as any;\n\n    // 不是数组\n    if (!(Array.isArray(stroke) && stroke.some(s => s === false))) {\n      return;\n    }\n\n    context.setStrokeStyle(rect, rect.attribute, x, y, groupAttribute);\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}\n"]}

package/cjs/render/contributions/render/contributions/symbol-contribution-render.js

@@ -18,31 +18,29 @@ let DefaultSymbolRenderContribution = class {
         this.order = 0;
     }
     drawShape(symbol, context, x, y, doFill, doStroke, fVisible, sVisible, symbolAttribute, drawContext, fillCb, strokeCb) {
-        const parsedPath = symbol.getParsedPath();
-        if (!parsedPath) return;
-        const {outerBorder: outerBorder, innerBorder: innerBorder} = symbol.attribute, doOuterBorder = outerBorder && !1 !== outerBorder.visible, doInnerBorder = innerBorder && !1 !== innerBorder.visible;
-        if (!doOuterBorder && !doInnerBorder) return;
-        const {size: size = symbolAttribute.size, opacity: opacity = symbolAttribute.opacity, x: originX = symbolAttribute.x, y: originY = symbolAttribute.y, scaleX: scaleX = symbolAttribute.scaleX, scaleY: scaleY = symbolAttribute.scaleY} = symbol.attribute, doStrokeOuter = !(!outerBorder || !outerBorder.stroke), doStrokeInner = !(!innerBorder || !innerBorder.stroke);
-        if (doOuterBorder) {
-            const {distance: distance = symbolAttribute.outerBorder.distance} = outerBorder, d = (0, 
-            canvas_utils_1.getScaledStroke)(context, distance, context.dpr);
-            if (context.beginPath(), !1 === parsedPath.drawOffset(context, size, x, y, d) && context.closePath(), 
-            context.setShadowStyle && context.setShadowStyle(symbol, symbol.attribute, symbolAttribute), 
-            strokeCb) strokeCb(context, outerBorder, symbolAttribute.outerBorder); else if (doStrokeOuter) {
-                const lastOpacity = symbolAttribute.outerBorder.opacity;
-                symbolAttribute.outerBorder.opacity = opacity, context.setStrokeStyle(symbol, outerBorder, (originX - x) / scaleX, (originY - y) / scaleY, symbolAttribute.outerBorder), 
-                symbolAttribute.outerBorder.opacity = lastOpacity, context.stroke();
+        const {size: size = symbolAttribute.size, opacity: opacity = symbolAttribute.opacity, outerBorder: outerBorder, innerBorder: innerBorder} = symbol.attribute, parsedPath = symbol.getParsedPath();
+        if (parsedPath) {
+            if (outerBorder) {
+                const {distance: distance = symbolAttribute.outerBorder.distance} = outerBorder, d = (0, 
+                canvas_utils_1.getScaledStroke)(context, distance, context.dpr);
+                if (context.beginPath(), !1 === parsedPath.drawOffset(context, size, x, y, d) && context.closePath(), 
+                context.setShadowStyle && context.setShadowStyle(symbol, symbol.attribute, symbolAttribute), 
+                strokeCb) strokeCb(context, outerBorder, symbolAttribute.outerBorder); else if (sVisible) {
+                    const lastOpacity = symbolAttribute.outerBorder.opacity;
+                    symbolAttribute.outerBorder.opacity = opacity, context.setStrokeStyle(symbol, outerBorder, x, y, symbolAttribute.outerBorder), 
+                    symbolAttribute.outerBorder.opacity = lastOpacity, context.stroke();
+                }
             }
-        }
-        if (doInnerBorder) {
-            const {distance: distance = symbolAttribute.innerBorder.distance} = innerBorder, d = (0, 
-            canvas_utils_1.getScaledStroke)(context, distance, context.dpr);
-            if (context.beginPath(), !1 === parsedPath.drawOffset(context, size, x, y, -d) && context.closePath(), 
-            context.setShadowStyle && context.setShadowStyle(symbol, symbol.attribute, symbolAttribute), 
-            strokeCb) strokeCb(context, innerBorder, symbolAttribute.innerBorder); else if (doStrokeInner) {
-                const lastOpacity = symbolAttribute.innerBorder.opacity;
-                symbolAttribute.innerBorder.opacity = opacity, context.setStrokeStyle(symbol, innerBorder, (originX - x) / scaleX, (originY - y) / scaleY, symbolAttribute.innerBorder), 
-                symbolAttribute.innerBorder.opacity = lastOpacity, context.stroke();
+            if (innerBorder) {
+                const {distance: distance = symbolAttribute.innerBorder.distance} = innerBorder, d = (0, 
+                canvas_utils_1.getScaledStroke)(context, distance, context.dpr);
+                if (context.beginPath(), !1 === parsedPath.drawOffset(context, size, x, y, -d) && context.closePath(), 
+                context.setShadowStyle && context.setShadowStyle(symbol, symbol.attribute, symbolAttribute), 
+                strokeCb) strokeCb(context, innerBorder, symbolAttribute.innerBorder); else if (sVisible) {
+                    const lastOpacity = symbolAttribute.innerBorder.opacity;
+                    symbolAttribute.innerBorder.opacity = opacity, context.setStrokeStyle(symbol, innerBorder, x, y, symbolAttribute.innerBorder), 
+                    symbolAttribute.innerBorder.opacity = lastOpacity, context.stroke();
+                }
             }
         }
     }

package/cjs/render/contributions/render/contributions/symbol-contribution-render.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/render/contributions/render/contributions/symbol-contribution-render.ts"],"names":[],"mappings":";;;;;;;;;AAAA,yCAAuC;AAWvC,kEAAkE;AAClE,yEAGoC;AACpC,oDAAsE;AAG/D,IAAM,+BAA+B,GAArC,MAAM,+BAA+B;IAArC;QACL,SAAI,GAA+B,kCAA0B,CAAC,eAAe,CAAC;QAC9E,aAAQ,GAAY,IAAI,CAAC;QACzB,UAAK,GAAW,CAAC,CAAC;IA4GpB,CAAC;IA3GC,SAAS,CACP,MAAe,EACf,OAAmB,EACnB,CAAS,EACT,CAAS,EACT,MAAe,EACf,QAAiB,EACjB,QAAiB,EACjB,QAAiB,EACjB,eAAkD,EAClD,WAAyB,EACzB,MAIY,EACZ,QAIY;QAEZ,MAAM,UAAU,GAAG,MAAM,CAAC,aAAa,EAAE,CAAC;QAE1C,IAAI,CAAC,UAAU,EAAE;YACf,OAAO;SACR;QAED,MAAM,EAAE,WAAW,EAAE,WAAW,EAAE,GAAG,MAAM,CAAC,SAAS,CAAC;QACtD,MAAM,aAAa,GAAG,WAAW,IAAI,WAAW,CAAC,OAAO,KAAK,KAAK,CAAC;QACnE,MAAM,aAAa,GAAG,WAAW,IAAI,WAAW,CAAC,OAAO,KAAK,KAAK,CAAC;QACnE,IAAI,CAAC,CAAC,aAAa,IAAI,aAAa,CAAC,EAAE;YACrC,OAAO;SACR;QAED,MAAM,EACJ,IAAI,GAAG,eAAe,CAAC,IAAI,EAC3B,OAAO,GAAG,eAAe,CAAC,OAAO,EACjC,CAAC,EAAE,OAAO,GAAG,eAAe,CAAC,CAAC,EAC9B,CAAC,EAAE,OAAO,GAAG,eAAe,CAAC,CAAC,EAC9B,MAAM,GAAG,eAAe,CAAC,MAAM,EAC/B,MAAM,GAAG,eAAe,CAAC,MAAM,EAChC,GAAG,MAAM,CAAC,SAAS,CAAC;QAErB,MAAM,aAAa,GAAG,CAAC,CAAC,CAAC,WAAW,IAAI,WAAW,CAAC,MAAM,CAAC,CAAC;QAC5D,MAAM,aAAa,GAAG,CAAC,CAAC,CAAC,WAAW,IAAI,WAAW,CAAC,MAAM,CAAC,CAAC;QAE5D,IAAI,aAAa,EAAE;YACjB,MAAM,EAAE,QAAQ,GAAG,eAAe,CAAC,WAAW,CAAC,QAAQ,EAAE,GAAG,WAAW,CAAC;YACxE,MAAM,CAAC,GAAG,IAAA,8BAAe,EAAC,OAAO,EAAE,QAAkB,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC;YAEpE,OAAO,CAAC,SAAS,EAAE,CAAC;YACpB,IAAI,UAAU,CAAC,UAAU,CAAC,OAAO,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,KAAK,KAAK,EAAE;gBAC3D,OAAO,CAAC,SAAS,EAAE,CAAC;aACrB;YAGD,OAAO,CAAC,cAAc,IAAI,OAAO,CAAC,cAAc,CAAC,MAAM,EAAE,MAAM,CAAC,SAAS,EAAE,eAAe,CAAC,CAAC;YAE5F,IAAI,QAAQ,EAAE;gBACZ,QAAQ,CAAC,OAAO,EAAE,WAAW,EAAE,eAAe,CAAC,WAAW,CAAC,CAAC;aAC7D;iBAAM,IAAI,aAAa,EAAE;gBAExB,MAAM,WAAW,GAAI,eAAe,CAAC,WAAmB,CAAC,OAAO,CAAC;gBAChE,eAAe,CAAC,WAAmB,CAAC,OAAO,GAAG,OAAO,CAAC;gBACvD,OAAO,CAAC,cAAc,CACpB,MAAM,EACN,WAAW,EACX,CAAC,OAAO,GAAG,CAAC,CAAC,GAAG,MAAM,EACtB,CAAC,OAAO,GAAG,CAAC,CAAC,GAAG,MAAM,EACtB,eAAe,CAAC,WAAkB,CACnC,CAAC;gBACD,eAAe,CAAC,WAAmB,CAAC,OAAO,GAAG,WAAW,CAAC;gBAC3D,OAAO,CAAC,MAAM,EAAE,CAAC;aAClB;SACF;QAED,IAAI,aAAa,EAAE;YACjB,MAAM,EAAE,QAAQ,GAAG,eAAe,CAAC,WAAW,CAAC,QAAQ,EAAE,GAAG,WAAW,CAAC;YACxE,MAAM,CAAC,GAAG,IAAA,8BAAe,EAAC,OAAO,EAAE,QAAkB,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC;YAEpE,OAAO,CAAC,SAAS,EAAE,CAAC;YACpB,IAAI,UAAU,CAAC,UAAU,CAAC,OAAO,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,KAAK,EAAE;gBAC5D,OAAO,CAAC,SAAS,EAAE,CAAC;aACrB;YAGD,OAAO,CAAC,cAAc,IAAI,OAAO,CAAC,cAAc,CAAC,MAAM,EAAE,MAAM,CAAC,SAAS,EAAE,eAAe,CAAC,CAAC;YAE5F,IAAI,QAAQ,EAAE;gBACZ,QAAQ,CAAC,OAAO,EAAE,WAAW,EAAE,eAAe,CAAC,WAAW,CAAC,CAAC;aAC7D;iBAAM,IAAI,aAAa,EAAE;gBAExB,MAAM,WAAW,GAAI,eAAe,CAAC,WAAmB,CAAC,OAAO,CAAC;gBAChE,eAAe,CAAC,WAAmB,CAAC,OAAO,GAAG,OAAO,CAAC;gBACvD,OAAO,CAAC,cAAc,CACpB,MAAM,EACN,WAAW,EACX,CAAC,OAAO,GAAG,CAAC,CAAC,GAAG,MAAM,EACtB,CAAC,OAAO,GAAG,CAAC,CAAC,GAAG,MAAM,EACtB,eAAe,CAAC,WAAkB,CACnC,CAAC;gBACD,eAAe,CAAC,WAAmB,CAAC,OAAO,GAAG,WAAW,CAAC;gBAC3D,OAAO,CAAC,MAAM,EAAE,CAAC;aAClB;SACF;IACH,CAAC;CACF,CAAA;AA/GY,+BAA+B;IAD3C,IAAA,sBAAU,GAAE;GACA,+BAA+B,CA+G3C;AA/GY,0EAA+B;AAiH5C,MAAa,yCACX,SAAQ,kEAAuC;IADjD;;QAIE,SAAI,GAA+B,kCAA0B,CAAC,gBAAgB,CAAC;IACjF,CAAC;CAAA;AALD,8FAKC;AAED,MAAa,sCACX,SAAQ,+DAAoC;IAD9C;;QAIE,SAAI,GAA+B,kCAA0B,CAAC,eAAe,CAAC;IAChF,CAAC;CAAA;AALD,wFAKC","file":"symbol-contribution-render.js","sourcesContent":["import { injectable } from 'inversify';\nimport type {\n  IGraphicAttribute,\n  IContext2d,\n  IMarkAttribute,\n  ISymbol,\n  ISymbolGraphicAttribute,\n  IThemeAttribute,\n  ISymbolRenderContribution,\n  IDrawContext\n} from '../../../../interface';\nimport { getScaledStroke } from '../../../../common/canvas-utils';\nimport {\n  DefaultBaseBackgroundRenderContribution,\n  DefaultBaseTextureRenderContribution\n} from './base-contribution-render';\nimport { BaseRenderContributionTime } from '../../../../common/enums';\n\n@injectable()\nexport class DefaultSymbolRenderContribution implements ISymbolRenderContribution {\n  time: BaseRenderContributionTime = BaseRenderContributionTime.afterFillStroke;\n  useStyle: boolean = true;\n  order: number = 0;\n  drawShape(\n    symbol: ISymbol,\n    context: IContext2d,\n    x: number,\n    y: number,\n    doFill: boolean,\n    doStroke: boolean,\n    fVisible: boolean,\n    sVisible: boolean,\n    symbolAttribute: Required<ISymbolGraphicAttribute>,\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 parsedPath = symbol.getParsedPath();\n    // todo: 考虑使用path\n    if (!parsedPath) {\n      return;\n    }\n\n    const { outerBorder, innerBorder } = symbol.attribute;\n    const doOuterBorder = outerBorder && outerBorder.visible !== false;\n    const doInnerBorder = innerBorder && innerBorder.visible !== false;\n    if (!(doOuterBorder || doInnerBorder)) {\n      return;\n    }\n\n    const {\n      size = symbolAttribute.size,\n      opacity = symbolAttribute.opacity,\n      x: originX = symbolAttribute.x,\n      y: originY = symbolAttribute.y,\n      scaleX = symbolAttribute.scaleX,\n      scaleY = symbolAttribute.scaleY\n    } = symbol.attribute;\n\n    const doStrokeOuter = !!(outerBorder && outerBorder.stroke);\n    const doStrokeInner = !!(innerBorder && innerBorder.stroke);\n\n    if (doOuterBorder) {\n      const { distance = symbolAttribute.outerBorder.distance } = outerBorder;\n      const d = getScaledStroke(context, distance as number, context.dpr);\n\n      context.beginPath();\n      if (parsedPath.drawOffset(context, size, x, y, d) === false) {\n        context.closePath();\n      }\n\n      // shadow\n      context.setShadowStyle && context.setShadowStyle(symbol, symbol.attribute, symbolAttribute);\n\n      if (strokeCb) {\n        strokeCb(context, outerBorder, symbolAttribute.outerBorder);\n      } else if (doStrokeOuter) {\n        // 存在stroke\n        const lastOpacity = (symbolAttribute.outerBorder as any).opacity;\n        (symbolAttribute.outerBorder as any).opacity = opacity;\n        context.setStrokeStyle(\n          symbol,\n          outerBorder,\n          (originX - x) / scaleX,\n          (originY - y) / scaleY,\n          symbolAttribute.outerBorder as any\n        );\n        (symbolAttribute.outerBorder as any).opacity = lastOpacity;\n        context.stroke();\n      }\n    }\n\n    if (doInnerBorder) {\n      const { distance = symbolAttribute.innerBorder.distance } = innerBorder;\n      const d = getScaledStroke(context, distance as number, context.dpr);\n\n      context.beginPath();\n      if (parsedPath.drawOffset(context, size, x, y, -d) === false) {\n        context.closePath();\n      }\n\n      // shadow\n      context.setShadowStyle && context.setShadowStyle(symbol, symbol.attribute, symbolAttribute);\n\n      if (strokeCb) {\n        strokeCb(context, innerBorder, symbolAttribute.innerBorder);\n      } else if (doStrokeInner) {\n        // 存在stroke\n        const lastOpacity = (symbolAttribute.innerBorder as any).opacity;\n        (symbolAttribute.innerBorder as any).opacity = opacity;\n        context.setStrokeStyle(\n          symbol,\n          innerBorder,\n          (originX - x) / scaleX,\n          (originY - y) / scaleY,\n          symbolAttribute.innerBorder as any\n        );\n        (symbolAttribute.innerBorder as any).opacity = lastOpacity;\n        context.stroke();\n      }\n    }\n  }\n}\n\nexport class DefaultSymbolBackgroundRenderContribution\n  extends DefaultBaseBackgroundRenderContribution\n  implements ISymbolRenderContribution\n{\n  time: BaseRenderContributionTime = BaseRenderContributionTime.beforeFillStroke;\n}\n\nexport class DefaultSymbolTextureRenderContribution\n  extends DefaultBaseTextureRenderContribution\n  implements ISymbolRenderContribution\n{\n  time: BaseRenderContributionTime = BaseRenderContributionTime.afterFillStroke;\n}\n"]}
+{"version":3,"sources":["../../src/render/contributions/render/contributions/symbol-contribution-render.ts"],"names":[],"mappings":"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","file":"symbol-contribution-render.js","sourcesContent":["import { injectable } from 'inversify';\nimport type {\n  IGraphicAttribute,\n  IContext2d,\n  IMarkAttribute,\n  ISymbol,\n  ISymbolGraphicAttribute,\n  IThemeAttribute,\n  ISymbolRenderContribution,\n  IDrawContext\n} from '../../../../interface';\nimport { getScaledStroke } from '../../../../common/canvas-utils';\nimport {\n  DefaultBaseBackgroundRenderContribution,\n  DefaultBaseTextureRenderContribution\n} from './base-contribution-render';\nimport { BaseRenderContributionTime } from '../../../../common/enums';\n\n@injectable()\nexport class DefaultSymbolRenderContribution implements ISymbolRenderContribution {\n  time: BaseRenderContributionTime = BaseRenderContributionTime.afterFillStroke;\n  useStyle: boolean = true;\n  order: number = 0;\n  drawShape(\n    symbol: ISymbol,\n    context: IContext2d,\n    x: number,\n    y: number,\n    doFill: boolean,\n    doStroke: boolean,\n    fVisible: boolean,\n    sVisible: boolean,\n    symbolAttribute: Required<ISymbolGraphicAttribute>,\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      size = symbolAttribute.size,\n      opacity = symbolAttribute.opacity,\n      outerBorder,\n      innerBorder\n    } = symbol.attribute;\n\n    const parsedPath = symbol.getParsedPath();\n    // todo: 考虑使用path\n    if (!parsedPath) {\n      return;\n    }\n\n    if (outerBorder) {\n      const { distance = symbolAttribute.outerBorder.distance } = outerBorder;\n      const d = getScaledStroke(context, distance as number, context.dpr);\n\n      context.beginPath();\n      if (parsedPath.drawOffset(context, size, x, y, d) === false) {\n        context.closePath();\n      }\n\n      // shadow\n      context.setShadowStyle && context.setShadowStyle(symbol, symbol.attribute, symbolAttribute);\n\n      if (strokeCb) {\n        strokeCb(context, outerBorder, symbolAttribute.outerBorder);\n      } else if (sVisible) {\n        // 存在stroke\n        const lastOpacity = (symbolAttribute.outerBorder as any).opacity;\n        (symbolAttribute.outerBorder as any).opacity = opacity;\n        context.setStrokeStyle(symbol, outerBorder, x, y, symbolAttribute.outerBorder as any);\n        (symbolAttribute.outerBorder as any).opacity = lastOpacity;\n        context.stroke();\n      }\n    }\n\n    if (innerBorder) {\n      const { distance = symbolAttribute.innerBorder.distance } = innerBorder;\n      const d = getScaledStroke(context, distance as number, context.dpr);\n\n      context.beginPath();\n      if (parsedPath.drawOffset(context, size, x, y, -d) === false) {\n        context.closePath();\n      }\n\n      // shadow\n      context.setShadowStyle && context.setShadowStyle(symbol, symbol.attribute, symbolAttribute);\n\n      if (strokeCb) {\n        strokeCb(context, innerBorder, symbolAttribute.innerBorder);\n      } else if (sVisible) {\n        // 存在stroke\n        const lastOpacity = (symbolAttribute.innerBorder as any).opacity;\n        (symbolAttribute.innerBorder as any).opacity = opacity;\n        context.setStrokeStyle(symbol, innerBorder, x, y, symbolAttribute.innerBorder as any);\n        (symbolAttribute.innerBorder as any).opacity = lastOpacity;\n        context.stroke();\n      }\n    }\n  }\n}\n\nexport class DefaultSymbolBackgroundRenderContribution\n  extends DefaultBaseBackgroundRenderContribution\n  implements ISymbolRenderContribution\n{\n  time: BaseRenderContributionTime = BaseRenderContributionTime.beforeFillStroke;\n}\n\nexport class DefaultSymbolTextureRenderContribution\n  extends DefaultBaseTextureRenderContribution\n  implements ISymbolRenderContribution\n{\n  time: BaseRenderContributionTime = BaseRenderContributionTime.afterFillStroke;\n}\n"]}

package/cjs/render/contributions/render/draw-contribution.d.ts

@@ -1,4 +1,4 @@
-import type { IContext2d, MaybePromise, IGraphic, IGroup, IDrawContext, IRenderService, IGraphicRender, IGraphicRenderDrawParams, IContributionProvider, IDrawItemInterceptorContribution, IDrawContribution, IRenderSelector } from '../../../interface';
+import type { IContext2d, MaybePromise, IGraphic, IGroup, IDrawContext, IRenderService, IGraphicRender, IGraphicRenderDrawParams, IContributionProvider, IDrawItemInterceptorContribution, IDrawContribution, IRenderSelector, IGlobal } from '../../../interface';
 import type { IBounds } from '@visactor/vutils';
 import type { ILayerService } from '../../../interface/core';
 export declare class DefaultDrawContribution implements IDrawContribution {
@@ -13,6 +13,7 @@ export declare class DefaultDrawContribution implements IDrawContribution {
     backupDirtyBounds: IBounds;
     currentRenderService: IRenderService;
     InterceptorContributions: IDrawItemInterceptorContribution[];
+    global: IGlobal;
     constructor(contributions: IGraphicRender[], renderSelector: IRenderSelector, layerService: ILayerService, drawItemInterceptorContributions: IContributionProvider<IDrawItemInterceptorContribution>);
     init(): void;
     draw(renderService: IRenderService, drawContext: IDrawContext): MaybePromise<void>;
@@ -25,4 +26,5 @@ export declare class DefaultDrawContribution implements IDrawContribution {
     protected selectRenderByType(type?: string): IGraphicRender | null;
     protected selectRenderByNumberType(type?: number): IGraphicRender | null;
     protected clearScreen(renderService: IRenderService, context: IContext2d, drawContext: IDrawContext): void;
+    afterDraw(renderService: IRenderService, drawParams: IDrawContext): void;
 }

package/cjs/render/contributions/render/draw-contribution.js

@@ -16,7 +16,7 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.DefaultDrawContribution = void 0;
 
-const inversify_1 = require("inversify"), sort_1 = require("../../../common/sort"), contribution_provider_1 = require("../../../common/contribution-provider"), graphic_1 = require("../../../graphic"), vutils_1 = require("@visactor/vutils"), constants_1 = require("../../../core/constants"), container_1 = require("../../../container"), symbol_1 = require("./symbol"), draw_interceptor_1 = require("./draw-interceptor"), canvas_utils_1 = require("../../../common/canvas-utils");
+const inversify_1 = require("inversify"), sort_1 = require("../../../common/sort"), contribution_provider_1 = require("../../../common/contribution-provider"), graphic_1 = require("../../../graphic"), vutils_1 = require("@visactor/vutils"), constants_1 = require("../../../core/constants"), container_1 = require("../../../container"), symbol_1 = require("./symbol"), draw_interceptor_1 = require("./draw-interceptor"), canvas_utils_1 = require("../../../common/canvas-utils"), constants_2 = require("../../../constants");
 
 let DefaultDrawContribution = class {
     constructor(contributions, renderSelector, layerService, drawItemInterceptorContributions) {
@@ -164,8 +164,10 @@ let DefaultDrawContribution = class {
             }, 0, 0), context.fillRect(x, y, width, height);
         }
     }
+    afterDraw(renderService, drawParams) {}
 };
 
+__decorate([ (0, inversify_1.inject)(constants_2.VGlobal), __metadata("design:type", Object) ], DefaultDrawContribution.prototype, "global", void 0), 
 __decorate([ (0, inversify_1.postConstruct)(), __metadata("design:type", Function), __metadata("design:paramtypes", []), __metadata("design:returntype", void 0) ], DefaultDrawContribution.prototype, "init", null), 
 DefaultDrawContribution = __decorate([ (0, inversify_1.injectable)(), __param(0, (0, 
 inversify_1.multiInject)(symbol_1.GraphicRender)), __param(1, (0, inversify_1.inject)(symbol_1.RenderSelector)), __param(2, (0, 

package/cjs/render/contributions/render/draw-contribution.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/render/contributions/render/draw-contribution.ts"],"names":[],"mappings":"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","file":"draw-contribution.js","sourcesContent":["import { injectable, inject, postConstruct, named, multiInject } from 'inversify';\nimport type {\n  IContext2d,\n  MaybePromise,\n  IGraphic,\n  IGroup,\n  IDrawContext,\n  IRenderService,\n  IGraphicRender,\n  IGraphicRenderDrawParams,\n  IContributionProvider,\n  IDrawItemInterceptorContribution,\n  IDrawContribution,\n  IRenderSelector\n} from '../../../interface';\nimport { findNextGraphic, foreach } from '../../../common/sort';\n// eslint-disable-next-line @typescript-eslint/consistent-type-imports\nimport { ContributionProvider } from '../../../common/contribution-provider';\nimport { DefaultAttribute } from '../../../graphic';\nimport type { IBounds } from '@visactor/vutils';\nimport { Bounds, getRectIntersect, isRectIntersect } from '@visactor/vutils';\nimport { LayerService } from '../../../core/constants';\nimport { container } from '../../../container';\nimport { GraphicRender, IncrementalDrawContribution, RenderSelector } from './symbol';\nimport { DrawItemInterceptor } from './draw-interceptor';\nimport { createColor } from '../../../common/canvas-utils';\nimport type { ILayerService } from '../../../interface/core';\n\n/**\n * 默认的渲染contribution，基于树状结构针对图元的渲染\n */\n@injectable()\nexport class DefaultDrawContribution implements IDrawContribution {\n  declare currentRenderMap: Map<number, IGraphicRender>;\n  declare defaultRenderMap: Map<number, IGraphicRender>;\n  declare styleRenderMap: Map<string, Map<number, IGraphicRender>>;\n  declare dirtyBounds: IBounds;\n  declare backupDirtyBounds: IBounds;\n  declare currentRenderService: IRenderService;\n  declare InterceptorContributions: IDrawItemInterceptorContribution[];\n\n  constructor(\n    // @inject(ContributionProvider)\n    // @named(GraphicRender)\n    // protected readonly contributions: ContributionProvider<IGraphicRender>,\n    @multiInject(GraphicRender) protected readonly contributions: IGraphicRender[],\n    @inject(RenderSelector) protected readonly renderSelector: IRenderSelector, // 根据图元类型选择对应的renderItem进行渲染\n    @inject(LayerService) protected readonly layerService: ILayerService, // 默认的polygonRender\n    // 拦截器\n    @inject(ContributionProvider)\n    @named(DrawItemInterceptor)\n    protected readonly drawItemInterceptorContributions: IContributionProvider<IDrawItemInterceptorContribution>\n  ) {\n    this.currentRenderMap = new Map();\n    this.defaultRenderMap = new Map();\n    this.styleRenderMap = new Map();\n    this.dirtyBounds = new Bounds();\n    this.backupDirtyBounds = new Bounds();\n  }\n\n  @postConstruct()\n  init() {\n    this.contributions.forEach(item => {\n      if (item.style) {\n        const map = this.styleRenderMap.get(item.style) || new Map();\n        map.set(item.numberType, item);\n        this.styleRenderMap.set(item.style, map);\n      } else {\n        this.defaultRenderMap.set(item.numberType, item);\n      }\n    });\n    this.InterceptorContributions = this.drawItemInterceptorContributions\n      .getContributions()\n      .sort((a, b) => a.order - b.order);\n  }\n\n  draw(renderService: IRenderService, drawContext: IDrawContext): MaybePromise<void> {\n    drawContext.drawContribution = this;\n    this.currentRenderMap = this.styleRenderMap.get(drawContext.renderStyle) || this.defaultRenderMap;\n    // this.startAtId = drawParams.startAtId;\n    this.currentRenderService = renderService;\n    // this.drawParams = drawParams;\n    const { context, stage, x = 0, y = 0, width, height } = drawContext;\n\n    if (!context) {\n      return;\n    }\n    // if (context.drawPromise) {\n    //   return;\n    // }\n    const dirtyBounds: IBounds | undefined = this.dirtyBounds.setValue(0, 0, width, height);\n    if (stage.dirtyBounds && !stage.dirtyBounds.empty()) {\n      const b = getRectIntersect(dirtyBounds, stage.dirtyBounds, false);\n      dirtyBounds.x1 = Math.floor(b.x1);\n      dirtyBounds.y1 = Math.floor(b.y1);\n      dirtyBounds.x2 = Math.ceil(b.x2);\n      dirtyBounds.y2 = Math.ceil(b.y2);\n    }\n    this.backupDirtyBounds.copy(dirtyBounds);\n    context.inuse = true;\n    // 初始化context\n    context.clearMatrix();\n    context.setTransformForCurrent(true);\n\n    const drawInArea =\n      dirtyBounds.width() * context.dpr !== context.canvas.width ||\n      dirtyBounds.height() * context.dpr !== context.canvas.height;\n    context.save();\n\n    // 设置translate\n    context.translate(x, y, true);\n    if (drawInArea) {\n      context.beginPath();\n      context.rect(dirtyBounds.x1, dirtyBounds.y1, dirtyBounds.width(), dirtyBounds.height());\n      context.clip();\n    }\n\n    // 如果存在3d视角，那么不使用dirtyBounds\n    if (stage.camera) {\n      this.dirtyBounds.setValue(-Infinity, -Infinity, Infinity, Infinity);\n      this.backupDirtyBounds.setValue(-Infinity, -Infinity, Infinity, Infinity);\n    }\n\n    this.clearScreen(renderService, context, drawContext);\n    // // 渲染的时候图元的起始位置就是x，y\n    // this.backupDirtyBounds.translate(-x, -y);\n    // this.dirtyBounds.translate(-x, -y);\n\n    // // 设置translate\n    // context.translate(x, y, true);\n\n    context.save();\n    renderService.renderTreeRoots\n      .sort((a, b) => {\n        return (a.attribute.zIndex ?? DefaultAttribute.zIndex) - (b.attribute.zIndex ?? DefaultAttribute.zIndex);\n      })\n      .forEach(group => {\n        this.renderGroup(group as IGroup, drawContext);\n      });\n\n    context.restore();\n    context.restore();\n    context.draw();\n    // this.break = false;\n    context.inuse = false;\n  }\n\n  doRegister() {\n    throw new Error('暂不支持');\n  }\n\n  // 找到下一个graphic\n  protected _findNextGraphic(group: IGroup): IGraphic | null {\n    let parent = group.parent;\n    let id = group._uid;\n    while (parent) {\n      const g = findNextGraphic(parent, id, DefaultAttribute.zIndex);\n      if (g) {\n        return g;\n      }\n      id = parent._uid;\n      parent = parent.parent;\n    }\n    return null;\n  }\n\n  renderGroup(group: IGroup, drawContext: IDrawContext, skipSort?: boolean) {\n    if (drawContext.break || group.attribute.visibleAll === false) {\n      return;\n    }\n    if (group.incremental && (drawContext.startAtId == null || drawContext.startAtId === group._uid)) {\n      drawContext.break = true;\n      this._increaseRender(group, drawContext);\n      return;\n    }\n\n    if (!isRectIntersect(group.AABBBounds, this.dirtyBounds, false)) {\n      return;\n    }\n\n    const tempBounds = this.dirtyBounds.clone();\n\n    // 变换dirtyBounds\n    const m = group.globalTransMatrix.getInverse();\n    this.dirtyBounds.copy(this.backupDirtyBounds).transformWithMatrix(m);\n\n    this.renderItem(group, drawContext, {\n      drawingCb: () => {\n        skipSort\n          ? group.forEachChildren((item: IGraphic) => {\n              if (drawContext.break) {\n                return;\n              }\n              if (item.isContainer) {\n                this.renderGroup(item as IGroup, drawContext);\n              } else {\n                this.renderItem(item, drawContext);\n              }\n            })\n          : foreach(\n              group,\n              DefaultAttribute.zIndex,\n              (item: IGraphic) => {\n                if (drawContext.break) {\n                  return;\n                }\n                if (item.isContainer) {\n                  this.renderGroup(item as IGroup, drawContext);\n                } else {\n                  this.renderItem(item, drawContext);\n                }\n              },\n              false,\n              !!drawContext.context?.camera\n            );\n      }\n    });\n\n    this.dirtyBounds.copy(tempBounds);\n  }\n\n  protected _increaseRender(group: IGroup, drawContext: IDrawContext) {\n    const { layer, stage } = drawContext;\n    const { subLayers } = layer;\n    // 获取渐进渲染层\n    let incrementalLayer = subLayers.get(group._uid);\n    if (!incrementalLayer) {\n      incrementalLayer = {\n        layer: this.layerService.createLayer(stage),\n        zIndex: subLayers.size,\n        group\n      };\n      subLayers.set(group._uid, incrementalLayer);\n    }\n    // 渲染\n    const incrementalContext = incrementalLayer.layer.getNativeHandler().getContext();\n    const idc = incrementalLayer.drawContribution || container.get(IncrementalDrawContribution);\n    idc.dirtyBounds.setValue(-Infinity, -Infinity, Infinity, Infinity);\n    idc.backupDirtyBounds.setValue(-Infinity, -Infinity, Infinity, Infinity);\n    (idc as any).draw(this.currentRenderService, {\n      ...drawContext,\n      drawContribution: idc,\n      clear: 'transparent',\n      layer: incrementalLayer.layer,\n      context: incrementalContext,\n      startAtId: group._uid,\n      break: false\n    });\n    incrementalLayer.drawContribution = idc;\n    // this.draw(this.currentRenderService, {...this.drawParams, startAtId: group._uid})\n    // this.draw(this.currentRenderService, {...this.drawParams, clear: 'transparent', layer: incrementalContext.layer, context: incrementalContext, startAtId: group._uid})\n    const nextGraphic = this._findNextGraphic(group);\n    if (nextGraphic) {\n      // 如果是下一个渐进渲染层，那就再来一次\n      if (nextGraphic.isContainer && nextGraphic.incremental) {\n        this._increaseRender(nextGraphic as IGroup, drawContext);\n      } else {\n        // 如果不是渐进渲染层，那就默认图层渲染\n        let afterLayer = subLayers.get(nextGraphic._uid);\n        if (!afterLayer) {\n          afterLayer = {\n            layer: this.layerService.createLayer(stage),\n            zIndex: subLayers.size\n          };\n          subLayers.set(nextGraphic._uid, afterLayer);\n        }\n        const afterContext = afterLayer.layer.getNativeHandler().getContext();\n        this.draw(this.currentRenderService, {\n          ...drawContext,\n          drawContribution: idc,\n          clear: 'transparent',\n          layer: afterLayer.layer,\n          context: afterContext,\n          startAtId: nextGraphic._uid,\n          break: false\n        });\n      }\n    }\n  }\n\n  getRenderContribution(graphic: IGraphic): IGraphicRender | null {\n    let renderer = this.renderSelector.selector(graphic);\n    if (!renderer) {\n      renderer = this.selectRenderByNumberType(graphic.numberType);\n    }\n    if (!renderer) {\n      renderer = this.selectRenderByType(graphic.type);\n    }\n    return renderer;\n  }\n\n  renderItem(graphic: IGraphic, drawContext: IDrawContext, params?: IGraphicRenderDrawParams) {\n    // 添加拦截器\n    if (this.InterceptorContributions.length) {\n      for (let i = 0; i < this.InterceptorContributions.length; i++) {\n        const drawContribution = this.InterceptorContributions[i];\n        if (drawContribution.beforeDrawItem) {\n          if (drawContribution.beforeDrawItem(graphic, this.currentRenderService, drawContext, this, params)) {\n            return;\n          }\n        }\n      }\n    }\n\n    const renderer = this.getRenderContribution(graphic);\n    if (!renderer) {\n      return;\n    }\n\n    if (!(graphic.isContainer || isRectIntersect(graphic.AABBBounds, this.dirtyBounds, false))) {\n      return;\n    }\n\n    const skipDraw = drawContext.startAtId != null && graphic._uid !== drawContext.startAtId;\n    if (graphic._uid === drawContext.startAtId) {\n      drawContext.startAtId = null;\n    }\n    params && (params.skipDraw = skipDraw);\n    if (skipDraw) {\n      graphic.isContainer && renderer.draw(graphic, this.currentRenderService, drawContext, params);\n    } else {\n      renderer.draw(graphic, this.currentRenderService, drawContext, params);\n    }\n\n    // 添加拦截器\n    if (this.InterceptorContributions.length) {\n      for (let i = 0; i < this.InterceptorContributions.length; i++) {\n        const drawContribution = this.InterceptorContributions[i];\n        if (drawContribution.afterDrawItem) {\n          if (drawContribution.afterDrawItem(graphic, this.currentRenderService, drawContext, this)) {\n            return;\n          }\n        }\n      }\n    }\n  }\n  // 根据type选择对应的render\n  protected selectRenderByType(type?: string): IGraphicRender | null {\n    console.warn('未知错误，不应该走到这里');\n    return null;\n  }\n  // 根据type选择对应的render\n  protected selectRenderByNumberType(type?: number): IGraphicRender | null {\n    return this.currentRenderMap.get(type) || this.defaultRenderMap.get(type);\n  }\n\n  protected clearScreen(renderService: IRenderService, context: IContext2d, drawContext: IDrawContext) {\n    const { clear } = drawContext;\n    if (clear) {\n      const canvas = context.getCanvas();\n      const { width = canvas.width, height = canvas.height } = drawContext;\n      const x = 0;\n      const y = 0;\n      context.clearRect(x, y, width, height);\n      context.fillStyle = createColor(\n        context,\n        clear,\n        {\n          AABBBounds: { x1: x, y1: y, x2: x + width, y2: y + height }\n        },\n        0,\n        0\n      );\n      context.fillRect(x, y, width, height);\n    }\n  }\n}\n"]}
+{"version":3,"sources":["../../src/render/contributions/render/draw-contribution.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,yCAAkF;AAgBlF,+CAAgE;AAEhE,iFAA6E;AAC7E,8CAAoD;AAEpD,6CAAmF;AACnF,uDAAuD;AACvD,kDAA+C;AAC/C,qCAAsF;AACtF,yDAAyD;AACzD,+DAA2D;AAE3D,kDAA6C;AAMtC,IAAM,uBAAuB,GAA7B,MAAM,uBAAuB;IAWlC,YAIiD,aAA+B,EACnC,cAA+B,EACjC,YAA2B,EAIjD,gCAAyF;QAN7D,kBAAa,GAAb,aAAa,CAAkB;QACnC,mBAAc,GAAd,cAAc,CAAiB;QACjC,iBAAY,GAAZ,YAAY,CAAe;QAIjD,qCAAgC,GAAhC,gCAAgC,CAAyD;QAE5G,IAAI,CAAC,gBAAgB,GAAG,IAAI,GAAG,EAAE,CAAC;QAClC,IAAI,CAAC,gBAAgB,GAAG,IAAI,GAAG,EAAE,CAAC;QAClC,IAAI,CAAC,cAAc,GAAG,IAAI,GAAG,EAAE,CAAC;QAChC,IAAI,CAAC,WAAW,GAAG,IAAI,eAAM,EAAE,CAAC;QAChC,IAAI,CAAC,iBAAiB,GAAG,IAAI,eAAM,EAAE,CAAC;IACxC,CAAC;IAGD,IAAI;QACF,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;YAChC,IAAI,IAAI,CAAC,KAAK,EAAE;gBACd,MAAM,GAAG,GAAG,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,IAAI,GAAG,EAAE,CAAC;gBAC7D,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC;gBAC/B,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;aAC1C;iBAAM;gBACL,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC;aAClD;QACH,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,wBAAwB,GAAG,IAAI,CAAC,gCAAgC;aAClE,gBAAgB,EAAE;aAClB,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC;IACvC,CAAC;IAED,IAAI,CAAC,aAA6B,EAAE,WAAyB;QAC3D,WAAW,CAAC,gBAAgB,GAAG,IAAI,CAAC;QACpC,IAAI,CAAC,gBAAgB,GAAG,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,WAAW,CAAC,WAAW,CAAC,IAAI,IAAI,CAAC,gBAAgB,CAAC;QAElG,IAAI,CAAC,oBAAoB,GAAG,aAAa,CAAC;QAE1C,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,WAAW,CAAC;QAEpE,IAAI,CAAC,OAAO,EAAE;YACZ,OAAO;SACR;QAID,MAAM,WAAW,GAAwB,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC,EAAE,CAAC,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC;QACxF,IAAI,KAAK,CAAC,WAAW,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,KAAK,EAAE,EAAE;YACnD,MAAM,CAAC,GAAG,IAAA,yBAAgB,EAAC,WAAW,EAAE,KAAK,CAAC,WAAW,EAAE,KAAK,CAAC,CAAC;YAClE,WAAW,CAAC,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;YAClC,WAAW,CAAC,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;YAClC,WAAW,CAAC,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;YACjC,WAAW,CAAC,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;SAClC;QACD,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QACzC,OAAO,CAAC,KAAK,GAAG,IAAI,CAAC;QAErB,OAAO,CAAC,WAAW,EAAE,CAAC;QACtB,OAAO,CAAC,sBAAsB,CAAC,IAAI,CAAC,CAAC;QAErC,MAAM,UAAU,GACd,WAAW,CAAC,KAAK,EAAE,GAAG,OAAO,CAAC,GAAG,KAAK,OAAO,CAAC,MAAM,CAAC,KAAK;YAC1D,WAAW,CAAC,MAAM,EAAE,GAAG,OAAO,CAAC,GAAG,KAAK,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC;QAC/D,OAAO,CAAC,IAAI,EAAE,CAAC;QAGf,OAAO,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,EAAE,IAAI,CAAC,CAAC;QAC9B,IAAI,UAAU,EAAE;YACd,OAAO,CAAC,SAAS,EAAE,CAAC;YACpB,OAAO,CAAC,IAAI,CAAC,WAAW,CAAC,EAAE,EAAE,WAAW,CAAC,EAAE,EAAE,WAAW,CAAC,KAAK,EAAE,EAAE,WAAW,CAAC,MAAM,EAAE,CAAC,CAAC;YACxF,OAAO,CAAC,IAAI,EAAE,CAAC;SAChB;QAGD,IAAI,KAAK,CAAC,MAAM,EAAE;YAChB,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC,QAAQ,EAAE,CAAC,QAAQ,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAC;YACpE,IAAI,CAAC,iBAAiB,CAAC,QAAQ,CAAC,CAAC,QAAQ,EAAE,CAAC,QAAQ,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAC;SAC3E;QAED,IAAI,CAAC,WAAW,CAAC,aAAa,EAAE,OAAO,EAAE,WAAW,CAAC,CAAC;QAQtD,OAAO,CAAC,IAAI,EAAE,CAAC;QACf,aAAa,CAAC,eAAe;aAC1B,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;;YACb,OAAO,CAAC,MAAA,CAAC,CAAC,SAAS,CAAC,MAAM,mCAAI,0BAAgB,CAAC,MAAM,CAAC,GAAG,CAAC,MAAA,CAAC,CAAC,SAAS,CAAC,MAAM,mCAAI,0BAAgB,CAAC,MAAM,CAAC,CAAC;QAC3G,CAAC,CAAC;aACD,OAAO,CAAC,KAAK,CAAC,EAAE;YACf,IAAI,CAAC,WAAW,CAAC,KAAe,EAAE,WAAW,CAAC,CAAC;QACjD,CAAC,CAAC,CAAC;QAEL,OAAO,CAAC,OAAO,EAAE,CAAC;QAClB,OAAO,CAAC,OAAO,EAAE,CAAC;QAClB,OAAO,CAAC,IAAI,EAAE,CAAC;QAEf,OAAO,CAAC,KAAK,GAAG,KAAK,CAAC;IACxB,CAAC;IAED,UAAU;QACR,MAAM,IAAI,KAAK,CAAC,MAAM,CAAC,CAAC;IAC1B,CAAC;IAGS,gBAAgB,CAAC,KAAa;QACtC,IAAI,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC;QAC1B,IAAI,EAAE,GAAG,KAAK,CAAC,IAAI,CAAC;QACpB,OAAO,MAAM,EAAE;YACb,MAAM,CAAC,GAAG,IAAA,sBAAe,EAAC,MAAM,EAAE,EAAE,EAAE,0BAAgB,CAAC,MAAM,CAAC,CAAC;YAC/D,IAAI,CAAC,EAAE;gBACL,OAAO,CAAC,CAAC;aACV;YACD,EAAE,GAAG,MAAM,CAAC,IAAI,CAAC;YACjB,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC;SACxB;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAED,WAAW,CAAC,KAAa,EAAE,WAAyB,EAAE,QAAkB;QACtE,IAAI,WAAW,CAAC,KAAK,IAAI,KAAK,CAAC,SAAS,CAAC,UAAU,KAAK,KAAK,EAAE;YAC7D,OAAO;SACR;QACD,IAAI,KAAK,CAAC,WAAW,IAAI,CAAC,WAAW,CAAC,SAAS,IAAI,IAAI,IAAI,WAAW,CAAC,SAAS,KAAK,KAAK,CAAC,IAAI,CAAC,EAAE;YAChG,WAAW,CAAC,KAAK,GAAG,IAAI,CAAC;YACzB,IAAI,CAAC,eAAe,CAAC,KAAK,EAAE,WAAW,CAAC,CAAC;YACzC,OAAO;SACR;QAED,IAAI,CAAC,IAAA,wBAAe,EAAC,KAAK,CAAC,UAAU,EAAE,IAAI,CAAC,WAAW,EAAE,KAAK,CAAC,EAAE;YAC/D,OAAO;SACR;QAED,MAAM,UAAU,GAAG,IAAI,CAAC,WAAW,CAAC,KAAK,EAAE,CAAC;QAG5C,MAAM,CAAC,GAAG,KAAK,CAAC,iBAAiB,CAAC,UAAU,EAAE,CAAC;QAC/C,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC,mBAAmB,CAAC,CAAC,CAAC,CAAC;QAErE,IAAI,CAAC,UAAU,CAAC,KAAK,EAAE,WAAW,EAAE;YAClC,SAAS,EAAE,GAAG,EAAE;;gBACd,QAAQ;oBACN,CAAC,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC,IAAc,EAAE,EAAE;wBACvC,IAAI,WAAW,CAAC,KAAK,EAAE;4BACrB,OAAO;yBACR;wBACD,IAAI,IAAI,CAAC,WAAW,EAAE;4BACpB,IAAI,CAAC,WAAW,CAAC,IAAc,EAAE,WAAW,CAAC,CAAC;yBAC/C;6BAAM;4BACL,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC;yBACpC;oBACH,CAAC,CAAC;oBACJ,CAAC,CAAC,IAAA,cAAO,EACL,KAAK,EACL,0BAAgB,CAAC,MAAM,EACvB,CAAC,IAAc,EAAE,EAAE;wBACjB,IAAI,WAAW,CAAC,KAAK,EAAE;4BACrB,OAAO;yBACR;wBACD,IAAI,IAAI,CAAC,WAAW,EAAE;4BACpB,IAAI,CAAC,WAAW,CAAC,IAAc,EAAE,WAAW,CAAC,CAAC;yBAC/C;6BAAM;4BACL,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC;yBACpC;oBACH,CAAC,EACD,KAAK,EACL,CAAC,CAAC,CAAA,MAAA,WAAW,CAAC,OAAO,0CAAE,MAAM,CAAA,CAC9B,CAAC;YACR,CAAC;SACF,CAAC,CAAC;QAEH,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;IACpC,CAAC;IAES,eAAe,CAAC,KAAa,EAAE,WAAyB;QAChE,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,WAAW,CAAC;QACrC,MAAM,EAAE,SAAS,EAAE,GAAG,KAAK,CAAC;QAE5B,IAAI,gBAAgB,GAAG,SAAS,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QACjD,IAAI,CAAC,gBAAgB,EAAE;YACrB,gBAAgB,GAAG;gBACjB,KAAK,EAAE,IAAI,CAAC,YAAY,CAAC,WAAW,CAAC,KAAK,CAAC;gBAC3C,MAAM,EAAE,SAAS,CAAC,IAAI;gBACtB,KAAK;aACN,CAAC;YACF,SAAS,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,EAAE,gBAAgB,CAAC,CAAC;SAC7C;QAED,MAAM,kBAAkB,GAAG,gBAAgB,CAAC,KAAK,CAAC,gBAAgB,EAAE,CAAC,UAAU,EAAE,CAAC;QAClF,MAAM,GAAG,GAAG,gBAAgB,CAAC,gBAAgB,IAAI,qBAAS,CAAC,GAAG,CAAC,oCAA2B,CAAC,CAAC;QAC5F,GAAG,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC,QAAQ,EAAE,CAAC,QAAQ,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAC;QACnE,GAAG,CAAC,iBAAiB,CAAC,QAAQ,CAAC,CAAC,QAAQ,EAAE,CAAC,QAAQ,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAC;QACxE,GAAW,CAAC,IAAI,CAAC,IAAI,CAAC,oBAAoB,kCACtC,WAAW,KACd,gBAAgB,EAAE,GAAG,EACrB,KAAK,EAAE,aAAa,EACpB,KAAK,EAAE,gBAAgB,CAAC,KAAK,EAC7B,OAAO,EAAE,kBAAkB,EAC3B,SAAS,EAAE,KAAK,CAAC,IAAI,EACrB,KAAK,EAAE,KAAK,IACZ,CAAC;QACH,gBAAgB,CAAC,gBAAgB,GAAG,GAAG,CAAC;QAGxC,MAAM,WAAW,GAAG,IAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC,CAAC;QACjD,IAAI,WAAW,EAAE;YAEf,IAAI,WAAW,CAAC,WAAW,IAAI,WAAW,CAAC,WAAW,EAAE;gBACtD,IAAI,CAAC,eAAe,CAAC,WAAqB,EAAE,WAAW,CAAC,CAAC;aAC1D;iBAAM;gBAEL,IAAI,UAAU,GAAG,SAAS,CAAC,GAAG,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;gBACjD,IAAI,CAAC,UAAU,EAAE;oBACf,UAAU,GAAG;wBACX,KAAK,EAAE,IAAI,CAAC,YAAY,CAAC,WAAW,CAAC,KAAK,CAAC;wBAC3C,MAAM,EAAE,SAAS,CAAC,IAAI;qBACvB,CAAC;oBACF,SAAS,CAAC,GAAG,CAAC,WAAW,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;iBAC7C;gBACD,MAAM,YAAY,GAAG,UAAU,CAAC,KAAK,CAAC,gBAAgB,EAAE,CAAC,UAAU,EAAE,CAAC;gBACtE,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,oBAAoB,kCAC9B,WAAW,KACd,gBAAgB,EAAE,GAAG,EACrB,KAAK,EAAE,aAAa,EACpB,KAAK,EAAE,UAAU,CAAC,KAAK,EACvB,OAAO,EAAE,YAAY,EACrB,SAAS,EAAE,WAAW,CAAC,IAAI,EAC3B,KAAK,EAAE,KAAK,IACZ,CAAC;aACJ;SACF;IACH,CAAC;IAED,qBAAqB,CAAC,OAAiB;QACrC,IAAI,QAAQ,GAAG,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;QACrD,IAAI,CAAC,QAAQ,EAAE;YACb,QAAQ,GAAG,IAAI,CAAC,wBAAwB,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;SAC9D;QACD,IAAI,CAAC,QAAQ,EAAE;YACb,QAAQ,GAAG,IAAI,CAAC,kBAAkB,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;SAClD;QACD,OAAO,QAAQ,CAAC;IAClB,CAAC;IAED,UAAU,CAAC,OAAiB,EAAE,WAAyB,EAAE,MAAiC;QAExF,IAAI,IAAI,CAAC,wBAAwB,CAAC,MAAM,EAAE;YACxC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,wBAAwB,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;gBAC7D,MAAM,gBAAgB,GAAG,IAAI,CAAC,wBAAwB,CAAC,CAAC,CAAC,CAAC;gBAC1D,IAAI,gBAAgB,CAAC,cAAc,EAAE;oBACnC,IAAI,gBAAgB,CAAC,cAAc,CAAC,OAAO,EAAE,IAAI,CAAC,oBAAoB,EAAE,WAAW,EAAE,IAAI,EAAE,MAAM,CAAC,EAAE;wBAClG,OAAO;qBACR;iBACF;aACF;SACF;QAED,MAAM,QAAQ,GAAG,IAAI,CAAC,qBAAqB,CAAC,OAAO,CAAC,CAAC;QACrD,IAAI,CAAC,QAAQ,EAAE;YACb,OAAO;SACR;QAED,IAAI,CAAC,CAAC,OAAO,CAAC,WAAW,IAAI,IAAA,wBAAe,EAAC,OAAO,CAAC,UAAU,EAAE,IAAI,CAAC,WAAW,EAAE,KAAK,CAAC,CAAC,EAAE;YAC1F,OAAO;SACR;QAED,MAAM,QAAQ,GAAG,WAAW,CAAC,SAAS,IAAI,IAAI,IAAI,OAAO,CAAC,IAAI,KAAK,WAAW,CAAC,SAAS,CAAC;QACzF,IAAI,OAAO,CAAC,IAAI,KAAK,WAAW,CAAC,SAAS,EAAE;YAC1C,WAAW,CAAC,SAAS,GAAG,IAAI,CAAC;SAC9B;QACD,MAAM,IAAI,CAAC,MAAM,CAAC,QAAQ,GAAG,QAAQ,CAAC,CAAC;QACvC,IAAI,QAAQ,EAAE;YACZ,OAAO,CAAC,WAAW,IAAI,QAAQ,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,oBAAoB,EAAE,WAAW,EAAE,MAAM,CAAC,CAAC;SAC/F;aAAM;YACL,QAAQ,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,oBAAoB,EAAE,WAAW,EAAE,MAAM,CAAC,CAAC;SACxE;QAGD,IAAI,IAAI,CAAC,wBAAwB,CAAC,MAAM,EAAE;YACxC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,wBAAwB,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;gBAC7D,MAAM,gBAAgB,GAAG,IAAI,CAAC,wBAAwB,CAAC,CAAC,CAAC,CAAC;gBAC1D,IAAI,gBAAgB,CAAC,aAAa,EAAE;oBAClC,IAAI,gBAAgB,CAAC,aAAa,CAAC,OAAO,EAAE,IAAI,CAAC,oBAAoB,EAAE,WAAW,EAAE,IAAI,CAAC,EAAE;wBACzF,OAAO;qBACR;iBACF;aACF;SACF;IACH,CAAC;IAES,kBAAkB,CAAC,IAAa;QACxC,OAAO,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;QAC7B,OAAO,IAAI,CAAC;IACd,CAAC;IAES,wBAAwB,CAAC,IAAa;QAC9C,OAAO,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IAC5E,CAAC;IAES,WAAW,CAAC,aAA6B,EAAE,OAAmB,EAAE,WAAyB;QACjG,MAAM,EAAE,KAAK,EAAE,GAAG,WAAW,CAAC;QAC9B,IAAI,KAAK,EAAE;YACT,MAAM,MAAM,GAAG,OAAO,CAAC,SAAS,EAAE,CAAC;YACnC,MAAM,EAAE,KAAK,GAAG,MAAM,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,WAAW,CAAC;YACrE,MAAM,CAAC,GAAG,CAAC,CAAC;YACZ,MAAM,CAAC,GAAG,CAAC,CAAC;YACZ,OAAO,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC;YACvC,OAAO,CAAC,SAAS,GAAG,IAAA,0BAAW,EAC7B,OAAO,EACP,KAAK,EACL;gBACE,UAAU,EAAE,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,GAAG,KAAK,EAAE,EAAE,EAAE,CAAC,GAAG,MAAM,EAAE;aAC5D,EACD,CAAC,EACD,CAAC,CACF,CAAC;YACF,OAAO,CAAC,QAAQ,CAAC,CAAC,EAAE,CAAC,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC;SACvC;IACH,CAAC;IAED,SAAS,CAAC,aAA6B,EAAE,UAAwB;QAC/D,OAAO;IACT,CAAC;CACF,CAAA;AA3UC;IAAC,IAAA,kBAAM,EAAC,mBAAO,CAAC;;uDAAiB;AAqBjC;IAAC,IAAA,yBAAa,GAAE;;;;mDAcf;AA5CU,uBAAuB;IADnC,IAAA,sBAAU,GAAE;IAgBR,WAAA,IAAA,uBAAW,EAAC,sBAAa,CAAC,CAAA;IAC1B,WAAA,IAAA,kBAAM,EAAC,uBAAc,CAAC,CAAA;IACtB,WAAA,IAAA,kBAAM,EAAC,wBAAY,CAAC,CAAA;IAEpB,WAAA,IAAA,kBAAM,EAAC,4CAAoB,CAAC,CAAA;IAC5B,WAAA,IAAA,iBAAK,EAAC,sCAAmB,CAAC,CAAA;;GApBlB,uBAAuB,CAoVnC;AApVY,0DAAuB","file":"draw-contribution.js","sourcesContent":["import { injectable, inject, postConstruct, named, multiInject } from 'inversify';\nimport type {\n  IContext2d,\n  MaybePromise,\n  IGraphic,\n  IGroup,\n  IDrawContext,\n  IRenderService,\n  IGraphicRender,\n  IGraphicRenderDrawParams,\n  IContributionProvider,\n  IDrawItemInterceptorContribution,\n  IDrawContribution,\n  IRenderSelector,\n  IGlobal\n} from '../../../interface';\nimport { findNextGraphic, foreach } from '../../../common/sort';\n// eslint-disable-next-line @typescript-eslint/consistent-type-imports\nimport { ContributionProvider } from '../../../common/contribution-provider';\nimport { DefaultAttribute } from '../../../graphic';\nimport type { IBounds } from '@visactor/vutils';\nimport { Bounds, getRectIntersect, isRectIntersect, last } from '@visactor/vutils';\nimport { LayerService } from '../../../core/constants';\nimport { container } from '../../../container';\nimport { GraphicRender, IncrementalDrawContribution, RenderSelector } from './symbol';\nimport { DrawItemInterceptor } from './draw-interceptor';\nimport { createColor } from '../../../common/canvas-utils';\nimport type { ILayerService } from '../../../interface/core';\nimport { VGlobal } from '../../../constants';\n\n/**\n * 默认的渲染contribution，基于树状结构针对图元的渲染\n */\n@injectable()\nexport class DefaultDrawContribution implements IDrawContribution {\n  declare currentRenderMap: Map<number, IGraphicRender>;\n  declare defaultRenderMap: Map<number, IGraphicRender>;\n  declare styleRenderMap: Map<string, Map<number, IGraphicRender>>;\n  declare dirtyBounds: IBounds;\n  declare backupDirtyBounds: IBounds;\n  declare currentRenderService: IRenderService;\n  declare InterceptorContributions: IDrawItemInterceptorContribution[];\n\n  @inject(VGlobal) global: IGlobal;\n\n  constructor(\n    // @inject(ContributionProvider)\n    // @named(GraphicRender)\n    // protected readonly contributions: ContributionProvider<IGraphicRender>,\n    @multiInject(GraphicRender) protected readonly contributions: IGraphicRender[],\n    @inject(RenderSelector) protected readonly renderSelector: IRenderSelector, // 根据图元类型选择对应的renderItem进行渲染\n    @inject(LayerService) protected readonly layerService: ILayerService, // 默认的polygonRender\n    // 拦截器\n    @inject(ContributionProvider)\n    @named(DrawItemInterceptor)\n    protected readonly drawItemInterceptorContributions: IContributionProvider<IDrawItemInterceptorContribution>\n  ) {\n    this.currentRenderMap = new Map();\n    this.defaultRenderMap = new Map();\n    this.styleRenderMap = new Map();\n    this.dirtyBounds = new Bounds();\n    this.backupDirtyBounds = new Bounds();\n  }\n\n  @postConstruct()\n  init() {\n    this.contributions.forEach(item => {\n      if (item.style) {\n        const map = this.styleRenderMap.get(item.style) || new Map();\n        map.set(item.numberType, item);\n        this.styleRenderMap.set(item.style, map);\n      } else {\n        this.defaultRenderMap.set(item.numberType, item);\n      }\n    });\n    this.InterceptorContributions = this.drawItemInterceptorContributions\n      .getContributions()\n      .sort((a, b) => a.order - b.order);\n  }\n\n  draw(renderService: IRenderService, drawContext: IDrawContext): MaybePromise<void> {\n    drawContext.drawContribution = this;\n    this.currentRenderMap = this.styleRenderMap.get(drawContext.renderStyle) || this.defaultRenderMap;\n    // this.startAtId = drawParams.startAtId;\n    this.currentRenderService = renderService;\n    // this.drawParams = drawParams;\n    const { context, stage, x = 0, y = 0, width, height } = drawContext;\n\n    if (!context) {\n      return;\n    }\n    // if (context.drawPromise) {\n    //   return;\n    // }\n    const dirtyBounds: IBounds | undefined = this.dirtyBounds.setValue(0, 0, width, height);\n    if (stage.dirtyBounds && !stage.dirtyBounds.empty()) {\n      const b = getRectIntersect(dirtyBounds, stage.dirtyBounds, false);\n      dirtyBounds.x1 = Math.floor(b.x1);\n      dirtyBounds.y1 = Math.floor(b.y1);\n      dirtyBounds.x2 = Math.ceil(b.x2);\n      dirtyBounds.y2 = Math.ceil(b.y2);\n    }\n    this.backupDirtyBounds.copy(dirtyBounds);\n    context.inuse = true;\n    // 初始化context\n    context.clearMatrix();\n    context.setTransformForCurrent(true);\n\n    const drawInArea =\n      dirtyBounds.width() * context.dpr !== context.canvas.width ||\n      dirtyBounds.height() * context.dpr !== context.canvas.height;\n    context.save();\n\n    // 设置translate\n    context.translate(x, y, true);\n    if (drawInArea) {\n      context.beginPath();\n      context.rect(dirtyBounds.x1, dirtyBounds.y1, dirtyBounds.width(), dirtyBounds.height());\n      context.clip();\n    }\n\n    // 如果存在3d视角，那么不使用dirtyBounds\n    if (stage.camera) {\n      this.dirtyBounds.setValue(-Infinity, -Infinity, Infinity, Infinity);\n      this.backupDirtyBounds.setValue(-Infinity, -Infinity, Infinity, Infinity);\n    }\n\n    this.clearScreen(renderService, context, drawContext);\n    // // 渲染的时候图元的起始位置就是x，y\n    // this.backupDirtyBounds.translate(-x, -y);\n    // this.dirtyBounds.translate(-x, -y);\n\n    // // 设置translate\n    // context.translate(x, y, true);\n\n    context.save();\n    renderService.renderTreeRoots\n      .sort((a, b) => {\n        return (a.attribute.zIndex ?? DefaultAttribute.zIndex) - (b.attribute.zIndex ?? DefaultAttribute.zIndex);\n      })\n      .forEach(group => {\n        this.renderGroup(group as IGroup, drawContext);\n      });\n\n    context.restore();\n    context.restore();\n    context.draw();\n    // this.break = false;\n    context.inuse = false;\n  }\n\n  doRegister() {\n    throw new Error('暂不支持');\n  }\n\n  // 找到下一个graphic\n  protected _findNextGraphic(group: IGroup): IGraphic | null {\n    let parent = group.parent;\n    let id = group._uid;\n    while (parent) {\n      const g = findNextGraphic(parent, id, DefaultAttribute.zIndex);\n      if (g) {\n        return g;\n      }\n      id = parent._uid;\n      parent = parent.parent;\n    }\n    return null;\n  }\n\n  renderGroup(group: IGroup, drawContext: IDrawContext, skipSort?: boolean) {\n    if (drawContext.break || group.attribute.visibleAll === false) {\n      return;\n    }\n    if (group.incremental && (drawContext.startAtId == null || drawContext.startAtId === group._uid)) {\n      drawContext.break = true;\n      this._increaseRender(group, drawContext);\n      return;\n    }\n\n    if (!isRectIntersect(group.AABBBounds, this.dirtyBounds, false)) {\n      return;\n    }\n\n    const tempBounds = this.dirtyBounds.clone();\n\n    // 变换dirtyBounds\n    const m = group.globalTransMatrix.getInverse();\n    this.dirtyBounds.copy(this.backupDirtyBounds).transformWithMatrix(m);\n\n    this.renderItem(group, drawContext, {\n      drawingCb: () => {\n        skipSort\n          ? group.forEachChildren((item: IGraphic) => {\n              if (drawContext.break) {\n                return;\n              }\n              if (item.isContainer) {\n                this.renderGroup(item as IGroup, drawContext);\n              } else {\n                this.renderItem(item, drawContext);\n              }\n            })\n          : foreach(\n              group,\n              DefaultAttribute.zIndex,\n              (item: IGraphic) => {\n                if (drawContext.break) {\n                  return;\n                }\n                if (item.isContainer) {\n                  this.renderGroup(item as IGroup, drawContext);\n                } else {\n                  this.renderItem(item, drawContext);\n                }\n              },\n              false,\n              !!drawContext.context?.camera\n            );\n      }\n    });\n\n    this.dirtyBounds.copy(tempBounds);\n  }\n\n  protected _increaseRender(group: IGroup, drawContext: IDrawContext) {\n    const { layer, stage } = drawContext;\n    const { subLayers } = layer;\n    // 获取渐进渲染层\n    let incrementalLayer = subLayers.get(group._uid);\n    if (!incrementalLayer) {\n      incrementalLayer = {\n        layer: this.layerService.createLayer(stage),\n        zIndex: subLayers.size,\n        group\n      };\n      subLayers.set(group._uid, incrementalLayer);\n    }\n    // 渲染\n    const incrementalContext = incrementalLayer.layer.getNativeHandler().getContext();\n    const idc = incrementalLayer.drawContribution || container.get(IncrementalDrawContribution);\n    idc.dirtyBounds.setValue(-Infinity, -Infinity, Infinity, Infinity);\n    idc.backupDirtyBounds.setValue(-Infinity, -Infinity, Infinity, Infinity);\n    (idc as any).draw(this.currentRenderService, {\n      ...drawContext,\n      drawContribution: idc,\n      clear: 'transparent',\n      layer: incrementalLayer.layer,\n      context: incrementalContext,\n      startAtId: group._uid,\n      break: false\n    });\n    incrementalLayer.drawContribution = idc;\n    // this.draw(this.currentRenderService, {...this.drawParams, startAtId: group._uid})\n    // this.draw(this.currentRenderService, {...this.drawParams, clear: 'transparent', layer: incrementalContext.layer, context: incrementalContext, startAtId: group._uid})\n    const nextGraphic = this._findNextGraphic(group);\n    if (nextGraphic) {\n      // 如果是下一个渐进渲染层，那就再来一次\n      if (nextGraphic.isContainer && nextGraphic.incremental) {\n        this._increaseRender(nextGraphic as IGroup, drawContext);\n      } else {\n        // 如果不是渐进渲染层，那就默认图层渲染\n        let afterLayer = subLayers.get(nextGraphic._uid);\n        if (!afterLayer) {\n          afterLayer = {\n            layer: this.layerService.createLayer(stage),\n            zIndex: subLayers.size\n          };\n          subLayers.set(nextGraphic._uid, afterLayer);\n        }\n        const afterContext = afterLayer.layer.getNativeHandler().getContext();\n        this.draw(this.currentRenderService, {\n          ...drawContext,\n          drawContribution: idc,\n          clear: 'transparent',\n          layer: afterLayer.layer,\n          context: afterContext,\n          startAtId: nextGraphic._uid,\n          break: false\n        });\n      }\n    }\n  }\n\n  getRenderContribution(graphic: IGraphic): IGraphicRender | null {\n    let renderer = this.renderSelector.selector(graphic);\n    if (!renderer) {\n      renderer = this.selectRenderByNumberType(graphic.numberType);\n    }\n    if (!renderer) {\n      renderer = this.selectRenderByType(graphic.type);\n    }\n    return renderer;\n  }\n\n  renderItem(graphic: IGraphic, drawContext: IDrawContext, params?: IGraphicRenderDrawParams) {\n    // 添加拦截器\n    if (this.InterceptorContributions.length) {\n      for (let i = 0; i < this.InterceptorContributions.length; i++) {\n        const drawContribution = this.InterceptorContributions[i];\n        if (drawContribution.beforeDrawItem) {\n          if (drawContribution.beforeDrawItem(graphic, this.currentRenderService, drawContext, this, params)) {\n            return;\n          }\n        }\n      }\n    }\n\n    const renderer = this.getRenderContribution(graphic);\n    if (!renderer) {\n      return;\n    }\n\n    if (!(graphic.isContainer || isRectIntersect(graphic.AABBBounds, this.dirtyBounds, false))) {\n      return;\n    }\n\n    const skipDraw = drawContext.startAtId != null && graphic._uid !== drawContext.startAtId;\n    if (graphic._uid === drawContext.startAtId) {\n      drawContext.startAtId = null;\n    }\n    params && (params.skipDraw = skipDraw);\n    if (skipDraw) {\n      graphic.isContainer && renderer.draw(graphic, this.currentRenderService, drawContext, params);\n    } else {\n      renderer.draw(graphic, this.currentRenderService, drawContext, params);\n    }\n\n    // 添加拦截器\n    if (this.InterceptorContributions.length) {\n      for (let i = 0; i < this.InterceptorContributions.length; i++) {\n        const drawContribution = this.InterceptorContributions[i];\n        if (drawContribution.afterDrawItem) {\n          if (drawContribution.afterDrawItem(graphic, this.currentRenderService, drawContext, this)) {\n            return;\n          }\n        }\n      }\n    }\n  }\n  // 根据type选择对应的render\n  protected selectRenderByType(type?: string): IGraphicRender | null {\n    console.warn('未知错误，不应该走到这里');\n    return null;\n  }\n  // 根据type选择对应的render\n  protected selectRenderByNumberType(type?: number): IGraphicRender | null {\n    return this.currentRenderMap.get(type) || this.defaultRenderMap.get(type);\n  }\n\n  protected clearScreen(renderService: IRenderService, context: IContext2d, drawContext: IDrawContext) {\n    const { clear } = drawContext;\n    if (clear) {\n      const canvas = context.getCanvas();\n      const { width = canvas.width, height = canvas.height } = drawContext;\n      const x = 0;\n      const y = 0;\n      context.clearRect(x, y, width, height);\n      context.fillStyle = createColor(\n        context,\n        clear,\n        {\n          AABBBounds: { x1: x, y1: y, x2: x + width, y2: y + height }\n        },\n        0,\n        0\n      );\n      context.fillRect(x, y, width, height);\n    }\n  }\n\n  afterDraw(renderService: IRenderService, drawParams: IDrawContext) {\n    return;\n  }\n}\n"]}

package/cjs/render/contributions/render/symbol-render.js

@@ -35,15 +35,22 @@ let DefaultCanvasSymbolRender = class extends base_render_1.BaseRender {
         const {keepDirIn3d: keepDirIn3d = symbolAttribute.keepDirIn3d} = symbol.attribute, z = null !== (_a = this.z) && void 0 !== _a ? _a : 0;
         if (context.beginPath(), keepDirIn3d && context.camera && context.project) {
             const p = context.project(x, y, z), camera = context.camera;
-            context.camera = null, !1 === parsedPath.draw(context, size, p.x, p.y) && context.closePath(), 
-            context.camera = camera;
-        } else !1 === parsedPath.draw(context, size, x, y, z) && context.closePath();
+            context.camera = null, !1 === parsedPath.draw(context, size, p.x, p.y, void 0, ((p, a) => {
+                a.fill && (fillCb ? fillCb(context, symbol.attribute, symbolAttribute) : (context.setCommonStyle(symbol, a, originX - x, originY - y), 
+                context.fill())), a.stroke && (strokeCb ? strokeCb(context, symbol.attribute, symbolAttribute) : (context.setStrokeStyle(symbol, a, (originX - x) / scaleX, (originY - y) / scaleY), 
+                context.stroke()));
+            })) && context.closePath(), context.camera = camera;
+        } else !1 === parsedPath.draw(context, size, x, y, z, ((p, a) => {
+            a.fill && (fillCb ? fillCb(context, symbol.attribute, symbolAttribute) : (context.setCommonStyle(symbol, a, originX - x, originY - y), 
+            context.fill())), a.stroke && (strokeCb ? strokeCb(context, symbol.attribute, symbolAttribute) : (context.setStrokeStyle(symbol, a, (originX - x) / scaleX, (originY - y) / scaleY), 
+            context.stroke()));
+        })) && context.closePath();
         this._symbolRenderContribitions || (this._symbolRenderContribitions = this.symbolRenderContribitions.getContributions() || [], 
         this._symbolRenderContribitions.sort(((a, b) => b.order - a.order))), this._symbolRenderContribitions.forEach((c => {
             c.time === enums_1.BaseRenderContributionTime.beforeFillStroke && c.drawShape(symbol, context, x, y, doFill, doStroke, fVisible, sVisible, symbolAttribute, drawContext, fillCb, strokeCb);
         })), context.setShadowStyle && context.setShadowStyle(symbol, symbol.attribute, symbolAttribute), 
-        doFill && (fillCb ? fillCb(context, symbol.attribute, symbolAttribute) : fVisible && (context.setCommonStyle(symbol, symbol.attribute, originX - x, originY - y, symbolAttribute), 
-        context.fill())), doStroke && (strokeCb ? strokeCb(context, symbol.attribute, symbolAttribute) : sVisible && (context.setStrokeStyle(symbol, symbol.attribute, (originX - x) / scaleX, (originY - y) / scaleY, symbolAttribute), 
+        doFill && !parsedPath.isSvg && (fillCb ? fillCb(context, symbol.attribute, symbolAttribute) : fVisible && (context.setCommonStyle(symbol, symbol.attribute, originX - x, originY - y, symbolAttribute), 
+        context.fill())), doStroke && !parsedPath.isSvg && (strokeCb ? strokeCb(context, symbol.attribute, symbolAttribute) : sVisible && (context.setStrokeStyle(symbol, symbol.attribute, (originX - x) / scaleX, (originY - y) / scaleY, symbolAttribute), 
         context.stroke())), this._symbolRenderContribitions.forEach((c => {
             c.time === enums_1.BaseRenderContributionTime.afterFillStroke && c.drawShape(symbol, context, x, y, doFill, doStroke, fVisible, sVisible, symbolAttribute, drawContext, fillCb, strokeCb);
         }));

package/cjs/render/contributions/render/symbol-render.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/render/contributions/render/symbol-render.ts"],"names":[],"mappings":"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","file":"symbol-render.js","sourcesContent":["import { mat4Allocate } from '../../../allocator/matrix-allocate';\nimport { inject, injectable, named } from 'inversify';\n// eslint-disable-next-line\nimport { ContributionProvider } from '../../../common/contribution-provider';\nimport { getTheme } from '../../../graphic/theme';\nimport { SYMBOL_NUMBER_TYPE } from '../../../graphic/constants';\nimport type {\n  IGraphicAttribute,\n  IContext2d,\n  IMarkAttribute,\n  ISymbol,\n  IThemeAttribute,\n  ISymbolRenderContribution,\n  IDrawContext,\n  IRenderService,\n  IGraphicRender,\n  IGraphicRenderDrawParams,\n  IContributionProvider\n} from '../../../interface';\nimport type {} from '../../render-service';\nimport { BaseRender } from './base-render';\nimport { BaseRenderContributionTime } from '../../../common/enums';\nimport { SymbolRenderContribution } from './contributions/constants';\nimport { drawPathProxy, fillVisible, runFill, runStroke, strokeVisible } from './utils';\n\n@injectable()\nexport class DefaultCanvasSymbolRender extends BaseRender<ISymbol> implements IGraphicRender {\n  type: 'symbol';\n  numberType: number = SYMBOL_NUMBER_TYPE;\n  declare z: number;\n\n  protected _symbolRenderContribitions: ISymbolRenderContribution[];\n\n  constructor(\n    @inject(ContributionProvider)\n    @named(SymbolRenderContribution)\n    protected readonly symbolRenderContribitions: IContributionProvider<ISymbolRenderContribution>\n  ) {\n    super();\n  }\n\n  drawShape(\n    symbol: ISymbol,\n    context: IContext2d,\n    x: number,\n    y: number,\n    drawContext: IDrawContext,\n    params?: IGraphicRenderDrawParams,\n    fillCb?: (\n      ctx: IContext2d,\n      markAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n      themeAttribute: IThemeAttribute\n    ) => boolean,\n    strokeCb?: (\n      ctx: IContext2d,\n      markAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n      themeAttribute: IThemeAttribute\n    ) => boolean\n  ) {\n    // const symbolAttribute = graphicService.themeService.getCurrentTheme().symbolAttribute;\n    const symbolAttribute = getTheme(symbol, params?.theme).symbol;\n\n    const {\n      size = symbolAttribute.size,\n      fill = symbolAttribute.fill,\n      background,\n      fillOpacity = symbolAttribute.fillOpacity,\n      strokeOpacity = symbolAttribute.strokeOpacity,\n      opacity = symbolAttribute.opacity,\n      lineWidth = symbolAttribute.lineWidth,\n      stroke = symbolAttribute.stroke,\n      visible = symbolAttribute.visible,\n      x: originX = symbolAttribute.x,\n      y: originY = symbolAttribute.y,\n      scaleX = symbolAttribute.scaleX,\n      scaleY = symbolAttribute.scaleY\n    } = symbol.attribute;\n\n    // 不绘制或者透明\n    const fVisible = fillVisible(opacity, fillOpacity, fill);\n    const sVisible = strokeVisible(opacity, strokeOpacity);\n    const doFill = runFill(fill, background);\n    const doStroke = runStroke(stroke, lineWidth);\n\n    if (!(symbol.valid && visible)) {\n      return;\n    }\n\n    if (!(doFill || doStroke)) {\n      return;\n    }\n\n    // 如果存在fillCb和strokeCb，那就不直接跳过\n    if (!(fVisible || sVisible || fillCb || strokeCb || background)) {\n      return;\n    }\n\n    const parsedPath = symbol.getParsedPath();\n    // todo: 考虑使用path\n    if (!parsedPath) {\n      return;\n    }\n\n    const { keepDirIn3d = symbolAttribute.keepDirIn3d } = symbol.attribute;\n    const z = this.z ?? 0;\n    context.beginPath();\n    if (keepDirIn3d && context.camera && context.project) {\n      const p = context.project(x, y, z);\n      const camera = context.camera;\n      context.camera = null;\n      if (parsedPath.draw(context, size, p.x, p.y) === false) {\n        context.closePath();\n      }\n      context.camera = camera;\n    } else {\n      if (parsedPath.draw(context, size, x, y, z) === false) {\n        context.closePath();\n      }\n    }\n\n    if (!this._symbolRenderContribitions) {\n      this._symbolRenderContribitions = this.symbolRenderContribitions.getContributions() || [];\n      this._symbolRenderContribitions.sort((a, b) => b.order - a.order);\n    }\n    this._symbolRenderContribitions.forEach(c => {\n      if (c.time === BaseRenderContributionTime.beforeFillStroke) {\n        // c.useStyle && context.setCommonStyle(symbol, symbol.attribute, x, y, symbolAttribute);\n        c.drawShape(\n          symbol,\n          context,\n          x,\n          y,\n          doFill,\n          doStroke,\n          fVisible,\n          sVisible,\n          symbolAttribute,\n          drawContext,\n          fillCb,\n          strokeCb\n        );\n      }\n    });\n\n    // if (fill !== false) {\n    //   context.setCommonStyle(symbol.attribute, symbolAttribute);\n    //   context.fill();\n    // }\n    // if (stroke !== false) {\n    //   context.setStrokeStyle(symbol.attribute, symbolAttribute);\n    //   context.stroke();\n    // }\n\n    // shadow\n    context.setShadowStyle && context.setShadowStyle(symbol, symbol.attribute, symbolAttribute);\n\n    if (doFill) {\n      if (fillCb) {\n        fillCb(context, symbol.attribute, symbolAttribute);\n      } else if (fVisible) {\n        context.setCommonStyle(symbol, symbol.attribute, originX - x, originY - y, symbolAttribute);\n        context.fill();\n      }\n    }\n    if (doStroke) {\n      if (strokeCb) {\n        strokeCb(context, symbol.attribute, symbolAttribute);\n      } else if (sVisible) {\n        context.setStrokeStyle(\n          symbol,\n          symbol.attribute,\n          (originX - x) / scaleX,\n          (originY - y) / scaleY,\n          symbolAttribute\n        );\n        context.stroke();\n      }\n    }\n\n    this._symbolRenderContribitions.forEach(c => {\n      if (c.time === BaseRenderContributionTime.afterFillStroke) {\n        c.drawShape(\n          symbol,\n          context,\n          x,\n          y,\n          doFill,\n          doStroke,\n          fVisible,\n          sVisible,\n          symbolAttribute,\n          drawContext,\n          fillCb,\n          strokeCb\n        );\n      }\n    });\n  }\n\n  draw(symbol: ISymbol, renderService: IRenderService, drawContext: IDrawContext, params?: IGraphicRenderDrawParams) {\n    const { context } = drawContext;\n    if (!context) {\n      return;\n    }\n\n    context.highPerformanceSave();\n\n    // const symbolAttribute = graphicService.themeService.getCurrentTheme().symbolAttribute;\n    const symbolAttribute = getTheme(symbol, params?.theme).symbol;\n    // let { x = symbolAttribute.x, y = symbolAttribute.y } = symbol.attribute;\n\n    // const transMatrix = symbol.transMatrix;\n    // const onlyTranslate = transMatrix.onlyTranslate();\n    // // 只有translate，那么不设置矩阵，通过xy进行偏移\n    // if (onlyTranslate) {\n    //   const point = symbol.getOffsetXY(symbolAttribute);\n    //   x += point.x;\n    //   y += point.y;\n    //   // 当前context有rotate/scale，重置matrix\n    //   context.setTransformForCurrent();\n    // } else {\n    //   // 如果存在translate，那么存在三种情况：不需要设置2d矩阵，需要设置2d矩阵，需要修改2d矩阵然后设置\n    //   // 1. 如果通过3d变换绘制，那么也不需要设置矩阵\n    //   // 2. 如果缩放等操作依然通过\n\n    //   const { keepDirIn3d = symbolAttribute.keepDirIn3d, scaleX, scaleY, z } = symbol.attribute;\n    //   if (context.camera && context.project) {\n    //     // 如果保持3d视角，那么需要设置2d矩阵，但是需要进行修改，因为通过投影改变位置，但是需要进行2d缩放和旋转变换\n    //     if (keepDirIn3d) {\n    //       const p = context.project(x, y, z);\n    //       context.translate(p.x, p.y, false);\n    //       context.scale(scaleX, scaleY, false);\n    //       context.rotate(scaleX, false)\n    //       context.translate(-p.x, -p.y, false);\n    //       context.setTransformForCurrent();\n    //     } else { // 不保持3d视角，所有变换均通过3d矩阵完成，不需要2d的矩阵\n    //       context.setTransform(1, 0, 0, 1, 0, 0, true);\n    //     }\n    //   } else {\n    //     // 直接设置矩阵即可\n    //     // 性能较差\n    //     x = 0;\n    //     y = 0;\n    //     context.transformFromMatrix(symbol.transMatrix, true);\n    //   }\n    // }\n    const data = this.transform(symbol, symbolAttribute, context);\n    const { x, y, z, lastModelMatrix } = data;\n\n    this.z = z;\n    if (drawPathProxy(symbol, context, x, y, drawContext, params)) {\n      context.highPerformanceRestore();\n      return;\n    }\n\n    this.drawShape(symbol, context, x, y, drawContext, params);\n    this.z = 0;\n\n    if (context.modelMatrix !== lastModelMatrix) {\n      mat4Allocate.free(context.modelMatrix);\n    }\n    context.modelMatrix = lastModelMatrix;\n\n    context.highPerformanceRestore();\n  }\n}\n"]}
+{"version":3,"sources":["../../src/render/contributions/render/symbol-render.ts"],"names":[],"mappings":"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","file":"symbol-render.js","sourcesContent":["import { mat4Allocate } from '../../../allocator/matrix-allocate';\nimport { inject, injectable, named } from 'inversify';\n// eslint-disable-next-line\nimport { ContributionProvider } from '../../../common/contribution-provider';\nimport { getTheme } from '../../../graphic/theme';\nimport { SYMBOL_NUMBER_TYPE } from '../../../graphic/constants';\nimport type {\n  IGraphicAttribute,\n  IContext2d,\n  IMarkAttribute,\n  ISymbol,\n  IThemeAttribute,\n  ISymbolRenderContribution,\n  IDrawContext,\n  IRenderService,\n  IGraphicRender,\n  IGraphicRenderDrawParams,\n  IContributionProvider\n} from '../../../interface';\nimport type {} from '../../render-service';\nimport { BaseRender } from './base-render';\nimport { BaseRenderContributionTime } from '../../../common/enums';\nimport { SymbolRenderContribution } from './contributions/constants';\nimport { drawPathProxy, fillVisible, runFill, runStroke, strokeVisible } from './utils';\n\n@injectable()\nexport class DefaultCanvasSymbolRender extends BaseRender<ISymbol> implements IGraphicRender {\n  type: 'symbol';\n  numberType: number = SYMBOL_NUMBER_TYPE;\n  declare z: number;\n\n  protected _symbolRenderContribitions: ISymbolRenderContribution[];\n\n  constructor(\n    @inject(ContributionProvider)\n    @named(SymbolRenderContribution)\n    protected readonly symbolRenderContribitions: IContributionProvider<ISymbolRenderContribution>\n  ) {\n    super();\n  }\n\n  drawShape(\n    symbol: ISymbol,\n    context: IContext2d,\n    x: number,\n    y: number,\n    drawContext: IDrawContext,\n    params?: IGraphicRenderDrawParams,\n    fillCb?: (\n      ctx: IContext2d,\n      markAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n      themeAttribute: IThemeAttribute\n    ) => boolean,\n    strokeCb?: (\n      ctx: IContext2d,\n      markAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n      themeAttribute: IThemeAttribute\n    ) => boolean\n  ) {\n    // const symbolAttribute = graphicService.themeService.getCurrentTheme().symbolAttribute;\n    const symbolAttribute = getTheme(symbol, params?.theme).symbol;\n\n    const {\n      size = symbolAttribute.size,\n      fill = symbolAttribute.fill,\n      background,\n      fillOpacity = symbolAttribute.fillOpacity,\n      strokeOpacity = symbolAttribute.strokeOpacity,\n      opacity = symbolAttribute.opacity,\n      lineWidth = symbolAttribute.lineWidth,\n      stroke = symbolAttribute.stroke,\n      visible = symbolAttribute.visible,\n      x: originX = symbolAttribute.x,\n      y: originY = symbolAttribute.y,\n      scaleX = symbolAttribute.scaleX,\n      scaleY = symbolAttribute.scaleY\n    } = symbol.attribute;\n\n    // 不绘制或者透明\n    const fVisible = fillVisible(opacity, fillOpacity, fill);\n    const sVisible = strokeVisible(opacity, strokeOpacity);\n    const doFill = runFill(fill, background);\n    const doStroke = runStroke(stroke, lineWidth);\n\n    if (!(symbol.valid && visible)) {\n      return;\n    }\n\n    if (!(doFill || doStroke)) {\n      return;\n    }\n\n    // 如果存在fillCb和strokeCb，那就不直接跳过\n    if (!(fVisible || sVisible || fillCb || strokeCb || background)) {\n      return;\n    }\n\n    const parsedPath = symbol.getParsedPath();\n    // todo: 考虑使用path\n    if (!parsedPath) {\n      return;\n    }\n\n    const { keepDirIn3d = symbolAttribute.keepDirIn3d } = symbol.attribute;\n    const z = this.z ?? 0;\n    context.beginPath();\n    if (keepDirIn3d && context.camera && context.project) {\n      const p = context.project(x, y, z);\n      const camera = context.camera;\n      context.camera = null;\n      if (\n        parsedPath.draw(context, size, p.x, p.y, undefined, (p, a) => {\n          if (a.fill) {\n            if (fillCb) {\n              fillCb(context, symbol.attribute, symbolAttribute);\n            } else {\n              context.setCommonStyle(symbol, a, originX - x, originY - y);\n              context.fill();\n            }\n          }\n          if (a.stroke) {\n            if (strokeCb) {\n              strokeCb(context, symbol.attribute, symbolAttribute);\n            } else {\n              context.setStrokeStyle(symbol, a, (originX - x) / scaleX, (originY - y) / scaleY);\n              context.stroke();\n            }\n          }\n        }) === false\n      ) {\n        context.closePath();\n      }\n      context.camera = camera;\n    } else {\n      if (\n        parsedPath.draw(context, size, x, y, z, (p, a) => {\n          if (a.fill) {\n            if (fillCb) {\n              fillCb(context, symbol.attribute, symbolAttribute);\n            } else {\n              context.setCommonStyle(symbol, a, originX - x, originY - y);\n              context.fill();\n            }\n          }\n          if (a.stroke) {\n            if (strokeCb) {\n              strokeCb(context, symbol.attribute, symbolAttribute);\n            } else {\n              context.setStrokeStyle(symbol, a, (originX - x) / scaleX, (originY - y) / scaleY);\n              context.stroke();\n            }\n          }\n        }) === false\n      ) {\n        context.closePath();\n      }\n    }\n\n    if (!this._symbolRenderContribitions) {\n      this._symbolRenderContribitions = this.symbolRenderContribitions.getContributions() || [];\n      this._symbolRenderContribitions.sort((a, b) => b.order - a.order);\n    }\n    this._symbolRenderContribitions.forEach(c => {\n      if (c.time === BaseRenderContributionTime.beforeFillStroke) {\n        // c.useStyle && context.setCommonStyle(symbol, symbol.attribute, x, y, symbolAttribute);\n        c.drawShape(\n          symbol,\n          context,\n          x,\n          y,\n          doFill,\n          doStroke,\n          fVisible,\n          sVisible,\n          symbolAttribute,\n          drawContext,\n          fillCb,\n          strokeCb\n        );\n      }\n    });\n\n    // if (fill !== false) {\n    //   context.setCommonStyle(symbol.attribute, symbolAttribute);\n    //   context.fill();\n    // }\n    // if (stroke !== false) {\n    //   context.setStrokeStyle(symbol.attribute, symbolAttribute);\n    //   context.stroke();\n    // }\n\n    // shadow\n    context.setShadowStyle && context.setShadowStyle(symbol, symbol.attribute, symbolAttribute);\n\n    // svg就不用fill和stroke了\n    if (doFill && !parsedPath.isSvg) {\n      if (fillCb) {\n        fillCb(context, symbol.attribute, symbolAttribute);\n      } else if (fVisible) {\n        context.setCommonStyle(symbol, symbol.attribute, originX - x, originY - y, symbolAttribute);\n        context.fill();\n      }\n    }\n    if (doStroke && !parsedPath.isSvg) {\n      if (strokeCb) {\n        strokeCb(context, symbol.attribute, symbolAttribute);\n      } else if (sVisible) {\n        context.setStrokeStyle(\n          symbol,\n          symbol.attribute,\n          (originX - x) / scaleX,\n          (originY - y) / scaleY,\n          symbolAttribute\n        );\n        context.stroke();\n      }\n    }\n\n    this._symbolRenderContribitions.forEach(c => {\n      if (c.time === BaseRenderContributionTime.afterFillStroke) {\n        c.drawShape(\n          symbol,\n          context,\n          x,\n          y,\n          doFill,\n          doStroke,\n          fVisible,\n          sVisible,\n          symbolAttribute,\n          drawContext,\n          fillCb,\n          strokeCb\n        );\n      }\n    });\n  }\n\n  draw(symbol: ISymbol, renderService: IRenderService, drawContext: IDrawContext, params?: IGraphicRenderDrawParams) {\n    const { context } = drawContext;\n    if (!context) {\n      return;\n    }\n\n    context.highPerformanceSave();\n\n    // const symbolAttribute = graphicService.themeService.getCurrentTheme().symbolAttribute;\n    const symbolAttribute = getTheme(symbol, params?.theme).symbol;\n    // let { x = symbolAttribute.x, y = symbolAttribute.y } = symbol.attribute;\n\n    // const transMatrix = symbol.transMatrix;\n    // const onlyTranslate = transMatrix.onlyTranslate();\n    // // 只有translate，那么不设置矩阵，通过xy进行偏移\n    // if (onlyTranslate) {\n    //   const point = symbol.getOffsetXY(symbolAttribute);\n    //   x += point.x;\n    //   y += point.y;\n    //   // 当前context有rotate/scale，重置matrix\n    //   context.setTransformForCurrent();\n    // } else {\n    //   // 如果存在translate，那么存在三种情况：不需要设置2d矩阵，需要设置2d矩阵，需要修改2d矩阵然后设置\n    //   // 1. 如果通过3d变换绘制，那么也不需要设置矩阵\n    //   // 2. 如果缩放等操作依然通过\n\n    //   const { keepDirIn3d = symbolAttribute.keepDirIn3d, scaleX, scaleY, z } = symbol.attribute;\n    //   if (context.camera && context.project) {\n    //     // 如果保持3d视角，那么需要设置2d矩阵，但是需要进行修改，因为通过投影改变位置，但是需要进行2d缩放和旋转变换\n    //     if (keepDirIn3d) {\n    //       const p = context.project(x, y, z);\n    //       context.translate(p.x, p.y, false);\n    //       context.scale(scaleX, scaleY, false);\n    //       context.rotate(scaleX, false)\n    //       context.translate(-p.x, -p.y, false);\n    //       context.setTransformForCurrent();\n    //     } else { // 不保持3d视角，所有变换均通过3d矩阵完成，不需要2d的矩阵\n    //       context.setTransform(1, 0, 0, 1, 0, 0, true);\n    //     }\n    //   } else {\n    //     // 直接设置矩阵即可\n    //     // 性能较差\n    //     x = 0;\n    //     y = 0;\n    //     context.transformFromMatrix(symbol.transMatrix, true);\n    //   }\n    // }\n    const data = this.transform(symbol, symbolAttribute, context);\n    const { x, y, z, lastModelMatrix } = data;\n\n    this.z = z;\n    if (drawPathProxy(symbol, context, x, y, drawContext, params)) {\n      context.highPerformanceRestore();\n      return;\n    }\n\n    this.drawShape(symbol, context, x, y, drawContext, params);\n    this.z = 0;\n\n    if (context.modelMatrix !== lastModelMatrix) {\n      mat4Allocate.free(context.modelMatrix);\n    }\n    context.modelMatrix = lastModelMatrix;\n\n    context.highPerformanceRestore();\n  }\n}\n"]}

package/cjs/render/render-service.js

@@ -42,7 +42,9 @@ let DefaultRenderService = class {
     draw(params) {
         this.drawContribution.draw(this, Object.assign({}, this.drawParams));
     }
-    afterDraw(params) {}
+    afterDraw(params) {
+        this.drawContribution.afterDraw && this.drawContribution.afterDraw(this, Object.assign({}, this.drawParams));
+    }
     render(groups, params) {
         this.renderTreeRoots = groups, this.drawParams = params;
         const updateBounds = params.updateBounds;