kfb-view 2.3.3 → 2.3.5

package/package.json

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

package/src/components/area/index.js

@@ -585,7 +585,6 @@ export class Area extends ViewerCommon {
       }, position === 4);
       this.drawPoint(points[1], position === 7);
     } else if (type === RECTANGLE) {
-      console.log(12);
       const sp = {
         x: points[0].x < points[1].x ? points[0].x : points[1].x,
         y: points[0].y < points[1].y ? points[0].y : points[1].y,

package/src/components/tailoring/index.js

@@ -27,9 +27,10 @@ export class Tailoring extends ViewerCommon {
     this.tailoringPoints = [];
     this.movePointIndex = -1;
     this.color = '#FFF';
+    this.contents = [];
   }
 
-  init({width, height, left, top, color, now = false}) {
+  init({width, height, left, top, color, now = false, contents = []}) {
     this.isInTailoring = true;
     this.movePointIndex = -1;
     const pointList = getRectPoint({x: left, y: top},
@@ -44,6 +45,8 @@ export class Tailoring extends ViewerCommon {
       this.stopTailoring();
     } else {
       this.color = color || '#FFF';
+      this.contents = contents?.length ||
+        ['双击区域内表示完成截图', '双击区域外或按ESC表示取消截图'];
       this.change();
     }
   }
@@ -107,10 +110,13 @@ export class Tailoring extends ViewerCommon {
     ctx.fillStyle = this.color;
     ctx.font = '18px Arial';
     ctx.fillText(
-      `区域大小为：${rightTop.x - leftTop.x}*${rightBottom.y - rightTop.y}`,
+      this.contents?.[3] ?? (`区域大小为：${rightTop.x -
+      leftTop.x}*${rightBottom.y - rightTop.y}`),
       leftTop.x, leftTop.y - 50);
-    ctx.fillText(`双击区域内表示完成截图`, leftTop.x, leftTop.y - 30);
-    ctx.fillText(`双击区域外或按ESC表示取消截图`, leftTop.x, leftTop.y - 10);
+    ctx.fillText(this.contents?.[0] ?? `双击区域内表示完成截图`, leftTop.x,
+      leftTop.y - 30);
+    ctx.fillText(this.contents?.[1] ?? `双击区域外或按ESC表示取消截图`, leftTop.x,
+      leftTop.y - 10);
     ctx.stroke();
   }
 

package/src/view.js

@@ -412,6 +412,10 @@ function initEvent(kv) {
     element: kv.viewer.canvas,
     moveHandler: function(event) {
       if (isRightDown && kv.board?.isInDraw) {
+        if (event.buttons !== 2) {
+          isRightDown = false;
+          return;
+        }
         console.log('nonprimary drag');
         let delta = event.position.minus(dragPosition);
         dragPosition = event.position.clone();