hellfire 0.19.5 → 0.19.8

package/CHANGELOG.md

@@ -2,6 +2,18 @@
 
 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.19.8](http://10.16.100.57/diffusion/115/paladin/compare/v0.19.7...v0.19.8) (2022-03-07)
+
+
+
+## [0.19.7](http://10.16.100.57/diffusion/115/paladin/compare/v0.19.6...v0.19.7) (2022-03-03)
+
+
+
+## [0.19.6](http://10.16.100.57/diffusion/115/paladin/compare/v0.19.5...v0.19.6) (2022-03-02)
+
+
+
 ## [0.19.5](http://10.16.100.57/diffusion/115/paladin/compare/v0.19.4...v0.19.5) (2022-03-02)
 
 

package/dist/index.js

@@ -11126,11 +11126,6 @@ function addTaskIntoPool(task) {
 
     var priority = task.priority || task.priority === 0 || 1;
 
-    if (cache && cache.executed) {
-      delete cachedTask[task.key];
-      cache = null;
-    }
-
     if (cache) {
       cache.priority = priority;
       var callbacks = cache.callbacks || [];
@@ -11186,7 +11181,7 @@ function executeTask() {
               res: res
             });
           });
-          task.executed = true;
+          delete cachedTask[task.key];
           executeTask();
         }, function (err) {
           // 请求失败 重试机制
@@ -29940,7 +29935,7 @@ var __signature__$1Z = typeof reactHotLoaderGlobal !== 'undefined' ? reactHotLoa
 var isMobileTablet = _default$D.isDeviceTypeMobileOrTablet();
 
 if (!isMobileTablet) {
-  cornerstone.imageCache.setMaximumSizeBytes(1024 * 1024 * 1024 * 0.1);
+  cornerstone.imageCache.setMaximumSizeBytes(1024 * 1024 * 1024 * 1);
 }
 
 _default$E.external.cornerstone = cornerstone;
@@ -44178,11 +44173,11 @@ var DicomToolFlattenMode = /*#__PURE__*/function (_Component) {
       var commonTools = ['Layout', 'StackScroll', 'Wwwc', 'Zoom', 'Pan', 'Rotate', 'ReverseColor', 'Reset', 'Cine', 'FalseColor', 'Link', 'ReferencePosition'];
 
       if (mode !== 'seriesMode') {
-        commonTools = ['Layout', 'Wwwc', 'Zoom', 'Pan', 'Reset', 'Save', 'Rotate', 'ReverseColor', 'FalseColor'];
+        commonTools = ['Layout', 'Wwwc', 'Zoom', 'Pan', 'Reset', 'Rotate', 'ReverseColor', 'FalseColor'];
       }
 
       if (isThree) {
-        commonTools = ['StackScroll', 'Wwwc', 'Zoom', 'Pan', 'Reset', 'Save', 'Rotate', 'ReverseColor', 'FalseColor'];
+        commonTools = ['StackScroll', 'Wwwc', 'Zoom', 'Pan', 'Reset', 'Rotate', 'ReverseColor', 'FalseColor'];
       }
 
       var vrTools = ['CrosshairsMPR', 'MprSwitchPerspective', 'MprRefresh'];
@@ -44344,7 +44339,7 @@ var DicomToolFlattenMode = /*#__PURE__*/function (_Component) {
       }, /*#__PURE__*/React__default.createElement(LargeToolItem, {
         active: Fullscreen,
         onClick: handleFullscreen
-      }, "\u5168\u5C4F")), !MPR && IODisconnect && /*#__PURE__*/React__default.createElement("div", {
+      }, "\u5168\u5C4F")), !MPR && IODisconnect && mode && mode !== 'allImageMode' && /*#__PURE__*/React__default.createElement("div", {
         className: "paladin-flex-row"
       }, /*#__PURE__*/React__default.createElement(LargeToolItem, {
         active: Surgery,
@@ -44473,11 +44468,11 @@ var DicomToolFlattenMode$1 = /*#__PURE__*/function (_Component) {
       var commonTools = ['Layout', 'StackScroll', 'Wwwc', 'Zoom', 'Pan', 'Rotate', 'ReverseColor', 'Reset', 'Cine', 'FalseColor', 'Link', 'ReferencePosition'];
 
       if (mode !== 'seriesMode') {
-        commonTools = ['Layout', 'Wwwc', 'Zoom', 'Pan', 'Reset', 'Save', 'Rotate', 'ReverseColor', 'FalseColor'];
+        commonTools = ['Layout', 'Wwwc', 'Zoom', 'Pan', 'Reset', 'Rotate', 'ReverseColor', 'FalseColor'];
       }
 
       if (isThree) {
-        commonTools = ['StackScroll', 'Wwwc', 'Zoom', 'Pan', 'Reset', 'Save', 'Rotate', 'ReverseColor', 'FalseColor'];
+        commonTools = ['StackScroll', 'Wwwc', 'Zoom', 'Pan', 'Reset', 'Rotate', 'ReverseColor', 'FalseColor'];
       }
 
       var vrTools = ['CrosshairsMPR', 'MprSwitchPerspective', 'MprRefresh'];
@@ -44657,7 +44652,7 @@ var DicomToolFlattenMode$1 = /*#__PURE__*/function (_Component) {
       }, /*#__PURE__*/React__default.createElement(LargeToolItem$1, {
         active: Fullscreen,
         onClick: handleFullscreen
-      }, "\u5168\u5C4F")), !MPR && IODisconnect && /*#__PURE__*/React__default.createElement("div", {
+      }, "\u5168\u5C4F")), !MPR && IODisconnect && mode && mode !== 'allImageMode' && /*#__PURE__*/React__default.createElement("div", {
         className: "paladin-flex-row"
       }, /*#__PURE__*/React__default.createElement(LargeToolItem$1, {
         active: Surgery,
@@ -46029,7 +46024,38 @@ var mergeProps$c = function mergeProps(propsFromState, propsFromDispatch, ownPro
       }
 
       propsFromDispatch.setImageScrollLine(0);
-      var nextMode;
+      var nextMode; // 全部模式 需要检查图像总是是否超过200 超过200则不可进入全部模式
+
+      if (key === 'AllImageMode') {
+        var study = ownProps.study;
+        var imageCount = 0;
+        lodash$1.map(study, function (studyItem) {
+          lodash$1.map(studyItem.series, function (seriesItem) {
+            imageCount += seriesItem.numberOfSeriesRelatedInstances;
+          });
+        });
+
+        if (imageCount > 200) {
+          _default$K.create( /*#__PURE__*/React__default.createElement("div", {
+            style: {
+              marginBottom: '10px'
+            }
+          }, "\u603B\u56FE\u50CF\u6570\u91CF\u5927\u4E8E200\uFF0C\u4E0D\u63D0\u4F9B\u5168\u90E8\u67E5\u770B\u529F\u80FD"), {
+            style: {
+              width: '350px',
+              background: '#333',
+              color: '#ccc',
+              fontSize: '15px'
+            },
+            maskClosable: false,
+            title: '提示',
+            footer: null
+          });
+          return;
+        }
+
+        nextMode = 'allImageMode';
+      }
 
       if (key === 'SeriesMode') {
         // 回到序列模式
@@ -46064,10 +46090,6 @@ var mergeProps$c = function mergeProps(propsFromState, propsFromDispatch, ownPro
         nextMode = 'imageMode';
       }
 
-      if (key === 'AllImageMode') {
-        nextMode = 'allImageMode';
-      }
-
       propsFromDispatch.setViewMode(nextMode);
     },
     autoLink: function () {
@@ -47510,20 +47532,49 @@ var ViewportOverlay = /*#__PURE__*/function (_PureComponent) {
   }
 
   createClass(ViewportOverlay, [{
+    key: "componentDidMount",
+    value: function componentDidMount() {
+      this.loadDicom(this.props.imageId);
+    }
+  }, {
     key: "componentWillReceiveProps",
     value: function () {
       var _componentWillReceiveProps = asyncToGenerator( /*#__PURE__*/regenerator.mark(function _callee(nextProps, nextContext) {
-        var _dicom;
-
         return regenerator.wrap(function _callee$(_context) {
           while (1) {
             switch (_context.prev = _context.next) {
               case 0:
-                _context.next = 2;
-                return loadAndCacheDicom(nextProps.imageId);
+                this.loadDicom(nextProps.imageId);
+
+              case 1:
+              case "end":
+                return _context.stop();
+            }
+          }
+        }, _callee, this);
+      }));
+
+      function componentWillReceiveProps(_x, _x2) {
+        return _componentWillReceiveProps.apply(this, arguments);
+      }
+
+      return componentWillReceiveProps;
+    }()
+  }, {
+    key: "loadDicom",
+    value: function () {
+      var _loadDicom = asyncToGenerator( /*#__PURE__*/regenerator.mark(function _callee2(imageId) {
+        var _dicom;
+
+        return regenerator.wrap(function _callee2$(_context2) {
+          while (1) {
+            switch (_context2.prev = _context2.next) {
+              case 0:
+                _context2.next = 2;
+                return loadAndCacheDicom(imageId);
 
               case 2:
-                _dicom = _context.sent;
+                _dicom = _context2.sent;
 
                 if (_dicom) {
                   this.setState({
@@ -47533,17 +47584,17 @@ var ViewportOverlay = /*#__PURE__*/function (_PureComponent) {
 
               case 4:
               case "end":
-                return _context.stop();
+                return _context2.stop();
             }
           }
-        }, _callee, this);
+        }, _callee2, this);
       }));
 
-      function componentWillReceiveProps(_x, _x2) {
-        return _componentWillReceiveProps.apply(this, arguments);
+      function loadDicom(_x3) {
+        return _loadDicom.apply(this, arguments);
       }
 
-      return componentWillReceiveProps;
+      return loadDicom;
     }()
   }, {
     key: "render",
@@ -49066,6 +49117,12 @@ var DicomViewport = /*#__PURE__*/function (_Component) {
       });
     });
 
+    defineProperty(assertThisInitialized(_this), "checkImageBeforeDisplay", function (imageId) {
+      var stack = _this.state.stack;
+      var currentImageId = stack && stack.imageIds[stack.currentImageIdIndex];
+      return currentImageId === imageId;
+    });
+
     defineProperty(assertThisInitialized(_this), "loadImage", function () {
       var _this2;
 
@@ -49100,6 +49157,13 @@ var DicomViewport = /*#__PURE__*/function (_Component) {
 
       imagePromise.then(function (image) {
         _this.firstLoaded = true; // Display the first image
+        // 注：display image之前校验image的正确性 避免快速滚动图像加载堆积 导致显示的图像并非当前图像
+
+        var checkResult = _this.checkImageBeforeDisplay(imageId);
+
+        if (!checkResult) {
+          return;
+        }
 
         cornerstone.displayImage(_this.element, image); // 扫描定位线处理 May be we can remove it, 防丢失
 
@@ -49188,6 +49252,12 @@ var DicomViewport = /*#__PURE__*/function (_Component) {
           error: null
         });
       }, function (error) {
+        var checkResult = _this.checkImageBeforeDisplay(imageId);
+
+        if (!checkResult) {
+          return;
+        }
+
         console.error('viewport-loadImage-error', error);
 
         _this.clearFirstLoadingHandler();
@@ -49248,6 +49318,13 @@ var DicomViewport = /*#__PURE__*/function (_Component) {
       }
 
       imagePromise.then(function (image) {
+        // 注：display image之前校验image的正确性 避免快速滚动图像加载堆积 导致显示的图像并非当前图像
+        var checkResult = _this.checkImageBeforeDisplay(imageId);
+
+        if (!checkResult) {
+          return;
+        }
+
         cornerstone.displayImage(_this.element, image); // 伪彩单独重置
 
         var viewport = cornerstone.getViewport(_this.element);
@@ -49275,6 +49352,12 @@ var DicomViewport = /*#__PURE__*/function (_Component) {
           _default$E.setToolDisabledForElement(_this.element, 'StackScrollMouseWheel', {});
         }
       }, function (error) {
+        var checkResult = _this.checkImageBeforeDisplay(imageId);
+
+        if (!checkResult) {
+          return;
+        }
+
         console.error('viewport-update-loadImage-error', error);
 
         _this.setState({