hellfire 0.19.7 → 0.20.0

package/CHANGELOG.md

@@ -2,6 +2,18 @@
 
 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.20.0](http://10.16.100.57/diffusion/115/paladin/compare/v0.19.9...v0.20.0) (2022-05-10)
+
+
+
+## [0.19.9](http://10.16.100.57/diffusion/115/paladin/compare/v0.19.8...v0.19.9) (2022-03-28)
+
+
+
+## [0.19.8](http://10.16.100.57/diffusion/115/paladin/compare/v0.19.7...v0.19.8) (2022-03-07)
+
+
+
 ## [0.19.7](http://10.16.100.57/diffusion/115/paladin/compare/v0.19.6...v0.19.7) (2022-03-03)
 
 

package/dist/index.js

@@ -112,7 +112,7 @@ var phoneTools = ["Prev", "Next", "StackScroll", "Wwwc", "Zoom", "Pan", "Reset",
 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 vrTools = ["MprExit", "PrevNext", "VRMode", "VRPresentColor", "VRCenterPointShow", "VRDirection", "VRClip", "VRInfo", "MprSwitchPerspective", "CrosshairsMPR", "StackScroll", "Wwwc", "Zoom", "Pan", "Reset", "Rotate", "Tool", "Length", "Fullscreen", "MprRefresh"];
+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"];
 var surgeryTools = ["SurgeryExit", "CentesisStart", "CentesisEnd", "CentesisSave", "PrevNext", "StackScroll", "Wwwc", "Zoom", "Pan", "Reset", "Rotate", "Tool", "Length", "Fullscreen"];
 var surgeryPhoneTools = ["SurgeryExit", "CentesisStart", "CentesisEnd", "CentesisSave", "Prev", "Next", "StackScroll", "Wwwc", "Zoom", "Pan", "Reset", "Rotate", "Tool", "Length"]; // 初始化时工具栏平铺or单列
@@ -11126,11 +11126,6 @@ function addTaskIntoPool(task) {
 
     var priority = task.priority || task.priority === 0 || 1;
 
-    if (cache && cache.executed) {
-      delete cachedTask[task.key];
-      cache = null;
-    }
-
     if (cache) {
       cache.priority = priority;
       var callbacks = cache.callbacks || [];
@@ -11186,7 +11181,7 @@ function executeTask() {
               res: res
             });
           });
-          task.executed = true;
+          delete cachedTask[task.key];
           executeTask();
         }, function (err) {
           // 请求失败 重试机制
@@ -17876,8 +17871,8 @@ var MprImageProcessorWorkerImpl = /*#__PURE__*/function (_ImageProcessorWorker)
     key: "reset",
     value: function reset() {
       this.resetActionParameters();
-      this.processInternal(this.ActionParameter);
-      this.resetVR();
+      this.processInternal(this.ActionParameter); // mpr重置时不重置vr
+      // this.resetVR();
     }
   }, {
     key: "resetVR",
@@ -34361,7 +34356,7 @@ var formatDicom = function formatDicom(dicom) {
   leaveModule && leaveModule(module);
 })();
 
-var css_248z$8 = ".paladin-table {\n  margin-top: 10px;\n  font-size: 14px;\n  color: #727882;\n  font-family: lucida console, monospace;\n  word-break: break-all;\n}\n.paladin-table .paladin-table-th {\n  background: #698b69;\n  color: #fff;\n  padding: 5px;\n}\n.paladin-table .paladin-tbody-row {\n  border-bottom: 1px solid lightgrey;\n}\n.paladin-table .paladin-tbody-row:hover .td {\n  background: #ddd;\n  color: inherit;\n}\n.paladin-table .paladin-tbody-row:nth-child(even) {\n  background: #eee;\n  color: inherit;\n}\n.paladin-table .paladin-tbody-td {\n  padding: 5px;\n}\n.paladin-table .paladin-key {\n  background-color: #7ac5cd;\n  color: white;\n}\n.paladin-table .paladin-childKey {\n  background-color: #49898F;\n  color: white;\n}\n.paladin-table .paladin-private {\n  color: orange;\n}\n.paladin-table .paladin-row-parent-icon {\n  display: inline-block;\n  background: #fff;\n  border-radius: 2px;\n  margin-right: 3px;\n  color: #00a4fe;\n  width: 16px;\n  height: 16px;\n  position: relative;\n  vertical-align: middle;\n}\n.paladin-table .paladin-row-parent-icon span {\n  position: absolute;\n  left: 50%;\n  top: 50%;\n  transform: translate(-50%, -51%);\n  display: inline-block;\n  width: 13px;\n  height: 13px;\n  line-height: 13px;\n  font-size: 13px;\n  text-align: center;\n}\n";
+var css_248z$8 = ".allow-select * {\n  -webkit-user-select: text !important;\n  -moz-user-select: text !important;\n  -ms-user-select: text !important;\n  user-select: text !important;\n}\n.paladin-table {\n  margin-top: 10px;\n  font-size: 14px;\n  color: #727882;\n  font-family: lucida console, monospace;\n  word-break: break-all;\n}\n.paladin-table .paladin-table-th {\n  background: #698b69;\n  color: #fff;\n  padding: 5px;\n}\n.paladin-table .paladin-tbody-row {\n  border-bottom: 1px solid lightgrey;\n}\n.paladin-table .paladin-tbody-row:hover .td {\n  background: #ddd;\n  color: inherit;\n}\n.paladin-table .paladin-tbody-row:nth-child(even) {\n  background: #eee;\n  color: inherit;\n}\n.paladin-table .paladin-tbody-td {\n  padding: 5px;\n}\n.paladin-table .paladin-key {\n  background-color: #7ac5cd;\n  color: white;\n}\n.paladin-table .paladin-childKey {\n  background-color: #49898F;\n  color: white;\n}\n.paladin-table .paladin-private {\n  color: orange;\n}\n.paladin-table .paladin-row-parent-icon {\n  display: inline-block;\n  background: #fff;\n  border-radius: 2px;\n  margin-right: 3px;\n  color: #00a4fe;\n  width: 16px;\n  height: 16px;\n  position: relative;\n  vertical-align: middle;\n}\n.paladin-table .paladin-row-parent-icon span {\n  position: absolute;\n  left: 50%;\n  top: 50%;\n  transform: translate(-50%, -51%);\n  display: inline-block;\n  width: 13px;\n  height: 13px;\n  line-height: 13px;\n  font-size: 13px;\n  text-align: center;\n}\n";
 styleInject$1(css_248z$8);
 
 (function () {
@@ -34636,7 +34631,9 @@ var DicomInfoModal = /*#__PURE__*/function (_Component) {
           dataSource = _this$state.dataSource,
           dataSourceScan = _this$state.dataSourceScan;
       var columnTagKey = dicomModalTag === 'dicomInfo';
-      return /*#__PURE__*/React__default.createElement("div", null, /*#__PURE__*/React__default.createElement(ButtonGroup, null, /*#__PURE__*/React__default.createElement(Button, {
+      return /*#__PURE__*/React__default.createElement("div", {
+        className: 'allow-select'
+      }, /*#__PURE__*/React__default.createElement(ButtonGroup, null, /*#__PURE__*/React__default.createElement(Button, {
         active: dicomModalTag === 'dicomInfo',
         onClick: function onClick() {
           _this2.setDicomModalTag('dicomInfo');
@@ -41139,7 +41136,7 @@ var _default$X = ConnectedVRMode;
   leaveModule && leaveModule(module);
 })();
 
-var css_248z$d = ".paladin-tool-go-flatten {\n  cursor: pointer;\n  font-size: 12px;\n  height: 32px;\n  text-align: center;\n  border-bottom: 1px solid #fff;\n  background: #353535;\n  position: relative;\n  z-index: 999;\n  color: #fff;\n}\n.paladin-tool-go-flatten svg {\n  width: 7px !important;\n  color: #fff;\n}\n.paladin-tool-go-flatten:hover {\n  background: #d4d4d4;\n}\n.paladin-tool-go-flatten:hover svg {\n  color: #333;\n}\n.paladin-tool-go-line {\n  cursor: pointer;\n  position: absolute;\n  display: flex;\n  align-items: center;\n  justify-content: center;\n  right: 0;\n  margin-top: 6px;\n  height: 34px;\n}\n.paladin-tool-go-line .paladin-full-content {\n  width: 24px;\n}\n.paladin-tool-go-line svg {\n  width: 8px !important;\n  color: #fff;\n}\n.paladin-tool-go-line:hover {\n  background: #d4d4d4;\n}\n.paladin-tool-go-line:hover svg {\n  color: #333;\n}\n.paladin-tool-item {\n  background: #fff;\n  padding: 5px 0;\n  min-width: 160px;\n  max-width: 280px;\n}\n.paladin-tool-lg-content {\n  border-bottom: 1px solid #5b5b5b;\n}\n.paladin-tool-lg-content .paladin-tool-lg-item {\n  display: flex;\n  flex-direction: column;\n  box-sizing: border-box;\n  flex: 1;\n  border-top: 1px solid #5b5b5b;\n  color: #b0b0b0;\n  font-size: 12px;\n  text-align: center;\n  padding: 8px 10px;\n  cursor: pointer;\n}\n.paladin-tool-lg-content .paladin-tool-lg-item:last-child {\n  border-left: 1px solid #5b5b5b;\n}\n.paladin-tool-lg-content .paladin-tool-lg-item:hover {\n  color: #fff;\n}\n.paladin-tool-lg-content .paladin-tool-lg-item-active {\n  background: #0d5075;\n  color: #fff;\n}\n.paladin-tool-flatten-vertical-wrapper {\n  width: 228px;\n  height: 100%;\n  display: flex;\n  flex-direction: column;\n}\n.paladin-tool-flatten-vertical-wrapper .paladin-tool-nav-wrapper {\n  margin: 6px 2px;\n}\n.paladin-tool-flatten-vertical-wrapper .paladin-tool-nav {\n  cursor: pointer;\n  font-size: 13px;\n  color: #e2e2e2;\n  padding: 8px 10px;\n  border-top: 1px solid #5b5b5b;\n  border-bottom: 1px solid #5b5b5b;\n  border-left: 1px solid #5b5b5b;\n}\n.paladin-tool-flatten-vertical-wrapper .paladin-tool-qa {\n  cursor: pointer;\n  margin-left: 15px;\n  color: #e2e2e2;\n}\n.paladin-tool-flatten-vertical-wrapper .paladin-tool-qa svg {\n  width: 22px;\n}\n.paladin-tool-flatten-vertical-wrapper .paladin-tool-nav-active {\n  color: #c8c8c8;\n  background-color: #5b5b5b;\n}\n.paladin-tool-flatten-vertical-wrapper .paladin-tool-space-line {\n  border-top: 1px solid gray;\n  margin-top: 6px;\n  padding-top: 6px;\n}\n.paladin-tool-flatten-hor-wrapper {\n  position: relative;\n  z-index: 100;\n  width: 100%;\n  display: flex;\n  flex-direction: row;\n}\n.paladin-tool-flatten-hor-wrapper .paladin-flatten-hor-go-line {\n  display: flex;\n  flex-direction: column;\n}\n.paladin-tool-flatten-hor-wrapper .paladin-flatten-hor-go-line .paladin-flatten-hor-go-line-content {\n  width: 24px;\n  height: 100%;\n  text-align: center;\n  line-height: 100%;\n}\n.paladin-tool-flatten-hor-wrapper .paladin-flatten-hor-go-line .paladin-flatten-hor-go-line-content svg {\n  width: 10px !important;\n  color: #fff;\n}\n.paladin-tool-flatten-hor-wrapper .paladin-flatten-hor-go-line .paladin-flatten-hor-go-line-content:hover {\n  background: #d4d4d4;\n}\n.paladin-tool-flatten-hor-wrapper .paladin-flatten-hor-go-line .paladin-flatten-hor-go-line-content:hover svg {\n  color: #333;\n}\n.paladin-tool-flatten-hor-wrapper .paladin-tool-nav-wrapper {\n  padding: 5px;\n}\n.paladin-tool-flatten-hor-wrapper .paladin-tool-nav {\n  cursor: pointer;\n  font-size: 13px;\n  color: #e2e2e2;\n  padding: 8px 10px;\n  border: 1px solid #5b5b5b;\n  margin-bottom: 5px;\n  text-align: center;\n}\n.paladin-tool-flatten-hor-wrapper .paladin-tool-qa {\n  cursor: pointer;\n  margin: 5px auto;\n  color: #e2e2e2;\n}\n.paladin-tool-flatten-hor-wrapper .paladin-tool-qa svg {\n  width: 20px;\n}\n.paladin-tool-flatten-hor-wrapper .paladin-tool-nav-active {\n  color: #c8c8c8;\n  background-color: #5b5b5b;\n}\n.paladin-tool-flatten-hor-wrapper .paladin-tool-lg-item {\n  border: 1px solid #5b5b5b;\n}\n";
+var css_248z$d = ".paladin-tool-go-flatten {\n  cursor: pointer;\n  font-size: 12px;\n  height: 32px;\n  text-align: center;\n  border-bottom: 1px solid #fff;\n  background: #353535;\n  position: relative;\n  z-index: 999;\n  color: #fff;\n}\n.paladin-tool-go-flatten svg {\n  width: 7px !important;\n  color: #fff;\n}\n.paladin-tool-go-flatten:hover {\n  background: #d4d4d4;\n}\n.paladin-tool-go-flatten:hover svg {\n  color: #333;\n}\n.paladin-tool-go-line {\n  cursor: pointer;\n  position: absolute;\n  display: flex;\n  align-items: center;\n  justify-content: center;\n  right: 0;\n  margin-top: 6px;\n  height: 34px;\n}\n.paladin-tool-go-line .paladin-full-content {\n  width: 24px;\n}\n.paladin-tool-go-line svg {\n  width: 8px !important;\n  color: #fff;\n}\n.paladin-tool-go-line:hover {\n  background: #d4d4d4;\n}\n.paladin-tool-go-line:hover svg {\n  color: #333;\n}\n.paladin-tool-item {\n  background: #fff;\n  padding: 5px 0;\n  min-width: 160px;\n  max-width: 280px;\n}\n.paladin-tool-lg-content {\n  border-bottom: 1px solid #5b5b5b;\n}\n.paladin-tool-lg-content .paladin-tool-lg-item {\n  display: flex;\n  flex-direction: column;\n  box-sizing: border-box;\n  flex: 1;\n  border-top: 1px solid #5b5b5b;\n  color: #b0b0b0;\n  font-size: 12px;\n  text-align: center;\n  padding: 8px 10px;\n  cursor: pointer;\n}\n.paladin-tool-lg-content .paladin-tool-lg-item:last-child {\n  border-left: 1px solid #5b5b5b;\n}\n.paladin-tool-lg-content .paladin-tool-lg-item:hover {\n  color: #fff;\n}\n.paladin-tool-lg-content .paladin-tool-lg-item-active {\n  background: #0d5075;\n  color: #fff;\n}\n.paladin-tool-flatten-vertical-wrapper {\n  width: 228px;\n  height: 100%;\n  display: flex;\n  flex-direction: column;\n}\n.paladin-tool-flatten-vertical-wrapper .paladin-tool-nav-wrapper {\n  margin: 6px 2px;\n}\n.paladin-tool-flatten-vertical-wrapper .paladin-tool-nav {\n  cursor: pointer;\n  font-size: 13px;\n  color: #e2e2e2;\n  padding: 8px 10px;\n  border-top: 1px solid #5b5b5b;\n  border-bottom: 1px solid #5b5b5b;\n  border-left: 1px solid #5b5b5b;\n}\n.paladin-tool-flatten-vertical-wrapper .paladin-tool-qa {\n  cursor: pointer;\n  margin-left: 15px;\n  color: #e2e2e2;\n}\n.paladin-tool-flatten-vertical-wrapper .paladin-tool-qa svg {\n  width: 22px;\n}\n.paladin-tool-flatten-vertical-wrapper .paladin-tool-nav-active {\n  color: #c8c8c8;\n  background-color: #5b5b5b;\n}\n.paladin-tool-flatten-vertical-wrapper .paladin-tool-space-line {\n  border-top: 1px solid gray;\n  margin-top: 6px;\n  padding-top: 6px;\n}\n.paladin-tool-flatten-hor-wrapper {\n  position: relative;\n  z-index: 100;\n  width: 100%;\n  display: flex;\n  flex-direction: row;\n}\n.paladin-tool-flatten-hor-wrapper .paladin-flatten-hor-go-line {\n  display: flex;\n  flex-direction: column;\n}\n.paladin-tool-flatten-hor-wrapper .paladin-flatten-hor-go-line .paladin-flatten-hor-go-line-content {\n  width: 24px;\n  height: 100%;\n  text-align: center;\n  line-height: 100%;\n}\n.paladin-tool-flatten-hor-wrapper .paladin-flatten-hor-go-line .paladin-flatten-hor-go-line-content svg {\n  width: 10px !important;\n  color: #fff;\n}\n.paladin-tool-flatten-hor-wrapper .paladin-flatten-hor-go-line .paladin-flatten-hor-go-line-content:hover {\n  background: #d4d4d4;\n}\n.paladin-tool-flatten-hor-wrapper .paladin-flatten-hor-go-line .paladin-flatten-hor-go-line-content:hover svg {\n  color: #333;\n}\n.paladin-tool-flatten-hor-wrapper .paladin-tool-nav-wrapper {\n  padding: 5px;\n}\n.paladin-tool-flatten-hor-wrapper .paladin-tool-nav {\n  cursor: pointer;\n  font-size: 13px;\n  color: #e2e2e2;\n  padding: 8px 10px;\n  border: 1px solid #5b5b5b;\n  margin-bottom: 5px;\n  text-align: center;\n}\n.paladin-tool-flatten-hor-wrapper .paladin-tool-qa {\n  cursor: pointer;\n  margin: 5px auto;\n  color: #e2e2e2;\n}\n.paladin-tool-flatten-hor-wrapper .paladin-tool-qa svg {\n  width: 20px;\n}\n.paladin-tool-flatten-hor-wrapper .paladin-tool-nav-active {\n  color: #c8c8c8;\n  background-color: #5b5b5b;\n}\n.paladin-tool-flatten-hor-wrapper .paladin-tool-lg-item {\n  border: 1px solid #5b5b5b;\n}\n.paladin-tool-space-line-3d {\n  border-top: 1px solid gray;\n  margin-top: 6px;\n}\n.paladin-tool-subtitle {\n  font-size: 12px;\n  color: gray;\n  padding: 4px 2px 3px 2px;\n}\n.paladin-hor-border {\n  border-right: 1px solid #666;\n  margin-right: 6px;\n}\n.paladin-hor-three-content {\n  position: relative;\n  padding-left: 13px;\n}\n.paladin-hor-three-content .paladin-hor-three-title {\n  position: absolute;\n  left: 0;\n  top: 2px;\n  width: 12px;\n  font-size: 12px;\n  word-break: break-all;\n  color: gray;\n}\n";
 styleInject$1(css_248z$d);
 
 (function () {
@@ -44183,13 +44180,11 @@ var DicomToolFlattenMode = /*#__PURE__*/function (_Component) {
 
       if (isThree) {
         commonTools = ['StackScroll', 'Wwwc', 'Zoom', 'Pan', 'Reset', 'Rotate', 'ReverseColor', 'FalseColor'];
-      }
+      } // 三维工具
 
-      var vrTools = ['CrosshairsMPR', 'MprSwitchPerspective', 'MprRefresh'];
 
-      if (VR) {
-        vrTools = ['VRMode', 'VRPresentColor', 'CrosshairsMPR', 'MprSwitchPerspective', 'VRDirection', 'VRCenterPointShow', 'VRClip', 'MprRefresh', 'VRInfo'];
-      }
+      var mprTools = ['CrosshairsMPR', 'MprSwitchPerspective', 'MprRefresh'];
+      var vrTools = ['VRMode', 'VRPresentColor', 'VRDirection', 'VRCenterPointShow', 'VRClip', 'VRInfo', 'VRRefresh']; // 测量工具
 
       var lengthTools = ['LengthTool', 'Angle', 'ArrowAnnotate', 'RectangleRoi', 'EllipticalRoi', 'Probe', 'CobbAngle', 'CTR'];
 
@@ -44269,14 +44264,29 @@ var DicomToolFlattenMode = /*#__PURE__*/function (_Component) {
           key: "tool-common-".concat(i),
           data: toolsMap[item]
         }));
-      })), MPR && /*#__PURE__*/React__default.createElement("div", {
-        className: "paladin-flex-row paladin-tool-space-line"
+      })), VR && /*#__PURE__*/React__default.createElement("div", {
+        className: "paladin-tool-space-line-3d"
+      }, /*#__PURE__*/React__default.createElement("div", {
+        className: "paladin-tool-subtitle"
+      }, "VR"), /*#__PURE__*/React__default.createElement("div", {
+        className: "paladin-flex-row"
       }, vrTools && vrTools.map(function (item, i) {
         return /*#__PURE__*/React__default.createElement(DicomToolItemPlus, _extends_1({}, _this2.props, {
           key: "tool-vr-".concat(i),
           data: toolsMap[item]
         }));
-      })), /*#__PURE__*/React__default.createElement("div", {
+      }))), (MPR || VR) && /*#__PURE__*/React__default.createElement("div", {
+        className: VR ? 'paladin-tool-space-line-3d' : 'paladin-tool-space-line'
+      }, VR && /*#__PURE__*/React__default.createElement("div", {
+        className: "paladin-tool-subtitle"
+      }, "MPR"), /*#__PURE__*/React__default.createElement("div", {
+        className: "paladin-flex-row"
+      }, mprTools && mprTools.map(function (item, i) {
+        return /*#__PURE__*/React__default.createElement(DicomToolItemPlus, _extends_1({}, _this2.props, {
+          key: "tool-mpr-".concat(i),
+          data: toolsMap[item]
+        }));
+      }))), /*#__PURE__*/React__default.createElement("div", {
         className: "paladin-flex-row paladin-tool-space-line"
       }, lengthTools && lengthTools.map(function (item, i) {
         return /*#__PURE__*/React__default.createElement(DicomToolItemPlus, _extends_1({}, _this2.props, {
@@ -44478,14 +44488,11 @@ var DicomToolFlattenMode$1 = /*#__PURE__*/function (_Component) {
 
       if (isThree) {
         commonTools = ['StackScroll', 'Wwwc', 'Zoom', 'Pan', 'Reset', 'Rotate', 'ReverseColor', 'FalseColor'];
-      }
+      } // 三维工具
 
-      var vrTools = ['CrosshairsMPR', 'MprSwitchPerspective', 'MprRefresh'];
-
-      if (VR) {
-        vrTools = ['VRMode', 'VRPresentColor', 'CrosshairsMPR', 'MprSwitchPerspective', 'VRDirection', 'VRCenterPointShow', 'VRClip', 'MprRefresh', 'VRInfo'];
-      }
 
+      var mprTools = ['CrosshairsMPR', 'MprSwitchPerspective', 'MprRefresh'];
+      var vrTools = ['VRMode', 'VRPresentColor', 'VRDirection', 'VRCenterPointShow', 'VRClip', 'VRInfo', 'VRRefresh'];
       var lengthTools = ['LengthTool', 'Angle', 'ArrowAnnotate', 'RectangleRoi', 'EllipticalRoi', 'Probe', 'CobbAngle', 'CTR'];
 
       if (IODisconnect) {
@@ -44550,7 +44557,7 @@ var DicomToolFlattenMode$1 = /*#__PURE__*/function (_Component) {
         tooltip: '使用帮助',
         tooltipPlacement: "right"
       }, /*#__PURE__*/React__default.createElement(SvgQuestionSign, null)))), /*#__PURE__*/React__default.createElement("div", {
-        className: "paladin-flex-col paladin-flex-1",
+        className: "paladin-flex-col paladin-flex-1 paladin-hor-border",
         style: {
           flex: MPR ? 3 : 2
         }
@@ -44562,7 +44569,7 @@ var DicomToolFlattenMode$1 = /*#__PURE__*/function (_Component) {
           data: toolsMap[item]
         }));
       }))), /*#__PURE__*/React__default.createElement("div", {
-        className: "paladin-flex-col paladin-flex-1",
+        className: MPR || VR ? 'paladin-flex-col paladin-flex-1 paladin-hor-border' : 'paladin-flex-col paladin-flex-1',
         style: {
           flex: 2
         }
@@ -44573,18 +44580,34 @@ var DicomToolFlattenMode$1 = /*#__PURE__*/function (_Component) {
           key: "tool-measure-".concat(i),
           data: toolsMap[item]
         }));
-      }))), MPR && /*#__PURE__*/React__default.createElement("div", {
-        className: "paladin-flex-col paladin-flex-1",
+      }))), VR && /*#__PURE__*/React__default.createElement("div", {
+        className: "paladin-flex-col paladin-flex-1 paladin-hor-border paladin-hor-three-content",
         style: {
           flex: 2
         }
       }, /*#__PURE__*/React__default.createElement("div", {
+        className: "paladin-hor-three-title"
+      }, "VR"), /*#__PURE__*/React__default.createElement("div", {
         className: "paladin-flex-row"
       }, vrTools && vrTools.map(function (item, i) {
         return /*#__PURE__*/React__default.createElement(DicomToolItemPlus, _extends_1({}, _this2.props, {
           key: "tool-vr-".concat(i),
           data: toolsMap[item]
         }));
+      }))), MPR && /*#__PURE__*/React__default.createElement("div", {
+        className: VR ? 'paladin-flex-col paladin-flex-1 paladin-hor-three-content' : 'paladin-flex-col paladin-flex-1',
+        style: {
+          flex: 1
+        }
+      }, VR && /*#__PURE__*/React__default.createElement("div", {
+        className: "paladin-hor-three-title"
+      }, "MPR"), /*#__PURE__*/React__default.createElement("div", {
+        className: "paladin-flex-row"
+      }, mprTools && mprTools.map(function (item, i) {
+        return /*#__PURE__*/React__default.createElement(DicomToolItemPlus, _extends_1({}, _this2.props, {
+          key: "tool-mpr-".concat(i),
+          data: toolsMap[item]
+        }));
       }))), Surgery && /*#__PURE__*/React__default.createElement("div", {
         className: "paladin-flex-col paladin-flex-1",
         style: {
@@ -45174,7 +45197,7 @@ var DicomTool = /*#__PURE__*/function (_Component) {
       MprRefresh: {
         label: "复位",
         name: "MprRefresh",
-        tooltip: "复位",
+        tooltip: "MPR复位",
         component: /*#__PURE__*/React__default.createElement(Svg445, null),
         inActive: true,
         borderTop: true,
@@ -45182,6 +45205,16 @@ var DicomTool = /*#__PURE__*/function (_Component) {
           _this.props.refreshMpr();
         }
       },
+      VRRefresh: {
+        label: "复位",
+        name: "VRRefresh",
+        tooltip: "VR复位",
+        component: /*#__PURE__*/React__default.createElement(Svg445, null),
+        inActive: true,
+        onClick: function onClick() {
+          _this.props.refreshVR();
+        }
+      },
       MprExit: {
         name: "MprExit",
         tooltip: "返回二维影像区",
@@ -46370,11 +46403,8 @@ var mergeProps$c = function mergeProps(propsFromState, propsFromDispatch, ownPro
 
       return refreshMpr;
     }(),
-    switchPerspective: function switchPerspective() {
-      propsFromDispatch.switchMprPerspective();
-    },
-    toggleVRCenterPoint: function () {
-      var _toggleVRCenterPoint = asyncToGenerator( /*#__PURE__*/regenerator.mark(function _callee3() {
+    refreshVR: function () {
+      var _refreshVR = asyncToGenerator( /*#__PURE__*/regenerator.mark(function _callee3() {
         var vrWorker;
         return regenerator.wrap(function _callee3$(_context3) {
           while (1) {
@@ -46393,6 +46423,46 @@ var mergeProps$c = function mergeProps(propsFromState, propsFromDispatch, ownPro
 
                 return _context3.abrupt("return");
 
+              case 5:
+                vrWorker.reset();
+
+              case 6:
+              case "end":
+                return _context3.stop();
+            }
+          }
+        }, _callee3);
+      }));
+
+      function refreshVR() {
+        return _refreshVR.apply(this, arguments);
+      }
+
+      return refreshVR;
+    }(),
+    switchPerspective: function switchPerspective() {
+      propsFromDispatch.switchMprPerspective();
+    },
+    toggleVRCenterPoint: function () {
+      var _toggleVRCenterPoint = asyncToGenerator( /*#__PURE__*/regenerator.mark(function _callee4() {
+        var vrWorker;
+        return regenerator.wrap(function _callee4$(_context4) {
+          while (1) {
+            switch (_context4.prev = _context4.next) {
+              case 0:
+                _context4.next = 2;
+                return _default$r.getWorkerFromCache(currentSeries.seriesInstanceUID, ImageProcessType.MIP);
+
+              case 2:
+                vrWorker = _context4.sent;
+
+                if (vrWorker) {
+                  _context4.next = 5;
+                  break;
+                }
+
+                return _context4.abrupt("return");
+
               case 5:
                 if (propsFromState.VRCenterPointShow) {
                   // 隐藏
@@ -46404,10 +46474,10 @@ var mergeProps$c = function mergeProps(propsFromState, propsFromDispatch, ownPro
 
               case 6:
               case "end":
-                return _context3.stop();
+                return _context4.stop();
             }
           }
-        }, _callee3);
+        }, _callee4);
       }));
 
       function toggleVRCenterPoint() {
@@ -46417,24 +46487,24 @@ var mergeProps$c = function mergeProps(propsFromState, propsFromDispatch, ownPro
       return toggleVRCenterPoint;
     }(),
     toggleVRClip: function () {
-      var _toggleVRClip = asyncToGenerator( /*#__PURE__*/regenerator.mark(function _callee4() {
+      var _toggleVRClip = asyncToGenerator( /*#__PURE__*/regenerator.mark(function _callee5() {
         var vrWorker;
-        return regenerator.wrap(function _callee4$(_context4) {
+        return regenerator.wrap(function _callee5$(_context5) {
           while (1) {
-            switch (_context4.prev = _context4.next) {
+            switch (_context5.prev = _context5.next) {
               case 0:
-                _context4.next = 2;
+                _context5.next = 2;
                 return _default$r.getWorkerFromCache(currentSeries.seriesInstanceUID, ImageProcessType.MIP);
 
               case 2:
-                vrWorker = _context4.sent;
+                vrWorker = _context5.sent;
 
                 if (vrWorker) {
-                  _context4.next = 5;
+                  _context5.next = 5;
                   break;
                 }
 
-                return _context4.abrupt("return");
+                return _context5.abrupt("return");
 
               case 5:
                 if (propsFromState.VRClip) {
@@ -46447,10 +46517,10 @@ var mergeProps$c = function mergeProps(propsFromState, propsFromDispatch, ownPro
 
               case 6:
               case "end":
-                return _context4.stop();
+                return _context5.stop();
             }
           }
-        }, _callee4);
+        }, _callee5);
       }));
 
       function toggleVRClip() {
@@ -47664,6 +47734,7 @@ var ViewportOverlay = /*#__PURE__*/function (_PureComponent) {
 
       var patientOrientation = dicom.PatientOrientation.toString();
       var protocolName = dicom.ProtocolName.toString();
+      var sequenceName = dicom.SequenceName.toString();
       var repetitionTime = dicom.RepetitionTime.toString();
       var echoTime = dicom.EchoTime.toString();
       var inversionTime = dicom.InversionTime.toString();
@@ -47711,7 +47782,7 @@ var ViewportOverlay = /*#__PURE__*/function (_PureComponent) {
           fontSize: '12px',
           display: "".concat(hide ? 'none' : 'block')
         }
-      }, /*#__PURE__*/React__default.createElement("div", null, patientOrientation), /*#__PURE__*/React__default.createElement("div", null, protocolName), /*#__PURE__*/React__default.createElement("div", null, getTRAndTE(repetitionTime, echoTime)), /*#__PURE__*/React__default.createElement("div", null, formatDicomInfo('TI', inversionTime)), /*#__PURE__*/React__default.createElement("div", null, formatDicomInfo('FA', flipAngle)), /*#__PURE__*/React__default.createElement("div", null, getADAndNEX(acquisitionDuration, numberOfAverages)), /*#__PURE__*/React__default.createElement("div", null, thk), /*#__PURE__*/React__default.createElement("div", null, formatDicomInfo('B', diffusionBValue, false)), /*#__PURE__*/React__default.createElement("div", null, seriesDescription)), /*#__PURE__*/React__default.createElement("div", {
+      }, /*#__PURE__*/React__default.createElement("div", null, patientOrientation), /*#__PURE__*/React__default.createElement("div", null, protocolName), /*#__PURE__*/React__default.createElement("div", null, sequenceName), /*#__PURE__*/React__default.createElement("div", null, getTRAndTE(repetitionTime, echoTime)), /*#__PURE__*/React__default.createElement("div", null, formatDicomInfo('TI', inversionTime)), /*#__PURE__*/React__default.createElement("div", null, formatDicomInfo('FA', flipAngle)), /*#__PURE__*/React__default.createElement("div", null, getADAndNEX(acquisitionDuration, numberOfAverages)), /*#__PURE__*/React__default.createElement("div", null, thk), /*#__PURE__*/React__default.createElement("div", null, formatDicomInfo('B', diffusionBValue, false)), seriesDescription && seriesDescription !== protocolName && /*#__PURE__*/React__default.createElement("div", null, seriesDescription)), /*#__PURE__*/React__default.createElement("div", {
         style: {
           position: 'absolute',
           top: 4,
@@ -49178,12 +49249,16 @@ var DicomViewport = /*#__PURE__*/function (_Component) {
         _this.initReferencePosition(); // 处理sync的初始化
 
 
-        _this.initSync(); // 默认开启标尺 / 开启方位
+        _this.initSync(); // 开启方位
 
 
         _default$E.setToolActiveForElement(_this.element, 'OrientationMarkers');
-        _default$E.setToolActiveForElement(_this.element, 'RulerOverlay');
-        _default$E.setToolActiveForElement(_this.element, 'Overlay'); // 对一些工具的特殊处理
+        _default$E.setToolActiveForElement(_this.element, 'Overlay'); // 除去mpr情况 默认开启标尺
+
+        if (!_this.props.mpr) {
+          _default$E.setToolActiveForElement(_this.element, 'RulerOverlay');
+        } // 对一些工具的特殊处理
+
 
         if (_this.props.mpr && !_this.props.Surgery) {
           // 只在mpr中触发的
@@ -54421,6 +54496,200 @@ var _default$1a = ConnectedDicomView;
 var __signature__$3k = typeof reactHotLoaderGlobal !== 'undefined' ? reactHotLoaderGlobal.default.signature : function (a) {
   return a;
 };
+var domId = "paladinOutputMock";
+
+function getImageDataFromWodo(_ref) {
+  var wodo = _ref.wodo,
+      _ref$width = _ref.width,
+      width = _ref$width === void 0 ? 100 : _ref$width,
+      _ref$height = _ref.height,
+      height = _ref$height === void 0 ? 100 : _ref$height;
+  return new Promise( /*#__PURE__*/function () {
+    var _ref2 = asyncToGenerator( /*#__PURE__*/regenerator.mark(function _callee(resolve, reject) {
+      var img;
+      return regenerator.wrap(function _callee$(_context) {
+        while (1) {
+          switch (_context.prev = _context.next) {
+            case 0:
+              if (!wodo) {
+                reject('wodo必填');
+              }
+
+              if (!lodash$1.isNumber(width) || !lodash$1.isNumber(height)) {
+                reject('width、height应为number类型');
+              }
+
+              _context.prev = 2;
+              _context.next = 5;
+              return getImage(wodo, width, height);
+
+            case 5:
+              img = _context.sent;
+              removeDom();
+              resolve(img);
+              _context.next = 14;
+              break;
+
+            case 10:
+              _context.prev = 10;
+              _context.t0 = _context["catch"](2);
+              removeDom();
+              reject();
+
+            case 14:
+            case "end":
+              return _context.stop();
+          }
+        }
+      }, _callee, null, [[2, 10]]);
+    }));
+
+    return function (_x, _x2) {
+      return _ref2.apply(this, arguments);
+    };
+  }());
+}
+
+function getMultiImageDataFromWodo(_ref3) {
+  var wodoList = _ref3.wodoList,
+      _ref3$width = _ref3.width,
+      width = _ref3$width === void 0 ? 100 : _ref3$width,
+      _ref3$height = _ref3.height,
+      height = _ref3$height === void 0 ? 100 : _ref3$height;
+  return new Promise( /*#__PURE__*/function () {
+    var _ref4 = asyncToGenerator( /*#__PURE__*/regenerator.mark(function _callee2(resolve, reject) {
+      var result, i, img;
+      return regenerator.wrap(function _callee2$(_context2) {
+        while (1) {
+          switch (_context2.prev = _context2.next) {
+            case 0:
+              if (!wodoList || wodoList.length === 0) {
+                reject('wodoList必填');
+              }
+
+              if (!lodash$1.isNumber(width) || !lodash$1.isNumber(height)) {
+                reject('width、height应为number类型');
+              }
+
+              result = [];
+              _context2.prev = 3;
+              i = 0;
+
+            case 5:
+              if (!(i < wodoList.length)) {
+                _context2.next = 13;
+                break;
+              }
+
+              _context2.next = 8;
+              return getImage(wodoList[i], width, height);
+
+            case 8:
+              img = _context2.sent;
+              result.push(img);
+
+            case 10:
+              i++;
+              _context2.next = 5;
+              break;
+
+            case 13:
+              removeDom();
+              resolve(result);
+              _context2.next = 21;
+              break;
+
+            case 17:
+              _context2.prev = 17;
+              _context2.t0 = _context2["catch"](3);
+              removeDom();
+              reject();
+
+            case 21:
+            case "end":
+              return _context2.stop();
+          }
+        }
+      }, _callee2, null, [[3, 17]]);
+    }));
+
+    return function (_x3, _x4) {
+      return _ref4.apply(this, arguments);
+    };
+  }());
+}
+
+function getImage(wodo, width, height) {
+  return new Promise(function (resolve, reject) {
+    cornerstone.loadAndCacheImage(wodo).then(function (image) {
+      var element = document.getElementById(domId);
+      var canvas;
+
+      if (!element) {
+        element = document.createElement("div");
+        element.setAttribute("id", domId);
+        document.body.appendChild(element);
+        element.style.width = width + 'px';
+        element.style.height = height + 'px';
+        element.style.display = 'block';
+        element.style.visibility = 'hidden';
+        canvas = document.createElement("canvas");
+        element.appendChild(canvas);
+        canvas.setAttribute('class', 'cornerstone-canvas');
+        cornerstone.enable(element, {});
+      } else {
+        canvas = element.querySelector('canvas.cornerstone-canvas');
+      }
+
+      cornerstone.displayImage(element, image);
+      cornerstone.reset(element);
+      var img = canvas.toDataURL("image/jpeg", 1);
+      resolve(img);
+    }).catch(function (err) {
+      reject(err);
+    });
+  });
+}
+
+function removeDom() {
+  var dom = document.getElementById(domId);
+
+  if (dom) {
+    document.body.removeChild(dom);
+  }
+}
+
+(function () {
+  var reactHotLoader = typeof reactHotLoaderGlobal !== 'undefined' ? reactHotLoaderGlobal.default : undefined;
+
+  if (!reactHotLoader) {
+    return;
+  }
+
+  reactHotLoader.register(domId, "domId", "/Users/huyeqing/workspace/chainz/paladin/src/utils/getImageDataFromWodo.js");
+  reactHotLoader.register(getImageDataFromWodo, "getImageDataFromWodo", "/Users/huyeqing/workspace/chainz/paladin/src/utils/getImageDataFromWodo.js");
+  reactHotLoader.register(getMultiImageDataFromWodo, "getMultiImageDataFromWodo", "/Users/huyeqing/workspace/chainz/paladin/src/utils/getImageDataFromWodo.js");
+  reactHotLoader.register(getImage, "getImage", "/Users/huyeqing/workspace/chainz/paladin/src/utils/getImageDataFromWodo.js");
+  reactHotLoader.register(removeDom, "removeDom", "/Users/huyeqing/workspace/chainz/paladin/src/utils/getImageDataFromWodo.js");
+})();
+
+(function () {
+  var leaveModule = typeof reactHotLoaderGlobal !== 'undefined' ? reactHotLoaderGlobal.leaveModule : undefined;
+  leaveModule && leaveModule(module);
+})();
+
+(function () {
+  var enterModule = typeof reactHotLoaderGlobal !== 'undefined' ? reactHotLoaderGlobal.enterModule : undefined;
+  enterModule && enterModule(module);
+})();
+
+var __signature__$3l = typeof reactHotLoaderGlobal !== 'undefined' ? reactHotLoaderGlobal.default.signature : function (a) {
+  return a;
+};
+var paladinUtils = {
+  getImageDataFromWodo: getImageDataFromWodo,
+  getMultiImageDataFromWodo: getMultiImageDataFromWodo
+};
 var _default$1b = _default$1a;
 
 (function () {
@@ -54430,6 +54699,7 @@ var _default$1b = _default$1a;
     return;
   }
 
+  reactHotLoader.register(paladinUtils, "paladinUtils", "/Users/huyeqing/workspace/chainz/paladin/src/index.js");
   reactHotLoader.register(_default$1b, "default", "/Users/huyeqing/workspace/chainz/paladin/src/index.js");
 })();
 
@@ -54440,5 +54710,6 @@ var _default$1b = _default$1a;
 
 exports.cornerstoneUtils = index;
 exports.default = _default$1b;
+exports.paladinUtils = paladinUtils;
 exports.reducers = _default$I;
 //# sourceMappingURL=index.js.map