@riil-frontend/component-topology 11.0.33 → 11.0.35

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

@@ -4,57 +4,50 @@ import React, { useState } from 'react';
 import service from "../../../../../services/overview";
 
 function useUserId(props) {
+  var _fetchUserId;
+
   var _useState = useState(''),
       userId = _useState[0],
       setUserId = _useState[1];
 
   function fetchUserId() {
-    return _fetchUserId.apply(this, arguments);
-  }
-
-  function _fetchUserId() {
-    _fetchUserId = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
+    return (_fetchUserId = _fetchUserId || _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
       return _regeneratorRuntime.wrap(function _callee2$(_context2) {
-        while (1) {
-          switch (_context2.prev = _context2.next) {
-            case 0:
-              setUserId(function (prev) {
-                // console.log('获取用户id', prev);
-                // 如果已经获取过，就不再重新获取
-                if (!prev) {
-                  _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
-                    var res;
-                    return _regeneratorRuntime.wrap(function _callee$(_context) {
-                      while (1) {
-                        switch (_context.prev = _context.next) {
-                          case 0:
-                            _context.next = 2;
-                            return service.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) {
+                _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
+                  var res;
+                  return _regeneratorRuntime.wrap(function _callee$(_context) {
+                    while (1) switch (_context.prev = _context.next) {
+                      case 0:
+                        _context.next = 2;
+                        return service.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/es/core/viewer/components/plugins/ResourceWebControllUrlSettingDialog.js

@@ -9,6 +9,8 @@ import React, { useEffect } from 'react';
 import styles from "./ResourceWebControllUrlSettingDialog.module.scss";
 var FormItem = _Form.Item;
 export default function ResourceWebControllUrlSettingDialog(props) {
+  var _ref;
+
   var topo = props.topo;
   var store = topo.store;
   var resourceWebControllUrl = topo.pluginManager.pluginMap.resourceWebControllUrl;
@@ -33,42 +35,36 @@ export default function ResourceWebControllUrlSettingDialog(props) {
     });
   }, [url]);
 
-  var submit = /*#__PURE__*/function () {
-    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
+  var submit = function submit() {
+    return (_ref = _ref || _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
       var _yield$field$validate, errors, values;
 
       return _regeneratorRuntime.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;
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            _context.next = 2;
+            return field.validatePromise();
 
-              if (errors) {
-                _context.next = 8;
-                break;
-              }
+          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.createElement(_Form, {
     field: field,

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

@@ -2,6 +2,9 @@ import _extends from "@babel/runtime/helpers/extends";
 import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/objectWithoutPropertiesLoose";
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 var _excluded = ["run"];
+
+var _updateLink, _saveLink;
+
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import { useEffect, useState } from 'react';
 import { useRequest } from 'ahooks';
@@ -87,79 +90,104 @@ function buildCreateLinkParams(params, discoveryId) {
 
 
 function updateLink(_x, _x2) {
-  return _updateLink.apply(this, arguments);
-}
-
-function _updateLink() {
-  _updateLink = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(oldLink, params) {
+  return (_updateLink = _updateLink || _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(oldLink, params) {
     var result, src, dst, srcRelation, dstRelation, srcIsCurrentRelation, dstIsCurrentRelation, onlyChangeOneEnd, createResult;
     return _regeneratorRuntime.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;
+          }
+
+          _context.next = 22;
+          return cmdbService.forceDeleteRelation(oldLink.id);
 
-          case 22:
-            return _context.abrupt("return", result);
+        case 22:
+          return _context.abrupt("return", result);
 
-          case 23:
-          case "end":
-            return _context.stop();
-        }
+        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 || _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(_ref2) {
+    var link, values, params, result, _params;
+
+    return _regeneratorRuntime.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);
 }
 /**
  * 保存链路
@@ -169,45 +197,6 @@ function saveLink(_x3) {
  */
 
 
-function _saveLink() {
-  _saveLink = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(_ref2) {
-    var link, values, params, result, _params;
-
-    return _regeneratorRuntime.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);
-}
-
 export var useSave = function useSave(_ref3) {
   var cb = _ref3.cb;
 

package/es/networkTopo/components/Link/index.js

@@ -14,6 +14,8 @@ import LinkSetting from "./setting";
  */
 
 var LinkDrawer = /*#__PURE__*/forwardRef(function (props, ref) {
+  var _ref2, _ref3, _ref4, _ref5;
+
   var topoContext = props.topoContext,
       topo = props.topo;
   var store = topo.store;
@@ -81,154 +83,130 @@ var LinkDrawer = /*#__PURE__*/forwardRef(function (props, ref) {
     }
   }, [urlParams.showAddLink]); // 链路更新，通过资源重新获取链路信息通知HT来更新
 
-  var refreshLink = /*#__PURE__*/function () {
-    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
+  var refreshLink = function refreshLink() {
+    return (_ref2 = _ref2 || _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
       var data;
       return _regeneratorRuntime.wrap(function _callee$(_context) {
-        while (1) {
-          switch (_context.prev = _context.next) {
-            case 0:
-              rlog.debug('useTopoEdit.refreshLink');
-              _context.next = 3;
-              return editDispatchers.fetchData();
-
-            case 3:
-              data = _context.sent;
-              topo.view.topoClient.emitEvent(TopoEvent.EVENT_DATA_RESULT, {
-                type: TopoEvent.DATA_TYPE_RESOURCE_COMBO,
-                data: data
-              });
-
-            case 5:
-            case "end":
-              return _context.stop();
-          }
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            rlog.debug('useTopoEdit.refreshLink');
+            _context.next = 3;
+            return editDispatchers.fetchData();
+
+          case 3:
+            data = _context.sent;
+            topo.view.topoClient.emitEvent(TopoEvent.EVENT_DATA_RESULT, {
+              type: TopoEvent.DATA_TYPE_RESOURCE_COMBO,
+              data: data
+            });
+
+          case 5:
+          case "end":
+            return _context.stop();
         }
       }, _callee);
-    }));
-
-    return function refreshLink() {
-      return _ref2.apply(this, arguments);
-    };
-  }();
+    }))).apply(this, arguments);
+  };
 
-  var getLink = /*#__PURE__*/function () {
-    var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(id) {
+  var getLink = function getLink(_x) {
+    return (_ref3 = _ref3 || _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(id) {
       var data;
       return _regeneratorRuntime.wrap(function _callee2$(_context2) {
-        while (1) {
-          switch (_context2.prev = _context2.next) {
-            case 0:
-              _context2.next = 2;
-              return editDispatchers.fetchData();
-
-            case 2:
-              data = _context2.sent;
-              return _context2.abrupt("return", data.filter(function (item) {
-                return item.id === id;
-              })[0]);
-
-            case 4:
-            case "end":
-              return _context2.stop();
-          }
+        while (1) switch (_context2.prev = _context2.next) {
+          case 0:
+            _context2.next = 2;
+            return editDispatchers.fetchData();
+
+          case 2:
+            data = _context2.sent;
+            return _context2.abrupt("return", data.filter(function (item) {
+              return item.id === id;
+            })[0]);
+
+          case 4:
+          case "end":
+            return _context2.stop();
         }
       }, _callee2);
-    }));
-
-    return function getLink(_x) {
-      return _ref3.apply(this, arguments);
-    };
-  }();
+    }))).apply(this, arguments);
+  };
 
-  var updateTopo = useCallback( /*#__PURE__*/function () {
-    var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3(data) {
-      var changed, isAdd, _data$result$, oldId, id, linkData;
+  var updateTopo = useCallback(function (_x2) {
+    return (_ref4 = _ref4 || _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3(data) {
+      var changed, isAdd, _data$result$2, oldId, id, linkData;
 
       return _regeneratorRuntime.wrap(function _callee3$(_context3) {
-        while (1) {
-          switch (_context3.prev = _context3.next) {
-            case 0:
-              changed = data.changed, isAdd = data.isAddMode;
-
-              if (!(changed === false)) {
-                _context3.next = 3;
-                break;
-              }
+        while (1) switch (_context3.prev = _context3.next) {
+          case 0:
+            changed = data.changed, isAdd = data.isAddMode;
 
-              return _context3.abrupt("return");
-
-            case 3:
-              if (!isAdd) {
-                _context3.next = 8;
-                break;
-              }
+            if (!(changed === false)) {
+              _context3.next = 3;
+              break;
+            }
 
-              _context3.next = 6;
-              return refreshLink();
+            return _context3.abrupt("return");
 
-            case 6:
-              _context3.next = 13;
+          case 3:
+            if (!isAdd) {
+              _context3.next = 8;
               break;
-
-            case 8:
-              _data$result$ = data.result[0], oldId = _data$result$.oldId, id = _data$result$.id;
-              _context3.next = 11;
-              return getLink(id);
-
-            case 11:
-              linkData = _context3.sent;
-              topo.view.topoClient.emitEvent('topo_link_update', {
-                id: oldId,
-                link: linkData
-              });
-
-            case 13:
-            case "end":
-              return _context3.stop();
-          }
+            }
+
+            _context3.next = 6;
+            return refreshLink();
+
+          case 6:
+            _context3.next = 13;
+            break;
+
+          case 8:
+            _data$result$2 = data.result[0], oldId = _data$result$2.oldId, id = _data$result$2.id;
+            _context3.next = 11;
+            return getLink(id);
+
+          case 11:
+            linkData = _context3.sent;
+            topo.view.topoClient.emitEvent('topo_link_update', {
+              id: oldId,
+              link: linkData
+            });
+
+          case 13:
+          case "end":
+            return _context3.stop();
         }
       }, _callee3);
-    }));
-
-    return function (_x2) {
-      return _ref4.apply(this, arguments);
-    };
-  }(), []);
-  var handleSaved = useCallback( /*#__PURE__*/function () {
-    var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee4(data) {
+    }))).apply(this, arguments);
+  }, []);
+  var handleSaved = useCallback(function (_x3) {
+    return (_ref5 = _ref5 || _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee4(data) {
       var errorItems;
       return _regeneratorRuntime.wrap(function _callee4$(_context4) {
-        while (1) {
-          switch (_context4.prev = _context4.next) {
-            case 0:
-              errorItems = data.errorItems;
-
-              if (errorItems.length) {
-                _context4.next = 7;
-                break;
-              }
-
-              setFalse();
-              setUpdateTopoState(true);
-              _context4.next = 6;
-              return updateTopo(data);
-
-            case 6:
-              setUpdateTopoState(false);
-
-            case 7:
-            case "end":
-              return _context4.stop();
-          }
+        while (1) switch (_context4.prev = _context4.next) {
+          case 0:
+            errorItems = data.errorItems;
+
+            if (errorItems.length) {
+              _context4.next = 7;
+              break;
+            }
+
+            setFalse();
+            setUpdateTopoState(true);
+            _context4.next = 6;
+            return updateTopo(data);
+
+          case 6:
+            setUpdateTopoState(false);
+
+          case 7:
+          case "end":
+            return _context4.stop();
         }
       }, _callee4);
-    }));
-
-    return function (_x3) {
-      return _ref5.apply(this, arguments);
-    };
-  }(), []);
+    }))).apply(this, arguments);
+  }, []);
   return /*#__PURE__*/React.createElement(_Drawer, {
     closeMode: ['close', 'esc'],
     visible: visible,