kfb-view 3.2.9 → 3.3.1

package/lib/kfb-view.umd.js.LICENSE.txt

@@ -0,0 +1,9 @@
+//! Built on 2024-04-01
+
+//! Git commit: v4.1.1-1-f90d9814
+
+//! License: http://openseadragon.github.io/license/
+
+//! http://openseadragon.github.io
+
+//! openseadragon 4.1.1

package/package.json

@@ -1,20 +1,23 @@
 {
   "name": "kfb-view",
   "description": "一个在线kfb的阅片软件",
-  "version": "3.2.9",
+  "version": "3.3.1",
   "author": "qifeng.fan <qifeng.fan@hzztai.com>",
   "license": "MIT",
-  "main": "lib/kfb-view.js",
+  "main": "lib/kfb-view.cjs.js",
+  "module": "lib/kfb-view.es.js",
+  "exports": {
+    ".": {
+      "import": "./lib/kfb-view.es.js",
+      "require": "./lib/kfb-view.cjs.js"
+    }
+  },
   "scripts": {
-    "build:dev": "npm run clean:dist && npm run webpack -- --mode development --config config/webpack.dev.conf.js --progress --profile",
-    "build:prod": "npm run clean:dist && npm run webpack -- --mode production --config config/webpack.prod.conf.js  --progress --profile --bail",
     "build:lib": "npm run clean:lib && npm run webpack -- --mode production --config config/webpack.lib.conf.js  --progress --profile --bail",
-    "build": "npm run build:prod",
-    "clean:dist": "npm run rimraf -- dist",
+    "build": "npm run build:lib",
     "clean:lib": "npm run rimraf -- lib",
     "rimraf": "rimraf",
-    "server:hot": "npm run webpack-dev-server -- --mode development --config config/webpack.dev.conf.js --hot --progress --profile --watch",
-    "server:dev": "npm run webpack-dev-server -- --mode development --config config/webpack.dev.conf.js --progress --profile --wascreenshottch",
+    "server:dev": "npm run webpack-dev-server -- --mode development --config config/webpack.dev.conf.js --hot --progress --profile",
     "server": "npm run server:dev",
     "start": "npm run build",
     "webpack-dev-server": "node --max_old_space_size=4096 node_modules/webpack-dev-server/bin/webpack-dev-server.js",
@@ -25,7 +28,6 @@
     "mitt": "^3.0.1"
   },
   "devDependencies": {
-    "axios": "^1.6.5",
     "@babel/core": "^7.0.0",
     "@babel/plugin-proposal-class-properties": "^7.0.0",
     "@babel/plugin-proposal-decorators": "^7.0.0",
@@ -43,37 +45,31 @@
     "@babel/plugin-syntax-dynamic-import": "^7.0.0",
     "@babel/plugin-syntax-import-meta": "^7.0.0",
     "@babel/preset-env": "^7.0.0",
-    "@purtuga/esm-webpack-plugin": "^1.5.0",
     "autoprefixer": "^8.6.4",
-    "babel-eslint": "^9.0.0",
-    "babel-loader": "^8.0.0",
-    "compression-webpack-plugin": "^1.1.11",
+    "axios": "^1.6.5",
+    "babel-eslint": "^10.1.0",
+    "babel-loader": "^10.0.0",
     "copy-webpack-plugin": "^4.5.2",
     "core-js": "^3.6.5",
-    "css-loader": "^0.28.11",
+    "css-loader": "^7.1.2",
     "eslint": "^5.0.1",
     "eslint-config-google": "^0.9.1",
     "eslint-friendly-formatter": "^4.0.1",
-    "eslint-loader": "^2.0.0",
     "eslint-plugin-html": "^4.0.5",
-    "file-loader": "^1.1.11",
-    "html-loader": "^0.5.5",
-    "html-webpack-plugin": "^3.2.0",
-    "mini-css-extract-plugin": "^0.4.1",
-    "node-sass": "^4.9.0",
-    "postcss-import": "^11.1.0",
-    "postcss-loader": "^2.1.5",
+    "html-loader": "^5.1.0",
+    "html-webpack-plugin": "^5.6.3",
+    "mini-css-extract-plugin": "^2.9.2",
+    "sass": "^1.89.1",
+    "postcss-import": "^16.1.1",
+    "postcss-loader": "^8.1.1",
     "rimraf": "^2.6.2",
-    "sass-loader": "^7.0.3",
-    "script-ext-html-webpack-plugin": "^2.0.1",
-    "style-loader": "^0.21.0",
+    "sass-loader": "^16.0.5",
+    "style-loader": "^4.0.0",
     "terser-webpack-plugin": "^4.2.2",
-    "url-loader": "^1.0.1",
-    "webpack": "^4.14.0",
-    "webpack-cli": "^3.0.8",
-    "webpack-dev-server": "^3.1.4",
-    "webpack-merge": "^4.1.3",
-    "worker-loader": "^2.0.0"
+    "webpack": "^5.100.1",
+    "webpack-cli": "^6.0.1",
+    "webpack-dev-server": "^5.2.2",
+    "webpack-merge": "^6.0.1"
   },
   "engines": {
     "node": ">= 6.11.5",

package/src/components/shape/index.js

@@ -60,6 +60,7 @@ export class Shape extends ViewerCommon {
     // 区域标注列表
     const labelList = this.labelList.filter((item) => {
       if (item.show === false) return false;
+      if (item.custom) return false;
       if (!this[item.tool]) return false;
       if (!this.isInCanvas(item.region, bounds)) return false;
       if ((REGION_TYPES.includes(item.tool) || item.isClose && item.tool ===

package/src/model/label.model.js

@@ -1,4 +1,4 @@
-import {DOT, FLAG, STAR} from '../const/mark';
+import {DOT, FLAG, IMAGE, STAR} from '../const/mark';
 
 export class LabelModel {
   constructor(data = {}) {
@@ -25,11 +25,13 @@ export class LabelModel {
     this.resize = data.resize; // 是否可拖动大小
     this.isROI = data.isROI ?? false; // 是否是ROI
     this.isClose = data.isClose ?? true; // 是否是闭合标注
+    this.custom = data.custom ?? false; // 是否是自定义的标注
     this.select = data.select ?? false; // 是否是选中状态
     this.show = data.show ?? true; // 是否显示
+    this.subType = data.subType; // 自定义类型
     this.__other__ = data.__other__ || {}; // 其他信息
     this.__data__ = data.__data__ ?? data; // 记录原始数据
-    if (this.src) {
+    if (this.src && this.tool === IMAGE) {
       this.img = new Image();
       this.img.src = this.src;
       this.imgLoadSuccess = false;

package/src/view.js

@@ -2,7 +2,7 @@ import openSeadragon from './plugin/openseadragon/openseadragon';
 import './util/canvas';
 import {EventEmitter} from './util/event-emitter';
 import {$, dataType, deepClone} from './util';
-import {pointsToRegion} from './util/calculate';
+import {pointsToRegion, regionToPoint} from './util/calculate';
 import * as COMPONENTS from './const/component';
 import * as EVENTS from './const/event';
 import * as Components from './components';
@@ -133,11 +133,17 @@ export default class KfbView extends EventEmitter {
    * @param {Array} list
    */
   initLabelList(list) {
-    this.labelList = list.map((item) => new LabelModel({
-      ...item,
-      region: item.region || pointsToRegion(item.points),
-      __data__: deepClone(item),
-    }));
+    this.labelList = list.map((item) => {
+      if (!item.points?.length) {
+        const {startPoint, endPoint} = regionToPoint(item.region);
+        item.points = [startPoint, endPoint];
+      }
+      return new LabelModel({
+        ...item,
+        region: item.region || pointsToRegion(item.points),
+        __data__: deepClone(item),
+      });
+    });
     this.board?.setLabelList?.(this.labelList);
     this.shape?.setLabelList?.(this.labelList);
     this.area?.setLabelList?.(this.labelList);
@@ -145,11 +151,17 @@ export default class KfbView extends EventEmitter {
 
   appendLabelList(list) {
     this.labelList = [
-      ...this.labelList, ...list.map((item) => new LabelModel({
-        ...item,
-        region: item.region || pointsToRegion(item.points),
-        __data__: deepClone(item),
-      }))];
+      ...this.labelList, ...list.map((item) => {
+        if (!item.points?.length) {
+          const {startPoint, endPoint} = regionToPoint(item.region);
+          item.points = [startPoint, endPoint];
+        }
+        return new LabelModel({
+          ...item,
+          region: item.region || pointsToRegion(item.points),
+          __data__: deepClone(item),
+        });
+      })];
     this.board?.setLabelList?.(this.labelList);
     this.shape?.setLabelList?.(this.labelList);
     this.area?.setLabelList?.(this.labelList);