kfb-view 3.2.9 → 3.3.0

package/package.json

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

package/src/components/shape/index.js

@@ -60,6 +60,7 @@ export class Shape extends ViewerCommon {
     // 区域标注列表
     const labelList = this.labelList.filter((item) => {
       if (item.show === false) return false;
+      if (item.custom) return false;
       if (!this[item.tool]) return false;
       if (!this.isInCanvas(item.region, bounds)) return false;
       if ((REGION_TYPES.includes(item.tool) || item.isClose && item.tool ===

package/src/model/label.model.js

@@ -25,6 +25,7 @@ export class LabelModel {
     this.resize = data.resize; // 是否可拖动大小
     this.isROI = data.isROI ?? false; // 是否是ROI
     this.isClose = data.isClose ?? true; // 是否是闭合标注
+    this.custom = data.custom ?? false; // 是否是自定义的标注
     this.select = data.select ?? false; // 是否是选中状态
     this.show = data.show ?? true; // 是否显示
     this.__other__ = data.__other__ || {}; // 其他信息

package/src/view.js

@@ -2,7 +2,7 @@ import openSeadragon from './plugin/openseadragon/openseadragon';
 import './util/canvas';
 import {EventEmitter} from './util/event-emitter';
 import {$, dataType, deepClone} from './util';
-import {pointsToRegion} from './util/calculate';
+import {pointsToRegion, regionToPoint} from './util/calculate';
 import * as COMPONENTS from './const/component';
 import * as EVENTS from './const/event';
 import * as Components from './components';
@@ -133,11 +133,17 @@ export default class KfbView extends EventEmitter {
    * @param {Array} list
    */
   initLabelList(list) {
-    this.labelList = list.map((item) => new LabelModel({
-      ...item,
-      region: item.region || pointsToRegion(item.points),
-      __data__: deepClone(item),
-    }));
+    this.labelList = list.map((item) => {
+      if (!item.points?.length) {
+        const {startPoint, endPoint} = regionToPoint(item.region);
+        item.points = [startPoint, endPoint];
+      }
+      return new LabelModel({
+        ...item,
+        region: item.region || pointsToRegion(item.points),
+        __data__: deepClone(item),
+      });
+    });
     this.board?.setLabelList?.(this.labelList);
     this.shape?.setLabelList?.(this.labelList);
     this.area?.setLabelList?.(this.labelList);
@@ -145,11 +151,17 @@ export default class KfbView extends EventEmitter {
 
   appendLabelList(list) {
     this.labelList = [
-      ...this.labelList, ...list.map((item) => new LabelModel({
-        ...item,
-        region: item.region || pointsToRegion(item.points),
-        __data__: deepClone(item),
-      }))];
+      ...this.labelList, ...list.map((item) => {
+        if (!item.points?.length) {
+          const {startPoint, endPoint} = regionToPoint(item.region);
+          item.points = [startPoint, endPoint];
+        }
+        return new LabelModel({
+          ...item,
+          region: item.region || pointsToRegion(item.points),
+          __data__: deepClone(item),
+        });
+      })];
     this.board?.setLabelList?.(this.labelList);
     this.shape?.setLabelList?.(this.labelList);
     this.area?.setLabelList?.(this.labelList);