kfb-view 2.3.7 → 2.3.9

package/package.json

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

package/src/components/shape/index.js

@@ -105,23 +105,12 @@ export class Shape extends ViewerCommon {
       clearTimeout(this.delaytimer);
       this.delaytimer = undefined;
     }
-    this.deepDrawLabel(sameFixWidthLabel, sameNormalLabel, 1, bounds);
-    regionLabelList.forEach((item) => {
-      this.combination.setContent(this.canvas, item);
-      this.combination.draw({
-        points: item.viewerElementPoints,
-        tool: item.tool,
-      }, item.child.map(({viewerElementPoints, tool}) => ({
-        points: viewerElementPoints,
-        tool,
-      })), this.viewport.getRotation());
-    });
-    imageLabel.forEach((item) => {
-      this.drawLabel(item);
-    });
+    this.deepDrawLabel(sameFixWidthLabel, sameNormalLabel, regionLabelList,
+      imageLabel, 1, bounds);
   }
 
-  deepDrawLabel(sameFixWidthLabel, sameNormalLabel, count, bounds) {
+  deepDrawLabel(sameFixWidthLabel, sameNormalLabel, regionLabelList,
+                imageLabel, count, bounds) {
     let currentDrawCount = 0; // 当前已绘制数量
     const ctx = this.canvas.getContext('2d');
     const remainFixLabel = {};
@@ -173,9 +162,23 @@ export class Shape extends ViewerCommon {
       Object.keys(remainNormalLabel).length === 0) {
       console.log(`end deep draw label, draw count: ${count}`);
       this.delaytimer = undefined;
+      regionLabelList.forEach((item) => {
+        this.combination.setContent(this.canvas, item);
+        this.combination.draw({
+          points: item.viewerElementPoints,
+          tool: item.tool,
+        }, item.child.map(({viewerElementPoints, tool}) => ({
+          points: viewerElementPoints,
+          tool,
+        })), this.viewport.getRotation());
+      });
+      imageLabel.forEach((item) => {
+        this.drawLabel(item);
+      });
     } else {
       this.delaytimer = setTimeout(() => {
-        this.deepDrawLabel(remainFixLabel, remainNormalLabel, count + 1,
+        this.deepDrawLabel(remainFixLabel, remainNormalLabel, regionLabelList,
+          imageLabel, count + 1,
           bounds);
       }, 100);
     }

package/src/components/tailoring/index.js

@@ -111,8 +111,9 @@ export class Tailoring extends ViewerCommon {
     ctx.fillStyle = this.color;
     ctx.font = '18px Arial';
     ctx.fillText(
-      this.contents?.[3] ?? (`区域大小为：${rightTop.x -
-      leftTop.x}*${rightBottom.y - rightTop.y}`),
+      this.contents?.[2] ?
+        this.contents[2](rightTop.x - leftTop.x, rightBottom.y - rightTop.y) :
+        (`区域大小为：${rightTop.x - leftTop.x}*${rightBottom.y - rightTop.y}`),
       leftTop.x, leftTop.y - 50);
     ctx.fillText(this.contents?.[0] ?? `双击区域内表示完成截图`, leftTop.x,
       leftTop.y - 30);