hellfire 0.20.0 → 0.20.1

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.20.1](http://10.16.100.57/diffusion/115/paladin/compare/v0.20.0...v0.20.1) (2022-05-11)
+
+
+
 # [0.20.0](http://10.16.100.57/diffusion/115/paladin/compare/v0.19.9...v0.20.0) (2022-05-10)
 
 

package/dist/index.js

@@ -54497,71 +54497,22 @@ var __signature__$3k = typeof reactHotLoaderGlobal !== 'undefined' ? reactHotLoa
   return a;
 };
 var domId = "paladinOutputMock";
+var actionPool = {};
+var currentActionIndex = 0;
 
-function getImageDataFromWodo(_ref) {
-  var wodo = _ref.wodo,
+function getMultiImageDataFromWodo(_ref) {
+  var wodoList = _ref.wodoList,
       _ref$width = _ref.width,
       width = _ref$width === void 0 ? 100 : _ref$width,
       _ref$height = _ref.height,
-      height = _ref$height === void 0 ? 100 : _ref$height;
+      height = _ref$height === void 0 ? 100 : _ref$height,
+      token = _ref.token;
   return new Promise( /*#__PURE__*/function () {
     var _ref2 = asyncToGenerator( /*#__PURE__*/regenerator.mark(function _callee(resolve, reject) {
-      var img;
+      var i;
       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必填');
@@ -54571,88 +54522,102 @@ function getMultiImageDataFromWodo(_ref3) {
                 reject('width、height应为number类型');
               }
 
-              result = [];
-              _context2.prev = 3;
-              i = 0;
+              if (!token) {
+                reject('token必填');
+              } // token
 
-            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);
+              cornerstoneWADOImageLoader.configure({
+                beforeSend: function beforeSend(xhr) {
+                  xhr.setRequestHeader('Authorization', "bearer ".concat(token));
+                }
+              });
 
-            case 10:
-              i++;
-              _context2.next = 5;
-              break;
+              try {
+                actionPool[currentActionIndex] = {
+                  total: wodoList.length,
+                  resultResolve: resolve,
+                  result: [],
+                  element: []
+                };
 
-            case 13:
-              removeDom();
-              resolve(result);
-              _context2.next = 21;
-              break;
+                for (i = 0; i < wodoList.length; i++) {
+                  getImage(wodoList[i], width, height, currentActionIndex, i);
+                }
 
-            case 17:
-              _context2.prev = 17;
-              _context2.t0 = _context2["catch"](3);
-              removeDom();
-              reject();
+                currentActionIndex++;
+              } catch (e) {
+                reject();
+              }
 
-            case 21:
+            case 5:
             case "end":
-              return _context2.stop();
+              return _context.stop();
           }
         }
-      }, _callee2, null, [[3, 17]]);
+      }, _callee);
     }));
 
-    return function (_x3, _x4) {
-      return _ref4.apply(this, arguments);
+    return function (_x, _x2) {
+      return _ref2.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 getImage(wodo, width, height, currentActionIndex, imageIndex) {
+  cornerstone.loadAndCacheImage(wodo).then(function (image) {
+    var id = "".concat(domId, "-").concat(currentActionIndex, "-").concat(imageIndex);
+    var element = document.getElementById(id);
+    var canvas;
+
+    if (!element) {
+      element = document.createElement("div");
+      element.setAttribute("id", id);
+      document.body.appendChild(element);
+      actionPool[currentActionIndex].element[imageIndex] = 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, {});
+    }
+
+    element.addEventListener(cornerstone.EVENTS.IMAGE_RENDERED, onImageRendered);
+    cornerstone.displayImage(element, image);
   });
 }
 
-function removeDom() {
-  var dom = document.getElementById(domId);
+var onImageRendered = function onImageRendered(ev) {
+  var element = ev.target;
+  var img = cornerstone.getEnabledElement(element).canvas.toDataURL('image/png');
+  var id = element.id;
+  var currentActionIndex = id.split('-')[1];
+  var imageIndex = id.split('-')[2];
+  actionPool[currentActionIndex].result[imageIndex] = img;
+  var result = actionPool[currentActionIndex].result;
+
+  if (result.length === actionPool[currentActionIndex].total) {
+    var checkError = false;
+    lodash$1.forEach(result, function (item) {
+      if (!item) {
+        checkError = true;
+      }
+    }); // 全部补全 resolve出去
+
+    if (!checkError) {
+      actionPool[currentActionIndex].resultResolve(result);
+    }
+  }
+
+  element.removeEventListener(cornerstone.EVENTS.IMAGE_RENDERED, onImageRendered);
+  removeDom(id);
+};
+
+function removeDom(id) {
+  var dom = document.getElementById(id);
 
   if (dom) {
     document.body.removeChild(dom);
@@ -54667,9 +54632,11 @@ function removeDom() {
   }
 
   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(actionPool, "actionPool", "/Users/huyeqing/workspace/chainz/paladin/src/utils/getImageDataFromWodo.js");
+  reactHotLoader.register(currentActionIndex, "currentActionIndex", "/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(onImageRendered, "onImageRendered", "/Users/huyeqing/workspace/chainz/paladin/src/utils/getImageDataFromWodo.js");
   reactHotLoader.register(removeDom, "removeDom", "/Users/huyeqing/workspace/chainz/paladin/src/utils/getImageDataFromWodo.js");
 })();
 
@@ -54687,7 +54654,6 @@ var __signature__$3l = typeof reactHotLoaderGlobal !== 'undefined' ? reactHotLoa
   return a;
 };
 var paladinUtils = {
-  getImageDataFromWodo: getImageDataFromWodo,
   getMultiImageDataFromWodo: getMultiImageDataFromWodo
 };
 var _default$1b = _default$1a;