@visactor/vrender-core 1.1.0-alpha.0 → 1.1.0-alpha.10

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

@@ -2,19 +2,89 @@
 
 Object.defineProperty(exports, "__esModule", {
     value: !0
-}), exports.DefaultCanvasImageRender = void 0;
+}), exports.DefaultCanvasImageRender = exports.drawImageWithLayout = exports.shouldClipImageByLayout = exports.resolveBackgroundParamsByImageSizing = exports.resolveImageMode = exports.resolveImageRepeatMode = void 0;
 
-const theme_1 = require("../../../graphic/theme"), constants_1 = require("./contributions/constants"), constants_2 = require("../../../graphic/constants"), vutils_1 = require("@visactor/vutils"), rect_1 = require("../../../common/shape/rect"), base_render_1 = require("./base-render"), contributions_1 = require("./contributions"), loader_1 = require("../../../resource-loader/loader"), registry_1 = require("../../../common/registry"), repeatStr = [ "", "repeat-x", "repeat-y", "repeat" ];
+const theme_1 = require("../../../graphic/theme"), constants_1 = require("../../../graphic/constants"), vutils_1 = require("@visactor/vutils"), rect_1 = require("../../../common/shape/rect"), base_render_1 = require("./base-render"), contributions_1 = require("./contributions"), loader_1 = require("../../../resource-loader/loader"), base_contribution_render_1 = require("./contributions/base-contribution-render"), repeatStr = [ "", "repeat-x", "repeat-y", "repeat" ];
+
+function resolveImageRepeatMode(repeatX, repeatY) {
+    let repeat = 0;
+    return "repeat" === repeatX && (repeat |= 1), "repeat" === repeatY && (repeat |= 2), 
+    repeat ? repeatStr[repeat] : "no-repeat";
+}
+
+function resolveImageMode({repeatX: repeatX = "no-repeat", repeatY: repeatY = "no-repeat", imageMode: imageMode}) {
+    const repeatMode = resolveImageRepeatMode(repeatX, repeatY);
+    return {
+        repeatMode: repeatMode,
+        sizingMode: "no-repeat" === repeatMode && null != imageMode ? imageMode : "fill"
+    };
+}
+
+exports.resolveImageRepeatMode = resolveImageRepeatMode, exports.resolveImageMode = resolveImageMode;
+
+const IMAGE_MODE_TO_BACKGROUND_MODE = {
+    cover: "no-repeat-cover",
+    contain: "no-repeat-contain",
+    fill: "no-repeat-fill",
+    auto: "no-repeat-auto"
+};
+
+function resolveBackgroundParamsByImageSizing(sizingMode) {
+    return {
+        backgroundMode: IMAGE_MODE_TO_BACKGROUND_MODE[sizingMode],
+        backgroundFit: !1,
+        backgroundKeepAspectRatio: !1
+    };
+}
+
+function shouldClipImageByLayout({repeatX: repeatX = "no-repeat", repeatY: repeatY = "no-repeat", imageMode: imageMode, imageScale: imageScale = 1, imageOffsetX: imageOffsetX = 0, imageOffsetY: imageOffsetY = 0}) {
+    const {repeatMode: repeatMode, sizingMode: sizingMode} = resolveImageMode({
+        repeatX: repeatX,
+        repeatY: repeatY,
+        imageMode: imageMode
+    });
+    return "no-repeat" === repeatMode && ("cover" === sizingMode || "auto" === sizingMode || 1 !== imageScale || 0 !== imageOffsetX || 0 !== imageOffsetY);
+}
+
+function drawImageWithLayout(context, data, x, y, width, height, {repeatX: repeatX = "no-repeat", repeatY: repeatY = "no-repeat", imageMode: imageMode, imageScale: imageScale = 1, imageOffsetX: imageOffsetX = 0, imageOffsetY: imageOffsetY = 0, imagePosition: imagePosition = "top-left"}) {
+    const {repeatMode: repeatMode, sizingMode: sizingMode} = resolveImageMode({
+        repeatX: repeatX,
+        repeatY: repeatY,
+        imageMode: imageMode
+    }), imageBackgroundParams = "no-repeat" === repeatMode ? resolveBackgroundParamsByImageSizing(sizingMode) : {
+        backgroundMode: repeatMode,
+        backgroundFit: !1,
+        backgroundKeepAspectRatio: !1
+    };
+    (0, base_contribution_render_1.drawBackgroundImage)(context, data, {
+        x1: x,
+        y1: y,
+        x2: x + width,
+        y2: y + height,
+        width: () => width,
+        height: () => height
+    }, {
+        backgroundMode: imageBackgroundParams.backgroundMode,
+        backgroundFit: imageBackgroundParams.backgroundFit,
+        backgroundKeepAspectRatio: imageBackgroundParams.backgroundKeepAspectRatio,
+        backgroundScale: imageScale,
+        backgroundOffsetX: imageOffsetX,
+        backgroundOffsetY: imageOffsetY,
+        backgroundPosition: imagePosition
+    });
+}
+
+exports.resolveBackgroundParamsByImageSizing = resolveBackgroundParamsByImageSizing, 
+exports.shouldClipImageByLayout = shouldClipImageByLayout, exports.drawImageWithLayout = drawImageWithLayout;
 
 class DefaultCanvasImageRender extends base_render_1.BaseRender {
     constructor(graphicRenderContributions) {
-        super(), this.numberType = constants_2.IMAGE_NUMBER_TYPE, this.graphicRenderContributions = graphicRenderContributions || {
-            getContributions: () => registry_1.contributionRegistry.get(constants_1.ImageRenderContribution)
-        }, this.builtinContributions = [ contributions_1.defaultImageRenderContribution, contributions_1.defaultImageBackgroundRenderContribution ], 
-        this.init(this.graphicRenderContributions);
+        super(), this.graphicRenderContributions = graphicRenderContributions, this.numberType = constants_1.IMAGE_NUMBER_TYPE, 
+        this.builtinContributions = [ contributions_1.defaultImageRenderContribution, contributions_1.defaultImageBackgroundRenderContribution ], 
+        this.init(graphicRenderContributions);
     }
     drawShape(image, context, x, y, drawContext, params, fillCb, strokeCb) {
-        const imageAttribute = (0, theme_1.getTheme)(image).image, {repeatX: repeatX = imageAttribute.repeatX, repeatY: repeatY = imageAttribute.repeatY, x: originX = imageAttribute.x, y: originY = imageAttribute.y, cornerRadius: cornerRadius = imageAttribute.cornerRadius, fillStrokeOrder: fillStrokeOrder = imageAttribute.fillStrokeOrder, cornerType: cornerType = imageAttribute.cornerType, image: url} = image.attribute, data = this.valid(image, imageAttribute, fillCb);
+        const imageAttribute = (0, theme_1.getTheme)(image).image, {repeatX: repeatX = imageAttribute.repeatX, repeatY: repeatY = imageAttribute.repeatY, x: originX = imageAttribute.x, y: originY = imageAttribute.y, cornerRadius: cornerRadius = imageAttribute.cornerRadius, fillStrokeOrder: fillStrokeOrder = imageAttribute.fillStrokeOrder, cornerType: cornerType = imageAttribute.cornerType, imageMode: imageMode = imageAttribute.imageMode, imageScale: imageScale = imageAttribute.imageScale, imageOffsetX: imageOffsetX = imageAttribute.imageOffsetX, imageOffsetY: imageOffsetY = imageAttribute.imageOffsetY, imagePosition: imagePosition = imageAttribute.imagePosition, image: url} = image.attribute, data = this.valid(image, imageAttribute, fillCb);
         if (!data) return;
         const {fVisible: fVisible, sVisible: sVisible, doFill: doFill, doStroke: doStroke} = data;
         if (!url || !image.resources) return;
@@ -22,30 +92,37 @@ class DefaultCanvasImageRender extends base_render_1.BaseRender {
         if ("success" !== res.state) return;
         const width = image.width, height = image.height;
         context.beginPath();
-        let needRestore = !1;
+        let needCornerClip = !1;
         0 === cornerRadius || (0, vutils_1.isArray)(cornerRadius) && cornerRadius.every((num => 0 === num)) ? context.rect(x, y, width, height) : ((0, 
         rect_1.createRectPath)(context, x, y, width, height, cornerRadius, "bevel" !== cornerType), 
-        needRestore = !0), context.setShadowBlendStyle && context.setShadowBlendStyle(image, image.attribute, imageAttribute);
+        needCornerClip = !0), context.setShadowBlendStyle && context.setShadowBlendStyle(image, image.attribute, imageAttribute);
         const _runFill = () => {
-            if (doFill) if (fillCb) fillCb(context, image.attribute, imageAttribute); else if (fVisible) {
-                context.setCommonStyle(image, image.attribute, x, y, imageAttribute);
-                let repeat = 0;
-                if ("repeat" === repeatX && (repeat |= 1), "repeat" === repeatY && (repeat |= 2), 
-                repeat) {
-                    const pattern = context.createPattern(res.data, repeatStr[repeat]);
-                    context.fillStyle = pattern, context.translate(x, y, !0), context.fillRect(0, 0, width, height), 
-                    context.translate(-x, -y, !0);
-                } else context.drawImage(res.data, x, y, width, height);
-            }
+            doFill && (fillCb ? fillCb(context, image.attribute, imageAttribute) : fVisible && (context.setCommonStyle(image, image.attribute, x, y, imageAttribute), 
+            drawImageWithLayout(context, res.data, x, y, width, height, {
+                repeatX: repeatX,
+                repeatY: repeatY,
+                imageMode: imageMode,
+                imageScale: imageScale,
+                imageOffsetX: imageOffsetX,
+                imageOffsetY: imageOffsetY,
+                imagePosition: imagePosition
+            })));
         }, _runStroke = () => {
             doStroke && (strokeCb ? strokeCb(context, image.attribute, imageAttribute) : sVisible && (context.setStrokeStyle(image, image.attribute, originX - x, originY - y, imageAttribute), 
             context.stroke()));
-        };
-        fillStrokeOrder ? (_runStroke(), needRestore && (context.save(), context.clip()), 
+        }, needLayoutClip = shouldClipImageByLayout({
+            repeatX: repeatX,
+            repeatY: repeatY,
+            imageMode: imageMode,
+            imageScale: imageScale,
+            imageOffsetX: imageOffsetX,
+            imageOffsetY: imageOffsetY,
+            imagePosition: imagePosition
+        }), needClip = needCornerClip || needLayoutClip;
+        fillStrokeOrder ? (_runStroke(), needClip && (context.save(), context.clip()), this.beforeRenderStep(image, context, x, y, doFill, !1, fVisible, !1, imageAttribute, drawContext, fillCb), 
+        _runFill(), needClip && context.restore()) : (needClip && (context.save(), context.clip()), 
         this.beforeRenderStep(image, context, x, y, doFill, !1, fVisible, !1, imageAttribute, drawContext, fillCb), 
-        _runFill(), needRestore && context.restore()) : (needRestore && (context.save(), 
-        context.clip()), this.beforeRenderStep(image, context, x, y, doFill, !1, fVisible, !1, imageAttribute, drawContext, fillCb), 
-        _runFill(), needRestore && context.restore(), _runStroke()), this.afterRenderStep(image, context, x, y, doFill, !1, fVisible, !1, imageAttribute, drawContext, fillCb);
+        _runFill(), needClip && context.restore(), _runStroke()), this.afterRenderStep(image, context, x, y, doFill, !1, fVisible, !1, imageAttribute, drawContext, fillCb);
     }
     draw(image, renderService, drawContext) {
         const {image: url} = image.attribute;

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

@@ -1 +1 @@
-{"version":3,"sources":["../src/render/contributions/render/image-render.ts"],"names":[],"mappings":"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","file":"image-render.js","sourcesContent":["import { getTheme } from '../../../graphic/theme';\nimport type {\n  IGraphicAttribute,\n  IContext2d,\n  IMarkAttribute,\n  IImage,\n  IThemeAttribute,\n  IGraphicRender,\n  IImageRenderContribution,\n  IContributionProvider,\n  IDrawContext,\n  IGraphicRenderDrawParams,\n  IRenderService\n} from '../../../interface';\nimport { ImageRenderContribution } from './contributions/constants';\nimport { fillVisible, runFill } from './utils';\nimport { IMAGE_NUMBER_TYPE } from '../../../graphic/constants';\nimport { BaseRenderContributionTime } from '../../../common/enums';\nimport { isArray, isString } from '@visactor/vutils';\nimport { createRectPath } from '../../../common/shape/rect';\nimport { BaseRender } from './base-render';\nimport { defaultImageBackgroundRenderContribution, defaultImageRenderContribution } from './contributions';\nimport { ResourceLoader } from '../../../resource-loader/loader';\nimport { contributionRegistry } from '../../../common/registry';\n\nconst repeatStr = ['', 'repeat-x', 'repeat-y', 'repeat'];\n\nexport class DefaultCanvasImageRender extends BaseRender<IImage> implements IGraphicRender {\n  type: 'image';\n  numberType: number = IMAGE_NUMBER_TYPE;\n\n  protected readonly graphicRenderContributions: IContributionProvider<IImageRenderContribution>;\n\n  constructor(graphicRenderContributions?: IContributionProvider<IImageRenderContribution>) {\n    super();\n    this.graphicRenderContributions =\n      graphicRenderContributions ||\n      ({\n        getContributions: () => contributionRegistry.get<IImageRenderContribution>(ImageRenderContribution)\n      } as IContributionProvider<IImageRenderContribution>);\n    this.builtinContributions = [defaultImageRenderContribution, defaultImageBackgroundRenderContribution];\n    this.init(this.graphicRenderContributions);\n  }\n\n  drawShape(\n    image: IImage,\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 imageAttribute = graphicService.themeService.getCurrentTheme().imageAttribute;\n    const imageAttribute = getTheme(image).image;\n    const {\n      repeatX = imageAttribute.repeatX,\n      repeatY = imageAttribute.repeatY,\n      x: originX = imageAttribute.x,\n      y: originY = imageAttribute.y,\n      cornerRadius = imageAttribute.cornerRadius,\n      fillStrokeOrder = imageAttribute.fillStrokeOrder,\n      cornerType = imageAttribute.cornerType,\n      image: url\n    } = image.attribute;\n\n    const data = this.valid(image, imageAttribute, fillCb);\n    if (!data) {\n      return;\n    }\n    const { fVisible, sVisible, doFill, doStroke } = data;\n\n    if (!url || !image.resources) {\n      return;\n    }\n    const res = image.resources.get(url);\n    if (res.state !== 'success') {\n      return;\n    }\n\n    const width = image.width;\n    const height = image.height;\n    context.beginPath();\n\n    // deal with cornerRadius\n    let needRestore = false;\n    if (cornerRadius === 0 || (isArray(cornerRadius) && (<number[]>cornerRadius).every(num => num === 0))) {\n      // 不需要处理圆角\n      context.rect(x, y, width, height);\n    } else {\n      // context.beginPath();\n      createRectPath(context, x, y, width, height, cornerRadius, cornerType !== 'bevel');\n      needRestore = true;\n    }\n\n    // shadow\n    context.setShadowBlendStyle && context.setShadowBlendStyle(image, image.attribute, imageAttribute);\n    // context.beginPath();\n    // context.image(x, y, width, height);\n\n    const _runFill = () => {\n      if (doFill) {\n        if (fillCb) {\n          fillCb(context, image.attribute, imageAttribute);\n        } else if (fVisible) {\n          context.setCommonStyle(image, image.attribute, x, y, imageAttribute);\n          let repeat = 0;\n          if (repeatX === 'repeat') {\n            repeat |= 0b0001;\n          }\n          if (repeatY === 'repeat') {\n            repeat |= 0b0010;\n          }\n          if (repeat) {\n            const pattern = context.createPattern(res.data, repeatStr[repeat]);\n            context.fillStyle = pattern;\n            context.translate(x, y, true);\n            context.fillRect(0, 0, width, height);\n            context.translate(-x, -y, true);\n          } else {\n            context.drawImage(res.data, x, y, width, height);\n          }\n        }\n      }\n    };\n\n    const _runStroke = () => {\n      if (doStroke) {\n        if (strokeCb) {\n          strokeCb(context, image.attribute, imageAttribute);\n        } else if (sVisible) {\n          context.setStrokeStyle(image, image.attribute, originX - x, originY - y, imageAttribute);\n          context.stroke();\n        }\n      }\n    };\n\n    if (!fillStrokeOrder) {\n      if (needRestore) {\n        context.save();\n        context.clip();\n      }\n      this.beforeRenderStep(image, context, x, y, doFill, false, fVisible, false, imageAttribute, drawContext, fillCb);\n      _runFill();\n      if (needRestore) {\n        context.restore();\n      }\n      _runStroke();\n    } else {\n      _runStroke();\n      if (needRestore) {\n        context.save();\n        context.clip();\n      }\n      this.beforeRenderStep(image, context, x, y, doFill, false, fVisible, false, imageAttribute, drawContext, fillCb);\n      _runFill();\n      if (needRestore) {\n        context.restore();\n      }\n    }\n\n    this.afterRenderStep(image, context, x, y, doFill, false, fVisible, false, imageAttribute, drawContext, fillCb);\n  }\n\n  draw(image: IImage, renderService: IRenderService, drawContext: IDrawContext) {\n    const { image: url } = image.attribute;\n\n    if (!url || !image.resources) {\n      return;\n    }\n    const res = image.resources.get(url);\n    // if (res.state !== 'success') {\n    //   return;\n    // }\n    if (res.state === 'loading' && isString(url)) {\n      ResourceLoader.improveImageLoading(url);\n      return;\n    } else if (res.state !== 'success') {\n      return;\n    }\n\n    const { context } = renderService.drawParams;\n    if (!context) {\n      return;\n    }\n    const imageAttribute = getTheme(image).image;\n    this._draw(image, imageAttribute, false, drawContext);\n  }\n}\n"]}
+{"version":3,"sources":["../src/render/contributions/render/image-render.ts"],"names":[],"mappings":"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","file":"image-render.js","sourcesContent":["import { getTheme } from '../../../graphic/theme';\nimport type {\n  IGraphicAttribute,\n  IContext2d,\n  IMarkAttribute,\n  BackgroundSizing,\n  BackgroundMode,\n  IImage,\n  IImageGraphicAttribute,\n  IThemeAttribute,\n  IGraphicRender,\n  IImageRenderContribution,\n  IContributionProvider,\n  IDrawContext,\n  IGraphicRenderDrawParams,\n  IRenderService\n} from '../../../interface';\nimport { ImageRenderContribution } from './contributions/constants';\nimport { fillVisible, runFill } from './utils';\nimport { IMAGE_NUMBER_TYPE } from '../../../graphic/constants';\nimport { BaseRenderContributionTime } from '../../../common/enums';\nimport { isArray, isString } from '@visactor/vutils';\nimport { createRectPath } from '../../../common/shape/rect';\nimport { BaseRender } from './base-render';\nimport { defaultImageBackgroundRenderContribution, defaultImageRenderContribution } from './contributions';\nimport { ResourceLoader } from '../../../resource-loader/loader';\nimport { drawBackgroundImage } from './contributions/base-contribution-render';\n\nconst repeatStr = ['', 'repeat-x', 'repeat-y', 'repeat'];\n\nexport type IImageLayoutDrawParams = Pick<\n  IImageGraphicAttribute,\n  'repeatX' | 'repeatY' | 'imageMode' | 'imageScale' | 'imageOffsetX' | 'imageOffsetY' | 'imagePosition'\n>;\n\nexport function resolveImageRepeatMode(\n  repeatX: IImageGraphicAttribute['repeatX'],\n  repeatY: IImageGraphicAttribute['repeatY']\n): 'repeat' | 'repeat-x' | 'repeat-y' | 'no-repeat' {\n  let repeat = 0;\n  if (repeatX === 'repeat') {\n    repeat |= 0b0001;\n  }\n  if (repeatY === 'repeat') {\n    repeat |= 0b0010;\n  }\n  return repeat ? (repeatStr[repeat] as 'repeat' | 'repeat-x' | 'repeat-y') : 'no-repeat';\n}\n\nexport function resolveImageMode({\n  repeatX = 'no-repeat',\n  repeatY = 'no-repeat',\n  imageMode\n}: Pick<IImageLayoutDrawParams, 'repeatX' | 'repeatY' | 'imageMode'>): {\n  repeatMode: 'repeat' | 'repeat-x' | 'repeat-y' | 'no-repeat';\n  sizingMode: BackgroundSizing;\n} {\n  const repeatMode = resolveImageRepeatMode(repeatX, repeatY);\n  return {\n    repeatMode,\n    sizingMode: repeatMode === 'no-repeat' ? imageMode ?? 'fill' : 'fill'\n  };\n}\n\nconst IMAGE_MODE_TO_BACKGROUND_MODE: Record<BackgroundSizing, BackgroundMode> = {\n  cover: 'no-repeat-cover',\n  contain: 'no-repeat-contain',\n  fill: 'no-repeat-fill',\n  auto: 'no-repeat-auto'\n};\n\nexport function resolveBackgroundParamsByImageSizing(sizingMode: BackgroundSizing): {\n  backgroundMode: BackgroundMode;\n  backgroundFit: boolean;\n  backgroundKeepAspectRatio: boolean;\n} {\n  return {\n    backgroundMode: IMAGE_MODE_TO_BACKGROUND_MODE[sizingMode],\n    backgroundFit: false,\n    backgroundKeepAspectRatio: false\n  };\n}\n\nexport function shouldClipImageByLayout({\n  repeatX = 'no-repeat',\n  repeatY = 'no-repeat',\n  imageMode,\n  imageScale = 1,\n  imageOffsetX = 0,\n  imageOffsetY = 0\n}: IImageLayoutDrawParams): boolean {\n  const { repeatMode, sizingMode } = resolveImageMode({\n    repeatX,\n    repeatY,\n    imageMode\n  });\n  return (\n    repeatMode === 'no-repeat' &&\n    (sizingMode === 'cover' || sizingMode === 'auto' || imageScale !== 1 || imageOffsetX !== 0 || imageOffsetY !== 0)\n  );\n}\n\nexport function drawImageWithLayout(\n  context: IContext2d,\n  data: any,\n  x: number,\n  y: number,\n  width: number,\n  height: number,\n  {\n    repeatX = 'no-repeat',\n    repeatY = 'no-repeat',\n    imageMode,\n    imageScale = 1,\n    imageOffsetX = 0,\n    imageOffsetY = 0,\n    imagePosition = 'top-left'\n  }: IImageLayoutDrawParams\n) {\n  const { repeatMode, sizingMode } = resolveImageMode({\n    repeatX,\n    repeatY,\n    imageMode\n  });\n  const imageBackgroundParams =\n    repeatMode === 'no-repeat'\n      ? resolveBackgroundParamsByImageSizing(sizingMode)\n      : {\n          backgroundMode: repeatMode,\n          backgroundFit: false,\n          backgroundKeepAspectRatio: false\n        };\n\n  drawBackgroundImage(\n    context,\n    data,\n    {\n      x1: x,\n      y1: y,\n      x2: x + width,\n      y2: y + height,\n      width: () => width,\n      height: () => height\n    } as any,\n    {\n      backgroundMode: imageBackgroundParams.backgroundMode,\n      backgroundFit: imageBackgroundParams.backgroundFit,\n      backgroundKeepAspectRatio: imageBackgroundParams.backgroundKeepAspectRatio,\n      backgroundScale: imageScale,\n      backgroundOffsetX: imageOffsetX,\n      backgroundOffsetY: imageOffsetY,\n      backgroundPosition: imagePosition\n    }\n  );\n}\n\nexport class DefaultCanvasImageRender extends BaseRender<IImage> implements IGraphicRender {\n  type: 'image';\n  numberType: number = IMAGE_NUMBER_TYPE;\n\n  constructor(protected readonly graphicRenderContributions: IContributionProvider<IImageRenderContribution>) {\n    super();\n    this.builtinContributions = [defaultImageRenderContribution, defaultImageBackgroundRenderContribution];\n    this.init(graphicRenderContributions);\n  }\n\n  drawShape(\n    image: IImage,\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 imageAttribute = graphicService.themeService.getCurrentTheme().imageAttribute;\n    const imageAttribute = getTheme(image).image;\n    const {\n      repeatX = imageAttribute.repeatX,\n      repeatY = imageAttribute.repeatY,\n      x: originX = imageAttribute.x,\n      y: originY = imageAttribute.y,\n      cornerRadius = imageAttribute.cornerRadius,\n      fillStrokeOrder = imageAttribute.fillStrokeOrder,\n      cornerType = imageAttribute.cornerType,\n      imageMode = imageAttribute.imageMode,\n      imageScale = imageAttribute.imageScale,\n      imageOffsetX = imageAttribute.imageOffsetX,\n      imageOffsetY = imageAttribute.imageOffsetY,\n      imagePosition = imageAttribute.imagePosition,\n      image: url\n    } = image.attribute;\n\n    const data = this.valid(image, imageAttribute, fillCb);\n    if (!data) {\n      return;\n    }\n    const { fVisible, sVisible, doFill, doStroke } = data;\n\n    if (!url || !image.resources) {\n      return;\n    }\n    const res = image.resources.get(url);\n    if (res.state !== 'success') {\n      return;\n    }\n\n    const width = image.width;\n    const height = image.height;\n    context.beginPath();\n\n    // deal with cornerRadius\n    let needCornerClip = false;\n    if (cornerRadius === 0 || (isArray(cornerRadius) && (<number[]>cornerRadius).every(num => num === 0))) {\n      // 不需要处理圆角\n      context.rect(x, y, width, height);\n    } else {\n      // context.beginPath();\n      createRectPath(context, x, y, width, height, cornerRadius, cornerType !== 'bevel');\n      needCornerClip = true;\n    }\n\n    // shadow\n    context.setShadowBlendStyle && context.setShadowBlendStyle(image, image.attribute, imageAttribute);\n    // context.beginPath();\n    // context.image(x, y, width, height);\n\n    const _runFill = () => {\n      if (doFill) {\n        if (fillCb) {\n          fillCb(context, image.attribute, imageAttribute);\n        } else if (fVisible) {\n          context.setCommonStyle(image, image.attribute, x, y, imageAttribute);\n          drawImageWithLayout(context, res.data, x, y, width, height, {\n            repeatX,\n            repeatY,\n            imageMode,\n            imageScale,\n            imageOffsetX,\n            imageOffsetY,\n            imagePosition\n          });\n        }\n      }\n    };\n\n    const _runStroke = () => {\n      if (doStroke) {\n        if (strokeCb) {\n          strokeCb(context, image.attribute, imageAttribute);\n        } else if (sVisible) {\n          context.setStrokeStyle(image, image.attribute, originX - x, originY - y, imageAttribute);\n          context.stroke();\n        }\n      }\n    };\n\n    const needLayoutClip = shouldClipImageByLayout({\n      repeatX,\n      repeatY,\n      imageMode,\n      imageScale,\n      imageOffsetX,\n      imageOffsetY,\n      imagePosition\n    });\n    const needClip = needCornerClip || needLayoutClip;\n\n    if (!fillStrokeOrder) {\n      if (needClip) {\n        context.save();\n        context.clip();\n      }\n      this.beforeRenderStep(image, context, x, y, doFill, false, fVisible, false, imageAttribute, drawContext, fillCb);\n      _runFill();\n      if (needClip) {\n        context.restore();\n      }\n      _runStroke();\n    } else {\n      _runStroke();\n      if (needClip) {\n        context.save();\n        context.clip();\n      }\n      this.beforeRenderStep(image, context, x, y, doFill, false, fVisible, false, imageAttribute, drawContext, fillCb);\n      _runFill();\n      if (needClip) {\n        context.restore();\n      }\n    }\n\n    this.afterRenderStep(image, context, x, y, doFill, false, fVisible, false, imageAttribute, drawContext, fillCb);\n  }\n\n  draw(image: IImage, renderService: IRenderService, drawContext: IDrawContext) {\n    const { image: url } = image.attribute;\n\n    if (!url || !image.resources) {\n      return;\n    }\n    const res = image.resources.get(url);\n    // if (res.state !== 'success') {\n    //   return;\n    // }\n    if (res.state === 'loading' && isString(url)) {\n      ResourceLoader.improveImageLoading(url);\n      return;\n    } else if (res.state !== 'success') {\n      return;\n    }\n\n    const { context } = renderService.drawParams;\n    if (!context) {\n      return;\n    }\n    const imageAttribute = getTheme(image).image;\n    this._draw(image, imageAttribute, false, drawContext);\n  }\n}\n"]}

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

@@ -6,6 +6,10 @@ declare enum STATUS {
     STOP = 1
 }
 export declare class DefaultIncrementalDrawContribution extends DefaultDrawContribution implements IDrawContribution {
+    protected contributions: IGraphicRender[];
+    protected readonly lineRender: IGraphicRender;
+    protected readonly areaRender: IGraphicRender;
+    protected drawItemInterceptorContributions: IContributionProvider<IDrawItemInterceptorContribution>;
     rendering: boolean;
     protected currFrameStartAt: number;
     protected currentIdx: number;
@@ -17,9 +21,7 @@ export declare class DefaultIncrementalDrawContribution extends DefaultDrawContr
     protected lastRenderService: IRenderService;
     protected lastDrawContext: IDrawContext;
     protected count: number;
-    protected readonly lineRender: IGraphicRender;
-    protected readonly areaRender: IGraphicRender;
-    constructor(contributions?: IGraphicRender[], lineRender?: IGraphicRender, areaRender?: IGraphicRender, drawItemInterceptorContributions?: IContributionProvider<IDrawItemInterceptorContribution>);
+    constructor(contributions: IGraphicRender[], lineRender: IGraphicRender, areaRender: IGraphicRender, drawItemInterceptorContributions: IContributionProvider<IDrawItemInterceptorContribution>);
     draw(renderService: IRenderService, drawContext: IDrawContext): Promise<void>;
     protected _increaseRender(group: IGroup, drawContext: IDrawContext): Promise<void>;
     protected _renderIncrementalGroup(group: IGroup, drawContext: IDrawContext): Promise<void>;

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

@@ -30,7 +30,7 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.DefaultIncrementalDrawContribution = void 0;
 
-const config_1 = require("../../../graphic/config"), draw_contribution_1 = require("./draw-contribution"), tapable_1 = require("../../../tapable"), symbol_1 = require("./symbol"), draw_interceptor_1 = require("./draw-interceptor"), sort_1 = require("../../../common/sort"), registry_1 = require("../../../common/registry");
+const config_1 = require("../../../graphic/config"), draw_contribution_1 = require("./draw-contribution"), tapable_1 = require("../../../tapable"), sort_1 = require("../../../common/sort");
 
 var STATUS;
 
@@ -40,14 +40,12 @@ var STATUS;
 
 class DefaultIncrementalDrawContribution extends draw_contribution_1.DefaultDrawContribution {
     constructor(contributions, lineRender, areaRender, drawItemInterceptorContributions) {
-        super(contributions || registry_1.contributionRegistry.get(symbol_1.GraphicRender), drawItemInterceptorContributions || {
-            getContributions: () => registry_1.contributionRegistry.get(draw_interceptor_1.DrawItemInterceptor)
-        }), this.rendering = !1, this.currFrameStartAt = 0, this.currentIdx = 0, this.status = STATUS.NORMAL, 
+        super(contributions, drawItemInterceptorContributions), this.contributions = contributions, 
+        this.lineRender = lineRender, this.areaRender = areaRender, this.drawItemInterceptorContributions = drawItemInterceptorContributions, 
+        this.rendering = !1, this.currFrameStartAt = 0, this.currentIdx = 0, this.status = STATUS.NORMAL, 
         this.checkingForDrawPromise = null, this.hooks = {
             completeDraw: new tapable_1.SyncHook([])
-        }, this.lineRender = lineRender || registry_1.serviceRegistry.get(symbol_1.LineIncrementalDrawContribution), 
-        this.areaRender = areaRender || registry_1.serviceRegistry.get(symbol_1.AreaIncrementalDrawContribution), 
-        this.defaultRenderMap.set(this.lineRender.numberType, this.lineRender), this.defaultRenderMap.set(this.areaRender.numberType, this.areaRender);
+        }, this.defaultRenderMap.set(this.lineRender.numberType, this.lineRender), this.defaultRenderMap.set(this.areaRender.numberType, this.areaRender);
     }
     draw(renderService, drawContext) {
         return __awaiter(this, void 0, void 0, (function*() {

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

@@ -1 +1 @@
-{"version":3,"sources":["../src/render/contributions/render/incremental-draw-contribution.ts"],"names":[],"mappings":"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","file":"incremental-draw-contribution.js","sourcesContent":["import type {\n  IGraphic,\n  IGroup,\n  IRenderService,\n  IDrawContext,\n  IDrawContribution,\n  IGraphicRender,\n  IDrawItemInterceptorContribution,\n  IContributionProvider\n} from '../../../interface';\nimport { DefaultAttribute } from '../../../graphic/config';\nimport { DefaultDrawContribution } from './draw-contribution';\nimport { SyncHook } from '../../../tapable';\nimport { AreaIncrementalDrawContribution, GraphicRender, LineIncrementalDrawContribution } from './symbol';\nimport { DrawItemInterceptor } from './draw-interceptor';\nimport { foreachAsync } from '../../../common/sort';\nimport { contributionRegistry, serviceRegistry } from '../../../common/registry';\n\nenum STATUS {\n  NORMAL = 0,\n  STOP = 1\n}\n\n/**\n * 增量渲染的contribution，基于树状结构针对图元的渲染\n * 不是单例模式\n */\nexport class DefaultIncrementalDrawContribution extends DefaultDrawContribution implements IDrawContribution {\n  rendering: boolean = false;\n  protected currFrameStartAt: number = 0;\n  protected currentIdx: number = 0;\n  protected status: STATUS = STATUS.NORMAL;\n  protected checkingForDrawPromise: Promise<any> | null = null;\n  hooks = {\n    completeDraw: new SyncHook<[]>([])\n  };\n  protected lastRenderService: IRenderService;\n  protected lastDrawContext: IDrawContext;\n  protected count: number;\n\n  protected readonly lineRender: IGraphicRender;\n  protected readonly areaRender: IGraphicRender;\n\n  constructor(\n    contributions?: IGraphicRender[],\n    lineRender?: IGraphicRender,\n    areaRender?: IGraphicRender,\n    drawItemInterceptorContributions?: IContributionProvider<IDrawItemInterceptorContribution>\n  ) {\n    const defaultContributions = contributions || contributionRegistry.get<IGraphicRender>(GraphicRender);\n    const defaultDrawItemInterceptor =\n      drawItemInterceptorContributions ||\n      ({\n        getContributions: () => contributionRegistry.get<IDrawItemInterceptorContribution>(DrawItemInterceptor)\n      } as IContributionProvider<IDrawItemInterceptorContribution>);\n    super(defaultContributions, defaultDrawItemInterceptor);\n    this.lineRender = lineRender || serviceRegistry.get(LineIncrementalDrawContribution);\n    this.areaRender = areaRender || serviceRegistry.get(AreaIncrementalDrawContribution);\n    this.defaultRenderMap.set(this.lineRender.numberType, this.lineRender);\n    this.defaultRenderMap.set(this.areaRender.numberType, this.areaRender);\n  }\n\n  /**\n   *\n   * @param renderService\n   * @param drawContext restartIncremental为true表示重新执行增量渲染，为false表示不执行增量渲染\n   * @returns\n   */\n  async draw(renderService: IRenderService, drawContext: IDrawContext): Promise<void> {\n    // 入口检查是否需要重新绘制\n    if (this.checkingForDrawPromise) {\n      return;\n    }\n    this.lastRenderService = renderService;\n    this.lastDrawContext = drawContext;\n\n    this.checkingForDrawPromise = this.checkForDraw(drawContext);\n    const skipDraw = await this.checkingForDrawPromise;\n    this.checkingForDrawPromise = null;\n    if (skipDraw) {\n      return;\n    }\n\n    this.currentRenderService = renderService;\n    const { context, viewBox } = drawContext;\n\n    if (!context) {\n      return;\n    }\n    // 增量渲染不需要dirtyBounds\n    // const dirtyBounds: IBounds | undefined = this.dirtyBounds.setValue(x, y, x + width, y + height);\n    // if (stage.dirtyBounds) {\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    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    // if (drawInArea) {\n    //   context.beginPath();\n    //   context.rect(dirtyBounds.x1, dirtyBounds.y1, dirtyBounds.width(), dirtyBounds.height());\n    //   context.clip();\n    // }\n\n    // this.clearScreen(renderService, context, drawContext);\n\n    // 绘制之前需要清空画布\n    drawContext.restartIncremental && this.clearScreen(this.currentRenderService, context, drawContext);\n    // 设置translate\n    context.translate(viewBox.x1, viewBox.y1, 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    this.hooks.completeDraw.tap('top-draw', () => {\n      context.restore();\n      context.restore();\n      context.draw();\n      context.inuse = false;\n      this.rendering = false;\n    });\n  }\n\n  protected async _increaseRender(group: IGroup, drawContext: IDrawContext) {\n    this.rendering = true;\n    await this._renderIncrementalGroup(group, drawContext);\n    return;\n  }\n\n  // 默认group后只有一层节点，也就是group是叶子结点的父节点\n  protected async _renderIncrementalGroup(group: IGroup, drawContext: IDrawContext) {\n    this.count = group.count;\n    await new Promise(resolve => {\n      this.renderItem(group, drawContext, {\n        drawingCb: async () => {\n          // 增量图元只支持一个，线段和面积图\n          if (group.count === 2) {\n            const graphic = group.getChildAt(0) as IGraphic;\n            if (graphic.incremental && (graphic.attribute as any).segments) {\n              if (!graphic.incrementalAt) {\n                graphic.incrementalAt = 0;\n              }\n              while (graphic.incrementalAt < (graphic.attribute as any).segments.length) {\n                drawContext.multiGraphicOptions = {\n                  startAtIdx: graphic.incrementalAt,\n                  length: graphic.incremental\n                };\n                this.renderItem(graphic, drawContext);\n                graphic.incrementalAt += graphic.incremental;\n                await this.waitToNextFrame();\n              }\n            } else {\n              this.renderItem(graphic, drawContext);\n            }\n            resolve(false);\n            return;\n          }\n          await foreachAsync(group, DefaultAttribute.zIndex, (item: IGraphic, i: number) => {\n            if (this.status === STATUS.STOP) {\n              return true;\n            }\n            if (item.isContainer) {\n              // 增量渲染group下不应该有其他的group节点\n              return false;\n            }\n            // 如果小于currentIdx，说明还没到当前的位置，那就直接跳过\n            if (i < this.currentIdx) {\n              return false;\n            }\n            const frameTail = this.currFrameStartAt + group.incremental;\n            // 绘制 currentIdx到this.lastFrameIdx + group.incremental的内容\n            if (i < frameTail) {\n              this.currentIdx = i + 1;\n              this.renderItem(item, drawContext);\n            }\n            // 下一帧\n            if (i === frameTail - 1) {\n              this.currFrameStartAt = this.currentIdx;\n              // this.lastFrameIdx = this.currentIdx;\n              return this.waitToNextFrame();\n            }\n\n            return false;\n          });\n          resolve(false);\n        }\n      });\n    });\n    this.hooks.completeDraw.call();\n  }\n\n  protected async waitToNextFrame(): Promise<boolean> {\n    return new Promise(resolve => {\n      this.global.getRequestAnimationFrame()(() => {\n        resolve(false);\n      });\n    });\n  }\n\n  /**\n   * 检查这次绘制是否跳过，以及执行一些准备\n   * 增量渲染有自己的绘制逻辑流程，外部每次触发draw，该图层不一定会执行\n   * @returns 返回true代表跳过绘制，false代表进行绘制\n   */\n  protected async checkForDraw(drawContext: IDrawContext): Promise<boolean> {\n    let skip = this.rendering;\n    if (drawContext.restartIncremental) {\n      skip = false;\n      await this.forceStop();\n      this.resetToInit();\n    }\n    return skip;\n  }\n\n  protected async forceStop() {\n    if (this.rendering) {\n      this.status = STATUS.STOP;\n      await new Promise(resolve => {\n        this.hooks.completeDraw.tap('stopCb', () => {\n          this.status = STATUS.NORMAL;\n          this.hooks.completeDraw.taps = this.hooks.completeDraw.taps.filter(item => {\n            return item.name !== 'stopCb';\n          });\n          resolve(false);\n        });\n      });\n    }\n  }\n\n  protected resetToInit() {\n    this.currFrameStartAt = 0;\n    this.currentIdx = 0;\n  }\n\n  async renderGroup(group: IGroup, drawContext: IDrawContext) {\n    if (drawContext.break || group.attribute.visibleAll === false) {\n      return;\n    }\n    if (group.incremental && drawContext.startAtId === group._uid) {\n      await this._increaseRender(group, drawContext);\n      drawContext.break = true;\n      return;\n    }\n\n    await new Promise(resolve => {\n      this.renderItem(group, drawContext, {\n        drawingCb: async () => {\n          await foreachAsync(group, DefaultAttribute.zIndex, async (item: IGraphic) => {\n            if (drawContext.break) {\n              return;\n            }\n            if (item.isContainer) {\n              await this.renderGroup(item as IGroup, drawContext);\n            } else {\n              // 增量渲染不管非_increaseRender的内容\n              return;\n            }\n          });\n          resolve(false);\n        }\n      });\n    });\n  }\n\n  // /**\n  //  * 一个每一帧都执行的脚本，用于检查和触发执行draw\n  //  */\n  // protected autoRunner() {\n\n  // }\n}\n"]}
+{"version":3,"sources":["../src/render/contributions/render/incremental-draw-contribution.ts"],"names":[],"mappings":"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","file":"incremental-draw-contribution.js","sourcesContent":["import type {\n  IGraphic,\n  IGroup,\n  IRenderService,\n  IDrawContext,\n  IDrawContribution,\n  IGraphicRender,\n  IDrawItemInterceptorContribution,\n  IContributionProvider\n} from '../../../interface';\nimport { DefaultAttribute } from '../../../graphic/config';\nimport { DefaultDrawContribution } from './draw-contribution';\nimport { SyncHook } from '../../../tapable';\n// eslint-disable-next-line @typescript-eslint/consistent-type-imports\nimport { foreachAsync } from '../../../common/sort';\n\nenum STATUS {\n  NORMAL = 0,\n  STOP = 1\n}\n\n/**\n * 增量渲染的contribution，基于树状结构针对图元的渲染\n * 不是单例模式\n */\nexport class DefaultIncrementalDrawContribution extends DefaultDrawContribution implements IDrawContribution {\n  rendering: boolean = false;\n  protected currFrameStartAt: number = 0;\n  protected currentIdx: number = 0;\n  protected status: STATUS = STATUS.NORMAL;\n  protected checkingForDrawPromise: Promise<any> | null = null;\n  hooks = {\n    completeDraw: new SyncHook<[]>([])\n  };\n  protected lastRenderService: IRenderService;\n  protected lastDrawContext: IDrawContext;\n  protected count: number;\n\n  constructor(\n    protected contributions: IGraphicRender[],\n    // protected readonly renderSelector: IRenderSelector, // 根据图元类型选择对应的renderItem进行渲染\n    protected readonly lineRender: IGraphicRender, // 默认的lineRender\n    protected readonly areaRender: IGraphicRender, // 默认的lineRender\n    // 拦截器\n    protected drawItemInterceptorContributions: IContributionProvider<IDrawItemInterceptorContribution>\n  ) {\n    super(contributions, drawItemInterceptorContributions);\n    this.defaultRenderMap.set(this.lineRender.numberType, this.lineRender);\n    this.defaultRenderMap.set(this.areaRender.numberType, this.areaRender);\n  }\n\n  /**\n   *\n   * @param renderService\n   * @param drawContext restartIncremental为true表示重新执行增量渲染，为false表示不执行增量渲染\n   * @returns\n   */\n  async draw(renderService: IRenderService, drawContext: IDrawContext): Promise<void> {\n    // 入口检查是否需要重新绘制\n    if (this.checkingForDrawPromise) {\n      return;\n    }\n    this.lastRenderService = renderService;\n    this.lastDrawContext = drawContext;\n\n    this.checkingForDrawPromise = this.checkForDraw(drawContext);\n    const skipDraw = await this.checkingForDrawPromise;\n    this.checkingForDrawPromise = null;\n    if (skipDraw) {\n      return;\n    }\n\n    this.currentRenderService = renderService;\n    const { context, viewBox } = drawContext;\n\n    if (!context) {\n      return;\n    }\n    // 增量渲染不需要dirtyBounds\n    // const dirtyBounds: IBounds | undefined = this.dirtyBounds.setValue(x, y, x + width, y + height);\n    // if (stage.dirtyBounds) {\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    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    // if (drawInArea) {\n    //   context.beginPath();\n    //   context.rect(dirtyBounds.x1, dirtyBounds.y1, dirtyBounds.width(), dirtyBounds.height());\n    //   context.clip();\n    // }\n\n    // this.clearScreen(renderService, context, drawContext);\n\n    // 绘制之前需要清空画布\n    drawContext.restartIncremental && this.clearScreen(this.currentRenderService, context, drawContext);\n    // 设置translate\n    context.translate(viewBox.x1, viewBox.y1, 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    this.hooks.completeDraw.tap('top-draw', () => {\n      context.restore();\n      context.restore();\n      context.draw();\n      context.inuse = false;\n      this.rendering = false;\n    });\n  }\n\n  protected async _increaseRender(group: IGroup, drawContext: IDrawContext) {\n    this.rendering = true;\n    await this._renderIncrementalGroup(group, drawContext);\n    return;\n  }\n\n  // 默认group后只有一层节点，也就是group是叶子结点的父节点\n  protected async _renderIncrementalGroup(group: IGroup, drawContext: IDrawContext) {\n    this.count = group.count;\n    await new Promise(resolve => {\n      this.renderItem(group, drawContext, {\n        drawingCb: async () => {\n          // 增量图元只支持一个，线段和面积图\n          if (group.count === 2) {\n            const graphic = group.getChildAt(0) as IGraphic;\n            if (graphic.incremental && (graphic.attribute as any).segments) {\n              if (!graphic.incrementalAt) {\n                graphic.incrementalAt = 0;\n              }\n              while (graphic.incrementalAt < (graphic.attribute as any).segments.length) {\n                drawContext.multiGraphicOptions = {\n                  startAtIdx: graphic.incrementalAt,\n                  length: graphic.incremental\n                };\n                this.renderItem(graphic, drawContext);\n                graphic.incrementalAt += graphic.incremental;\n                await this.waitToNextFrame();\n              }\n            } else {\n              this.renderItem(graphic, drawContext);\n            }\n            resolve(false);\n            return;\n          }\n          await foreachAsync(group, DefaultAttribute.zIndex, (item: IGraphic, i: number) => {\n            if (this.status === STATUS.STOP) {\n              return true;\n            }\n            if (item.isContainer) {\n              // 增量渲染group下不应该有其他的group节点\n              return false;\n            }\n            // 如果小于currentIdx，说明还没到当前的位置，那就直接跳过\n            if (i < this.currentIdx) {\n              return false;\n            }\n            const frameTail = this.currFrameStartAt + group.incremental;\n            // 绘制 currentIdx到this.lastFrameIdx + group.incremental的内容\n            if (i < frameTail) {\n              this.currentIdx = i + 1;\n              this.renderItem(item, drawContext);\n            }\n            // 下一帧\n            if (i === frameTail - 1) {\n              this.currFrameStartAt = this.currentIdx;\n              // this.lastFrameIdx = this.currentIdx;\n              return this.waitToNextFrame();\n            }\n\n            return false;\n          });\n          resolve(false);\n        }\n      });\n    });\n    this.hooks.completeDraw.call();\n  }\n\n  protected async waitToNextFrame(): Promise<boolean> {\n    return new Promise(resolve => {\n      this.global.getRequestAnimationFrame()(() => {\n        resolve(false);\n      });\n    });\n  }\n\n  /**\n   * 检查这次绘制是否跳过，以及执行一些准备\n   * 增量渲染有自己的绘制逻辑流程，外部每次触发draw，该图层不一定会执行\n   * @returns 返回true代表跳过绘制，false代表进行绘制\n   */\n  protected async checkForDraw(drawContext: IDrawContext): Promise<boolean> {\n    let skip = this.rendering;\n    if (drawContext.restartIncremental) {\n      skip = false;\n      await this.forceStop();\n      this.resetToInit();\n    }\n    return skip;\n  }\n\n  protected async forceStop() {\n    if (this.rendering) {\n      this.status = STATUS.STOP;\n      await new Promise(resolve => {\n        this.hooks.completeDraw.tap('stopCb', () => {\n          this.status = STATUS.NORMAL;\n          this.hooks.completeDraw.taps = this.hooks.completeDraw.taps.filter(item => {\n            return item.name !== 'stopCb';\n          });\n          resolve(false);\n        });\n      });\n    }\n  }\n\n  protected resetToInit() {\n    this.currFrameStartAt = 0;\n    this.currentIdx = 0;\n  }\n\n  async renderGroup(group: IGroup, drawContext: IDrawContext) {\n    if (drawContext.break || group.attribute.visibleAll === false) {\n      return;\n    }\n    if (group.incremental && drawContext.startAtId === group._uid) {\n      await this._increaseRender(group, drawContext);\n      drawContext.break = true;\n      return;\n    }\n\n    await new Promise(resolve => {\n      this.renderItem(group, drawContext, {\n        drawingCb: async () => {\n          await foreachAsync(group, DefaultAttribute.zIndex, async (item: IGraphic) => {\n            if (drawContext.break) {\n              return;\n            }\n            if (item.isContainer) {\n              await this.renderGroup(item as IGroup, drawContext);\n            } else {\n              // 增量渲染不管非_increaseRender的内容\n              return;\n            }\n          });\n          resolve(false);\n        }\n      });\n    });\n  }\n\n  // /**\n  //  * 一个每一帧都执行的脚本，用于检查和触发执行draw\n  //  */\n  // protected autoRunner() {\n\n  // }\n}\n"]}

package/cjs/render/contributions/render/index.d.ts

@@ -1,24 +1,16 @@
 export * from './arc-render';
-export * from './arc3d-render';
-export * from './area-render';
 export * from './circle-render';
-export * from './group-render';
-export * from './glyph-render';
-export * from './image-render';
 export * from './line-render';
+export * from './area-render';
 export * from './path-render';
-export * from './polygon-render';
-export * from './pyramid3d-render';
 export * from './rect-render';
-export * from './rect3d-render';
-export * from './richtext-render';
-export * from './star-render';
 export * from './symbol-render';
 export * from './text-render';
 export * from './graphic-render';
+export * from './polygon-render';
+export * from './group-render';
+export * from './image-render';
 export * from './symbol';
 export * from './contributions';
 export * from './utils';
 export * from './draw-interceptor';
-export * from './incremental-line-render';
-export * from './incremental-area-render';

package/cjs/render/contributions/render/index.js

@@ -17,16 +17,12 @@ var __createBinding = this && this.__createBinding || (Object.create ? function(
 
 Object.defineProperty(exports, "__esModule", {
     value: !0
-}), __exportStar(require("./arc-render"), exports), __exportStar(require("./arc3d-render"), exports), 
-__exportStar(require("./area-render"), exports), __exportStar(require("./circle-render"), exports), 
-__exportStar(require("./group-render"), exports), __exportStar(require("./glyph-render"), exports), 
-__exportStar(require("./image-render"), exports), __exportStar(require("./line-render"), exports), 
-__exportStar(require("./path-render"), exports), __exportStar(require("./polygon-render"), exports), 
-__exportStar(require("./pyramid3d-render"), exports), __exportStar(require("./rect-render"), exports), 
-__exportStar(require("./rect3d-render"), exports), __exportStar(require("./richtext-render"), exports), 
-__exportStar(require("./star-render"), exports), __exportStar(require("./symbol-render"), exports), 
-__exportStar(require("./text-render"), exports), __exportStar(require("./graphic-render"), exports), 
+}), __exportStar(require("./arc-render"), exports), __exportStar(require("./circle-render"), exports), 
+__exportStar(require("./line-render"), exports), __exportStar(require("./area-render"), exports), 
+__exportStar(require("./path-render"), exports), __exportStar(require("./rect-render"), exports), 
+__exportStar(require("./symbol-render"), exports), __exportStar(require("./text-render"), exports), 
+__exportStar(require("./graphic-render"), exports), __exportStar(require("./polygon-render"), exports), 
+__exportStar(require("./group-render"), exports), __exportStar(require("./image-render"), exports), 
 __exportStar(require("./symbol"), exports), __exportStar(require("./contributions"), exports), 
-__exportStar(require("./utils"), exports), __exportStar(require("./draw-interceptor"), exports), 
-__exportStar(require("./incremental-line-render"), exports), __exportStar(require("./incremental-area-render"), exports);
+__exportStar(require("./utils"), exports), __exportStar(require("./draw-interceptor"), exports);
 //# sourceMappingURL=index.js.map

package/cjs/render/contributions/render/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/render/contributions/render/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,+CAA6B;AAC7B,iDAA+B;AAC/B,gDAA8B;AAC9B,kDAAgC;AAChC,iDAA+B;AAC/B,iDAA+B;AAC/B,iDAA+B;AAC/B,gDAA8B;AAC9B,gDAA8B;AAC9B,mDAAiC;AACjC,qDAAmC;AACnC,gDAA8B;AAC9B,kDAAgC;AAChC,oDAAkC;AAClC,gDAA8B;AAC9B,kDAAgC;AAChC,gDAA8B;AAC9B,mDAAiC;AACjC,2CAAyB;AACzB,kDAAgC;AAChC,0CAAwB;AACxB,qDAAmC;AACnC,4DAA0C;AAC1C,4DAA0C","file":"index.js","sourcesContent":["export * from './arc-render';\nexport * from './arc3d-render';\nexport * from './area-render';\nexport * from './circle-render';\nexport * from './group-render';\nexport * from './glyph-render';\nexport * from './image-render';\nexport * from './line-render';\nexport * from './path-render';\nexport * from './polygon-render';\nexport * from './pyramid3d-render';\nexport * from './rect-render';\nexport * from './rect3d-render';\nexport * from './richtext-render';\nexport * from './star-render';\nexport * from './symbol-render';\nexport * from './text-render';\nexport * from './graphic-render';\nexport * from './symbol';\nexport * from './contributions';\nexport * from './utils';\nexport * from './draw-interceptor';\nexport * from './incremental-line-render';\nexport * from './incremental-area-render';\n"]}
+{"version":3,"sources":["../src/render/contributions/render/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,+CAA6B;AAC7B,kDAAgC;AAChC,gDAA8B;AAC9B,gDAA8B;AAC9B,gDAA8B;AAC9B,gDAA8B;AAC9B,kDAAgC;AAChC,gDAA8B;AAC9B,mDAAiC;AACjC,mDAAiC;AACjC,iDAA+B;AAC/B,iDAA+B;AAC/B,2CAAyB;AACzB,kDAAgC;AAChC,0CAAwB;AACxB,qDAAmC","file":"index.js","sourcesContent":["export * from './arc-render';\nexport * from './circle-render';\nexport * from './line-render';\nexport * from './area-render';\nexport * from './path-render';\nexport * from './rect-render';\nexport * from './symbol-render';\nexport * from './text-render';\nexport * from './graphic-render';\nexport * from './polygon-render';\nexport * from './group-render';\nexport * from './image-render';\nexport * from './symbol';\nexport * from './contributions';\nexport * from './utils';\nexport * from './draw-interceptor';\n"]}

package/cjs/render/contributions/render/line-module.d.ts

@@ -0,0 +1,4 @@
+export declare function bindLineRenderModule({ bind }: {
+    bind: any;
+}): void;
+export declare const lineModule: typeof bindLineRenderModule;

package/cjs/render/contributions/render/line-module.js

@@ -0,0 +1,19 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+    value: !0
+}), exports.lineModule = exports.bindLineRenderModule = void 0;
+
+const incremental_line_render_1 = require("./incremental-line-render"), line_render_1 = require("./line-render"), symbol_1 = require("./symbol");
+
+let loadLineModule = !1;
+
+function bindLineRenderModule({bind: bind}) {
+    loadLineModule || (loadLineModule = !0, bind(line_render_1.DefaultCanvasLineRender).toSelf().inSingletonScope(), 
+    bind(incremental_line_render_1.DefaultIncrementalCanvasLineRender).toSelf().inSingletonScope(), 
+    bind(symbol_1.LineRender).to(line_render_1.DefaultCanvasLineRender).inSingletonScope(), 
+    bind(symbol_1.GraphicRender).toService(symbol_1.LineRender));
+}
+
+exports.bindLineRenderModule = bindLineRenderModule, exports.lineModule = bindLineRenderModule;
+//# sourceMappingURL=line-module.js.map

package/cjs/render/contributions/render/line-module.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/render/contributions/render/line-module.ts"],"names":[],"mappings":";;;AAAA,uEAA+E;AAC/E,+CAAwD;AACxD,qCAAqD;AAErD,IAAI,cAAc,GAAG,KAAK,CAAC;AAC3B,SAAgB,oBAAoB,CAAC,EAAE,IAAI,EAAiB;IAC1D,IAAI,cAAc,EAAE;QAClB,OAAO;KACR;IACD,cAAc,GAAG,IAAI,CAAC;IAEtB,IAAI,CAAC,qCAAuB,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IAC1D,IAAI,CAAC,4DAAkC,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IACrE,IAAI,CAAC,mBAAU,CAAC,CAAC,EAAE,CAAC,qCAAuB,CAAC,CAAC,gBAAgB,EAAE,CAAC;IAChE,IAAI,CAAC,sBAAa,CAAC,CAAC,SAAS,CAAC,mBAAU,CAAC,CAAC;AAC5C,CAAC;AAVD,oDAUC;AAEY,QAAA,UAAU,GAAG,oBAAoB,CAAC","file":"line-module.js","sourcesContent":["import { DefaultIncrementalCanvasLineRender } from './incremental-line-render';\nimport { DefaultCanvasLineRender } from './line-render';\nimport { GraphicRender, LineRender } from './symbol';\n\nlet loadLineModule = false;\nexport function bindLineRenderModule({ bind }: { bind: any }) {\n  if (loadLineModule) {\n    return;\n  }\n  loadLineModule = true;\n  // line渲染器\n  bind(DefaultCanvasLineRender).toSelf().inSingletonScope();\n  bind(DefaultIncrementalCanvasLineRender).toSelf().inSingletonScope();\n  bind(LineRender).to(DefaultCanvasLineRender).inSingletonScope();\n  bind(GraphicRender).toService(LineRender);\n}\n\nexport const lineModule = bindLineRenderModule;\n"]}

package/cjs/render/contributions/render/module.d.ts

@@ -0,0 +1,4 @@
+export declare function bindRenderModules({ bind }: {
+    bind: any;
+}): void;
+export default bindRenderModules;

package/cjs/render/contributions/render/module.js

@@ -0,0 +1,27 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+    value: !0
+}), exports.bindRenderModules = void 0;
+
+const contribution_provider_1 = require("../../../common/contribution-provider"), draw_contribution_1 = require("./draw-contribution"), group_render_1 = require("./group-render"), incremental_draw_contribution_1 = require("./incremental-draw-contribution"), symbol_1 = require("./symbol"), draw_interceptor_1 = require("./draw-interceptor"), constants_1 = require("./contributions/constants"), contributions_1 = require("./contributions");
+
+function bindRenderModules({bind: bind}) {
+    bind(contributions_1.DefaultBaseBackgroundRenderContribution).toSelf().inSingletonScope(), 
+    bind(contributions_1.DefaultBaseTextureRenderContribution).toSelf().inSingletonScope(), 
+    bind(symbol_1.DrawContribution).to(draw_contribution_1.DefaultDrawContribution), 
+    bind(symbol_1.IncrementalDrawContribution).to(incremental_draw_contribution_1.DefaultIncrementalDrawContribution), 
+    bind(symbol_1.GroupRender).toDynamicValue((({container: container}) => new group_render_1.DefaultCanvasGroupRender((0, 
+    contribution_provider_1.createContributionProvider)(constants_1.GroupRenderContribution, container)))).inSingletonScope(), 
+    bind(symbol_1.GraphicRender).toService(symbol_1.GroupRender), (0, contribution_provider_1.bindContributionProvider)(bind, constants_1.GroupRenderContribution), 
+    (0, contribution_provider_1.bindContributionProvider)(bind, constants_1.InteractiveSubRenderContribution), 
+    bind(contributions_1.DefaultBaseInteractiveRenderContribution).toDynamicValue((({container: container}) => new contributions_1.DefaultBaseInteractiveRenderContribution((0, 
+    contribution_provider_1.createContributionProvider)(constants_1.InteractiveSubRenderContribution, container)))).inSingletonScope(), 
+    (0, contribution_provider_1.bindContributionProvider)(bind, symbol_1.GraphicRender), 
+    bind(draw_interceptor_1.CommonDrawItemInterceptorContribution).toSelf().inSingletonScope(), 
+    bind(draw_interceptor_1.DrawItemInterceptor).toService(draw_interceptor_1.CommonDrawItemInterceptorContribution), 
+    (0, contribution_provider_1.bindContributionProvider)(bind, draw_interceptor_1.DrawItemInterceptor);
+}
+
+exports.bindRenderModules = bindRenderModules, exports.default = bindRenderModules;
+//# sourceMappingURL=module.js.map

package/cjs/render/contributions/render/module.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/render/contributions/render/module.ts"],"names":[],"mappings":";;;AAAA,iFAA6G;AAC7G,2DAA8D;AAC9D,iDAA0D;AAC1D,mFAAqF;AACrF,qCAAqG;AACrG,yDAAgG;AAChG,yDAAsG;AACtG,mDAIyB;AAEzB,SAAgB,iBAAiB,CAAC,EAAE,IAAI,EAAiB;IACvD,IAAI,CAAC,uDAAuC,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IAC1E,IAAI,CAAC,oDAAoC,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IAEvE,IAAI,CAAC,yBAAgB,CAAC,CAAC,EAAE,CAAC,2CAAuB,CAAC,CAAC;IACnD,IAAI,CAAC,oCAA2B,CAAC,CAAC,EAAE,CAAC,kEAAkC,CAAC,CAAC;IAKzE,IAAI,CAAC,oBAAW,CAAC;SACd,cAAc,CACb,CAAC,EAAE,SAAS,EAAsB,EAAE,EAAE,CACpC,IAAI,uCAAwB,CAAC,IAAA,kDAA0B,EAAC,mCAAuB,EAAE,SAAS,CAAC,CAAC,CAC/F;SACA,gBAAgB,EAAE,CAAC;IACtB,IAAI,CAAC,sBAAa,CAAC,CAAC,SAAS,CAAC,oBAAW,CAAC,CAAC;IAG3C,IAAA,gDAAwB,EAAC,IAAI,EAAE,mCAAuB,CAAC,CAAC;IAGxD,IAAA,gDAAwB,EAAC,IAAI,EAAE,4CAAgC,CAAC,CAAC;IACjE,IAAI,CAAC,wDAAwC,CAAC;SAC3C,cAAc,CACb,CAAC,EAAE,SAAS,EAAsB,EAAE,EAAE,CACpC,IAAI,wDAAwC,CAC1C,IAAA,kDAA0B,EAAC,4CAAgC,EAAE,SAAS,CAAC,CACxE,CACJ;SACA,gBAAgB,EAAE,CAAC;IACtB,IAAA,gDAAwB,EAAC,IAAI,EAAE,sBAAa,CAAC,CAAC;IAK9C,IAAI,CAAC,wDAAqC,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IACxE,IAAI,CAAC,sCAAmB,CAAC,CAAC,SAAS,CAAC,wDAAqC,CAAC,CAAC;IAM3E,IAAA,gDAAwB,EAAC,IAAI,EAAE,sCAAmB,CAAC,CAAC;AACtD,CAAC;AA5CD,8CA4CC;AAED,kBAAe,iBAAiB,CAAC","file":"module.js","sourcesContent":["import { bindContributionProvider, createContributionProvider } from '../../../common/contribution-provider';\nimport { DefaultDrawContribution } from './draw-contribution';\nimport { DefaultCanvasGroupRender } from './group-render';\nimport { DefaultIncrementalDrawContribution } from './incremental-draw-contribution';\nimport { DrawContribution, GraphicRender, GroupRender, IncrementalDrawContribution } from './symbol';\nimport { CommonDrawItemInterceptorContribution, DrawItemInterceptor } from './draw-interceptor';\nimport { GroupRenderContribution, InteractiveSubRenderContribution } from './contributions/constants';\nimport {\n  DefaultBaseBackgroundRenderContribution,\n  DefaultBaseInteractiveRenderContribution,\n  DefaultBaseTextureRenderContribution\n} from './contributions';\n\nexport function bindRenderModules({ bind }: { bind: any }) {\n  bind(DefaultBaseBackgroundRenderContribution).toSelf().inSingletonScope();\n  bind(DefaultBaseTextureRenderContribution).toSelf().inSingletonScope();\n\n  bind(DrawContribution).to(DefaultDrawContribution);\n  bind(IncrementalDrawContribution).to(DefaultIncrementalDrawContribution);\n\n  // bind(RenderSelector).to(DefaultRenderSelector).inSingletonScope();\n\n  // group渲染器\n  bind(GroupRender)\n    .toDynamicValue(\n      ({ container }: { container: any }) =>\n        new DefaultCanvasGroupRender(createContributionProvider(GroupRenderContribution, container))\n    )\n    .inSingletonScope();\n  bind(GraphicRender).toService(GroupRender);\n\n  // group 渲染器注入contributions\n  bindContributionProvider(bind, GroupRenderContribution);\n\n  // 绑定通用interactive contribution\n  bindContributionProvider(bind, InteractiveSubRenderContribution);\n  bind(DefaultBaseInteractiveRenderContribution)\n    .toDynamicValue(\n      ({ container }: { container: any }) =>\n        new DefaultBaseInteractiveRenderContribution(\n          createContributionProvider(InteractiveSubRenderContribution, container)\n        )\n    )\n    .inSingletonScope();\n  bindContributionProvider(bind, GraphicRender);\n\n  // interceptor\n  // bind(ShadowRootDrawItemInterceptorContribution).toSelf().inSingletonScope();\n  // bind(DrawItemInterceptor).toService(ShadowRootDrawItemInterceptorContribution);\n  bind(CommonDrawItemInterceptorContribution).toSelf().inSingletonScope();\n  bind(DrawItemInterceptor).toService(CommonDrawItemInterceptorContribution);\n  // bind(RenderSelector).toService()\n  // bind(Canvas3DDrawItemInterceptor).toSelf().inSingletonScope();\n  // bind(DrawItemInterceptor).toService(Canvas3DDrawItemInterceptor);\n  // bind(InteractiveDrawItemInterceptorContribution).toSelf().inSingletonScope();\n  // bind(DrawItemInterceptor).toService(InteractiveDrawItemInterceptorContribution);\n  bindContributionProvider(bind, DrawItemInterceptor);\n}\n\nexport default bindRenderModules;\n"]}

package/cjs/render/contributions/render/path-module.d.ts

@@ -0,0 +1,4 @@
+export declare function bindPathRenderModule({ bind }: {
+    bind: any;
+}): void;
+export declare const pathModule: typeof bindPathRenderModule;

package/cjs/render/contributions/render/path-module.js

@@ -0,0 +1,19 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+    value: !0
+}), exports.pathModule = exports.bindPathRenderModule = void 0;
+
+const contribution_provider_1 = require("../../../common/contribution-provider"), contributions_1 = require("./contributions"), constants_1 = require("./contributions/constants"), path_render_1 = require("./path-render"), symbol_1 = require("./symbol");
+
+let loadPathModule = !1;
+
+function bindPathRenderModule({bind: bind}) {
+    loadPathModule || (loadPathModule = !0, bind(path_render_1.DefaultCanvasPathRender).toSelf().inSingletonScope(), 
+    bind(symbol_1.PathRender).to(path_render_1.DefaultCanvasPathRender).inSingletonScope(), 
+    bind(symbol_1.GraphicRender).toService(symbol_1.PathRender), bind(constants_1.PathRenderContribution).toService(contributions_1.DefaultBaseInteractiveRenderContribution), 
+    (0, contribution_provider_1.bindContributionProvider)(bind, constants_1.PathRenderContribution));
+}
+
+exports.bindPathRenderModule = bindPathRenderModule, exports.pathModule = bindPathRenderModule;
+//# sourceMappingURL=path-module.js.map

package/cjs/render/contributions/render/path-module.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/render/contributions/render/path-module.ts"],"names":[],"mappings":";;;AAAA,iFAAiF;AACjF,mDAA2E;AAC3E,yDAAmE;AACnE,+CAAwD;AACxD,qCAAqD;AAErD,IAAI,cAAc,GAAG,KAAK,CAAC;AAC3B,SAAgB,oBAAoB,CAAC,EAAE,IAAI,EAAiB;IAC1D,IAAI,cAAc,EAAE;QAClB,OAAO;KACR;IACD,cAAc,GAAG,IAAI,CAAC;IAEtB,IAAI,CAAC,qCAAuB,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IAC1D,IAAI,CAAC,mBAAU,CAAC,CAAC,EAAE,CAAC,qCAAuB,CAAC,CAAC,gBAAgB,EAAE,CAAC;IAChE,IAAI,CAAC,sBAAa,CAAC,CAAC,SAAS,CAAC,mBAAU,CAAC,CAAC;IAC1C,IAAI,CAAC,kCAAsB,CAAC,CAAC,SAAS,CAAC,wDAAwC,CAAC,CAAC;IAGjF,IAAA,gDAAwB,EAAC,IAAI,EAAE,kCAAsB,CAAC,CAAC;AACzD,CAAC;AAbD,oDAaC;AAEY,QAAA,UAAU,GAAG,oBAAoB,CAAC","file":"path-module.js","sourcesContent":["import { bindContributionProvider } from '../../../common/contribution-provider';\nimport { DefaultBaseInteractiveRenderContribution } from './contributions';\nimport { PathRenderContribution } from './contributions/constants';\nimport { DefaultCanvasPathRender } from './path-render';\nimport { GraphicRender, PathRender } from './symbol';\n\nlet loadPathModule = false;\nexport function bindPathRenderModule({ bind }: { bind: any }) {\n  if (loadPathModule) {\n    return;\n  }\n  loadPathModule = true;\n  // path 渲染器\n  bind(DefaultCanvasPathRender).toSelf().inSingletonScope();\n  bind(PathRender).to(DefaultCanvasPathRender).inSingletonScope();\n  bind(GraphicRender).toService(PathRender);\n  bind(PathRenderContribution).toService(DefaultBaseInteractiveRenderContribution);\n\n  // path 渲染器注入contributions\n  bindContributionProvider(bind, PathRenderContribution);\n}\n\nexport const pathModule = bindPathRenderModule;\n"]}

package/cjs/render/contributions/render/path-render.d.ts

@@ -1,11 +1,11 @@
 import type { IPath, IContext2d, IThemeAttribute, IGraphicAttribute, IMarkAttribute, IPathRenderContribution, IGraphicRender, IContributionProvider, IDrawContext, IGraphicRenderDrawParams, IRenderService, IPathGraphicAttribute } from '../../../interface';
 import { BaseRender } from './base-render';
 export declare class DefaultCanvasPathRender extends BaseRender<IPath> implements IGraphicRender {
+    protected readonly graphicRenderContributions: IContributionProvider<IPathRenderContribution>;
     type: 'path';
     numberType: number;
     tempTheme: Required<IPathGraphicAttribute>;
-    protected readonly graphicRenderContributions: IContributionProvider<IPathRenderContribution>;
-    constructor(graphicRenderContributions?: IContributionProvider<IPathRenderContribution>);
+    constructor(graphicRenderContributions: IContributionProvider<IPathRenderContribution>);
     drawShape(path: IPath, context: IContext2d, x: number, y: number, drawContext: IDrawContext, params?: IGraphicRenderDrawParams, fillCb?: (ctx: IContext2d, markAttribute: Partial<IMarkAttribute & IGraphicAttribute>, themeAttribute: IThemeAttribute) => boolean, strokeCb?: (ctx: IContext2d, markAttribute: Partial<IMarkAttribute & IGraphicAttribute>, themeAttribute: IThemeAttribute) => boolean): void;
     draw(path: IPath, renderService: IRenderService, drawContext: IDrawContext, params?: IGraphicRenderDrawParams): void;
 }

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

@@ -4,14 +4,13 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.DefaultCanvasPathRender = void 0;
 
-const render_command_list_1 = require("../../../common/render-command-list"), theme_1 = require("../../../graphic/theme"), constants_1 = require("../../../graphic/constants"), constants_2 = require("./contributions/constants"), base_render_1 = require("./base-render"), path_contribution_render_1 = require("./contributions/path-contribution-render"), registry_1 = require("../../../common/registry");
+const render_command_list_1 = require("../../../common/render-command-list"), theme_1 = require("../../../graphic/theme"), constants_1 = require("../../../graphic/constants"), base_render_1 = require("./base-render"), path_contribution_render_1 = require("./contributions/path-contribution-render");
 
 class DefaultCanvasPathRender extends base_render_1.BaseRender {
     constructor(graphicRenderContributions) {
-        super(), this.numberType = constants_1.PATH_NUMBER_TYPE, this.graphicRenderContributions = graphicRenderContributions || {
-            getContributions: () => registry_1.contributionRegistry.get(constants_2.PathRenderContribution)
-        }, this.builtinContributions = [ path_contribution_render_1.defaultPathBackgroundRenderContribution, path_contribution_render_1.defaultPathTextureRenderContribution ], 
-        this.init(this.graphicRenderContributions);
+        super(), this.graphicRenderContributions = graphicRenderContributions, this.numberType = constants_1.PATH_NUMBER_TYPE, 
+        this.builtinContributions = [ path_contribution_render_1.defaultPathBackgroundRenderContribution, path_contribution_render_1.defaultPathTextureRenderContribution ], 
+        this.init(graphicRenderContributions);
     }
     drawShape(path, context, x, y, drawContext, params, fillCb, strokeCb) {
         var _a, _b, _c;