@visactor/vrender-kits 0.22.10 → 0.22.12

package/es/render/contributions/rough/rough-line.js

@@ -2,62 +2,29 @@ var __decorate = this && this.__decorate || function(decorators, target, key, de
     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);
+    };
 };
 
-import { DefaultCanvasLineRender, CustomPath2D, drawSegments, injectable } from "@visactor/vrender-core";
+import { DefaultCanvasLineRender, injectable, inject, LINE_NUMBER_TYPE } from "@visactor/vrender-core";
 
-import rough from "roughjs";
+import { RoughBaseRender } from "./base-render";
 
-import { defaultRouthThemeSpec } from "./config";
-
-let RoughCanvasLineRender = class extends DefaultCanvasLineRender {
-    constructor() {
-        super(...arguments), this.style = "rough";
+let RoughCanvasLineRender = class extends RoughBaseRender {
+    constructor(canvasRenderer) {
+        super(), this.canvasRenderer = canvasRenderer, this.style = "rough", this.type = "line", 
+        this.numberType = LINE_NUMBER_TYPE;
     }
-    drawSegmentItem(context, cache, fill, stroke, fillOpacity, strokeOpacity, attribute, defaultAttribute, clipRange, clipRangeByDimension, offsetX, offsetY, line, fillCb, strokeCb) {
-        if (fillCb || strokeCb) return super.drawSegmentItem(context, cache, fill, stroke, fillOpacity, strokeOpacity, attribute, defaultAttribute, clipRange, clipRangeByDimension, offsetX, offsetY, line, fillCb, strokeCb);
-        context.highPerformanceSave();
-        const canvas = context.canvas.nativeCanvas, rc = rough.canvas(canvas, {}), customPath = new CustomPath2D;
-        drawSegments(context.camera ? context : context.nativeContext, cache, clipRange, clipRangeByDimension, {
-            offsetX: offsetX,
-            offsetY: offsetY
-        });
-        const {maxRandomnessOffset: maxRandomnessOffset = defaultRouthThemeSpec.maxRandomnessOffset, roughness: roughness = defaultRouthThemeSpec.roughness, bowing: bowing = defaultRouthThemeSpec.bowing, curveFitting: curveFitting = defaultRouthThemeSpec.curveFitting, curveTightness: curveTightness = defaultRouthThemeSpec.curveTightness, curveStepCount: curveStepCount = defaultRouthThemeSpec.curveStepCount, fillStyle: fillStyle = defaultRouthThemeSpec.fillStyle, fillWeight: fillWeight = defaultRouthThemeSpec.fillWeight, hachureAngle: hachureAngle = defaultRouthThemeSpec.hachureAngle, hachureGap: hachureGap = defaultRouthThemeSpec.hachureGap, simplification: simplification = defaultRouthThemeSpec.simplification, dashOffset: dashOffset = defaultRouthThemeSpec.dashOffset, dashGap: dashGap = defaultRouthThemeSpec.dashGap, zigzagOffset: zigzagOffset = defaultRouthThemeSpec.zigzagOffset, seed: seed = defaultRouthThemeSpec.seed, fillLineDash: fillLineDash = defaultRouthThemeSpec.fillLineDash, fillLineDashOffset: fillLineDashOffset = defaultRouthThemeSpec.fillLineDashOffset, disableMultiStroke: disableMultiStroke = defaultRouthThemeSpec.disableMultiStroke, disableMultiStrokeFill: disableMultiStrokeFill = defaultRouthThemeSpec.disableMultiStrokeFill, preserveVertices: preserveVertices = defaultRouthThemeSpec.preserveVertices, fixedDecimalPlaceDigits: fixedDecimalPlaceDigits = defaultRouthThemeSpec.fixedDecimalPlaceDigits} = attribute;
-        let {fill: fillColor, stroke: strokeColor, lineWidth: lineWidth} = attribute;
-        return Array.isArray(defaultAttribute) ? defaultAttribute.forEach((item => {
-            fillColor = null != fillColor ? fillColor : item.fill, strokeColor = null != strokeColor ? strokeColor : item.stroke, 
-            lineWidth = null != lineWidth ? lineWidth : item.lineWidth;
-        })) : (fillColor = null != fillColor ? fillColor : defaultAttribute.fill, strokeColor = null != strokeColor ? strokeColor : defaultAttribute.stroke, 
-        lineWidth = null != lineWidth ? lineWidth : defaultAttribute.lineWidth), rc.path(customPath.toString(), {
-            fill: fill ? fillColor : void 0,
-            stroke: stroke ? strokeColor : void 0,
-            strokeWidth: lineWidth,
-            maxRandomnessOffset: maxRandomnessOffset,
-            roughness: roughness,
-            bowing: bowing,
-            curveFitting: curveFitting,
-            curveTightness: curveTightness,
-            curveStepCount: curveStepCount,
-            fillStyle: fillStyle,
-            fillWeight: fillWeight,
-            hachureAngle: hachureAngle,
-            hachureGap: hachureGap,
-            simplification: simplification,
-            dashOffset: dashOffset,
-            dashGap: dashGap,
-            zigzagOffset: zigzagOffset,
-            seed: seed,
-            fillLineDash: fillLineDash,
-            fillLineDashOffset: fillLineDashOffset,
-            disableMultiStroke: disableMultiStroke,
-            disableMultiStrokeFill: disableMultiStrokeFill,
-            preserveVertices: preserveVertices,
-            fixedDecimalPlaceDigits: fixedDecimalPlaceDigits
-        }), context.highPerformanceRestore(), !1;
+    draw(line, renderService, drawContext, params) {
+        this.doDraw(line, renderService, drawContext, params);
     }
 };
 
-RoughCanvasLineRender = __decorate([ injectable() ], RoughCanvasLineRender);
+RoughCanvasLineRender = __decorate([ injectable(), __param(0, inject(DefaultCanvasLineRender)), __metadata("design:paramtypes", [ Object ]) ], RoughCanvasLineRender);
 
 export { RoughCanvasLineRender };
 //# sourceMappingURL=rough-line.js.map

package/es/render/contributions/rough/rough-line.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/render/contributions/rough/rough-line.ts"],"names":[],"mappings":"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","file":"rough-line.js","sourcesContent":["import type {\n  IGraphicRender,\n  IContext2d,\n  IMarkAttribute,\n  IThemeAttribute,\n  IGraphicAttribute,\n  ISegPath2D,\n  ILine,\n  ILineGraphicAttribute,\n  IClipRangeByDimensionType\n} from '@visactor/vrender-core';\nimport {\n  IRenderService,\n  IGraphic,\n  DefaultCanvasLineRender,\n  getTheme,\n  CustomPath2D,\n  drawSegments,\n  injectable\n} from '@visactor/vrender-core';\nimport rough from 'roughjs';\nimport { defaultRouthThemeSpec } from './config';\n\n@injectable()\nexport class RoughCanvasLineRender extends DefaultCanvasLineRender implements IGraphicRender {\n  declare type: 'line';\n  declare numberType: number;\n  style: 'rough' = 'rough';\n\n  /**\n   * 绘制segment\n   * @param context\n   * @param cache\n   * @param fill\n   * @param stroke\n   * @param attribute\n   * @param defaultAttribute\n   * @param clipRange\n   * @param offsetX\n   * @param offsetY\n   * @param fillCb\n   * @param strokeCb\n   * @returns 返回true代表跳过后续绘制\n   */\n  protected drawSegmentItem(\n    context: IContext2d,\n    cache: ISegPath2D,\n    fill: boolean,\n    stroke: boolean,\n    fillOpacity: number,\n    strokeOpacity: number,\n    attribute: Partial<ILineGraphicAttribute>,\n    defaultAttribute: Required<ILineGraphicAttribute> | Partial<ILineGraphicAttribute>[],\n    clipRange: number,\n    clipRangeByDimension: IClipRangeByDimensionType,\n    offsetX: number,\n    offsetY: number,\n    line: ILine,\n    fillCb?: (\n      ctx: IContext2d,\n      lineAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n      themeAttribute: IThemeAttribute | IThemeAttribute[]\n    ) => boolean,\n    strokeCb?: (\n      ctx: IContext2d,\n      lineAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n      themeAttribute: IThemeAttribute | IThemeAttribute[]\n    ) => boolean\n  ): boolean {\n    if (fillCb || strokeCb) {\n      return super.drawSegmentItem(\n        context,\n        cache,\n        fill,\n        stroke,\n        fillOpacity,\n        strokeOpacity,\n        attribute,\n        defaultAttribute,\n        clipRange,\n        clipRangeByDimension,\n        offsetX,\n        offsetY,\n        line,\n        fillCb,\n        strokeCb\n      );\n    }\n    context.highPerformanceSave();\n    // 获取到原生canvas\n    const canvas = context.canvas.nativeCanvas;\n    const rc = rough.canvas(canvas, {});\n\n    const customPath = new CustomPath2D();\n\n    drawSegments(context.camera ? context : context.nativeContext, cache, clipRange, clipRangeByDimension, {\n      offsetX,\n      offsetY\n    });\n    const {\n      maxRandomnessOffset = defaultRouthThemeSpec.maxRandomnessOffset,\n      roughness = defaultRouthThemeSpec.roughness,\n      bowing = defaultRouthThemeSpec.bowing,\n      curveFitting = defaultRouthThemeSpec.curveFitting,\n      curveTightness = defaultRouthThemeSpec.curveTightness,\n      curveStepCount = defaultRouthThemeSpec.curveStepCount,\n      fillStyle = defaultRouthThemeSpec.fillStyle,\n      fillWeight = defaultRouthThemeSpec.fillWeight,\n      hachureAngle = defaultRouthThemeSpec.hachureAngle,\n      hachureGap = defaultRouthThemeSpec.hachureGap,\n      simplification = defaultRouthThemeSpec.simplification,\n      dashOffset = defaultRouthThemeSpec.dashOffset,\n      dashGap = defaultRouthThemeSpec.dashGap,\n      zigzagOffset = defaultRouthThemeSpec.zigzagOffset,\n      seed = defaultRouthThemeSpec.seed,\n      fillLineDash = defaultRouthThemeSpec.fillLineDash,\n      fillLineDashOffset = defaultRouthThemeSpec.fillLineDashOffset,\n      disableMultiStroke = defaultRouthThemeSpec.disableMultiStroke,\n      disableMultiStrokeFill = defaultRouthThemeSpec.disableMultiStrokeFill,\n      preserveVertices = defaultRouthThemeSpec.preserveVertices,\n      fixedDecimalPlaceDigits = defaultRouthThemeSpec.fixedDecimalPlaceDigits\n    } = attribute as any;\n\n    let { fill: fillColor, stroke: strokeColor, lineWidth } = attribute;\n\n    if (Array.isArray(defaultAttribute)) {\n      defaultAttribute.forEach(item => {\n        fillColor = fillColor ?? item.fill;\n        strokeColor = strokeColor ?? item.stroke;\n        lineWidth = lineWidth ?? item.lineWidth;\n      });\n    } else {\n      fillColor = fillColor ?? defaultAttribute.fill;\n      strokeColor = strokeColor ?? defaultAttribute.stroke;\n      lineWidth = lineWidth ?? defaultAttribute.lineWidth;\n    }\n\n    rc.path(customPath.toString(), {\n      fill: fill ? (fillColor as string) : undefined,\n      stroke: stroke ? (strokeColor as string) : undefined,\n      strokeWidth: lineWidth,\n      maxRandomnessOffset,\n      roughness,\n      bowing,\n      curveFitting,\n      curveTightness,\n      curveStepCount,\n      fillStyle,\n      fillWeight,\n      hachureAngle,\n      hachureGap,\n      simplification,\n      dashOffset,\n      dashGap,\n      zigzagOffset,\n      seed,\n      fillLineDash,\n      fillLineDashOffset,\n      disableMultiStroke,\n      disableMultiStrokeFill,\n      preserveVertices,\n      fixedDecimalPlaceDigits\n    });\n\n    context.highPerformanceRestore();\n\n    return false;\n  }\n}\n"]}
+{"version":3,"sources":["../src/render/contributions/rough/rough-line.ts"],"names":[],"mappings":";;;;;;;;;;;;AAcA,OAAO,EAAE,uBAAuB,EAAE,UAAU,EAAE,MAAM,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AACvG,OAAO,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AAGzC,IAAM,qBAAqB,GAA3B,MAAM,qBAAsB,SAAQ,eAAe;IAKxD,YAEkB,cAA8B;QAE9C,KAAK,EAAE,CAAC;QAFQ,mBAAc,GAAd,cAAc,CAAgB;QAJhD,UAAK,GAAY,OAAO,CAAC;QAOvB,IAAI,CAAC,IAAI,GAAG,MAAM,CAAC;QACnB,IAAI,CAAC,UAAU,GAAG,gBAAgB,CAAC;IACrC,CAAC;IAED,IAAI,CAAC,IAAW,EAAE,aAA6B,EAAE,WAAyB,EAAE,MAAiC;QAC3G,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,CAAC,CAAC;IACxD,CAAC;CACF,CAAA;AAjBY,qBAAqB;IADjC,UAAU,EAAE;IAOR,WAAA,MAAM,CAAC,uBAAuB,CAAC,CAAA;;GANvB,qBAAqB,CAiBjC;SAjBY,qBAAqB","file":"rough-line.js","sourcesContent":["import type {\n  IGraphicRender,\n  IContext2d,\n  IMarkAttribute,\n  IThemeAttribute,\n  IGraphicAttribute,\n  ISegPath2D,\n  ILine,\n  ILineGraphicAttribute,\n  IClipRangeByDimensionType,\n  IDrawContext,\n  IGraphicRenderDrawParams,\n  IRenderService\n} from '@visactor/vrender-core';\nimport { DefaultCanvasLineRender, injectable, inject, LINE_NUMBER_TYPE } from '@visactor/vrender-core';\nimport { RoughBaseRender } from './base-render';\n\n@injectable()\nexport class RoughCanvasLineRender extends RoughBaseRender implements IGraphicRender {\n  declare type: 'line';\n  declare numberType: number;\n  style: 'rough' = 'rough';\n\n  constructor(\n    @inject(DefaultCanvasLineRender)\n    public readonly canvasRenderer: IGraphicRender\n  ) {\n    super();\n    this.type = 'line';\n    this.numberType = LINE_NUMBER_TYPE;\n  }\n\n  draw(line: ILine, renderService: IRenderService, drawContext: IDrawContext, params?: IGraphicRenderDrawParams) {\n    this.doDraw(line, renderService, drawContext, params);\n  }\n}\n"]}

package/es/render/contributions/rough/rough-rect.d.ts

@@ -1,4 +1,4 @@
-import type { IGraphicRender, IRenderService, IRect, IDrawContext, IGraphicRenderDrawParams } from '@visactor/vrender-core';
+import { type IGraphicRender, type IRenderService, type IRect, type IDrawContext, type IGraphicRenderDrawParams } from '@visactor/vrender-core';
 import { RoughBaseRender } from './base-render';
 export declare class RoughCanvasRectRender extends RoughBaseRender implements IGraphicRender {
     readonly canvasRenderer: IGraphicRender;

package/es/render/contributions/rough/rough-rect.js

@@ -12,10 +12,6 @@ var __decorate = this && this.__decorate || function(decorators, target, key, de
 
 import { RECT_NUMBER_TYPE, DefaultCanvasRectRender, inject, injectable } from "@visactor/vrender-core";
 
-import rough from "roughjs";
-
-import { defaultRouthThemeSpec } from "./config";
-
 import { RoughBaseRender } from "./base-render";
 
 let RoughCanvasRectRender = class extends RoughBaseRender {
@@ -24,45 +20,7 @@ let RoughCanvasRectRender = class extends RoughBaseRender {
         this.numberType = RECT_NUMBER_TYPE;
     }
     draw(rect, renderService, drawContext, params) {
-        const {context: context} = drawContext;
-        if (!context) return;
-        const canvas = context.canvas.nativeCanvas, rc = rough.canvas(canvas);
-        context.highPerformanceSave();
-        const rectAttribute = rect.getGraphicTheme();
-        let {x: x = rectAttribute.x, y: y = rectAttribute.y} = rect.attribute;
-        if (rect.transMatrix.onlyTranslate()) {
-            const {dx: dx = rectAttribute.dx, dy: dy = rectAttribute.dy} = rect.attribute;
-            x += dx, y += dy, context.setTransformForCurrent();
-        } else x = 0, y = 0, context.transformFromMatrix(rect.transMatrix, !0);
-        const {fill: fill = rectAttribute.fill, stroke: stroke = rectAttribute.stroke, fillColor: fillColor = rectAttribute.fill, strokeColor: strokeColor = rectAttribute.stroke, x1: x1, y1: y1, lineWidth: lineWidth = rectAttribute.lineWidth, maxRandomnessOffset: maxRandomnessOffset = defaultRouthThemeSpec.maxRandomnessOffset, roughness: roughness = defaultRouthThemeSpec.roughness, bowing: bowing = defaultRouthThemeSpec.bowing, curveFitting: curveFitting = defaultRouthThemeSpec.curveFitting, curveTightness: curveTightness = defaultRouthThemeSpec.curveTightness, curveStepCount: curveStepCount = defaultRouthThemeSpec.curveStepCount, fillStyle: fillStyle = defaultRouthThemeSpec.fillStyle, fillWeight: fillWeight = defaultRouthThemeSpec.fillWeight, hachureAngle: hachureAngle = defaultRouthThemeSpec.hachureAngle, hachureGap: hachureGap = defaultRouthThemeSpec.hachureGap, simplification: simplification = defaultRouthThemeSpec.simplification, dashOffset: dashOffset = defaultRouthThemeSpec.dashOffset, dashGap: dashGap = defaultRouthThemeSpec.dashGap, zigzagOffset: zigzagOffset = defaultRouthThemeSpec.zigzagOffset, seed: seed = defaultRouthThemeSpec.seed, fillLineDash: fillLineDash = defaultRouthThemeSpec.fillLineDash, fillLineDashOffset: fillLineDashOffset = defaultRouthThemeSpec.fillLineDashOffset, disableMultiStroke: disableMultiStroke = defaultRouthThemeSpec.disableMultiStroke, disableMultiStrokeFill: disableMultiStrokeFill = defaultRouthThemeSpec.disableMultiStrokeFill, preserveVertices: preserveVertices = defaultRouthThemeSpec.preserveVertices, fixedDecimalPlaceDigits: fixedDecimalPlaceDigits = defaultRouthThemeSpec.fixedDecimalPlaceDigits} = rect.attribute;
-        let {width: width = rectAttribute.width, height: height = rectAttribute.height} = rect.attribute;
-        width = (null != width ? width : x1 - x) || 0, height = (null != height ? height : y1 - y) || 0, 
-        rc.rectangle(x, y, width, height, {
-            fill: fill ? fillColor : void 0,
-            stroke: stroke ? strokeColor : void 0,
-            strokeWidth: lineWidth,
-            maxRandomnessOffset: maxRandomnessOffset,
-            roughness: roughness,
-            bowing: bowing,
-            curveFitting: curveFitting,
-            curveTightness: curveTightness,
-            curveStepCount: curveStepCount,
-            fillStyle: fillStyle,
-            fillWeight: fillWeight,
-            hachureAngle: hachureAngle,
-            hachureGap: hachureGap,
-            simplification: simplification,
-            dashOffset: dashOffset,
-            dashGap: dashGap,
-            zigzagOffset: zigzagOffset,
-            seed: seed,
-            fillLineDash: fillLineDash,
-            fillLineDashOffset: fillLineDashOffset,
-            disableMultiStroke: disableMultiStroke,
-            disableMultiStrokeFill: disableMultiStrokeFill,
-            preserveVertices: preserveVertices,
-            fixedDecimalPlaceDigits: fixedDecimalPlaceDigits
-        }), context.highPerformanceRestore();
+        this.doDraw(rect, renderService, drawContext, params);
     }
 };
 

package/es/render/contributions/rough/rough-rect.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/render/contributions/rough/rough-rect.ts"],"names":[],"mappings":"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","file":"rough-rect.js","sourcesContent":["import type {\n  IGraphicRender,\n  IRenderService,\n  IRect,\n  IDrawContext,\n  IGraphicRenderDrawParams\n} from '@visactor/vrender-core';\nimport { RECT_NUMBER_TYPE, DefaultCanvasRectRender, getTheme, inject, injectable } from '@visactor/vrender-core';\nimport rough from 'roughjs';\nimport { defaultRouthThemeSpec } from './config';\nimport { RoughBaseRender } from './base-render';\n\n@injectable()\nexport class RoughCanvasRectRender extends RoughBaseRender implements IGraphicRender {\n  type: 'rect';\n  numberType: number;\n  style: 'rough' = 'rough';\n\n  constructor(\n    @inject(DefaultCanvasRectRender)\n    public readonly canvasRenderer: IGraphicRender\n  ) {\n    super();\n    this.type = 'rect';\n    this.numberType = RECT_NUMBER_TYPE;\n  }\n\n  draw(rect: IRect, renderService: IRenderService, drawContext: IDrawContext, params?: IGraphicRenderDrawParams) {\n    const { context } = drawContext;\n    if (!context) {\n      return;\n    }\n    // 获取到原生canvas\n    const canvas = context.canvas.nativeCanvas;\n    const rc = rough.canvas(canvas);\n\n    context.highPerformanceSave();\n\n    // const rectAttribute = graphicService.themeService.getCurrentTheme().rectAttribute;\n    const rectAttribute = rect.getGraphicTheme();\n    let { x = rectAttribute.x, y = rectAttribute.y } = rect.attribute;\n    if (!rect.transMatrix.onlyTranslate()) {\n      // 性能较差\n      x = 0;\n      y = 0;\n      context.transformFromMatrix(rect.transMatrix, true);\n    } else {\n      const { dx = rectAttribute.dx, dy = rectAttribute.dy } = rect.attribute;\n      x += dx;\n      y += dy;\n      // 当前context有rotate/scale，重置matrix\n      context.setTransformForCurrent();\n    }\n\n    const {\n      fill = rectAttribute.fill,\n      stroke = rectAttribute.stroke,\n      fillColor = rectAttribute.fill,\n      strokeColor = rectAttribute.stroke,\n      x1,\n      y1,\n      lineWidth = rectAttribute.lineWidth,\n      maxRandomnessOffset = defaultRouthThemeSpec.maxRandomnessOffset,\n      roughness = defaultRouthThemeSpec.roughness,\n      bowing = defaultRouthThemeSpec.bowing,\n      curveFitting = defaultRouthThemeSpec.curveFitting,\n      curveTightness = defaultRouthThemeSpec.curveTightness,\n      curveStepCount = defaultRouthThemeSpec.curveStepCount,\n      fillStyle = defaultRouthThemeSpec.fillStyle,\n      fillWeight = defaultRouthThemeSpec.fillWeight,\n      hachureAngle = defaultRouthThemeSpec.hachureAngle,\n      hachureGap = defaultRouthThemeSpec.hachureGap,\n      simplification = defaultRouthThemeSpec.simplification,\n      dashOffset = defaultRouthThemeSpec.dashOffset,\n      dashGap = defaultRouthThemeSpec.dashGap,\n      zigzagOffset = defaultRouthThemeSpec.zigzagOffset,\n      seed = defaultRouthThemeSpec.seed,\n      fillLineDash = defaultRouthThemeSpec.fillLineDash,\n      fillLineDashOffset = defaultRouthThemeSpec.fillLineDashOffset,\n      disableMultiStroke = defaultRouthThemeSpec.disableMultiStroke,\n      disableMultiStrokeFill = defaultRouthThemeSpec.disableMultiStrokeFill,\n      preserveVertices = defaultRouthThemeSpec.preserveVertices,\n      fixedDecimalPlaceDigits = defaultRouthThemeSpec.fixedDecimalPlaceDigits\n    } = rect.attribute as any;\n\n    let { width = rectAttribute.width, height = rectAttribute.height } = rect.attribute;\n\n    width = (width ?? x1 - x) || 0;\n    height = (height ?? y1 - y) || 0;\n\n    rc.rectangle(x, y, width, height, {\n      fill: fill ? (fillColor as string) : undefined,\n      stroke: stroke ? (strokeColor as string) : undefined,\n      strokeWidth: lineWidth,\n      maxRandomnessOffset,\n      roughness,\n      bowing,\n      curveFitting,\n      curveTightness,\n      curveStepCount,\n      fillStyle,\n      fillWeight,\n      hachureAngle,\n      hachureGap,\n      simplification,\n      dashOffset,\n      dashGap,\n      zigzagOffset,\n      seed,\n      fillLineDash,\n      fillLineDashOffset,\n      disableMultiStroke,\n      disableMultiStrokeFill,\n      preserveVertices,\n      fixedDecimalPlaceDigits\n    });\n\n    context.highPerformanceRestore();\n  }\n}\n"]}
+{"version":3,"sources":["../src/render/contributions/rough/rough-rect.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,OAAO,EAML,gBAAgB,EAChB,uBAAuB,EACvB,MAAM,EACN,UAAU,EAEX,MAAM,wBAAwB,CAAC;AAIhC,OAAO,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AAIzC,IAAM,qBAAqB,GAA3B,MAAM,qBAAsB,SAAQ,eAAe;IAKxD,YAEkB,cAA8B;QAE9C,KAAK,EAAE,CAAC;QAFQ,mBAAc,GAAd,cAAc,CAAgB;QAJhD,UAAK,GAAY,OAAO,CAAC;QAOvB,IAAI,CAAC,IAAI,GAAG,MAAM,CAAC;QACnB,IAAI,CAAC,UAAU,GAAG,gBAAgB,CAAC;IACrC,CAAC;IAED,IAAI,CAAC,IAAW,EAAE,aAA6B,EAAE,WAAyB,EAAE,MAAiC;QAC3G,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,CAAC,CAAC;IACxD,CAAC;CACF,CAAA;AAjBY,qBAAqB;IADjC,UAAU,EAAE;IAOR,WAAA,MAAM,CAAC,uBAAuB,CAAC,CAAA;;GANvB,qBAAqB,CAiBjC;SAjBY,qBAAqB","file":"rough-rect.js","sourcesContent":["import {\n  type IGraphicRender,\n  type IRenderService,\n  type IRect,\n  type IDrawContext,\n  type IGraphicRenderDrawParams,\n  RECT_NUMBER_TYPE,\n  DefaultCanvasRectRender,\n  inject,\n  injectable,\n  CustomPath2D\n} from '@visactor/vrender-core';\n\nimport rough from 'roughjs';\nimport { defaultRouthThemeSpec } from './config';\nimport { RoughBaseRender } from './base-render';\nimport { RoughContext2d } from './context';\n\n@injectable()\nexport class RoughCanvasRectRender extends RoughBaseRender implements IGraphicRender {\n  type: 'rect';\n  numberType: number;\n  style: 'rough' = 'rough';\n\n  constructor(\n    @inject(DefaultCanvasRectRender)\n    public readonly canvasRenderer: IGraphicRender\n  ) {\n    super();\n    this.type = 'rect';\n    this.numberType = RECT_NUMBER_TYPE;\n  }\n\n  draw(rect: IRect, renderService: IRenderService, drawContext: IDrawContext, params?: IGraphicRenderDrawParams) {\n    this.doDraw(rect, renderService, drawContext, params);\n  }\n}\n"]}

package/es/render/contributions/rough/rough-symbol.d.ts

@@ -1,11 +1,10 @@
-import type { IGraphicRender, IRenderService, ISymbol, IGraphicAttribute, IContext2d, IGraphic, IMarkAttribute, IThemeAttribute, IDrawContext, IGraphicRenderDrawParams } from '@visactor/vrender-core';
-import { BaseRender } from '@visactor/vrender-core';
-export declare class RoughCanvasSymbolRender extends BaseRender<ISymbol> implements IGraphicRender {
+import type { IGraphicRender, IRenderService, ISymbol, IDrawContext, IGraphicRenderDrawParams } from '@visactor/vrender-core';
+import { RoughBaseRender } from './base-render';
+export declare class RoughCanvasSymbolRender extends RoughBaseRender implements IGraphicRender {
     readonly canvasRenderer: IGraphicRender;
     type: 'symbol';
     numberType: number;
     style: 'rough';
     constructor(canvasRenderer: IGraphicRender);
     draw(symbol: ISymbol, renderService: IRenderService, drawContext: IDrawContext, params?: IGraphicRenderDrawParams): void;
-    drawShape(graphic: IGraphic, ctx: 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;
 }

package/es/render/contributions/rough/rough-symbol.js

@@ -10,59 +10,17 @@ var __decorate = this && this.__decorate || function(decorators, target, key, de
     };
 };
 
-import { SYMBOL_NUMBER_TYPE, DefaultCanvasSymbolRender, BaseRender, CustomPath2D, inject, injectable } from "@visactor/vrender-core";
+import { SYMBOL_NUMBER_TYPE, DefaultCanvasSymbolRender, inject, injectable } from "@visactor/vrender-core";
 
-import rough from "roughjs";
+import { RoughBaseRender } from "./base-render";
 
-import { defaultRouthThemeSpec } from "./config";
-
-let RoughCanvasSymbolRender = class extends BaseRender {
+let RoughCanvasSymbolRender = class extends RoughBaseRender {
     constructor(canvasRenderer) {
         super(), this.canvasRenderer = canvasRenderer, this.type = "symbol", this.numberType = SYMBOL_NUMBER_TYPE, 
         this.style = "rough";
     }
     draw(symbol, renderService, drawContext, params) {
-        const {context: context} = drawContext;
-        if (!context) return;
-        const canvas = context.canvas.nativeCanvas, rc = rough.canvas(canvas);
-        context.highPerformanceSave();
-        const symbolAttribute = symbol.getGraphicTheme(), data = this.transform(symbol, symbolAttribute, context), {x: x, y: y, z: z, lastModelMatrix: lastModelMatrix} = data, parsedPath = symbol.getParsedPath();
-        if (!parsedPath) return;
-        const {fill: fill = symbolAttribute.fill, stroke: stroke = symbolAttribute.stroke, fillColor: fillColor = symbolAttribute.fill, strokeColor: strokeColor = symbolAttribute.stroke, size: size = symbolAttribute.size, lineWidth: lineWidth = symbolAttribute.lineWidth, maxRandomnessOffset: maxRandomnessOffset = defaultRouthThemeSpec.maxRandomnessOffset, roughness: roughness = defaultRouthThemeSpec.roughness, bowing: bowing = defaultRouthThemeSpec.bowing, curveFitting: curveFitting = defaultRouthThemeSpec.curveFitting, curveTightness: curveTightness = defaultRouthThemeSpec.curveTightness, curveStepCount: curveStepCount = defaultRouthThemeSpec.curveStepCount, fillStyle: fillStyle = defaultRouthThemeSpec.fillStyle, fillWeight: fillWeight = defaultRouthThemeSpec.fillWeight, hachureAngle: hachureAngle = defaultRouthThemeSpec.hachureAngle, hachureGap: hachureGap = defaultRouthThemeSpec.hachureGap, simplification: simplification = defaultRouthThemeSpec.simplification, dashOffset: dashOffset = defaultRouthThemeSpec.dashOffset, dashGap: dashGap = defaultRouthThemeSpec.dashGap, zigzagOffset: zigzagOffset = defaultRouthThemeSpec.zigzagOffset, seed: seed = defaultRouthThemeSpec.seed, fillLineDash: fillLineDash = defaultRouthThemeSpec.fillLineDash, fillLineDashOffset: fillLineDashOffset = defaultRouthThemeSpec.fillLineDashOffset, disableMultiStroke: disableMultiStroke = defaultRouthThemeSpec.disableMultiStroke, disableMultiStrokeFill: disableMultiStrokeFill = defaultRouthThemeSpec.disableMultiStrokeFill, preserveVertices: preserveVertices = defaultRouthThemeSpec.preserveVertices, fixedDecimalPlaceDigits: fixedDecimalPlaceDigits = defaultRouthThemeSpec.fixedDecimalPlaceDigits} = symbol.attribute;
-        let svgPath = "";
-        if (parsedPath.drawToSvgPath) svgPath = parsedPath.drawToSvgPath(size, x, y); else {
-            const customPath = new CustomPath2D;
-            parsedPath.draw(customPath, size, x, y) && customPath.closePath(), svgPath = customPath.toString();
-        }
-        rc.path(svgPath, {
-            fill: fill ? fillColor : void 0,
-            stroke: stroke ? strokeColor : void 0,
-            strokeWidth: lineWidth,
-            maxRandomnessOffset: maxRandomnessOffset,
-            roughness: roughness,
-            bowing: bowing,
-            curveFitting: curveFitting,
-            curveTightness: curveTightness,
-            curveStepCount: curveStepCount,
-            fillStyle: fillStyle,
-            fillWeight: fillWeight,
-            hachureAngle: hachureAngle,
-            hachureGap: hachureGap,
-            simplification: simplification,
-            dashOffset: dashOffset,
-            dashGap: dashGap,
-            zigzagOffset: zigzagOffset,
-            seed: seed,
-            fillLineDash: fillLineDash,
-            fillLineDashOffset: fillLineDashOffset,
-            disableMultiStroke: disableMultiStroke,
-            disableMultiStrokeFill: disableMultiStrokeFill,
-            preserveVertices: preserveVertices,
-            fixedDecimalPlaceDigits: fixedDecimalPlaceDigits
-        }), context.highPerformanceRestore();
-    }
-    drawShape(graphic, ctx, x, y, drawContext, params, fillCb, strokeCb) {
-        if (this.canvasRenderer.drawShape) return this.canvasRenderer.drawShape(graphic, ctx, x, y, drawContext, params, fillCb, strokeCb);
+        this.doDraw(symbol, renderService, drawContext, params);
     }
 };
 

package/es/render/contributions/rough/rough-symbol.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/render/contributions/rough/rough-symbol.ts"],"names":[],"mappings":"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","file":"rough-symbol.js","sourcesContent":["import type {\n  IGraphicRender,\n  IRenderService,\n  ISymbol,\n  IGraphicAttribute,\n  IContext2d,\n  IGraphic,\n  IMarkAttribute,\n  IThemeAttribute,\n  IDrawContext,\n  IGraphicRenderDrawParams\n} from '@visactor/vrender-core';\nimport {\n  SYMBOL_NUMBER_TYPE,\n  DefaultCanvasSymbolRender,\n  BaseRender,\n  getTheme,\n  CustomPath2D,\n  inject,\n  injectable\n} from '@visactor/vrender-core';\nimport rough from 'roughjs';\nimport { defaultRouthThemeSpec } from './config';\n\n@injectable()\nexport class RoughCanvasSymbolRender extends BaseRender<ISymbol> implements IGraphicRender {\n  type: 'symbol';\n  numberType: number;\n  style: 'rough';\n\n  constructor(\n    @inject(DefaultCanvasSymbolRender)\n    public readonly canvasRenderer: IGraphicRender\n  ) {\n    super();\n    this.type = 'symbol';\n    this.numberType = SYMBOL_NUMBER_TYPE;\n    this.style = 'rough';\n  }\n\n  draw(symbol: ISymbol, renderService: IRenderService, drawContext: IDrawContext, params?: IGraphicRenderDrawParams) {\n    const { context } = drawContext;\n    if (!context) {\n      return;\n    }\n    // 获取到原生canvas\n    const canvas = context.canvas.nativeCanvas;\n    const rc = rough.canvas(canvas);\n\n    context.highPerformanceSave();\n    const symbolAttribute = symbol.getGraphicTheme();\n    const data = this.transform(symbol, symbolAttribute, context);\n    const { x, y, z, lastModelMatrix } = data;\n\n    const parsedPath = symbol.getParsedPath();\n    // todo: 考虑使用path\n    if (!parsedPath) {\n      return;\n    }\n\n    const {\n      fill = symbolAttribute.fill,\n      stroke = symbolAttribute.stroke,\n      fillColor = symbolAttribute.fill,\n      strokeColor = symbolAttribute.stroke,\n      size = symbolAttribute.size,\n      lineWidth = symbolAttribute.lineWidth,\n      maxRandomnessOffset = defaultRouthThemeSpec.maxRandomnessOffset,\n      roughness = defaultRouthThemeSpec.roughness,\n      bowing = defaultRouthThemeSpec.bowing,\n      curveFitting = defaultRouthThemeSpec.curveFitting,\n      curveTightness = defaultRouthThemeSpec.curveTightness,\n      curveStepCount = defaultRouthThemeSpec.curveStepCount,\n      fillStyle = defaultRouthThemeSpec.fillStyle,\n      fillWeight = defaultRouthThemeSpec.fillWeight,\n      hachureAngle = defaultRouthThemeSpec.hachureAngle,\n      hachureGap = defaultRouthThemeSpec.hachureGap,\n      simplification = defaultRouthThemeSpec.simplification,\n      dashOffset = defaultRouthThemeSpec.dashOffset,\n      dashGap = defaultRouthThemeSpec.dashGap,\n      zigzagOffset = defaultRouthThemeSpec.zigzagOffset,\n      seed = defaultRouthThemeSpec.seed,\n      fillLineDash = defaultRouthThemeSpec.fillLineDash,\n      fillLineDashOffset = defaultRouthThemeSpec.fillLineDashOffset,\n      disableMultiStroke = defaultRouthThemeSpec.disableMultiStroke,\n      disableMultiStrokeFill = defaultRouthThemeSpec.disableMultiStrokeFill,\n      preserveVertices = defaultRouthThemeSpec.preserveVertices,\n      fixedDecimalPlaceDigits = defaultRouthThemeSpec.fixedDecimalPlaceDigits\n    } = symbol.attribute as any;\n\n    let svgPath = '';\n    if (parsedPath.drawToSvgPath) {\n      svgPath = parsedPath.drawToSvgPath(size, x, y);\n    } else {\n      const customPath = new CustomPath2D();\n      if (parsedPath.draw(customPath, size, x, y)) {\n        customPath.closePath();\n      }\n      svgPath = customPath.toString();\n    }\n\n    rc.path(svgPath, {\n      fill: fill ? (fillColor as string) : undefined,\n      stroke: stroke ? (strokeColor as string) : undefined,\n      strokeWidth: lineWidth,\n      maxRandomnessOffset,\n      roughness,\n      bowing,\n      curveFitting,\n      curveTightness,\n      curveStepCount,\n      fillStyle,\n      fillWeight,\n      hachureAngle,\n      hachureGap,\n      simplification,\n      dashOffset,\n      dashGap,\n      zigzagOffset,\n      seed,\n      fillLineDash,\n      fillLineDashOffset,\n      disableMultiStroke,\n      disableMultiStrokeFill,\n      preserveVertices,\n      fixedDecimalPlaceDigits\n    });\n\n    context.highPerformanceRestore();\n  }\n\n  drawShape(\n    graphic: IGraphic,\n    ctx: 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  ): void {\n    if (this.canvasRenderer.drawShape) {\n      return this.canvasRenderer.drawShape(graphic, ctx, x, y, drawContext, params, fillCb, strokeCb);\n    }\n  }\n}\n"]}
+{"version":3,"sources":["../src/render/contributions/rough/rough-symbol.ts"],"names":[],"mappings":";;;;;;;;;;;;AAYA,OAAO,EACL,kBAAkB,EAClB,yBAAyB,EAIzB,MAAM,EACN,UAAU,EACX,MAAM,wBAAwB,CAAC;AAIhC,OAAO,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AAGzC,IAAM,uBAAuB,GAA7B,MAAM,uBAAwB,SAAQ,eAAe;IAK1D,YAEkB,cAA8B;QAE9C,KAAK,EAAE,CAAC;QAFQ,mBAAc,GAAd,cAAc,CAAgB;QAG9C,IAAI,CAAC,IAAI,GAAG,QAAQ,CAAC;QACrB,IAAI,CAAC,UAAU,GAAG,kBAAkB,CAAC;QACrC,IAAI,CAAC,KAAK,GAAG,OAAO,CAAC;IACvB,CAAC;IAED,IAAI,CAAC,MAAe,EAAE,aAA6B,EAAE,WAAyB,EAAE,MAAiC;QAC/G,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,CAAC,CAAC;IAC1D,CAAC;CACF,CAAA;AAlBY,uBAAuB;IADnC,UAAU,EAAE;IAOR,WAAA,MAAM,CAAC,yBAAyB,CAAC,CAAA;;GANzB,uBAAuB,CAkBnC;SAlBY,uBAAuB","file":"rough-symbol.js","sourcesContent":["import type {\n  IGraphicRender,\n  IRenderService,\n  ISymbol,\n  IGraphicAttribute,\n  IContext2d,\n  IGraphic,\n  IMarkAttribute,\n  IThemeAttribute,\n  IDrawContext,\n  IGraphicRenderDrawParams\n} from '@visactor/vrender-core';\nimport {\n  SYMBOL_NUMBER_TYPE,\n  DefaultCanvasSymbolRender,\n  BaseRender,\n  getTheme,\n  CustomPath2D,\n  inject,\n  injectable\n} from '@visactor/vrender-core';\nimport rough from 'roughjs';\nimport { defaultRouthThemeSpec } from './config';\nimport { RoughContext2d } from './context';\nimport { RoughBaseRender } from './base-render';\n\n@injectable()\nexport class RoughCanvasSymbolRender extends RoughBaseRender implements IGraphicRender {\n  type: 'symbol';\n  numberType: number;\n  style: 'rough';\n\n  constructor(\n    @inject(DefaultCanvasSymbolRender)\n    public readonly canvasRenderer: IGraphicRender\n  ) {\n    super();\n    this.type = 'symbol';\n    this.numberType = SYMBOL_NUMBER_TYPE;\n    this.style = 'rough';\n  }\n\n  draw(symbol: ISymbol, renderService: IRenderService, drawContext: IDrawContext, params?: IGraphicRenderDrawParams) {\n    this.doDraw(symbol, renderService, drawContext, params);\n  }\n}\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@visactor/vrender-kits",
-  "version": "0.22.10",
+  "version": "0.22.12",
   "description": "",
   "sideEffects": false,
   "main": "cjs/index.js",
@@ -12,8 +12,8 @@
     "dist"
   ],
   "dependencies": {
-    "@visactor/vutils": "~0.19.5",
-    "@visactor/vrender-core": "0.22.10",
+    "@visactor/vutils": "1.0.6",
+    "@visactor/vrender-core": "0.22.12",
     "@resvg/resvg-js": "2.4.1",
     "roughjs": "4.5.2",
     "gifuct-js": "2.1.2",
@@ -34,8 +34,8 @@
     "typescript": "4.9.5",
     "cross-env": "^7.0.3",
     "@internal/bundler": "0.0.1",
-    "@internal/eslint-config": "0.0.1",
-    "@internal/ts-config": "0.0.1"
+    "@internal/ts-config": "0.0.1",
+    "@internal/eslint-config": "0.0.1"
   },
   "keywords": [
     "VisActor",