kfb-view 3.0.4 → 3.0.6

package/package.json

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

package/src/components/board/index.js

@@ -277,8 +277,8 @@ export class Board extends ViewerCommon {
     this.$emit(EVENT_END_PAINTING, this.getPaintOptions());
     // 是否只绘制一次
     if (this[this.tool].options.once) {
-      this.endDraw();
       this.$emit(EVENT_STOP_PAINTING, this.getPaintOptions());
+      this.endDraw();
     } else if (this[this.tool].options.clear) { // 是否结束绘画时清空画布
       this.points = [];
       this.clearCanvas();
@@ -376,6 +376,7 @@ export class Board extends ViewerCommon {
   }
 
   getPaintOptions() {
+    console.log(this.tool);
     const form = new LabelModel({
       ...this[this.tool].options,
       points: this.points,

package/src/components/shape/index.js

@@ -168,10 +168,10 @@ export class Shape extends ViewerCommon {
       regionLabelList.forEach((item) => {
         this.combination.setContent(this.canvas, item);
         this.combination.draw({
-          points: item.viewerElementPoints,
+          points: this.imageToViewerElementPoints(item.points),
           tool: item.tool,
-        }, item.child.map(({viewerElementPoints, tool}) => ({
-          points: viewerElementPoints,
+        }, item.child.map(({points, tool}) => ({
+          points: this.imageToViewerElementPoints(points),
           tool,
         })), this.viewport.getRotation());
       });

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();
   }