kfb-view 3.2.7 → 3.2.8

package/package.json

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

package/src/components/tailoring/index.js

@@ -137,17 +137,27 @@ export class Tailoring extends ViewerCommon {
     ctx.stroke();
     ctx.beginPath();
     ctx.fillStyle = '#000000';
-    ctx.rect(rightTop.x + 4, rightTop.y, 100, 40);
+    let areaInterval = 4;
+    let areaDist = 100;
+    if (rightTop.x + areaDist + areaInterval > this.canvas.width) {
+      areaDist = -100;
+      areaInterval = -4;
+    }
+    ctx.rect(rightTop.x + areaInterval, rightTop.y, areaDist, 40);
     ctx.fill();
     ctx.save();
     ctx.beginPath();
-    ctx.translate(rightTop.x + 54, rightTop.y - 5);
+    ctx.translate(rightTop.x + areaInterval + areaDist / 2, rightTop.y - 5);
     ctx.fillStyle = '#ffffff';
     ctx.drawConfirm();
     ctx.restore();
     ctx.save();
     ctx.beginPath();
-    ctx.translate(rightTop.x + 4, rightTop.y - 5);
+    if (areaDist < 0) {
+      ctx.translate(rightTop.x + areaDist + areaInterval, rightTop.y - 5);
+    } else {
+      ctx.translate(rightTop.x + areaInterval, rightTop.y - 5);
+    }
     ctx.fillStyle = '#ffffff';
     ctx.drawCancel();
     ctx.restore();
@@ -163,8 +173,15 @@ export class Tailoring extends ViewerCommon {
     this.movePointIndex = this.tailoringPoints.findIndex(
       (point) => pointInOtherPoint(point, {x, y}, 30));
     const rightTopPoint = this.tailoringPoints[1];
-    const cancelArea = new Rect(rightTopPoint.x + 14, rightTopPoint.y, 30, 40);
-    const confirmArea = new Rect(rightTopPoint.x + 64, rightTopPoint.y, 30, 40);
+
+    let areaInterval = 4;
+    let areaDist = 100;
+    let cancelArea = new Rect(rightTopPoint.x + 14, rightTopPoint.y, 30, 40);
+    let confirmArea = new Rect(rightTopPoint.x + 64, rightTopPoint.y, 30, 40);
+    if (rightTopPoint.x + areaDist + areaInterval > this.canvas.width) {
+      cancelArea = new Rect(rightTopPoint.x - 94, rightTopPoint.y, 30, 40);
+      confirmArea = new Rect(rightTopPoint.x - 44, rightTopPoint.y, 30, 40);
+    }
     const point = new Point(x, y);
     if (cancelArea.containsPoint(point)) {
       this.stopTailoring();
@@ -257,6 +274,20 @@ export class Tailoring extends ViewerCommon {
         };
         break;
     }
+    this.tailoringPoints.forEach((i) => {
+      if (i.x < 0) {
+        i.x = 0;
+      }
+      if (i.y < 0) {
+        i.y = 0;
+      }
+      if (i.x > this.canvas.width) {
+        i.x = this.canvas.width;
+      }
+      if (i.y > this.canvas.height) {
+        i.y = this.canvas.height;
+      }
+    });
     this.clearCanvas();
     this.drawRect();
     this.drawTailoring();