hellfire 0.27.8 → 0.27.9

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.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)
 
 

package/dist/index.js

@@ -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", {
@@ -54502,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,
@@ -54555,7 +54563,8 @@ var mapStateToProps$u = function mapStateToProps(state) {
     continuousMeasure: continuousMeasure,
     originActiveTool: originActiveTool,
     CPR: CPR,
-    globalLoading: globalLoading
+    globalLoading: globalLoading,
+    originStudy: originStudy
   };
 };
 
@@ -54579,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) {
@@ -54699,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;
           }
 
@@ -54745,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;
           } // 序列模式
 
@@ -55221,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);
     }
   });
 };
@@ -55247,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() {