@riil-frontend/component-topology 10.0.58 → 10.0.59

package/lib/networkTopo/getTopoData.js

@@ -17,6 +17,8 @@ var _linkUtils = require("../core/models/utils/linkUtils");
 
 var _resourcePermissionUtil = require("./utils/resourcePermissionUtil");
 
+var _addLinkData, _buildData, _getTopoData;
+
 // import "./utils/__tests__/resourcePermissionUtil.test";
 // 过滤掉无两端节点数据的链路
 function filterLinkNoSourceTarget(data) {
@@ -71,113 +73,92 @@ function fixNodeGroupId(data) {
 }
 
 function addLinkData(_x) {
-  return _addLinkData.apply(this, arguments);
-} // FIXME 业务拓扑不需要链路相关逻辑
-
-
-function _addLinkData() {
-  _addLinkData = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(data) {
+  return (_addLinkData = _addLinkData || (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(data) {
     var links, nodes, networkLinks, otherLinks;
     return _regenerator["default"].wrap(function _callee$(_context) {
-      while (1) {
-        switch (_context.prev = _context.next) {
-          case 0:
-            links = data.links || [];
-            nodes = data.nodes || []; // 如果是网络链路，补充详情信息
-
-            _context.next = 4;
-            return (0, _linkUtils.getLinksDetail)(links.filter(function (link) {
-              return link.ciType === 'network_link';
-            }), nodes);
-
-          case 4:
-            networkLinks = _context.sent;
-            // console.log("如果是网络链路，补充详情信息", networkLinks);
-            otherLinks = links.filter(function (link) {
-              return link.ciType !== 'network_link';
-            });
-            return _context.abrupt("return", (0, _extends2["default"])({}, data, {
-              links: [].concat(networkLinks, otherLinks),
-              linkGroups: []
-            }));
-
-          case 7:
-          case "end":
-            return _context.stop();
-        }
+      while (1) switch (_context.prev = _context.next) {
+        case 0:
+          links = data.links || [];
+          nodes = data.nodes || []; // 如果是网络链路，补充详情信息
+
+          _context.next = 4;
+          return (0, _linkUtils.getLinksDetail)(links.filter(function (link) {
+            return link.ciType === 'network_link';
+          }), nodes);
+
+        case 4:
+          networkLinks = _context.sent;
+          // console.log("如果是网络链路，补充详情信息", networkLinks);
+          otherLinks = links.filter(function (link) {
+            return link.ciType !== 'network_link';
+          });
+          return _context.abrupt("return", (0, _extends2["default"])({}, data, {
+            links: [].concat(networkLinks, otherLinks),
+            linkGroups: []
+          }));
+
+        case 7:
+        case "end":
+          return _context.stop();
       }
     }, _callee);
-  }));
-  return _addLinkData.apply(this, arguments);
-}
+  }))).apply(this, arguments);
+} // FIXME 业务拓扑不需要链路相关逻辑
 
-function buildData(_x2) {
-  return _buildData.apply(this, arguments);
-}
 
-function _buildData() {
-  _buildData = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2(oldData) {
+function buildData(_x2) {
+  return (_buildData = _buildData || (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2(oldData) {
     var data;
     return _regenerator["default"].wrap(function _callee2$(_context2) {
-      while (1) {
-        switch (_context2.prev = _context2.next) {
-          case 0:
-            data = oldData;
-            data = fixNodeGroupId(data);
-            data = filterLinkNoSourceTarget(data); // data = await addLinkData(data)
-
-            data = (0, _resourcePermissionUtil.addTopoDataResourcePermission)(data);
-            return _context2.abrupt("return", data);
-
-          case 5:
-          case "end":
-            return _context2.stop();
-        }
+      while (1) switch (_context2.prev = _context2.next) {
+        case 0:
+          data = oldData;
+          data = fixNodeGroupId(data);
+          data = filterLinkNoSourceTarget(data); // data = await addLinkData(data)
+
+          data = (0, _resourcePermissionUtil.addTopoDataResourcePermission)(data);
+          return _context2.abrupt("return", data);
+
+        case 5:
+        case "end":
+          return _context2.stop();
       }
     }, _callee2);
-  }));
-  return _buildData.apply(this, arguments);
+  }))).apply(this, arguments);
 }
 
 function getTopoData(_x3, _x4) {
-  return _getTopoData.apply(this, arguments);
-}
-
-function _getTopoData() {
-  _getTopoData = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee3(id, topoService) {
+  return (_getTopoData = _getTopoData || (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee3(id, topoService) {
     var data;
     return _regenerator["default"].wrap(function _callee3$(_context3) {
-      while (1) {
-        switch (_context3.prev = _context3.next) {
-          case 0:
-            _context3.next = 2;
-            return topoService.getTopoData(id);
-
-          case 2:
-            data = _context3.sent;
-
-            if (data) {
-              _context3.next = 5;
-              break;
-            }
-
-            return _context3.abrupt("return", data);
-
-          case 5:
-            data = fixAlarmConfig(data);
-            _context3.next = 8;
-            return buildData(data);
-
-          case 8:
-            data = _context3.sent;
-            return _context3.abrupt("return", data);
-
-          case 10:
-          case "end":
-            return _context3.stop();
-        }
+      while (1) switch (_context3.prev = _context3.next) {
+        case 0:
+          _context3.next = 2;
+          return topoService.getTopoData(id);
+
+        case 2:
+          data = _context3.sent;
+
+          if (data) {
+            _context3.next = 5;
+            break;
+          }
+
+          return _context3.abrupt("return", data);
+
+        case 5:
+          data = fixAlarmConfig(data);
+          _context3.next = 8;
+          return buildData(data);
+
+        case 8:
+          data = _context3.sent;
+          return _context3.abrupt("return", data);
+
+        case 10:
+        case "end":
+          return _context3.stop();
       }
     }, _callee3);
-  }));
-  return _getTopoData.apply(this, arguments);
+  }))).apply(this, arguments);
 }

package/lib/networkTopo/hooks/viewer/useRelateTopo.js

@@ -23,6 +23,8 @@ var _tree = require("../../../utils/tree");
  * 双击节点=>调用生成拓扑缩略图=>打开新拓扑图=>ht渲染缩略图
  */
 function useRelateTopo(params) {
+  var _openLinkedTopo;
+
   var topo = params.topo;
   var store = topo.store;
   var topoState = store.useModelState('topoMod');
@@ -66,52 +68,45 @@ function useRelateTopo(params) {
 
 
   function openLinkedTopo(_x) {
-    return _openLinkedTopo.apply(this, arguments);
-  }
-
-  function _openLinkedTopo() {
-    _openLinkedTopo = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(topoId) {
+    return (_openLinkedTopo = _openLinkedTopo || (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(topoId) {
       var thumbnailImg;
       return _regenerator["default"].wrap(function _callee$(_context) {
-        while (1) {
-          switch (_context.prev = _context.next) {
-            case 0:
-              _rlog["default"].info('打开关联拓扑图', topoId);
-
-              if (checkTopoExisted(topoId)) {
-                _context.next = 4;
-                break;
-              }
-
-              _rlog["default"].error('关联拓扑图不存在：', topoId);
-
-              return _context.abrupt("return");
-
-            case 4:
-              _context.next = 6;
-              return topo.getHtTopo().createThumbnail();
-
-            case 6:
-              thumbnailImg = _context.sent;
-              // 打开新拓扑，传递缩略图和原拓扑id
-              topoCenterDispatchers.openTopoPage({
-                id: topoId,
-                linkTo: {
-                  img: thumbnailImg,
-                  sourceTopo: {
-                    id: topoState.topoId
-                  }
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            _rlog["default"].info('打开关联拓扑图', topoId);
+
+            if (checkTopoExisted(topoId)) {
+              _context.next = 4;
+              break;
+            }
+
+            _rlog["default"].error('关联拓扑图不存在：', topoId);
+
+            return _context.abrupt("return");
+
+          case 4:
+            _context.next = 6;
+            return topo.getHtTopo().createThumbnail();
+
+          case 6:
+            thumbnailImg = _context.sent;
+            // 打开新拓扑，传递缩略图和原拓扑id
+            topoCenterDispatchers.openTopoPage({
+              id: topoId,
+              linkTo: {
+                img: thumbnailImg,
+                sourceTopo: {
+                  id: topoState.topoId
                 }
-              });
+              }
+            });
 
-            case 8:
-            case "end":
-              return _context.stop();
-          }
+          case 8:
+          case "end":
+            return _context.stop();
         }
       }, _callee);
-    }));
-    return _openLinkedTopo.apply(this, arguments);
+    }))).apply(this, arguments);
   }
 
   function returnSourceTopo(data) {

package/lib/networkTopo/models/LinkDynamicStyleExecutor.js

@@ -50,6 +50,7 @@ var getChildrenNodeCiIds = function getChildrenNodeCiIds(nodes) {
 
 var LinkDynamicStyleExecutor = /*#__PURE__*/function () {
   function LinkDynamicStyleExecutor(topo) {
+    // network_link.actual_bandwidth
     this.calcEdgeWidth = calcEdgeWidth;
     this.topo = topo;
   }
@@ -207,8 +208,7 @@ var LinkDynamicStyleExecutor = /*#__PURE__*/function () {
     }
 
     return this.calcEdgeWidth(link.attributes['network_link.actual_bandwidth']);
-  } // network_link.actual_bandwidth
-  ;
+  };
 
   return LinkDynamicStyleExecutor;
 }();

package/lib/networkTopo/models/TopoCenter.js

@@ -30,6 +30,8 @@ var _ResourceInfoDisplay = require("../../constants/ResourceInfoDisplay");
 var _ExtElementTagTipBuilder = _interopRequireDefault(require("./ExtElementTagTipBuilder"));
 
 var TopoCenter = /*#__PURE__*/function (_TopoApp) {
+  var _initData, _exit;
+
   (0, _inheritsLoose2["default"])(TopoCenter, _TopoApp);
 
   function TopoCenter(options) {
@@ -67,33 +69,23 @@ var TopoCenter = /*#__PURE__*/function (_TopoApp) {
 
   var _proto = TopoCenter.prototype;
 
-  _proto.initData =
-  /*#__PURE__*/
-  function () {
-    var _initData = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(params) {
+  _proto.initData = function initData(_x) {
+    return (_initData = _initData || (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(params) {
       var topoDispatchers;
       return _regenerator["default"].wrap(function _callee$(_context) {
-        while (1) {
-          switch (_context.prev = _context.next) {
-            case 0:
-              topoDispatchers = this.store.getModelDispatchers('topoCenter');
-              _context.next = 3;
-              return topoDispatchers.initData(params);
-
-            case 3:
-            case "end":
-              return _context.stop();
-          }
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            topoDispatchers = this.store.getModelDispatchers('topoCenter');
+            _context.next = 3;
+            return topoDispatchers.initData(params);
+
+          case 3:
+          case "end":
+            return _context.stop();
         }
       }, _callee, this);
-    }));
-
-    function initData(_x) {
-      return _initData.apply(this, arguments);
-    }
-
-    return initData;
-  }();
+    }))).apply(this, arguments);
+  };
 
   _proto.openTopo = function openTopo(params) {
     var topoDispatchers = this.store.getModelDispatchers('topoCenter');
@@ -104,33 +96,23 @@ var TopoCenter = /*#__PURE__*/function (_TopoApp) {
    */
   ;
 
-  _proto.exit =
-  /*#__PURE__*/
-  function () {
-    var _exit = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2() {
+  _proto.exit = function exit() {
+    return (_exit = _exit || (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2() {
       var topoDispatchers;
       return _regenerator["default"].wrap(function _callee2$(_context2) {
-        while (1) {
-          switch (_context2.prev = _context2.next) {
-            case 0:
-              topoDispatchers = this.store.getModelDispatchers('topoCenter');
-              _context2.next = 3;
-              return topoDispatchers.exit();
-
-            case 3:
-            case "end":
-              return _context2.stop();
-          }
+        while (1) switch (_context2.prev = _context2.next) {
+          case 0:
+            topoDispatchers = this.store.getModelDispatchers('topoCenter');
+            _context2.next = 3;
+            return topoDispatchers.exit();
+
+          case 3:
+          case "end":
+            return _context2.stop();
         }
       }, _callee2, this);
-    }));
-
-    function exit() {
-      return _exit.apply(this, arguments);
-    }
-
-    return exit;
-  }();
+    }))).apply(this, arguments);
+  };
 
   _proto.getResourceConfigManager = function getResourceConfigManager() {
     return this.resourceConfig;

package/lib/networkTopo/services/alert.js

@@ -19,19 +19,17 @@ var _default = {
   getAlarmByIds: function getAlarmByIds(params) {
     return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee() {
       return _regenerator["default"].wrap(function _callee$(_context) {
-        while (1) {
-          switch (_context.prev = _context.next) {
-            case 0:
-              _context.next = 2;
-              return _componentTopologyUtils.request.post('/alert/v1/api/alert/getAlertListInResource', params);
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            _context.next = 2;
+            return _componentTopologyUtils.request.post('/alert/v1/api/alert/getAlertListInResource', params);
 
-            case 2:
-              return _context.abrupt("return", _context.sent);
+          case 2:
+            return _context.abrupt("return", _context.sent);
 
-            case 3:
-            case "end":
-              return _context.stop();
-          }
+          case 3:
+          case "end":
+            return _context.stop();
         }
       }, _callee);
     }))();
@@ -45,19 +43,17 @@ var _default = {
   getCisComponentIds: function getCisComponentIds(params) {
     return (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:
-              _context2.next = 2;
-              return _componentTopologyUtils.request.post('/topo/v1/api/structure/componentIds', params);
+        while (1) switch (_context2.prev = _context2.next) {
+          case 0:
+            _context2.next = 2;
+            return _componentTopologyUtils.request.post('/topo/v1/api/structure/componentIds', params);
 
-            case 2:
-              return _context2.abrupt("return", _context2.sent);
+          case 2:
+            return _context2.abrupt("return", _context2.sent);
 
-            case 3:
-            case "end":
-              return _context2.stop();
-          }
+          case 3:
+          case "end":
+            return _context2.stop();
         }
       }, _callee2);
     }))();

package/lib/networkTopo/services/authorization.js

@@ -27,19 +27,17 @@ var _default = {
   checkMenuAuthentication: function checkMenuAuthentication(menus) {
     return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee() {
       return _regenerator["default"].wrap(function _callee$(_context) {
-        while (1) {
-          switch (_context.prev = _context.next) {
-            case 0:
-              _context.next = 2;
-              return _componentTopologyUtils.request.post('/authorization/v1/api/authority/check/checkMenuAuthentication', menus);
-
-            case 2:
-              return _context.abrupt("return", _context.sent);
-
-            case 3:
-            case "end":
-              return _context.stop();
-          }
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            _context.next = 2;
+            return _componentTopologyUtils.request.post('/authorization/v1/api/authority/check/checkMenuAuthentication', menus);
+
+          case 2:
+            return _context.abrupt("return", _context.sent);
+
+          case 3:
+          case "end":
+            return _context.stop();
         }
       }, _callee);
     }))();
@@ -54,19 +52,17 @@ var _default = {
   checkSourceAuthentication: function checkSourceAuthentication(res) {
     return (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:
-              _context2.next = 2;
-              return _componentTopologyUtils.request.post('/authorization/v1/api/authority/check/checkSourceAuthentication', res);
-
-            case 2:
-              return _context2.abrupt("return", _context2.sent);
-
-            case 3:
-            case "end":
-              return _context2.stop();
-          }
+        while (1) switch (_context2.prev = _context2.next) {
+          case 0:
+            _context2.next = 2;
+            return _componentTopologyUtils.request.post('/authorization/v1/api/authority/check/checkSourceAuthentication', res);
+
+          case 2:
+            return _context2.abrupt("return", _context2.sent);
+
+          case 3:
+          case "end":
+            return _context2.stop();
         }
       }, _callee2);
     }))();
@@ -78,19 +74,17 @@ var _default = {
   checkFuncAuthentication: function checkFuncAuthentication(param) {
     return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee3() {
       return _regenerator["default"].wrap(function _callee3$(_context3) {
-        while (1) {
-          switch (_context3.prev = _context3.next) {
-            case 0:
-              _context3.next = 2;
-              return _componentTopologyUtils.request.post('/authorization/v1/api/authority/check/checkFuncAuthentication', param);
-
-            case 2:
-              return _context3.abrupt("return", _context3.sent);
-
-            case 3:
-            case "end":
-              return _context3.stop();
-          }
+        while (1) switch (_context3.prev = _context3.next) {
+          case 0:
+            _context3.next = 2;
+            return _componentTopologyUtils.request.post('/authorization/v1/api/authority/check/checkFuncAuthentication', param);
+
+          case 2:
+            return _context3.abrupt("return", _context3.sent);
+
+          case 3:
+          case "end":
+            return _context3.stop();
         }
       }, _callee3);
     }))();
@@ -104,19 +98,17 @@ var _default = {
   queryRolesList: function queryRolesList(param) {
     return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee4() {
       return _regenerator["default"].wrap(function _callee4$(_context4) {
-        while (1) {
-          switch (_context4.prev = _context4.next) {
-            case 0:
-              _context4.next = 2;
-              return _componentTopologyUtils.request.post('/authorization/v1/api/roles/list', param);
-
-            case 2:
-              return _context4.abrupt("return", _context4.sent);
-
-            case 3:
-            case "end":
-              return _context4.stop();
-          }
+        while (1) switch (_context4.prev = _context4.next) {
+          case 0:
+            _context4.next = 2;
+            return _componentTopologyUtils.request.post('/authorization/v1/api/roles/list', param);
+
+          case 2:
+            return _context4.abrupt("return", _context4.sent);
+
+          case 3:
+          case "end":
+            return _context4.stop();
         }
       }, _callee4);
     }))();
@@ -124,19 +116,17 @@ var _default = {
   orgRolePostPage: function orgRolePostPage(param) {
     return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee5() {
       return _regenerator["default"].wrap(function _callee5$(_context5) {
-        while (1) {
-          switch (_context5.prev = _context5.next) {
-            case 0:
-              _context5.next = 2;
-              return _componentTopologyUtils.request.post('/identity/v1/api/user/orgRolePost/page', param);
-
-            case 2:
-              return _context5.abrupt("return", _context5.sent);
-
-            case 3:
-            case "end":
-              return _context5.stop();
-          }
+        while (1) switch (_context5.prev = _context5.next) {
+          case 0:
+            _context5.next = 2;
+            return _componentTopologyUtils.request.post('/identity/v1/api/user/orgRolePost/page', param);
+
+          case 2:
+            return _context5.abrupt("return", _context5.sent);
+
+          case 3:
+          case "end":
+            return _context5.stop();
         }
       }, _callee5);
     }))();