kfb-view 2.3.2 → 2.3.3

package/package.json

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

package/src/components/area/index.js

@@ -42,6 +42,7 @@ export class Area extends ViewerCommon {
     this.currentPressPoint = undefined;
     this.lastPoint = undefined;
     this.draging = false;
+    this.isHover = false;
     MARKS.forEach((mark) => {
       this[mark] = new Tools[mark];
     });
@@ -323,18 +324,29 @@ export class Area extends ViewerCommon {
     const selectLabel = this.labelList.find(
       ({tool, select}) => tool === RECTANGLE && select);
     if (selectLabel) {
-      const region = selectLabel.region;
-      const startPoint = this.imageToViewerElementCoordinates(region.x,
-        region.y);
-      const endPoint = this.imageToViewerElementCoordinates(
-        region.x + region.width, region.y + region.height);
-      const pointList = getRectPoint(startPoint, endPoint);
-      const moveIndex = pointList.findIndex(
-        (point) => pointInOtherPoint(point, {x, y}));
-      if (moveIndex === 4) {
-        this.drawPoint(pointList[4], !!this.movePoint);
-      } else {
-        this.change();
+      const region = this.imageToViewerElementRectangle(selectLabel.region);
+      if (this.isContainerInRegion({x, y}, {
+        ...selectLabel,
+        region,
+      })) {
+        const startPoint = {
+          x: region.x,
+          y: region.y,
+        };
+        const endPoint = {
+          x: region.x + region.width,
+          y: region.y + region.height,
+        };
+        const pointList = getRectPoint(startPoint, endPoint);
+        const moveIndex = pointList.findIndex(
+          (point) => pointInOtherPoint(point, {x, y}));
+        if (moveIndex === 4) {
+          this.isHover = true;
+          this.drawPoint(pointList[4], !!this.movePoint);
+        } else if (this.isHover) {
+          this.isHover = false;
+          this.change();
+        }
       }
     }
   }
@@ -573,6 +585,7 @@ 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,
@@ -682,7 +695,6 @@ export class Area extends ViewerCommon {
       this[label.tool].drawMeasureInfo.call(this, label,
         this.getMeasureContent(label));
     } else {
-      console.log(1);
       this.labelList.forEach((label) => {
         if (label.show === false) return;
         if (label.select && label.measure) {

package/src/view.js

@@ -411,15 +411,14 @@ function initEvent(kv) {
   new openSeadragon.MouseTracker({
     element: kv.viewer.canvas,
     moveHandler: function(event) {
-      if (kv.area?.onCanvasMove) {
-        kv.area.onCanvasMove(event.position);
-      }
       if (isRightDown && kv.board?.isInDraw) {
         console.log('nonprimary drag');
         let delta = event.position.minus(dragPosition);
         dragPosition = event.position.clone();
         kv.viewer.viewport.panBy(
           kv.viewer.viewport.deltaPointsFromPixels(delta.negate()));
+      } else if (kv.area?.onCanvasMove) {
+        kv.area.onCanvasMove(event.position);
       }
     },
   });