kfb-view 3.3.6 → 3.3.8

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "kfb-view",
   "description": "一个在线kfb的阅片软件",
-  "version": "3.3.6",
+  "version": "3.3.8",
   "author": "qifeng.fan <qifeng.fan@hzztai.com>",
   "license": "MIT",
   "main": "lib/kfb-view.cjs.js",

package/src/components/tailoring/index.js

@@ -45,9 +45,11 @@ export class Tailoring extends ViewerCommon {
          left,
          top,
          color,
-         now = false,
          contents = [],
+         shape = true,
+         now = false,
        }) {
+    this.options.shape = shape;
     this.isInTailoring = true;
     this.movePointIndex = -1;
     const pointList = getRectPoint({x: left, y: top},
@@ -359,6 +361,9 @@ export class Tailoring extends ViewerCommon {
     const radioY = canvasHeight / height;
     const disWidth = Math.abs(endPoint.x - startPoint.x) * radioX;
     const disHeight = Math.abs(endPoint.y - startPoint.y) * radioY;
+    // 与 drawer 不同：标注层 canvas 的 width/height 与视口 CSS 像素一致，不能用 drawer 的 radio 做源矩形
+    const shapeSrcW = Math.abs(endPoint.x - startPoint.x);
+    const shapeSrcH = Math.abs(endPoint.y - startPoint.y);
     if (disWidth.toFixed(5) / 1 === 0 || disHeight.toFixed(5) / 1 === 0) {
       return;
     }
@@ -383,9 +388,8 @@ export class Tailoring extends ViewerCommon {
       copyCtx.putImageData(imageData, 0, 0, 0, 0, disWidth, disHeight);
       const shapeCanvas = this.kv.shape?.canvas;
       if (shapeCanvas && this.options.shape) {
-        copyCtx.drawImage(shapeCanvas, startPoint.x * radioX,
-          startPoint.y * radioY, disWidth, disHeight, 0, 0, disWidth,
-          disHeight);
+        copyCtx.drawImage(shapeCanvas, startPoint.x, startPoint.y, shapeSrcW,
+          shapeSrcH, 0, 0, disWidth, disHeight);
       }
       if (copyCanvas.width > this.options.resolution) {
         const maxCanvas = document.createElement('canvas');