kfb-view 2.3.5 → 2.3.7

package/package.json

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

package/src/components/area/index.js

@@ -153,6 +153,8 @@ export class Area extends ViewerCommon {
     let selectList = [];
     let selectLabel;
     let prevSelectLabel = undefined;
+    const bounds = this.viewport.viewportToImageRectangle(
+      this.viewport.getBounds());
     this.labelList.forEach((item) => {
       if (item.tool === IMAGE) {
         return;
@@ -165,6 +167,8 @@ export class Area extends ViewerCommon {
       if (this.movePoint) {
         return;
       }
+      // 不在可见区域内的标注都过滤掉
+      if (!this.isInCanvas(item.region, bounds)) return false;
       let moveIndex = -1; // 可移动点位置
       let pointList = []; // 可移动点的集合
       const scale = this.getImageZoom(true) / item.scale;
@@ -323,7 +327,7 @@ export class Area extends ViewerCommon {
   onCanvasMove({x, y}) {
     const selectLabel = this.labelList.find(
       ({tool, select}) => tool === RECTANGLE && select);
-    if (selectLabel) {
+    if (selectLabel && !this.movePoint) {
       const region = this.imageToViewerElementRectangle(selectLabel.region);
       if (this.isContainerInRegion({x, y}, {
         ...selectLabel,

package/src/components/tailoring/index.js

@@ -45,7 +45,8 @@ export class Tailoring extends ViewerCommon {
       this.stopTailoring();
     } else {
       this.color = color || '#FFF';
-      this.contents = contents?.length ||
+      this.contents = contents?.length ?
+        contents :
         ['双击区域内表示完成截图', '双击区域外或按ESC表示取消截图'];
       this.change();
     }
@@ -115,7 +116,8 @@ export class Tailoring extends ViewerCommon {
       leftTop.x, leftTop.y - 50);
     ctx.fillText(this.contents?.[0] ?? `双击区域内表示完成截图`, leftTop.x,
       leftTop.y - 30);
-    ctx.fillText(this.contents?.[1] ?? `双击区域外或按ESC表示取消截图`, leftTop.x,
+    ctx.fillText(this.contents?.[1] ?? `双击区域外或按ESC表示取消截图`,
+      leftTop.x,
       leftTop.y - 10);
     ctx.stroke();
   }