kfb-view 3.2.0 → 3.2.2

package/src/util/index.js

@@ -64,9 +64,26 @@ function delayedTrigger(callback, time = 1000) {
   };
 }
 
+function getUnitNumber(number, units, binary, index = 0) {
+  if (index) {
+    return (number / Math.pow(binary, index)).toFixed(2) / 1 + units[index];
+  }
+  let i = number;
+  while (i >= binary) {
+    i = i / binary;
+    index++;
+  }
+  if (!units[index]) {
+    index = units.length - 1;
+  }
+  return (number / Math.pow(binary, index)).toFixed(2) / 1 + units[index];
+}
+
+
 export {
   $,
   dataType,
   deepClone,
   delayedTrigger,
+  getUnitNumber,
 };

package/src/view.js

@@ -35,7 +35,9 @@ export default class KfbView extends EventEmitter {
    * @param {number[]=} config.navigator.vestige.zooms 浏览痕迹触发倍率
    * @param {Object} config.pxConversion 像素转换参数
    * @param {number} config.pxConversion.imageCapRes 像素转换倍率
-   * @param {string} config.pxConversion.unit 单位
+   * @param {string[]=} config.pxConversion.units 单位组  ['um', 'mm', 'cm']
+   * @param {string} config.pxConversion.unit 单位 废弃
+   * @param {number} config.pxConversion.binary 几进制, 2, 16, 24, 1000
    * @param {Object} config.area 交互区域,触发点击、拖动等事件
    * @param {boolean=} config.area.disabled 是否禁用area
    * @param {boolean=} config.area.drag 是否允许拖动
@@ -63,7 +65,9 @@ export default class KfbView extends EventEmitter {
    * @param {boolean=} config.graduation.disabled 是否禁用刻度
    * @param {boolean=} config.graduation.show 是否显刻度
    * @param {boolean=} config.graduation.custom 是否自定义刻度,抛出graduation-change事件
-   * @param {array=} config.graduation.scales 倍率数组
+   * @param {Object} config.graduation.tick 刻度线参数
+   * @param {number=} config.graduation.tick.height 刻度线高度
+   * @param {number=} config.graduation.tick.number 刻度线段落
    * @param {array=} config.graduation.microns 刻度长度数组，在对应倍率范围内显示的刻度长度
    * @param {boolean=} config.grid.disabled 是否禁用网格线
    * @param {boolean=} config.grid.show 是否显示网格线
@@ -81,6 +85,7 @@ export default class KfbView extends EventEmitter {
    * @param {function=} config.label.drawing 标注绘制回调，
    * @param {function=} config.labelDrawing 标注绘制回调   @deprecated Use label.drawing instead
    * @param {array} config.labelList 标注列表
+   * @param {function} config.handleKey 按钮处理回调
    */
   constructor(config) {
     super();
@@ -285,7 +290,7 @@ function createCanvas(kv) {
 
 function initComponentsOptions(kv, type) {
   const config = kv.$options;
-  const pxConversion = config.pxConversion || {imageCapRes: 1, unit: ''};
+  const pxConversion = config.pxConversion || {imageCapRes: 1, units: []};
   return {
     kv,
     viewer: kv.viewer,
@@ -306,6 +311,7 @@ function initComponentsOptions(kv, type) {
       },
       ...config[type],
       ...pxConversion,
+      units: pxConversion.units ?? [pxConversion.unit ?? ''], // 兼容之前只显示一个的单位
       thumb: config.thumb ? {
         radius: 5,
         activeRadius: 7,
@@ -368,7 +374,9 @@ function initEvent(kv) {
 
   kv.viewer.addHandler('canvas-key', (e) => {
     const {originalEvent} = e;
-    e.preventDefaultAction = originalEvent.key.indexOf('Arrow') === -1;
+    e.preventDefaultAction = kv.$options.handleKey ?
+      kv.$options.handleKey(originalEvent.key) :
+      handlerKey(originalEvent.key);
     handlerCacheEvent(originalEvent, kv);
     if (kv.board?.isInDraw) {
       kv.board?.onCanvasKey?.(e);
@@ -448,6 +456,10 @@ function initEvent(kv) {
   });
 }
 
+function handlerKey(key) {
+  return ['Escape', 'Delete', 'Backspace', 'z', 'y'].includes(key);
+}
+
 function handlerCacheEvent(e, kv) {
   if (e.key === 'z' && e.ctrlKey) {
     if (kv.cache.currentIndex === 0) return;