hellfire 0.29.11 → 0.29.12

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.29.12](http://10.16.100.57/diffusion/115/paladin/compare/v0.29.11...v0.29.12) (2025-05-14)
+
+
+
 ## [0.29.11](http://10.16.100.57/diffusion/115/paladin/compare/v0.29.10...v0.29.11) (2025-05-13)
 
 

package/dist/index.js

@@ -29724,9 +29724,9 @@ function _ref() {
               newImageIdIndex = eventData.newImageIdIndex;
 
               if (targetImageLength > sourceImageLength) {
-                targetNewIndex = lodash$1.round(targetImageLength / sourceImageLength) * newImageIdIndex;
+                targetNewIndex = lodash$1.round(targetImageLength / sourceImageLength * newImageIdIndex);
               } else {
-                targetNewIndex = lodash$1.floor(newImageIdIndex / lodash$1.round(sourceImageLength / targetImageLength));
+                targetNewIndex = lodash$1.round(newImageIdIndex / (sourceImageLength / targetImageLength));
               }
 
               if (targetNewIndex < 0) {
@@ -40033,7 +40033,8 @@ var PopperBox = /*#__PURE__*/function (_Component) {
           ref: ref,
           style: _objectSpread$r(_objectSpread$r(_objectSpread$r({}, style), popperStyle), {}, {
             // zIndex: -1,
-            margin: popoverArrow ? '10px' : 0
+            margin: popoverArrow ? '10px' : 0,
+            zIndex: 99
           }),
           "data-placement": placement
         }, /*#__PURE__*/React__default.createElement(WrapperPopover, _extends_1({
@@ -48436,28 +48437,28 @@ function openAutoLink (_x) {
 
 function _ref$1q() {
   _ref$1q = asyncToGenerator( /*#__PURE__*/regenerator.mark(function _callee(props) {
-    var col, row, currentScrollLine, activeIndex, seriesCurrentIndex, series, setLinkSeries, linkSynchronizer, linkScrollSynchronizer, realActiveIndex, realSeriesIndex, _currentImageIdIndex, _currentSeries, currentImageId, currentDicom, currentPos, links, startIndex, endIndex, currentLayoutSeries, _series, i, seriesItem, imageId, dicom, comparePos, angle, activeElement;
+    var col, row, currentScrollLine, activeIndex, seriesCurrentIndex, series, setLinkSeries, linkSynchronizer, linkScrollSynchronizer, realActiveIndex, realSeriesIndex, currentImageIdIndex, calcImageIdIndex, _currentSeries, currentImageId, currentDicom, currentPos, links, startIndex, endIndex, currentLayoutSeries, _series, i, seriesItem, imageId, dicom, comparePos, angle, activeElement, sourceStack, sourceImageLength;
 
     return regenerator.wrap(function _callee$(_context) {
       while (1) {
         switch (_context.prev = _context.next) {
           case 0:
             col = props.col, row = props.row, currentScrollLine = props.currentScrollLine, activeIndex = props.activeIndex, seriesCurrentIndex = props.seriesCurrentIndex, series = props.series, setLinkSeries = props.setLinkSeries, linkSynchronizer = props.linkSynchronizer, linkScrollSynchronizer = props.linkScrollSynchronizer, realActiveIndex = props.realActiveIndex;
-            realSeriesIndex = col * currentScrollLine + activeIndex; // const _currentImageIdIndex = seriesCurrentIndex[realSeriesIndex];
-
-            _currentImageIdIndex = 0;
+            realSeriesIndex = col * currentScrollLine + activeIndex;
+            currentImageIdIndex = seriesCurrentIndex[realSeriesIndex];
+            calcImageIdIndex = 0;
             _currentSeries = series[realSeriesIndex];
-            currentImageId = _currentSeries.imageIds[_currentImageIdIndex];
-            _context.next = 7;
+            currentImageId = _currentSeries.imageIds[calcImageIdIndex];
+            _context.next = 8;
             return loadAndCacheDicom(currentImageId);
 
-          case 7:
+          case 8:
             currentDicom = _context.sent;
             currentPos = getPosFromDicom(currentDicom);
             links = [];
 
             if (!currentPos) {
-              _context.next = 28;
+              _context.next = 29;
               break;
             }
 
@@ -48468,24 +48469,24 @@ function _ref$1q() {
             _series = lodash$1.cloneDeep(currentLayoutSeries);
             i = 0;
 
-          case 16:
+          case 17:
             if (!(i < _series.length)) {
-              _context.next = 28;
+              _context.next = 29;
               break;
             }
 
             seriesItem = _series[i]; // (seriesItem.numberOfSeriesRelatedInstances === _currentSeries.numberOfSeriesRelatedInstances)
 
             if (!(seriesItem.seriesInstanceUID !== _currentSeries.seriesInstanceUID)) {
-              _context.next = 25;
+              _context.next = 26;
               break;
             }
 
-            imageId = seriesItem.imageIds[_currentImageIdIndex];
-            _context.next = 22;
+            imageId = seriesItem.imageIds[calcImageIdIndex];
+            _context.next = 23;
             return loadAndCacheDicom(imageId);
 
-          case 22:
+          case 23:
             dicom = _context.sent;
             comparePos = getPosFromDicom(dicom);
 
@@ -48497,20 +48498,25 @@ function _ref$1q() {
               }
             }
 
-          case 25:
+          case 26:
             i++;
-            _context.next = 16;
+            _context.next = 17;
             break;
 
-          case 28:
+          case 29:
+            activeElement = getElement(realActiveIndex);
+
             if (links && links.length > 0) {
+              sourceStack = cornerstoneTools.getToolState(activeElement, 'stack');
+              sourceImageLength = sourceStack.data[0].numberOfSeriesRelatedInstances;
               lodash$1.forEach(links, function (link) {
-                scrollToIndex$3(getElement(link), _currentImageIdIndex);
+                var targetElement = getElement(link);
+                var nextIndex = calcTargetIndex(sourceImageLength, targetElement, currentImageIdIndex);
+                scrollToIndex$3(targetElement, nextIndex || 0);
               });
             }
 
             setLinkSeries(links);
-            activeElement = getElement(realActiveIndex);
 
             if (links && links.length > 0) {
               lodash$1.forEach(links, function (link) {
@@ -48521,7 +48527,7 @@ function _ref$1q() {
               linkScrollSynchronizer.add(activeElement);
             }
 
-          case 32:
+          case 33:
           case "end":
             return _context.stop();
         }
@@ -48531,6 +48537,34 @@ function _ref$1q() {
   return _ref$1q.apply(this, arguments);
 }
 
+function calcTargetIndex(sourceImageLength, targetElement, currentImageIdIndex) {
+  var targetStack = cornerstoneTools.getToolState(targetElement, 'stack');
+  var targetImageLength = targetStack.data[0].numberOfSeriesRelatedInstances;
+
+  if (sourceImageLength === targetImageLength) {
+    return currentImageIdIndex;
+  } else {
+    // 序列图像张数不同 按比例
+    var targetNewIndex;
+
+    if (targetImageLength > sourceImageLength) {
+      targetNewIndex = lodash$1.round(targetImageLength / sourceImageLength * currentImageIdIndex);
+    } else {
+      targetNewIndex = lodash$1.round(currentImageIdIndex / (sourceImageLength / targetImageLength));
+    }
+
+    if (targetNewIndex < 0) {
+      targetNewIndex = 0;
+    }
+
+    if (targetNewIndex > targetImageLength - 1) {
+      targetNewIndex = targetImageLength - 1;
+    }
+
+    return targetNewIndex;
+  }
+}
+
 var css_248z$u = ".paladin-user-setting {\n  padding: 0 20px;\n  margin-bottom: 30px;\n  font-size: 15px;\n}\n.paladin-user-setting p {\n  font-size: 16px;\n}\n.paladin-user-setting p svg {\n  width: 10px;\n  margin-right: 2px;\n}\n.paladin-user-setting .paladin-user-setting-remark {\n  color: #d43f3a;\n  margin: 10px 0 0 0;\n}\n.paladin-user-setting .paladin-user-setting-footer {\n  margin-top: 15px;\n  text-align: right;\n}\n.paladin-user-setting .paladin-user-setting-footer button {\n  margin-left: 10px;\n}\n.paladin-user-setting .paladin-setting-radio {\n  display: flex;\n}\n.paladin-user-setting .paladin-setting-radio .paladin-setting-radio-label {\n  display: flex;\n  flex-direction: row;\n  align-items: center;\n  justify-content: center;\n}\n.paladin-user-setting .paladin-setting-radio .paladin-setting-radio-item {\n  display: flex;\n  flex-direction: row;\n  margin-right: 10px;\n  align-items: center;\n  justify-content: center;\n}\n.paladin-user-setting .paladin-setting-radio .paladin-setting-radio-item .paladin-ipt {\n  padding: 0 !important;\n  margin: 0 3px 0 0 !important;\n}\n.paladin-user-setting .paladin-setting-radio .paladin-setting-radio-item input {\n  display: flex;\n  flex-direction: column;\n  width: 20px;\n  height: 20px;\n}\n.paladin-user-setting .paladin-setting-radio .paladin-setting-radio-item span {\n  display: flex;\n  flex-direction: column;\n}\n.paladin-user-setting .paladin-setting-hotkey {\n  display: flex;\n  flex-direction: row;\n  flex-wrap: wrap;\n}\n.paladin-user-setting .paladin-setting-hotkey .paladin-setting-hotkey-item {\n  display: flex;\n  flex-direction: column;\n  flex: none;\n  padding: 5px 10px;\n  border: 1px solid #666;\n  border-radius: 3px;\n  margin-right: 10px;\n  margin-bottom: 10px;\n}\n";
 styleInject$1(css_248z$u);
 
@@ -54134,12 +54168,24 @@ var DicomViewport = /*#__PURE__*/function (_Component) {
   }, {
     key: "onNewImage",
     value: function onNewImage() {
-      // 展示新的image时先去viewport缓存池中找有没有已存的viewport
+      // 更新series current index（联动、同步的情况下，需要这边触发更新）
+      var currentImageIdIndex = this.state.stack ? this.state.stack.currentImageIdIndex : 0;
+
+      if (this.props.mode === 'seriesMode' && !this.props.mpr) {
+        var _this$props6 = this.props,
+            col = _this$props6.col,
+            currentScrollLine = _this$props6.currentScrollLine,
+            index = _this$props6.index,
+            setSeriesCurrentIndex = _this$props6.setSeriesCurrentIndex;
+        var currentSeriesIndex = col * currentScrollLine + index;
+        setSeriesCurrentIndex(currentSeriesIndex, currentImageIdIndex);
+      } // 展示新的image时先去viewport缓存池中找有没有已存的viewport
+
+
       if (!this.props.getCacheViewport) {
         return;
       }
 
-      var currentImageIdIndex = this.state.stack ? this.state.stack.currentImageIdIndex : 0;
       var key = this.props.mpr || this.props.index;
       var initViewport = this.props.getCacheViewport(key, currentImageIdIndex);
       /**
@@ -54257,9 +54303,9 @@ var DicomViewport = /*#__PURE__*/function (_Component) {
 
       e.stopPropagation();
       checkAndUnLockToolState(e, this.element);
-      var _this$props6 = this.props,
-          onViewportMouseDown = _this$props6.onViewportMouseDown,
-          mpr = _this$props6.mpr;
+      var _this$props7 = this.props,
+          onViewportMouseDown = _this$props7.onViewportMouseDown,
+          mpr = _this$props7.mpr;
       onViewportMouseDown && onViewportMouseDown(e, this.state.stack.seriesInstanceUID);
       var activeDataTool = this.checkToolDataActive();
 
@@ -54282,10 +54328,10 @@ var DicomViewport = /*#__PURE__*/function (_Component) {
       var isMobile = ua.isDeviceTypeMobile();
 
       if (isMobile) {
-        var _this$props7 = this.props,
-            activeTool = _this$props7.activeTool,
-            originActiveTool = _this$props7.originActiveTool,
-            setActiveTool = _this$props7.setActiveTool;
+        var _this$props8 = this.props,
+            activeTool = _this$props8.activeTool,
+            originActiveTool = _this$props8.originActiveTool,
+            setActiveTool = _this$props8.setActiveTool;
 
         if (lodash$1.includes(LengthToolsWithMeasure, activeTool)) {
           var toolData = cornerstoneTools.getToolState(this.element, activeTool);
@@ -54643,9 +54689,9 @@ var DicomViewport = /*#__PURE__*/function (_Component) {
   }, {
     key: "changeReferenceLineType",
     value: function changeReferenceLineType(type) {
-      var _this$props8 = this.props,
-          ReferencePosition = _this$props8.ReferencePosition,
-          synchronizer = _this$props8.synchronizer;
+      var _this$props9 = this.props,
+          ReferencePosition = _this$props9.ReferencePosition,
+          synchronizer = _this$props9.synchronizer;
 
       if (ReferencePosition) {
         cornerstoneTools.setToolDisabledForElement(this.element, 'ReferenceLines', {
@@ -54662,10 +54708,10 @@ var DicomViewport = /*#__PURE__*/function (_Component) {
   }, {
     key: "addElementReferenceLines",
     value: function addElementReferenceLines(type) {
-      var _this$props9 = this.props,
-          synchronizer = _this$props9.synchronizer,
-          activeIndex = _this$props9.activeIndex,
-          index = _this$props9.index;
+      var _this$props10 = this.props,
+          synchronizer = _this$props10.synchronizer,
+          activeIndex = _this$props10.activeIndex,
+          index = _this$props10.index;
       var active = activeIndex === index;
 
       if (active) {
@@ -54698,10 +54744,10 @@ var DicomViewport = /*#__PURE__*/function (_Component) {
   }, {
     key: "addElementReferencePosition",
     value: function addElementReferencePosition() {
-      var _this$props10 = this.props,
-          positionSynchronizer = _this$props10.positionSynchronizer,
-          activeIndex = _this$props10.activeIndex,
-          index = _this$props10.index;
+      var _this$props11 = this.props,
+          positionSynchronizer = _this$props11.positionSynchronizer,
+          activeIndex = _this$props11.activeIndex,
+          index = _this$props11.index;
       var stack = this.state.stack;
       var active = activeIndex === index;