kfb-view 2.3.0 → 2.3.1

package/package.json

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

package/src/components/area/index.js

@@ -573,7 +573,15 @@ export class Area extends ViewerCommon {
       }, position === 4);
       this.drawPoint(points[1], position === 7);
     } else if (type === RECTANGLE) {
-      getRectPoint(points[0], points[1]).forEach((point, i) => {
+      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,
+      };
+      const ep = {
+        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,
+      };
+      getRectPoint(sp, ep).forEach((point, i) => {
         this.drawLine(point, i, position === i);
       });
     } else if (REGION_TYPES.includes(type)) {

package/src/components/common/common.js

@@ -190,14 +190,30 @@ export class ViewerCommon extends EventEmitter {
     if (label.points.length <= 1) return content;
     const scale = this.getImageZoom(true) / label.scale;
     const region = pointsToRegion(label.points);
-    const startPoint = {x: region.x, y: region.y};
-    const endPoint = {x: region.x + region.width, y: region.y + region.height};
+    const _startPoint = {x: region.x, y: region.y};
+    const _endPoint = {x: region.x + region.width, y: region.y + region.height};
+    const startPoint = {
+      x: _startPoint.x < _endPoint.x ? _startPoint.x : _endPoint.x,
+      y: _startPoint.y < _endPoint.y ? _startPoint.y : _endPoint.y,
+    };
+    const endPoint = {
+      x: _startPoint.x > _endPoint.x ? _startPoint.x : _endPoint.x,
+      y: _startPoint.y > _endPoint.y ? _startPoint.y : _endPoint.y,
+    };
     /*  const p1 = label.points[0];
       const p2 = label.points[label.points.length - 1];*/
     switch (label.tool) {
       case ARROW:
       case BILATERAL:
       case LINE: {
+        const startPoint = {
+          x: _startPoint.x < _endPoint.x ? _startPoint.x : _endPoint.x,
+          y: _startPoint.x < _endPoint.x ? _startPoint.y : _endPoint.y,
+        };
+        const endPoint = {
+          x: _startPoint.x > _endPoint.x ? _startPoint.x : _endPoint.x,
+          y: _startPoint.x > _endPoint.x ? _startPoint.y : _endPoint.y,
+        };
         const w = Math.abs(endPoint.x - startPoint.x);
         const h = Math.abs(endPoint.y - startPoint.y);
         const center = {

package/src/model/label.model.js

@@ -4,6 +4,7 @@ export class LabelModel {
   constructor(data = {}) {
     if (!data) data = {};
     this.id = data.id; // id标识
+    this.parent_id = data.parent_id; // 父id标识
     this.lineWidth = !data.lineWidth ?
       (data.tool === STAR ? 15 :
         data.tool === FLAG ? 30 : data.tool === DOT ? 10 : 2) :