@riil-frontend/component-topology 9.0.0-a.20 → 9.0.0-a.21

package/lib/core/test/Test.js

@@ -39,7 +39,7 @@ var Test = /*#__PURE__*/function () {
 
     var nodeElement = htTopo.getGraphView().sm().fd();
     var ip = {
-      'id': 'ip_1.1.1.1',
+      'id': 'ip:1.1.1.1',
       'name': '1.1.1.1',
       customName: null,
       // 'groupId': null,
@@ -51,12 +51,12 @@ var Test = /*#__PURE__*/function () {
 
     };
     nodeElement.a(ip);
-    nodeElement.setTag('ip_1.1.1.1');
+    nodeElement.setTag('ip:1.1.1.1');
     var link = {
       'id': '0000000019b462d1',
       'name': '172.17.160.116(Gi2/2/0/1) - 172.27.130.13(Gi 0/9)',
       'source': '00000000029f9411',
-      'target': 'ip_1.1.1.1',
+      'target': 'ip:1.1.1.1',
       'operation': 'delete',
       'interfaceSource': '0000000018080aee',
       'interfaceTarget': '000000000341b015',

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

@@ -25,7 +25,9 @@ var _cmdb = require("../cmdb");
 
 var _model = require("../model");
 
-var _excluded = ["groups", "resources"];
+var _exitLinkUtil = require("../../utils/exitLinkUtil");
+
+var _excluded = ["groups", "resources", "exportLinkIdList"];
 var API_ROOT = _constants.TOPO_API_ROOT;
 /**
  * 拓扑图（看做一个容器）的“父容器”ID
@@ -72,10 +74,16 @@ function prepareResourceParams(conditions, query) {
     dynamicCondition.sort = query.sortBy + " " + query.sortOrder;
   }
 
-  var fixedConditionIdList = staticRes || undefined;
   return {
     dynamicCondition: dynamicCondition,
-    fixedConditionIdList: fixedConditionIdList
+    fixedConditionIdList: (staticRes || []).filter(function (ciId) {
+      return !ciId.startsWith('ip:');
+    }),
+    linkIps: (staticRes || []).filter(function (ciId) {
+      return ciId.startsWith('ip:');
+    }).map(function (ciId) {
+      return ciId.replace('ip:', '');
+    })
   };
 }
 
@@ -420,7 +428,7 @@ var _default = (0, _extends2["default"])({
   */
   getTopoData: function getTopoData(id) {
     return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee12() {
-      var _result$links, result;
+      var _result$nodes, _result$links, result;
 
       return _regenerator["default"].wrap(function _callee12$(_context12) {
         while (1) {
@@ -432,13 +440,14 @@ var _default = (0, _extends2["default"])({
 
             case 3:
               result = _context12.sent;
-              return _context12.abrupt("return", (0, _extends2["default"])({}, result, {
+              return _context12.abrupt("return", (0, _exitLinkUtil.processExitLink)((0, _extends2["default"])({}, result, {
+                nodes: (_result$nodes = result.nodes) !== null && _result$nodes !== void 0 ? _result$nodes : [],
                 links: ((_result$links = result.links) !== null && _result$links !== void 0 ? _result$links : []).map(function (item) {
                   return (0, _extends2["default"])({}, item, {
                     ciType: 'network_link'
                   });
                 })
-              }));
+              })));
 
             case 7:
               _context12.prev = 7;
@@ -464,9 +473,9 @@ var _default = (0, _extends2["default"])({
   * @param {Array} groups
   * @returns
   */
-  getTopoDataByResource: function getTopoDataByResource(id, resources, groups, exportLinkIdList) {
+  getTopoDataByResource: function getTopoDataByResource(id, resources, groups) {
     return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee13() {
-      var _result$links2;
+      var _result$nodes2, _result$links2;
 
       var data, obj, result;
       return _regenerator["default"].wrap(function _callee13$(_context13) {
@@ -485,19 +494,18 @@ var _default = (0, _extends2["default"])({
 
               obj = prepareGroupParams(data);
               _context13.next = 5;
-              return _componentTopologyUtils.request.post(API_ROOT + "/structure/byCondition/" + id, (0, _extends2["default"])({}, obj, {
-                exportLinkIdList: exportLinkIdList
-              }));
+              return _componentTopologyUtils.request.post(API_ROOT + "/structure/byCondition/" + id, (0, _extends2["default"])({}, obj));
 
             case 5:
               result = _context13.sent;
-              return _context13.abrupt("return", (0, _extends2["default"])({}, result, {
+              return _context13.abrupt("return", (0, _exitLinkUtil.processByConditionResult)((0, _extends2["default"])({}, result, {
+                nodes: (_result$nodes2 = result.nodes) !== null && _result$nodes2 !== void 0 ? _result$nodes2 : [],
                 links: ((_result$links2 = result.links) !== null && _result$links2 !== void 0 ? _result$links2 : []).map(function (item) {
                   return (0, _extends2["default"])({}, item, {
                     ciType: 'network_link'
                   });
                 })
-              }));
+              })));
 
             case 7:
             case "end":
@@ -517,12 +525,12 @@ var _default = (0, _extends2["default"])({
   */
   bindResourceToTopo: function bindResourceToTopo(id, config) {
     return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee14() {
-      var groups, resources, otherConfig, newGroups, obj;
+      var groups, resources, exportLinkIdList, otherConfig, newGroups, obj;
       return _regenerator["default"].wrap(function _callee14$(_context14) {
         while (1) {
           switch (_context14.prev = _context14.next) {
             case 0:
-              groups = config.groups, resources = config.resources, otherConfig = (0, _objectWithoutPropertiesLoose2["default"])(config, _excluded);
+              groups = config.groups, resources = config.resources, exportLinkIdList = config.exportLinkIdList, otherConfig = (0, _objectWithoutPropertiesLoose2["default"])(config, _excluded);
               newGroups = isAvailableArray(groups) ? groups : [];
 
               if (resources) {
@@ -536,7 +544,10 @@ var _default = (0, _extends2["default"])({
 
               obj = prepareGroupParams(newGroups);
               _context14.next = 6;
-              return _componentTopologyUtils.request.post(API_ROOT + "/resource/" + id, (0, _extends2["default"])({}, otherConfig, obj));
+              return _componentTopologyUtils.request.post(API_ROOT + "/resource/" + id, (0, _extends2["default"])({}, otherConfig, obj, {
+                exportLinkIdList: [] // 传空数组清空
+
+              }));
 
             case 6:
               return _context14.abrupt("return", _context14.sent);

package/lib/networkTopo/services/topo/networkLink.js

@@ -17,9 +17,9 @@ var API_ROOT = _constants.TOPO_API_ROOT;
 var _default = {
   /**
    * 批量查询ci类型是否可创建链路
-   * 
-   * @param {*} typeCodes 
-   * @returns 
+   *
+   * @param {*} typeCodes
+   * @returns
    */
   getCiTypesConnectable: function getCiTypesConnectable(typeCodes) {
     return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee() {
@@ -40,6 +40,48 @@ var _default = {
         }
       }, _callee);
     }))();
+  },
+
+  /**
+   * 通过ip查询关联链路
+   *
+   * @param {array} ciIds
+   */
+  queryLinksByIp: function queryLinksByIp(ids, ip) {
+    return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2() {
+      var stag, condition, parm, result;
+      return _regenerator["default"].wrap(function _callee2$(_context2) {
+        while (1) {
+          switch (_context2.prev = _context2.next) {
+            case 0:
+              stag = "'" + ids.join("','") + "'";
+              condition = "type('network_link') && network_link.destination_ipv4 = '" + ip + "' && network_link.source_device_id in [" + stag + "]";
+              parm = {
+                condition: condition,
+                sort: "name asc",
+                currentPage: 1,
+                pageSize: 999
+              };
+              _context2.prev = 3;
+              _context2.next = 6;
+              return _componentTopologyUtils.request.post("/mdc/v1/api/cmdb/commonQueryCiData", parm);
+
+            case 6:
+              result = _context2.sent;
+              return _context2.abrupt("return", result);
+
+            case 10:
+              _context2.prev = 10;
+              _context2.t0 = _context2["catch"](3);
+              rlog.error("通过ip查询关联链路", _context2.t0);
+
+            case 13:
+            case "end":
+              return _context2.stop();
+          }
+        }
+      }, _callee2, null, [[3, 10]]);
+    }))();
   }
 };
 exports["default"] = _default;

package/lib/networkTopo/utils/exitLinkUtil.js

@@ -0,0 +1,235 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+exports.__esModule = true;
+exports.isUniqueIp = isUniqueIp;
+exports.processByConditionResult = processByConditionResult;
+exports.processExitLink = processExitLink;
+
+var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
+
+var _htElementUtils = require("../../utils/htElementUtils");
+
+function findPingNodeFromHt(nodes, ip) {
+  return nodes.find(function (node) {
+    return node.a('ciType') === "ping" && node.a('ipAddress') === ip;
+  });
+}
+
+function isPingHtNode(node, ip) {
+  return node.a('ciType') === "ping" && node.a('ipAddress') === ip;
+}
+
+function isIpHtNode(node, ip) {
+  return node.a('bindType') === ip && node.a('ipAddress') === ip;
+}
+
+function buildIpNode(ip) {
+  return {
+    'id': "ip:" + ip,
+    'name': ip,
+    bindType: 'ip',
+    // 绑定资源类型。关联资源 值为空，关联IP ip
+    bindIp: ip,
+    // TODO 所属区域，从序列化拿
+    // 'groupId': null,
+    // 'groupTag': null,
+    ipAddress: ip,
+    // 'attributes': [],
+    // 'metrics': [],
+    type: "node",
+    // 'dtype': 'device'
+    operation: "delete"
+  };
+}
+
+function getHtSerialize(serialize) {
+  if (serialize) {
+    return JSON.parse(serialize);
+  }
+
+  return null;
+}
+
+function isExitLink(link) {
+  return link.attributes.destination_type === "ip";
+} // 判断拓扑图上ip是否唯一
+
+
+function isUniqueIp(dataModel, ip, nodeElement) {
+  var nodes = (0, _htElementUtils.getNodes)(dataModel);
+  var isUnique = !!nodes.filter(function (node) {
+    return node.getId() !== nodeElement.getId();
+  }).filter(function (node) {
+    return isPingHtNode(node, ip) || isIpHtNode(node, ip);
+  });
+  return isUnique;
+}
+/**
+ * 打开拓扑出口链路处理
+ * @param {*} topoData 
+ * @returns 
+ */
+
+
+function processExitLink(topoData) {
+  var nodes = topoData.nodes,
+      links = topoData.links;
+  var serialize = (0, _extends2["default"])({}, getHtSerialize(topoData.serialize));
+
+  if (!serialize) {
+    return topoData;
+  } // 历史数据升级
+
+
+  links.filter(isExitLink) // 升级V1.4前配置的出口链路目的端节点为IP节点
+  .forEach(function (link) {
+    return upgradeExitLinkTarget(link);
+  }); // 出口链路目的端设置为IP节点或者ping资源节点id
+
+  var newLinks = links.map(function (link) {
+    if (!isExitLink(link) || link.target && nodes.find(function (node) {
+      return node.id === link.target;
+    })) {
+      return link;
+    }
+
+    var destinationIp = link.attributes['network_link.destination_ipv4'];
+    var pingNode = findPingNode(nodes, destinationIp); // 出口链路目的端设置为IP节点或者ping资源节点id
+
+    var target = pingNode ? pingNode.id : "ip:" + destinationIp; // 历史数据适配：同IP节点关联多个不同IP的链路、分级拓扑。target匹配不到元素时，根据序列化匹配
+
+    var targetSerialize = findElementSerializeById(serialize, target);
+
+    if (!targetSerialize) {
+      var linkSerialize = findElementSerializeById(serialize, link.id);
+
+      if (linkSerialize) {
+        // 根据链路序列化数据找目的端节点
+        // eslint-disable-next-line no-underscore-dangle
+        var targetNodeSerialize = serialize.d.find(function (item) {
+          return item.i === linkSerialize.p.target.__i;
+        });
+
+        if (targetNodeSerialize) {
+          target = targetNodeSerialize.p.tag;
+        }
+      }
+    }
+
+    return (0, _extends2["default"])({}, link, {
+      target: target
+    });
+  }); // IP节点构造为node。如果有相同ip的ping资源和图片节点，图片节点消失（不构造）
+
+  var ipNodes = getIpNodes();
+
+  function getIpNodes() {
+    // 从序列化获取关联的IP
+    var ips = serialize.d.filter(function (item) {
+      return item.a.bindType === 'ip';
+    }).map(function (item) {
+      return item.a.bindIp;
+    }).filter(function (item) {
+      return !!item;
+    }).filter(function (ip) {
+      return !findPingNode(nodes, ip);
+    }); // TODO 过滤ping资源对应的ip
+
+    return ips.map(buildIpNode);
+  }
+
+  function findIpNodeSerialize(serialize, ip) {
+    return serialize.d.find(function (item) {
+      return item.p.tag === "ip:" + ip;
+    });
+  }
+
+  function findElementSerializeById(serialize, id) {
+    return serialize.d.find(function (item) {
+      return item.a.id === id;
+    });
+  }
+  /**
+   * 链路在序列化存在且目的端不是ping资源、IP节点时，升级链路目的端序列化数据为IP节点
+   * @param {*} link 
+   */
+
+
+  function upgradeExitLinkTarget(link) {
+    var destinationIp = link.attributes['network_link.destination_ipv4'];
+    var linkSerialize = findElementSerializeById(serialize, link.id);
+
+    if (linkSerialize) {
+      // 根据链路序列化数据找目的端节点
+      // eslint-disable-next-line no-underscore-dangle
+      var targetNodeSerialize = serialize.d.find(function (item) {
+        return item.i === linkSerialize.p.target.__i;
+      });
+
+      if (!targetNodeSerialize.p.tag) {
+        targetNodeSerialize.a = (0, _extends2["default"])({}, targetNodeSerialize.a, buildIpNode(destinationIp), {
+          isbinding: true
+        });
+        targetNodeSerialize.p.tag = "ip:" + destinationIp;
+      }
+    }
+  }
+
+  return (0, _extends2["default"])({}, topoData, {
+    nodes: [].concat(nodes, ipNodes),
+    links: newLinks,
+    serialize: serialize
+  });
+} // 从拓扑数据查找
+
+
+function findPingNode(nodes, ip) {
+  return nodes.find(function (node) {
+    return node.ciType === "ping" && (node.ipAddress || node.attributes.ipv4_address) === ip;
+  });
+}
+/**
+ * 编辑模式按资源查询拓扑数据处理出口链路target
+ * FIXME 移到frontend 网络拓扑编辑
+ * @param {*} topoData 
+ * @returns 
+ */
+
+
+function processByConditionResult(topoData) {
+  var nodes = topoData.nodes,
+      links = topoData.links;
+  var ipNodes = getIpNodes();
+
+  function getIpNodes() {
+    // 从序列化获取关联的IP
+    var ips = [].filter(function (ip) {
+      return !findPingNode(nodes, ip);
+    }); // TODO 过滤ping资源对应的ip
+
+    return ips.map(buildIpNode);
+  } // 出口链路目的端设置为IP节点或者ping资源节点id
+
+
+  var newLinks = links.map(function (link) {
+    if (!isExitLink(link) || link.target && nodes.find(function (node) {
+      return node.id === link.target;
+    })) {
+      return link;
+    }
+
+    var destinationIp = link.attributes['network_link.destination_ipv4'];
+    var pingNode = findPingNode(nodes, destinationIp); // 出口链路目的端设置为IP节点或者ping资源节点id
+
+    var target = pingNode ? pingNode.id : "ip:" + destinationIp;
+    return (0, _extends2["default"])({}, link, {
+      target: target
+    });
+  });
+  return (0, _extends2["default"])({}, topoData, {
+    nodes: [].concat(nodes, ipNodes),
+    links: newLinks
+  });
+}

package/lib/utils/htElementUtils.js

@@ -55,7 +55,7 @@ function getElementData(element) {
     styleMap: element.getStyleMap()
   };
 
-  if (className === 'ht.Edge') {
+  if (className === "ht.Edge") {
     return (0, _extends3["default"])({}, commonData);
   }
 
@@ -67,7 +67,7 @@ function getElementData(element) {
 function isNode(element) {
   // HT为了支持区域内无节点可展开增加了站位节点，因此 节点的layer等于container_blank的过滤掉就可以了
   // eslint-disable-next-line no-underscore-dangle
-  return element instanceof ht.Node && !isLayer(element) && element._layer !== 'container_blank';
+  return element instanceof ht.Node && !isLayer(element) && element._layer !== "container_blank";
 }
 
 function isEdge(element) {
@@ -80,7 +80,7 @@ function isValidEdge(element) {
   }
 
   if (!element.getSource() || !element.getTarget()) {
-    _rlog["default"].error('isValidEdge 连线异常：源或目的为空', element);
+    _rlog["default"].error("isValidEdge 连线异常：源或目的为空", element);
 
     return false;
   }
@@ -97,7 +97,7 @@ function isLayer(element) {
 }
 
 function isText(element) {
-  return element instanceof ht.Text && element.a('isText');
+  return element instanceof ht.Text && element.a("isText");
 }
 
 function getElements(dataModel) {
@@ -123,7 +123,7 @@ function getGroupDatas(dataModel) {
 
 function getGroupElementByTag(dataModel, tag) {
   return dataModel.getDataByTag(tag) || dataModel.getDatas().toArray().filter(function (item) {
-    return item.a('tag') === tag;
+    return item.a("tag") === tag;
   })[0];
 }
 
@@ -135,14 +135,14 @@ function getGroupData(element) {
   var parent = element.getParent();
   var groupInfo = parent ? {
     groupId: parent.getTag(),
-    groupTag: parent.a('tag') // 父容器
+    groupTag: parent.a("tag") // 父容器
 
   } : {};
   return (0, _extends3["default"])({
     name: element.getStyleMap().label
   }, element.getAttrObject(), {
     id: element.getTag(),
-    tag: element.a('tag'),
+    tag: element.a("tag"),
     image: element.getImage()
   }, groupInfo);
 }
@@ -159,7 +159,7 @@ function getNodeData(element) {
   var parent = element.getParent();
   var groupInfo = parent ? {
     groupId: parent.getTag(),
-    groupTag: parent.a('tag') // 父容器
+    groupTag: parent.a("tag") // 父容器
 
   } : {};
   return (0, _extends3["default"])({}, element.getAttrObject(), {
@@ -173,12 +173,12 @@ function getEdges(dataModel) {
 }
 
 function isEdgeGroupExpanded(edge) {
-  return isEdge(edge) && edge.getEdgeGroup() && !!edge.s('edge.expanded');
+  return isEdge(edge) && edge.getEdgeGroup() && !!edge.s("edge.expanded");
 }
 /**
  * 是否连线组代理
- * @param {*} edge 
- * @returns 
+ * @param {*} edge
+ * @returns
  */
 
 
@@ -187,9 +187,9 @@ function isEdgeGroupAgent(edge) {
 }
 /**
  * 获得两个节点间的连线列表
- * @param {*} node1 
- * @param {*} node2 
- * @returns 
+ * @param {*} node1
+ * @param {*} node2
+ * @returns
  */
 
 
@@ -212,7 +212,7 @@ function getEdgesBetweenNodes(node1, node2) {
 }
 /**
  * 获得节点间的连线组，连线<=1时返回null
- * @returns 
+ * @returns
  */
 
 
@@ -232,7 +232,7 @@ function getEdgeGroupByNodes(node1, node2) {
 }
 /**
  * 获得节点间的连线组，连线<=1时返回null
- * @returns 
+ * @returns
  */
 
 
@@ -241,7 +241,7 @@ function getEdgeGroupByNodeTags(dataModel, nodeTag1, nodeTag2) {
   var node2 = dataModel.getDataByTag(nodeTag2);
 
   if (!node1 || !node2) {
-    console.warn('getEdgeGroupByNodes 未找到节点', {
+    console.warn("getEdgeGroupByNodes 未找到节点", {
       node1: node1,
       node2: node2,
       nodeTag1: nodeTag1,
@@ -328,7 +328,7 @@ function getGroupChildren(group) {
 
 
   return group.getChildren().getArray().filter(function (node) {
-    return node._layer !== 'container_blank';
+    return node._layer !== "container_blank";
   });
 }
 /**
@@ -361,7 +361,7 @@ function getGroupChildrenData(group) {
 function setElementRuntimeStyle(element, name, value) {
   var _extends2;
 
-  var prevRuntimeStyle = element.a('runtimeStyles') || {};
+  var prevRuntimeStyle = element.a("runtimeStyles") || {};
   var runtimeStyle = (0, _extends3["default"])({}, prevRuntimeStyle, (_extends2 = {}, _extends2[name] = value, _extends2)); // if (prevRuntimeStyle[name] === undefined && value === undefined) {
   //   return
   // }
@@ -370,7 +370,7 @@ function setElementRuntimeStyle(element, name, value) {
     runtimeStyle[name] = undefined; // delete runtimeStyle[name]
   }
 
-  element.a('runtimeStyles', runtimeStyle);
+  element.a("runtimeStyles", runtimeStyle);
 }
 /**
  * 判断拓扑图是否存在元素
@@ -384,7 +384,7 @@ function isExistedElement(htTopo, dataModel, data) {
 
 
   var element = getElements(dataModel).find(function (item) {
-    return data.tag && item.a('tag') === data.tag;
+    return data.tag && item.a("tag") === data.tag;
   });
 
   if (element) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@riil-frontend/component-topology",
-  "version": "9.0.0-a.20",
+  "version": "9.0.0-a.21",
   "description": "拓扑",
   "scripts": {
     "start": "build-scripts start",
@@ -116,6 +116,6 @@
     "access": "public"
   },
   "license": "MIT",
-  "homepage": "https://unpkg.com/@riil-frontend/component-topology@9.0.0-a.20/build/index.html",
+  "homepage": "https://unpkg.com/@riil-frontend/component-topology@9.0.0-a.21/build/index.html",
   "gitHead": "2da19ffccbb7ca60a8acf396e39f542c68bb33f5"
 }