hellfire 0.25.9 → 0.25.10

package/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 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.25.10](http://10.16.100.57/diffusion/115/paladin/compare/v0.25.9...v0.25.10) (2023-03-21)
+
+
+
 ## [0.25.9](http://10.16.100.57/diffusion/115/paladin/compare/v0.25.8...v0.25.9) (2023-03-07)
 
 

package/dist/index.js

@@ -28526,7 +28526,8 @@ var __signature__$1G = typeof reactHotLoaderGlobal !== 'undefined' ? reactHotLoa
 };
 var EVENTS$3 = {
   RELATIVE_SYNC: 'cornerstonetoolsrelativesync',
-  SELECT_POSITION: 'cornerstonetoolsselectposition'
+  SELECT_POSITION: 'cornerstonetoolsselectposition',
+  EVENT_DOM_RE_RENDER: 'cornerstone_dom_error_re_render'
 };
 function setViewportWithEvent(element, viewport, activeTool, changeData, originViewport) {
   cornerstone.setViewport(element, viewport);
@@ -51577,7 +51578,7 @@ var SvgRefresh$1 = function SvgRefresh(props) {
   }, props), _ref$1c);
 };
 
-var css_248z$m = ".loadingIndicator {\n  position: absolute;\n  top: 0;\n  background: black;\n  opacity: 1;\n  width: 100%;\n  height: 100%;\n  text-align: center;\n  z-index: 1;\n  display: flex;\n  align-items: center;\n  justify-content: center;\n}\n.loadingIndicator .lds-ring {\n  color: #999;\n  position: absolute;\n  left: 0;\n  right: 0;\n  top: 0;\n  bottom: 0;\n  width: 40px;\n  height: 40px;\n  margin: auto;\n}\n.loadingIndicator .lds-ring div {\n  box-sizing: border-box;\n  display: block;\n  position: absolute;\n  width: 40px;\n  height: 40px;\n  border: 4px solid silver;\n  border-radius: 50%;\n  animation: lds-ring 1.2s cubic-bezier(0.5, 0, 0.5, 1) infinite;\n  border-color: silver transparent transparent transparent;\n}\n.loadingIndicator .lds-ring div:nth-child(1) {\n  animation-delay: -0.45s;\n}\n.loadingIndicator .lds-ring div:nth-child(2) {\n  animation-delay: -0.3s;\n}\n.loadingIndicator .lds-ring div:nth-child(3) {\n  animation-delay: -0.15s;\n}\n@keyframes lds-ring {\n  0% {\n    transform: rotate(0deg);\n  }\n  100% {\n    transform: rotate(360deg);\n  }\n}\n.loadingIndicator .loadingIndicator-retry {\n  width: 40px;\n  color: #999;\n  margin: 0 auto;\n  font-size: 14px;\n}\n.loadingIndicator .indicatorContents h4 {\n  font-size: 18px;\n  margin: 0 auto 10px 0;\n}\n.loadingIndicator .indicatorContents p {\n  margin: 4px auto;\n  color: #999;\n  font-size: 14px;\n}\n.loadingIndicator .indicatorContents .loadingIndicator-retry {\n  width: 40px;\n  margin: 20px auto 0 auto;\n}\n.loadingIndicator .indicatorContents-mini h4 {\n  color: #fff;\n  font-size: 12px;\n  margin: 5px 0 5px 0;\n}\n.loadingIndicator .indicatorContents-mini .loadingIndicator-retry {\n  width: 20px;\n  font-size: 12px;\n}\n";
+var css_248z$m = ".loadingIndicator {\n  position: absolute;\n  top: 0;\n  background: black;\n  opacity: 1;\n  width: 100%;\n  height: 100%;\n  text-align: center;\n  z-index: 1;\n  display: flex;\n  align-items: center;\n  justify-content: center;\n}\n.loadingIndicator .lds-ring {\n  color: #999;\n  position: absolute;\n  left: 0;\n  right: 0;\n  top: 0;\n  bottom: 0;\n  width: 40px;\n  height: 40px;\n  margin: auto;\n}\n.loadingIndicator .lds-ring div {\n  box-sizing: border-box;\n  display: block;\n  position: absolute;\n  width: 40px;\n  height: 40px;\n  border: 4px solid silver;\n  border-radius: 50%;\n  animation: lds-ring 1.2s cubic-bezier(0.5, 0, 0.5, 1) infinite;\n  border-color: silver transparent transparent transparent;\n}\n.loadingIndicator .lds-ring div:nth-child(1) {\n  animation-delay: -0.45s;\n}\n.loadingIndicator .lds-ring div:nth-child(2) {\n  animation-delay: -0.3s;\n}\n.loadingIndicator .lds-ring div:nth-child(3) {\n  animation-delay: -0.15s;\n}\n@keyframes lds-ring {\n  0% {\n    transform: rotate(0deg);\n  }\n  100% {\n    transform: rotate(360deg);\n  }\n}\n.loadingIndicator .loadingIndicator-retry {\n  width: 40px;\n  color: #999;\n  margin: 0 auto;\n  font-size: 14px;\n}\n.loadingIndicator .indicatorContents h4 {\n  font-size: 18px;\n  margin: 0 auto 10px 0;\n}\n.loadingIndicator .indicatorContents h5 {\n  font-size: 16px;\n  margin: 0 auto 10px 0;\n}\n.loadingIndicator .indicatorContents p {\n  margin: 4px auto;\n  color: #999;\n  font-size: 14px;\n}\n.loadingIndicator .indicatorContents .loadingIndicator-retry {\n  width: 40px;\n  margin: 20px auto 0 auto;\n}\n.loadingIndicator .indicatorContents-mini h4 {\n  color: #fff;\n  font-size: 12px;\n  margin: 5px 0 5px 0;\n}\n.loadingIndicator .indicatorContents-mini .loadingIndicator-retry {\n  width: 20px;\n  font-size: 12px;\n}\n";
 styleInject$1(css_248z$m);
 
 (function () {
@@ -51610,7 +51611,8 @@ var LoadingIndicator = /*#__PURE__*/function (_PureComponent) {
       var _this$props = this.props,
           mini = _this$props.mini,
           error = _this$props.error,
-          handleRetry = _this$props.handleRetry;
+          handleRetry = _this$props.handleRetry,
+          domError = _this$props.domError;
       return /*#__PURE__*/React__default.createElement("div", {
         className: "loadingIndicator"
       }, error ? mini ? /*#__PURE__*/React__default.createElement("div", {
@@ -51621,6 +51623,14 @@ var LoadingIndicator = /*#__PURE__*/function (_PureComponent) {
         }
       }, /*#__PURE__*/React__default.createElement("h4", null, "\u52A0\u8F7D\u5931\u8D25"), /*#__PURE__*/React__default.createElement("div", {
         className: "loadingIndicator-retry"
+      }, /*#__PURE__*/React__default.createElement(SvgRefresh$1, null))) : domError ? /*#__PURE__*/React__default.createElement("div", {
+        className: "indicatorContents"
+      }, /*#__PURE__*/React__default.createElement("h5", null, "\u5F71\u50CF\u6E32\u67D3\u5931\u8D25\uFF0C\u8BF7\u70B9\u51FB\u91CD\u8BD5"), /*#__PURE__*/React__default.createElement("div", {
+        className: "loadingIndicator-retry",
+        onClick: function onClick(e) {
+          e.stopPropagation();
+          handleRetry(e);
+        }
       }, /*#__PURE__*/React__default.createElement(SvgRefresh$1, null))) : /*#__PURE__*/React__default.createElement("div", {
         className: "indicatorContents"
       }, /*#__PURE__*/React__default.createElement("h4", null, "\u52A0\u8F7D\u5F71\u50CF\u5931\u8D25"), /*#__PURE__*/React__default.createElement("p", {
@@ -51650,6 +51660,7 @@ var LoadingIndicator = /*#__PURE__*/function (_PureComponent) {
 }(React.PureComponent);
 
 defineProperty(LoadingIndicator, "propTypes", {
+  domError: PropTypes$1.bool,
   error: PropTypes$1.object,
   mini: PropTypes$1.bool,
   handleRetry: PropTypes$1.func
@@ -54674,6 +54685,9 @@ var DicomViewport = /*#__PURE__*/function (_Component) {
       stack: _stack,
       viewport: cornerstone.getDefaultViewport(null, undefined),
       error: null,
+      // 影像数据加载error
+      domError: false,
+      // 容器渲染error
       sliceThickness: 1,
       //mpr模式的层厚倍数
       forceRender: false,
@@ -54688,6 +54702,7 @@ var DicomViewport = /*#__PURE__*/function (_Component) {
     _this.onMPRProcessed = _this.onMPRProcessed.bind(assertThisInitialized(_this));
     _this.onWindowResize = _this.onWindowResize.bind(assertThisInitialized(_this));
     _this.onMouseWheel = _this.onMouseWheel.bind(assertThisInitialized(_this));
+    _this.onDomErrorReRender = _this.onDomErrorReRender.bind(assertThisInitialized(_this));
     _this.debouncedResize = lodash$1.debounce(_this.resize, 300);
     _this.availableTools = _this.mergeToolConfig(); // 滚动条上的标记
     // 1.ai标记 序列模式下
@@ -54716,7 +54731,8 @@ var DicomViewport = /*#__PURE__*/function (_Component) {
           error = _this$state.error,
           aiTipInCustomScroll = _this$state.aiTipInCustomScroll,
           centesisTipInCustomScroll = _this$state.centesisTipInCustomScroll,
-          stack = _this$state.stack;
+          stack = _this$state.stack,
+          domError = _this$state.domError;
       var _this$props4 = this.props,
           showCustomScroll = _this$props4.showCustomScroll,
           mpr = _this$props4.mpr,
@@ -54733,12 +54749,13 @@ var DicomViewport = /*#__PURE__*/function (_Component) {
           Surgery = _this$props4.Surgery,
           directionToggle = _this$props4.directionToggle,
           direction = _this$props4.direction,
-          CPR = _this$props4.CPR;
+          CPR = _this$props4.CPR,
+          onClickDomErrorReRenderButton = _this$props4.onClickDomErrorReRenderButton;
       var active = activeIndex === index;
 
       var linked = lodash$1.includes(linkedIndexArr, index);
 
-      var displayLoadingIndicator = isLoading || error;
+      var displayLoadingIndicator = isLoading || error || domError;
       var imageCount = stack && stack.imageIds.length || 0;
       var currentImageIndex = stack && stack.currentImageIdIndex || 0;
       var imageId = stack && stack.imageIds[currentImageIndex]; // thickness process type
@@ -54764,7 +54781,16 @@ var DicomViewport = /*#__PURE__*/function (_Component) {
         }
       }, displayLoadingIndicator && /*#__PURE__*/React__default.createElement(_default$13, {
         error: error,
-        handleRetry: this.loadImage
+        domError: domError,
+        handleRetry: function handleRetry(ev) {
+          if (domError) {
+            _this3.componentDidMount();
+
+            onClickDomErrorReRenderButton && onClickDomErrorReRenderButton();
+          } else {
+            _this3.loadImage(ev);
+          }
+        }
       }), /*#__PURE__*/React__default.createElement("canvas", {
         className: "cornerstone-canvas"
       }), /*#__PURE__*/React__default.createElement("div", {
@@ -55194,6 +55220,13 @@ var DicomViewport = /*#__PURE__*/function (_Component) {
 
       return scale;
     }
+  }, {
+    key: "onDomErrorReRender",
+    value: function onDomErrorReRender() {
+      if (this.state.domError) {
+        this.componentDidMount();
+      }
+    }
   }, {
     key: "addEventListener",
     value: function addEventListener() {
@@ -55230,6 +55263,7 @@ var DicomViewport = /*#__PURE__*/function (_Component) {
       this.element.removeEventListener(cornerstone.EVENTS.IMAGE_RENDERED, this.onImageRendered);
       this.element.removeEventListener(cornerstone.EVENTS.NEW_IMAGE, this.onNewImage);
       window.removeEventListener(EVENT_RESIZE, this.onWindowResize);
+      _default$f.removeListener(EVENTS$3.EVENT_DOM_RE_RENDER, this.onDomErrorReRender);
       this.element.removeEventListener('mousedown', this.onMouseDown);
 
       if (this.props.onMouseWheel) {
@@ -55242,6 +55276,23 @@ var DicomViewport = /*#__PURE__*/function (_Component) {
       this.element = document.getElementById("paladin-viewport-".concat(this.props.index));
       var element = this.element; // Enable the DOM Element for use with Cornerstone
 
+      if (element.offsetWidth === 0) {
+        this.setState({
+          error: {
+            message: '影像窗口获取失败，请重试'
+          },
+          domError: true
+        });
+        _default$f.addListener(EVENTS$3.EVENT_DOM_RE_RENDER, this.onDomErrorReRender);
+        return;
+      } else {
+        _default$f.removeListener(EVENTS$3.EVENT_DOM_RE_RENDER, this.onDomErrorReRender);
+        this.setState({
+          error: null,
+          domError: false
+        });
+      }
+
       cornerstone.enable(element, {}); //先监听事件集合
 
       this.addEventListener(); // 初始化工具
@@ -56018,7 +56069,8 @@ var DicomLayout = /*#__PURE__*/function (_Component) {
             onCustomScroll: _this2.onCustomScroll,
             onDrop: _this2.props.onDrop,
             showAIResult: _this2.props.showAIResult,
-            onResizeEmit: _this2.props.onResizeEmit
+            onResizeEmit: _this2.props.onResizeEmit,
+            onClickDomErrorReRenderButton: _this2.props.onClickDomErrorReRenderButton
           });
         }));
       })), showVerticalScroll && /*#__PURE__*/React__default.createElement("div", {
@@ -56422,6 +56474,10 @@ var mergeProps$h = function mergeProps(propsFromState, propsFromDispatch, ownPro
       if (propsFromState.activeIndex === i) {
         propsFromDispatch.setCurrentSeries(dragSeries);
       }
+    },
+    onClickDomErrorReRenderButton: function onClickDomErrorReRenderButton() {
+      // dom没有准备好就enable element导致canvas大小为0，一个影像重试按钮操作后需要通知所有element自我检测是否需要re render
+      _default$f.emit(EVENTS$3.EVENT_DOM_RE_RENDER);
     }
   });
 };