hellfire 0.19.6 → 0.19.9

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.9](http://10.16.100.57/diffusion/115/paladin/compare/v0.19.8...v0.19.9) (2022-03-28)
+
+
+
+## [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)
 
 

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) {
           // 请求失败 重试机制
@@ -34361,7 +34356,7 @@ var formatDicom = function formatDicom(dicom) {
   leaveModule && leaveModule(module);
 })();
 
-var css_248z$8 = ".paladin-table {\n  margin-top: 10px;\n  font-size: 14px;\n  color: #727882;\n  font-family: lucida console, monospace;\n  word-break: break-all;\n}\n.paladin-table .paladin-table-th {\n  background: #698b69;\n  color: #fff;\n  padding: 5px;\n}\n.paladin-table .paladin-tbody-row {\n  border-bottom: 1px solid lightgrey;\n}\n.paladin-table .paladin-tbody-row:hover .td {\n  background: #ddd;\n  color: inherit;\n}\n.paladin-table .paladin-tbody-row:nth-child(even) {\n  background: #eee;\n  color: inherit;\n}\n.paladin-table .paladin-tbody-td {\n  padding: 5px;\n}\n.paladin-table .paladin-key {\n  background-color: #7ac5cd;\n  color: white;\n}\n.paladin-table .paladin-childKey {\n  background-color: #49898F;\n  color: white;\n}\n.paladin-table .paladin-private {\n  color: orange;\n}\n.paladin-table .paladin-row-parent-icon {\n  display: inline-block;\n  background: #fff;\n  border-radius: 2px;\n  margin-right: 3px;\n  color: #00a4fe;\n  width: 16px;\n  height: 16px;\n  position: relative;\n  vertical-align: middle;\n}\n.paladin-table .paladin-row-parent-icon span {\n  position: absolute;\n  left: 50%;\n  top: 50%;\n  transform: translate(-50%, -51%);\n  display: inline-block;\n  width: 13px;\n  height: 13px;\n  line-height: 13px;\n  font-size: 13px;\n  text-align: center;\n}\n";
+var css_248z$8 = ".allow-select * {\n  -webkit-user-select: text !important;\n  -moz-user-select: text !important;\n  -ms-user-select: text !important;\n  user-select: text !important;\n}\n.paladin-table {\n  margin-top: 10px;\n  font-size: 14px;\n  color: #727882;\n  font-family: lucida console, monospace;\n  word-break: break-all;\n}\n.paladin-table .paladin-table-th {\n  background: #698b69;\n  color: #fff;\n  padding: 5px;\n}\n.paladin-table .paladin-tbody-row {\n  border-bottom: 1px solid lightgrey;\n}\n.paladin-table .paladin-tbody-row:hover .td {\n  background: #ddd;\n  color: inherit;\n}\n.paladin-table .paladin-tbody-row:nth-child(even) {\n  background: #eee;\n  color: inherit;\n}\n.paladin-table .paladin-tbody-td {\n  padding: 5px;\n}\n.paladin-table .paladin-key {\n  background-color: #7ac5cd;\n  color: white;\n}\n.paladin-table .paladin-childKey {\n  background-color: #49898F;\n  color: white;\n}\n.paladin-table .paladin-private {\n  color: orange;\n}\n.paladin-table .paladin-row-parent-icon {\n  display: inline-block;\n  background: #fff;\n  border-radius: 2px;\n  margin-right: 3px;\n  color: #00a4fe;\n  width: 16px;\n  height: 16px;\n  position: relative;\n  vertical-align: middle;\n}\n.paladin-table .paladin-row-parent-icon span {\n  position: absolute;\n  left: 50%;\n  top: 50%;\n  transform: translate(-50%, -51%);\n  display: inline-block;\n  width: 13px;\n  height: 13px;\n  line-height: 13px;\n  font-size: 13px;\n  text-align: center;\n}\n";
 styleInject$1(css_248z$8);
 
 (function () {
@@ -34636,7 +34631,9 @@ var DicomInfoModal = /*#__PURE__*/function (_Component) {
           dataSource = _this$state.dataSource,
           dataSourceScan = _this$state.dataSourceScan;
       var columnTagKey = dicomModalTag === 'dicomInfo';
-      return /*#__PURE__*/React__default.createElement("div", null, /*#__PURE__*/React__default.createElement(ButtonGroup, null, /*#__PURE__*/React__default.createElement(Button, {
+      return /*#__PURE__*/React__default.createElement("div", {
+        className: 'allow-select'
+      }, /*#__PURE__*/React__default.createElement(ButtonGroup, null, /*#__PURE__*/React__default.createElement(Button, {
         active: dicomModalTag === 'dicomInfo',
         onClick: function onClick() {
           _this2.setDicomModalTag('dicomInfo');
@@ -44178,11 +44175,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 +44341,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 +44470,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 +44654,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,
@@ -47537,20 +47534,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({
@@ -47560,17 +47586,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",
@@ -47635,6 +47661,7 @@ var ViewportOverlay = /*#__PURE__*/function (_PureComponent) {
 
       var patientOrientation = dicom.PatientOrientation.toString();
       var protocolName = dicom.ProtocolName.toString();
+      var sequenceName = dicom.SequenceName.toString();
       var repetitionTime = dicom.RepetitionTime.toString();
       var echoTime = dicom.EchoTime.toString();
       var inversionTime = dicom.InversionTime.toString();
@@ -47682,7 +47709,7 @@ var ViewportOverlay = /*#__PURE__*/function (_PureComponent) {
           fontSize: '12px',
           display: "".concat(hide ? 'none' : 'block')
         }
-      }, /*#__PURE__*/React__default.createElement("div", null, patientOrientation), /*#__PURE__*/React__default.createElement("div", null, protocolName), /*#__PURE__*/React__default.createElement("div", null, getTRAndTE(repetitionTime, echoTime)), /*#__PURE__*/React__default.createElement("div", null, formatDicomInfo('TI', inversionTime)), /*#__PURE__*/React__default.createElement("div", null, formatDicomInfo('FA', flipAngle)), /*#__PURE__*/React__default.createElement("div", null, getADAndNEX(acquisitionDuration, numberOfAverages)), /*#__PURE__*/React__default.createElement("div", null, thk), /*#__PURE__*/React__default.createElement("div", null, formatDicomInfo('B', diffusionBValue, false)), /*#__PURE__*/React__default.createElement("div", null, seriesDescription)), /*#__PURE__*/React__default.createElement("div", {
+      }, /*#__PURE__*/React__default.createElement("div", null, patientOrientation), /*#__PURE__*/React__default.createElement("div", null, protocolName), /*#__PURE__*/React__default.createElement("div", null, sequenceName), /*#__PURE__*/React__default.createElement("div", null, getTRAndTE(repetitionTime, echoTime)), /*#__PURE__*/React__default.createElement("div", null, formatDicomInfo('TI', inversionTime)), /*#__PURE__*/React__default.createElement("div", null, formatDicomInfo('FA', flipAngle)), /*#__PURE__*/React__default.createElement("div", null, getADAndNEX(acquisitionDuration, numberOfAverages)), /*#__PURE__*/React__default.createElement("div", null, thk), /*#__PURE__*/React__default.createElement("div", null, formatDicomInfo('B', diffusionBValue, false)), seriesDescription && seriesDescription !== protocolName && /*#__PURE__*/React__default.createElement("div", null, seriesDescription)), /*#__PURE__*/React__default.createElement("div", {
         style: {
           position: 'absolute',
           top: 4,
@@ -49093,6 +49120,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;
 
@@ -49127,6 +49160,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, 防丢失
 
@@ -49215,6 +49255,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();
@@ -49275,6 +49321,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);
@@ -49302,6 +49355,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({