@visactor/vrender-core 1.0.47-alpha.0 → 1.1.0-alpha.1

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

@@ -1 +1 @@
-{"version":3,"sources":["../src/render/contributions/render/module.ts"],"names":[],"mappings":";;AAAA,mEAAiE;AACjE,iFAAiF;AACjF,2DAA8D;AAC9D,iDAA0D;AAC1D,mFAAqF;AACrF,qCAAqH;AACrH,yDAAgG;AAChG,yDAAsG;AACtG,mDAIyB;AAEzB,kBAAe,IAAI,gCAAe,CAAC,IAAI,CAAC,EAAE;IACxC,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,CAAC,EAAE,CAAC,uCAAwB,CAAC,CAAC,gBAAgB,EAAE,CAAC;IAClE,IAAI,CAAC,sBAAa,CAAC,CAAC,SAAS,CAAC,oBAAW,CAAC,CAAC;IAG3C,IAAA,gDAAwB,EAAC,IAAI,EAAE,mCAAuB,CAAC,CAAC;IAGxD,IAAI,CAAC,wDAAwC,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IAC3E,IAAA,gDAAwB,EAAC,IAAI,EAAE,4CAAgC,CAAC,CAAC;IACjE,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,CAAC,CAAC","file":"module.js","sourcesContent":["import { ContainerModule } from '../../../common/inversify-lite';\nimport { bindContributionProvider } 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, RenderSelector } 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 default new ContainerModule(bind => {\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).to(DefaultCanvasGroupRender).inSingletonScope();\n  bind(GraphicRender).toService(GroupRender);\n\n  // group 渲染器注入contributions\n  bindContributionProvider(bind, GroupRenderContribution);\n\n  // 绑定通用interactive contribution\n  bind(DefaultBaseInteractiveRenderContribution).toSelf().inSingletonScope();\n  bindContributionProvider(bind, InteractiveSubRenderContribution);\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"]}
+{"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

@@ -1,2 +1,4 @@
-import { ContainerModule } from '../../../common/inversify';
-export declare const pathModule: ContainerModule;
+export declare function bindPathRenderModule({ bind }: {
+    bind: any;
+}): void;
+export declare const pathModule: typeof bindPathRenderModule;

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

@@ -2,16 +2,18 @@
 
 Object.defineProperty(exports, "__esModule", {
     value: !0
-}), exports.pathModule = void 0;
+}), exports.pathModule = exports.bindPathRenderModule = void 0;
 
-const contribution_provider_1 = require("../../../common/contribution-provider"), inversify_1 = require("../../../common/inversify"), contributions_1 = require("./contributions"), constants_1 = require("./contributions/constants"), path_render_1 = require("./path-render"), symbol_1 = require("./symbol");
+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;
 
-exports.pathModule = new inversify_1.ContainerModule((bind => {
+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

@@ -1 +1 @@
-{"version":3,"sources":["../src/render/contributions/render/path-module.ts"],"names":[],"mappings":";;;AAAA,iFAAiF;AACjF,yDAA4D;AAC5D,mDAA2E;AAC3E,yDAAmE;AACnE,+CAAwD;AACxD,qCAAqD;AAErD,IAAI,cAAc,GAAG,KAAK,CAAC;AACd,QAAA,UAAU,GAAG,IAAI,2BAAe,CAAC,IAAI,CAAC,EAAE;IACnD,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,CAAC,CAAC","file":"path-module.js","sourcesContent":["import { bindContributionProvider } from '../../../common/contribution-provider';\nimport { ContainerModule } from '../../../common/inversify';\nimport { DefaultBaseInteractiveRenderContribution } from './contributions';\nimport { PathRenderContribution } from './contributions/constants';\nimport { DefaultCanvasPathRender } from './path-render';\nimport { GraphicRender, PathRender } from './symbol';\n\nlet loadPathModule = false;\nexport const pathModule = new ContainerModule(bind => {\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"]}
+{"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.js

@@ -1,24 +1,12 @@
 "use strict";
 
-var __decorate = this && this.__decorate || function(decorators, target, key, desc) {
-    var d, c = arguments.length, r = c < 3 ? target : null === desc ? desc = Object.getOwnPropertyDescriptor(target, key) : desc;
-    if ("object" == typeof Reflect && "function" == typeof Reflect.decorate) r = Reflect.decorate(decorators, target, key, desc); else for (var i = decorators.length - 1; i >= 0; i--) (d = decorators[i]) && (r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r);
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
-}, __metadata = this && this.__metadata || function(k, v) {
-    if ("object" == typeof Reflect && "function" == typeof Reflect.metadata) return Reflect.metadata(k, v);
-}, __param = this && this.__param || function(paramIndex, decorator) {
-    return function(target, key) {
-        decorator(target, key, paramIndex);
-    };
-};
-
 Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.DefaultCanvasPathRender = void 0;
 
-const inversify_lite_1 = require("../../../common/inversify-lite"), contribution_provider_1 = require("../../../common/contribution-provider"), 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");
+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");
 
-let DefaultCanvasPathRender = class extends base_render_1.BaseRender {
+class DefaultCanvasPathRender extends base_render_1.BaseRender {
     constructor(graphicRenderContributions) {
         super(), this.graphicRenderContributions = graphicRenderContributions, this.numberType = constants_1.PATH_NUMBER_TYPE, 
         this.builtinContributions = [ path_contribution_render_1.defaultPathBackgroundRenderContribution, path_contribution_render_1.defaultPathTextureRenderContribution ], 
@@ -50,10 +38,7 @@ let DefaultCanvasPathRender = class extends base_render_1.BaseRender {
         this.tempTheme = pathAttribute, this._draw(path, pathAttribute, !1, drawContext, params), 
         this.tempTheme = null;
     }
-};
+}
 
-DefaultCanvasPathRender = __decorate([ (0, inversify_lite_1.injectable)(), __param(0, (0, 
-inversify_lite_1.inject)(contribution_provider_1.ContributionProvider)), __param(0, (0, 
-inversify_lite_1.named)(constants_2.PathRenderContribution)), __metadata("design:paramtypes", [ Object ]) ], DefaultCanvasPathRender), 
 exports.DefaultCanvasPathRender = DefaultCanvasPathRender;
 //# sourceMappingURL=path-render.js.map

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

@@ -1 +1 @@
-{"version":3,"sources":["../src/render/contributions/render/path-render.ts"],"names":[],"mappings":"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","file":"path-render.js","sourcesContent":["import { inject, injectable, named } from '../../../common/inversify-lite';\n// eslint-disable-next-line @typescript-eslint/consistent-type-imports\nimport { ContributionProvider } from '../../../common/contribution-provider';\nimport { renderCommandList } from '../../../common/render-command-list';\nimport type {\n  IPath,\n  ICustomPath2D,\n  IContext2d,\n  IThemeAttribute,\n  IGraphicAttribute,\n  IMarkAttribute,\n  IPathRenderContribution,\n  IGraphicRender,\n  IContributionProvider,\n  IDrawContext,\n  IGraphicRenderDrawParams,\n  IRenderService,\n  IPathGraphicAttribute\n} from '../../../interface';\nimport { getTheme } from '../../../graphic/theme';\nimport { PATH_NUMBER_TYPE } from '../../../graphic/constants';\nimport { PathRenderContribution } from './contributions/constants';\nimport { BaseRender } from './base-render';\nimport {\n  defaultPathBackgroundRenderContribution,\n  defaultPathTextureRenderContribution\n} from './contributions/path-contribution-render';\n\n@injectable()\nexport class DefaultCanvasPathRender extends BaseRender<IPath> implements IGraphicRender {\n  type: 'path';\n  numberType: number = PATH_NUMBER_TYPE;\n  tempTheme: Required<IPathGraphicAttribute>;\n\n  constructor(\n    @inject(ContributionProvider)\n    @named(PathRenderContribution)\n    protected readonly graphicRenderContributions: IContributionProvider<IPathRenderContribution>\n  ) {\n    super();\n    this.builtinContributions = [defaultPathBackgroundRenderContribution, defaultPathTextureRenderContribution];\n    this.init(graphicRenderContributions);\n  }\n\n  drawShape(\n    path: IPath,\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 pathAttribute = graphicService.themeService.getCurrentTheme().pathAttribute;\n    const pathAttribute = this.tempTheme ?? getTheme(path, params?.theme).path;\n    const {\n      x: originX = pathAttribute.x,\n      y: originY = pathAttribute.y,\n      fillStrokeOrder = pathAttribute.fillStrokeOrder\n    } = path.attribute;\n\n    const z = this.z ?? 0;\n\n    const data = this.valid(path, pathAttribute, fillCb, strokeCb);\n    if (!data) {\n      return;\n    }\n    const { fVisible, sVisible, doFill, doStroke } = data;\n\n    context.beginPath();\n    if (path.pathShape) {\n      renderCommandList((path.pathShape as ICustomPath2D).commandList, context, x, y, 1, 1, z);\n    } else {\n      const path2D = path.attribute.path ?? pathAttribute.path;\n      renderCommandList((path2D as ICustomPath2D).commandList, context, x, y, 1, 1, z);\n    }\n\n    // shadow\n    context.setShadowBlendStyle && context.setShadowBlendStyle(path, path.attribute, pathAttribute);\n\n    this.beforeRenderStep(\n      path,\n      context,\n      x,\n      y,\n      doFill,\n      doStroke,\n      fVisible,\n      sVisible,\n      pathAttribute,\n      drawContext,\n      fillCb,\n      strokeCb\n    );\n\n    const _runStroke = () => {\n      if (doStroke) {\n        if (strokeCb) {\n          strokeCb(context, path.attribute, pathAttribute);\n        } else if (sVisible) {\n          context.setStrokeStyle(path, path.attribute, originX - x, originY - y, pathAttribute);\n          context.stroke();\n        }\n      }\n    };\n    const _runFill = () => {\n      if (doFill) {\n        if (fillCb) {\n          fillCb(context, path.attribute, pathAttribute);\n        } else if (fVisible) {\n          context.setCommonStyle(path, path.attribute, originX - x, originY - y, pathAttribute);\n          context.fill();\n        }\n      }\n    };\n\n    if (!fillStrokeOrder) {\n      _runFill();\n      _runStroke();\n    } else {\n      _runStroke();\n      _runFill();\n    }\n\n    this.afterRenderStep(\n      path,\n      context,\n      x,\n      y,\n      doFill,\n      doStroke,\n      fVisible,\n      sVisible,\n      pathAttribute,\n      drawContext,\n      fillCb,\n      strokeCb\n    );\n  }\n\n  draw(path: IPath, renderService: IRenderService, drawContext: IDrawContext, params?: IGraphicRenderDrawParams) {\n    const pathAttribute = getTheme(path, params?.theme).path;\n    this.tempTheme = pathAttribute;\n    this._draw(path, pathAttribute, false, drawContext, params);\n    this.tempTheme = null;\n  }\n}\n"]}
+{"version":3,"sources":["../src/render/contributions/render/path-render.ts"],"names":[],"mappings":"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","file":"path-render.js","sourcesContent":["import { renderCommandList } from '../../../common/render-command-list';\nimport type {\n  IPath,\n  ICustomPath2D,\n  IContext2d,\n  IThemeAttribute,\n  IGraphicAttribute,\n  IMarkAttribute,\n  IPathRenderContribution,\n  IGraphicRender,\n  IContributionProvider,\n  IDrawContext,\n  IGraphicRenderDrawParams,\n  IRenderService,\n  IPathGraphicAttribute\n} from '../../../interface';\nimport { getTheme } from '../../../graphic/theme';\nimport { PATH_NUMBER_TYPE } from '../../../graphic/constants';\nimport { PathRenderContribution } from './contributions/constants';\nimport { BaseRender } from './base-render';\nimport {\n  defaultPathBackgroundRenderContribution,\n  defaultPathTextureRenderContribution\n} from './contributions/path-contribution-render';\n\nexport class DefaultCanvasPathRender extends BaseRender<IPath> implements IGraphicRender {\n  type: 'path';\n  numberType: number = PATH_NUMBER_TYPE;\n  tempTheme: Required<IPathGraphicAttribute>;\n\n  constructor(protected readonly graphicRenderContributions: IContributionProvider<IPathRenderContribution>) {\n    super();\n    this.builtinContributions = [defaultPathBackgroundRenderContribution, defaultPathTextureRenderContribution];\n    this.init(graphicRenderContributions);\n  }\n\n  drawShape(\n    path: IPath,\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 pathAttribute = graphicService.themeService.getCurrentTheme().pathAttribute;\n    const pathAttribute = this.tempTheme ?? getTheme(path, params?.theme).path;\n    const {\n      x: originX = pathAttribute.x,\n      y: originY = pathAttribute.y,\n      fillStrokeOrder = pathAttribute.fillStrokeOrder\n    } = path.attribute;\n\n    const z = this.z ?? 0;\n\n    const data = this.valid(path, pathAttribute, fillCb, strokeCb);\n    if (!data) {\n      return;\n    }\n    const { fVisible, sVisible, doFill, doStroke } = data;\n\n    context.beginPath();\n    if (path.pathShape) {\n      renderCommandList((path.pathShape as ICustomPath2D).commandList, context, x, y, 1, 1, z);\n    } else {\n      const path2D = path.attribute.path ?? pathAttribute.path;\n      renderCommandList((path2D as ICustomPath2D).commandList, context, x, y, 1, 1, z);\n    }\n\n    // shadow\n    context.setShadowBlendStyle && context.setShadowBlendStyle(path, path.attribute, pathAttribute);\n\n    this.beforeRenderStep(\n      path,\n      context,\n      x,\n      y,\n      doFill,\n      doStroke,\n      fVisible,\n      sVisible,\n      pathAttribute,\n      drawContext,\n      fillCb,\n      strokeCb\n    );\n\n    const _runStroke = () => {\n      if (doStroke) {\n        if (strokeCb) {\n          strokeCb(context, path.attribute, pathAttribute);\n        } else if (sVisible) {\n          context.setStrokeStyle(path, path.attribute, originX - x, originY - y, pathAttribute);\n          context.stroke();\n        }\n      }\n    };\n    const _runFill = () => {\n      if (doFill) {\n        if (fillCb) {\n          fillCb(context, path.attribute, pathAttribute);\n        } else if (fVisible) {\n          context.setCommonStyle(path, path.attribute, originX - x, originY - y, pathAttribute);\n          context.fill();\n        }\n      }\n    };\n\n    if (!fillStrokeOrder) {\n      _runFill();\n      _runStroke();\n    } else {\n      _runStroke();\n      _runFill();\n    }\n\n    this.afterRenderStep(\n      path,\n      context,\n      x,\n      y,\n      doFill,\n      doStroke,\n      fVisible,\n      sVisible,\n      pathAttribute,\n      drawContext,\n      fillCb,\n      strokeCb\n    );\n  }\n\n  draw(path: IPath, renderService: IRenderService, drawContext: IDrawContext, params?: IGraphicRenderDrawParams) {\n    const pathAttribute = getTheme(path, params?.theme).path;\n    this.tempTheme = pathAttribute;\n    this._draw(path, pathAttribute, false, drawContext, params);\n    this.tempTheme = null;\n  }\n}\n"]}

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

@@ -1,2 +1,4 @@
-import { ContainerModule } from '../../../common/inversify';
-export declare const polygonModule: ContainerModule;
+export declare function bindPolygonRenderModule({ bind }: {
+    bind: any;
+}): void;
+export declare const polygonModule: typeof bindPolygonRenderModule;

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

@@ -2,15 +2,17 @@
 
 Object.defineProperty(exports, "__esModule", {
     value: !0
-}), exports.polygonModule = void 0;
+}), exports.polygonModule = exports.bindPolygonRenderModule = void 0;
 
-const contribution_provider_1 = require("../../../common/contribution-provider"), inversify_1 = require("../../../common/inversify"), contributions_1 = require("./contributions"), constants_1 = require("./contributions/constants"), polygon_render_1 = require("./polygon-render"), symbol_1 = require("./symbol");
+const contribution_provider_1 = require("../../../common/contribution-provider"), contributions_1 = require("./contributions"), constants_1 = require("./contributions/constants"), polygon_render_1 = require("./polygon-render"), symbol_1 = require("./symbol");
 
 let loadPolygonModule = !1;
 
-exports.polygonModule = new inversify_1.ContainerModule((bind => {
+function bindPolygonRenderModule({bind: bind}) {
     loadPolygonModule || (loadPolygonModule = !0, bind(symbol_1.PolygonRender).to(polygon_render_1.DefaultCanvasPolygonRender).inSingletonScope(), 
     bind(symbol_1.GraphicRender).toService(symbol_1.PolygonRender), bind(constants_1.PolygonRenderContribution).toService(contributions_1.DefaultBaseInteractiveRenderContribution), 
     (0, contribution_provider_1.bindContributionProvider)(bind, constants_1.PolygonRenderContribution));
-}));
+}
+
+exports.bindPolygonRenderModule = bindPolygonRenderModule, exports.polygonModule = bindPolygonRenderModule;
 //# sourceMappingURL=polygon-module.js.map

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

@@ -1 +1 @@
-{"version":3,"sources":["../src/render/contributions/render/polygon-module.ts"],"names":[],"mappings":";;;AAAA,iFAAiF;AACjF,yDAA4D;AAC5D,mDAA2E;AAC3E,yDAA8F;AAE9F,qDAA8D;AAC9D,qCAAoE;AAEpE,IAAI,iBAAiB,GAAG,KAAK,CAAC;AACjB,QAAA,aAAa,GAAG,IAAI,2BAAe,CAAC,IAAI,CAAC,EAAE;IACtD,IAAI,iBAAiB,EAAE;QACrB,OAAO;KACR;IACD,iBAAiB,GAAG,IAAI,CAAC;IAEzB,IAAI,CAAC,sBAAa,CAAC,CAAC,EAAE,CAAC,2CAA0B,CAAC,CAAC,gBAAgB,EAAE,CAAC;IACtE,IAAI,CAAC,sBAAa,CAAC,CAAC,SAAS,CAAC,sBAAa,CAAC,CAAC;IAC7C,IAAI,CAAC,qCAAyB,CAAC,CAAC,SAAS,CAAC,wDAAwC,CAAC,CAAC;IAGpF,IAAA,gDAAwB,EAAC,IAAI,EAAE,qCAAyB,CAAC,CAAC;AAC5D,CAAC,CAAC,CAAC","file":"polygon-module.js","sourcesContent":["import { bindContributionProvider } from '../../../common/contribution-provider';\nimport { ContainerModule } from '../../../common/inversify';\nimport { DefaultBaseInteractiveRenderContribution } from './contributions';\nimport { PathRenderContribution, PolygonRenderContribution } from './contributions/constants';\nimport { DefaultCanvasPathRender } from './path-render';\nimport { DefaultCanvasPolygonRender } from './polygon-render';\nimport { GraphicRender, PathRender, PolygonRender } from './symbol';\n\nlet loadPolygonModule = false;\nexport const polygonModule = new ContainerModule(bind => {\n  if (loadPolygonModule) {\n    return;\n  }\n  loadPolygonModule = true;\n  // polygon渲染器\n  bind(PolygonRender).to(DefaultCanvasPolygonRender).inSingletonScope();\n  bind(GraphicRender).toService(PolygonRender);\n  bind(PolygonRenderContribution).toService(DefaultBaseInteractiveRenderContribution);\n\n  // polygon 渲染器注入contributions\n  bindContributionProvider(bind, PolygonRenderContribution);\n});\n"]}
+{"version":3,"sources":["../src/render/contributions/render/polygon-module.ts"],"names":[],"mappings":";;;AAAA,iFAAiF;AACjF,mDAA2E;AAC3E,yDAA8F;AAE9F,qDAA8D;AAC9D,qCAAoE;AAEpE,IAAI,iBAAiB,GAAG,KAAK,CAAC;AAC9B,SAAgB,uBAAuB,CAAC,EAAE,IAAI,EAAiB;IAC7D,IAAI,iBAAiB,EAAE;QACrB,OAAO;KACR;IACD,iBAAiB,GAAG,IAAI,CAAC;IAEzB,IAAI,CAAC,sBAAa,CAAC,CAAC,EAAE,CAAC,2CAA0B,CAAC,CAAC,gBAAgB,EAAE,CAAC;IACtE,IAAI,CAAC,sBAAa,CAAC,CAAC,SAAS,CAAC,sBAAa,CAAC,CAAC;IAC7C,IAAI,CAAC,qCAAyB,CAAC,CAAC,SAAS,CAAC,wDAAwC,CAAC,CAAC;IAGpF,IAAA,gDAAwB,EAAC,IAAI,EAAE,qCAAyB,CAAC,CAAC;AAC5D,CAAC;AAZD,0DAYC;AAEY,QAAA,aAAa,GAAG,uBAAuB,CAAC","file":"polygon-module.js","sourcesContent":["import { bindContributionProvider } from '../../../common/contribution-provider';\nimport { DefaultBaseInteractiveRenderContribution } from './contributions';\nimport { PathRenderContribution, PolygonRenderContribution } from './contributions/constants';\nimport { DefaultCanvasPathRender } from './path-render';\nimport { DefaultCanvasPolygonRender } from './polygon-render';\nimport { GraphicRender, PathRender, PolygonRender } from './symbol';\n\nlet loadPolygonModule = false;\nexport function bindPolygonRenderModule({ bind }: { bind: any }) {\n  if (loadPolygonModule) {\n    return;\n  }\n  loadPolygonModule = true;\n  // polygon渲染器\n  bind(PolygonRender).to(DefaultCanvasPolygonRender).inSingletonScope();\n  bind(GraphicRender).toService(PolygonRender);\n  bind(PolygonRenderContribution).toService(DefaultBaseInteractiveRenderContribution);\n\n  // polygon 渲染器注入contributions\n  bindContributionProvider(bind, PolygonRenderContribution);\n}\n\nexport const polygonModule = bindPolygonRenderModule;\n"]}

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

@@ -1,24 +1,12 @@
 "use strict";
 
-var __decorate = this && this.__decorate || function(decorators, target, key, desc) {
-    var d, c = arguments.length, r = c < 3 ? target : null === desc ? desc = Object.getOwnPropertyDescriptor(target, key) : desc;
-    if ("object" == typeof Reflect && "function" == typeof Reflect.decorate) r = Reflect.decorate(decorators, target, key, desc); else for (var i = decorators.length - 1; i >= 0; i--) (d = decorators[i]) && (r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r);
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
-}, __metadata = this && this.__metadata || function(k, v) {
-    if ("object" == typeof Reflect && "function" == typeof Reflect.metadata) return Reflect.metadata(k, v);
-}, __param = this && this.__param || function(paramIndex, decorator) {
-    return function(target, key) {
-        decorator(target, key, paramIndex);
-    };
-};
-
 Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.DefaultCanvasPolygonRender = void 0;
 
-const vutils_1 = require("@visactor/vutils"), inversify_lite_1 = require("../../../common/inversify-lite"), theme_1 = require("../../../graphic/theme"), constants_1 = require("../../../graphic/constants"), polygon_1 = require("../../../common/polygon"), constants_2 = require("./contributions/constants"), contribution_provider_1 = require("../../../common/contribution-provider"), base_render_1 = require("./base-render"), polygon_contribution_render_1 = require("./contributions/polygon-contribution-render");
+const vutils_1 = require("@visactor/vutils"), theme_1 = require("../../../graphic/theme"), constants_1 = require("../../../graphic/constants"), polygon_1 = require("../../../common/polygon"), base_render_1 = require("./base-render"), polygon_contribution_render_1 = require("./contributions/polygon-contribution-render");
 
-let DefaultCanvasPolygonRender = class extends base_render_1.BaseRender {
+class DefaultCanvasPolygonRender extends base_render_1.BaseRender {
     constructor(graphicRenderContributions) {
         super(), this.graphicRenderContributions = graphicRenderContributions, this.numberType = constants_1.POLYGON_NUMBER_TYPE, 
         this.builtinContributions = [ polygon_contribution_render_1.defaultPolygonBackgroundRenderContribution, polygon_contribution_render_1.defaultPolygonTextureRenderContribution ], 
@@ -46,10 +34,7 @@ let DefaultCanvasPolygonRender = class extends base_render_1.BaseRender {
         const polygonAttribute = (0, theme_1.getTheme)(polygon, null == params ? void 0 : params.theme).polygon;
         this._draw(polygon, polygonAttribute, !1, drawContext, params);
     }
-};
+}
 
-DefaultCanvasPolygonRender = __decorate([ (0, inversify_lite_1.injectable)(), __param(0, (0, 
-inversify_lite_1.inject)(contribution_provider_1.ContributionProvider)), __param(0, (0, 
-inversify_lite_1.named)(constants_2.PolygonRenderContribution)), __metadata("design:paramtypes", [ Object ]) ], DefaultCanvasPolygonRender), 
 exports.DefaultCanvasPolygonRender = DefaultCanvasPolygonRender;
 //# sourceMappingURL=polygon-render.js.map

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

@@ -1 +1 @@
-{"version":3,"sources":["../src/render/contributions/render/polygon-render.ts"],"names":[],"mappings":"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","file":"polygon-render.js","sourcesContent":["import { isArray } from '@visactor/vutils';\nimport { inject, injectable, named } from '../../../common/inversify-lite';\nimport { getTheme } from '../../../graphic/theme';\nimport { POLYGON_NUMBER_TYPE } from '../../../graphic/constants';\nimport type {\n  IGraphicAttribute,\n  IContext2d,\n  IMarkAttribute,\n  IPolygon,\n  IThemeAttribute,\n  IGraphicRender,\n  IPolygonRenderContribution,\n  IContributionProvider,\n  IDrawContext,\n  IGraphicRenderDrawParams,\n  IRenderService\n} from '../../../interface';\nimport { drawPolygon, drawRoundedPolygon } from '../../../common/polygon';\nimport { PolygonRenderContribution } from './contributions/constants';\n// eslint-disable-next-line @typescript-eslint/consistent-type-imports\nimport { ContributionProvider } from '../../../common/contribution-provider';\nimport { BaseRender } from './base-render';\nimport {\n  defaultPolygonBackgroundRenderContribution,\n  defaultPolygonTextureRenderContribution\n} from './contributions/polygon-contribution-render';\n\n@injectable()\nexport class DefaultCanvasPolygonRender extends BaseRender<IPolygon> implements IGraphicRender {\n  type: 'polygon';\n  numberType: number = POLYGON_NUMBER_TYPE;\n\n  constructor(\n    @inject(ContributionProvider)\n    @named(PolygonRenderContribution)\n    protected readonly graphicRenderContributions: IContributionProvider<IPolygonRenderContribution>\n  ) {\n    super();\n    this.builtinContributions = [defaultPolygonBackgroundRenderContribution, defaultPolygonTextureRenderContribution];\n    this.init(graphicRenderContributions);\n  }\n\n  drawShape(\n    polygon: IPolygon,\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 polygonAttribute = graphicService.themeService.getCurrentTheme().polygonAttribute;\n    const polygonAttribute = getTheme(polygon, params?.theme).polygon;\n    const {\n      points = polygonAttribute.points,\n      cornerRadius = polygonAttribute.cornerRadius,\n      x: originX = polygonAttribute.x,\n      y: originY = polygonAttribute.y,\n      closePath = polygonAttribute.closePath,\n      fillStrokeOrder = polygonAttribute.fillStrokeOrder\n    } = polygon.attribute;\n\n    const data = this.valid(polygon, polygonAttribute, fillCb, strokeCb);\n    if (!data) {\n      return;\n    }\n    const { fVisible, sVisible, doFill, doStroke } = data;\n\n    context.beginPath();\n\n    if ((cornerRadius as number) <= 0 || (isArray(cornerRadius) && (<number[]>cornerRadius).every(num => num === 0))) {\n      drawPolygon(context.camera ? context : context.nativeContext, points, x, y);\n    } else {\n      // FIXME: type\n      drawRoundedPolygon(context.camera ? context : context.nativeContext, points, x, y, cornerRadius, closePath);\n    }\n    // polygon 默认闭合\n    closePath && context.closePath();\n\n    // shadow\n    context.setShadowBlendStyle && context.setShadowBlendStyle(polygon, polygon.attribute, polygonAttribute);\n\n    this.beforeRenderStep(\n      polygon,\n      context,\n      x,\n      y,\n      doFill,\n      doStroke,\n      fVisible,\n      sVisible,\n      polygonAttribute,\n      drawContext,\n      fillCb,\n      strokeCb\n    );\n\n    const _runFill = () => {\n      if (doFill) {\n        if (fillCb) {\n          fillCb(context, polygon.attribute, polygonAttribute);\n        } else if (fVisible) {\n          // 存在fill\n          context.setCommonStyle(polygon, polygon.attribute, originX - x, originY - y, polygonAttribute);\n          context.fill();\n        }\n      }\n    };\n    const _runStroke = () => {\n      if (doStroke) {\n        if (strokeCb) {\n          strokeCb(context, polygon.attribute, polygonAttribute);\n        } else if (sVisible) {\n          // 存在stroke\n          context.setStrokeStyle(polygon, polygon.attribute, originX - x, originY - y, polygonAttribute);\n          context.stroke();\n        }\n      }\n    };\n\n    if (!fillStrokeOrder) {\n      _runFill();\n      _runStroke();\n    } else {\n      _runStroke();\n      _runFill();\n    }\n\n    this.afterRenderStep(\n      polygon,\n      context,\n      x,\n      y,\n      doFill,\n      doStroke,\n      fVisible,\n      sVisible,\n      polygonAttribute,\n      drawContext,\n      fillCb,\n      strokeCb\n    );\n  }\n\n  draw(polygon: IPolygon, renderService: IRenderService, drawContext: IDrawContext, params?: IGraphicRenderDrawParams) {\n    const polygonAttribute = getTheme(polygon, params?.theme).polygon;\n    this._draw(polygon, polygonAttribute, false, drawContext, params);\n  }\n}\n"]}
+{"version":3,"sources":["../src/render/contributions/render/polygon-render.ts"],"names":[],"mappings":"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","file":"polygon-render.js","sourcesContent":["import { isArray } from '@visactor/vutils';\nimport { getTheme } from '../../../graphic/theme';\nimport { POLYGON_NUMBER_TYPE } from '../../../graphic/constants';\nimport type {\n  IGraphicAttribute,\n  IContext2d,\n  IMarkAttribute,\n  IPolygon,\n  IThemeAttribute,\n  IGraphicRender,\n  IPolygonRenderContribution,\n  IContributionProvider,\n  IDrawContext,\n  IGraphicRenderDrawParams,\n  IRenderService\n} from '../../../interface';\nimport { drawPolygon, drawRoundedPolygon } from '../../../common/polygon';\nimport { PolygonRenderContribution } from './contributions/constants';\nimport { BaseRender } from './base-render';\nimport {\n  defaultPolygonBackgroundRenderContribution,\n  defaultPolygonTextureRenderContribution\n} from './contributions/polygon-contribution-render';\n\nexport class DefaultCanvasPolygonRender extends BaseRender<IPolygon> implements IGraphicRender {\n  type: 'polygon';\n  numberType: number = POLYGON_NUMBER_TYPE;\n\n  constructor(protected readonly graphicRenderContributions: IContributionProvider<IPolygonRenderContribution>) {\n    super();\n    this.builtinContributions = [defaultPolygonBackgroundRenderContribution, defaultPolygonTextureRenderContribution];\n    this.init(graphicRenderContributions);\n  }\n\n  drawShape(\n    polygon: IPolygon,\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 polygonAttribute = graphicService.themeService.getCurrentTheme().polygonAttribute;\n    const polygonAttribute = getTheme(polygon, params?.theme).polygon;\n    const {\n      points = polygonAttribute.points,\n      cornerRadius = polygonAttribute.cornerRadius,\n      x: originX = polygonAttribute.x,\n      y: originY = polygonAttribute.y,\n      closePath = polygonAttribute.closePath,\n      fillStrokeOrder = polygonAttribute.fillStrokeOrder\n    } = polygon.attribute;\n\n    const data = this.valid(polygon, polygonAttribute, fillCb, strokeCb);\n    if (!data) {\n      return;\n    }\n    const { fVisible, sVisible, doFill, doStroke } = data;\n\n    context.beginPath();\n\n    if ((cornerRadius as number) <= 0 || (isArray(cornerRadius) && (<number[]>cornerRadius).every(num => num === 0))) {\n      drawPolygon(context.camera ? context : context.nativeContext, points, x, y);\n    } else {\n      // FIXME: type\n      drawRoundedPolygon(context.camera ? context : context.nativeContext, points, x, y, cornerRadius, closePath);\n    }\n    // polygon 默认闭合\n    closePath && context.closePath();\n\n    // shadow\n    context.setShadowBlendStyle && context.setShadowBlendStyle(polygon, polygon.attribute, polygonAttribute);\n\n    this.beforeRenderStep(\n      polygon,\n      context,\n      x,\n      y,\n      doFill,\n      doStroke,\n      fVisible,\n      sVisible,\n      polygonAttribute,\n      drawContext,\n      fillCb,\n      strokeCb\n    );\n\n    const _runFill = () => {\n      if (doFill) {\n        if (fillCb) {\n          fillCb(context, polygon.attribute, polygonAttribute);\n        } else if (fVisible) {\n          // 存在fill\n          context.setCommonStyle(polygon, polygon.attribute, originX - x, originY - y, polygonAttribute);\n          context.fill();\n        }\n      }\n    };\n    const _runStroke = () => {\n      if (doStroke) {\n        if (strokeCb) {\n          strokeCb(context, polygon.attribute, polygonAttribute);\n        } else if (sVisible) {\n          // 存在stroke\n          context.setStrokeStyle(polygon, polygon.attribute, originX - x, originY - y, polygonAttribute);\n          context.stroke();\n        }\n      }\n    };\n\n    if (!fillStrokeOrder) {\n      _runFill();\n      _runStroke();\n    } else {\n      _runStroke();\n      _runFill();\n    }\n\n    this.afterRenderStep(\n      polygon,\n      context,\n      x,\n      y,\n      doFill,\n      doStroke,\n      fVisible,\n      sVisible,\n      polygonAttribute,\n      drawContext,\n      fillCb,\n      strokeCb\n    );\n  }\n\n  draw(polygon: IPolygon, renderService: IRenderService, drawContext: IDrawContext, params?: IGraphicRenderDrawParams) {\n    const polygonAttribute = getTheme(polygon, params?.theme).polygon;\n    this._draw(polygon, polygonAttribute, false, drawContext, params);\n  }\n}\n"]}

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

@@ -1,2 +1,4 @@
-import { ContainerModule } from '../../../common/inversify';
-export declare const pyramid3dModule: ContainerModule;
+export declare function bindPyramid3dRenderModule({ bind }: {
+    bind: any;
+}): void;
+export declare const pyramid3dModule: typeof bindPyramid3dRenderModule;

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

@@ -2,14 +2,16 @@
 
 Object.defineProperty(exports, "__esModule", {
     value: !0
-}), exports.pyramid3dModule = void 0;
+}), exports.pyramid3dModule = exports.bindPyramid3dRenderModule = void 0;
 
-const inversify_1 = require("../../../common/inversify"), pyramid3d_render_1 = require("./pyramid3d-render"), symbol_1 = require("./symbol");
+const pyramid3d_render_1 = require("./pyramid3d-render"), symbol_1 = require("./symbol");
 
 let loadPyramid3dModule = !1;
 
-exports.pyramid3dModule = new inversify_1.ContainerModule((bind => {
+function bindPyramid3dRenderModule({bind: bind}) {
     loadPyramid3dModule || (loadPyramid3dModule = !0, bind(symbol_1.Pyramid3dRender).to(pyramid3d_render_1.DefaultCanvasPyramid3dRender).inSingletonScope(), 
     bind(symbol_1.GraphicRender).toService(symbol_1.Pyramid3dRender));
-}));
+}
+
+exports.bindPyramid3dRenderModule = bindPyramid3dRenderModule, exports.pyramid3dModule = bindPyramid3dRenderModule;
 //# sourceMappingURL=pyramid3d-module.js.map

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

@@ -1 +1 @@
-{"version":3,"sources":["../src/render/contributions/render/pyramid3d-module.ts"],"names":[],"mappings":";;;AAAA,yDAA4D;AAC5D,yDAAkE;AAClE,qCAAwE;AAExE,IAAI,mBAAmB,GAAG,KAAK,CAAC;AACnB,QAAA,eAAe,GAAG,IAAI,2BAAe,CAAC,IAAI,CAAC,EAAE;IACxD,IAAI,mBAAmB,EAAE;QACvB,OAAO;KACR;IACD,mBAAmB,GAAG,IAAI,CAAC;IAE3B,IAAI,CAAC,wBAAe,CAAC,CAAC,EAAE,CAAC,+CAA4B,CAAC,CAAC,gBAAgB,EAAE,CAAC;IAC1E,IAAI,CAAC,sBAAa,CAAC,CAAC,SAAS,CAAC,wBAAe,CAAC,CAAC;AACjD,CAAC,CAAC,CAAC","file":"pyramid3d-module.js","sourcesContent":["import { ContainerModule } from '../../../common/inversify';\nimport { DefaultCanvasPyramid3dRender } from './pyramid3d-render';\nimport { GraphicRender, Pyramid3dRender, Rect3DRender } from './symbol';\n\nlet loadPyramid3dModule = false;\nexport const pyramid3dModule = new ContainerModule(bind => {\n  if (loadPyramid3dModule) {\n    return;\n  }\n  loadPyramid3dModule = true;\n  // pyramid3d 渲染器\n  bind(Pyramid3dRender).to(DefaultCanvasPyramid3dRender).inSingletonScope();\n  bind(GraphicRender).toService(Pyramid3dRender);\n});\n"]}
+{"version":3,"sources":["../src/render/contributions/render/pyramid3d-module.ts"],"names":[],"mappings":";;;AAAA,yDAAkE;AAClE,qCAAwE;AAExE,IAAI,mBAAmB,GAAG,KAAK,CAAC;AAChC,SAAgB,yBAAyB,CAAC,EAAE,IAAI,EAAiB;IAC/D,IAAI,mBAAmB,EAAE;QACvB,OAAO;KACR;IACD,mBAAmB,GAAG,IAAI,CAAC;IAE3B,IAAI,CAAC,wBAAe,CAAC,CAAC,EAAE,CAAC,+CAA4B,CAAC,CAAC,gBAAgB,EAAE,CAAC;IAC1E,IAAI,CAAC,sBAAa,CAAC,CAAC,SAAS,CAAC,wBAAe,CAAC,CAAC;AACjD,CAAC;AARD,8DAQC;AAEY,QAAA,eAAe,GAAG,yBAAyB,CAAC","file":"pyramid3d-module.js","sourcesContent":["import { DefaultCanvasPyramid3dRender } from './pyramid3d-render';\nimport { GraphicRender, Pyramid3dRender, Rect3DRender } from './symbol';\n\nlet loadPyramid3dModule = false;\nexport function bindPyramid3dRenderModule({ bind }: { bind: any }) {\n  if (loadPyramid3dModule) {\n    return;\n  }\n  loadPyramid3dModule = true;\n  // pyramid3d 渲染器\n  bind(Pyramid3dRender).to(DefaultCanvasPyramid3dRender).inSingletonScope();\n  bind(GraphicRender).toService(Pyramid3dRender);\n}\n\nexport const pyramid3dModule = bindPyramid3dRenderModule;\n"]}

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

@@ -1,18 +1,12 @@
 "use strict";
 
-var __decorate = this && this.__decorate || function(decorators, target, key, desc) {
-    var d, c = arguments.length, r = c < 3 ? target : null === desc ? desc = Object.getOwnPropertyDescriptor(target, key) : desc;
-    if ("object" == typeof Reflect && "function" == typeof Reflect.decorate) r = Reflect.decorate(decorators, target, key, desc); else for (var i = decorators.length - 1; i >= 0; i--) (d = decorators[i]) && (r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r);
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
-};
-
 Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.DefaultCanvasPyramid3dRender = void 0;
 
-const inversify_lite_1 = require("../../../common/inversify-lite"), theme_1 = require("../../../graphic/theme"), constants_1 = require("../../../graphic/constants"), base_3d_render_1 = require("./base-3d-render");
+const theme_1 = require("../../../graphic/theme"), constants_1 = require("../../../graphic/constants"), base_3d_render_1 = require("./base-3d-render");
 
-let DefaultCanvasPyramid3dRender = class extends base_3d_render_1.Base3dRender {
+class DefaultCanvasPyramid3dRender extends base_3d_render_1.Base3dRender {
     constructor() {
         super(...arguments), this.type = "pyramid3d", this.numberType = constants_1.PYRAMID3D_NUMBER_TYPE;
     }
@@ -33,8 +27,7 @@ let DefaultCanvasPyramid3dRender = class extends base_3d_render_1.Base3dRender {
         const pyramid3dAttribute = (0, theme_1.getTheme)(pyramid3d).polygon;
         this._draw(pyramid3d, pyramid3dAttribute, !1, drawContext);
     }
-};
+}
 
-DefaultCanvasPyramid3dRender = __decorate([ (0, inversify_lite_1.injectable)() ], DefaultCanvasPyramid3dRender), 
 exports.DefaultCanvasPyramid3dRender = DefaultCanvasPyramid3dRender;
 //# sourceMappingURL=pyramid3d-render.js.map

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

@@ -1 +1 @@
-{"version":3,"sources":["../src/render/contributions/render/pyramid3d-render.ts"],"names":[],"mappings":";;;;;;;;;AAAA,mEAA4D;AAC5D,kDAAkD;AAClD,0DAAmE;AAYnE,qDAAgD;AAGzC,IAAM,4BAA4B,GAAlC,MAAM,4BAA6B,SAAQ,6BAAwB;IAAnE;;QACL,SAAI,GAAG,WAAW,CAAC;QACnB,eAAU,GAAW,iCAAqB,CAAC;IA2D7C,CAAC;IAxDC,SAAS,CACP,SAAqB,EACrB,OAAmB,EACnB,CAAS,EACT,CAAS,EACT,WAAyB,EACzB,MAAiC,EACjC,MAIY,EACZ,QAIY;;QAGZ,MAAM,gBAAgB,GAAG,IAAA,gBAAQ,EAAC,SAAS,EAAE,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,KAAK,CAAC,CAAC,OAAO,CAAC;QACpE,MAAM,EACJ,IAAI,GAAG,gBAAgB,CAAC,IAAI,EAC5B,MAAM,GAAG,gBAAgB,CAAC,MAAM,EAChC,IAAI,GAAG,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,EAC5C,GAAG,SAAS,CAAC,SAAS,CAAC;QAExB,MAAM,CAAC,GAAG,MAAA,IAAI,CAAC,CAAC,mCAAI,CAAC,CAAC;QAEtB,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,SAAS,EAAE,gBAAgB,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAC;QACvE,IAAI,CAAC,IAAI,EAAE;YACT,OAAO;SACR;QAGD,MAAM,EAAE,KAAK,EAAE,GAAG,WAAW,CAAC,KAAK,IAAI,EAAE,CAAC;QAE1C,MAAM,MAAM,GAAG,SAAS,CAAC,QAAQ,EAAE,CAAC;QAEpC,IAAI,IAAI,KAAK,KAAK,EAAE;YAClB,OAAO,CAAC,cAAc,CAAC,SAAS,EAAE,SAAS,CAAC,SAAS,EAAE,CAAC,EAAE,CAAC,EAAE,gBAAgB,CAAC,CAAC;YAC/E,IAAI,EAAE,GAAG,IAAI,CAAC;YACd,IAAI,OAAO,EAAE,KAAK,QAAQ,EAAE;gBAC1B,EAAE,GAAG,OAAO,CAAC;aACd;YACD,IAAI,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,gBAAgB,EAAE,MAAM,CAAC,CAAC;SAC3F;QACD,IAAI,MAAM,KAAK,KAAK,EAAE;YACpB,OAAO,CAAC,cAAc,CAAC,SAAS,EAAE,SAAS,CAAC,SAAS,EAAE,CAAC,EAAE,CAAC,EAAE,gBAAgB,CAAC,CAAC;YAC/E,IAAI,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;SACvC;IACH,CAAC;IAED,IAAI,CAAC,SAAqB,EAAE,aAA6B,EAAE,WAAyB;QAClF,MAAM,kBAAkB,GAAG,IAAA,gBAAQ,EAAC,SAAS,CAAC,CAAC,OAAO,CAAC;QACvD,IAAI,CAAC,KAAK,CAAC,SAAS,EAAE,kBAAkB,EAAE,KAAK,EAAE,WAAW,CAAC,CAAC;IAChE,CAAC;CACF,CAAA;AA7DY,4BAA4B;IADxC,IAAA,2BAAU,GAAE;GACA,4BAA4B,CA6DxC;AA7DY,oEAA4B","file":"pyramid3d-render.js","sourcesContent":["import { injectable } from '../../../common/inversify-lite';\nimport { getTheme } from '../../../graphic/theme';\nimport { PYRAMID3D_NUMBER_TYPE } from '../../../graphic/constants';\nimport type {\n  IGraphicAttribute,\n  IContext2d,\n  IMarkAttribute,\n  IPyramid3d,\n  IThemeAttribute,\n  IGraphicRender,\n  IDrawContext,\n  IGraphicRenderDrawParams,\n  IRenderService\n} from '../../../interface';\nimport { Base3dRender } from './base-3d-render';\n\n@injectable()\nexport class DefaultCanvasPyramid3dRender extends Base3dRender<IPyramid3d> implements IGraphicRender {\n  type = 'pyramid3d';\n  numberType: number = PYRAMID3D_NUMBER_TYPE;\n  declare z: number;\n\n  drawShape(\n    pyramid3d: IPyramid3d,\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 rectAttribute = graphicService.themeService.getCurrentTheme().rectAttribute;\n    const pyramidAttribute = getTheme(pyramid3d, params?.theme).polygon;\n    const {\n      fill = pyramidAttribute.fill,\n      stroke = pyramidAttribute.stroke,\n      face = [true, true, true, true, true, true]\n    } = pyramid3d.attribute;\n\n    const z = this.z ?? 0;\n\n    const data = this.valid(pyramid3d, pyramidAttribute, fillCb, strokeCb);\n    if (!data) {\n      return;\n    }\n    // const { fVisible, sVisible, doFill, doStroke } = data;\n\n    const { light } = drawContext.stage || {};\n\n    const face3d = pyramid3d.findFace();\n\n    if (fill !== false) {\n      context.setCommonStyle(pyramid3d, pyramid3d.attribute, x, y, pyramidAttribute);\n      let fc = fill;\n      if (typeof fc !== 'string') {\n        fc = 'black';\n      }\n      this.fill(x, y, z, face3d, face, fc, context, light, pyramid3d, pyramidAttribute, fillCb);\n    }\n    if (stroke !== false) {\n      context.setStrokeStyle(pyramid3d, pyramid3d.attribute, x, y, pyramidAttribute);\n      this.stroke(x, y, z, face3d, context);\n    }\n  }\n\n  draw(pyramid3d: IPyramid3d, renderService: IRenderService, drawContext: IDrawContext) {\n    const pyramid3dAttribute = getTheme(pyramid3d).polygon;\n    this._draw(pyramid3d, pyramid3dAttribute, false, drawContext);\n  }\n}\n"]}
+{"version":3,"sources":["../src/render/contributions/render/pyramid3d-render.ts"],"names":[],"mappings":";;;AAAA,kDAAkD;AAClD,0DAAmE;AAYnE,qDAAgD;AAEhD,MAAa,4BAA6B,SAAQ,6BAAwB;IAA1E;;QACE,SAAI,GAAG,WAAW,CAAC;QACnB,eAAU,GAAW,iCAAqB,CAAC;IA2D7C,CAAC;IAxDC,SAAS,CACP,SAAqB,EACrB,OAAmB,EACnB,CAAS,EACT,CAAS,EACT,WAAyB,EACzB,MAAiC,EACjC,MAIY,EACZ,QAIY;;QAGZ,MAAM,gBAAgB,GAAG,IAAA,gBAAQ,EAAC,SAAS,EAAE,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,KAAK,CAAC,CAAC,OAAO,CAAC;QACpE,MAAM,EACJ,IAAI,GAAG,gBAAgB,CAAC,IAAI,EAC5B,MAAM,GAAG,gBAAgB,CAAC,MAAM,EAChC,IAAI,GAAG,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,EAC5C,GAAG,SAAS,CAAC,SAAS,CAAC;QAExB,MAAM,CAAC,GAAG,MAAA,IAAI,CAAC,CAAC,mCAAI,CAAC,CAAC;QAEtB,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,SAAS,EAAE,gBAAgB,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAC;QACvE,IAAI,CAAC,IAAI,EAAE;YACT,OAAO;SACR;QAGD,MAAM,EAAE,KAAK,EAAE,GAAG,WAAW,CAAC,KAAK,IAAI,EAAE,CAAC;QAE1C,MAAM,MAAM,GAAG,SAAS,CAAC,QAAQ,EAAE,CAAC;QAEpC,IAAI,IAAI,KAAK,KAAK,EAAE;YAClB,OAAO,CAAC,cAAc,CAAC,SAAS,EAAE,SAAS,CAAC,SAAS,EAAE,CAAC,EAAE,CAAC,EAAE,gBAAgB,CAAC,CAAC;YAC/E,IAAI,EAAE,GAAG,IAAI,CAAC;YACd,IAAI,OAAO,EAAE,KAAK,QAAQ,EAAE;gBAC1B,EAAE,GAAG,OAAO,CAAC;aACd;YACD,IAAI,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,gBAAgB,EAAE,MAAM,CAAC,CAAC;SAC3F;QACD,IAAI,MAAM,KAAK,KAAK,EAAE;YACpB,OAAO,CAAC,cAAc,CAAC,SAAS,EAAE,SAAS,CAAC,SAAS,EAAE,CAAC,EAAE,CAAC,EAAE,gBAAgB,CAAC,CAAC;YAC/E,IAAI,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;SACvC;IACH,CAAC;IAED,IAAI,CAAC,SAAqB,EAAE,aAA6B,EAAE,WAAyB;QAClF,MAAM,kBAAkB,GAAG,IAAA,gBAAQ,EAAC,SAAS,CAAC,CAAC,OAAO,CAAC;QACvD,IAAI,CAAC,KAAK,CAAC,SAAS,EAAE,kBAAkB,EAAE,KAAK,EAAE,WAAW,CAAC,CAAC;IAChE,CAAC;CACF;AA7DD,oEA6DC","file":"pyramid3d-render.js","sourcesContent":["import { getTheme } from '../../../graphic/theme';\nimport { PYRAMID3D_NUMBER_TYPE } from '../../../graphic/constants';\nimport type {\n  IGraphicAttribute,\n  IContext2d,\n  IMarkAttribute,\n  IPyramid3d,\n  IThemeAttribute,\n  IGraphicRender,\n  IDrawContext,\n  IGraphicRenderDrawParams,\n  IRenderService\n} from '../../../interface';\nimport { Base3dRender } from './base-3d-render';\n\nexport class DefaultCanvasPyramid3dRender extends Base3dRender<IPyramid3d> implements IGraphicRender {\n  type = 'pyramid3d';\n  numberType: number = PYRAMID3D_NUMBER_TYPE;\n  declare z: number;\n\n  drawShape(\n    pyramid3d: IPyramid3d,\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 rectAttribute = graphicService.themeService.getCurrentTheme().rectAttribute;\n    const pyramidAttribute = getTheme(pyramid3d, params?.theme).polygon;\n    const {\n      fill = pyramidAttribute.fill,\n      stroke = pyramidAttribute.stroke,\n      face = [true, true, true, true, true, true]\n    } = pyramid3d.attribute;\n\n    const z = this.z ?? 0;\n\n    const data = this.valid(pyramid3d, pyramidAttribute, fillCb, strokeCb);\n    if (!data) {\n      return;\n    }\n    // const { fVisible, sVisible, doFill, doStroke } = data;\n\n    const { light } = drawContext.stage || {};\n\n    const face3d = pyramid3d.findFace();\n\n    if (fill !== false) {\n      context.setCommonStyle(pyramid3d, pyramid3d.attribute, x, y, pyramidAttribute);\n      let fc = fill;\n      if (typeof fc !== 'string') {\n        fc = 'black';\n      }\n      this.fill(x, y, z, face3d, face, fc, context, light, pyramid3d, pyramidAttribute, fillCb);\n    }\n    if (stroke !== false) {\n      context.setStrokeStyle(pyramid3d, pyramid3d.attribute, x, y, pyramidAttribute);\n      this.stroke(x, y, z, face3d, context);\n    }\n  }\n\n  draw(pyramid3d: IPyramid3d, renderService: IRenderService, drawContext: IDrawContext) {\n    const pyramid3dAttribute = getTheme(pyramid3d).polygon;\n    this._draw(pyramid3d, pyramid3dAttribute, false, drawContext);\n  }\n}\n"]}

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

@@ -1,2 +1,4 @@
-import { ContainerModule } from '../../../common/inversify';
-export declare const rectModule: ContainerModule;
+export declare function bindRectRenderModule({ bind }: {
+    bind: any;
+}): void;
+export declare const rectModule: typeof bindRectRenderModule;

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

@@ -2,19 +2,22 @@
 
 Object.defineProperty(exports, "__esModule", {
     value: !0
-}), exports.rectModule = void 0;
+}), exports.rectModule = exports.bindRectRenderModule = void 0;
 
-const contribution_provider_1 = require("../../../common/contribution-provider"), inversify_1 = require("../../../common/inversify"), contributions_1 = require("./contributions"), constants_1 = require("./contributions/constants"), rect_render_1 = require("./rect-render"), symbol_1 = require("./symbol");
+const contribution_provider_1 = require("../../../common/contribution-provider"), contributions_1 = require("./contributions"), constants_1 = require("./contributions/constants"), rect_render_1 = require("./rect-render"), symbol_1 = require("./symbol");
 
 let loadRectModule = !1;
 
-exports.rectModule = new inversify_1.ContainerModule((bind => {
-    loadRectModule || (loadRectModule = !0, bind(rect_render_1.DefaultCanvasRectRender).toSelf().inSingletonScope(), 
-    bind(symbol_1.RectRender).to(rect_render_1.DefaultCanvasRectRender).inSingletonScope(), 
-    bind(symbol_1.GraphicRender).toService(symbol_1.RectRender), bind(contributions_1.SplitRectAfterRenderContribution).toSelf(), 
-    bind(contributions_1.SplitRectBeforeRenderContribution).toSelf(), bind(constants_1.RectRenderContribution).toService(contributions_1.SplitRectAfterRenderContribution), 
+function bindRectRenderModule({bind: bind}) {
+    loadRectModule || (loadRectModule = !0, bind(rect_render_1.DefaultCanvasRectRender).toDynamicValue((({container: container}) => new rect_render_1.DefaultCanvasRectRender((0, 
+    contribution_provider_1.createContributionProvider)(constants_1.RectRenderContribution, container)))).inSingletonScope(), 
+    bind(symbol_1.RectRender).toService(rect_render_1.DefaultCanvasRectRender), bind(symbol_1.GraphicRender).toService(symbol_1.RectRender), 
+    bind(contributions_1.SplitRectAfterRenderContribution).toSelf(), bind(contributions_1.SplitRectBeforeRenderContribution).toSelf(), 
+    bind(constants_1.RectRenderContribution).toService(contributions_1.SplitRectAfterRenderContribution), 
     bind(constants_1.RectRenderContribution).toService(contributions_1.SplitRectBeforeRenderContribution), 
     bind(constants_1.RectRenderContribution).toService(contributions_1.DefaultBaseInteractiveRenderContribution), 
     (0, contribution_provider_1.bindContributionProvider)(bind, constants_1.RectRenderContribution));
-}));
+}
+
+exports.bindRectRenderModule = bindRectRenderModule, exports.rectModule = bindRectRenderModule;
 //# sourceMappingURL=rect-module.js.map

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

@@ -1 +1 @@
-{"version":3,"sources":["../src/render/contributions/render/rect-module.ts"],"names":[],"mappings":";;;AAAA,iFAAiF;AACjF,yDAA4D;AAE5D,mDAIyB;AACzB,yDAA0F;AAC1F,+CAAwD;AACxD,qCAAgE;AAEhE,IAAI,cAAc,GAAG,KAAK,CAAC;AACd,QAAA,UAAU,GAAG,IAAI,2BAAe,CAAC,IAAI,CAAC,EAAE;IACnD,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,gDAAgC,CAAC,CAAC,MAAM,EAAE,CAAC;IAChD,IAAI,CAAC,iDAAiC,CAAC,CAAC,MAAM,EAAE,CAAC;IACjD,IAAI,CAAC,kCAAsB,CAAC,CAAC,SAAS,CAAC,gDAAgC,CAAC,CAAC;IACzE,IAAI,CAAC,kCAAsB,CAAC,CAAC,SAAS,CAAC,iDAAiC,CAAC,CAAC;IAC1E,IAAI,CAAC,kCAAsB,CAAC,CAAC,SAAS,CAAC,wDAAwC,CAAC,CAAC;IAEjF,IAAA,gDAAwB,EAAC,IAAI,EAAE,kCAAsB,CAAC,CAAC;AACzD,CAAC,CAAC,CAAC","file":"rect-module.js","sourcesContent":["import { bindContributionProvider } from '../../../common/contribution-provider';\nimport { ContainerModule } from '../../../common/inversify';\nimport { DefaultCanvasArcRender } from './arc-render';\nimport {\n  DefaultBaseInteractiveRenderContribution,\n  SplitRectAfterRenderContribution,\n  SplitRectBeforeRenderContribution\n} from './contributions';\nimport { ArcRenderContribution, RectRenderContribution } from './contributions/constants';\nimport { DefaultCanvasRectRender } from './rect-render';\nimport { ArcRender, GraphicRender, RectRender } from './symbol';\n\nlet loadRectModule = false;\nexport const rectModule = new ContainerModule(bind => {\n  if (loadRectModule) {\n    return;\n  }\n  loadRectModule = true;\n  // rect 渲染器\n  bind(DefaultCanvasRectRender).toSelf().inSingletonScope();\n  bind(RectRender).to(DefaultCanvasRectRender).inSingletonScope();\n  bind(GraphicRender).toService(RectRender);\n  bind(SplitRectAfterRenderContribution).toSelf();\n  bind(SplitRectBeforeRenderContribution).toSelf();\n  bind(RectRenderContribution).toService(SplitRectAfterRenderContribution);\n  bind(RectRenderContribution).toService(SplitRectBeforeRenderContribution);\n  bind(RectRenderContribution).toService(DefaultBaseInteractiveRenderContribution);\n  // rect 渲染器注入contributions\n  bindContributionProvider(bind, RectRenderContribution);\n});\n"]}
+{"version":3,"sources":["../src/render/contributions/render/rect-module.ts"],"names":[],"mappings":";;;AAAA,iFAA6G;AAC7G,mDAIyB;AACzB,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;SAC1B,cAAc,CACb,CAAC,EAAE,SAAS,EAAsB,EAAE,EAAE,CACpC,IAAI,qCAAuB,CAAC,IAAA,kDAA0B,EAAC,kCAAsB,EAAE,SAAS,CAAC,CAAC,CAC7F;SACA,gBAAgB,EAAE,CAAC;IACtB,IAAI,CAAC,mBAAU,CAAC,CAAC,SAAS,CAAC,qCAAuB,CAAC,CAAC;IACpD,IAAI,CAAC,sBAAa,CAAC,CAAC,SAAS,CAAC,mBAAU,CAAC,CAAC;IAC1C,IAAI,CAAC,gDAAgC,CAAC,CAAC,MAAM,EAAE,CAAC;IAChD,IAAI,CAAC,iDAAiC,CAAC,CAAC,MAAM,EAAE,CAAC;IACjD,IAAI,CAAC,kCAAsB,CAAC,CAAC,SAAS,CAAC,gDAAgC,CAAC,CAAC;IACzE,IAAI,CAAC,kCAAsB,CAAC,CAAC,SAAS,CAAC,iDAAiC,CAAC,CAAC;IAC1E,IAAI,CAAC,kCAAsB,CAAC,CAAC,SAAS,CAAC,wDAAwC,CAAC,CAAC;IAEjF,IAAA,gDAAwB,EAAC,IAAI,EAAE,kCAAsB,CAAC,CAAC;AACzD,CAAC;AArBD,oDAqBC;AAEY,QAAA,UAAU,GAAG,oBAAoB,CAAC","file":"rect-module.js","sourcesContent":["import { bindContributionProvider, createContributionProvider } from '../../../common/contribution-provider';\nimport {\n  DefaultBaseInteractiveRenderContribution,\n  SplitRectAfterRenderContribution,\n  SplitRectBeforeRenderContribution\n} from './contributions';\nimport { RectRenderContribution } from './contributions/constants';\nimport { DefaultCanvasRectRender } from './rect-render';\nimport { GraphicRender, RectRender } from './symbol';\n\nlet loadRectModule = false;\nexport function bindRectRenderModule({ bind }: { bind: any }) {\n  if (loadRectModule) {\n    return;\n  }\n  loadRectModule = true;\n  // rect 渲染器\n  bind(DefaultCanvasRectRender)\n    .toDynamicValue(\n      ({ container }: { container: any }) =>\n        new DefaultCanvasRectRender(createContributionProvider(RectRenderContribution, container))\n    )\n    .inSingletonScope();\n  bind(RectRender).toService(DefaultCanvasRectRender);\n  bind(GraphicRender).toService(RectRender);\n  bind(SplitRectAfterRenderContribution).toSelf();\n  bind(SplitRectBeforeRenderContribution).toSelf();\n  bind(RectRenderContribution).toService(SplitRectAfterRenderContribution);\n  bind(RectRenderContribution).toService(SplitRectBeforeRenderContribution);\n  bind(RectRenderContribution).toService(DefaultBaseInteractiveRenderContribution);\n  // rect 渲染器注入contributions\n  bindContributionProvider(bind, RectRenderContribution);\n}\n\nexport const rectModule = bindRectRenderModule;\n"]}

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

@@ -1,24 +1,12 @@
 "use strict";
 
-var __decorate = this && this.__decorate || function(decorators, target, key, desc) {
-    var d, c = arguments.length, r = c < 3 ? target : null === desc ? desc = Object.getOwnPropertyDescriptor(target, key) : desc;
-    if ("object" == typeof Reflect && "function" == typeof Reflect.decorate) r = Reflect.decorate(decorators, target, key, desc); else for (var i = decorators.length - 1; i >= 0; i--) (d = decorators[i]) && (r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r);
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
-}, __metadata = this && this.__metadata || function(k, v) {
-    if ("object" == typeof Reflect && "function" == typeof Reflect.metadata) return Reflect.metadata(k, v);
-}, __param = this && this.__param || function(paramIndex, decorator) {
-    return function(target, key) {
-        decorator(target, key, paramIndex);
-    };
-};
-
 Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.DefaultCanvasRectRender = void 0;
 
-const vutils_1 = require("@visactor/vutils"), inversify_lite_1 = require("../../../common/inversify-lite"), theme_1 = require("../../../graphic/theme"), constants_1 = require("../../../graphic/constants"), rect_1 = require("../../../common/shape/rect"), contribution_provider_1 = require("../../../common/contribution-provider"), constants_2 = require("./contributions/constants"), utils_1 = require("./utils"), base_render_1 = require("./base-render"), contributions_1 = require("./contributions");
+const vutils_1 = require("@visactor/vutils"), theme_1 = require("../../../graphic/theme"), constants_1 = require("../../../graphic/constants"), rect_1 = require("../../../common/shape/rect"), utils_1 = require("./utils"), base_render_1 = require("./base-render"), contributions_1 = require("./contributions");
 
-let DefaultCanvasRectRender = class extends base_render_1.BaseRender {
+class DefaultCanvasRectRender extends base_render_1.BaseRender {
     constructor(graphicRenderContributions) {
         super(), this.graphicRenderContributions = graphicRenderContributions, this.type = "rect", 
         this.numberType = constants_1.RECT_NUMBER_TYPE, this.builtinContributions = [ contributions_1.defaultRectRenderContribution, contributions_1.defaultRectBackgroundRenderContribution, contributions_1.defaultRectTextureRenderContribution ], 
@@ -60,10 +48,7 @@ let DefaultCanvasRectRender = class extends base_render_1.BaseRender {
         const rectAttribute = (0, theme_1.getTheme)(rect, null == params ? void 0 : params.theme).rect;
         this._draw(rect, rectAttribute, !1, drawContext, params, rectAttribute);
     }
-};
+}
 
-DefaultCanvasRectRender = __decorate([ (0, inversify_lite_1.injectable)(), __param(0, (0, 
-inversify_lite_1.inject)(contribution_provider_1.ContributionProvider)), __param(0, (0, 
-inversify_lite_1.named)(constants_2.RectRenderContribution)), __metadata("design:paramtypes", [ Object ]) ], DefaultCanvasRectRender), 
 exports.DefaultCanvasRectRender = DefaultCanvasRectRender;
 //# sourceMappingURL=rect-render.js.map

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

@@ -1 +1 @@
-{"version":3,"sources":["../src/render/contributions/render/rect-render.ts"],"names":[],"mappings":"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","file":"rect-render.js","sourcesContent":["import { isArray } from '@visactor/vutils';\nimport { inject, injectable, named } from '../../../common/inversify-lite';\nimport { getTheme } from '../../../graphic/theme';\nimport { RECT_NUMBER_TYPE } from '../../../graphic/constants';\nimport { createRectPath } from '../../../common/shape/rect';\n// eslint-disable-next-line @typescript-eslint/consistent-type-imports\nimport { ContributionProvider } from '../../../common/contribution-provider';\nimport type {\n  IGraphicAttribute,\n  IContext2d,\n  IMarkAttribute,\n  IRect,\n  IThemeAttribute,\n  IGraphicRender,\n  IDrawContext,\n  IGraphicRenderDrawParams,\n  IRenderService,\n  IRectRenderContribution,\n  IContributionProvider,\n  IRectGraphicAttribute\n} from '../../../interface';\nimport { RectRenderContribution } from './contributions/constants';\nimport { rectFillVisible, rectStrokeVisible, runFill, runStroke } from './utils';\nimport { BaseRender } from './base-render';\nimport {\n  defaultRectBackgroundRenderContribution,\n  defaultRectRenderContribution,\n  defaultRectTextureRenderContribution\n} from './contributions';\n\n@injectable()\nexport class DefaultCanvasRectRender extends BaseRender<IRect> implements IGraphicRender {\n  type = 'rect';\n  numberType: number = RECT_NUMBER_TYPE;\n  tempTheme: Required<IRectGraphicAttribute>;\n\n  constructor(\n    @inject(ContributionProvider)\n    @named(RectRenderContribution)\n    protected readonly graphicRenderContributions: IContributionProvider<IRectRenderContribution>\n  ) {\n    super();\n    this.builtinContributions = [\n      defaultRectRenderContribution,\n      defaultRectBackgroundRenderContribution,\n      defaultRectTextureRenderContribution\n    ];\n    this.init(graphicRenderContributions);\n  }\n\n  drawShape(\n    rect: IRect,\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    rectAttribute?: Required<IRectGraphicAttribute>\n  ) {\n    rectAttribute = rectAttribute ?? getTheme(rect, params?.theme).rect;\n    const {\n      fill = rectAttribute.fill,\n      background,\n      stroke = rectAttribute.stroke,\n      cornerRadius = rectAttribute.cornerRadius,\n      cornerType = rectAttribute.cornerType,\n      opacity = rectAttribute.opacity,\n      fillOpacity = rectAttribute.fillOpacity,\n      lineWidth = rectAttribute.lineWidth,\n      strokeOpacity = rectAttribute.strokeOpacity,\n      visible = rectAttribute.visible,\n      x1,\n      y1,\n      x: originX = rectAttribute.x,\n      y: originY = rectAttribute.y,\n      fillStrokeOrder = rectAttribute.fillStrokeOrder,\n      drawStrokeWhenZeroWH = rectAttribute.drawStrokeWhenZeroWH\n    } = rect.attribute;\n    let { width, height } = rect.attribute;\n    width = (width ?? x1 - originX) || 0;\n    height = (height ?? y1 - originY) || 0;\n\n    // 不绘制或者透明\n    const fVisible = rectFillVisible(opacity, fillOpacity, width, height, fill);\n    const sVisible = rectStrokeVisible(opacity, strokeOpacity, width, height, drawStrokeWhenZeroWH);\n    const doFill = runFill(fill, background);\n    const doStroke = runStroke(stroke, lineWidth);\n\n    if (!(rect.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    if (cornerRadius === 0 || (isArray(cornerRadius) && (<number[]>cornerRadius).every(num => num === 0))) {\n      // 不需要处理圆角\n      context.beginPath();\n      context.rect(x, y, width, height);\n    } else {\n      context.beginPath();\n\n      // 测试后，cache对于重绘性能提升不大，但是在首屏有一定性能损耗，因此rect不再使用cache\n      createRectPath(context, x, y, width, height, cornerRadius, cornerType !== 'bevel');\n    }\n\n    const doFillOrStroke = {\n      doFill,\n      doStroke\n    };\n\n    // shadow\n    context.setShadowBlendStyle && context.setShadowBlendStyle(rect, rect.attribute, rectAttribute);\n\n    this.beforeRenderStep(\n      rect,\n      context,\n      x,\n      y,\n      doFill,\n      doStroke,\n      fVisible,\n      sVisible,\n      rectAttribute,\n      drawContext,\n      fillCb,\n      strokeCb,\n      doFillOrStroke\n    );\n\n    // 内联的函数性能差\n    // const _runFill = () => {\n    //   if (doFillOrStroke.doFill) {\n    //     if (fillCb) {\n    //       fillCb(context, rect.attribute, rectAttribute);\n    //     } else if (fVisible) {\n    //       // 存在fill\n    //       context.setCommonStyle(rect, rect.attribute, originX - x, originY - y, rectAttribute);\n    //       context.fill();\n    //     }\n    //   }\n    // };\n    // const _runStroke = () => {\n    //   if (doFillOrStroke.doStroke) {\n    //     if (strokeCb) {\n    //       strokeCb(context, rect.attribute, rectAttribute);\n    //     } else if (sVisible) {\n    //       // 存在stroke\n    //       context.setStrokeStyle(rect, rect.attribute, originX - x, originY - y, rectAttribute);\n    //       context.stroke();\n    //     }\n    //   }\n    // };\n\n    if (!fillStrokeOrder) {\n      this._runFill(rect, context, x, y, rectAttribute, doFillOrStroke, fVisible, originX, originY, fillCb);\n      this._runStroke(rect, context, x, y, rectAttribute, doFillOrStroke, sVisible, originX, originY, strokeCb);\n    } else {\n      this._runStroke(rect, context, x, y, rectAttribute, doFillOrStroke, sVisible, originX, originY, strokeCb);\n      this._runFill(rect, context, x, y, rectAttribute, doFillOrStroke, fVisible, originX, originY, fillCb);\n    }\n\n    this.afterRenderStep(\n      rect,\n      context,\n      x,\n      y,\n      doFill,\n      doStroke,\n      fVisible,\n      sVisible,\n      rectAttribute,\n      drawContext,\n      fillCb,\n      strokeCb\n    );\n  }\n\n  private _runFill(\n    rect: IRect,\n    context: IContext2d,\n    x: number,\n    y: number,\n    rectAttribute: Required<IRectGraphicAttribute>,\n    doFillOrStroke: { doFill: boolean; doStroke: boolean },\n    fVisible: boolean,\n    originX: number,\n    originY: number,\n    fillCb?: (\n      ctx: IContext2d,\n      markAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n      themeAttribute: IThemeAttribute\n    ) => boolean\n  ) {\n    if (doFillOrStroke.doFill) {\n      if (fillCb) {\n        fillCb(context, rect.attribute, rectAttribute);\n      } else if (fVisible) {\n        // 存在fill\n        context.setCommonStyle(rect, rect.attribute, originX - x, originY - y, rectAttribute);\n        context.fill();\n      }\n    }\n  }\n\n  private _runStroke(\n    rect: IRect,\n    context: IContext2d,\n    x: number,\n    y: number,\n    rectAttribute: Required<IRectGraphicAttribute>,\n    doFillOrStroke: { doFill: boolean; doStroke: boolean },\n    sVisible: boolean,\n    originX: number,\n    originY: number,\n    strokeCb?: (\n      ctx: IContext2d,\n      markAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n      themeAttribute: IThemeAttribute\n    ) => boolean\n  ) {\n    if (doFillOrStroke.doStroke) {\n      if (strokeCb) {\n        strokeCb(context, rect.attribute, rectAttribute);\n      } else if (sVisible) {\n        // 存在stroke\n        context.setStrokeStyle(rect, rect.attribute, originX - x, originY - y, rectAttribute);\n        context.stroke();\n      }\n    }\n  }\n\n  draw(rect: IRect, renderService: IRenderService, drawContext: IDrawContext, params?: IGraphicRenderDrawParams) {\n    const rectAttribute = getTheme(rect, params?.theme).rect;\n    this._draw(rect, rectAttribute, false, drawContext, params, rectAttribute);\n  }\n}\n"]}
+{"version":3,"sources":["../src/render/contributions/render/rect-render.ts"],"names":[],"mappings":"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","file":"rect-render.js","sourcesContent":["import { isArray } from '@visactor/vutils';\nimport { getTheme } from '../../../graphic/theme';\nimport { RECT_NUMBER_TYPE } from '../../../graphic/constants';\nimport { createRectPath } from '../../../common/shape/rect';\nimport type {\n  IGraphicAttribute,\n  IContext2d,\n  IMarkAttribute,\n  IRect,\n  IThemeAttribute,\n  IGraphicRender,\n  IDrawContext,\n  IGraphicRenderDrawParams,\n  IRenderService,\n  IRectRenderContribution,\n  IContributionProvider,\n  IRectGraphicAttribute\n} from '../../../interface';\nimport { rectFillVisible, rectStrokeVisible, runFill, runStroke } from './utils';\nimport { BaseRender } from './base-render';\nimport {\n  defaultRectBackgroundRenderContribution,\n  defaultRectRenderContribution,\n  defaultRectTextureRenderContribution\n} from './contributions';\n\nexport class DefaultCanvasRectRender extends BaseRender<IRect> implements IGraphicRender {\n  type = 'rect';\n  numberType: number = RECT_NUMBER_TYPE;\n  tempTheme: Required<IRectGraphicAttribute>;\n\n  constructor(protected readonly graphicRenderContributions: IContributionProvider<IRectRenderContribution>) {\n    super();\n    this.builtinContributions = [\n      defaultRectRenderContribution,\n      defaultRectBackgroundRenderContribution,\n      defaultRectTextureRenderContribution\n    ];\n    this.init(graphicRenderContributions);\n  }\n\n  drawShape(\n    rect: IRect,\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    rectAttribute?: Required<IRectGraphicAttribute>\n  ) {\n    rectAttribute = rectAttribute ?? getTheme(rect, params?.theme).rect;\n    const {\n      fill = rectAttribute.fill,\n      background,\n      stroke = rectAttribute.stroke,\n      cornerRadius = rectAttribute.cornerRadius,\n      cornerType = rectAttribute.cornerType,\n      opacity = rectAttribute.opacity,\n      fillOpacity = rectAttribute.fillOpacity,\n      lineWidth = rectAttribute.lineWidth,\n      strokeOpacity = rectAttribute.strokeOpacity,\n      visible = rectAttribute.visible,\n      x1,\n      y1,\n      x: originX = rectAttribute.x,\n      y: originY = rectAttribute.y,\n      fillStrokeOrder = rectAttribute.fillStrokeOrder,\n      drawStrokeWhenZeroWH = rectAttribute.drawStrokeWhenZeroWH\n    } = rect.attribute;\n    let { width, height } = rect.attribute;\n    width = (width ?? x1 - originX) || 0;\n    height = (height ?? y1 - originY) || 0;\n\n    // 不绘制或者透明\n    const fVisible = rectFillVisible(opacity, fillOpacity, width, height, fill);\n    const sVisible = rectStrokeVisible(opacity, strokeOpacity, width, height, drawStrokeWhenZeroWH);\n    const doFill = runFill(fill, background);\n    const doStroke = runStroke(stroke, lineWidth);\n\n    if (!(rect.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    if (cornerRadius === 0 || (isArray(cornerRadius) && (<number[]>cornerRadius).every(num => num === 0))) {\n      // 不需要处理圆角\n      context.beginPath();\n      context.rect(x, y, width, height);\n    } else {\n      context.beginPath();\n\n      // 测试后，cache对于重绘性能提升不大，但是在首屏有一定性能损耗，因此rect不再使用cache\n      createRectPath(context, x, y, width, height, cornerRadius, cornerType !== 'bevel');\n    }\n\n    const doFillOrStroke = {\n      doFill,\n      doStroke\n    };\n\n    // shadow\n    context.setShadowBlendStyle && context.setShadowBlendStyle(rect, rect.attribute, rectAttribute);\n\n    this.beforeRenderStep(\n      rect,\n      context,\n      x,\n      y,\n      doFill,\n      doStroke,\n      fVisible,\n      sVisible,\n      rectAttribute,\n      drawContext,\n      fillCb,\n      strokeCb,\n      doFillOrStroke\n    );\n\n    // 内联的函数性能差\n    // const _runFill = () => {\n    //   if (doFillOrStroke.doFill) {\n    //     if (fillCb) {\n    //       fillCb(context, rect.attribute, rectAttribute);\n    //     } else if (fVisible) {\n    //       // 存在fill\n    //       context.setCommonStyle(rect, rect.attribute, originX - x, originY - y, rectAttribute);\n    //       context.fill();\n    //     }\n    //   }\n    // };\n    // const _runStroke = () => {\n    //   if (doFillOrStroke.doStroke) {\n    //     if (strokeCb) {\n    //       strokeCb(context, rect.attribute, rectAttribute);\n    //     } else if (sVisible) {\n    //       // 存在stroke\n    //       context.setStrokeStyle(rect, rect.attribute, originX - x, originY - y, rectAttribute);\n    //       context.stroke();\n    //     }\n    //   }\n    // };\n\n    if (!fillStrokeOrder) {\n      this._runFill(rect, context, x, y, rectAttribute, doFillOrStroke, fVisible, originX, originY, fillCb);\n      this._runStroke(rect, context, x, y, rectAttribute, doFillOrStroke, sVisible, originX, originY, strokeCb);\n    } else {\n      this._runStroke(rect, context, x, y, rectAttribute, doFillOrStroke, sVisible, originX, originY, strokeCb);\n      this._runFill(rect, context, x, y, rectAttribute, doFillOrStroke, fVisible, originX, originY, fillCb);\n    }\n\n    this.afterRenderStep(\n      rect,\n      context,\n      x,\n      y,\n      doFill,\n      doStroke,\n      fVisible,\n      sVisible,\n      rectAttribute,\n      drawContext,\n      fillCb,\n      strokeCb\n    );\n  }\n\n  private _runFill(\n    rect: IRect,\n    context: IContext2d,\n    x: number,\n    y: number,\n    rectAttribute: Required<IRectGraphicAttribute>,\n    doFillOrStroke: { doFill: boolean; doStroke: boolean },\n    fVisible: boolean,\n    originX: number,\n    originY: number,\n    fillCb?: (\n      ctx: IContext2d,\n      markAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n      themeAttribute: IThemeAttribute\n    ) => boolean\n  ) {\n    if (doFillOrStroke.doFill) {\n      if (fillCb) {\n        fillCb(context, rect.attribute, rectAttribute);\n      } else if (fVisible) {\n        // 存在fill\n        context.setCommonStyle(rect, rect.attribute, originX - x, originY - y, rectAttribute);\n        context.fill();\n      }\n    }\n  }\n\n  private _runStroke(\n    rect: IRect,\n    context: IContext2d,\n    x: number,\n    y: number,\n    rectAttribute: Required<IRectGraphicAttribute>,\n    doFillOrStroke: { doFill: boolean; doStroke: boolean },\n    sVisible: boolean,\n    originX: number,\n    originY: number,\n    strokeCb?: (\n      ctx: IContext2d,\n      markAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n      themeAttribute: IThemeAttribute\n    ) => boolean\n  ) {\n    if (doFillOrStroke.doStroke) {\n      if (strokeCb) {\n        strokeCb(context, rect.attribute, rectAttribute);\n      } else if (sVisible) {\n        // 存在stroke\n        context.setStrokeStyle(rect, rect.attribute, originX - x, originY - y, rectAttribute);\n        context.stroke();\n      }\n    }\n  }\n\n  draw(rect: IRect, renderService: IRenderService, drawContext: IDrawContext, params?: IGraphicRenderDrawParams) {\n    const rectAttribute = getTheme(rect, params?.theme).rect;\n    this._draw(rect, rectAttribute, false, drawContext, params, rectAttribute);\n  }\n}\n"]}

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

@@ -1,2 +1,4 @@
-import { ContainerModule } from '../../../common/inversify';
-export declare const rect3dModule: ContainerModule;
+export declare function bindRect3dRenderModule({ bind }: {
+    bind: any;
+}): void;
+export declare const rect3dModule: typeof bindRect3dRenderModule;

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

@@ -2,14 +2,16 @@
 
 Object.defineProperty(exports, "__esModule", {
     value: !0
-}), exports.rect3dModule = void 0;
+}), exports.rect3dModule = exports.bindRect3dRenderModule = void 0;
 
-const inversify_1 = require("../../../common/inversify"), rect3d_render_1 = require("./rect3d-render"), symbol_1 = require("./symbol");
+const rect3d_render_1 = require("./rect3d-render"), symbol_1 = require("./symbol");
 
 let loadRect3dModule = !1;
 
-exports.rect3dModule = new inversify_1.ContainerModule((bind => {
+function bindRect3dRenderModule({bind: bind}) {
     loadRect3dModule || (loadRect3dModule = !0, bind(symbol_1.Rect3DRender).to(rect3d_render_1.DefaultCanvasRect3dRender).inSingletonScope(), 
     bind(symbol_1.GraphicRender).toService(symbol_1.Rect3DRender));
-}));
+}
+
+exports.bindRect3dRenderModule = bindRect3dRenderModule, exports.rect3dModule = bindRect3dRenderModule;
 //# sourceMappingURL=rect3d-module.js.map

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

@@ -1 +1 @@
-{"version":3,"sources":["../src/render/contributions/render/rect3d-module.ts"],"names":[],"mappings":";;;AAAA,yDAA4D;AAC5D,mDAA4D;AAC5D,qCAAuD;AAEvD,IAAI,gBAAgB,GAAG,KAAK,CAAC;AAChB,QAAA,YAAY,GAAG,IAAI,2BAAe,CAAC,IAAI,CAAC,EAAE;IACrD,IAAI,gBAAgB,EAAE;QACpB,OAAO;KACR;IACD,gBAAgB,GAAG,IAAI,CAAC;IAExB,IAAI,CAAC,qBAAY,CAAC,CAAC,EAAE,CAAC,yCAAyB,CAAC,CAAC,gBAAgB,EAAE,CAAC;IACpE,IAAI,CAAC,sBAAa,CAAC,CAAC,SAAS,CAAC,qBAAY,CAAC,CAAC;AAC9C,CAAC,CAAC,CAAC","file":"rect3d-module.js","sourcesContent":["import { ContainerModule } from '../../../common/inversify';\nimport { DefaultCanvasRect3dRender } from './rect3d-render';\nimport { GraphicRender, Rect3DRender } from './symbol';\n\nlet loadRect3dModule = false;\nexport const rect3dModule = new ContainerModule(bind => {\n  if (loadRect3dModule) {\n    return;\n  }\n  loadRect3dModule = true;\n  // rect3d 渲染器\n  bind(Rect3DRender).to(DefaultCanvasRect3dRender).inSingletonScope();\n  bind(GraphicRender).toService(Rect3DRender);\n});\n"]}
+{"version":3,"sources":["../src/render/contributions/render/rect3d-module.ts"],"names":[],"mappings":";;;AAAA,mDAA4D;AAC5D,qCAAuD;AAEvD,IAAI,gBAAgB,GAAG,KAAK,CAAC;AAC7B,SAAgB,sBAAsB,CAAC,EAAE,IAAI,EAAiB;IAC5D,IAAI,gBAAgB,EAAE;QACpB,OAAO;KACR;IACD,gBAAgB,GAAG,IAAI,CAAC;IAExB,IAAI,CAAC,qBAAY,CAAC,CAAC,EAAE,CAAC,yCAAyB,CAAC,CAAC,gBAAgB,EAAE,CAAC;IACpE,IAAI,CAAC,sBAAa,CAAC,CAAC,SAAS,CAAC,qBAAY,CAAC,CAAC;AAC9C,CAAC;AARD,wDAQC;AAEY,QAAA,YAAY,GAAG,sBAAsB,CAAC","file":"rect3d-module.js","sourcesContent":["import { DefaultCanvasRect3dRender } from './rect3d-render';\nimport { GraphicRender, Rect3DRender } from './symbol';\n\nlet loadRect3dModule = false;\nexport function bindRect3dRenderModule({ bind }: { bind: any }) {\n  if (loadRect3dModule) {\n    return;\n  }\n  loadRect3dModule = true;\n  // rect3d 渲染器\n  bind(Rect3DRender).to(DefaultCanvasRect3dRender).inSingletonScope();\n  bind(GraphicRender).toService(Rect3DRender);\n}\n\nexport const rect3dModule = bindRect3dRenderModule;\n"]}