@riil-frontend/component-topology 11.0.34 → 11.0.35

package/lib/core/models/plugins/resourceWebControllUrl.js

@@ -16,6 +16,8 @@ var _topo = _interopRequireDefault(require("@riil-frontend/component-topology-co
 var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
 
 function _default(topo) {
+  var _onTopoDataLoaded, _initData, _saveResourceWebUrl;
+
   var resourceUrlMap = {};
   var currentId = null;
   init();
@@ -33,76 +35,62 @@ function _default(topo) {
   }
 
   function onTopoDataLoaded(_x) {
-    return _onTopoDataLoaded.apply(this, arguments);
-  }
-
-  function _onTopoDataLoaded() {
-    _onTopoDataLoaded = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(topoData) {
+    return (_onTopoDataLoaded = _onTopoDataLoaded || (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(topoData) {
       return _regenerator["default"].wrap(function _callee$(_context) {
-        while (1) {
-          switch (_context.prev = _context.next) {
-            case 0:
-              initData(topoData.nodes);
-
-            case 1:
-            case "end":
-              return _context.stop();
-          }
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            initData(topoData.nodes);
+
+          case 1:
+          case "end":
+            return _context.stop();
         }
       }, _callee);
-    }));
-    return _onTopoDataLoaded.apply(this, arguments);
+    }))).apply(this, arguments);
   }
 
   function initData(_x2) {
-    return _initData.apply(this, arguments);
-  }
-
-  function _initData() {
-    _initData = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2(nodes) {
+    return (_initData = _initData || (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2(nodes) {
       var ids, list;
       return _regenerator["default"].wrap(function _callee2$(_context2) {
-        while (1) {
-          switch (_context2.prev = _context2.next) {
-            case 0:
-              ids = nodes.map(function (node) {
-                return node.id;
-              });
-
-              if (ids.length) {
-                _context2.next = 3;
-                break;
-              }
-
-              return _context2.abrupt("return");
-
-            case 3:
-              _context2.prev = 3;
-              _context2.next = 6;
-              return _topo["default"].resourceWebUrl.list(ids);
-
-            case 6:
-              list = _context2.sent;
-              list.forEach(function (item) {
-                resourceUrlMap[item.ciId] = item.webUrl;
-              });
-              _context2.next = 13;
+        while (1) switch (_context2.prev = _context2.next) {
+          case 0:
+            ids = nodes.map(function (node) {
+              return node.id;
+            });
+
+            if (ids.length) {
+              _context2.next = 3;
               break;
+            }
+
+            return _context2.abrupt("return");
+
+          case 3:
+            _context2.prev = 3;
+            _context2.next = 6;
+            return _topo["default"].resourceWebUrl.list(ids);
 
-            case 10:
-              _context2.prev = 10;
-              _context2.t0 = _context2["catch"](3);
+          case 6:
+            list = _context2.sent;
+            list.forEach(function (item) {
+              resourceUrlMap[item.ciId] = item.webUrl;
+            });
+            _context2.next = 13;
+            break;
 
-              _rlog["default"].error('资源web控制台.加载数据异常', _context2.t0);
+          case 10:
+            _context2.prev = 10;
+            _context2.t0 = _context2["catch"](3);
 
-            case 13:
-            case "end":
-              return _context2.stop();
-          }
+            _rlog["default"].error('资源web控制台.加载数据异常', _context2.t0);
+
+          case 13:
+          case "end":
+            return _context2.stop();
         }
       }, _callee2, null, [[3, 10]]);
-    }));
-    return _initData.apply(this, arguments);
+    }))).apply(this, arguments);
   }
 
   function getModelDispatchers() {
@@ -141,59 +129,52 @@ function _default(topo) {
   }
 
   function saveResourceWebUrl(_x3, _x4) {
-    return _saveResourceWebUrl.apply(this, arguments);
-  }
-
-  function _saveResourceWebUrl() {
-    _saveResourceWebUrl = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee3(id, url) {
+    return (_saveResourceWebUrl = _saveResourceWebUrl || (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee3(id, url) {
       return _regenerator["default"].wrap(function _callee3$(_context3) {
-        while (1) {
-          switch (_context3.prev = _context3.next) {
-            case 0:
-              if (!(!url && !getResourceUrl(id))) {
-                _context3.next = 4;
-                break;
-              }
-
-              _message["default"].success('链接设置成功');
-
-              closeSettingDialog();
-              return _context3.abrupt("return");
-
-            case 4:
-              updateStore({
-                saving: true
-              });
-              _context3.prev = 5;
-              _context3.next = 8;
-              return _topo["default"].resourceWebUrl.save(id, url || null);
-
-            case 8:
-              _message["default"].success('链接设置成功');
-
-              resourceUrlMap[id] = url;
-              closeSettingDialog();
-              _context3.next = 17;
+        while (1) switch (_context3.prev = _context3.next) {
+          case 0:
+            if (!(!url && !getResourceUrl(id))) {
+              _context3.next = 4;
               break;
+            }
+
+            _message["default"].success('链接设置成功');
+
+            closeSettingDialog();
+            return _context3.abrupt("return");
+
+          case 4:
+            updateStore({
+              saving: true
+            });
+            _context3.prev = 5;
+            _context3.next = 8;
+            return _topo["default"].resourceWebUrl.save(id, url || null);
+
+          case 8:
+            _message["default"].success('链接设置成功');
+
+            resourceUrlMap[id] = url;
+            closeSettingDialog();
+            _context3.next = 17;
+            break;
 
-            case 13:
-              _context3.prev = 13;
-              _context3.t0 = _context3["catch"](5);
+          case 13:
+            _context3.prev = 13;
+            _context3.t0 = _context3["catch"](5);
 
-              _message["default"].error('链接设置失败');
+            _message["default"].error('链接设置失败');
 
-              updateStore({
-                saving: false
-              });
+            updateStore({
+              saving: false
+            });
 
-            case 17:
-            case "end":
-              return _context3.stop();
-          }
+          case 17:
+          case "end":
+            return _context3.stop();
         }
       }, _callee3, null, [[5, 13]]);
-    }));
-    return _saveResourceWebUrl.apply(this, arguments);
+    }))).apply(this, arguments);
   }
 
   var resourceWebUrl = {

package/lib/core/models/tagstips/ElementTagTipConfig.js

@@ -23,6 +23,8 @@ var _tagtip = require("../../services/topo/tagtip");
  * 标注、悬浮框字段模型
  */
 var ElementTagTipConfig = /*#__PURE__*/function () {
+  var _init, _initNetworkLinkModel;
+
   function ElementTagTipConfig(topo) {
     this.topoData = void 0;
     this.modelMap = {};
@@ -34,79 +36,63 @@ var ElementTagTipConfig = /*#__PURE__*/function () {
 
   var _proto = ElementTagTipConfig.prototype;
 
-  _proto.init = /*#__PURE__*/function () {
-    var _init = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(topoData) {
+  _proto.init = function init(_x) {
+    return (_init = _init || (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(topoData) {
       return _regenerator["default"].wrap(function _callee$(_context) {
-        while (1) {
-          switch (_context.prev = _context.next) {
-            case 0:
-              this.topoData = topoData;
-              _context.next = 3;
-              return this.initNetworkLinkModel();
-
-            case 3:
-              this.mtCiTypeMap = (0, _utils.getMtCodeCiTypeMap)(topoData);
-
-            case 4:
-            case "end":
-              return _context.stop();
-          }
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            this.topoData = topoData;
+            _context.next = 3;
+            return this.initNetworkLinkModel();
+
+          case 3:
+            this.mtCiTypeMap = (0, _utils.getMtCodeCiTypeMap)(topoData);
+
+          case 4:
+          case "end":
+            return _context.stop();
         }
       }, _callee, this);
-    }));
-
-    function init(_x) {
-      return _init.apply(this, arguments);
-    }
-
-    return init;
-  }();
+    }))).apply(this, arguments);
+  };
 
-  _proto.initNetworkLinkModel = /*#__PURE__*/function () {
-    var _initNetworkLinkModel = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2() {
+  _proto.initNetworkLinkModel = function initNetworkLinkModel() {
+    return (_initNetworkLinkModel = _initNetworkLinkModel || (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2() {
       var mtCodes;
       return _regenerator["default"].wrap(function _callee2$(_context2) {
-        while (1) {
-          switch (_context2.prev = _context2.next) {
-            case 0:
-              _context2.prev = 0;
-              mtCodes = ['m.critical_link', 'm.ethernet_link'];
+        while (1) switch (_context2.prev = _context2.next) {
+          case 0:
+            _context2.prev = 0;
+            mtCodes = ['m.critical_link', 'm.ethernet_link'];
 
-              if (!mtCodes.length) {
-                _context2.next = 6;
-                break;
-              }
+            if (!mtCodes.length) {
+              _context2.next = 6;
+              break;
+            }
 
-              _context2.next = 5;
-              return (0, _tagtip.getMetricsByMonitorTemplateCodes)(mtCodes);
+            _context2.next = 5;
+            return (0, _tagtip.getMetricsByMonitorTemplateCodes)(mtCodes);
 
-            case 5:
-              this.mtMetricsMap = _context2.sent;
+          case 5:
+            this.mtMetricsMap = _context2.sent;
 
-            case 6:
-              _context2.next = 11;
-              break;
+          case 6:
+            _context2.next = 11;
+            break;
 
-            case 8:
-              _context2.prev = 8;
-              _context2.t0 = _context2["catch"](0);
+          case 8:
+            _context2.prev = 8;
+            _context2.t0 = _context2["catch"](0);
 
-              _rlog["default"].error('查询监控模板指标失败', _context2.t0);
+            _rlog["default"].error('查询监控模板指标失败', _context2.t0);
 
-            case 11:
-            case "end":
-              return _context2.stop();
-          }
+          case 11:
+          case "end":
+            return _context2.stop();
         }
       }, _callee2, this, [[0, 8]]);
-    }));
-
-    function initNetworkLinkModel() {
-      return _initNetworkLinkModel.apply(this, arguments);
-    }
-
-    return initNetworkLinkModel;
-  }();
+    }))).apply(this, arguments);
+  };
 
   _proto.getModelTypes = function getModelTypes(cis) {
     var _this = this;

package/lib/core/models/topoData.js

@@ -17,6 +17,8 @@ var _topo = require("@riil-frontend/component-topology-common/es/services/topo")
 
 var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
 
+var _saveTopo;
+
 function getLayoutId(layout) {
   if (!layout) {
     return layout;
@@ -52,98 +54,91 @@ function resToConditions(resources, persist) {
 }
 
 function saveTopo(_x) {
-  return _saveTopo.apply(this, arguments);
-}
-
-function _saveTopo() {
-  _saveTopo = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(data) {
+  return (_saveTopo = _saveTopo || (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(data) {
     var topoService, topoId, template, layout, backgroundId, globalConfig, serialize, resources, groups, relateTopoIdList, viewGroupId, groupInfo, viewResources, linkIps;
     return _regenerator["default"].wrap(function _callee$(_context) {
-      while (1) {
-        switch (_context.prev = _context.next) {
-          case 0:
-            topoService = data.topoService, topoId = data.id, template = data.template, layout = data.layout, backgroundId = data.backgroundId, globalConfig = data.globalConfig, serialize = data.serialize, resources = data.resources, groups = data.groups, relateTopoIdList = data.relateTopoIdList, viewGroupId = data.viewGroupId;
+      while (1) switch (_context.prev = _context.next) {
+        case 0:
+          topoService = data.topoService, topoId = data.id, template = data.template, layout = data.layout, backgroundId = data.backgroundId, globalConfig = data.globalConfig, serialize = data.serialize, resources = data.resources, groups = data.groups, relateTopoIdList = data.relateTopoIdList, viewGroupId = data.viewGroupId;
 
-            _rlog["default"].debug("saveTopo", data); // 保存布局
+          _rlog["default"].debug("saveTopo", data); // 保存布局
 
 
-            if (!(template && layout)) {
-              _context.next = 5;
-              break;
-            }
-
+          if (!(template && layout)) {
             _context.next = 5;
-            return topoService.changeLayout({
-              id: topoId,
-              template: template,
-              layout: getLayoutId(layout),
-              backgroundId: backgroundId
-            });
-
-          case 5:
-            if (!globalConfig) {
-              _context.next = 8;
-              break;
-            }
-
+            break;
+          }
+
+          _context.next = 5;
+          return topoService.changeLayout({
+            id: topoId,
+            template: template,
+            layout: getLayoutId(layout),
+            backgroundId: backgroundId
+          });
+
+        case 5:
+          if (!globalConfig) {
             _context.next = 8;
-            return topoService.saveTopoSettings(topoId, globalConfig);
-
-          case 8:
-            if (!(resources || groups)) {
-              _context.next = 16;
-              break;
-            }
-
-            groupInfo = groups.map(function (group) {
-              return (0, _extends2["default"])({}, group, {
-                layout: getLayoutId(group.layout),
-                resources: resToConditions(group.resources, true)
-              });
-            }); // 视图
-
-            viewResources = resToConditions(resources, true);
-
-            if (viewResources) {
-              groupInfo.push({
-                id: viewGroupId,
-                parentId: _topo.TOPO_PARENT_ID,
-                order: 100,
-                resources: viewResources
-              });
-            }
-
-            linkIps = []; // resources?.static.map((nodeId) => {
-            //   if (nodeId.startsWith("ip_")) {
-            //     linkIps.push(nodeId.replace("ip_", ""));
-            //   }
-            // });
-
-            _rlog["default"].debug("saveTopo-groupInfo", groupInfo);
+            break;
+          }
+
+          _context.next = 8;
+          return topoService.saveTopoSettings(topoId, globalConfig);
 
+        case 8:
+          if (!(resources || groups)) {
             _context.next = 16;
-            return topoService.bindResourceToTopo(topoId, {
-              groups: groupInfo,
-              linkIps: linkIps,
-              // exportLinkIdList,
-              relateTopoIdList: relateTopoIdList
+            break;
+          }
+
+          groupInfo = groups.map(function (group) {
+            return (0, _extends2["default"])({}, group, {
+              layout: getLayoutId(group.layout),
+              resources: resToConditions(group.resources, true)
             });
+          }); // 视图
 
-          case 16:
-            if (!serialize) {
-              _context.next = 19;
-              break;
-            }
+          viewResources = resToConditions(resources, true);
 
+          if (viewResources) {
+            groupInfo.push({
+              id: viewGroupId,
+              parentId: _topo.TOPO_PARENT_ID,
+              order: 100,
+              resources: viewResources
+            });
+          }
+
+          linkIps = []; // resources?.static.map((nodeId) => {
+          //   if (nodeId.startsWith("ip_")) {
+          //     linkIps.push(nodeId.replace("ip_", ""));
+          //   }
+          // });
+
+          _rlog["default"].debug("saveTopo-groupInfo", groupInfo);
+
+          _context.next = 16;
+          return topoService.bindResourceToTopo(topoId, {
+            groups: groupInfo,
+            linkIps: linkIps,
+            // exportLinkIdList,
+            relateTopoIdList: relateTopoIdList
+          });
+
+        case 16:
+          if (!serialize) {
             _context.next = 19;
-            return topoService.saveSerializeData(topoId, serialize);
+            break;
+          }
+
+          _context.next = 19;
+          return topoService.saveSerializeData(topoId, serialize);
 
-          case 19:
-          case "end":
-            return _context.stop();
-        }
+        case 19:
+        case "end":
+          return _context.stop();
       }
     }, _callee);
-  }));
-  return _saveTopo.apply(this, arguments);
+  }))).apply(this, arguments);
 }

package/lib/core/models/utils/linkUtils.js

@@ -30,7 +30,8 @@ var _CiTypeCache = _interopRequireDefault(require("../cache/CiTypeCache"));
 
 var _CiCache = _interopRequireDefault(require("../cache/CiCache"));
 
-// 查询所有连线
+var _getLinksDetail;
+
 // const interfaceTypeMap = {
 //   "network.interface": {
 //     displayName: "网络接口",
@@ -98,60 +99,53 @@ function mergeLinksData(links, linkCis, nodes, interfaceCiMap, interfaceDoc) {
 }
 
 function getLinksDetail(_x, _x2) {
-  return _getLinksDetail.apply(this, arguments);
-}
-
-function _getLinksDetail() {
-  _getLinksDetail = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(links, nodes) {
+  return (_getLinksDetail = _getLinksDetail || (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(links, nodes) {
     var linkCis, interfaceIds, interfaceTypes, interfaceCiMap, interfaceDoc;
     return _regenerator["default"].wrap(function _callee$(_context) {
-      while (1) {
-        switch (_context.prev = _context.next) {
-          case 0:
-            if (!(!links || !links.length)) {
-              _context.next = 2;
-              break;
-            }
-
-            return _context.abrupt("return", []);
-
-          case 2:
-            // const linkCis = await topoService.relation.batchQueryRelation(
-            //   links.map((link) => link.id)
-            // );
-            linkCis = links;
-            interfaceIds = [].concat(linkCis.map(function (item) {
-              return item.attributes.source_id;
-            }), linkCis.map(function (item) {
-              return item.attributes.destination_id;
-            }));
-            interfaceTypes = _lodash["default"].compact(_lodash["default"].uniq([].concat(linkCis.map(function (item) {
-              return item.attributes.source_type;
-            }), linkCis.map(function (item) {
-              return item.attributes.destination_type;
-            })))).filter(function (item) {
-              return item !== "ip";
-            });
-            _context.next = 7;
-            return _CiCache["default"].load(interfaceIds);
-
-          case 7:
-            interfaceCiMap = _context.sent;
-            _context.next = 10;
-            return _CiTypeCache["default"].load(interfaceTypes);
-
-          case 10:
-            interfaceDoc = _context.sent;
-            return _context.abrupt("return", mergeLinksData(links, linkCis, nodes, interfaceCiMap, interfaceDoc));
-
-          case 12:
-          case "end":
-            return _context.stop();
-        }
+      while (1) switch (_context.prev = _context.next) {
+        case 0:
+          if (!(!links || !links.length)) {
+            _context.next = 2;
+            break;
+          }
+
+          return _context.abrupt("return", []);
+
+        case 2:
+          // const linkCis = await topoService.relation.batchQueryRelation(
+          //   links.map((link) => link.id)
+          // );
+          linkCis = links;
+          interfaceIds = [].concat(linkCis.map(function (item) {
+            return item.attributes.source_id;
+          }), linkCis.map(function (item) {
+            return item.attributes.destination_id;
+          }));
+          interfaceTypes = _lodash["default"].compact(_lodash["default"].uniq([].concat(linkCis.map(function (item) {
+            return item.attributes.source_type;
+          }), linkCis.map(function (item) {
+            return item.attributes.destination_type;
+          })))).filter(function (item) {
+            return item !== "ip";
+          });
+          _context.next = 7;
+          return _CiCache["default"].load(interfaceIds);
+
+        case 7:
+          interfaceCiMap = _context.sent;
+          _context.next = 10;
+          return _CiTypeCache["default"].load(interfaceTypes);
+
+        case 10:
+          interfaceDoc = _context.sent;
+          return _context.abrupt("return", mergeLinksData(links, linkCis, nodes, interfaceCiMap, interfaceDoc));
+
+        case 12:
+        case "end":
+          return _context.stop();
       }
     }, _callee);
-  }));
-  return _getLinksDetail.apply(this, arguments);
+  }))).apply(this, arguments);
 }
 
 function buildTopoLinkData() {}

package/lib/core/models/utils/nodeNameVisibleUtil.js

@@ -33,8 +33,8 @@ function updateNodesNameVisible(topo) {
 
 function setNewNodeNameVisible(topo, element) {
   if ((0, _htElementUtils.isNode)(element)) {
-    var _topo$store$getModelS = topo.store.getModelState('displayConfig'),
-        nodeTag = _topo$store$getModelS.nodeTag;
+    var _topo$store$getModelS2 = topo.store.getModelState('displayConfig'),
+        nodeTag = _topo$store$getModelS2.nodeTag;
 
     var nameVisible = getNodeNameVisible({
       node: element,
@@ -46,8 +46,8 @@ function setNewNodeNameVisible(topo, element) {
 }
 
 function getNodesNameVisible(topo) {
-  var _topo$store$getModelS2 = topo.store.getModelState('displayConfig'),
-      nodeTag = _topo$store$getModelS2.nodeTag;
+  var _topo$store$getModelS3 = topo.store.getModelState('displayConfig'),
+      nodeTag = _topo$store$getModelS3.nodeTag;
 
   var dm = topo.getDataModel();
   var htNodes = (0, _htElementUtils.getNodes)(dm);