@riil-frontend/component-topology 9.0.0-a.3 → 9.0.0-a.30

package/lib/networkTopo/getTopoData.js

@@ -92,6 +92,7 @@ function _addLinkData() {
 
           case 4:
             networkLinks = _context.sent;
+            console.log("如果是网络链路，补充详情信息", networkLinks);
             otherLinks = links.filter(function (link) {
               return link.ciType !== 'network_link';
             });
@@ -100,7 +101,7 @@ function _addLinkData() {
               linkGroups: []
             }));
 
-          case 7:
+          case 8:
           case "end":
             return _context.stop();
         }

package/lib/networkTopo/models/LinkDynamicStyleExecutor.js

@@ -16,15 +16,15 @@ var _linkUtil = require("../utils/linkUtil");
 // network_link.actual_bandwidth
 function calcEdgeWidth(actualBandwidth) {
   if (!actualBandwidth) {
-    return 2;
+    return 3;
   } else if (actualBandwidth <= 100) {
-    return 2;
-  } else if (actualBandwidth <= 1000) {
     return 3;
-  } else if (actualBandwidth <= 10000) {
+  } else if (actualBandwidth <= 1000) {
     return 4;
-  } else if (actualBandwidth > 10000) {
+  } else if (actualBandwidth <= 10000) {
     return 5;
+  } else if (actualBandwidth > 10000) {
+    return 6;
   }
 }
 

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,40 +428,33 @@ 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;
 
+      var result;
       return _regenerator["default"].wrap(function _callee12$(_context12) {
         while (1) {
           switch (_context12.prev = _context12.next) {
             case 0:
-              _context12.prev = 0;
-              _context12.next = 3;
+              _context12.next = 2;
               return _componentTopologyUtils.request.get(API_ROOT + "/structure/both/" + id);
 
-            case 3:
+            case 2:
               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;
-              _context12.t0 = _context12["catch"](0);
-
-              _rlog["default"].debug('getTopoData-error', _context12.t0);
+              })));
 
-              return _context12.abrupt("return", null);
-
-            case 11:
+            case 4:
             case "end":
               return _context12.stop();
           }
         }
-      }, _callee12, null, [[0, 7]]);
+      }, _callee12);
     }))();
   },
 
@@ -464,9 +465,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 +486,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'
                   });
                 })
-              }));
+              }), obj.groups));
 
             case 7:
             case "end":
@@ -517,12 +517,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) {

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,269 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+exports.__esModule = true;
+exports.buildIpNode = buildIpNode;
+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("bindIp") === 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 = true;
+  console.log("nodes-nodeElement", nodes, nodeElement);
+
+  if (nodeElement) {
+    console.log("nodes-nodeElement---filter", nodes.filter(function (node) {
+      return node.getId() !== (nodeElement === null || nodeElement === void 0 ? void 0 : nodeElement.getId());
+    }));
+    var arr = nodes.filter(function (node) {
+      return node.getId() !== (nodeElement === null || nodeElement === void 0 ? void 0 : nodeElement.getId());
+    }).filter(function (node) {
+      return isPingHtNode(node, ip) || isIpHtNode(node, ip);
+    });
+    isUnique = arr.length === 0;
+    console.log("nodes-nodeElement---filter", arr, isUnique);
+  } else {
+    isUnique = nodes.filter(function (node) {
+      return node.a("ipAddress") === ip;
+    }).length === 0;
+  }
+
+  return isUnique;
+}
+/**
+ * 打开拓扑出口链路处理
+ * @param {*} topoData 
+ * @returns 
+ */
+
+
+function processExitLink(topoData) {
+  var nodes = topoData.nodes,
+      links = topoData.links; // 出口链路目的端设置为IP节点或者ping资源节点id
+
+  var newLinks = updateLinkTarget(links, nodes);
+
+  if (!topoData.serialize) {
+    return (0, _extends2["default"])({}, topoData, {
+      links: newLinks
+    });
+  }
+
+  var serialize = (0, _extends2["default"])({}, getHtSerialize(topoData.serialize)); // 历史数据升级
+
+  links.filter(isExitLink) // 升级V1.4前配置的出口链路目的端节点为IP节点
+  .forEach(function (link) {
+    return upgradeExitLinkTarget(link, serialize);
+  }); // 历史数据适配：同IP节点关联多个不同IP的链路、分级拓扑。target匹配不到元素时，根据序列化匹配
+
+  newLinks = upgradeLinkTargetNotExisted(links); // IP节点构造为node。如果有相同ip的ping资源和图片节点，图片节点消失（不构造）
+
+  var ipNodes = getIpNodes(serialize, nodes);
+  return (0, _extends2["default"])({}, topoData, {
+    nodes: [].concat(nodes, ipNodes),
+    links: newLinks,
+    serialize: serialize
+  }); // 历史数据适配：同IP节点关联多个不同IP的链路、分级拓扑。target匹配不到元素时，根据序列化匹配
+
+  function upgradeLinkTargetNotExisted(links) {
+    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 = link.target; // 历史数据适配：同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
+      });
+    });
+    return newLinks;
+  }
+
+  function getIpNodes(serialize, nodes) {
+    // 从序列化获取关联的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;
+    }) // 过滤ping资源对应的ip
+    .filter(function (ip) {
+      return !findPingNode(nodes, 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, serialize) {
+    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;
+      }
+    }
+  }
+} // 从拓扑数据查找
+
+
+function findPingNode(nodes, ip) {
+  return nodes.find(function (node) {
+    return node.ciType === "ping" && (node.ipAddress || node.attributes.ipv4_address) === ip;
+  });
+} // 出口链路目的端设置为IP节点或者ping资源节点id
+
+
+function updateLinkTarget(links, nodes) {
+  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 newLinks;
+}
+/**
+ * 编辑模式按资源查询拓扑数据处理出口链路target
+ * 1. 出口链路目的端设置为IP节点或者ping资源节点id
+ * 2. IP构造为node节点
+ * FIXME 移到frontend 网络拓扑编辑
+ * @param {*} topoData 
+ * @returns 
+ */
+
+
+function processByConditionResult(topoData, groupConfigs) {
+  var nodes = topoData.nodes,
+      links = topoData.links;
+  var ipNodes = getIpNodes(groupConfigs, nodes); // 出口链路目的端设置为IP节点或者ping资源节点id
+
+  var newLinks = updateLinkTarget(links, nodes);
+  return (0, _extends2["default"])({}, topoData, {
+    nodes: [].concat(nodes, ipNodes),
+    links: newLinks
+  });
+
+  function getIpNodes(groupConfigs, nodes) {
+    var ips = groupConfigs.map(function (g) {
+      return g.condition.linkIps;
+    }).reduce(function (result, groupIps) {
+      return [].concat(result, groupIps);
+    }, []) // 过滤ping资源对应的ip节点
+    .filter(function (ip) {
+      return !findPingNode(nodes, ip);
+    });
+    return ips.map(buildIpNode);
+  }
+}

package/lib/utils/ResourceConfigUtil.js

@@ -13,8 +13,6 @@ var _linkUtils = require("../core/models/utils/linkUtils");
 
 var _clusterUtil = require("./clusterUtil");
 
-var _htElementDataUtil = require("./htElementDataUtil");
-
 var _htElementUtils = require("./htElementUtils");
 
 /**
@@ -118,7 +116,9 @@ function getLayerDatas(dataModel) {
       name: layerElement.s('label'),
       order: layerElement.a('order'),
       resources: {
-        "static": (0, _htElementDataUtil.getLayerChildrenResourceElements)(layerElement).map(function (node) {
+        "static": (0, _htElementUtils.getLayerChildren)(layerElement).filter(function (item) {
+          return !!item.getTag();
+        }).map(function (node) {
           return node.getTag();
         })
       }
@@ -147,7 +147,7 @@ function getGroupConfigByElement(groupElement) {
     name: groupElement.a('name'),
     order: groupElement.a('order'),
     resources: {
-      "static": (0, _htElementDataUtil.getGroupChildrenResourceElements)(groupElement).filter(function (node) {
+      "static": (0, _htElementUtils.getGroupChildren)(groupElement).filter(function (node) {
         return !!node.getTag();
       }).map(function (node) {
         return node.getTag();

package/lib/utils/htElementDataUtil.js

@@ -2,8 +2,6 @@
 
 exports.__esModule = true;
 exports.getAllEdgeResourceIds = void 0;
-exports.getGroupChildrenResourceElements = getGroupChildrenResourceElements;
-exports.getLayerChildrenResourceElements = getLayerChildrenResourceElements;
 exports.isEdge = isEdge;
 exports.isGroup = isGroup;
 exports.isLayer = isLayer;
@@ -46,14 +44,6 @@ function isResourceNodeElement(element) {
   return (htElementUtils.isGroup(element) || htElementUtils.isNode(element)) && isResourceElement(element);
 }
 
-function getGroupChildrenResourceElements(element) {
-  return (0, htElementUtils.getGroupChildren)(element).filter(isResourceElement);
-}
-
-function getLayerChildrenResourceElements(layerElement) {
-  return (0, htElementUtils.getLayerChildren)(layerElement).filter(isResourceElement);
-}
-
 var getAllEdgeResourceIds = function getAllEdgeResourceIds(dm) {
   return (0, htElementUtils.getEdges)(dm).filter(function (node) {
     return !!node.getTag();