kfb-view 3.2.2 → 3.2.3

package/package.json

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

package/src/components/area/index.js

@@ -679,33 +679,28 @@ export class Area extends ViewerCommon {
   showLabelMeasure() {
     const bounds = this.viewport.viewportToImageRectangle(
       this.viewport.getBounds());
-    const currentScale = this.getImageZoom(true);
-    if (currentScale * this.options.scale < this.options.measure.scale) {
-      const label = this.labelList.find((item) => item.select);
-      if (!label) return;
+    const currentScale = this.getImageZoom(true) * this.options.scale;
+    this.labelList.forEach((label) => {
       if (label.show === false) return;
+      if (!this.isInCanvas(label.region, bounds)) return;
+      this.labelDrawingFunc(label);
       if (label.measure === false) return;
-      this[label.tool].drawMeasureInfo.call(this, label,
-        this.getMeasureContent(label));
-    } else {
-      this.labelList.forEach((label) => {
-        if (label.show === false) return;
-        if (label.select && label.measure) {
-          this[label.tool].drawMeasureInfo.call(this, label,
-            this.getMeasureContent(label));
-        } else if (this.options.measure.defaultShow && label.measure) {
-          if (!this.isInCanvas(label.region, bounds)) return false;
-          this[label.tool].drawMeasureInfo.call(this, label,
-            this.getMeasureContent(label));
-        }
-        if (this.options.labelDrawing || this.options.label?.drawing) {
-          if (!this.isInCanvas(label.region, bounds)) return false;
-          const drawingFunc = this.options.label?.drawing ||
-            this.options.labelDrawing;
-          drawingFunc(this.canvas, label,
-            this.imageToViewerElementRectangle(label.region));
-        }
-      });
+      if (label.select) {
+        this[label.tool].drawMeasureInfo.call(this, label,
+          this.getMeasureContent(label));
+      } else if (currentScale >= this.options.measure.scale && this.options.measure.defaultShow) {
+        this[label.tool].drawMeasureInfo.call(this, label,
+          this.getMeasureContent(label));
+      }
+    });
+  }
+
+  labelDrawingFunc(label) {
+    if (this.options.labelDrawing || this.options.label?.drawing) {
+      const drawingFunc = this.options.label?.drawing ||
+        this.options.labelDrawing;
+      drawingFunc(this.canvas, label,
+        this.imageToViewerElementRectangle(label.region));
     }
   }