@riil-frontend/component-topology 11.0.33 → 11.0.35

package/lib/core/viewer/components/plugins/ResourceDetail/hooks/useUserId.js

@@ -18,57 +18,50 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
 function useUserId(props) {
+  var _fetchUserId;
+
   var _useState = (0, _react.useState)(''),
       userId = _useState[0],
       setUserId = _useState[1];
 
   function fetchUserId() {
-    return _fetchUserId.apply(this, arguments);
-  }
-
-  function _fetchUserId() {
-    _fetchUserId = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2() {
+    return (_fetchUserId = _fetchUserId || (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2() {
       return _regenerator["default"].wrap(function _callee2$(_context2) {
-        while (1) {
-          switch (_context2.prev = _context2.next) {
-            case 0:
-              setUserId(function (prev) {
-                // console.log('获取用户id', prev);
-                // 如果已经获取过，就不再重新获取
-                if (!prev) {
-                  (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee() {
-                    var res;
-                    return _regenerator["default"].wrap(function _callee$(_context) {
-                      while (1) {
-                        switch (_context.prev = _context.next) {
-                          case 0:
-                            _context.next = 2;
-                            return _overview["default"].getUserId();
-
-                          case 2:
-                            res = _context.sent;
-                            setUserId((res === null || res === void 0 ? void 0 : res.user_id) || '');
-
-                          case 4:
-                          case "end":
-                            return _context.stop();
-                        }
-                      }
-                    }, _callee);
-                  }))();
-                }
-
-                return prev;
-              });
-
-            case 1:
-            case "end":
-              return _context2.stop();
-          }
+        while (1) switch (_context2.prev = _context2.next) {
+          case 0:
+            setUserId(function (prev) {
+              // console.log('获取用户id', prev);
+              // 如果已经获取过，就不再重新获取
+              if (!prev) {
+                (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee() {
+                  var res;
+                  return _regenerator["default"].wrap(function _callee$(_context) {
+                    while (1) switch (_context.prev = _context.next) {
+                      case 0:
+                        _context.next = 2;
+                        return _overview["default"].getUserId();
+
+                      case 2:
+                        res = _context.sent;
+                        setUserId((res === null || res === void 0 ? void 0 : res.user_id) || '');
+
+                      case 4:
+                      case "end":
+                        return _context.stop();
+                    }
+                  }, _callee);
+                }))();
+              }
+
+              return prev;
+            });
+
+          case 1:
+          case "end":
+            return _context2.stop();
         }
       }, _callee2);
-    }));
-    return _fetchUserId.apply(this, arguments);
+    }))).apply(this, arguments);
   }
 
   return {

package/lib/core/viewer/components/plugins/ResourceWebControllUrlSettingDialog.js

@@ -30,6 +30,8 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
 var FormItem = _form["default"].Item;
 
 function ResourceWebControllUrlSettingDialog(props) {
+  var _ref;
+
   var topo = props.topo;
   var store = topo.store;
   var resourceWebControllUrl = topo.pluginManager.pluginMap.resourceWebControllUrl;
@@ -54,42 +56,36 @@ function ResourceWebControllUrlSettingDialog(props) {
     });
   }, [url]);
 
-  var submit = /*#__PURE__*/function () {
-    var _ref = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee() {
+  var submit = function submit() {
+    return (_ref = _ref || (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee() {
       var _yield$field$validate, errors, values;
 
       return _regenerator["default"].wrap(function _callee$(_context) {
-        while (1) {
-          switch (_context.prev = _context.next) {
-            case 0:
-              _context.next = 2;
-              return field.validatePromise();
-
-            case 2:
-              _yield$field$validate = _context.sent;
-              errors = _yield$field$validate.errors;
-              values = _yield$field$validate.values;
-
-              if (errors) {
-                _context.next = 8;
-                break;
-              }
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            _context.next = 2;
+            return field.validatePromise();
+
+          case 2:
+            _yield$field$validate = _context.sent;
+            errors = _yield$field$validate.errors;
+            values = _yield$field$validate.values;
 
+            if (errors) {
               _context.next = 8;
-              return resourceWebControllUrl.setting.saveResourceWebUrl(resourceWebControllUrl.setting.getCurrentId(), values.url);
+              break;
+            }
 
-            case 8:
-            case "end":
-              return _context.stop();
-          }
+            _context.next = 8;
+            return resourceWebControllUrl.setting.saveResourceWebUrl(resourceWebControllUrl.setting.getCurrentId(), values.url);
+
+          case 8:
+          case "end":
+            return _context.stop();
         }
       }, _callee);
-    }));
-
-    return function submit() {
-      return _ref.apply(this, arguments);
-    };
-  }();
+    }))).apply(this, arguments);
+  };
 
   var renameIconForm = /*#__PURE__*/_react["default"].createElement(_form["default"], {
     field: field,

package/lib/networkTopo/components/Link/hook.js

@@ -5,12 +5,12 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 exports.__esModule = true;
 exports.useSubs = exports.useSave = void 0;
 
-var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
-
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 
 var _objectWithoutPropertiesLoose2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutPropertiesLoose"));
 
+var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
+
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 
 var _react = require("react");
@@ -23,6 +23,8 @@ var _utils = require("@riil-frontend/utils");
 
 var _excluded = ["run"];
 
+var _updateLink, _saveLink;
+
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
@@ -108,79 +110,104 @@ function buildCreateLinkParams(params, discoveryId) {
 
 
 function updateLink(_x, _x2) {
-  return _updateLink.apply(this, arguments);
-}
-
-function _updateLink() {
-  _updateLink = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(oldLink, params) {
+  return (_updateLink = _updateLink || (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(oldLink, params) {
     var result, src, dst, srcRelation, dstRelation, srcIsCurrentRelation, dstIsCurrentRelation, onlyChangeOneEnd, createResult;
     return _regenerator["default"].wrap(function _callee$(_context) {
-      while (1) {
-        switch (_context.prev = _context.next) {
-          case 0:
-            result = {
-              oldId: oldLink.id
-            };
-            src = params.src, dst = params.dst; // 如果只修改一端，则先删除再新建
-
-            _context.next = 4;
-            return cmdbService.queryRelationByEndpoint(src.sub);
-
-          case 4:
-            srcRelation = _context.sent;
-            _context.next = 7;
-            return cmdbService.queryRelationByEndpoint(dst.sub);
-
-          case 7:
-            dstRelation = _context.sent;
-            srcIsCurrentRelation = srcRelation && srcRelation.id === oldLink.id && !dstRelation;
-            dstIsCurrentRelation = dstRelation && dstRelation.id === oldLink.id && !srcRelation;
-            onlyChangeOneEnd = srcIsCurrentRelation || dstIsCurrentRelation;
-
-            if (!onlyChangeOneEnd) {
-              _context.next = 14;
-              break;
-            }
-
+      while (1) switch (_context.prev = _context.next) {
+        case 0:
+          result = {
+            oldId: oldLink.id
+          };
+          src = params.src, dst = params.dst; // 如果只修改一端，则先删除再新建
+
+          _context.next = 4;
+          return cmdbService.queryRelationByEndpoint(src.sub);
+
+        case 4:
+          srcRelation = _context.sent;
+          _context.next = 7;
+          return cmdbService.queryRelationByEndpoint(dst.sub);
+
+        case 7:
+          dstRelation = _context.sent;
+          srcIsCurrentRelation = srcRelation && srcRelation.id === oldLink.id && !dstRelation;
+          dstIsCurrentRelation = dstRelation && dstRelation.id === oldLink.id && !srcRelation;
+          onlyChangeOneEnd = srcIsCurrentRelation || dstIsCurrentRelation;
+
+          if (!onlyChangeOneEnd) {
             _context.next = 14;
-            return cmdbService.forceDeleteRelation(oldLink.id);
+            break;
+          }
 
-          case 14:
-            _context.next = 16;
-            return cmdbService.batchCreateRelation([buildCreateLinkParams(params, 0)]);
+          _context.next = 14;
+          return cmdbService.forceDeleteRelation(oldLink.id);
 
-          case 16:
-            createResult = _context.sent;
-            Object.assign(result, createResult[0]);
+        case 14:
+          _context.next = 16;
+          return cmdbService.batchCreateRelation([buildCreateLinkParams(params, 0)]);
 
-            if (!(result.status === 0)) {
-              _context.next = 22;
-              break;
-            }
+        case 16:
+          createResult = _context.sent;
+          Object.assign(result, createResult[0]);
 
-            if (onlyChangeOneEnd) {
-              _context.next = 22;
-              break;
-            }
+          if (!(result.status === 0)) {
+            _context.next = 22;
+            break;
+          }
 
+          if (onlyChangeOneEnd) {
             _context.next = 22;
-            return cmdbService.forceDeleteRelation(oldLink.id);
+            break;
+          }
 
-          case 22:
-            return _context.abrupt("return", result);
+          _context.next = 22;
+          return cmdbService.forceDeleteRelation(oldLink.id);
 
-          case 23:
-          case "end":
-            return _context.stop();
-        }
+        case 22:
+          return _context.abrupt("return", result);
+
+        case 23:
+        case "end":
+          return _context.stop();
       }
     }, _callee);
-  }));
-  return _updateLink.apply(this, arguments);
+  }))).apply(this, arguments);
 }
 
 function saveLink(_x3) {
-  return _saveLink.apply(this, arguments);
+  return (_saveLink = _saveLink || (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2(_ref2) {
+    var link, values, params, result, _params;
+
+    return _regenerator["default"].wrap(function _callee2$(_context2) {
+      while (1) switch (_context2.prev = _context2.next) {
+        case 0:
+          link = _ref2.link, values = _ref2.values;
+
+          if (!link) {
+            _context2.next = 9;
+            break;
+          }
+
+          params = values[0];
+          _context2.next = 5;
+          return updateLink(link, params);
+
+        case 5:
+          result = _context2.sent;
+          return _context2.abrupt("return", [result]);
+
+        case 9:
+          _params = values.map(function (item, index) {
+            return buildCreateLinkParams(item, index);
+          });
+          return _context2.abrupt("return", cmdbService.batchCreateRelation(_params));
+
+        case 11:
+        case "end":
+          return _context2.stop();
+      }
+    }, _callee2);
+  }))).apply(this, arguments);
 }
 /**
  * 保存链路
@@ -190,45 +217,6 @@ function saveLink(_x3) {
  */
 
 
-function _saveLink() {
-  _saveLink = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2(_ref2) {
-    var link, values, params, result, _params;
-
-    return _regenerator["default"].wrap(function _callee2$(_context2) {
-      while (1) {
-        switch (_context2.prev = _context2.next) {
-          case 0:
-            link = _ref2.link, values = _ref2.values;
-
-            if (!link) {
-              _context2.next = 9;
-              break;
-            }
-
-            params = values[0];
-            _context2.next = 5;
-            return updateLink(link, params);
-
-          case 5:
-            result = _context2.sent;
-            return _context2.abrupt("return", [result]);
-
-          case 9:
-            _params = values.map(function (item, index) {
-              return buildCreateLinkParams(item, index);
-            });
-            return _context2.abrupt("return", cmdbService.batchCreateRelation(_params));
-
-          case 11:
-          case "end":
-            return _context2.stop();
-        }
-      }
-    }, _callee2);
-  }));
-  return _saveLink.apply(this, arguments);
-}
-
 var useSave = function useSave(_ref3) {
   var cb = _ref3.cb;