kfb-view 3.1.3 → 3.1.5

package/package.json

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

package/src/components/common/common.js

@@ -369,7 +369,9 @@ export class ViewerCommon extends EventEmitter {
     const ctx = this.canvas.getContext('2d');
     ctx.beginPath();
     ctx.font = `${size}px Arial`;
-    return ctx.measureText(text).width;
+    const texts = text.split('\n');
+    const maxText = texts.sort((a, b) => a.length > b.length ? -1 : 1)[0];
+    return ctx.measureText(maxText).width;
   }
 
   /**

package/src/components/tailoring/index.js

@@ -33,6 +33,7 @@ export class Tailoring extends ViewerCommon {
       suffix: 'jpeg',
       quality: 0.92,
       resolution: 1200,
+      shape: true,
       ...this.options,
     };
   }
@@ -331,7 +332,7 @@ export class Tailoring extends ViewerCommon {
       copyCtx.fillRect(0, 0, copyCanvas.width, copyCanvas.height);
       copyCtx.putImageData(imageData, 0, 0, 0, 0, disWidth, disHeight);
       const shapeCanvas = this.kv.shape?.canvas;
-      if (shapeCanvas) {
+      if (shapeCanvas && this.options.shape) {
         copyCtx.drawImage(shapeCanvas, startPoint.x * radioX,
           startPoint.y * radioY, disWidth, disHeight, 0, 0, disWidth,
           disHeight);

package/src/tool/Font.js

@@ -30,7 +30,10 @@ class Font extends Brush {
     ctx.rotate(angle / 180 * Math.PI);
     ctx.scale(scale, scale);
     ctx.font = `${this.options.fontSize}px Arial`;
-    ctx.fillText(text, 0, 0);
+    const texts = text.split('\n');
+    texts.forEach((v, index) => {
+      ctx.fillText(v, 0, 0 + index * this.options.fontSize);
+    });
     ctx.restore();
   }
 }