@riil-frontend/component-topology 7.0.9 → 8.0.0-a.10

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

@@ -4,7 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 
 exports.__esModule = true;
 exports.buildTopoLinkData = buildTopoLinkData;
-exports.getInterfaceObject = exports.compatibleWith = void 0;
+exports.compatibleWith = void 0;
 exports.getLinksDetail = getLinksDetail;
 exports.isCrucialLink = isCrucialLink;
 exports.isExitLink = isExitLink;
@@ -13,11 +13,9 @@ exports.showLinkByConfig = exports.plurals = void 0;
 
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 
-var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
-
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 
-var _topo = _interopRequireDefault(require("@riil-frontend/component-topology-common/es/services/topo"));
+var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 
 var _keyBy = _interopRequireDefault(require("lodash/keyBy"));
 
@@ -27,6 +25,8 @@ var _services = require("../../services");
 
 var _htElementUtils = require("../../../utils/htElementUtils");
 
+var _CiTypeCache = _interopRequireDefault(require("../cache/CiTypeCache"));
+
 // 查询所有连线
 // const interfaceTypeMap = {
 //   "network.interface": {
@@ -56,67 +56,27 @@ function isExitLink(link) {
   return (link === null || link === void 0 ? void 0 : link.attributes) && !(link !== null && link !== void 0 && link.attributes['destination_id']);
 }
 
-var getInterfaceObject = /*#__PURE__*/function () {
-  var _ref = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(codes) {
-    var query, promises, result, ifDoc;
-    return _regenerator["default"].wrap(function _callee$(_context) {
-      while (1) {
-        switch (_context.prev = _context.next) {
-          case 0:
-            query = _lodash["default"].compact(_lodash["default"].uniq(codes));
-            promises = query.map(_services.queryModelAsset);
-            _context.next = 4;
-            return Promise.all(promises);
-
-          case 4:
-            result = _context.sent;
-            ifDoc = {};
-            result.map(function (ifItem) {
-              ifDoc[ifItem.code] = {
-                displayName: ifItem.displayName
-              };
-            });
-            return _context.abrupt("return", ifDoc);
-
-          case 8:
-          case "end":
-            return _context.stop();
-        }
-      }
-    }, _callee);
-  }));
-
-  return function getInterfaceObject(_x) {
-    return _ref.apply(this, arguments);
-  };
-}();
-
-exports.getInterfaceObject = getInterfaceObject;
-
 function mergeLinksData(links, linkCis, nodes, interfaceCis, interfaceDoc) {
-  var linkCiMap = (0, _keyBy["default"])(linkCis, "id");
+  var linkCiMap = (0, _keyBy["default"])(links, 'id');
   return links.map(function (link) {
     var _interfaceCis$find, _interfaceCis$find2;
 
     var linkCi = linkCiMap[link.id];
     var attributes = (0, _extends2["default"])({}, linkCi === null || linkCi === void 0 ? void 0 : linkCi.attributes);
     var sourceNode = nodes.find(function (node) {
-      return node.id === attributes["network_link.source_device_id"];
+      return node.id === attributes['network_link.source_device_id'];
     });
     var targetNode = nodes.find(function (node) {
-      return node.id === attributes["network_link.destination_device_id"];
+      return node.id === attributes['network_link.destination_device_id'];
     }); // 翻译
 
     return (0, _extends2["default"])({}, link, {
-      id: linkCi.id,
-      ciType: linkCi === null || linkCi === void 0 ? void 0 : linkCi.typeCode,
-      name: linkCi === null || linkCi === void 0 ? void 0 : linkCi.attributes.name,
       attributes: (0, _extends2["default"])({}, attributes, {
         // 源/目的设备
-        "network_link.source_device_id_object": {
+        'network_link.source_device_id_object': {
           displayName: sourceNode === null || sourceNode === void 0 ? void 0 : sourceNode.name
         },
-        "network_link.destination_device_id_object": {
+        'network_link.destination_device_id_object': {
           displayName: targetNode === null || targetNode === void 0 ? void 0 : targetNode.name
         },
         // 源/目的接口类型
@@ -126,72 +86,71 @@ function mergeLinksData(links, linkCis, nodes, interfaceCis, interfaceDoc) {
         source_id_object: {
           displayName: (_interfaceCis$find = interfaceCis.find(function (node) {
             return node.id === attributes.source_id;
-          })) === null || _interfaceCis$find === void 0 ? void 0 : _interfaceCis$find.attributes["display_name"]
+          })) === null || _interfaceCis$find === void 0 ? void 0 : _interfaceCis$find.attributes['display_name']
         },
         destination_id_object: {
           displayName: (_interfaceCis$find2 = interfaceCis.find(function (node) {
             return node.id === attributes.destination_id;
-          })) === null || _interfaceCis$find2 === void 0 ? void 0 : _interfaceCis$find2.attributes["display_name"]
+          })) === null || _interfaceCis$find2 === void 0 ? void 0 : _interfaceCis$find2.attributes['display_name']
         }
       })
     });
   });
 }
 
-function getLinksDetail(_x2, _x3) {
+function getLinksDetail(_x, _x2) {
   return _getLinksDetail.apply(this, arguments);
 }
 
 function _getLinksDetail() {
-  _getLinksDetail = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2(links, nodes) {
+  _getLinksDetail = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(links, nodes) {
     var linkCis, interfaceIds, interfaceTypes, interfaceCis, interfaceDoc;
-    return _regenerator["default"].wrap(function _callee2$(_context2) {
+    return _regenerator["default"].wrap(function _callee$(_context) {
       while (1) {
-        switch (_context2.prev = _context2.next) {
+        switch (_context.prev = _context.next) {
           case 0:
             if (!(!links || !links.length)) {
-              _context2.next = 2;
+              _context.next = 2;
               break;
             }
 
-            return _context2.abrupt("return", []);
+            return _context.abrupt("return", []);
 
           case 2:
-            _context2.next = 4;
-            return _topo["default"].relation.batchQueryRelation(links.map(function (link) {
-              return link.id;
+            // 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;
             }));
-
-          case 4:
-            linkCis = _context2.sent;
-            interfaceIds = [];
-            interfaceTypes = [];
-            linkCis.map(function (item) {
-              interfaceIds.push(item.attributes.source_id);
-              interfaceIds.push(item.attributes.destination_id);
-              interfaceTypes.push(item.attributes.source_type);
-              interfaceTypes.push(item.attributes.destination_type);
+            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';
             });
-            _context2.next = 10;
+            _context.next = 7;
             return (0, _services.queryCisByIds)(interfaceIds);
 
-          case 10:
-            interfaceCis = _context2.sent;
-            _context2.next = 13;
-            return getInterfaceObject(interfaceTypes.filter(function (item) {
-              return item !== 'ip';
-            }));
+          case 7:
+            interfaceCis = _context.sent;
+            _context.next = 10;
+            return _CiTypeCache["default"].getCiTypeMap(interfaceTypes);
 
-          case 13:
-            interfaceDoc = _context2.sent;
-            return _context2.abrupt("return", mergeLinksData(links, linkCis, nodes, interfaceCis, interfaceDoc));
+          case 10:
+            interfaceDoc = _context.sent;
+            return _context.abrupt("return", mergeLinksData(links, linkCis, nodes, interfaceCis, interfaceDoc));
 
-          case 15:
+          case 12:
           case "end":
-            return _context2.stop();
+            return _context.stop();
         }
       }
-    }, _callee2);
+    }, _callee);
   }));
   return _getLinksDetail.apply(this, arguments);
 }
@@ -216,10 +175,10 @@ var compatibleWith = function compatibleWith(value) {
 exports.compatibleWith = compatibleWith;
 var plurals = {
   0: [],
-  1: ["phy"],
-  2: ["phy"],
-  3: ["agg"],
-  4: ["phy", "agg"]
+  1: ['phy'],
+  2: ['phy'],
+  3: ['agg'],
+  4: ['phy', 'agg']
 };
 exports.plurals = plurals;
 
@@ -236,25 +195,25 @@ var showLinkByConfig = function showLinkByConfig(props) {
   var dm = gv.getDataModel();
   var edges = (0, _htElementUtils.getEdges)(dm); // console.log("edges", edges);
 
-  var showPhy = types.indexOf("phy") >= 0;
-  var showAgg = types.indexOf("agg") >= 0; // console.log("edges----types",showType, types,showPhy, showAgg);
+  var showPhy = types.indexOf('phy') >= 0;
+  var showAgg = types.indexOf('agg') >= 0; // console.log("edges----types",showType, types,showPhy, showAgg);
 
   if (Array.isArray(edges) && edges.length > 0) {
     edges.map(function (edge) {
       if (showType === 1 || showType === true) {
         // 单链路全部显示
         // console.log("单链路全部显示", edge);
-        edge.s("2d.visible", true);
+        edge.s('2d.visible', true);
       } else {
         var _d$attributes, _d$attributes2;
 
         var d = topo.dataModel.getDataById(edge.getTag()); // 判断是否聚合链路
 
-        if ((d === null || d === void 0 ? void 0 : (_d$attributes = d.attributes) === null || _d$attributes === void 0 ? void 0 : _d$attributes.destination_type) === "network.agg_interface" && (d === null || d === void 0 ? void 0 : (_d$attributes2 = d.attributes) === null || _d$attributes2 === void 0 ? void 0 : _d$attributes2.source_type) === "network.agg_interface") {
-          edge.s("2d.visible", showAgg);
+        if ((d === null || d === void 0 ? void 0 : (_d$attributes = d.attributes) === null || _d$attributes === void 0 ? void 0 : _d$attributes.destination_type) === 'network.agg_interface' && (d === null || d === void 0 ? void 0 : (_d$attributes2 = d.attributes) === null || _d$attributes2 === void 0 ? void 0 : _d$attributes2.source_type) === 'network.agg_interface') {
+          edge.s('2d.visible', showAgg);
         } else {
           // console.log("edge", edge, d, showAgg);
-          edge.s("2d.visible", showPhy);
+          edge.s('2d.visible', showPhy);
         }
       }
     });

package/lib/core/services/topo/basic.js

@@ -0,0 +1,46 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+exports.__esModule = true;
+exports["default"] = void 0;
+
+var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
+
+var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
+
+var _componentTopologyUtils = require("@riil-frontend/component-topology-utils");
+
+var _constants = require("./constants");
+
+var _default = {
+  /**
+  * 保存拓扑绘制数据（第三方库内部结构，无需关心含义）
+  * @param {Number} id Topo ID
+  * @param {String} data ht拓扑序列化数据
+  * @returns
+  */
+  saveSerializeData: function saveSerializeData(id, data) {
+    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(_constants.TOPO_API_ROOT + "/structure/" + id, {
+                data: data
+              });
+
+            case 2:
+              return _context.abrupt("return", _context.sent);
+
+            case 3:
+            case "end":
+              return _context.stop();
+          }
+        }
+      }, _callee);
+    }))();
+  }
+};
+exports["default"] = _default;

package/lib/core/services/topo/constants.js

@@ -0,0 +1,6 @@
+"use strict";
+
+exports.__esModule = true;
+exports.TOPO_API_ROOT = void 0;
+var TOPO_API_ROOT = '/topo/v1/api';
+exports.TOPO_API_ROOT = TOPO_API_ROOT;

package/lib/core/services/topo/index.js

@@ -0,0 +1,16 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+exports.__esModule = true;
+exports["default"] = void 0;
+
+var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
+
+var _topo = _interopRequireDefault(require("@riil-frontend/component-topology-common/es/services/topo"));
+
+var _basic = _interopRequireDefault(require("./basic"));
+
+var _default = (0, _extends2["default"])({}, _topo["default"], _basic["default"]);
+
+exports["default"] = _default;

package/lib/core/store/models/topoBizMod.js

@@ -23,7 +23,6 @@ function _default(engine) {
       metricDoc: {},
       attrDoc: {},
       allCiSet: {},
-      ciSetDoc: {},
       pollingSwitch: false,
 
       /**
@@ -44,7 +43,6 @@ function _default(engine) {
           var _this = this;
 
           return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee() {
-            var ciDoc, newCiDoc;
             return _regenerator["default"].wrap(function _callee$(_context) {
               while (1) {
                 switch (_context.prev = _context.next) {
@@ -53,17 +51,9 @@ function _default(engine) {
                       resAndMetrics: conditions
                     });
 
-                    ciDoc = conditions.ciDoc;
-                    newCiDoc = (0, _extends2["default"])({}, ciDoc); // rlog.debug('topoBizMod.combBatchCiInfo getBatchCiInfo', conditions);
-
-                    _this.update({
-                      ciSetDoc: newCiDoc,
-                      pollingSwitch: true
-                    });
-
                     return _context.abrupt("return", {});
 
-                  case 5:
+                  case 2:
                   case "end":
                     return _context.stop();
                 }

package/lib/core/store/models/topoConfig.js

@@ -330,7 +330,7 @@ function _default(topoApp) {
           var _this4 = this;
 
           return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee4() {
-            var topoId, resources, groups, exportLinkIdList, viewConditions, groupInfo, data, _yield$Promise$all, ciTypeMap, _combTopoData, topoData, resAndMetrics, topoDataTrans;
+            var topoId, resources, groups, exportLinkIdList, viewConditions, groupInfo, data, _yield$Promise$all, dataWithLinkDetail, _combTopoData, topoData, resAndMetrics, topoDataTrans;
 
             return _regenerator["default"].wrap(function _callee4$(_context4) {
               while (1) {
@@ -357,20 +357,19 @@ function _default(topoApp) {
                   case 8:
                     data = _context4.sent;
                     _context4.next = 11;
-                    return Promise.all([topoApp.ciTyeCache.getCiTypeMap((0, _topoData.getCiTypes)(data)), dispatch.customIcon.loadCustomIcons()]);
+                    return Promise.all([(0, _getTopoData.addLinkData)(data), topoApp.ciTyeCache.getCiTypeMap((0, _topoData.getCiTypes)(data)), dispatch.customIcon.loadCustomIcons()]);
 
                   case 11:
                     _yield$Promise$all = _context4.sent;
-                    ciTypeMap = _yield$Promise$all[0];
+                    dataWithLinkDetail = _yield$Promise$all[0];
                     _combTopoData = (0, _topoData.combTopoData)({
                       engine: topoApp,
                       data: data,
                       linkTo: null,
-                      globalConfig: state.topoMod.globalConfig,
-                      ciTypeMap: ciTypeMap
+                      globalConfig: state.topoMod.globalConfig
                     }), topoData = _combTopoData.topoData, resAndMetrics = _combTopoData.resAndMetrics;
                     dispatch.topoMod.update({
-                      data: data
+                      data: dataWithLinkDetail
                     });
                     topoDataTrans = (0, _utils2.transformTopoElements)(topoData);