hellfire 0.23.1 → 0.23.2

package/dist/index.js

@@ -107,7 +107,7 @@ var tools = ['Layout', 'PrevNext', 'ImageMode', 'StackScroll', 'Wwwc', 'Zoom', '
 var phoneTools = ["Prev", "Next", "StackScroll", "Wwwc", "Zoom", "Pan", "Reset", "Rotate", "Tool", "Length", "Cine", "MPR", "Settings"]; // MPR 允许使用的工具, 及其排序
 
 var mprTools = ["MprExit", "PrevNext", "MprSwitchPerspective", "CrosshairsMPR", "StackScroll", "Wwwc", "Zoom", "Pan", "Reset", "Rotate", "Tool", "Length", "Fullscreen", "MprRefresh"];
-var mprPhoneTools = ["MprExit", "Prev", "Next", "MprSwitchPerspective", "CrosshairsMPR", "StackScroll", "Wwwc", "Zoom", "Pan", "Reset", "Rotate", "Tool", "Length", "MprRefresh"]; // VR 允许使用的工具, 及其排序
+var mprPhoneTools = ["MprExit", "StackScroll", "MprSwitchPerspective", "CrosshairsMPR", "Wwwc", "Zoom", "Pan", "Reset", "Rotate", "Tool", "Length", "MprRefresh"]; // VR 允许使用的工具, 及其排序
 
 var vrTools = ["MprExit", "PrevNext", "VRMode", "VRPresentColor", "VRCenterPointShow", "VRDirection", "VRClip", "VRRefresh", "VRInfo", "MprSwitchPerspective", "CrosshairsMPR", "StackScroll", "Wwwc", "Zoom", "Pan", "Reset", "Rotate", "Tool", "Length", "Fullscreen", "MprRefresh"];
 var vrPhoneTools = ["MprExit", "VRMode", "VRPresentColor", "VRCenterPointShow", "VRDirection", "VRClip", "VRInfo", "Prev", "Next", "MprSwitchPerspective", "CrosshairsMPR", "StackScroll", "Wwwc", "Zoom", "Pan", "Reset", "Rotate", "Tool", "Length", "MprRefresh"];
@@ -11291,10 +11291,12 @@ var errorCache = {}; // 出错的task集合
 
 var currentTopPriority = 1; // 当前最高的优先级（除了及时触发的）
 
+var clearCacheEveryLoad = false; // multi-frame的图像需要每次都清cache 不然一直会报错：frame exceeds size of pixelData
+
 function initConfig(config) {
-  console.log('Init Config');
   maxRequest = config.maxRequest || maxRequest;
-  retry = config.retry || retry;
+  retry = config.retry || (config.retry === 0 ? 0 : retry);
+  clearCacheEveryLoad = config.clearCacheEveryLoad;
   executeCallback = config.executeCallback || null;
 }
 
@@ -11354,6 +11356,11 @@ function addTaskIntoPool(task) {
 function executeTask() {
   if (taskPool.length > 0) {
     sortTaskPool();
+
+    if (clearCacheEveryLoad) {
+      cornerstoneWADOImageLoader.wadouri.dataSetCacheManager.purge();
+    }
+
     var executeRequest = maxRequest - numRequest;
 
     if (executeRequest > 0) {
@@ -11471,6 +11478,7 @@ function changeCurrentTopPriority(value) {
   reactHotLoader.register(cachedTask, "cachedTask", "/Users/huyeqing/workspace/chainz/paladin/src/cornerstone-plus/cornerstone-request-image/task-helper/index.js");
   reactHotLoader.register(errorCache, "errorCache", "/Users/huyeqing/workspace/chainz/paladin/src/cornerstone-plus/cornerstone-request-image/task-helper/index.js");
   reactHotLoader.register(currentTopPriority, "currentTopPriority", "/Users/huyeqing/workspace/chainz/paladin/src/cornerstone-plus/cornerstone-request-image/task-helper/index.js");
+  reactHotLoader.register(clearCacheEveryLoad, "clearCacheEveryLoad", "/Users/huyeqing/workspace/chainz/paladin/src/cornerstone-plus/cornerstone-request-image/task-helper/index.js");
   reactHotLoader.register(initConfig, "initConfig", "/Users/huyeqing/workspace/chainz/paladin/src/cornerstone-plus/cornerstone-request-image/task-helper/index.js");
   reactHotLoader.register(clear, "clear", "/Users/huyeqing/workspace/chainz/paladin/src/cornerstone-plus/cornerstone-request-image/task-helper/index.js");
   reactHotLoader.register(addTaskIntoPool, "addTaskIntoPool", "/Users/huyeqing/workspace/chainz/paladin/src/cornerstone-plus/cornerstone-request-image/task-helper/index.js");
@@ -24680,7 +24688,7 @@ var CprImageProcessorWorkerImpl = /*#__PURE__*/function (_ImageProcessorWorker)
 
       var v = lodash$1.flattenDeep(_resultValues);
 
-      var __resultValues = new Uint16Array(v);
+      var __resultValues = new Int16Array(v);
 
       var cprData = this.imageResultDatasMap[ImagePlanDirection.CPR];
       var _curvePoints = [];
@@ -24713,8 +24721,9 @@ var CprImageProcessorWorkerImpl = /*#__PURE__*/function (_ImageProcessorWorker)
         windowWidth: coronalData.windowLevel,
         sizeInBytes: coronalData.imageHeight * width,
         color: false,
+        invert: false,
         intercept: coronalData.intercept,
-        minPixelValue: minPixelValue < 0 || !minPixelValue ? 0 : minPixelValue,
+        minPixelValue: minPixelValue || 0,
         maxPixelValue: maxPixelValue || 0,
         curvePoints: _curvePoints
       };
@@ -29976,23 +29985,23 @@ var __signature__$1K = typeof reactHotLoaderGlobal !== 'undefined' ? reactHotLoa
   return a;
 };
 
-function getActiveElement(mode, activeIndex, imageActiveIndex, MPR, mprActiveIndex, Surgery, surgeryActiveIndex) {
+function getActiveElement(mode, activeIndex, imageActiveIndex, MPR, mprActiveIndex, Surgery, surgeryActiveIndex, CPR) {
   // 1.序列模式
   // 2.图像模式
   // 3.mpr
   // 4.手术路径规划
-  var index = Surgery ? surgeryActiveIndex : MPR ? mprActiveIndex : mode === 'seriesMode' ? activeIndex : imageActiveIndex;
+  var index = Surgery || CPR ? surgeryActiveIndex : MPR ? mprActiveIndex : mode === 'seriesMode' ? activeIndex : imageActiveIndex;
   return getElement(index);
 }
 function getElement(index) {
   return document.getElementById("paladin-viewport-".concat(index));
 }
-function getRealActiveIndex(mode, activeIndex, imageActiveIndex, MPR, mprActiveIndex, Surgery, surgeryActiveIndex) {
+function getRealActiveIndex(mode, activeIndex, imageActiveIndex, MPR, mprActiveIndex, Surgery, surgeryActiveIndex, CPR) {
   // 1.序列模式
   // 2.图像模式
   // 3.mpr
   // 4.手术路径规划
-  return Surgery ? surgeryActiveIndex : MPR ? mprActiveIndex : mode === 'seriesMode' ? activeIndex : imageActiveIndex;
+  return Surgery || CPR ? surgeryActiveIndex : MPR ? mprActiveIndex : mode === 'seriesMode' ? activeIndex : imageActiveIndex;
 }
 
 (function () {
@@ -34102,21 +34111,21 @@ var SvgViewMode = function SvgViewMode(props) {
 
 function _extends$9() { _extends$9 = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends$9.apply(this, arguments); }
 
-var _ref$9 = /*#__PURE__*/React__default.createElement("path", {
-  d: "M1268.316 15.548c-.158-1.192-.454-2.755-1.319-4.251-.654-1.135-1.477-1.967-2.131-2.569-4.393-4.055-10.6-6.201-17.942-6.201-.975 0-1.95.036-2.925.105-7.508.538-13.932 2.817-19.093 6.775-4.827 3.702-8.632 9.073-11.007 15.545-2.036 5.539-2.796 11.126-2.265 16.603.153 1.587.459 3.439 1.582 5.138 1.104 1.666 2.643 2.648 3.862 3.317 4.153 2.287 9.047 3.448 14.558 3.448 1.4 0 2.868-.077 4.358-.225 7.571-.75 14.013-3.138 19.146-7.09 5.114-3.94 9.076-9.628 11.451-16.448 1.744-5.002 2.323-9.762 1.725-14.147zM1251.12 38.78a15.199 15.199 0 01-21.612.096c-5.993-5.984-6.041-15.736-.1-21.777a15.2 15.2 0 0121.612-.098c5.993 5.985 6.041 15.738.1 21.779z"
-});
-
-var _ref2$4 = /*#__PURE__*/React__default.createElement("path", {
-  d: "M1246.838 33.752a8.56 8.56 0 00-.053-12.163c-.019-.021-.048-.036-.072-.057a4.5 4.5 0 01-1.023 1.618 4.519 4.519 0 01-6.428.029c-.985-.985-1.41-2.311-1.314-3.604-1.247.413-2.423 1.08-3.413 2.069a8.56 8.56 0 00.053 12.166c3.399 3.342 8.885 3.316 12.25-.058z"
-});
+var _ref$9 = /*#__PURE__*/React__default.createElement("g", {
+  "data-name": "\\u7EC4 3591"
+}, /*#__PURE__*/React__default.createElement("path", {
+  "data-name": "\\u51CF\\u53BB 7",
+  d: "M59 66H7a7.008 7.008 0 01-7-7V7a7.008 7.008 0 017-7h52a7.007 7.007 0 017 7v52a7.008 7.008 0 01-7 7zM33.216 16.889v32.9h11.039a18.177 18.177 0 005.628-.807 11.267 11.267 0 006.881-5.784 16.609 16.609 0 001.554-4.52 28.558 28.558 0 00.47-5.374 25.476 25.476 0 00-.795-6.651 15 15 0 00-2.483-5.148 10.8 10.8 0 00-4.53-3.422 17.39 17.39 0 00-6.725-1.193zm-15.472 3.735a5.907 5.907 0 014.05 1.41 4.757 4.757 0 011.59 3.719 6.74 6.74 0 01-.3 1.988 7.624 7.624 0 01-.915 1.916c-.412.629-.793 1.16-1.133 1.579s-.814.96-1.386 1.579L7.356 46.437v3.326h21.62V45.28H14.322v-.289l8.411-9.255c.894-1 1.465-1.636 1.8-2.013.346-.393.836-1.009 1.458-1.832a12.551 12.551 0 001.338-2.084 13.327 13.327 0 00.73-2.054A9.107 9.107 0 0028.4 25.3a8.339 8.339 0 00-2.916-6.52 11.155 11.155 0 00-7.62-2.567 12.381 12.381 0 00-4.627.832 9.124 9.124 0 00-3.362 2.229A10.039 10.039 0 007.9 22.42a9.932 9.932 0 00-.687 3.651v.241h4.772v-.265a5.272 5.272 0 011.565-3.844 5.665 5.665 0 014.194-1.579zM43.8 45.253h-5.618V21.396H43.8c3.279 0 5.772 1.008 7.411 2.995s2.471 5.01 2.471 8.984c0 4.046-.815 7.07-2.422 8.99s-4.121 2.888-7.46 2.888z",
+  fill: "#fff"
+}));
 
-var SvgBrowse = function SvgBrowse(props) {
+var Svg2D = function Svg2D(props) {
   return /*#__PURE__*/React__default.createElement("svg", _extends$9({
-    width: 60,
-    height: 56,
-    viewBox: "1210 0 60 56",
+    width: 66,
+    height: 66,
+    viewBox: "0 0 66 66",
     fill: "currentColor"
-  }, props), _ref$9, _ref2$4);
+  }, props), _ref$9);
 };
 
 function _extends$a() { _extends$a = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends$a.apply(this, arguments); }
@@ -34373,7 +34382,7 @@ var _ref$p = /*#__PURE__*/React__default.createElement("linearGradient", {
   stopColor: "#efefef"
 }));
 
-var _ref2$5 = /*#__PURE__*/React__default.createElement("path", {
+var _ref2$4 = /*#__PURE__*/React__default.createElement("path", {
   fill: "url(#vr-color_svg__a)",
   stroke: "#FFF",
   strokeMiterlimit: 10,
@@ -34386,7 +34395,7 @@ var SvgVrColor = function SvgVrColor(props) {
     height: 283.46,
     viewBox: "0 0 283.46 283.46",
     fill: "currentColor"
-  }, props), _ref$p, _ref2$5);
+  }, props), _ref$p, _ref2$4);
 };
 
 function _extends$q() { _extends$q = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends$q.apply(this, arguments); }
@@ -34395,7 +34404,7 @@ var _ref$q = /*#__PURE__*/React__default.createElement("path", {
   d: "M133.502 0h16.453v92.611h-16.453zM133.197 190.251h16.453v92.595h-16.453zM190.251 133.197h92.595v16.453h-92.595zM0 133.197h92.611v16.453H0z"
 });
 
-var _ref2$6 = /*#__PURE__*/React__default.createElement("circle", {
+var _ref2$5 = /*#__PURE__*/React__default.createElement("circle", {
   cx: 141.425,
   cy: 141.428,
   r: 20.674
@@ -34407,7 +34416,7 @@ var SvgVrCenter = function SvgVrCenter(props) {
     height: 283.46,
     viewBox: "0 0 283.46 283.46",
     fill: "currentColor"
-  }, props), _ref$q, _ref2$6);
+  }, props), _ref$q, _ref2$5);
 };
 
 function _extends$r() { _extends$r = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends$r.apply(this, arguments); }
@@ -34598,7 +34607,7 @@ var _ref$D = /*#__PURE__*/React__default.createElement("g", {
   d: "M99.399 127.359a3.315 3.315 0 01-.299-6.617c7.633-.705 12.489-1.345 12.521-1.35a3.304 3.304 0 013.723 2.851 3.32 3.32 0 01-2.851 3.723s-4.966.657-12.785 1.38a3.99 3.99 0 01-.309.013zM62.074 129.212c-4.903 0-9.61-.12-13.99-.354a3.313 3.313 0 01-3.133-3.486c.097-1.83 1.649-3.3 3.486-3.133 7.78.413 16.897.423 25.296.137 1.783-.127 3.367 1.367 3.427 3.198a3.312 3.312 0 01-3.198 3.427c-3.871.134-7.866.211-11.888.211zm-39.129-3.827c-.279 0-.563-.037-.844-.11-12.9-3.384-20.288-9.082-21.964-16.931a3.315 3.315 0 116.485-1.385c1.111 5.202 6.883 9.207 17.163 11.901a3.319 3.319 0 012.366 4.049 3.322 3.322 0 01-3.206 2.476zm-7.855-34.81a3.315 3.315 0 01-1.459-6.295c6.129-3.001 14.374-4.943 25.944-6.111 1.815-.217 3.447 1.141 3.631 2.963s-1.143 3.449-2.963 3.631c-10.766 1.088-18.294 2.829-23.698 5.474a3.313 3.313 0 01-1.455.338zm50.406-7.436a3.315 3.315 0 01-.179-6.624c10.036-.548 18.129-1.2 25.003-2.602a3.291 3.291 0 013.91 2.585 3.315 3.315 0 01-2.585 3.91c-7.269 1.484-15.637 2.164-25.964 2.727-.063.004-.125.004-.185.004zm45.714-15.945a3.28 3.28 0 01-.969-.147 3.314 3.314 0 01-2.201-4.139c.361-1.178.543-2.49.543-3.902l-.017-.752c-.244-5.713-2.886-10.208-8.074-13.731a3.315 3.315 0 113.726-5.484c6.945 4.717 10.636 11.089 10.972 18.936l.022 1.031c0 2.069-.279 4.034-.832 5.84a3.315 3.315 0 01-3.17 2.348zM78.246 37.193c-.152 0-.306-.01-.458-.03-5.967-.827-12.765-1.245-20.206-1.245-1.574.002-3.217.02-4.809.055-1.895-.085-3.347-1.414-3.387-3.242a3.316 3.316 0 013.242-3.387c1.636-.035 3.344-.017 4.953-.055 7.742 0 14.847.438 21.113 1.305a3.314 3.314 0 01-.448 6.599zM14.062 39.614a3.317 3.317 0 01-3.262-2.739 3.313 3.313 0 012.687-3.84c.207-.037 5.132-.901 12.815-1.798 1.795-.222 3.462 1.088 3.676 2.906a3.312 3.312 0 01-2.909 3.678c-7.471.874-12.379 1.733-12.429 1.743-.195.035-.389.05-.578.05z"
 }));
 
-var _ref2$7 = /*#__PURE__*/React__default.createElement("path", {
+var _ref2$6 = /*#__PURE__*/React__default.createElement("path", {
   d: "M113.532 52.018c-14.885 0-27.065 11.908-27.065 26.794 0 5.142 1.624 10.014 4.06 14.073 0 .271.27.271.27.541 2.977 4.872 9.473 10.555 13.803 15.968 5.413 7.037 8.39 12.991 8.39 12.991s.271.271.541.271c.271 0 .541 0 .541-.271 0 0 2.436-5.684 7.578-11.909 4.601-5.683 11.909-11.908 14.615-16.78 0-.271.271-.271.271-.271 2.706-4.059 4.059-8.931 4.059-14.073.002-15.425-12.177-27.334-27.063-27.334zm-2.997 43.214v-6.43l3.562 1.837-3.562 4.593zm11.573-5.511l-11.573-3.674 11.573-13.777-15.133 13.777-8.903-3.674 28.486-15.614-4.45 22.962z"
 });
 
@@ -34613,7 +34622,7 @@ var SvgCentesisStart = function SvgCentesisStart(props) {
     height: 141.73,
     viewBox: "0 0 141.73 141.73",
     fill: "currentColor"
-  }, props), _ref$D, _ref2$7, _ref3);
+  }, props), _ref$D, _ref2$6, _ref3);
 };
 
 function _extends$E() { _extends$E = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends$E.apply(this, arguments); }
@@ -34624,7 +34633,7 @@ var _ref$E = /*#__PURE__*/React__default.createElement("g", {
   d: "M92.757 138.338a2.696 2.696 0 01-.243-5.38c6.205-.573 10.151-1.093 10.177-1.097a2.686 2.686 0 013.027 2.318 2.7 2.7 0 01-2.318 3.027s-4.035.534-10.392 1.122a3.51 3.51 0 01-.251.01zM62.413 139.844c-3.986 0-7.813-.097-11.374-.287a2.693 2.693 0 01-2.547-2.834c.079-1.488 1.371-2.683 2.834-2.547 6.325.336 13.737.344 20.565.111 1.522-.103 2.735 1.111 2.786 2.6a2.692 2.692 0 01-2.6 2.786c-3.147.108-6.394.171-9.664.171zm-31.812-3.112c-.227 0-.458-.03-.686-.089-10.487-2.751-16.494-7.384-17.856-13.765a2.696 2.696 0 012.073-3.199 2.7 2.7 0 013.199 2.073c.903 4.229 5.596 7.485 13.953 9.675a2.698 2.698 0 01-.683 5.305zm-6.385-28.299a2.696 2.696 0 01-1.186-5.118c4.982-2.44 11.686-4.019 21.092-4.968 1.482-.176 2.804.927 2.952 2.409a2.692 2.692 0 01-2.409 2.952c-8.752.885-14.872 2.3-19.266 4.45a2.695 2.695 0 01-1.183.275zm40.981-6.043a2.695 2.695 0 01-.146-5.385c8.161-.445 14.739-.978 20.324-2.118a2.695 2.695 0 111.078 5.28c-5.906 1.207-12.708 1.761-21.106 2.219-.051.004-.102.004-.15.004zm37.16-12.965a2.696 2.696 0 01-2.578-3.484c.294-.958.441-2.025.441-3.172l-.012-.634c-.198-4.622-2.346-8.274-6.566-11.141a2.695 2.695 0 013.028-4.458c5.648 3.837 8.649 9.015 8.922 15.395l.016.838c0 1.682-.227 3.28-.676 4.748a2.692 2.692 0 01-2.575 1.908zm-26.799-24.39c-.123 0-.249-.008-.373-.024-4.851-.672-10.378-1.012-16.427-1.012-1.324.002-2.614.016-3.909.045-1.486-.069-2.721-1.15-2.753-2.636a2.695 2.695 0 012.636-2.753c1.33-.028 2.638-.014 4.027-.045 6.294 0 12.07.356 17.164 1.061a2.697 2.697 0 012.302 3.039 2.698 2.698 0 01-2.667 2.325zM23.38 67.003a2.696 2.696 0 01-.468-5.349c.168-.03 4.173-.733 10.418-1.462 1.45-.18 2.816.885 2.988 2.363a2.693 2.693 0 01-2.365 2.99c-6.074.711-10.064 1.409-10.105 1.417a2.575 2.575 0 01-.468.041z"
 }));
 
-var _ref2$8 = /*#__PURE__*/React__default.createElement("path", {
+var _ref2$7 = /*#__PURE__*/React__default.createElement("path", {
   opacity: 0.7,
   d: "M103.737 102.514c-6.322 0-11.495 5.058-11.495 11.38 0 2.184.69 4.253 1.724 5.977 0 .115.115.115.115.23 1.264 2.069 4.023 4.483 5.862 6.782 2.299 2.989 3.563 5.518 3.563 5.518s.115.115.23.115.23 0 .23-.115c0 0 1.034-2.414 3.218-5.058 1.954-2.414 5.058-5.058 6.207-7.127 0-.115.115-.115.115-.115 1.149-1.724 1.724-3.793 1.724-5.977.002-6.552-5.17-11.61-11.493-11.61zm-1.273 18.354v-2.731l1.513.78-1.513 1.951zm4.916-2.341l-4.915-1.56 4.915-5.851-6.427 5.851-3.781-1.56 12.098-6.631-1.89 9.751z"
 });
@@ -34639,14 +34648,14 @@ var SvgCentesisEnd = function SvgCentesisEnd(props) {
     height: 141.73,
     viewBox: "0 0 141.73 141.73",
     fill: "currentColor"
-  }, props), _ref$E, _ref2$8, _ref3$1);
+  }, props), _ref$E, _ref2$7, _ref3$1);
 };
 
 function _extends$F() { _extends$F = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends$F.apply(this, arguments); }
 
 var _ref$F = /*#__PURE__*/React__default.createElement("defs", null, /*#__PURE__*/React__default.createElement("style", null));
 
-var _ref2$9 = /*#__PURE__*/React__default.createElement("path", {
+var _ref2$8 = /*#__PURE__*/React__default.createElement("path", {
   d: "M512 365.714c-80.786 0-146.286 65.5-146.286 146.286S431.214 658.286 512 658.286 658.286 592.786 658.286 512 592.786 365.714 512 365.714zm0 219.429c-40.322 0-73.143-32.821-73.143-73.143s32.821-73.143 73.143-73.143 73.143 32.821 73.143 73.143-32.821 73.143-73.143 73.143z"
 });
 
@@ -34661,14 +34670,14 @@ var SvgReferencePosition = function SvgReferencePosition(props) {
     width: 200,
     height: 200,
     fill: "currentColor"
-  }, props), _ref$F, _ref2$9, _ref3$2);
+  }, props), _ref$F, _ref2$8, _ref3$2);
 };
 
 function _extends$G() { _extends$G = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends$G.apply(this, arguments); }
 
 var _ref$G = /*#__PURE__*/React__default.createElement("defs", null, /*#__PURE__*/React__default.createElement("style", null, "@font-face{font-family:feedback-iconfont;src:url(//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff2?t=1630033759944) format(&quot;woff2&quot;),url(//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff?t=1630033759944) format(&quot;woff&quot;),url(//at.alicdn.com/t/font_1031158_u69w8yhxdu.ttf?t=1630033759944) format(&quot;truetype&quot;)}"));
 
-var _ref2$a = /*#__PURE__*/React__default.createElement("path", {
+var _ref2$9 = /*#__PURE__*/React__default.createElement("path", {
   d: "M904.704 651.776l-2.048-229.888c52.224-10.752 91.648-56.832 91.648-112.128 0-62.976-51.2-114.688-114.688-114.688-46.08 0-86.016 27.648-103.936 66.56L230.4 129.024v-5.12c0-62.976-51.2-114.176-114.688-114.176S1.536 60.928 1.536 123.904s51.2 114.688 114.688 114.688h.512l101.888 513.024c-40.448 17.408-69.12 57.856-69.12 104.96 0 62.976 51.2 114.688 114.688 114.688 58.368 0 106.496-44.032 113.664-100.352l399.872-66.56c16.384 43.52 58.368 74.24 107.008 74.24 62.976 0 114.688-51.2 114.688-114.688-1.024-55.808-41.472-102.4-94.72-112.128zm-24.576-413.184c38.912 0 70.656 31.744 70.656 70.656 0 31.232-20.48 57.856-48.64 67.072-7.168 2.56-14.336 3.584-22.528 3.584-7.168 0-14.336-1.024-20.992-3.072-27.136-8.704-47.104-32.768-49.664-62.464 0-1.536-.512-3.584-.512-5.12 0-13.824 4.096-26.112 10.752-36.864 12.8-20.48 35.328-33.792 60.928-33.792zm-764.416-43.52c-2.56 0-5.632 0-8.192-.512-35.328-4.096-62.464-34.304-62.464-70.144 0-38.912 31.744-70.656 70.656-70.656 37.376 0 68.096 29.184 70.656 65.536 0 1.536.512 3.584.512 5.12 0 13.824-4.096 26.112-10.752 36.864-6.144 10.24-15.36 18.944-25.6 25.088-10.24 5.12-22.016 8.704-34.816 8.704zm43.52 34.816c27.136-11.264 48.64-31.744 60.928-58.368l545.792 132.608v5.12c0 55.808 40.448 102.912 93.696 112.64l2.048 229.888c-51.2 10.24-90.112 55.296-91.648 109.056L374.784 826.88c-13.824-48.64-58.368-84.48-111.104-84.48h-2.56L159.232 229.888zM263.68 927.744c-38.912 0-70.656-31.744-70.656-70.656 0-25.6 13.824-48.128 34.304-60.928 10.752-6.656 23.04-10.24 36.352-10.24 2.048 0 4.096 0 6.144.512 28.672 2.56 52.736 22.016 61.44 48.128 2.56 7.168 3.584 14.336 3.584 22.528 0 7.68-1.024 14.848-3.584 22.016-9.216 27.648-36.352 48.64-67.584 48.64zm620.544-92.672c-27.136 0-51.2-15.36-62.976-38.4-5.12-9.728-8.192-20.992-8.192-32.768 0-3.584.512-7.168 1.024-10.24 4.096-26.624 22.528-48.64 47.616-56.832 7.168-2.56 14.336-3.584 22.528-3.584 7.168 0 14.336 1.024 20.992 3.072 28.672 9.216 49.664 35.84 49.664 67.584 0 39.424-31.744 71.168-70.656 71.168z"
 });
 
@@ -34679,7 +34688,7 @@ var SvgPolygon = function SvgPolygon(props) {
     width: 200,
     height: 200,
     fill: "currentColor"
-  }, props), _ref$G, _ref2$a);
+  }, props), _ref$G, _ref2$9);
 };
 
 function _extends$H() { _extends$H = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends$H.apply(this, arguments); }
@@ -37008,8 +37017,9 @@ var mapStateToProps$1 = function mapStateToProps(state) {
   var _state$paladin$tools$ = state.paladin.tools.action,
       mode = _state$paladin$tools$.mode,
       MPR = _state$paladin$tools$.MPR,
-      Surgery = _state$paladin$tools$.Surgery;
-  var activeElement = getActiveElement(mode, activeIndex, imageActiveIndex, MPR, mprActiveIndex, Surgery, surgeryActiveIndex);
+      Surgery = _state$paladin$tools$.Surgery,
+      CPR = _state$paladin$tools$.CPR;
+  var activeElement = getActiveElement(mode, activeIndex, imageActiveIndex, MPR, mprActiveIndex, Surgery, surgeryActiveIndex, CPR);
   return {
     activeElement: activeElement
   };
@@ -37280,8 +37290,9 @@ var mapStateToProps$2 = function mapStateToProps(state) {
   var _state$paladin$tools$ = state.paladin.tools.action,
       mode = _state$paladin$tools$.mode,
       MPR = _state$paladin$tools$.MPR,
-      Surgery = _state$paladin$tools$.Surgery;
-  var activeElement = getActiveElement(mode, activeIndex, imageActiveIndex, MPR, mprActiveIndex, Surgery, surgeryActiveIndex);
+      Surgery = _state$paladin$tools$.Surgery,
+      CPR = _state$paladin$tools$.CPR;
+  var activeElement = getActiveElement(mode, activeIndex, imageActiveIndex, MPR, mprActiveIndex, Surgery, surgeryActiveIndex, CPR);
   return {
     activeElement: activeElement,
     MPR: MPR,
@@ -37385,7 +37396,7 @@ var _ref$R = /*#__PURE__*/React__default.createElement("path", {
   d: "M0 162.517l98.977-82.481v164.961L0 162.517zm17.756 0l69.854 58.211V104.306l-69.854 58.211zM182.945 244.998V80.036l98.979 82.481zM190.486 20.714c-26.433-26.432-68.313-27.806-93.373-2.747L80.636 34.444l6.866 6.866 16.477-16.477c21.284-21.284 56.985-19.911 79.642 2.746L169.889 41.31l48.06 13.731-13.732-48.059-13.731 13.732zm0 0"
 });
 
-var _ref2$b = /*#__PURE__*/React__default.createElement("g", {
+var _ref2$a = /*#__PURE__*/React__default.createElement("g", {
   fill: "#040000"
 }, /*#__PURE__*/React__default.createElement("path", {
   d: "M134.714 224.502h12.496v37.062a6.247 6.247 0 01-12.495 0v-37.062zM134.714 161.948h12.496v48.121h-12.496zM140.962 44.864a6.247 6.247 0 016.249 6.248v32.251h-12.496V51.124a6.25 6.25 0 016.248-6.248v-.012zM134.714 97.796h12.496v48.109h-12.496z"
@@ -37397,7 +37408,7 @@ var SvgFlipHorizontal = function SvgFlipHorizontal(props) {
     height: 283.46,
     viewBox: "0 0 283.46 283.46",
     fill: "currentColor"
-  }, props), _ref$R, _ref2$b);
+  }, props), _ref$R, _ref2$a);
 };
 
 function _extends$S() { _extends$S = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends$S.apply(this, arguments); }
@@ -37407,7 +37418,7 @@ var _ref$S = /*#__PURE__*/React__default.createElement("path", {
   d: "M105.294 0l82.481 98.977H22.813L105.294 0zm0 17.756L47.083 87.61h116.422l-58.211-69.854zM22.813 182.945h164.962l-82.481 98.979zM247.097 190.486c26.432-26.433 27.806-68.313 2.747-93.373l-16.477-16.477-6.866 6.866 16.477 16.477c21.284 21.284 19.911 56.985-2.746 79.642L226.5 169.889l-13.731 48.06 48.059-13.732-13.731-13.731zm0 0"
 });
 
-var _ref2$c = /*#__PURE__*/React__default.createElement("g", {
+var _ref2$b = /*#__PURE__*/React__default.createElement("g", {
   fill: "#040000"
 }, /*#__PURE__*/React__default.createElement("path", {
   d: "M43.309 134.714v12.496H6.247a6.247 6.247 0 010-12.495h37.062zM57.742 134.714h48.121v12.496H57.742zM222.947 140.962a6.247 6.247 0 01-6.248 6.249h-32.251v-12.496h32.239a6.25 6.25 0 016.248 6.248h.012zM121.907 134.714h48.109v12.496h-48.109z"
@@ -37419,7 +37430,7 @@ var SvgFlipVertical = function SvgFlipVertical(props) {
     height: 283.46,
     viewBox: "0 0 283.46 283.46",
     fill: "currentColor"
-  }, props), _ref$S, _ref2$c);
+  }, props), _ref$S, _ref2$b);
 };
 
 (function () {
@@ -37539,8 +37550,9 @@ var mapStateToProps$3 = function mapStateToProps(state) {
   var _state$paladin$tools$ = state.paladin.tools.action,
       mode = _state$paladin$tools$.mode,
       MPR = _state$paladin$tools$.MPR,
-      Surgery = _state$paladin$tools$.Surgery;
-  var activeElement = getActiveElement(mode, activeIndex, imageActiveIndex, MPR, mprActiveIndex, Surgery, surgeryActiveIndex);
+      Surgery = _state$paladin$tools$.Surgery,
+      CPR = _state$paladin$tools$.CPR;
+  var activeElement = getActiveElement(mode, activeIndex, imageActiveIndex, MPR, mprActiveIndex, Surgery, surgeryActiveIndex, CPR);
   return {
     activeElement: activeElement
   };
@@ -38458,9 +38470,10 @@ var mapStateToProps$4 = function mapStateToProps(state) {
       showOverlayText = _state$paladin$tools$.showOverlayText,
       mode = _state$paladin$tools$.mode,
       MPR = _state$paladin$tools$.MPR,
-      Surgery = _state$paladin$tools$.Surgery;
+      Surgery = _state$paladin$tools$.Surgery,
+      CPR = _state$paladin$tools$.CPR;
   var toolMode = state.paladin.tools.customization.toolMode;
-  var activeElement = getActiveElement(mode, activeIndex, imageActiveIndex, MPR, mprActiveIndex, Surgery, surgeryActiveIndex);
+  var activeElement = getActiveElement(mode, activeIndex, imageActiveIndex, MPR, mprActiveIndex, Surgery, surgeryActiveIndex, CPR);
   return {
     activeElement: activeElement,
     showOverlayText: showOverlayText,
@@ -38939,8 +38952,9 @@ var mapStateToProps$5 = function mapStateToProps(state) {
       MPR = _state$paladin$tools$.MPR,
       continuousMeasure = _state$paladin$tools$.continuousMeasure,
       Surgery = _state$paladin$tools$.Surgery,
-      IO = _state$paladin$tools$.IO;
-  var activeElement = getActiveElement(mode, activeIndex, imageActiveIndex, MPR, mprActiveIndex, Surgery, surgeryActiveIndex);
+      IO = _state$paladin$tools$.IO,
+      CPR = _state$paladin$tools$.CPR;
+  var activeElement = getActiveElement(mode, activeIndex, imageActiveIndex, MPR, mprActiveIndex, Surgery, surgeryActiveIndex, CPR);
   return {
     activeElement: activeElement,
     activeTool: activeTool,
@@ -44356,8 +44370,9 @@ var mapStateToProps$9 = function mapStateToProps(state) {
   var _state$paladin$tools$ = state.paladin.tools.action,
       mode = _state$paladin$tools$.mode,
       MPR = _state$paladin$tools$.MPR,
-      Surgery = _state$paladin$tools$.Surgery;
-  var activeElement = getActiveElement(mode, activeIndex, imageActiveIndex, MPR, mprActiveIndex, Surgery, surgeryActiveIndex);
+      Surgery = _state$paladin$tools$.Surgery,
+      CPR = _state$paladin$tools$.CPR;
+  var activeElement = getActiveElement(mode, activeIndex, imageActiveIndex, MPR, mprActiveIndex, Surgery, surgeryActiveIndex, CPR);
   return {
     activeElement: activeElement,
     MPR: MPR,
@@ -46804,7 +46819,7 @@ var _ref$15 = /*#__PURE__*/React__default.createElement("path", {
   d: "M59.661.336L0 34.781v68.357l59.661-33.913V.336zm-8.165 60.185l-8.928 4.966s.123-30.196.373-33.682l-.186.103c-.497 3.378-.993 5.946-1.488 7.709l-7.624 30.836-7.811 4.345-7.625-23.096a215.946 215.946 0 01-1.488-5.495l-.186.104c0 .744.061 1.764.186 3.058.123 3.651.186 30.396.186 30.396l-8.74 4.863V43.713l13.761-7.656 7.253 22.745c.122.676.308 2.061.557 4.153 0-.371.062-.899.186-1.59 0-1.61.122-2.672.372-3.183l7.253-30.815 13.948-7.76v40.914zm0 0M92.144 37.107l-6.632-3.974v13.466l6.632 3.973c5.225 2.999 7.905 2.325 8.039-2.017-.134-4.367-2.814-8.183-8.039-11.448zm0 0"
 });
 
-var _ref2$d = /*#__PURE__*/React__default.createElement("path", {
+var _ref2$c = /*#__PURE__*/React__default.createElement("path", {
   d: "M63.219.336v68.892l59.661 34.671V34.781L63.219.336zm29.729 58.356l-7.436-4.455v15.476l-10.05-6.021V19.475l18.491 11.078c10.718 6.691 16.28 14.646 16.682 23.862.132 10.128-5.763 11.556-17.687 4.277zm0 0M66.81 100.098c.111-3.502-2.093-5.199-6.613-5.087h-7.29v10.003h7.29c4.52 0 6.724-1.637 6.613-4.916zm0 0"
 });
 
@@ -46818,7 +46833,7 @@ var SvgMpr = function SvgMpr(props) {
     height: 142,
     viewBox: "0 0 142 142",
     fill: "currentColor"
-  }, props), _ref$15, _ref2$d, _ref3$3);
+  }, props), _ref$15, _ref2$c, _ref3$3);
 };
 
 function _extends$18() { _extends$18 = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends$18.apply(this, arguments); }
@@ -46843,7 +46858,7 @@ var _ref$17 = /*#__PURE__*/React__default.createElement("path", {
   d: "M11.217 10.354l1.672 4.76 1.698-4.76h1.366l-2.49 6.326h-1.212l-2.398-6.326zM21.513 15.722a4.73 4.73 0 00-.073-.617 2.253 2.253 0 00-.149-.436 1.319 1.319 0 00-.308-.432 1.8 1.8 0 00-.503-.28c.278-.102.503-.249.674-.446.273-.33.41-.795.41-1.395a1.91 1.91 0 00-.176-.821 1.521 1.521 0 00-.5-.602c-.313-.228-.868-.341-1.665-.341h-2.775v6.328h1.212v-2.4h.972c.42-.007.74.057.963.19.176.114.308.268.396.465.088.197.147.477.176.844.045.455.088.757.128.901h1.357c-.058-.182-.105-.502-.139-.958zm-1.558-2.713c-.119.095-.32.142-.607.142H17.65v-1.67h1.698c.216 0 .372.019.47.057.273.109.41.353.41.74 0 .349-.09.591-.273.731z"
 });
 
-var _ref2$e = /*#__PURE__*/React__default.createElement("path", {
+var _ref2$d = /*#__PURE__*/React__default.createElement("path", {
   d: "M18.632 20.558a.544.544 0 00-.676.347c-1.013 3.168-2.586 5.059-4.21 5.059-.645 0-1.283-.294-1.893-.872-.641-.609-1.222-1.488-1.722-2.613-1.068-2.384-1.654-5.565-1.654-8.958 0-3.394.587-6.576 1.654-8.96.498-1.122 1.077-2 1.722-2.612.614-.578 1.25-.872 1.893-.872 1.158 0 2.082.932 2.711 1.846l-1.634 1.03 4.315 2.226-.155-4.849-1.622 1.022C16.312.818 15.073 0 13.748 0c-1.775 0-3.408 1.465-4.595 4.124-1.126 2.513-1.746 5.849-1.746 9.396 0 3.543.62 6.88 1.746 9.396 1.19 2.655 2.821 4.117 4.595 4.117 1.099 0 2.17-.576 3.1-1.667.847-.993 1.583-2.422 2.131-4.135a.537.537 0 00-.347-.673z"
 });
 
@@ -46857,7 +46872,7 @@ var SvgVr = function SvgVr(props) {
     height: 28.346,
     viewBox: "0 0 28.346 28.346",
     fill: "currentColor"
-  }, props), _ref$17, _ref2$e, _ref3$4);
+  }, props), _ref$17, _ref2$d, _ref3$4);
 };
 
 function _extends$1a() { _extends$1a = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends$1a.apply(this, arguments); }
@@ -47114,7 +47129,7 @@ var _ref$19 = /*#__PURE__*/React__default.createElement("g", {
   d: "M69.932 69.61a2.333 2.333 0 01-.21-4.659c5.374-.496 8.79-.947 8.813-.95a2.326 2.326 0 012.621 2.007 2.337 2.337 0 01-2.007 2.621s-3.494.463-8.999.971a2.67 2.67 0 01-.218.01zM43.655 70.914c-3.452 0-6.767-.084-9.851-.249a2.332 2.332 0 01-2.206-2.454c.068-1.289 1.185-2.323 2.454-2.206 5.473.291 11.89.298 17.809.096 1.276-.089 2.37.962 2.412 2.251a2.33 2.33 0 01-2.251 2.412c-2.725.096-5.534.15-8.367.15zm-27.55-2.694c-.196 0-.396-.026-.594-.077C6.428 65.759 1.228 61.747.051 56.22a2.333 2.333 0 011.797-2.768 2.33 2.33 0 012.768 1.797c.778 3.661 4.842 6.48 12.079 8.378a2.336 2.336 0 01-.59 4.593zm-5.524-24.506a2.336 2.336 0 01-1.028-4.432c4.313-2.111 10.118-3.477 18.265-4.301 1.297-.154 2.426.803 2.556 2.086s-.805 2.426-2.086 2.556c-7.581.768-12.881 1.992-16.683 3.852-.33.161-.68.239-1.024.239zm35.488-5.234a2.333 2.333 0 01-.126-4.664c7.067-.386 12.765-.847 17.6-1.834a2.324 2.324 0 012.754 1.82 2.332 2.332 0 01-1.818 2.752c-5.116 1.045-11.008 1.525-18.28 1.921-.044.005-.088.005-.13.005zm32.18-11.231a2.334 2.334 0 01-2.232-3.017c.254-.829.382-1.753.38-2.742l-.012-.531c-.172-4.024-2.032-7.186-5.687-9.669a2.334 2.334 0 012.623-3.861c4.891 3.321 7.491 7.807 7.728 13.333l.016.724c.002 1.452-.195 2.835-.584 4.109a2.335 2.335 0 01-2.232 1.654zM55.035 6.132c-.107 0-.214-.007-.323-.021-5.108-.708-11.329-.981-17.61-.838-1.346-.06-2.356-.996-2.384-2.283A2.333 2.333 0 0137 .606c6.515-.133 12.995.142 18.351.88a2.335 2.335 0 01-.316 4.646zM9.854 7.836a2.335 2.335 0 01-2.297-1.929 2.332 2.332 0 011.892-2.702c.146-.026 3.613-.635 9.022-1.266 1.248-.156 2.439.766 2.588 2.046a2.33 2.33 0 01-2.048 2.589c-5.26.615-8.715 1.22-8.75 1.227a2.269 2.269 0 01-.407.035z"
 }));
 
-var _ref2$f = /*#__PURE__*/React__default.createElement("path", {
+var _ref2$e = /*#__PURE__*/React__default.createElement("path", {
   fill: "#FFF",
   d: "M128.104.646l11.434 11.096a2.36 2.36 0 01.732 1.702c0 .638-.264 1.252-.732 1.703a2.536 2.536 0 01-3.508 0l-3.824-3.712-6.22 6.179 13.402 13.026c.468.45.732 1.063.732 1.702 0 .64-.264 1.252-.732 1.703a2.545 2.545 0 01-1.754.674 2.538 2.538 0 01-1.754-.707l-5.182-5.029-25.38 25.303a9.602 9.602 0 01-6.839 2.834 9.604 9.604 0 01-6.84-2.832l-1.047-1.048-8.739 8.742a2.53 2.53 0 01-1.778.739 2.536 2.536 0 01-2.524-2.519c0-.669.269-1.31.744-1.781l8.739-8.743-1.053-1.055a9.717 9.717 0 010-13.709l25.02-25.046-5.846-5.673a2.363 2.363 0 01-.637-2.333A2.452 2.452 0 01106.28.159a2.537 2.537 0 012.4.631l13.907 13.518L128.77 8.1l-4.173-4.049a2.358 2.358 0 01.062-3.345 2.534 2.534 0 013.445-.06zM94.112 33.519a2.144 2.144 0 00-.582 2.823l.101.153 6.922 6.792a2.29 2.29 0 003.061-.453 2.158 2.158 0 00.568-2.838l-.101-.153-6.906-6.776a2.292 2.292 0 00-3.063.452zm7.072-6.888a2.142 2.142 0 00-.599 2.82l.101.155 4.276 4.285a2.293 2.293 0 003.061-.403 2.176 2.176 0 00.598-2.837l-.098-.155-4.276-4.285c-.718-.76-2.081-.518-3.063.42zm0 0"
 });
@@ -47125,7 +47140,7 @@ var SvgCentesis = function SvgCentesis(props) {
     height: 141.73,
     viewBox: "0 0 141.73 141.73",
     fill: "currentColor"
-  }, props), _ref$19, _ref2$f);
+  }, props), _ref$19, _ref2$e);
 };
 
 (function () {
@@ -47277,7 +47292,7 @@ var DicomToolLineMode = /*#__PURE__*/function (_Component) {
         SurgeryExit: {
           name: "SurgeryExit",
           tooltip: "返回二维影像区",
-          component: /*#__PURE__*/React__default.createElement(SvgBrowse, null),
+          component: /*#__PURE__*/React__default.createElement(Svg2D, null),
           inActive: true,
           onClick: function onClick() {
             _this2.props.exit3D('Surgery');
@@ -49804,7 +49819,7 @@ var DicomTool = /*#__PURE__*/function (_Component) {
       MprExit: {
         name: "MprExit",
         tooltip: "返回二维影像区",
-        component: /*#__PURE__*/React__default.createElement(SvgBrowse, null),
+        component: /*#__PURE__*/React__default.createElement(Svg2D, null),
         inActive: true,
         onClick: function onClick() {
           _this.props.exit3D();
@@ -50356,7 +50371,7 @@ var mapStateToProps$e = function mapStateToProps(state) {
     });
   }
 
-  var realActiveIndex = getRealActiveIndex(mode, activeIndex, imageActiveIndex, MPR, mprActiveIndex, Surgery, surgeryActiveIndex);
+  var realActiveIndex = getRealActiveIndex(mode, activeIndex, imageActiveIndex, MPR, mprActiveIndex, Surgery, surgeryActiveIndex, CPR);
   return {
     toolMode: toolMode,
     activeTool: activeTool,
@@ -50433,11 +50448,12 @@ var mergeProps$e = function mergeProps(propsFromState, propsFromDispatch, ownPro
       Surgery = propsFromState.Surgery,
       MIP = propsFromState.MIP,
       CPR = propsFromState.CPR;
-  var maxIndex = currentSeries.imageIds.length - 1;
+  var maxIndex = currentSeries && currentSeries.imageIds.length - 1;
   return _objectSpread$B(_objectSpread$B(_objectSpread$B(_objectSpread$B({}, ownProps), propsFromState), propsFromDispatch), {}, {
     reset: function reset() {
       // 重置
       var activeElement = getElement(realActiveIndex);
+      console.log('activeElement', activeElement);
 
       reset$1(activeElement, mode);
 
@@ -51645,6 +51661,11 @@ var ThumbContent = function ThumbContent(props) {
 
   if (loadedCount && totalCount) {
     width = loadedCount / totalCount;
+  } // 多帧dicom没有预加载进度条
+
+
+  if (series.isMultiFrame) {
+    width = 1;
   }
 
   return /*#__PURE__*/React__default.createElement("div", {
@@ -52364,8 +52385,9 @@ var ViewportOverlay = /*#__PURE__*/function (_PureComponent) {
       var studyDateTime = getStudyDateTime(dicom);
       var seriesNumber = dicom.SeriesNumber.toString();
       var instanceCount = stack.instanceCount || stack.imageIds.length; // 图像模式的数据才有stack.instanceCount
+      // 当前层数 多帧dicom的情况下取currentImageIdIndex
 
-      var instanceNumber = dicom.InstanceNumber.toString();
+      var instanceNumber = stack && stack.isMultiFrame ? stack.currentImageIdIndex + 1 : dicom.InstanceNumber.toString();
       var seriesCount = stack.seriesCount ? stack.seriesCount : '';
       var compression = getCompression(dicom);
       var inPlanePhaseEncodingDirection = dicom.InPlanePhaseEncodingDirection.toString(); // 右下
@@ -59142,16 +59164,25 @@ var DicomView = /*#__PURE__*/function (_Component) {
   createClass(DicomView, [{
     key: "componentWillMount",
     value: function componentWillMount() {
+      var _this2 = this;
+
       window.addEventListener('mousedown', checkAndUnLockToolState); // 初始化序列
+      // callback是为了multi-frame（多帧dicom）的情况修改study
 
-      this.props.initSeries(); // 自定义窗值设置
+      this.props.initSeries(null, function (result) {
+        if (result && result.hasChange) {
+          _this2.setState({
+            study: result.study
+          });
+        }
+      }); // 自定义窗值设置
 
       this.props.windowSetting && saveWwwcCustomDic(this.props.windowSetting);
     }
   }, {
     key: "componentWillReceiveProps",
     value: function componentWillReceiveProps(nextProps) {
-      var _this2 = this;
+      var _this3 = this;
 
       /**
        * study切换
@@ -59160,7 +59191,7 @@ var DicomView = /*#__PURE__*/function (_Component) {
         this.setState({
           study: nextProps.study
         }, function () {
-          _this2.props.initSeries(nextProps.study);
+          _this3.props.initSeries(nextProps.study);
         });
       }
 
@@ -59750,7 +59781,7 @@ var mergeProps$o = function mergeProps(propsFromState, propsFromDispatch, ownPro
   var showDicomThumbnail = !threeDMode;
 
   var getCurrentElement = function getCurrentElement() {
-    return getActiveElement(mode, activeIndex, imageActiveIndex, threeDMode, mprActiveIndex, Surgery, surgeryActiveIndex);
+    return getActiveElement(mode, activeIndex, imageActiveIndex, threeDMode, mprActiveIndex, Surgery, surgeryActiveIndex, CPR);
   };
   /**
    *
@@ -60052,113 +60083,217 @@ var mergeProps$o = function mergeProps(propsFromState, propsFromDispatch, ownPro
         }
       });
     },
-    initSeries: function initSeries(changeStudy) {
-      /**
-       * 初始化study
-       * - 初始化 cornerstoneWADOImageLoader token
-       * - 初始化 global toolState (study中存在serverToolState的情况)
-       * - 初始化 手术路径规划的缓存数据 (study中是否存在centesisPath)
-       * - 初始化layout（外部传入）
-       * - 初始化工具栏（外部传入）
-       * - 初始化series
-       * - 设置当前series
-       * - 初始化viewport缓存池
-       * - 初始化图像预加载
-       *
-       * 检查io是否为true是的话打开同屏开关
-       */
-      console.log('[paladin] - init series');
-      cornerstoneWADOImageLoader.configure({
-        beforeSend: function beforeSend(xhr) {
-          xhr.setRequestHeader('Authorization', "bearer ".concat(ownProps.token));
-        }
-      });
+    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;
 
-      if (ownProps.study && ownProps.study[0].serverToolState) {
-        var data = lodash$1.cloneDeep(ownProps.study[0].serverToolState);
-        _default$E.globalImageIdSpecificToolStateManager.restoreToolState(data);
-      }
+        return regenerator.wrap(function _callee$(_context) {
+          while (1) {
+            switch (_context.prev = _context.next) {
+              case 0:
+                /**
+                 * 初始化study
+                 * - 初始化 cornerstoneWADOImageLoader token
+                 * - 初始化 global toolState (study中存在serverToolState的情况)
+                 * - 初始化 手术路径规划的缓存数据 (study中是否存在centesisPath)
+                 * - 初始化layout（外部传入）
+                 * - 初始化工具栏（外部传入）
+                 * - 初始化series(加入多帧dicom的情况)
+                 * - 设置当前series
+                 * - 初始化viewport缓存池
+                 * - 初始化图像预加载
+                 *
+                 * 检查io是否为true是的话打开同屏开关
+                 */
+                console.log('[paladin] - init series');
+                cornerstoneWADOImageLoader.configure({
+                  beforeSend: function beforeSend(xhr) {
+                    xhr.setRequestHeader('Authorization', "bearer ".concat(ownProps.token));
+                  }
+                });
 
-      if (ownProps.study && ownProps.study[0].centesisPath) {
-        initCentesisConfig(lodash$1.cloneDeep(ownProps.study[0].centesisPath));
-      } // 先重置所有
-      // 1.重置预加载状态
+                if (ownProps.study && ownProps.study[0].serverToolState) {
+                  data = lodash$1.cloneDeep(ownProps.study[0].serverToolState);
+                  _default$E.globalImageIdSpecificToolStateManager.restoreToolState(data);
+                }
 
+                if (ownProps.study && ownProps.study[0].centesisPath) {
+                  initCentesisConfig(lodash$1.cloneDeep(ownProps.study[0].centesisPath));
+                } // 先重置所有
+                // 1.重置预加载状态
 
-      resetTaskPool(); // 2.重置滚动条
 
-      propsFromDispatch.setScrollLine(0); // 3.重置redux - viewport内容
+                resetTaskPool(); // 2.重置滚动条
 
-      propsFromDispatch.resetViewPort(); // 4.重置工具栏状态
+                propsFromDispatch.setScrollLine(0); // 3.重置redux - viewport内容
 
-      propsFromDispatch.resetToolsState(); // 5.重置loaded（预加载关联进度条的数据）
+                propsFromDispatch.resetViewPort(); // 4.重置工具栏状态
 
-      propsFromDispatch.clearSeriesLoaded(); // 6.重置所有sync element
+                propsFromDispatch.resetToolsState(); // 5.重置loaded（预加载关联进度条的数据）
 
-      var synchronizer = propsFromState.synchronizer,
-          linkSynchronizer = propsFromState.linkSynchronizer,
-          linkImageModeSynchronizer = propsFromState.linkImageModeSynchronizer,
-          linkScrollSynchronizer = propsFromState.linkScrollSynchronizer;
-      synchronizer.destroy();
-      linkSynchronizer.destroy();
-      linkImageModeSynchronizer.destroy();
-      linkScrollSynchronizer.destroy();
+                propsFromDispatch.clearSeriesLoaded(); // 6.重置所有sync element
 
+                synchronizer = propsFromState.synchronizer, linkSynchronizer = propsFromState.linkSynchronizer, linkImageModeSynchronizer = propsFromState.linkImageModeSynchronizer, linkScrollSynchronizer = propsFromState.linkScrollSynchronizer;
+                synchronizer.destroy();
+                linkSynchronizer.destroy();
+                linkImageModeSynchronizer.destroy();
+                linkScrollSynchronizer.destroy();
 
-      var options = ownProps.options;
 
-      if (options) {
-        if (options.layout && !lodash$1.isEmpty(options.layout)) {
-          propsFromDispatch.setLayout(options.layout);
-        }
+                options = ownProps.options;
 
-        if (options.tools && options.tools.length > 0) {
-          propsFromDispatch.setTools(options.tools);
-        }
-      }
+                if (options) {
+                  if (options.layout && !lodash$1.isEmpty(options.layout)) {
+                    propsFromDispatch.setLayout(options.layout);
+                  }
 
-      var _study = lodash$1.cloneDeep(ownProps.study);
+                  if (options.tools && options.tools.length > 0) {
+                    propsFromDispatch.setTools(options.tools);
+                  }
+                }
 
-      var series = _study[0].series; // 设置ai结果
+                _study = lodash$1.cloneDeep(ownProps.study);
+                series = _study[0].series; // 设置ai结果
 
-      if (ownProps.aiResult && ownProps.aiResult.inspectionDetails && ownProps.aiResult.inspectionDetails.length > 0) {
-        set$1('aiResult', ownProps.aiResult.inspectionDetails);
-      } // 初始化series
+                if (ownProps.aiResult && ownProps.aiResult.inspectionDetails && ownProps.aiResult.inspectionDetails.length > 0) {
+                  set$1('aiResult', ownProps.aiResult.inspectionDetails);
+                } // 初始化之前做一遍multi-frame的检查 将多帧dicom拆分为多image的常规序列
+                // 全部序列都为1的study才需要做多帧dicom check
 
 
-      _initSeries(series); // 初始化seriesCurrentIndex
+                needCheckMultiFrame = true;
+                hasMultiFrame = false;
+                lodash$1.forEach(series, function (v) {
+                  if (v.numberOfSeriesRelatedInstances && v.numberOfSeriesRelatedInstances > 1) {
+                    needCheckMultiFrame = false;
+                  }
+                });
 
+                if (!needCheckMultiFrame) {
+                  _context.next = 41;
+                  break;
+                }
 
-      var seriesCurrentIndex = Array.apply(null, Array(series.length)).map(function () {
-        return 0;
-      });
-      propsFromDispatch.initSeriesCurrentIndex(seriesCurrentIndex); // 设置当前series
+                i = 0;
 
-      setCurrentSeries(series[0]); // 初始化viewport缓存池
+              case 25:
+                if (!(i < series.length)) {
+                  _context.next = 41;
+                  break;
+                }
 
-      init(series); // 初始化图像预加载
+                item = series[i];
 
-      var firstReady = true;
-      initTaskPool(series, {
-        maxRequest: options && options.maxRequest,
-        executeCallback: function executeCallback(task, taskPoolLength) {
-          if (taskPoolLength === 0 && firstReady) {
-            firstReady = false;
-            ownProps.onLoadReady && ownProps.onLoadReady();
-          }
+                if (!(item.numberOfSeriesRelatedInstances && item.numberOfSeriesRelatedInstances === 1)) {
+                  _context.next = 38;
+                  break;
+                }
+
+                wado = lodash$1.cloneDeep(item.imageIds[0].split(':'));
+                wado.shift();
+                url = wado.join(':');
+                _context.next = 33;
+                return cornerstoneWADOImageLoader.wadouri.dataSetCacheManager.load(url, cornerstoneWADOImageLoader.internal.xhrRequest);
+
+              case 33:
+                dataSet = _context.sent;
+                // 这边如果加载了的话 进度条也需要匹配上
+                propsFromDispatch.setSeriesLoaded(item.seriesInstanceUID);
+                numFrames = dataSet.intString('x00280008');
+
+                if (numFrames && numFrames > 1) {
+                  hasMultiFrame = true;
+                  imageIds = [];
+
+                  for (_i = 0; _i < numFrames; _i++) {
+                    imageId = "wadouri:" + url + "?frame=" + _i;
+                    imageIds.push(imageId);
+                  }
+
+                  series[i] = _objectSpread$M(_objectSpread$M({}, item), {}, {
+                    imageIds: imageIds,
+                    numberOfSeriesRelatedInstances: numFrames,
+                    isMultiFrame: true
+                  });
+                }
+
+                cornerstoneWADOImageLoader.wadouri.dataSetCacheManager.unload(url);
+
+              case 38:
+                i++;
+                _context.next = 25;
+                break;
 
-          if (task.extra && task.extra.series) {
-            propsFromDispatch.setSeriesLoaded(task.extra.series);
+              case 41:
+                // 初始化seriesCurrentIndex
+                seriesCurrentIndex = Array.apply(null, Array(series.length)).map(function () {
+                  return 0;
+                });
+                propsFromDispatch.initSeriesCurrentIndex(seriesCurrentIndex); // 设置当前series
+
+                setCurrentSeries(series[0]); // 初始化viewport缓存池
+
+                init(series); // 初始化图像预加载
+
+                firstReady = true;
+                maxRequest = options && options.maxRequest;
+                retry = options && options.retry;
+                clearCacheEveryLoad = false;
+
+                if (hasMultiFrame) {
+                  maxRequest = 1;
+                  retry = 0;
+                  clearCacheEveryLoad = true;
+                } // 多帧的情况不要预加载 只要初始化设置
+
+
+                initTaskPool(hasMultiFrame ? [] : series, {
+                  maxRequest: maxRequest,
+                  retry: retry,
+                  clearCacheEveryLoad: clearCacheEveryLoad,
+                  executeCallback: function executeCallback(task, taskPoolLength) {
+                    if (taskPoolLength === 0 && firstReady) {
+                      firstReady = false;
+                      ownProps.onLoadReady && ownProps.onLoadReady();
+                    }
+
+                    if (task.extra && task.extra.series) {
+                      propsFromDispatch.setSeriesLoaded(task.extra.series);
+                    }
+                  }
+                }); // 初始化series 放到最后为了预加载的进度条和viewport中的loadimage有时间差
+
+                _initSeries(series); // io
+
+
+                if (ownProps.io) {
+                  propsFromDispatch.openIO();
+                } else {
+                  propsFromDispatch.closeIO();
+                } // for multi-frame situation
+
+
+                callback && callback({
+                  hasChange: hasMultiFrame,
+                  study: [_objectSpread$M(_objectSpread$M({}, ownProps.study[0]), {}, {
+                    series: series
+                  })]
+                });
+
+              case 54:
+              case "end":
+                return _context.stop();
+            }
           }
-        }
-      });
+        }, _callee);
+      }));
 
-      if (ownProps.io) {
-        propsFromDispatch.openIO();
-      } else {
-        propsFromDispatch.closeIO();
+      function initSeries(_x, _x2) {
+        return _initSeries2.apply(this, arguments);
       }
-    },
+
+      return initSeries;
+    }(),
     unmount: function unmount() {
       resetTaskPool();
       propsFromDispatch.initSeries([]); // 如果在op模式的话 退出op mode