kfb-view 3.0.0-beta3 → 3.0.1

package/package.json

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

package/src/components/board/index.js

@@ -8,7 +8,7 @@ import {
 import {
   EVENT_START_PAINTING,
   EVENT_END_PAINTING,
-  EVENT_IN_PAINTING,
+  EVENT_IN_PAINTING, EVENT_STOP_PAINTING,
 } from '../../const/event';
 import {
   getAngle,
@@ -278,6 +278,7 @@ export class Board extends ViewerCommon {
     // 是否只绘制一次
     if (this[this.tool].options.once) {
       this.endDraw();
+      this.$emit(EVENT_STOP_PAINTING, this.getPaintOptions());
     } else if (this[this.tool].options.clear) { // 是否结束绘画时清空画布
       this.points = [];
       this.clearCanvas();
@@ -323,7 +324,8 @@ export class Board extends ViewerCommon {
    */
   onCanvasKey(e) {
     const {originalEvent} = e;
-    if (originalEvent.key === 'Escape') {
+    if (originalEvent.key === 'Escape' && this.isInDraw) {
+      this.$emit(EVENT_STOP_PAINTING, this.getPaintOptions());
       this.endDraw();
     }
     if (originalEvent.key === 'Delete' || originalEvent.key ===

package/src/components/tailoring/index.js

@@ -21,8 +21,9 @@ export class Tailoring extends ViewerCommon {
    * @param {Object} cache
    * @param {Object} options
    */
-  constructor({viewer, canvas, cache, options}) {
+  constructor({kv, viewer, canvas, cache, options}) {
     super(viewer, canvas, cache, options);
+    this.kv = kv;
     this.isInTailoring = false;
     this.tailoringPoints = [];
     this.movePointIndex = -1;
@@ -289,6 +290,12 @@ export class Tailoring extends ViewerCommon {
       copyCanvas.height = disHeight;
       const copyCtx = copyCanvas.getContext('2d');
       copyCtx.putImageData(imageData, 0, 0, 0, 0, disWidth, disHeight);
+      const shapeCanvas = this.kv.shape?.canvas;
+      if (shapeCanvas) {
+        copyCtx.drawImage(shapeCanvas, startPoint.x * radioX,
+          startPoint.y * radioY, disWidth, disHeight, 0, 0, disWidth,
+          disHeight);
+      }
       return copyCanvas.toDataURL('image/png');
     } catch (e) {
       console.error(e);

package/src/const/event.js

@@ -2,6 +2,7 @@
 export const EVENT_START_PAINTING = 'start-painting';
 export const EVENT_IN_PAINTING = 'in-painting';
 export const EVENT_END_PAINTING = 'end-painting';
+export const EVENT_STOP_PAINTING = 'stop-painting';
 export const EVENT_TAILORING_REGION = 'tailoring-region';
 export const EVENT_TAILORING_SCREENSHOT = 'tailoring-screenshot';
 export const EVENT_AREA_MOVE_START = 'area-move-start';

package/src/plugin/openseadragon/openseadragon.js

@@ -9544,7 +9544,10 @@ function OpenSeadragon(options) {
             } else {
               this.addControl(
                 this.pagingControl,
-                {anchor: this.sequenceControlAnchor || $.ControlAnchor.TOP_LEFT},
+                {
+                  anchor: this.sequenceControlAnchor ||
+                    $.ControlAnchor.TOP_LEFT,
+                },
               );
             }
           }
@@ -24271,7 +24274,8 @@ function OpenSeadragon(options) {
     this.getImage = options.getImage.bind(null, this);
     this.getData = options.getData.bind(null, this);
     this.getRenderedContext = options.getRenderedContext.bind(null, this);
-    this.getCopyRenderedContext = options.getCopyRenderedContext.bind(null, this);
+    this.getCopyRenderedContext = options.getCopyRenderedContext.bind(null,
+      this);
   };
 
   ImageRecord.prototype = {

package/src/view.js

@@ -271,6 +271,7 @@ function initComponentsOptions(kv, type) {
   const config = kv.$options;
   const pxConversion = config.pxConversion || {imageCapRes: 1, unit: ''};
   return {
+    kv,
     viewer: kv.viewer,
     cache: kv.cache,
     canvas: createCanvas(kv),