kfb-view 3.0.3 → 3.0.5

package/package.json

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

package/src/components/navigator/index.js

@@ -325,19 +325,19 @@ export class Navigator extends EventEmitter {
       const imgHeight = img.height;
       let scale = 1;
       if (imgWidth >= imgHeight) {
-        scale = imgHeight / this.height;
-        const trueWidth = imgWidth / scale;
-        canvas.height = this.height;
-        canvas.width = trueWidth;
-        ctx.drawImage(img, 0, 0, trueWidth, canvas.height);
-      }
-      if (imgHeight > imgWidth) {
         scale = imgWidth / this.width;
         const trueHeight = imgHeight / scale;
         canvas.width = this.width;
         canvas.height = trueHeight;
         ctx.drawImage(img, 0, 0, canvas.width, trueHeight);
       }
+      if (imgHeight > imgWidth) {
+        scale = imgHeight / this.height;
+        const trueWidth = imgWidth / scale;
+        canvas.height = this.height;
+        canvas.width = trueWidth;
+        ctx.drawImage(img, 0, 0, trueWidth, canvas.height);
+      }
       this.setViewRect(this.element.getElementsByClassName('view-rect')[0]);
       const colorCanvas = this.element.getElementsByClassName(
         'navigator-color-rect')[0];
@@ -358,14 +358,6 @@ export class Navigator extends EventEmitter {
       const imgHeight = img.height;
       let scale = 1;
       if (imgWidth >= imgHeight) {
-        scale = imgHeight / this.height;
-        const trueWidth = imgWidth / scale;
-        this.canvas.height = this.height;
-        this.canvas.width = trueWidth;
-        ctx.clearRect(0, 0, this.canvas.width, this.canvas.height);
-        ctx.drawImage(img, 0, 0, trueWidth, this.canvas.height);
-      }
-      if (imgHeight > imgWidth) {
         scale = imgWidth / this.width;
         const trueHeight = imgHeight / scale;
         this.canvas.width = this.width;
@@ -373,6 +365,14 @@ export class Navigator extends EventEmitter {
         ctx.clearRect(0, 0, this.canvas.width, this.canvas.height);
         ctx.drawImage(img, 0, 0, this.canvas.width, trueHeight);
       }
+      if (imgHeight > imgWidth) {
+        scale = imgHeight / this.height;
+        const trueWidth = imgWidth / scale;
+        this.canvas.height = this.height;
+        this.canvas.width = trueWidth;
+        ctx.clearRect(0, 0, this.canvas.width, this.canvas.height);
+        ctx.drawImage(img, 0, 0, trueWidth, this.canvas.height);
+      }
       this.setViewRect(this.element.getElementsByClassName('view-rect')[0]);
       const colorCanvas = this.element.getElementsByClassName(
         'navigator-color-rect')[0];

package/src/components/tailoring/index.js

@@ -56,7 +56,15 @@ export class Tailoring extends ViewerCommon {
       pointList[6],
       pointList[8]];
     if (now) {
-      this.$emit(EVENT_TAILORING_SCREENSHOT, this.getScreenCanvasImage());
+      this.emitTailoringRegion();
+      this.$emit(EVENT_TAILORING_SCREENSHOT, {
+        base64: this.getScreenCanvasImage(),
+        region: this.viewerElementToImageRectangle({
+          x: this.tailoringPoints[0].x, y: this.tailoringPoints[0].y,
+          width: this.tailoringPoints[3].x - this.tailoringPoints[0].x,
+          height: this.tailoringPoints[3].y - this.tailoringPoints[0].y,
+        }),
+      });
       this.stopTailoring();
     } else {
       this.color = color || '#FFF';
@@ -253,7 +261,15 @@ export class Tailoring extends ViewerCommon {
 
   onCanvasDblClick(position) {
     if (this.tailoringPoints.length > 0 && this.isPointInMatrix(position)) {
-      this.$emit(EVENT_TAILORING_SCREENSHOT, this.getScreenCanvasImage());
+      this.emitTailoringRegion();
+      this.$emit(EVENT_TAILORING_SCREENSHOT, {
+        base64: this.getScreenCanvasImage(),
+        region: this.viewerElementToImageRectangle({
+          x: this.tailoringPoints[0].x, y: this.tailoringPoints[0].y,
+          width: this.tailoringPoints[3].x - this.tailoringPoints[0].x,
+          height: this.tailoringPoints[3].y - this.tailoringPoints[0].y,
+        }),
+      });
     }
     this.stopTailoring();
   }