kfb-view 2.1.13 → 2.1.16

package/package.json

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

package/src/components/shape/index.js

@@ -1,6 +1,6 @@
 import {
   HAS_REGION_TYPES, MARKS,
-  NO_NORMAL_REGION_TYPES, POINT_TYPES,
+  NO_NORMAL_REGION_TYPES, POINT_TYPES, POLYGON, REGION_TYPES,
 } from '../../const/mark';
 import {ViewerCommon} from '../common/common';
 import * as Tools from '../../tool';
@@ -59,7 +59,8 @@ export class Shape extends ViewerCommon {
     this.clearCanvas();
     // 区域标注列表
     const regionLabelList = this.labelList.filter(
-      ({tool, isClose}) => HAS_REGION_TYPES.includes(tool) && isClose).
+      ({tool, isClose}) => REGION_TYPES.includes(tool) || isClose && tool ===
+        POLYGON).
       map((item) => ({
         ...item,
         child: [],

package/src/tool/Combination.js

@@ -42,13 +42,13 @@ class Combination extends Brush {
         points[0].y + region.height - centerPoint.y);
       ctx.lineTo(points[0].x - centerPoint.x, points[0].y - centerPoint.y);
     } else if (tool === ELLIPSE) {
-      ctx.drawOval(0, 0, region.width / 2, region.height / 2, false);
+      ctx.drawOval(0, 0, Math.abs(region.width / 2),
+        Math.abs(region.height / 2), false);
     }
     ctx.closePath();
     ctx.restore();
     children.forEach(({tool, points}) => {
       ctx.save();
-      ctx.beginPath();
       const region = pointsToRegion(points);
       const centerPoint = {
         x: region.x + region.width / 2,
@@ -71,11 +71,8 @@ class Combination extends Brush {
           points[0].y - centerPoint.y);
         ctx.lineTo(points[0].x - centerPoint.x, points[0].y - centerPoint.y);
       } else if (tool === ELLIPSE) {
-        ctx.drawOval(0, 0, region.width / 2, region.height / 2, true);
-      }
-      if (this.options.fillStyle) {
-        ctx.fillStyle = this.options.fillStyle;
-        ctx.fill();
+        ctx.drawOval(0, 0, Math.abs(region.width / 2),
+          Math.abs(region.height / 2), true);
       }
       ctx.restore();
     });

package/src/util/canvas.js

@@ -60,6 +60,7 @@ CanvasRenderingContext2D.prototype.drawOval = function drawOval(
   this.save();
   // 选择a、b中的较大者作为arc方法的半径参数
   const r = (a > b) ? a : b;
+  console.log(r);
   const ratioX = a / r; // 横轴缩放比率
   const ratioY = b / r; // 纵轴缩放比率
   this.scale(ratioX, ratioY); // 进行缩放（均匀压缩）

package/src/view.js

@@ -106,7 +106,7 @@ export default class KfbView extends EventEmitter {
 
   appendLabelList(list) {
     this.labelList = [
-      ...this.labelList, list.map((item) => new LabelModel({
+      ...this.labelList, ...list.map((item) => new LabelModel({
         ...item,
         region: item.region || pointsToRegion(item.points),
         strokeStyle: item.strokeStyle || '#0000FF',