kfb-view 2.2.1 → 2.2.4

package/package.json

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

package/src/components/area/index.js

@@ -39,6 +39,7 @@ export class Area extends ViewerCommon {
     super(viewer, canvas, cache, options);
     this.labelList = [];
     this.movePoint = undefined;
+    this.currentPressPoint = undefined;
     this.lastPoint = undefined;
     this.draging = false;
     MARKS.forEach((mark) => {
@@ -82,6 +83,7 @@ export class Area extends ViewerCommon {
    */
   onCanvasPress({x, y}) {
     this.movePoint = undefined;
+    this.currentPressPoint = undefined;
     this.lastPoint = undefined;
     this.draging = false;
     let selectList = [];
@@ -181,6 +183,7 @@ export class Area extends ViewerCommon {
       // moveIndex>-1,表示选中的是图形中可移动的点
       if (~moveIndex) {
         this.movePoint = {position: moveIndex, label: item};
+        this.currentPressPoint = {x, y};
       } else if ((item.tool !== POLYGON &&
           isPointInMatrix(pointList[0], pointList[2], pointList[6], pointList[8],
             {x, y})) ||
@@ -258,10 +261,14 @@ export class Area extends ViewerCommon {
    */
   onCanvasRelease({x, y}) {
     if (this.movePoint && this.options.drag !== false) {
-      const label = this.movePoint.label;
-      this.$emit(EVENT_AREA_MOVE_END, label);
+      const dist = getDistance(this.currentPressPoint, {x, y});
+      if (Math.abs(dist) > 1) {
+        const label = this.movePoint.label;
+        this.$emit(EVENT_AREA_MOVE_END, label);
+      }
     }
     this.movePoint = undefined;
+    this.currentPressPoint = undefined;
     this.lastPoint = undefined;
     this.draging = false;
     this.change();
@@ -563,7 +570,7 @@ export class Area extends ViewerCommon {
     }
     this[label.tool].setContent(this.canvas, {...label});
     if (label.measure && label.select) {
-      this[label.tool].drawMeasureInfo(label,
+      this[label.tool].drawMeasureInfo.call(this, label,
         this.getMeasureContent(label), scale);
     }
   }

package/src/components/board/index.js

@@ -11,6 +11,7 @@ import {
   EVENT_IN_PAINTING,
 } from '../../const/event';
 import {
+  getDistance,
   pointInOtherPoint,
   pointsToRegion,
 } from '../../util/calculate';
@@ -148,13 +149,11 @@ export class Board extends ViewerCommon {
     const points = this.imageToViewerElementPoints(this.points);
     this[tool].draw(points);
     this[tool].endDraw();
-    if (tool === POLYGON) {
-      this[tool].drawPoints(points, {
-        radius: this.options.thumb.radius,
-        strokeStyle: this.options.thumb.color,
-        fillStyle: this.options.thumb.bgColor,
-      });
-    }
+    this[tool].drawPoints(points, {
+      radius: this.options.thumb.radius,
+      strokeStyle: this.options.thumb.color,
+      fillStyle: this.options.thumb.bgColor,
+    });
     this.$emit(EVENT_START_PAINTING, this.getPaintOptions());
   }
 
@@ -185,13 +184,11 @@ export class Board extends ViewerCommon {
     const points = this.imageToViewerElementPoints(this.points);
     this[tool].draw(points);
     this[tool].endDraw();
-    if (tool === POLYGON) {
-      this[tool].drawPoints(points, {
-        radius: this.options.thumb.radius,
-        strokeStyle: this.options.thumb.color,
-        fillStyle: this.options.thumb.bgColor,
-      });
-    }
+    this[tool].drawPoints(points, {
+      radius: this.options.thumb.radius,
+      strokeStyle: this.options.thumb.color,
+      fillStyle: this.options.thumb.bgColor,
+    });
     this.$emit(EVENT_IN_PAINTING, this.getPaintOptions());
   }
 
@@ -209,10 +206,15 @@ export class Board extends ViewerCommon {
       return;
     }
     const tool = this.tool;
-    if (point.x === this.points[0].x && point.y === this.points[0].y &&
-      !NO_NORMAL_REGION_TYPES.includes(tool)) {
-      this.points = [];
-      return;
+    if (!NO_NORMAL_REGION_TYPES.includes(tool)) {
+      const firstPoint = this.imageToViewerElementCoordinates(this.points[0].x,
+        this.points[0].y);
+      const dist = getDistance(firstPoint, {x, y});
+      if (Math.abs(dist) < 10) {
+        this.points = [];
+        this.clearCanvas();
+        return;
+      }
     } else if (POINT_TYPES.includes(tool)) {
       this.points = [point, point];
     } else if (tool === POLYGON) {
@@ -305,13 +307,11 @@ export class Board extends ViewerCommon {
       const points = this.imageToViewerElementPoints(this.points);
       this[tool].draw(points);
       this[tool].endDraw();
-      if (tool === POLYGON) {
-        this[tool].drawPoints(points, {
-          radius: this.options.thumb.radius,
-          strokeStyle: this.options.thumb.color,
-          fillStyle: this.options.thumb.bgColor,
-        });
-      }
+      this[tool].drawPoints(points, {
+        radius: this.options.thumb.radius,
+        strokeStyle: this.options.thumb.color,
+        fillStyle: this.options.thumb.bgColor,
+      });
       this.$emit(EVENT_IN_PAINTING, this.getPaintOptions());
     }
   }
@@ -370,7 +370,7 @@ export class Board extends ViewerCommon {
       tool: this.tool,
     });
     if (form.measure) {
-      this[this.tool].drawMeasureInfo(form,
+      this[this.tool].drawMeasureInfo.call(this, form,
         this.getMeasureContent(form));
     }
     return form;
@@ -422,13 +422,11 @@ export class Board extends ViewerCommon {
     this[this.tool].startDraw();
     this[this.tool].draw(points);
     this[this.tool].endDraw();
-    if (this.tool === POLYGON) {
-      this[this.tool].drawPoints(points, {
-        radius: this.options.thumb.radius,
-        strokeStyle: this.options.thumb.color,
-        fillStyle: this.options.thumb.bgColor,
-      });
-    }
+    this[this.tool].drawPoints(points, {
+      radius: this.options.thumb.radius,
+      strokeStyle: this.options.thumb.color,
+      fillStyle: this.options.thumb.bgColor,
+    });
     this.$emit(EVENT_IN_PAINTING, this.getPaintOptions());
   }
 }

package/src/components/common/common.js

@@ -185,7 +185,7 @@ export class ViewerCommon extends EventEmitter {
       left: 0,
       top: 0,
       angle: 0,
-      content: [],
+      texts: [],
     };
     if (label.points.length <= 1) return content;
     const scale = this.getImageZoom(true) / label.scale;
@@ -230,7 +230,7 @@ export class ViewerCommon extends EventEmitter {
           left: p.x + distX * scale,
           top: p.y + distY * scale,
           angle: deg,
-          content: [
+          texts: [
             `长：${(Math.sqrt(w * w + h * h) * this.options.imageCapRes).toFixed(
               2)}${this.options.unit}`],
         };
@@ -250,7 +250,7 @@ export class ViewerCommon extends EventEmitter {
           left: p.x + 10 * scale,
           top: p.y,
           angle: 0,
-          content: [
+          texts: [
             `长轴：${(w * this.options.imageCapRes).toFixed(
               2)}${this.options.unit}`,
             `短轴：${(h * this.options.imageCapRes).toFixed(
@@ -274,7 +274,7 @@ export class ViewerCommon extends EventEmitter {
           left: p.x + 10 * scale,
           top: p.y,
           angle: 0,
-          content: [
+          texts: [
             `长：${(w * this.options.imageCapRes).toFixed(
               2)}${this.options.unit}`,
             `宽：${(h * this.options.imageCapRes).toFixed(
@@ -298,7 +298,7 @@ export class ViewerCommon extends EventEmitter {
           left: p.x,
           top: p.y,
           angle: 0,
-          content: [
+          texts: [
             `周长：${(pt * this.options.imageCapRes).toFixed(
               2)}${this.options.unit}`],
         };
@@ -309,12 +309,17 @@ export class ViewerCommon extends EventEmitter {
           left: 0,
           right: 0,
           angle: 0,
-          content: [],
+          texts: [],
         };
       }
         break;
     }
-    return content;
+    return {
+      ...content,
+      texts: this.options.measure.handler ?
+        this.options.measure.handler(content.texts, label) :
+        content.texts,
+    };
   }
 
   /**
@@ -417,6 +422,18 @@ export class ViewerCommon extends EventEmitter {
 
   }
 
+  /**
+   * updated
+   * @param {Object=} options
+   */
+  updated(options = {}) {
+    this.options = {
+      ...this.options,
+      ...options,
+    };
+    this.change();
+  }
+
   /**
    * 清除canvas
    */

package/src/components/graduation/index.js

@@ -14,28 +14,16 @@ export class Graduation extends ViewerCommon {
    */
   constructor({viewer, canvas, cache, options}) {
     super(viewer, canvas, cache, options);
-    this.scales = options.scales || [0.2, 0.5, 0.8, 1, 2, 4, 10, 20, 40, 100];
+    this.scales = options.scales ||
+      [0.1, 0.4, 0.6, 1, 2, 4, 8, 10, 20, 40, 60, 100, 140, 200];
     this.microns = options.microns ||
-      [5000, 2000, 1250, 1000, 500, 250, 100, 50, 25, 10];
-    this.init();
-  }
-
-  /**
-   * 初始化函数
-   */
-  init() {
-    this.viewer.addHandler('animation', (res) => {
-      this.changeZoom();
-    });
-    setTimeout(() => {
-      this.changeZoom();
-    }, 100);
+      [5000, 2000, 1250, 1000, 500, 250, 200, 100, 50, 25, 20, 10, 5, 2];
   }
 
   /**
    * 倍率大小改变
    */
-  changeZoom() {
+  change() {
     const scales = [...this.scales];
     const zoom = this.viewport.viewportToImageZoom(
       this.viewport.getZoom(true)) * 40;
@@ -71,6 +59,9 @@ export class Graduation extends ViewerCommon {
     const height = this.canvas.height;
     ctx.beginPath();
     ctx.clearRect(0, 0, width, height);
+    if (!this.options.show) {
+      return;
+    }
     const {left, top, right, bottom} = this.options;
     let x = 10;
     let y = height - 10;
@@ -85,17 +76,18 @@ export class Graduation extends ViewerCommon {
       y = height - bottom;
     }
     ctx.beginPath();
-    ctx.strokeStyle = '#454545';
-    ctx.lineWidth = 2;
-    ctx.moveTo(x, y - 5);
+    ctx.strokeStyle = '#000000';
+    ctx.lineWidth = 3;
+    ctx.moveTo(x, y - 8);
     ctx.lineTo(x, y);
     ctx.lineTo(x + lineWidth, y);
-    ctx.lineTo(x + lineWidth, y - 5);
+    ctx.lineTo(x + lineWidth, y - 8);
     ctx.stroke();
     ctx.beginPath();
-    ctx.fillStyle = '#454545';
+    ctx.fillStyle = '#000000';
+    ctx.font = 'bold 16px Arial';
     const t = txt.toFixed(0) + this.options.unit;
     const fontWidth = ctx.measureText(t).width;
-    ctx.fillText(t, x + lineWidth / 2 - fontWidth / 2, top ? y + 10 : y - 10);
+    ctx.fillText(t, x + lineWidth / 2 - fontWidth / 2, top ? y + 12 : y - 12);
   }
 }

package/src/components/grid/index.js

@@ -0,0 +1,120 @@
+import {ViewerCommon} from '../common/common';
+
+/**
+ * 网格
+ * @class
+ */
+export class Grid extends ViewerCommon {
+  /**
+   * 初始化视图测量工具
+   * @param {Object} viewer
+   * @param {Object} canvas
+   * @param {Object} cache
+   * @param {Object} options
+   */
+  constructor({viewer, canvas, cache, options}) {
+    super(viewer, canvas, cache, options);
+    if (!this.options.scale) {
+      this.options.scale = 20;
+    }
+  }
+
+  change() {
+    const imageViewStartPoint = this.viewerElementToImageCoordinates(0, 0);
+    const imageViewXEndPoint = this.viewerElementToImageCoordinates(
+      this.canvas.width, 0);
+    const imageViewYEndPoint = this.viewerElementToImageCoordinates(0,
+      this.canvas.height);
+    let currentZoom = this.getImageZoom(true) * this.options.scale;
+    let baseScale = this.options.scale === 40 ? 3200 : 1600;
+    let twoCount = 0;
+    if (currentZoom >= 1) {
+      while (currentZoom / 2 >= 1) {
+        twoCount++;
+        currentZoom = currentZoom / 2;
+      }
+      if (twoCount) {
+        baseScale /= Math.pow(2, twoCount);
+      }
+    } else if (currentZoom < 1) {
+      while (currentZoom * 2 <= 1) {
+        twoCount++;
+        currentZoom = currentZoom * 2;
+      }
+      if (twoCount) {
+        baseScale *= Math.pow(2, twoCount);
+      }
+    }
+    const distX = imageViewXEndPoint.distanceTo(imageViewStartPoint);
+    const distY = imageViewYEndPoint.distanceTo(imageViewStartPoint);
+    const minX = Math.floor(imageViewStartPoint.x / baseScale);
+    const maxX = Math.floor((imageViewXEndPoint.x + distX) / baseScale);
+    const minY = Math.floor(imageViewStartPoint.y / baseScale);
+    const maxY = Math.floor((imageViewYEndPoint.y + distY) / baseScale);
+    const ctx = this.canvas.getContext('2d');
+    ctx.clearRect(0, 0, this.canvas.width, this.canvas.height);
+    if (this.options.show) {
+      ctx.beginPath();
+      ctx.lineWidth = 1;
+      for (let i = minX; i <= maxX + 1; i++) {
+        const point = this.imageToViewerElementCoordinates(i * baseScale, 0);
+        ctx.moveTo(point.x, 0);
+        ctx.lineTo(point.x, this.canvas.height);
+      }
+      for (let i = minY; i <= maxY + 1; i++) {
+        const point = this.imageToViewerElementCoordinates(0, i * baseScale);
+        ctx.moveTo(0, point.y);
+        ctx.lineTo(this.canvas.width, point.y);
+      }
+      ctx.stroke();
+    }
+    if (this.options.ruler) {
+      const basePx = this.imageToViewerElementCoordinates(baseScale, 0).
+        minus(this.imageToViewerElementCoordinates(0, 0)).x;
+      ctx.beginPath();
+      ctx.font = '14px Arial';
+      ctx.fillStyle = '#fff';
+      ctx.fillRect(0, 0, 20, this.canvas.height);
+      ctx.fillRect(0, 0, this.canvas.width, 20);
+      ctx.beginPath();
+      ctx.fillStyle = 'rgba(0, 0, 0, .3)';
+      ctx.strokeStyle = 'rgba(0, 0, 0, .8)';
+      ctx.moveTo(20, 20);
+      ctx.lineTo(20, this.canvas.height);
+      ctx.moveTo(20, 20);
+      ctx.lineTo(this.canvas.width, 20);
+      for (let i = minX; i <= maxX + 1; i++) {
+        const point = this.imageToViewerElementCoordinates(i * baseScale, 0);
+        ctx.moveTo(point.x, 0);
+        ctx.lineTo(point.x, 20);
+        for (let j = 1; j < 5; j++) {
+          ctx.moveTo(point.x + (basePx / 5) * j, 16);
+          ctx.lineTo(point.x + (basePx / 5) * j, 20);
+          if (i !== minX) {
+            ctx.fillText(i * baseScale, point.x + 5, 13);
+          }
+        }
+      }
+      for (let i = minY; i <= maxY + 1; i++) {
+        const point = this.imageToViewerElementCoordinates(0, i * baseScale);
+        ctx.moveTo(0, point.y);
+        ctx.lineTo(20, point.y);
+        for (let j = 1; j < 5; j++) {
+          ctx.moveTo(16, point.y + (basePx / 5) * j);
+          ctx.lineTo(20, point.y + (basePx / 5) * j);
+          if (i !== minY) {
+            ctx.save();
+            ctx.translate(3, point.y + 5);
+            ctx.rotate(Math.PI / 2);
+            ctx.fillText(i * baseScale, 0, 0);
+            ctx.restore();
+          }
+        }
+      }
+      ctx.stroke();
+      ctx.beginPath();
+      ctx.fillStyle = '#fff';
+      ctx.fillRect(0, 0, 20, 20);
+    }
+  }
+}

package/src/components/index.js

@@ -6,3 +6,4 @@ export {Shape} from './shape';
 export {Area} from './area';
 export {Board} from './board';
 export {Graduation} from './graduation';
+export {Grid} from './grid';

package/src/components/navigator/index.js

@@ -19,14 +19,32 @@ export class Navigator extends EventEmitter {
     this.viewport = rest.viewer.viewport;
     this.viewer = rest.viewer;
     this.el = rest.el;
-    this.height = rest.height || 200;
-    this.width = rest.width || 200;
+    this.height = rest.height || 150;
+    this.width = rest.width || 150;
     this.containerHeight = rest.containerHeight || window.innerHeight;
     this.containerWidth = rest.containerWidth || window.innerWidth;
     this.element = rest.element;
     this.pointList = rest.pointList || [];
-    this.info = '';
+    this.loadStatus = false; // 导航图加载状态
     this.init();
+    this.vestige = this.options.vestige ? {
+      show: true,
+      delay: 1000,
+      colors: [
+        'rgba(255, 255, 0, .5)',
+        'rgba(0, 255, 255, .5)',
+        'rgba(255, 0, 255, .5)'],
+      zooms: [5, 10, 20],
+      ...this.options.vestige,
+    } : {
+      show: true,
+      delay: 1000,
+      colors: [
+        'rgba(255, 255, 0, .5)',
+        'rgba(0, 255, 255, .5)',
+        'rgba(255, 0, 255, .5)'],
+      zooms: [5, 10, 20],
+    };
   }
 
   /**
@@ -51,15 +69,20 @@ export class Navigator extends EventEmitter {
       hLine.style.top =
         Math.round(rect.getBoundingClientRect().height / 2 +
           rect.offsetTop) + 'px';
+      vLine.style.backgroundColor = 'red';
+      hLine.style.backgroundColor = 'red';
     });
     this.$on('rect-draw', (e) => {
       const left = rect.offsetLeft;
       const top = rect.offsetTop;
+      const index = e.detail;
       const rectObj = {
         left: left,
         top: top,
         width: rect.clientWidth,
         height: rect.clientHeight,
+        scale: [...this.vestige.zooms].reverse()[index],
+        color: [...this.vestige.colors].reverse()[index],
       };
       this.pointList.push(rectObj);
       this.drawPointList(this.pointList);
@@ -82,9 +105,10 @@ export class Navigator extends EventEmitter {
     const colorCanvas = this.element.getElementsByClassName(
       'navigator-color-rect')[0];
     const ctx = colorCanvas.getContext('2d');
-    this.pointList.forEach((item) => {
-      this.drawRect(ctx, item);
-    });
+    this.pointList.sort((a, b) => a.scale > b.scale ? 1 : -1).
+      forEach((item) => {
+        this.drawRect(ctx, item);
+      });
   }
 
   /**
@@ -96,7 +120,7 @@ export class Navigator extends EventEmitter {
     // if (clear)
     // ctx.clearRect(0, 0, this.containerWidth, this.containerHeight);
     ctx.beginPath();
-    ctx.fillStyle = this.options.vestigeColor || 'rgba(255, 0, 255, .5)';
+    ctx.fillStyle = item.color;
     ctx.clearRect(item.left, item.top, item.width + 1, item.height + 1);
     ctx.fillRect(item.left, item.top, item.width + 1, item.height + 1);
   }
@@ -108,6 +132,9 @@ export class Navigator extends EventEmitter {
    * @param {Object=} rect 遮罩层元素
    */
   navigatorChange(zoom, refPoint, rect) {
+    if (!this.loadStatus) {
+      return;
+    }
     if (!refPoint) {
       refPoint = this.viewport.getCenter(true);
     }
@@ -270,14 +297,17 @@ export class Navigator extends EventEmitter {
     };
     rect.style.left = refPoint.x + 'px';
     rect.style.top = refPoint.y + 'px';
+    rect.style.border = '1px solid red';
     this.$emit('rect-change');
-    if (this.options.vestige) {
+    if (this.vestige.show !== false) {
       if (this.clearTimeId) window.clearTimeout(this.clearTimeId);
-      if (this.viewport.viewportToImageZoom(currentZoom) >=
-        (this.options.vestigeZoom ?? 1)) {
+      const currentImageZoom = this.viewport.viewportToImageZoom(currentZoom);
+      const index = [...this.vestige.zooms].reverse().findIndex(
+        (z) => currentImageZoom >= (z / (this.options.scale || 40)));
+      if (index !== -1) {
         this.clearTimeId = window.setTimeout(() => {
-          this.$emit('rect-draw');
-        }, this.options.vestigeDelay || 1000);
+          this.$emit('rect-draw', index);
+        }, this.vestige.delay || 1000);
       }
     }
   }
@@ -295,24 +325,25 @@ export class Navigator extends EventEmitter {
       const imgHeight = img.height;
       let scale = 1;
       if (imgWidth >= imgHeight) {
-        scale = imgWidth / this.width;
-        const trueHeight = imgHeight / scale;
-        canvas.width = this.width;
-        canvas.height = trueHeight;
-        ctx.drawImage(img, 0, 0, canvas.width, trueHeight);
-      }
-      if (imgHeight > imgWidth) {
         scale = imgHeight / this.height;
         const trueWidth = imgWidth / scale;
         canvas.height = this.height;
         canvas.width = trueWidth;
         ctx.drawImage(img, 0, 0, trueWidth, canvas.height);
       }
+      if (imgHeight > imgWidth) {
+        scale = imgWidth / this.width;
+        const trueHeight = imgHeight / scale;
+        canvas.width = this.width;
+        canvas.height = trueHeight;
+        ctx.drawImage(img, 0, 0, canvas.width, trueHeight);
+      }
       this.setViewRect(this.element.getElementsByClassName('view-rect')[0]);
       const colorCanvas = this.element.getElementsByClassName(
         'navigator-color-rect')[0];
       colorCanvas.width = this.canvas.width;
       colorCanvas.height = this.canvas.height;
+      this.loadStatus = true;
     };
     img.src = this.options.thumbnail; // 设置图片源地
     return canvas;
@@ -327,14 +358,6 @@ export class Navigator extends EventEmitter {
       const imgHeight = img.height;
       let scale = 1;
       if (imgWidth >= imgHeight) {
-        scale = imgWidth / this.width;
-        const trueHeight = imgHeight / scale;
-        this.canvas.width = this.width;
-        this.canvas.height = trueHeight;
-        ctx.clearRect(0, 0, this.canvas.width, this.canvas.height);
-        ctx.drawImage(img, 0, 0, this.canvas.width, trueHeight);
-      }
-      if (imgHeight > imgWidth) {
         scale = imgHeight / this.height;
         const trueWidth = imgWidth / scale;
         this.canvas.height = this.height;
@@ -342,6 +365,14 @@ export class Navigator extends EventEmitter {
         ctx.clearRect(0, 0, this.canvas.width, this.canvas.height);
         ctx.drawImage(img, 0, 0, trueWidth, this.canvas.height);
       }
+      if (imgHeight > imgWidth) {
+        scale = imgWidth / this.width;
+        const trueHeight = imgHeight / scale;
+        this.canvas.width = this.width;
+        this.canvas.height = trueHeight;
+        ctx.clearRect(0, 0, this.canvas.width, this.canvas.height);
+        ctx.drawImage(img, 0, 0, this.canvas.width, trueHeight);
+      }
       this.setViewRect(this.element.getElementsByClassName('view-rect')[0]);
       const colorCanvas = this.element.getElementsByClassName(
         'navigator-color-rect')[0];

package/src/components/navigator/navigator.scss

@@ -14,7 +14,6 @@
       line-height: 1px;
       position: absolute;
       top: 0;
-      background-color: rgb(255, 0, 0);
     }
 
     .h-line {
@@ -23,12 +22,10 @@
       line-height: 1px;
       position: absolute;
       left: 0;
-      background-color: rgb(255, 0, 0);
     }
 
     .view-rect {
       top: -1px;
-      border: 1px solid rgb(255, 0, 0);
       background-color: rgb(255, 255, 255);
       position: absolute;
       cursor: pointer;

package/src/components/shape/index.js

@@ -57,8 +57,8 @@ export class Shape extends ViewerCommon {
     const labelList = this.labelList.filter((item) => {
       if (item.show === false) return false;
       if (!this[item.tool]) return false;
-      if (REGION_TYPES.includes(item.tool) || item.isClose && item.tool ===
-        POLYGON && item.fillStyle) {
+      if ((REGION_TYPES.includes(item.tool) || item.isClose && item.tool ===
+        POLYGON) && item.fillStyle) {
         regionLabelList.push({
           ...item,
           child: [],

package/src/components/tailoring/index.js

@@ -105,7 +105,7 @@ export class Tailoring extends ViewerCommon {
     ctx.stroke();
     ctx.beginPath();
     ctx.fillStyle = this.color;
-    ctx.font = '18px';
+    ctx.font = '18px Arial';
     ctx.fillText(
       `区域大小为：${rightTop.x - leftTop.x}*${rightBottom.y - rightTop.y}`,
       leftTop.x, leftTop.y - 50);

package/src/const/component.js

@@ -6,3 +6,4 @@ export const COMPONENT_ROTATION = 'rotation';
 export const COMPONENT_TAILORING = 'tailoring';
 export const COMPONENT_NAVIGATOR = 'navigator';
 export const COMPONENT_CACHE = 'cache';
+export const COMPONENT_FRID = 'grid';