kfb-view 2.1.7 → 2.1.9

package/.idea/git_toolbox_prj.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="GitToolBoxProjectSettings">
+    <option name="commitMessageIssueKeyValidationOverride">
+      <BoolValueOverride>
+        <option name="enabled" value="true" />
+      </BoolValueOverride>
+    </option>
+    <option name="commitMessageValidationConfigOverride">
+      <CommitMessageValidationOverride>
+        <option name="enabled" value="true" />
+      </CommitMessageValidationOverride>
+    </option>
+  </component>
+</project>

package/.idea/workspace.xml

@@ -36,7 +36,9 @@
     </select>
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="55024232-8108-4dc9-9bd3-0fd2aa2f34f8" name="Default Changelist" comment="" />
+    <list default="true" id="55024232-8108-4dc9-9bd3-0fd2aa2f34f8" name="Default Changelist" comment="">
+      <change beforePath="$PROJECT_DIR$/package.json" beforeDir="false" afterPath="$PROJECT_DIR$/package.json" afterDir="false" />
+    </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@@ -58,6 +60,9 @@
     </option>
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
   </component>
+  <component name="MarkdownSettingsMigration">
+    <option name="stateVersion" value="1" />
+  </component>
   <component name="ProjectId" id="1hqXz2bwk8xsvUX2aTlZ9SFeYgK" />
   <component name="ProjectViewState">
     <option name="hideEmptyMiddlePackages" value="true" />
@@ -66,6 +71,7 @@
   <component name="PropertiesComponent">
     <property name="RunOnceActivity.OpenProjectViewOnStart" value="true" />
     <property name="WebServerToolWindowFactoryState" value="false" />
+    <property name="dart.analysis.tool.window.visible" value="false" />
     <property name="last_opened_file_path" value="$PROJECT_DIR$" />
     <property name="list.type.of.created.stylesheet" value="CSS" />
     <property name="node.js.detected.package.eslint" value="true" />
@@ -74,11 +80,11 @@
     <property name="node.js.path.for.package.standard" value="project" />
     <property name="node.js.selected.package.eslint" value="(autodetect)" />
     <property name="node.js.selected.package.standard" value="" />
+    <property name="nodejs_interpreter_path" value="$USER_HOME$/.nvm/versions/node/v10.15.1/bin/node" />
     <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
     <property name="nodejs_npm_path_reset_for_default_project" value="true" />
-    <property name="nodejs_package_manager_path" value="yarn" />
-    <property name="restartRequiresConfirmation" value="false" />
-    <property name="settings.editor.selected.configurable" value="project.propVCSSupport.CommitDialog" />
+    <property name="nodejs_package_manager_path" value="npm" />
+    <property name="settings.editor.selected.configurable" value="settings.nodejs" />
     <property name="ts.external.directory.path" value="$APPLICATION_HOME_DIR$/plugins/JavaScriptLanguage/jsLanguageServicesImpl/external" />
     <property name="vue.rearranger.settings.migration" value="true" />
   </component>
@@ -148,7 +154,7 @@
       <scripts>
         <script value="server:hot" />
       </scripts>
-      <node-interpreter value="project" />
+      <node-interpreter value="$USER_HOME$/.nvm/versions/node/v10.15.1/bin/node" />
       <package-manager value="npm" />
       <envs />
       <method v="2" />
@@ -163,9 +169,9 @@
     <recent_temporary>
       <list>
         <item itemvalue="npm.build:lib" />
+        <item itemvalue="npm.build:prod" />
         <item itemvalue="npm.server:hot" />
         <item itemvalue="npm.lint" />
-        <item itemvalue="npm.build:prod" />
         <item itemvalue="npm.server:dev" />
       </list>
     </recent_temporary>
@@ -243,7 +249,14 @@
       <workItem from="1634268135304" duration="1276000" />
       <workItem from="1634344422400" duration="3753000" />
       <workItem from="1634435147345" duration="2072000" />
-      <workItem from="1634438173344" duration="675000" />
+      <workItem from="1634438173344" duration="4115000" />
+      <workItem from="1634553017155" duration="1214000" />
+      <workItem from="1634689926208" duration="599000" />
+      <workItem from="1634776612768" duration="633000" />
+      <workItem from="1641349006244" duration="1011000" />
+      <workItem from="1641351835998" duration="596000" />
+      <workItem from="1646288182802" duration="1809000" />
+      <workItem from="1646290338220" duration="2938000" />
     </task>
     <task id="LOCAL-00001" summary="2.0.0重构">
       <created>1600767106537</created>
@@ -560,7 +573,28 @@
       <option name="project" value="LOCAL" />
       <updated>1634437932304</updated>
     </task>
-    <option name="localTasksCounter" value="46" />
+    <task id="LOCAL-00046" summary="优化，增加部分注释">
+      <created>1646292963908</created>
+      <option name="number" value="00046" />
+      <option name="presentableId" value="LOCAL-00046" />
+      <option name="project" value="LOCAL" />
+      <updated>1646292963908</updated>
+    </task>
+    <task id="LOCAL-00047" summary="2.1.8">
+      <created>1646292978431</created>
+      <option name="number" value="00047" />
+      <option name="presentableId" value="LOCAL-00047" />
+      <option name="project" value="LOCAL" />
+      <updated>1646292978431</updated>
+    </task>
+    <task id="LOCAL-00048" summary="TerserPlugin">
+      <created>1646293408931</created>
+      <option name="number" value="00048" />
+      <option name="presentableId" value="LOCAL-00048" />
+      <option name="project" value="LOCAL" />
+      <updated>1646293408931</updated>
+    </task>
+    <option name="localTasksCounter" value="49" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -598,14 +632,10 @@
         </entry>
       </map>
     </option>
-    <option name="oldMeFiltersMigrated" value="true" />
   </component>
   <component name="VcsManagerConfiguration">
     <option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="false" />
     <option name="LOCAL_CHANGES_DETAILS_PREVIEW_SHOWN" value="false" />
-    <MESSAGE value="2.0.10缩略图" />
-    <MESSAGE value="2.0.11截图优化" />
-    <MESSAGE value="2.0.12增加lib打包" />
     <MESSAGE value="导航图优化" />
     <MESSAGE value="gnore" />
     <MESSAGE value="标注信息从shape中移到area" />
@@ -628,113 +658,14 @@
     <MESSAGE value="navigator 获取元素方式修改" />
     <MESSAGE value="chrome 49版本兼容" />
     <MESSAGE value="刻度线显示异常" />
-    <option name="LAST_COMMIT_MESSAGE" value="刻度线显示异常" />
+    <MESSAGE value="优化，增加部分注释" />
+    <MESSAGE value="2.1.8" />
+    <MESSAGE value="TerserPlugin" />
+    <option name="LAST_COMMIT_MESSAGE" value="TerserPlugin" />
     <option name="REFORMAT_BEFORE_PROJECT_COMMIT" value="true" />
   </component>
-  <component name="WindowStateProjectService">
-    <state x="738" y="358" width="1084" height="756" key="#com.intellij.execution.impl.EditConfigurationsDialog" timestamp="1626252602840">
-      <screen x="0" y="27" width="2560" height="1348" />
-    </state>
-    <state x="738" y="358" width="1084" height="756" key="#com.intellij.execution.impl.EditConfigurationsDialog/0.27.2560.1348@0.27.2560.1348" timestamp="1626252602840" />
-    <state x="804" y="176" width="937" height="804" key="CommitChangelistDialog2" timestamp="1634437932051">
-      <screen x="0" y="27" width="1861" height="1052" />
-    </state>
-    <state x="804" y="176" width="937" height="804" key="CommitChangelistDialog2/0.27.1861.1052@0.27.1861.1052" timestamp="1634437932051" />
-    <state x="1106" y="264" width="920" height="1030" key="CommitChangelistDialog2/0.27.2560.1348@0.27.2560.1348" timestamp="1632379604925" />
-    <state x="233" y="564" width="2360" height="1150" key="DiffContextDialog" timestamp="1632379478129">
-      <screen x="0" y="27" width="2560" height="1348" />
-    </state>
-    <state x="233" y="564" width="2360" height="1150" key="DiffContextDialog/0.27.2560.1348@0.27.2560.1348" timestamp="1632379478129" />
-    <state x="1595" y="688" width="424" height="484" key="FileChooserDialogImpl" timestamp="1632743649599">
-      <screen x="0" y="27" width="3840" height="2068" />
-    </state>
-    <state x="1063" y="458" width="424" height="484" key="FileChooserDialogImpl/0.27.2560.1348@0.27.2560.1348" timestamp="1630485689567" />
-    <state x="1595" y="688" key="FileChooserDialogImpl/0.27.3840.2068@0.27.3840.2068" timestamp="1632743649599" />
-    <state width="1834" height="301" key="GridCell.Tab.0.bottom" timestamp="1634436647542">
-      <screen x="0" y="27" width="1861" height="1052" />
-    </state>
-    <state width="1834" height="301" key="GridCell.Tab.0.bottom/0.27.1861.1052@0.27.1861.1052" timestamp="1634436647542" />
-    <state width="2533" height="408" key="GridCell.Tab.0.bottom/0.27.2560.1348@0.27.2560.1348" timestamp="1632382458365" />
-    <state width="1834" height="301" key="GridCell.Tab.0.center" timestamp="1634436647540">
-      <screen x="0" y="27" width="1861" height="1052" />
-    </state>
-    <state width="1834" height="301" key="GridCell.Tab.0.center/0.27.1861.1052@0.27.1861.1052" timestamp="1634436647540" />
-    <state width="2533" height="408" key="GridCell.Tab.0.center/0.27.2560.1348@0.27.2560.1348" timestamp="1632382458362" />
-    <state width="1834" height="301" key="GridCell.Tab.0.left" timestamp="1634436647539">
-      <screen x="0" y="27" width="1861" height="1052" />
-    </state>
-    <state width="1834" height="301" key="GridCell.Tab.0.left/0.27.1861.1052@0.27.1861.1052" timestamp="1634436647539" />
-    <state width="2533" height="408" key="GridCell.Tab.0.left/0.27.2560.1348@0.27.2560.1348" timestamp="1632382458361" />
-    <state width="1834" height="301" key="GridCell.Tab.0.right" timestamp="1634436647541">
-      <screen x="0" y="27" width="1861" height="1052" />
-    </state>
-    <state width="1834" height="301" key="GridCell.Tab.0.right/0.27.1861.1052@0.27.1861.1052" timestamp="1634436647541" />
-    <state width="2533" height="408" key="GridCell.Tab.0.right/0.27.2560.1348@0.27.2560.1348" timestamp="1632382458364" />
-    <state width="2533" height="457" key="GridCell.Tab.1.bottom" timestamp="1626673542669">
-      <screen x="0" y="27" width="2560" height="1348" />
-    </state>
-    <state width="2533" height="457" key="GridCell.Tab.1.bottom/0.27.2560.1348@0.27.2560.1348" timestamp="1626673542669" />
-    <state width="2533" height="457" key="GridCell.Tab.1.center" timestamp="1626673542666">
-      <screen x="0" y="27" width="2560" height="1348" />
-    </state>
-    <state width="2533" height="457" key="GridCell.Tab.1.center/0.27.2560.1348@0.27.2560.1348" timestamp="1626673542666" />
-    <state width="2533" height="457" key="GridCell.Tab.1.left" timestamp="1626673542663">
-      <screen x="0" y="27" width="2560" height="1348" />
-    </state>
-    <state width="2533" height="457" key="GridCell.Tab.1.left/0.27.2560.1348@0.27.2560.1348" timestamp="1626673542663" />
-    <state width="2533" height="457" key="GridCell.Tab.1.right" timestamp="1626673542668">
-      <screen x="0" y="27" width="2560" height="1348" />
-    </state>
-    <state width="2533" height="457" key="GridCell.Tab.1.right/0.27.2560.1348@0.27.2560.1348" timestamp="1626673542668" />
-    <state width="2533" height="457" key="GridCell.Tab.2.bottom" timestamp="1626673542674">
-      <screen x="0" y="27" width="2560" height="1348" />
-    </state>
-    <state width="2533" height="457" key="GridCell.Tab.2.bottom/0.27.2560.1348@0.27.2560.1348" timestamp="1626673542674" />
-    <state width="2533" height="457" key="GridCell.Tab.2.center" timestamp="1626673542672">
-      <screen x="0" y="27" width="2560" height="1348" />
-    </state>
-    <state width="2533" height="457" key="GridCell.Tab.2.center/0.27.2560.1348@0.27.2560.1348" timestamp="1626673542672" />
-    <state width="2533" height="457" key="GridCell.Tab.2.left" timestamp="1626673542671">
-      <screen x="0" y="27" width="2560" height="1348" />
-    </state>
-    <state width="2533" height="457" key="GridCell.Tab.2.left/0.27.2560.1348@0.27.2560.1348" timestamp="1626673542671" />
-    <state width="2533" height="457" key="GridCell.Tab.2.right" timestamp="1626673542673">
-      <screen x="0" y="27" width="2560" height="1348" />
-    </state>
-    <state width="2533" height="457" key="GridCell.Tab.2.right/0.27.2560.1348@0.27.2560.1348" timestamp="1626673542673" />
-    <state width="2533" height="457" key="GridCell.Tab.3.bottom" timestamp="1626673542682">
-      <screen x="0" y="27" width="2560" height="1348" />
-    </state>
-    <state width="2533" height="457" key="GridCell.Tab.3.bottom/0.27.2560.1348@0.27.2560.1348" timestamp="1626673542682" />
-    <state width="2533" height="457" key="GridCell.Tab.3.center" timestamp="1626673542679">
-      <screen x="0" y="27" width="2560" height="1348" />
-    </state>
-    <state width="2533" height="457" key="GridCell.Tab.3.center/0.27.2560.1348@0.27.2560.1348" timestamp="1626673542679" />
-    <state width="2533" height="457" key="GridCell.Tab.3.left" timestamp="1626673542676">
-      <screen x="0" y="27" width="2560" height="1348" />
-    </state>
-    <state width="2533" height="457" key="GridCell.Tab.3.left/0.27.2560.1348@0.27.2560.1348" timestamp="1626673542676" />
-    <state width="2533" height="457" key="GridCell.Tab.3.right" timestamp="1626673542680">
-      <screen x="0" y="27" width="2560" height="1348" />
-    </state>
-    <state width="2533" height="457" key="GridCell.Tab.3.right/0.27.2560.1348@0.27.2560.1348" timestamp="1626673542680" />
-    <state x="1031" y="327" width="487" height="745" key="RollbackChangesDialog" timestamp="1630460804017">
-      <screen x="0" y="27" width="2560" height="1348" />
-    </state>
-    <state x="1031" y="327" width="487" height="745" key="RollbackChangesDialog/0.27.2560.1348@0.27.2560.1348" timestamp="1630460804017" />
-    <state x="1122" y="606" width="306" height="187" key="VCS.ChangelistChooser" timestamp="1631757307782">
-      <screen x="0" y="27" width="2560" height="1348" />
-    </state>
-    <state x="1122" y="606" width="306" height="187" key="VCS.ChangelistChooser/0.27.2560.1348@0.27.2560.1348" timestamp="1631757307782" />
-    <state x="636" y="327" width="800" height="531" key="Vcs.Push.Dialog.v2" timestamp="1634268799005">
-      <screen x="0" y="27" width="1861" height="1052" />
-    </state>
-    <state x="636" y="327" key="Vcs.Push.Dialog.v2/0.27.1861.1052@0.27.1861.1052" timestamp="1634268799005" />
-    <state x="875" y="434" width="800" height="531" key="Vcs.Push.Dialog.v2/0.27.2560.1348@0.27.2560.1348" timestamp="1632364390828" />
-    <state x="704" y="306" width="839" height="626" key="find.popup" timestamp="1634435934505">
-      <screen x="0" y="27" width="1861" height="1052" />
-    </state>
-    <state x="704" y="306" width="839" height="626" key="find.popup/0.27.1861.1052@0.27.1861.1052" timestamp="1634435934505" />
-    <state x="969" y="384" width="1154" height="626" key="find.popup/0.27.2560.1348@0.27.2560.1348" timestamp="1632379533248" />
+  <component name="XSLT-Support.FileAssociations.UIState">
+    <expand />
+    <select />
   </component>
 </project>

package/config/webpack.lib.conf.js

@@ -1,5 +1,5 @@
 const utils = require('./utils');
-const UglifyJsPlugin = require('uglifyjs-webpack-plugin');
+const TerserPlugin = require('terser-webpack-plugin');
 const EsmWebpackPlugin = require('@purtuga/esm-webpack-plugin');
 
 module.exports = {
@@ -61,13 +61,13 @@ module.exports = {
     // production模式下自动开启
     minimize: true,
     minimizer: [
-      new UglifyJsPlugin({
+      new TerserPlugin({
         test: /\.js($|\?)/i,
         // 是否启用缓存
         cache: true,
         // 启用并行化
         parallel: true,
-        uglifyOptions: {
+        terserOptions: {
           // 支持ie8
           ie8: false,
           // enable work around safari 10/11 bugs in loop scoping and await,

package/config/webpack.prod.conf.js

@@ -2,7 +2,7 @@ const utils = require('./utils');
 // const webpack = require('webpack');
 const webpackMerge = require('webpack-merge');
 const baseWebpackConfig = require('./webpack.base.conf');
-const UglifyJsPlugin = require('uglifyjs-webpack-plugin');
+const TerserPlugin = require('terser-webpack-plugin');
 const MiniCssExtractPlugin = require('mini-css-extract-plugin');
 
 process.env.NODE_ENV = process.env.NODE_ENV ?
@@ -31,13 +31,13 @@ module.exports = function() {
       // production模式下自动开启
       minimize: true,
       minimizer: [
-        new UglifyJsPlugin({
+        new TerserPlugin({
           test: /\.js($|\?)/i,
           // 是否启用缓存
           cache: true,
           // 启用并行化
           parallel: true,
-          uglifyOptions: {
+          terserOptions: {
             // 支持ie8
             ie8: false,
             // enable work around safari 10/11 bugs in loop scoping and await,

package/example/index.js

@@ -1,5 +1,6 @@
 import {KfbView, cacheGammaTable, hslToRgb, rgbToHsl} from '../src';
 import axios from 'axios';
+import {EVENT_TAILORING_SCREENSHOT} from '../src/const/event';
 
 const fileName = '/upload/large_file/last/fb6f566d15cc52331e3c4f3e1794a748/T2020-00935.kfb';
 
@@ -20,6 +21,9 @@ instance.get(`/ai/kfb/info?file=${fileName}`).then(({data}) => {
       disabled: false,
       drag: true,
     },
+    board: {
+      ROI: true,
+    },
     graduation: {
       right: 30,
     },
@@ -66,7 +70,15 @@ instance.get(`/ai/kfb/info?file=${fileName}`).then(({data}) => {
       },
     },
     tileDrawing(e) {
-      const {context, rendered, sourceWidth, sourceHeight, position, size, initRendered} = e;
+      const {
+        context,
+        rendered,
+        sourceWidth,
+        sourceHeight,
+        position,
+        size,
+        initRendered,
+      } = e;
       let rangeA = document.querySelector('#a').value / 1;
       let rangeB = document.querySelector('#b').value / 1;
       let rangeC = document.querySelector('#c').value / 1;
@@ -176,8 +188,11 @@ instance.get(`/ai/kfb/info?file=${fileName}`).then(({data}) => {
   rect.onclick = () => {
     kv.board.startDraw({
       tool: KfbView.marks.RECTANGLE,
-      // isROI: true,
+      isROI: true,
       once: true,
+      measure: false,
+      resize: false,
+      move: false,
     });
   };
   line.onclick = () => {
@@ -258,18 +273,18 @@ instance.get(`/ai/kfb/info?file=${fileName}`).then(({data}) => {
   kv.$on(KfbView.events.EVENT_CANCEL_SELECT_LABEL, (e) => {
     // kv.board.endDraw();
   });
-  /*  const {width, height} = kv.$options;
-  kv.rotation.init(
-     {
-       left: width / 2 - 100,
-       top: height / 2 - 100,
-       height: data.height,
-       width: data.width,
-       color: '#F00',
-     });
-    kv.$on(KfbView.events.EVENT_TAILORING_SCREENSHOT, (e) => {
-      console.log(e.detail);
-    });*/
+  const {width, height} = kv.$options;
+  kv.$on(KfbView.events.EVENT_TAILORING_SCREENSHOT, (e) => {
+    console.log(e.detail);
+  });
+  /*  kv.tailoring.init(
+      {
+        left: width / 2 - 100,
+        top: height / 2 - 100,
+        height: 200,
+        width: 200,
+        color: '#F00',
+      });*/
   setTimeout(() => {
     // kv.destroy();
   }, 6000);