hellfire 0.26.1 → 0.26.2

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

package/dist/index.js

@@ -45486,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;
           });
         });
 
@@ -46625,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) {
@@ -46655,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) {
@@ -50854,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;
@@ -53145,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);
       });
@@ -54460,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;
                   }