kfb-view 3.0.6 → 3.0.8

package/package.json

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

package/src/components/grid/index.js

@@ -26,7 +26,11 @@ export class Grid extends ViewerCommon {
     const imageViewYEndPoint = this.viewerElementToImageCoordinates(0,
       this.canvas.height);
     let currentZoom = this.getImageZoom(true) * this.options.scale;
-    let baseScale = this.options.scale === 40 ? 3200 : 1600;
+    const pxConversion = this.options.pxConversion ?
+      this.options.imageCapRes : 1;
+    let baseScale = this.options.scale === 40 ?
+      (this.options.pxConversion ? 1600 / this.options.imageCapRes : 3200) :
+      (this.options.pxConversion ? 800 / this.options.imageCapRes : 1600);
     let twoCount = 0;
     if (currentZoom >= 1) {
       while (currentZoom / 2 >= 1) {
@@ -91,7 +95,8 @@ export class Grid extends ViewerCommon {
           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);
+            ctx.fillText((i * baseScale * pxConversion).toFixed(0), point.x + 5,
+              13);
           }
         }
       }
@@ -106,7 +111,7 @@ export class Grid extends ViewerCommon {
             ctx.save();
             ctx.translate(3, point.y + 5);
             ctx.rotate(Math.PI / 2);
-            ctx.fillText(i * baseScale, 0, 0);
+            ctx.fillText((i * baseScale * pxConversion).toFixed(0), 0, 0);
             ctx.restore();
           }
         }

package/src/view.js

@@ -68,6 +68,7 @@ export default class KfbView extends EventEmitter {
    * @param {boolean=} config.grid.disabled 是否禁用网格线
    * @param {boolean=} config.grid.show 是否显示网格线
    * @param {boolean=} config.grid.ruler 是否启用标尺
+   * @param {boolean=} config.grid.pxConversion 是否启用标尺
    * @param {function=} config.measure.handler 标注信息的回调处理
    * @param {function=} config.measure.selectHandler 标注信息选中时的回调处理
    * @param {boolean=} config.measure.color 标注注释颜色
@@ -352,8 +353,8 @@ function initEvent(kv) {
   });
   // 键盘事件会连续触发两次
   kv.viewer.addHandler('canvas-key', delayedTrigger((e) => {
-    e.preventDefaultAction = true;
     const {originalEvent} = e;
+    e.preventDefaultAction = originalEvent.key.indexOf('Arrow') === -1;
     handlerCacheEvent(originalEvent, kv);
     if (kv.board?.isInDraw) {
       kv.board?.onCanvasKey?.(e);