hellfire 0.27.13 → 0.27.15

package/CHANGELOG.md

@@ -2,6 +2,14 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+## [0.27.15](http://10.16.100.57/diffusion/115/paladin/compare/v0.27.14...v0.27.15) (2024-06-14)
+
+
+
+## [0.27.14](http://10.16.100.57/diffusion/115/paladin/compare/v0.27.13...v0.27.14) (2024-06-14)
+
+
+
 ## [0.27.13](http://10.16.100.57/diffusion/115/paladin/compare/v0.27.12...v0.27.13) (2024-06-06)
 
 

package/README.md

@@ -160,7 +160,7 @@ anonymous: boolean
 <b>`dicomSettingChange`</b>
 
 ```
-dicomSettingChange: (key, data) => void
+dicomSettingChange: (data) => void
 ```
 
 功能设置修改的回调

package/dist/index.js

@@ -31462,10 +31462,13 @@ function isPromise(obj) {
 }
 
 var CreateModal = function CreateModal(props) {
+  var childWithProps = /*#__PURE__*/React__default.cloneElement(props.child, {
+    close: props.close
+  });
   return /*#__PURE__*/React__default.createElement(Modal, _extends_1({}, props, {
     footer: null,
     onCancel: props.close
-  }), props.child, props.footer && /*#__PURE__*/React__default.createElement("div", {
+  }), childWithProps, props.footer && /*#__PURE__*/React__default.createElement("div", {
     className: "paladin-modal-footer"
   }, props.cancelButtonProps.show && /*#__PURE__*/React__default.createElement(Button, {
     type: props.cancelButtonProps.type,
@@ -43070,7 +43073,8 @@ var DicomToolFlattenMode$1 = /*#__PURE__*/function (_Component) {
           openDicomModal = _this$props3.openDicomModal,
           handleFullscreen = _this$props3.handleFullscreen,
           setCustomWindowLayoutType = _this$props3.setCustomWindowLayoutType,
-          operateKeyImages = _this$props3.operateKeyImages;
+          operateKeyImages = _this$props3.operateKeyImages,
+          openSettingModal = _this$props3.openSettingModal;
       var isThree = MPR || VR || Surgery || MIP;
       var IODisconnect = !IO;
       var commonTools = ['Layout', 'StackScroll', 'Wwwc', 'Zoom', 'Pan', 'Rotate', 'ReverseColor', 'Sharpen', 'Cine', 'FalseColor', 'Link', 'ReferencePosition', 'Reset']; // 只有传入了关键图像操作的方法 才显示这个按钮
@@ -43315,7 +43319,14 @@ var DicomToolFlattenMode$1 = /*#__PURE__*/function (_Component) {
             start3D('Surgery');
           }
         }
-      }, Surgery ? '退出手术路径规划' : '手术路径规划'))));
+      }, Surgery ? '退出手术路径规划' : '手术路径规划')), /*#__PURE__*/React__default.createElement("div", {
+        className: "paladin-flex-row"
+      }, /*#__PURE__*/React__default.createElement(LargeToolItem$1, {
+        onClick: function onClick(e) {
+          e.stopPropagation();
+          openSettingModal();
+        }
+      }, "\u529F\u80FD\u8BBE\u7F6E"))));
     }
   }]);
 
@@ -45776,7 +45787,7 @@ function _ref$1m() {
   return _ref$1m.apply(this, arguments);
 }
 
-var css_248z$r = ".paladin-user-setting {\n  padding: 0 20px;\n  margin-bottom: 30px;\n  font-size: 15px;\n}\n.paladin-user-setting p {\n  font-size: 16px;\n}\n.paladin-user-setting .paladin-user-setting-remark {\n  font-size: 14px;\n  color: #666;\n  margin: 10px 0;\n}\n.paladin-user-setting .paladin-setting-radio {\n  display: flex;\n}\n.paladin-user-setting .paladin-setting-radio .paladin-setting-radio-item {\n  display: flex;\n  flex-direction: row;\n  margin-right: 10px;\n}\n.paladin-user-setting .paladin-setting-radio .paladin-setting-radio-item:first-child {\n  margin-right: 0;\n}\n.paladin-user-setting .paladin-setting-radio .paladin-setting-radio-item input {\n  display: flex;\n  flex-direction: column;\n  width: 20px;\n  height: 20px;\n}\n.paladin-user-setting .paladin-setting-radio .paladin-setting-radio-item span {\n  display: flex;\n  flex-direction: column;\n}\n.paladin-user-setting .paladin-setting-hotkey {\n  display: flex;\n  flex-direction: row;\n  flex-wrap: wrap;\n}\n.paladin-user-setting .paladin-setting-hotkey .paladin-setting-hotkey-item {\n  display: flex;\n  flex-direction: column;\n  flex: none;\n  padding: 5px 10px;\n  border: 1px solid #666;\n  border-radius: 3px;\n  margin-right: 10px;\n  margin-bottom: 10px;\n}\n";
+var css_248z$r = ".paladin-user-setting {\n  padding: 0 20px;\n  margin-bottom: 30px;\n  font-size: 15px;\n}\n.paladin-user-setting p {\n  font-size: 16px;\n}\n.paladin-user-setting .paladin-user-setting-remark {\n  color: #d43f3a;\n  margin: 10px 0 0 0;\n}\n.paladin-user-setting .paladin-user-setting-footer {\n  margin-top: 15px;\n  text-align: right;\n}\n.paladin-user-setting .paladin-user-setting-footer button {\n  margin-left: 10px;\n}\n.paladin-user-setting .paladin-setting-radio {\n  display: flex;\n}\n.paladin-user-setting .paladin-setting-radio .paladin-setting-radio-label {\n  display: flex;\n  flex-direction: row;\n  align-items: center;\n  justify-content: center;\n}\n.paladin-user-setting .paladin-setting-radio .paladin-setting-radio-item {\n  display: flex;\n  flex-direction: row;\n  margin-right: 10px;\n  align-items: center;\n  justify-content: center;\n}\n.paladin-user-setting .paladin-setting-radio .paladin-setting-radio-item .paladin-ipt {\n  padding: 0 !important;\n  margin: 0 3px 0 0 !important;\n}\n.paladin-user-setting .paladin-setting-radio .paladin-setting-radio-item input {\n  display: flex;\n  flex-direction: column;\n  width: 20px;\n  height: 20px;\n}\n.paladin-user-setting .paladin-setting-radio .paladin-setting-radio-item span {\n  display: flex;\n  flex-direction: column;\n}\n.paladin-user-setting .paladin-setting-hotkey {\n  display: flex;\n  flex-direction: row;\n  flex-wrap: wrap;\n}\n.paladin-user-setting .paladin-setting-hotkey .paladin-setting-hotkey-item {\n  display: flex;\n  flex-direction: column;\n  flex: none;\n  padding: 5px 10px;\n  border: 1px solid #666;\n  border-radius: 3px;\n  margin-right: 10px;\n  margin-bottom: 10px;\n}\n";
 styleInject$1(css_248z$r);
 
 var dicomSettingLeftMouseTools = ['StackScroll', 'Wwwc'];
@@ -45802,41 +45813,43 @@ var dicomSettingRightMouseToolsDic = [{
 }];
 var dicomSettingHotKeyDic = [{
   label: '调窗',
-  hotkey: 'Q'
+  hotkey: 'T'
 }, {
   label: '浏览',
-  hotkey: 'W'
+  hotkey: 'L'
 }, {
   label: '缩放',
-  hotkey: 'E'
+  hotkey: 'S'
 }, {
   label: '移动',
-  hotkey: 'R'
+  hotkey: 'Y'
 }, {
   label: '反色',
-  hotkey: 'T'
+  hotkey: 'F'
 }, {
   label: '直线测量',
-  hotkey: 'A'
+  hotkey: 'Z'
 }, {
   label: '矩形测量',
-  hotkey: 'S'
+  hotkey: 'J'
 }, {
   label: 'CT值测量',
-  hotkey: 'D'
+  hotkey: 'C'
 }, {
   label: '连续测量',
-  hotkey: 'F'
+  hotkey: 'A'
 }, {
   label: '扫描定位线',
-  hotkey: 'G'
+  hotkey: 'D'
 }, {
   label: '显示/隐藏图像信息',
-  hotkey: 'Z'
+  hotkey: 'X'
 }];
+var hotKeyIsOpen = window.localStorage.getItem('hellfire-hotkey-open') || 'open';
 var customDicomSetting = {
   leftMouseTool: 'Wwwc',
-  rightMouseTool: 'Zoom'
+  rightMouseTool: 'Zoom',
+  hotKeyIsOpen: hotKeyIsOpen
 };
 
 var saveCustomDicomSetting = function saveCustomDicomSetting() {
@@ -45868,6 +45881,24 @@ var UserSettingModal = /*#__PURE__*/function (_Component) {
     classCallCheck(this, UserSettingModal);
 
     _this = _super.call(this, props);
+
+    defineProperty(assertThisInitialized(_this), "handleSave", function () {
+      var dicomSettingChange = _this.props.dicomSettingChange;
+      window.localStorage.setItem('hellfire-hotkey-open', _this.state.hotKeyIsOpen);
+
+      if (dicomSettingChange) {
+        dicomSettingChange && dicomSettingChange({
+          leftMouseTool: _this.state.leftMouseTool,
+          rightMouseTool: _this.state.rightMouseTool
+        });
+      } else {
+        // 没有接口层面的记忆，就直接本地存储
+        window.localStorage.setItem('hellfire-left-mouse-tool', _this.state.leftMouseTool);
+        window.localStorage.setItem('hellfire-right-mouse-tool', _this.state.rightMouseTool);
+        window.location.reload();
+      }
+    });
+
     _this.state = _objectSpread$I({}, customDicomSetting);
     return _this;
   }
@@ -45879,16 +45910,15 @@ var UserSettingModal = /*#__PURE__*/function (_Component) {
 
       var _this$state = this.state,
           leftMouseTool = _this$state.leftMouseTool,
-          rightMouseTool = _this$state.rightMouseTool;
-      var dicomSettingChange = this.props.dicomSettingChange;
+          rightMouseTool = _this$state.rightMouseTool,
+          hotKeyIsOpen = _this$state.hotKeyIsOpen;
+      var close = this.props.close;
       return /*#__PURE__*/React__default.createElement("div", {
         className: 'paladin-user-setting'
-      }, /*#__PURE__*/React__default.createElement("div", {
-        className: 'paladin-user-setting-remark'
-      }, "\u6CE8\uFF1A\u4FEE\u6539\u8BBE\u7F6E\u540E\uFF0C\u9700\u91CD\u542F\u8F6F\u4EF6\u6216\u91CD\u65B0\u767B\u5F55\u8D26\u53F7\uFF0C\u624D\u80FD\u751F\u6548\u3002"), /*#__PURE__*/React__default.createElement("p", null, "\u9F20\u6807\u8BBE\u7F6E\uFF1A"), /*#__PURE__*/React__default.createElement("div", {
+      }, /*#__PURE__*/React__default.createElement("p", null, "\u9F20\u6807\u8BBE\u7F6E\uFF1A"), /*#__PURE__*/React__default.createElement("div", {
         className: 'paladin-setting-radio'
       }, /*#__PURE__*/React__default.createElement("div", {
-        className: 'paladin-setting-radio-item'
+        className: 'paladin-setting-radio-label'
       }, "\u5DE6\u952E\uFF1A"), dicomSettingLeftMouseToolsDic && dicomSettingLeftMouseToolsDic.map(function (item, index) {
         return /*#__PURE__*/React__default.createElement("div", {
           className: 'paladin-setting-radio-item',
@@ -45900,8 +45930,6 @@ var UserSettingModal = /*#__PURE__*/function (_Component) {
             _this2.setState({
               leftMouseTool: item.value
             });
-
-            dicomSettingChange && dicomSettingChange('leftMouseTool', item.value);
           }
         }), /*#__PURE__*/React__default.createElement("span", null, item.label));
       })), /*#__PURE__*/React__default.createElement("div", {
@@ -45910,7 +45938,7 @@ var UserSettingModal = /*#__PURE__*/function (_Component) {
           marginTop: '10px'
         }
       }, /*#__PURE__*/React__default.createElement("div", {
-        className: 'paladin-setting-radio-item'
+        className: 'paladin-setting-radio-label'
       }, "\u53F3\u952E\uFF1A"), dicomSettingRightMouseToolsDic && dicomSettingRightMouseToolsDic.map(function (item, index) {
         return /*#__PURE__*/React__default.createElement("div", {
           className: 'paladin-setting-radio-item',
@@ -45922,8 +45950,6 @@ var UserSettingModal = /*#__PURE__*/function (_Component) {
             _this2.setState({
               rightMouseTool: item.value
             });
-
-            dicomSettingChange && dicomSettingChange('rightMouseTool', item.value);
           }
         }), /*#__PURE__*/React__default.createElement("span", null, item.label));
       })), /*#__PURE__*/React__default.createElement("p", {
@@ -45931,13 +45957,47 @@ var UserSettingModal = /*#__PURE__*/function (_Component) {
           marginTop: '30px'
         }
       }, "\u5FEB\u6377\u952E\u8BF4\u660E\uFF1A"), /*#__PURE__*/React__default.createElement("div", {
+        className: 'paladin-setting-radio',
+        style: {
+          marginBottom: '15px'
+        }
+      }, /*#__PURE__*/React__default.createElement("div", {
+        className: 'paladin-setting-radio-item'
+      }, /*#__PURE__*/React__default.createElement(Input$1, {
+        type: "radio",
+        checked: hotKeyIsOpen === 'open',
+        onChange: function onChange(e) {
+          _this2.setState({
+            hotKeyIsOpen: 'open'
+          });
+        }
+      }), /*#__PURE__*/React__default.createElement("span", null, "\u5F00\u542F\u5FEB\u6377\u952E")), /*#__PURE__*/React__default.createElement("div", {
+        className: 'paladin-setting-radio-item'
+      }, /*#__PURE__*/React__default.createElement(Input$1, {
+        type: "radio",
+        checked: hotKeyIsOpen === 'close',
+        onChange: function onChange(e) {
+          _this2.setState({
+            hotKeyIsOpen: 'close'
+          });
+        }
+      }), /*#__PURE__*/React__default.createElement("span", null, "\u5173\u95ED\u5FEB\u6377\u952E"))), /*#__PURE__*/React__default.createElement("div", {
         className: 'paladin-setting-hotkey'
       }, dicomSettingHotKeyDic && dicomSettingHotKeyDic.map(function (value, index) {
         return /*#__PURE__*/React__default.createElement("div", {
           className: 'paladin-setting-hotkey-item',
           key: "setting-hotkey-".concat(index)
         }, value.label, "(", value.hotkey, ")");
-      })));
+      })), /*#__PURE__*/React__default.createElement("div", {
+        className: 'paladin-user-setting-remark'
+      }, "\u6CE8\uFF1A\u4FDD\u5B58\u540E\u4F1A\u81EA\u52A8\u5237\u65B0\u9875\u9762"), /*#__PURE__*/React__default.createElement("div", {
+        className: 'paladin-user-setting-footer'
+      }, /*#__PURE__*/React__default.createElement(Button, {
+        onClick: close
+      }, "\u5173\u95ED"), /*#__PURE__*/React__default.createElement(Button, {
+        type: 'primary',
+        onClick: this.handleSave
+      }, "\u4FDD\u5B58")));
     }
   }]);
 
@@ -47135,10 +47195,7 @@ var mergeProps$j = function mergeProps(propsFromState, propsFromDispatch, ownPro
         dicomSettingChange: ownProps.dicomSettingChange
       }), {
         title: '功能设置',
-        okText: '关闭',
-        cancelButtonProps: {
-          show: false
-        },
+        footer: false,
         style: {
           width: '580px',
           top: '10%',
@@ -54356,17 +54413,17 @@ index$2.configure({
     187: 'key-add',
     109: 'key-minus',
     189: 'key-minus',
-    81: 'key-q',
-    87: 'key-w',
-    69: 'key-e',
-    82: 'key-r',
     84: 'key-t',
-    65: 'key-a',
+    76: 'key-l',
     83: 'key-s',
-    68: 'key-d',
+    89: 'key-y',
     70: 'key-f',
-    71: 'key-g',
-    90: 'key-z'
+    90: 'key-z',
+    74: 'key-j',
+    67: 'key-c',
+    65: 'key-a',
+    68: 'key-d',
+    78: 'key-x'
   }
 });
 
@@ -54468,9 +54525,18 @@ var DicomView = /*#__PURE__*/function (_Component) {
         }
       }); // 自定义窗值设置
 
-      this.props.windowSetting && saveWwwcCustomDic(this.props.windowSetting); // 自定义的功能设置初始值
+      this.props.windowSetting && saveWwwcCustomDic(this.props.windowSetting); // 自定义的功能设置初始值 1.外部传入、保存 2.内部本地存储
 
-      this.props.dicomSetting && saveCustomDicomSetting(this.props.dicomSetting);
+      if (this.props.dicomSetting) {
+        saveCustomDicomSetting(this.props.dicomSetting);
+      } else {
+        var leftMouseTool = window.localStorage.getItem('hellfire-left-mouse-tool');
+        var rightMouseTool = window.localStorage.getItem('hellfire-right-mouse-tool');
+        saveCustomDicomSetting({
+          leftMouseTool: leftMouseTool,
+          rightMouseTool: rightMouseTool
+        });
+      }
     }
   }, {
     key: "componentWillReceiveProps",
@@ -55122,6 +55188,7 @@ var mergeProps$t = function mergeProps(propsFromState, propsFromDispatch, ownPro
 
   var throttleForwardFunc = throttle$9(forwardFunc, stepTime);
   var throttleBackFunc = throttle$9(backFunc, stepTime);
+  var hotKeyIsOpen = customDicomSetting.hotKeyIsOpen === 'open';
   /**
    *
    * Key values:
@@ -55155,17 +55222,17 @@ var mergeProps$t = function mergeProps(propsFromState, propsFromDispatch, ownPro
       WWWC9: ['key-9'],
       PAUSE: "space",
       ESC: "esc",
-      KEYQ: ['key-q'],
-      KEYW: ['key-w'],
-      KEYE: ['key-e'],
-      KEYR: ['key-r'],
       KEYT: ['key-t'],
-      KEYA: ['key-a'],
+      KEYL: ['key-l'],
       KEYS: ['key-s'],
-      KEYD: ['key-d'],
+      KEYY: ['key-y'],
       KEYF: ['key-f'],
-      KEYG: ['key-g'],
-      KEYZ: ['key-z']
+      KEYZ: ['key-z'],
+      KEYJ: ['key-j'],
+      KEYC: ['key-c'],
+      KEYA: ['key-a'],
+      KEYD: ['key-d'],
+      KEYX: ['key-x']
     },
     handlers: {
       PAUSE: function PAUSE() {
@@ -55439,46 +55506,90 @@ var mergeProps$t = function mergeProps(propsFromState, propsFromDispatch, ownPro
         if (!activeElement) return;
         setWwwc(activeElement, wwwcCustomDic[9].ww, wwwcCustomDic[9].wc);
       },
-      KEYQ: function KEYQ() {
+      KEYT: function KEYT() {
+        if (!hotKeyIsOpen) {
+          return;
+        }
+
         propsFromDispatch.setActiveTool('Wwwc');
       },
-      KEYW: function KEYW() {
+      KEYL: function KEYL() {
+        if (!hotKeyIsOpen) {
+          return;
+        }
+
         propsFromDispatch.setActiveTool('StackScroll');
       },
-      KEYE: function KEYE() {
+      KEYS: function KEYS() {
+        if (!hotKeyIsOpen) {
+          return;
+        }
+
         propsFromDispatch.setActiveTool('Zoom');
       },
-      KEYR: function KEYR() {
+      KEYY: function KEYY() {
+        if (!hotKeyIsOpen) {
+          return;
+        }
+
         propsFromDispatch.setActiveTool('Pan');
       },
-      KEYT: function KEYT() {
-        // 反色
+      KEYF: function KEYF() {
+        if (!hotKeyIsOpen) {
+          return;
+        } // 反色
+
+
         var activeElement = getCurrentElement();
         if (!activeElement) return;
         setInvert(activeElement);
       },
-      KEYA: function KEYA() {
-        // 直线测量
+      KEYZ: function KEYZ() {
+        if (!hotKeyIsOpen) {
+          return;
+        } // 直线测量
+
+
         propsFromDispatch.setActiveTool('Length');
       },
-      KEYS: function KEYS() {
-        // 矩形测量
+      KEYJ: function KEYJ() {
+        if (!hotKeyIsOpen) {
+          return;
+        } // 矩形测量
+
+
         propsFromDispatch.setActiveTool('RectangleRoi');
       },
-      KEYD: function KEYD() {
-        // CT值测量
+      KEYC: function KEYC() {
+        if (!hotKeyIsOpen) {
+          return;
+        } // CT值测量
+
+
         propsFromDispatch.setActiveTool('Probe');
       },
-      KEYF: function KEYF() {
-        // 连续测量切换
+      KEYA: function KEYA() {
+        if (!hotKeyIsOpen) {
+          return;
+        } // 连续测量切换
+
+
         propsFromDispatch.toggleMeasure();
       },
-      KEYG: function KEYG() {
-        // 扫描定位线
+      KEYD: function KEYD() {
+        if (!hotKeyIsOpen) {
+          return;
+        } // 扫描定位线
+
+
         propsFromDispatch.activeDicomFunction('ReferenceLines');
       },
-      KEYZ: function KEYZ() {
-        // 显示隐藏图像信息
+      KEYX: function KEYX() {
+        if (!hotKeyIsOpen) {
+          return;
+        } // 显示隐藏图像信息
+
+
         propsFromDispatch.toggleOverlayText();
       }
     },