npm - hellfire - Versions diffs - 0.27.7 → 0.27.9 - Mend

hellfire 0.27.7 → 0.27.9

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (11) hide show

package/CHANGELOG.md CHANGED Viewed

@@ -2,6 +2,19 @@
 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.9](http://10.16.100.57/diffusion/115/paladin/compare/v0.27.8...v0.27.9) (2024-01-02)
+## [0.27.8](http://10.16.100.57/diffusion/115/paladin/compare/v0.27.7...v0.27.8) (2023-12-29)
+### Reverts
+* Revert "修复心胸比操作结束数据不一致问题" ([2380e6a](http://10.16.100.57/diffusion/115/paladin/commits/2380e6a4a5d7bc8e75bda6d23188a2ed79c36657))
 ## [0.27.7](http://10.16.100.57/diffusion/115/paladin/compare/v0.27.6...v0.27.7) (2023-12-01)

package/dist/index.html CHANGED Viewed

@@ -9,4 +9,4 @@
             width: 100%;
             overflow: auto;
             margin: 0;
-        }</style><link rel="icon" href="./favicon.ico?ff4705d76ef04744f20e"><script defer="defer" src="./v0.17.0-114-gf39de5e/main-ff4705d76ef04744f20e.js?ff4705d76ef04744f20e"></script><link href="./v0.17.0-114-gf39de5e/main-ff4705d76ef04744f20e.css?ff4705d76ef04744f20e" rel="stylesheet"></head><body><div id="app" style="height: 100%;"></div></body></html>
+        }</style><link rel="icon" href="./favicon.ico?504bd2f206cadb4f4aee"><script defer="defer" src="./v0.17.0-140-g0429685/main-504bd2f206cadb4f4aee.js?504bd2f206cadb4f4aee"></script><link href="./v0.17.0-140-g0429685/main-504bd2f206cadb4f4aee.css?504bd2f206cadb4f4aee" rel="stylesheet"></head><body><div id="app" style="height: 100%;"></div></body></html>

package/dist/index.js CHANGED Viewed

@@ -28734,7 +28734,8 @@ var SWITCH_MPR_PERSPECTIVE = 'SWITCH_MPR_PERSPECTIVE';
 var SET_SERIES_CURRENT_INDEX = 'SET_SERIES_CURRENT_INDEX';
 var INIT_SERIES_CURRENT_INDEX = 'INIT_SERIES_CURRENT_INDEX';
 var SET_LAST_ACTIVE_INDEX = 'SET_LAST_ACTIVE_INDEX';
-var SET_SURGERY_ACTIVE_INDEX = 'SET_SURGERY_ACTIVE_INDEX'; // ---------- Reducers ----------
+var SET_SURGERY_ACTIVE_INDEX = 'SET_SURGERY_ACTIVE_INDEX';
+var SET_ORIGIN_STUDY = 'SET_ORIGIN_STUDY'; // ---------- Reducers ----------
 var initialState$4 = {
   // 当前选择的series及其id
@@ -28762,6 +28763,8 @@ var initialState$4 = {
   imageActiveIndex: 0,
   linkImageIndex: [],
   // 绝对同步的image集合
+  originStudy: [],
+  // 传入的study集合（包含关联检查）
   // synchronizer集合
   synchronizer: synchronizer,
   // 定位线
@@ -28781,6 +28784,15 @@ var viewport = (function () {
   var action = arguments.length > 1 ? arguments[1] : undefined;
   switch (action.type) {
+    case SET_ORIGIN_STUDY:
+      {
+        var nextStudy = lodash$1.clone(action.payload);
+        return _objectSpread$e(_objectSpread$e({}, state), {}, {
+          originStudy: nextStudy
+        });
+      }
     case SET_ACTIVE_INDEX:
       {
         return _objectSpread$e(_objectSpread$e({}, state), {}, {
@@ -29026,6 +29038,12 @@ function switchMprPerspective(reset) {
     reset: reset
   };
 }
+function setOriginStudyData(data) {
+  return {
+    type: SET_ORIGIN_STUDY,
+    payload: data
+  };
+}
 var createReducer = function createReducer() {
   return function (state, action) {
@@ -53947,7 +53965,6 @@ var DicomView = /*#__PURE__*/function (_Component) {
     });
     _this.state = {
-      study: studySeriesDataCheck(_this.props.study),
       resize: 0,
       windowLayoutType: _this.props.windowLayoutType
     }; // 窗口变化要重新渲染滚动条的距离
@@ -53980,9 +53997,11 @@ var DicomView = /*#__PURE__*/function (_Component) {
       this.props.initSeries(null, function (result) {
         if (result && result.hasChange) {
-          _this2.setState({
-            study: result.study
-          });
+          _this2.props.setReduxOnStudyChange(result.study);
+        } else {
+          var nextStudy = studySeriesDataCheck(_this2.props.study);
+          _this2.props.setReduxOnStudyChange(nextStudy);
         }
       }); // 自定义窗值设置
@@ -53997,10 +54016,13 @@ var DicomView = /*#__PURE__*/function (_Component) {
        * study切换
        */
       if (JSON.stringify(nextProps.study) !== JSON.stringify(this.props.study)) {
-        this.setState({
-          study: studySeriesDataCheck(nextProps.study)
-        }, function () {
-          _this3.props.initSeries(nextProps.study);
+        var nextStudy = studySeriesDataCheck(nextProps.study);
+        this.props.initSeries(nextStudy, function (result) {
+          if (result && result.hasChange) {
+            _this3.props.setReduxOnStudyChange(result.study);
+          } else {
+            _this3.props.setReduxOnStudyChange(nextStudy);
+          }
         });
       }
@@ -54072,11 +54094,9 @@ var DicomView = /*#__PURE__*/function (_Component) {
   }, {
     key: "addStudy",
     value: function addStudy(study) {
-      var _study = lodash$1.concat(this.state.study, study);
+      var _study = lodash$1.concat(this.props.originStudy, study);
-      this.setState({
-        study: _study
-      });
+      this.props.setReduxOnStudyChange(_study);
       this.props.addStudy(study);
     }
     /**
@@ -54363,7 +54383,8 @@ var DicomView = /*#__PURE__*/function (_Component) {
       var _this$props5 = this.props,
           viewMode = _this$props5.viewMode,
           toolMode = _this$props5.toolMode,
-          onRefresh = _this$props5.onRefresh;
+          onRefresh = _this$props5.onRefresh,
+          originStudy = _this$props5.originStudy;
       var dcStyle = {
         display: 'flex',
         position: 'absolute',
@@ -54382,7 +54403,7 @@ var DicomView = /*#__PURE__*/function (_Component) {
         operateCentesisPath: this.props.operateCentesisPath,
         helpLink: this.props.helpLink,
         changeWindowSet: this.props.changeWindowSet,
-        study: this.state.study,
+        study: originStudy,
         windowLayoutType: this.state.windowLayoutType,
         setCustomWindowLayoutType: this.setCustomWindowLayoutType,
         operateKeyImages: this.props.operateKeyImages
@@ -54396,34 +54417,20 @@ var DicomView = /*#__PURE__*/function (_Component) {
       }), viewMode === '2D' && this.props.mode === 'imageMode' && /*#__PURE__*/React__default.createElement(ConnectedDicomImageModeLayout, {
         onResizeEmit: this.props.onResizeEmit
       }), viewMode === '2D' && this.props.mode === 'allImageMode' && /*#__PURE__*/React__default.createElement(ConnectedDicomAllImageModeLayout, {
-        study: this.state.study,
+        study: originStudy,
         onResizeEmit: this.props.onResizeEmit
       }), viewMode === 'MPR' && /*#__PURE__*/React__default.createElement(ConnectedMPRLayout, null), viewMode === 'VR' && /*#__PURE__*/React__default.createElement(ConnectedVR, null), viewMode === 'Surgery' && /*#__PURE__*/React__default.createElement(ConnectedSurgeryLayout, null), viewMode === 'MIP' && /*#__PURE__*/React__default.createElement(ConnectedMIP, null), viewMode === 'CPR' && /*#__PURE__*/React__default.createElement(ConnectedCPRLayout, null));
       var DicomThumbnail = /*#__PURE__*/React__default.createElement("div", {
         className: "paladin-dicomView-dicomThumbnailWrapper"
       }, /*#__PURE__*/React__default.createElement(ConnectedDicomThumbnail, {
-        study: this.state.study,
+        study: originStudy,
         onRefresh: onRefresh
       }));
       var GlobalLoading = /*#__PURE__*/React__default.createElement("div", {
         className: "paladin-global-loading"
       }, /*#__PURE__*/React__default.createElement("div", {
         className: "paladin-global-loading-text"
-      }, this.props.globalLoading || '加载中...')); // const DicomTool = (
-      //     <div className='paladin-dicomView-dicomToolWrapper'>
-      //         <ConnectedDicomTool
-      //             isMobile={isMobile}
-      //             toolSortChange={this.props.toolSortChange}
-      //             operateServerToolState={this.props.operateServerToolState}
-      //             operateCentesisPath={this.props.operateCentesisPath}
-      //             helpLink={this.props.helpLink}
-      //             changeWindowSet={this.props.changeWindowSet}
-      //             study={this.state.study}
-      //             windowLayoutType={this.props.windowLayoutType}
-      //         />
-      //     </div>
-      // )
+      }, this.props.globalLoading || '加载中...'));
       var mobile = /*#__PURE__*/React__default.createElement("div", {
         style: dcStyle
       }, this.props.globalLoading && GlobalLoading, /*#__PURE__*/React__default.createElement("div", {
@@ -54432,7 +54439,7 @@ var DicomView = /*#__PURE__*/function (_Component) {
         className: "paladin-dicomView-dicomToolWrapper"
       }, /*#__PURE__*/React__default.createElement(ConnectedDicomTool, {
         isMobileThree: true,
-        study: this.state.study
+        study: originStudy
       })), DicomLayout, DicomTool)); // pc分横屏和竖屏
       var pc = /*#__PURE__*/React__default.createElement("div", {
@@ -54490,6 +54497,7 @@ function ownKeys$T(object, enumerableOnly) { var keys = Object.keys(object); if
 function _objectSpread$U(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys$T(Object(source), true).forEach(function (key) { defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys$T(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
 var throttle$9 = cornerstoneTools.importInternal('util/throttle');
+var NO_CHECK_MULTI_FRAME_MODALITIES = ['DR', 'CR', 'DX', 'MG'];
 var mapStateToProps$u = function mapStateToProps(state) {
   var _state$paladin$viewpo = state.paladin.viewport,
@@ -54501,6 +54509,7 @@ var mapStateToProps$u = function mapStateToProps(state) {
       currentSeriesUID = _state$paladin$viewpo.currentSeriesUID,
       currentSeries = _state$paladin$viewpo.currentSeries,
       seriesCurrentIndex = _state$paladin$viewpo.seriesCurrentIndex,
+      originStudy = _state$paladin$viewpo.originStudy,
       synchronizer = _state$paladin$viewpo.synchronizer,
       linkSynchronizer = _state$paladin$viewpo.linkSynchronizer,
       linkImageModeSynchronizer = _state$paladin$viewpo.linkImageModeSynchronizer,
@@ -54554,7 +54563,8 @@ var mapStateToProps$u = function mapStateToProps(state) {
     continuousMeasure: continuousMeasure,
     originActiveTool: originActiveTool,
     CPR: CPR,
-    globalLoading: globalLoading
+    globalLoading: globalLoading,
+    originStudy: originStudy
   };
 };
@@ -54578,7 +54588,9 @@ var mergeProps$t = function mergeProps(propsFromState, propsFromDispatch, ownPro
       surgeryActiveIndex = propsFromState.surgeryActiveIndex;
   var setCurrentSeries = propsFromDispatch.setCurrentSeries,
       _initSeries = propsFromDispatch.initSeries,
-      addSeries = propsFromDispatch.addSeries;
+      addSeries = propsFromDispatch.addSeries,
+      setSeriesCurrentIndex = propsFromDispatch.setSeriesCurrentIndex,
+      setSeries = propsFromDispatch.setSeries;
   var viewMode;
   if (Surgery) {
@@ -54698,7 +54710,35 @@ var mergeProps$t = function mergeProps(propsFromState, propsFromDispatch, ownPro
             propsFromDispatch.setImageScrollLine(resultScrollLine);
           }
         } else {
-          if (onePickMode) {
+          if (onePickMode || col === 1 && row === 1) {
+            var originStudy = propsFromState.originStudy;
+            var matchSeries = null;
+            var matchSeriesIndex = 0;
+            lodash$1.forEach(originStudy, function (item) {
+              if (item.studyInstanceUID === propsFromState.currentSeries.studyInstanceUID) {
+                matchSeries = item.series;
+                matchSeriesIndex = lodash$1.findIndex(matchSeries, function (v) {
+                  return v.seriesInstanceUID === propsFromState.currentSeriesUID;
+                });
+              }
+            });
+            if (!matchSeries || matchSeries.length === 0) {
+              return;
+            }
+            var nextSeriesIndex = matchSeriesIndex - 1;
+            if (nextSeriesIndex < 0) {
+              nextSeriesIndex = matchSeries.length - 1;
+            }
+            var selectSeries = matchSeries[nextSeriesIndex];
+            var realIndex = col * currentScrollLine + activeIndex;
+            reset$2('series')(realIndex, selectSeries);
+            setSeriesCurrentIndex(realIndex, selectSeries.currentImageIdIndex);
+            setSeries(realIndex, selectSeries);
+            setCurrentSeries(selectSeries);
             return;
           }
@@ -54744,7 +54784,35 @@ var mergeProps$t = function mergeProps(propsFromState, propsFromDispatch, ownPro
             }
           }
         } else {
-          if (onePickMode) {
+          if (onePickMode || col === 1 && row === 1) {
+            var originStudy = propsFromState.originStudy;
+            var matchSeries = null;
+            var matchSeriesIndex = 0;
+            lodash$1.forEach(originStudy, function (item) {
+              if (item.studyInstanceUID === propsFromState.currentSeries.studyInstanceUID) {
+                matchSeries = item.series;
+                matchSeriesIndex = lodash$1.findIndex(matchSeries, function (v) {
+                  return v.seriesInstanceUID === propsFromState.currentSeriesUID;
+                });
+              }
+            });
+            if (!matchSeries || matchSeries.length === 0) {
+              return;
+            }
+            var nextSeriesIndex = matchSeriesIndex + 1;
+            if (nextSeriesIndex === matchSeries.length) {
+              nextSeriesIndex = 0;
+            }
+            var selectSeries = matchSeries[nextSeriesIndex];
+            var realIndex = col * currentScrollLine + activeIndex;
+            reset$2('series')(realIndex, selectSeries);
+            setSeriesCurrentIndex(realIndex, selectSeries.currentImageIdIndex);
+            setSeries(realIndex, selectSeries);
+            setCurrentSeries(selectSeries);
             return;
           } // 序列模式
@@ -54937,7 +55005,7 @@ var mergeProps$t = function mergeProps(propsFromState, propsFromDispatch, ownPro
     },
     initSeries: function () {
       var _initSeries2 = asyncToGenerator( /*#__PURE__*/regenerator.mark(function _callee(changeStudy, callback) {
-        var data, synchronizer, linkSynchronizer, linkImageModeSynchronizer, linkScrollSynchronizer, options, _study, series, needCheckMultiFrame, hasMultiFrame, i, item, wado, url, dataSet, numFrames, imageIds, _i, imageId, seriesCurrentIndex, firstReady, maxRequest, retry, clearCacheEveryLoad, dicom, frameTime;
+        var data, synchronizer, linkSynchronizer, linkImageModeSynchronizer, linkScrollSynchronizer, options, _study, series, needCheckMultiFrame, hasMultiFrame, modalitiesInStudy, i, item, wado, url, dataSet, numFrames, imageIds, _i, imageId, seriesCurrentIndex, firstReady, maxRequest, retry, clearCacheEveryLoad, dicom, frameTime;
         return regenerator.wrap(function _callee$(_context) {
           while (1) {
@@ -55015,7 +55083,18 @@ var mergeProps$t = function mergeProps(propsFromState, propsFromDispatch, ownPro
                 needCheckMultiFrame = true;
-                hasMultiFrame = false;
+                hasMultiFrame = false; // 一些modalities不检测多帧
+                modalitiesInStudy = [];
+                if (_study[0].modalitiesInStudy) {
+                  modalitiesInStudy = lodash$1.isArray(_study[0].modalitiesInStudy) ? _study[0].modalitiesInStudy : [_study[0].modalitiesInStudy];
+                }
+                if (lodash$1.intersection(modalitiesInStudy, NO_CHECK_MULTI_FRAME_MODALITIES).length > 0) {
+                  needCheckMultiFrame = false;
+                }
                 lodash$1.forEach(series, function (v) {
                   if (v.numberOfSeriesRelatedInstances && v.numberOfSeriesRelatedInstances > 1) {
                     needCheckMultiFrame = false;
@@ -55023,32 +55102,32 @@ var mergeProps$t = function mergeProps(propsFromState, propsFromDispatch, ownPro
                 });
                 if (!needCheckMultiFrame) {
-                  _context.next = 41;
+                  _context.next = 44;
                   break;
                 }
                 i = 0;
-              case 25:
+              case 28:
                 if (!(i < series.length)) {
-                  _context.next = 41;
+                  _context.next = 44;
                   break;
                 }
                 item = series[i];
                 if (!(item.numberOfSeriesRelatedInstances && item.numberOfSeriesRelatedInstances === 1)) {
-                  _context.next = 38;
+                  _context.next = 41;
                   break;
                 }
                 wado = lodash$1.cloneDeep(item.imageIds[0].split(':'));
                 wado.shift();
                 url = wado.join(':');
-                _context.next = 33;
+                _context.next = 36;
                 return cornerstoneWADOImageLoader.wadouri.dataSetCacheManager.load(url, cornerstoneWADOImageLoader.internal.xhrRequest);
-              case 33:
+              case 36:
                 dataSet = _context.sent;
                 // 这边如果加载了的话 进度条也需要匹配上
                 propsFromDispatch.setSeriesLoaded(item.seriesInstanceUID);
@@ -55072,12 +55151,12 @@ var mergeProps$t = function mergeProps(propsFromState, propsFromDispatch, ownPro
                 cornerstoneWADOImageLoader.wadouri.dataSetCacheManager.purge();
-              case 38:
+              case 41:
                 i++;
-                _context.next = 25;
+                _context.next = 28;
                 break;
-              case 41:
+              case 44:
                 // 初始化seriesCurrentIndex
                 seriesCurrentIndex = Array.apply(null, Array(series.length)).map(function () {
                   return 0;
@@ -55133,10 +55212,10 @@ var mergeProps$t = function mergeProps(propsFromState, propsFromDispatch, ownPro
                   })]
                 }); // 如果有frameTime的话设置fps
-                _context.next = 56;
+                _context.next = 59;
                 return loadAndCacheDicom(series[0].imageIds[0]);
-              case 56:
+              case 59:
                 dicom = _context.sent;
                 if (dicom && dicom.FrameTime && dicom.FrameTime.value) {
@@ -55144,7 +55223,7 @@ var mergeProps$t = function mergeProps(propsFromState, propsFromDispatch, ownPro
                   propsFromDispatch.setCineFps(lodash$1.round(1000 / frameTime, 3) || 3);
                 }
-              case 58:
+              case 61:
               case "end":
                 return _context.stop();
             }
@@ -55209,6 +55288,13 @@ var mergeProps$t = function mergeProps(propsFromState, propsFromDispatch, ownPro
     },
     resetKeyImages: function resetKeyImages(data) {
       propsFromDispatch.setKeyImage(data);
+    },
+    setReduxOnStudyChange: function setReduxOnStudyChange(nextStudyData) {
+      if (!nextStudyData) {
+        return;
+      }
+      propsFromDispatch.setOriginStudyData(nextStudyData);
     }
   });
 };
@@ -55235,7 +55321,10 @@ var ConnectedDicomView = reactRedux.connect(mapStateToProps$u, {
   setActiveTool: setActiveTool,
   setCineFps: setCineFps,
   closeGlobalLoading: closeGlobalLoading,
-  setKeyImage: setKeyImage
+  setKeyImage: setKeyImage,
+  setOriginStudyData: setOriginStudyData,
+  setSeriesCurrentIndex: setSeriesCurrentIndex,
+  setSeries: setSeries
 }, mergeProps$t, withRef())(DicomView);
 function withRef() {