@riil-frontend/component-topology 9.0.0-a.8 → 9.0.1

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",
+    isbinding: true,
+    // '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) {
+    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;
+  } 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(newLinks); // 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) {
+            var _linkSerialize$p$targ;
+
+            return item.i === (linkSerialize === null || linkSerialize === void 0 ? void 0 : (_linkSerialize$p$targ = linkSerialize.p.target) === null || _linkSerialize$p$targ === void 0 ? void 0 : _linkSerialize$p$targ.__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) {
+        var _linkSerialize$p$targ2;
+
+        return item.i === (linkSerialize === null || linkSerialize === void 0 ? void 0 : (_linkSerialize$p$targ2 = linkSerialize.p.target) === null || _linkSerialize$p$targ2 === void 0 ? void 0 : _linkSerialize$p$targ2.__i);
+      });
+
+      if (targetNodeSerialize && !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/style.js

@@ -14,6 +14,7 @@ require('@riil-frontend/component-pager/lib/style');
 require('@alifd/next/lib/button/style');
 require('@alifd/next/lib/icon/style');
 require('@alifd/next/lib/loading/style');
+require('@alifd/next/lib/switch/style');
 require('@alifd/next/lib/divider/style');
 require('@riil-frontend/component-no-data-page/lib/style');
 

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

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.8",
+  "version": "9.0.1",
   "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.8/build/index.html",
+  "homepage": "https://unpkg.com/@riil-frontend/component-topology@9.0.1/build/index.html",
   "gitHead": "2da19ffccbb7ca60a8acf396e39f542c68bb33f5"
 }