hellfire 0.17.0 → 0.17.4

package/CHANGELOG.md

@@ -2,6 +2,22 @@
 
 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.17.4](http://10.16.100.57/diffusion/115/paladin/compare/v0.17.3...v0.17.4) (2021-12-22)
+
+
+
+## [0.17.3](http://10.16.100.57/diffusion/115/paladin/compare/v0.17.2...v0.17.3) (2021-12-15)
+
+
+
+## [0.17.2](http://10.16.100.57/diffusion/115/paladin/compare/v0.17.1...v0.17.2) (2021-12-14)
+
+
+
+## [0.17.1](http://10.16.100.57/diffusion/115/paladin/compare/v0.17.0...v0.17.1) (2021-11-30)
+
+
+
 # [0.17.0](http://10.16.100.57/diffusion/115/paladin/compare/v0.16.1...v0.17.0) (2021-11-24)
 
 

package/dist/index.js

@@ -7349,6 +7349,22 @@ var cornerstoneToolStateReset = function cornerstoneToolStateReset(data) {
     data: data
   });
 };
+var paladinRefreshEvent = function paladinRefreshEvent() {
+  _default$e.emit('paladin_action', {
+    type: 'window_refresh'
+  });
+};
+var paladinModalOpenEvent = function paladinModalOpenEvent(data) {
+  _default$e.emit('paladin_action', {
+    type: 'modal_open',
+    data: data
+  });
+};
+var paladinModalCloseEvent = function paladinModalCloseEvent() {
+  _default$e.emit('paladin_action', {
+    type: 'modal_close'
+  });
+};
 
 (function () {
   var reactHotLoader = typeof reactHotLoaderGlobal !== 'undefined' ? reactHotLoaderGlobal.default : undefined;
@@ -7362,6 +7378,9 @@ var cornerstoneToolStateReset = function cornerstoneToolStateReset(data) {
   reactHotLoader.register(cornerstoneStateChangeEvent, "cornerstoneStateChangeEvent", "/Users/huyeqing/workspace/chainz/paladin/src/utils/paladinAction.js");
   reactHotLoader.register(cornerstoneToolUpdateEvent, "cornerstoneToolUpdateEvent", "/Users/huyeqing/workspace/chainz/paladin/src/utils/paladinAction.js");
   reactHotLoader.register(cornerstoneToolStateReset, "cornerstoneToolStateReset", "/Users/huyeqing/workspace/chainz/paladin/src/utils/paladinAction.js");
+  reactHotLoader.register(paladinRefreshEvent, "paladinRefreshEvent", "/Users/huyeqing/workspace/chainz/paladin/src/utils/paladinAction.js");
+  reactHotLoader.register(paladinModalOpenEvent, "paladinModalOpenEvent", "/Users/huyeqing/workspace/chainz/paladin/src/utils/paladinAction.js");
+  reactHotLoader.register(paladinModalCloseEvent, "paladinModalCloseEvent", "/Users/huyeqing/workspace/chainz/paladin/src/utils/paladinAction.js");
 })();
 
 (function () {
@@ -31921,6 +31940,7 @@ Modal.create = function (child, props) {
       visible: false
     });
     setTimeout(function () {
+      props.onCancel && props.onCancel();
       destroy();
     }, 0);
   }
@@ -33798,6 +33818,14 @@ var ImageTool = /*#__PURE__*/function (_Component) {
     _this = _super.call(this, props);
 
     defineProperty(assertThisInitialized(_this), "openDicomModal", function (tag, title) {
+      paladinModalOpenEvent({
+        key: 'dicom_modal',
+        value: {
+          tag: tag,
+          title: title
+        }
+      });
+
       var imageId = _this.props.getCurrentImageId();
 
       _default$K.create( /*#__PURE__*/React__default.createElement(DicomInfoModal, {
@@ -33812,6 +33840,9 @@ var ImageTool = /*#__PURE__*/function (_Component) {
         style: {
           top: 0,
           transform: 'translate(-50%,0)'
+        },
+        onCancel: function onCancel() {
+          paladinModalCloseEvent();
         }
       });
     });
@@ -44442,7 +44473,8 @@ var DicomTool = /*#__PURE__*/function (_Component) {
           VR = _this$props.VR,
           VRCenterPointShow = _this$props.VRCenterPointShow,
           VRModeText = _this$props.VRModeText,
-          isMobile = _this$props.isMobile;
+          isMobile = _this$props.isMobile,
+          windowLayoutType = _this$props.windowLayoutType;
 
       if (VR) {
         if (this.toolsMap) {
@@ -44471,9 +44503,12 @@ var DicomTool = /*#__PURE__*/function (_Component) {
 
       var FlattenMode = DicomToolFlattenMode;
 
-      if (width < height) {
+      if (windowLayoutType) {
         // 竖屏
-        FlattenMode = DicomToolFlattenMode$1;
+        if (windowLayoutType === 'vertical') FlattenMode = DicomToolFlattenMode$1;
+      } else {
+        // 竖屏
+        if (width < height) FlattenMode = DicomToolFlattenMode$1;
       }
 
       return /*#__PURE__*/React__default.createElement("div", {
@@ -45497,6 +45532,13 @@ var mergeProps$c = function mergeProps(propsFromState, propsFromDispatch, ownPro
       propsFromDispatch.activeDicomFunction('Fullscreen');
     },
     openDicomModal: function openDicomModal(tag, title) {
+      paladinModalOpenEvent({
+        key: 'dicom_modal',
+        value: {
+          tag: tag,
+          title: title
+        }
+      });
       var activeElement = getElement(realActiveIndex);
       var image = cornerstone.getImage(activeElement);
       _default$K.create( /*#__PURE__*/React__default.createElement(DicomInfoModal, {
@@ -45511,6 +45553,9 @@ var mergeProps$c = function mergeProps(propsFromState, propsFromDispatch, ownPro
         style: {
           top: 0,
           transform: 'translate(-50%,0)'
+        },
+        onCancel: function onCancel() {
+          paladinModalCloseEvent();
         }
       });
     },
@@ -45979,6 +46024,7 @@ var DicomThumbnailLayout = /*#__PURE__*/function (_Component) {
     });
 
     defineProperty(assertThisInitialized(_this), "handleRefresh", function () {
+      paladinRefreshEvent();
       window.location.reload();
     });
 
@@ -47651,6 +47697,7 @@ var DicomViewport = /*#__PURE__*/function (_Component) {
         return;
       }
 
+      _this.props.onResizeEmit && _this.props.onResizeEmit();
       cornerstone.resize(_this.element, true);
     });
 
@@ -49262,7 +49309,8 @@ var DicomLayout = /*#__PURE__*/function (_Component) {
             onViewportMouseDown: _this2.onViewportMouseDown,
             onCustomScroll: _this2.onCustomScroll,
             onDrop: _this2.props.onDrop,
-            showAIResult: _this2.props.showAIResult
+            showAIResult: _this2.props.showAIResult,
+            onResizeEmit: _this2.props.onResizeEmit
           });
         }));
       })), showVerticalScroll && /*#__PURE__*/React__default.createElement("div", {
@@ -51534,6 +51582,43 @@ var _default$18 = ConnectedVR;
   enterModule && enterModule(module);
 })();
 
+var __signature__$3c = typeof reactHotLoaderGlobal !== 'undefined' ? reactHotLoaderGlobal.default.signature : function (a) {
+  return a;
+};
+
+function colorMapFix(viewportData) {
+  viewportData.imageViewports = lodash$1.map(viewportData.imageViewports, function (seriesViewportArr) {
+    return lodash$1.map(seriesViewportArr, function (item) {
+      if (item.colorMapId) {
+        item.colormap = cornerstone.colors.getColormap(item.colorMapId);
+      }
+
+      return item;
+    });
+  });
+  return viewportData;
+}
+
+(function () {
+  var reactHotLoader = typeof reactHotLoaderGlobal !== 'undefined' ? reactHotLoaderGlobal.default : undefined;
+
+  if (!reactHotLoader) {
+    return;
+  }
+
+  reactHotLoader.register(colorMapFix, "colorMapFix", "/Users/huyeqing/workspace/chainz/paladin/src/utils/colorMapMethod.js");
+})();
+
+(function () {
+  var leaveModule = typeof reactHotLoaderGlobal !== 'undefined' ? reactHotLoaderGlobal.leaveModule : undefined;
+  leaveModule && leaveModule(module);
+})();
+
+(function () {
+  var enterModule = typeof reactHotLoaderGlobal !== 'undefined' ? reactHotLoaderGlobal.enterModule : undefined;
+  enterModule && enterModule(module);
+})();
+
 function _createForOfIteratorHelper$d(o, allowArrayLike) { var it; if (typeof Symbol === "undefined" || o[Symbol.iterator] == null) { if (Array.isArray(o) || (it = _unsupportedIterableToArray$f(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = o[Symbol.iterator](); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
 
 function _unsupportedIterableToArray$f(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray$f(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray$f(o, minLen); }
@@ -51544,7 +51629,7 @@ function _createSuper$1i(Derived) { var hasNativeReflectConstruct = _isNativeRef
 
 function _isNativeReflectConstruct$1i() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Date.prototype.toString.call(Reflect.construct(Date, [], function () {})); return true; } catch (e) { return false; } }
 
-var __signature__$3c = typeof reactHotLoaderGlobal !== 'undefined' ? reactHotLoaderGlobal.default.signature : function (a) {
+var __signature__$3d = typeof reactHotLoaderGlobal !== 'undefined' ? reactHotLoaderGlobal.default.signature : function (a) {
   return a;
 };
 
@@ -51697,6 +51782,10 @@ var DicomView = /*#__PURE__*/function (_Component) {
       this.props.unmount();
       window.removeEventListener('mousedown', checkAndUnLockToolState);
       window.removeEventListener('resize', this.debouncedResize);
+
+      if (this.props.paladinActionEmit) {
+        _default$e.removeListener('paladin_action', this.props.paladinActionEmit);
+      }
     }
   }, {
     key: "emitImageResize",
@@ -51792,7 +51881,7 @@ var DicomView = /*#__PURE__*/function (_Component) {
         if (value.cornerstoneState) {
           // 从server获取当前viewport数据 更新element 然后重新渲染
           // 序列模式 图像模式
-          var cornerstoneState = value.cornerstoneState;
+          var cornerstoneState = colorMapFix(value.cornerstoneState);
           set$1('all', cornerstoneState);
           var imageViewports = cornerstoneState.imageViewports;
 
@@ -51923,7 +52012,9 @@ var DicomView = /*#__PURE__*/function (_Component) {
           break;
 
         case "cornerstone_state_change":
-          set$1('all', data);
+          var _data = colorMapFix(data);
+
+          set$1('all', _data);
           break;
 
         case "cornerstone_measurement_reset":
@@ -51955,6 +52046,39 @@ var DicomView = /*#__PURE__*/function (_Component) {
           }
 
           break;
+
+        case "modal_open":
+          var key = data.key,
+              value = data.value;
+
+          if (key === "dicom_modal") {
+            try {
+              var activeElement = this.props.getCurrentElement();
+              var image = cornerstone.getImage(activeElement);
+              _default$K.create( /*#__PURE__*/React__default.createElement(DicomInfoModal, {
+                dicomModalTag: value.tag,
+                imageId: image.imageId
+              }), {
+                title: value.title,
+                okText: '关闭',
+                cancelButtonProps: {
+                  show: false
+                },
+                style: {
+                  top: 0,
+                  transform: 'translate(-50%,0)'
+                }
+              });
+            } catch (e) {
+              console.log('modal_open', e);
+            }
+          }
+
+          break;
+
+        case "modal_close":
+          _default$K.destroy();
+          break;
       }
     }
   }, {
@@ -51982,12 +52106,16 @@ var DicomView = /*#__PURE__*/function (_Component) {
         operateCentesisPath: this.props.operateCentesisPath,
         helpLink: this.props.helpLink,
         changeWindowSet: this.props.changeWindowSet,
-        study: this.state.study
+        study: this.state.study,
+        windowLayoutType: this.props.windowLayoutType
       }));
       var DicomLayout = /*#__PURE__*/React__default.createElement(DicomLayoutContainerWrap, null, viewMode === '2D' && (this.props.mode === 'seriesMode' ? /*#__PURE__*/React__default.createElement(_default$14, {
         series: this.props.series,
-        showAIResult: this.props.showAIResult
-      }) : /*#__PURE__*/React__default.createElement(_default$15, null)), viewMode === 'MPR' && /*#__PURE__*/React__default.createElement(_default$17, null), viewMode === 'VR' && /*#__PURE__*/React__default.createElement(_default$18, null), viewMode === 'Surgery' && /*#__PURE__*/React__default.createElement(_default$16, null));
+        showAIResult: this.props.showAIResult,
+        onResizeEmit: this.props.onResizeEmit
+      }) : /*#__PURE__*/React__default.createElement(_default$15, {
+        onResizeEmit: this.props.onResizeEmit
+      })), viewMode === 'MPR' && /*#__PURE__*/React__default.createElement(_default$17, null), viewMode === 'VR' && /*#__PURE__*/React__default.createElement(_default$18, null), viewMode === 'Surgery' && /*#__PURE__*/React__default.createElement(_default$16, null));
       var DicomThumbnail = /*#__PURE__*/React__default.createElement("div", {
         className: "paladin-dicomView-dicomThumbnailWrapper"
       }, /*#__PURE__*/React__default.createElement(_default$10, {
@@ -52005,21 +52133,26 @@ var DicomView = /*#__PURE__*/function (_Component) {
       }, DicomTool, /*#__PURE__*/React__default.createElement("div", {
         className: "paladin-dicomView-pcmobileWrapper"
       }, DicomLayout, this.props.showDicomThumbnail && DicomThumbnail));
+      var verticalLayout = /*#__PURE__*/React__default.createElement("div", {
+        style: dcStyle
+      }, /*#__PURE__*/React__default.createElement("div", {
+        style: {
+          display: 'flex',
+          flexDirection: 'column',
+          flex: 1,
+          width: 0
+        }
+      }, DicomLayout, this.props.showDicomThumbnail && DicomThumbnail, DicomTool));
       var width = window.innerWidth;
       var height = window.innerHeight;
 
-      if (width < height && toolMode === 'flatten') {
-        // 竖屏 + 展开
-        pc = /*#__PURE__*/React__default.createElement("div", {
-          style: dcStyle
-        }, /*#__PURE__*/React__default.createElement("div", {
-          style: {
-            display: 'flex',
-            flexDirection: 'column',
-            flex: 1,
-            width: 0
-          }
-        }, DicomLayout, this.props.showDicomThumbnail && DicomThumbnail, DicomTool));
+      if (this.props.windowLayoutType) {
+        if (this.props.windowLayoutType === 'vertical') pc = verticalLayout;
+      } else {
+        if (width < height && toolMode === 'flatten') {
+          // 竖屏 + 展开
+          pc = verticalLayout;
+        }
       }
 
       return (
@@ -52078,7 +52211,7 @@ function ownKeys$E(object, enumerableOnly) { var keys = Object.keys(object); if
 
 function _objectSpread$F(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys$E(Object(source), true).forEach(function (key) { defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys$E(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
 
-var __signature__$3d = typeof reactHotLoaderGlobal !== 'undefined' ? reactHotLoaderGlobal.default.signature : function (a) {
+var __signature__$3e = typeof reactHotLoaderGlobal !== 'undefined' ? reactHotLoaderGlobal.default.signature : function (a) {
   return a;
 };
 var scroll = _default$E.importInternal('util/scroll');
@@ -52394,6 +52527,7 @@ var mergeProps$j = function mergeProps(propsFromState, propsFromDispatch, ownPro
         setWwwc(getCurrentElement(), wwwcCustomDic[9].ww, wwwcCustomDic[9].wc);
       }
     },
+    getCurrentElement: getCurrentElement,
     addStudy: function addStudy(value) {
       /**
        * 添加关联study
@@ -52637,7 +52771,7 @@ var _default$19 = ConnectedDicomView;
   enterModule && enterModule(module);
 })();
 
-var __signature__$3e = typeof reactHotLoaderGlobal !== 'undefined' ? reactHotLoaderGlobal.default.signature : function (a) {
+var __signature__$3f = typeof reactHotLoaderGlobal !== 'undefined' ? reactHotLoaderGlobal.default.signature : function (a) {
   return a;
 };
 var _default$1a = _default$19;