hellfire 0.26.0 → 0.26.2

package/CHANGELOG.md

@@ -2,6 +2,14 @@
 
 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.26.2](http://10.16.100.57/diffusion/115/paladin/compare/v0.26.1...v0.26.2) (2023-05-26)
+
+
+
+## [0.26.1](http://10.16.100.57/diffusion/115/paladin/compare/v0.26.0...v0.26.1) (2023-05-16)
+
+
+
 # [0.26.0](http://10.16.100.57/diffusion/115/paladin/compare/v0.25.16...v0.26.0) (2023-05-16)
 
 

package/dist/index.js

@@ -42747,12 +42747,12 @@ var DicomToolFlattenMode$1 = /*#__PURE__*/function (_Component) {
       var _this$props3 = this.props,
           start3D = _this$props3.start3D,
           exit3D = _this$props3.exit3D,
-          toggleToolMode = _this$props3.toggleToolMode,
           toggleOverlayText = _this$props3.toggleOverlayText,
           toggleImageMode = _this$props3.toggleImageMode,
           toggleMeasure = _this$props3.toggleMeasure,
           openDicomModal = _this$props3.openDicomModal,
-          handleFullscreen = _this$props3.handleFullscreen;
+          handleFullscreen = _this$props3.handleFullscreen,
+          setCustomWindowLayoutType = _this$props3.setCustomWindowLayoutType;
       var isThree = MPR || VR || Surgery || MIP;
       var IODisconnect = !IO;
       var commonTools = ['Layout', 'StackScroll', 'Wwwc', 'Zoom', 'Pan', 'Rotate', 'ReverseColor', 'Sharpen', 'Cine', 'FalseColor', 'Link', 'ReferencePosition', 'Reset'];
@@ -42793,9 +42793,11 @@ var DicomToolFlattenMode$1 = /*#__PURE__*/function (_Component) {
         className: "paladin-tool-flatten-hor-wrapper"
       }, IODisconnect && /*#__PURE__*/React__default.createElement("div", {
         className: "paladin-flatten-hor-go-line",
-        onClick: toggleToolMode
+        onClick: function onClick() {
+          setCustomWindowLayoutType('horizontal');
+        }
       }, /*#__PURE__*/React__default.createElement(PopperBox, {
-        tooltip: '折叠工具栏'
+        tooltip: '切换工具栏'
       }, /*#__PURE__*/React__default.createElement("div", {
         className: "paladin-flatten-hor-go-line-content"
       }, /*#__PURE__*/React__default.createElement(SvgCaretLeft, null)))), !Surgery && /*#__PURE__*/React__default.createElement("div", {
@@ -45060,7 +45062,15 @@ var DicomTool = /*#__PURE__*/function (_Component) {
       }
 
       var width = window.innerWidth;
-      var height = window.innerHeight; // 横屏
+      var height = window.innerHeight;
+      /**
+       * 工具栏影响因素：
+       * 1._toolMode为 line 和 flatten 简约工具栏和展开式工具栏（期望尽量不用简约）
+       * 2.pc端横屏还是竖屏
+       * 3.手机端
+       * 4.手机端三维界面
+       */
+      // 横屏
 
       var FlattenMode = DicomToolFlattenMode;
 
@@ -45078,7 +45088,8 @@ var DicomTool = /*#__PURE__*/function (_Component) {
         toolsMap: this.toolsMap,
         direction: isMobile ? 'Horizontal' : 'Vertical'
       })), _toolMode === 'flatten' && /*#__PURE__*/React__default.createElement(FlattenMode, _extends_1({}, this.props, {
-        toolsMap: this.toolsMap
+        toolsMap: this.toolsMap,
+        setCustomWindowLayoutType: this.props.setCustomWindowLayoutType
       })), _toolMode === 'mobile' && /*#__PURE__*/React__default.createElement(DicomToolMobileThreeModeBottom, _extends_1({}, this.props, {
         toolsMap: this.toolsMap,
         scrollHidden: isThree
@@ -45475,7 +45486,8 @@ var mergeProps$h = function mergeProps(propsFromState, propsFromDispatch, ownPro
         var imageCount = 0;
         lodash$1.map(study, function (studyItem) {
           lodash$1.map(studyItem.series, function (seriesItem) {
-            imageCount += seriesItem.numberOfSeriesRelatedInstances;
+            var instanceCount = seriesItem.imageIds && seriesItem.imageIds.length || 0;
+            imageCount += instanceCount;
           });
         });
 
@@ -46614,7 +46626,7 @@ var ThumbContent = function ThumbContent(props) {
   var series = props.series,
       loaded = props.loaded;
   var loadedCount = loaded && loaded[series.seriesInstanceUID];
-  var totalCount = series && series.numberOfSeriesRelatedInstances;
+  var totalCount = series && series.imageIds && series.imageIds.length;
   var width = 0;
 
   if (loadedCount && totalCount) {
@@ -46644,7 +46656,7 @@ var ThumbContent = function ThumbContent(props) {
     imageId: series.imageIds[0]
   }), /*#__PURE__*/React__default.createElement("div", {
     className: isMobile$2 ? "paladin-thumb-bottom paladin-thumb-bottom-mobile" : "paladin-thumb-bottom"
-  }, series.numberOfSeriesRelatedInstances ? "Im: ".concat(series.numberOfSeriesRelatedInstances) : ''));
+  }, totalCount ? "Im: ".concat(totalCount) : ''));
 };
 
 var DicomThumbnailLayout = /*#__PURE__*/function (_Component) {
@@ -50843,12 +50855,13 @@ var mergeProps$k = function mergeProps(propsFromState, propsFromDispatch, ownPro
 
   var series = lodash$1.map(imageIds, function (image) {
     // seriesCount和instanceCount为了overlay的正确显示
+    var instanceCount = imageIds.length;
     return {
       imageIds: [image],
       seriesInstanceUID: currentSeries.seriesInstanceUID,
       currentImageIdIndex: 0,
       seriesCount: currentSeries.seriesCount,
-      instanceCount: currentSeries.numberOfSeriesRelatedInstances
+      instanceCount: instanceCount
     };
   });
   var showVerticalScroll = series && series.length / col > row;
@@ -53134,13 +53147,14 @@ var mergeProps$q = function mergeProps(propsFromState, propsFromDispatch, ownPro
   lodash$1.map(study, function (studyItem) {
     lodash$1.map(studyItem.series, function (seriesItem) {
       // seriesCount和instanceCount为了overlay的正确显示
+      var instanceCount = seriesItem.imageIds.length;
       lodash$1.map(seriesItem.imageIds, function (image) {
         var data = {
           imageIds: [image],
           seriesInstanceUID: seriesItem.seriesInstanceUID,
           currentImageIdIndex: 0,
           seriesCount: seriesItem.seriesCount,
-          instanceCount: seriesItem.numberOfSeriesRelatedInstances
+          instanceCount: instanceCount
         };
         allSeries.push(data);
       });
@@ -53375,9 +53389,16 @@ var DicomView = /*#__PURE__*/function (_Component) {
       });
     });
 
+    defineProperty(assertThisInitialized(_this), "setCustomWindowLayoutType", function (value) {
+      _this.setState({
+        windowLayoutType: value
+      });
+    });
+
     _this.state = {
       study: _this.props.study,
-      resize: 0
+      resize: 0,
+      windowLayoutType: _this.props.windowLayoutType
     }; // 窗口变化要重新渲染滚动条的距离
 
     _this.debouncedResize = lodash$1.debounce(_this.resize, 300);
@@ -53438,6 +53459,12 @@ var DicomView = /*#__PURE__*/function (_Component) {
           set$1('aiResult', nextProps.aiResult.inspectionDetails);
         }
       }
+
+      if (nextProps.windowLayoutType !== this.props.windowLayoutType) {
+        this.setState({
+          windowLayoutType: nextProps.windowLayoutType
+        });
+      }
     }
   }, {
     key: "componentWillUnmount",
@@ -53801,7 +53828,8 @@ var DicomView = /*#__PURE__*/function (_Component) {
         helpLink: this.props.helpLink,
         changeWindowSet: this.props.changeWindowSet,
         study: this.state.study,
-        windowLayoutType: this.props.windowLayoutType
+        windowLayoutType: this.state.windowLayoutType,
+        setCustomWindowLayoutType: this.setCustomWindowLayoutType
       }));
       var DicomLayout = /*#__PURE__*/React__default.createElement(DicomLayoutContainerWrap, null, viewMode === '2D' && this.props.mode === 'seriesMode' && /*#__PURE__*/React__default.createElement(ConnectedDicomLayout, {
         series: this.props.series,
@@ -53870,8 +53898,8 @@ var DicomView = /*#__PURE__*/function (_Component) {
       var width = window.innerWidth;
       var height = window.innerHeight;
 
-      if (this.props.windowLayoutType) {
-        if (this.props.windowLayoutType === 'vertical') pc = verticalLayout;
+      if (this.state.windowLayoutType) {
+        if (this.state.windowLayoutType === 'vertical') pc = verticalLayout;
       } else {
         if (width < height && toolMode === 'flatten') {
           // 竖屏 + 展开
@@ -54435,6 +54463,11 @@ var mergeProps$r = function mergeProps(propsFromState, propsFromDispatch, ownPro
                 needCheckMultiFrame = true;
                 hasMultiFrame = false;
                 lodash$1.forEach(series, function (v) {
+                  // numberOfSeriesRelatedInstances修正 避免多次上传和实际数量不一致的情况
+                  if (v.imageIds && v.imageIds.length > 0) {
+                    v.numberOfSeriesRelatedInstances = v.imageIds.length;
+                  }
+
                   if (v.numberOfSeriesRelatedInstances && v.numberOfSeriesRelatedInstances > 1) {
                     needCheckMultiFrame = false;
                   }