@riil-frontend/component-topology 11.0.34 → 12.0.0-dev.1

package/lib/core/models/topoData.js

@@ -59,89 +59,87 @@ function _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);
   }));

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

@@ -105,49 +105,47 @@ function _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);
   }));

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);

package/lib/core/services/alarm.js

@@ -25,26 +25,24 @@ var _default = {
     return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee() {
       var parms, result;
       return _regenerator["default"].wrap(function _callee$(_context) {
-        while (1) {
-          switch (_context.prev = _context.next) {
-            case 0:
-              parms = (0, _extends2["default"])({
-                mainCiIdList: ciIds
-              }, params);
-              _context.next = 3;
-              return _topo["default"].getAlarmByIds(parms);
-
-            case 3:
-              result = _context.sent;
-
-              _rlog["default"].debug('查询告警列表', ciIds, result);
-
-              return _context.abrupt("return", result);
-
-            case 6:
-            case "end":
-              return _context.stop();
-          }
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            parms = (0, _extends2["default"])({
+              mainCiIdList: ciIds
+            }, params);
+            _context.next = 3;
+            return _topo["default"].getAlarmByIds(parms);
+
+          case 3:
+            result = _context.sent;
+
+            _rlog["default"].debug('查询告警列表', ciIds, result);
+
+            return _context.abrupt("return", result);
+
+          case 6:
+          case "end":
+            return _context.stop();
         }
       }, _callee);
     }))();

package/lib/core/services/background.js

@@ -20,19 +20,17 @@ var _default = {
   uploadBackground: function uploadBackground(type, 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("/topo/v1/api/background/upload/" + type, params);
-
-            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("/topo/v1/api/background/upload/" + type, params);
+
+          case 2:
+            return _context.abrupt("return", _context.sent);
+
+          case 3:
+          case "end":
+            return _context.stop();
         }
       }, _callee);
     }))();
@@ -45,19 +43,17 @@ var _default = {
   deleteBackground: function deleteBackground(id) {
     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["delete"]("/topo/v1/api/background/" + id);
-
-            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["delete"]("/topo/v1/api/background/" + id);
+
+          case 2:
+            return _context2.abrupt("return", _context2.sent);
+
+          case 3:
+          case "end":
+            return _context2.stop();
         }
       }, _callee2);
     }))();
@@ -70,45 +66,43 @@ var _default = {
     return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee3() {
       var useDebugData;
       return _regenerator["default"].wrap(function _callee3$(_context3) {
-        while (1) {
-          switch (_context3.prev = _context3.next) {
-            case 0:
-              useDebugData = localStorage.getItem('topo.background.debug') === 'true';
-
-              if (useDebugData) {
-                _context3.next = 5;
-                break;
-              }
-
-              _context3.next = 4;
-              return (0, _componentTopologyUtils.request)('/topo/v1/api/background/all');
-
-            case 4:
-              return _context3.abrupt("return", _context3.sent);
-
-            case 5:
-              return _context3.abrupt("return", [{
-                id: 10000,
-                isSystem: 1,
-                fileCode: 'chinamap_light'
-              }, {
-                id: 10001,
-                isSystem: 1,
-                fileCode: 'chinamap_dark'
-              }, {
-                id: 10002,
-                isSystem: 1,
-                fileCode: 'test'
-              }, {
-                id: 10003,
-                isSystem: 0,
-                fileCode: 'chinamap_dark'
-              }]);
-
-            case 6:
-            case "end":
-              return _context3.stop();
-          }
+        while (1) switch (_context3.prev = _context3.next) {
+          case 0:
+            useDebugData = localStorage.getItem('topo.background.debug') === 'true';
+
+            if (useDebugData) {
+              _context3.next = 5;
+              break;
+            }
+
+            _context3.next = 4;
+            return (0, _componentTopologyUtils.request)('/topo/v1/api/background/all');
+
+          case 4:
+            return _context3.abrupt("return", _context3.sent);
+
+          case 5:
+            return _context3.abrupt("return", [{
+              id: 10000,
+              isSystem: 1,
+              fileCode: 'chinamap_light'
+            }, {
+              id: 10001,
+              isSystem: 1,
+              fileCode: 'chinamap_dark'
+            }, {
+              id: 10002,
+              isSystem: 1,
+              fileCode: 'test'
+            }, {
+              id: 10003,
+              isSystem: 0,
+              fileCode: 'chinamap_dark'
+            }]);
+
+          case 6:
+          case "end":
+            return _context3.stop();
         }
       }, _callee3);
     }))();
@@ -126,19 +120,17 @@ var _default = {
   canDeleteBackground: function canDeleteBackground(id) {
     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 (0, _componentTopologyUtils.request)("/topo/v1/api/background/" + id);
-
-            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 (0, _componentTopologyUtils.request)("/topo/v1/api/background/" + id);
+
+          case 2:
+            return _context4.abrupt("return", _context4.sent);
+
+          case 3:
+          case "end":
+            return _context4.stop();
         }
       }, _callee4);
     }))();

package/lib/core/services/cmdb/metric.js

@@ -18,18 +18,16 @@ function queryLatestMetrics(_x, _x2) {
 function _queryLatestMetrics() {
   _queryLatestMetrics = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(ids, codes) {
     return _regenerator["default"].wrap(function _callee$(_context) {
-      while (1) {
-        switch (_context.prev = _context.next) {
-          case 0:
-            return _context.abrupt("return", _componentTopologyUtils.request.post('/mdc/v1/api/cmdb/metric/queryLatestMetrics', {
-              'ciId': ids,
-              'metricCode': codes
-            }));
-
-          case 1:
-          case "end":
-            return _context.stop();
-        }
+      while (1) switch (_context.prev = _context.next) {
+        case 0:
+          return _context.abrupt("return", _componentTopologyUtils.request.post('/mdc/v1/api/cmdb/metric/queryLatestMetrics', {
+            'ciId': ids,
+            'metricCode': codes
+          }));
+
+        case 1:
+        case "end":
+          return _context.stop();
       }
     }, _callee);
   }));

package/lib/core/services/cmdb.js

@@ -21,28 +21,28 @@ function _commonQueryCiDataByIds() {
   _commonQueryCiDataByIds = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(ids, options) {
     var result;
     return _regenerator["default"].wrap(function _callee$(_context) {
-      while (1) {
-        switch (_context.prev = _context.next) {
-          case 0:
-            _context.next = 2;
-            return _componentTopologyUtils.request.post('/mdc/v1/api/cmdb/commonQueryCiData', (0, _extends2["default"])({
-              condition: "id('" + ids.join('\',\'') + "')",
-              orders: [{
-                name: 'display_name',
-                type: 'asc'
-              }],
-              pageIndex: 1,
-              pageSize: 20
-            }, options));
-
-          case 2:
-            result = _context.sent;
-            return _context.abrupt("return", result);
-
-          case 4:
-          case "end":
-            return _context.stop();
-        }
+      while (1) switch (_context.prev = _context.next) {
+        case 0:
+          _context.next = 2;
+          return _componentTopologyUtils.request.post('/mdc/v1/api/cmdb/commonQueryCiData', (0, _extends2["default"])({
+            condition: "id('" + ids.join('\',\'') + "')",
+            orders: [{
+              name: 'display_name',
+              type: 'asc'
+            }],
+            level: null,
+            // 本级+下级
+            pageIndex: 1,
+            pageSize: 20
+          }, options));
+
+        case 2:
+          result = _context.sent;
+          return _context.abrupt("return", result);
+
+        case 4:
+        case "end":
+          return _context.stop();
       }
     }, _callee);
   }));