@riil-frontend/component-topology 9.0.0-a.22 → 9.0.0-a.24

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

@@ -42,44 +42,51 @@ var _CiCache = _interopRequireDefault(require("../cache/CiCache"));
 
 /**
  * 是否关键链路
- * @param {*} link 
- * @returns 
+ * @param {*} link
+ * @returns
  */
 function isCrucialLink(link) {
-  return !!link.attributes['network_link.is_crucial'];
+  return !!link.attributes["network_link.is_crucial"];
 }
 /**
  * 是否出口链路
- * @param {*} link 
- * @returns 
+ * @param {*} link
+ * @returns
  */
 
 
 function isExitLink(link) {
-  return (link === null || link === void 0 ? void 0 : link.attributes) && !(link !== null && link !== void 0 && link.attributes['destination_id']);
+  return (link === null || link === void 0 ? void 0 : link.attributes) && !(link !== null && link !== void 0 && link.attributes["destination_id"]);
 }
 
 function mergeLinksData(links, linkCis, nodes, interfaceCiMap, interfaceDoc) {
-  var linkCiMap = (0, _keyBy["default"])(links, 'id');
+  var linkCiMap = (0, _keyBy["default"])(links, "id");
   return links.map(function (link) {
     var _interfaceCiMap$attri, _interfaceCiMap$attri2;
 
     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"];
+    });
+    var target = link.target; // 目的端为ip节点
+
+    if (attributes["destination_type"] === "ip") {
+      target = "ip:" + attributes["network_link.destination_ipv4"];
+    } // 翻译
+
 
     return (0, _extends2["default"])({}, link, {
+      target: target,
       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
         },
         // 源/目的接口类型
@@ -87,10 +94,10 @@ function mergeLinksData(links, linkCis, nodes, interfaceCiMap, interfaceDoc) {
         destination_type_object: interfaceDoc[attributes.destination_type],
         // 源/目的接口
         source_id_object: {
-          displayName: (_interfaceCiMap$attri = interfaceCiMap[attributes.source_id]) === null || _interfaceCiMap$attri === void 0 ? void 0 : _interfaceCiMap$attri.attributes['display_name']
+          displayName: (_interfaceCiMap$attri = interfaceCiMap[attributes.source_id]) === null || _interfaceCiMap$attri === void 0 ? void 0 : _interfaceCiMap$attri.attributes["display_name"]
         },
         destination_id_object: {
-          displayName: (_interfaceCiMap$attri2 = interfaceCiMap[attributes.destination_id]) === null || _interfaceCiMap$attri2 === void 0 ? void 0 : _interfaceCiMap$attri2.attributes['display_name']
+          displayName: (_interfaceCiMap$attri2 = interfaceCiMap[attributes.destination_id]) === null || _interfaceCiMap$attri2 === void 0 ? void 0 : _interfaceCiMap$attri2.attributes["display_name"]
         }
       })
     });
@@ -130,7 +137,7 @@ function _getLinksDetail() {
             }), linkCis.map(function (item) {
               return item.attributes.destination_type;
             })))).filter(function (item) {
-              return item !== 'ip';
+              return item !== "ip";
             });
             _context.next = 7;
             return _CiCache["default"].load(interfaceIds);
@@ -174,10 +181,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;
 
@@ -194,25 +201,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);
         }
       }
     });
@@ -229,7 +236,7 @@ var mergeExportLinkData = function mergeExportLinkData(props) {
   var linkData = (0, _extends2["default"])({}, link, {
     name: attrObj.name,
     source: attrObj["network_link.source_device_id"],
-    target: attrObj.destination_type === 'ip' ? target.getTag() : attrObj["network_link.destination_device_id"],
+    target: attrObj.destination_type === "ip" ? target.getTag() : attrObj["network_link.destination_device_id"],
     operation: attrObj.operation,
     interfaceSource: attrObj["source_id"],
     interfaceTarget: attrObj["destination_id"],

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

@@ -347,22 +347,27 @@ function _default(topoApp) {
                         layout: (0, _topoData2.getLayoutId)(group.layout),
                         resources: (0, _topoData2.resToConditions)(group.resources)
                       });
-                    }); // rlog.debug("getTopoByConditions--------", viewConditions, groupInfo);
+                    });
+
+                    _rlog["default"].debug("getTopoByConditions--------", viewConditions, groupInfo);
 
-                    _context4.next = 5;
+                    _context4.next = 6;
                     return topoApp.serverApi.getTopoDataByResource(topoId, viewConditions, groupInfo, exportLinkIdList, ipNodes);
 
-                  case 5:
+                  case 6:
                     data = _context4.sent;
-                    _context4.next = 8;
+
+                    _rlog["default"].debug("getTopoByConditions--------data", data);
+
+                    _context4.next = 10;
                     return (0, _getTopoData.buildData)(data);
 
-                  case 8:
+                  case 10:
                     data = _context4.sent;
-                    _context4.next = 11;
+                    _context4.next = 13;
                     return Promise.all([(0, _getTopoData.addLinkData)(data), topoApp.ciTyeCache.getCiTypeMap((0, _topoData.getCiTypes)(data)), dispatch.customIcon.loadCustomIcons()]);
 
-                  case 11:
+                  case 13:
                     _yield$Promise$all = _context4.sent;
                     dataWithLinkDetail = _yield$Promise$all[0];
                     _combTopoData = (0, _topoData.combTopoData)({
@@ -389,7 +394,7 @@ function _default(topoApp) {
                       topoDataTrans: topoDataTrans
                     });
 
-                  case 19:
+                  case 21:
                   case "end":
                     return _context4.stop();
                 }

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/services/topo/basic.js

@@ -428,17 +428,17 @@ var _default = (0, _extends2["default"])({
   */
   getTopoData: function getTopoData(id) {
     return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee12() {
-      var _result$nodes, _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, _exitLinkUtil.processExitLink)((0, _extends2["default"])({}, result, {
                 nodes: (_result$nodes = result.nodes) !== null && _result$nodes !== void 0 ? _result$nodes : [],
@@ -449,20 +449,12 @@ var _default = (0, _extends2["default"])({
                 })
               })));
 
-            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);
     }))();
   },
 
@@ -505,7 +497,7 @@ var _default = (0, _extends2["default"])({
                     ciType: 'network_link'
                   });
                 })
-              })));
+              }), obj.groups));
 
             case 7:
             case "end":
@@ -544,10 +536,7 @@ var _default = (0, _extends2["default"])({
 
               obj = prepareGroupParams(newGroups);
               _context14.next = 6;
-              return _componentTopologyUtils.request.post(API_ROOT + "/resource/" + id, (0, _extends2["default"])({}, otherConfig, obj, {
-                exportLinkIdList: [] // 传空数组清空
-
-              }));
+              return _componentTopologyUtils.request.post(API_ROOT + "/resource/" + id, (0, _extends2["default"])({}, otherConfig, obj));
 
             case 6:
               return _context14.abrupt("return", _context14.sent);

package/lib/networkTopo/utils/exitLinkUtil.js

@@ -75,57 +75,71 @@ function isUniqueIp(dataModel, ip, nodeElement) {
 
 function processExitLink(topoData) {
   var nodes = topoData.nodes,
-      links = topoData.links;
-  var serialize = (0, _extends2["default"])({}, getHtSerialize(topoData.serialize));
+      links = topoData.links; // 出口链路目的端设置为IP节点或者ping资源节点id
 
-  if (!serialize) {
-    return topoData;
-  } // 历史数据升级
+  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);
-  }); // 出口链路目的端设置为IP节点或者ping资源节点id
+    return upgradeExitLinkTarget(link, serialize);
+  }); // 历史数据适配：同IP节点关联多个不同IP的链路、分级拓扑。target匹配不到元素时，根据序列化匹配
 
-  var newLinks = links.map(function (link) {
-    if (!isExitLink(link) || link.target && nodes.find(function (node) {
-      return node.id === link.target;
-    })) {
-      return link;
-    }
+  newLinks = upgradeLinkTargetNotExisted(links); // IP节点构造为node。如果有相同ip的ping资源和图片节点，图片节点消失（不构造）
 
-    var destinationIp = link.attributes['network_link.destination_ipv4'];
-    var pingNode = findPingNode(nodes, destinationIp); // 出口链路目的端设置为IP节点或者ping资源节点id
+  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 target = pingNode ? pingNode.id : "ip:" + destinationIp; // 历史数据适配：同IP节点关联多个不同IP的链路、分级拓扑。target匹配不到元素时，根据序列化匹配
+      var destinationIp = link.attributes['network_link.destination_ipv4'];
+      var pingNode = findPingNode(nodes, destinationIp); // 出口链路目的端设置为IP节点或者ping资源节点id
 
-    var targetSerialize = findElementSerializeById(serialize, target);
+      var target = link.target; // 历史数据适配：同IP节点关联多个不同IP的链路、分级拓扑。target匹配不到元素时，根据序列化匹配
 
-    if (!targetSerialize) {
-      var linkSerialize = findElementSerializeById(serialize, link.id);
+      var targetSerialize = findElementSerializeById(serialize, target);
 
-      if (linkSerialize) {
-        // 根据链路序列化数据找目的端节点
-        // eslint-disable-next-line no-underscore-dangle
-        var targetNodeSerialize = serialize.d.find(function (item) {
-          return item.i === linkSerialize.p.target.__i;
-        });
+      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;
+          if (targetNodeSerialize) {
+            target = targetNodeSerialize.p.tag;
+          }
         }
       }
-    }
 
-    return (0, _extends2["default"])({}, link, {
-      target: target
+      return (0, _extends2["default"])({}, link, {
+        target: target
+      });
     });
-  }); // IP节点构造为node。如果有相同ip的ping资源和图片节点，图片节点消失（不构造）
-
-  var ipNodes = getIpNodes();
+    return newLinks;
+  }
 
-  function getIpNodes() {
+  function getIpNodes(serialize, nodes) {
     // 从序列化获取关联的IP
     var ips = serialize.d.filter(function (item) {
       return item.a.bindType === 'ip';
@@ -133,10 +147,10 @@ function processExitLink(topoData) {
       return item.a.bindIp;
     }).filter(function (item) {
       return !!item;
-    }).filter(function (ip) {
+    }) // 过滤ping资源对应的ip
+    .filter(function (ip) {
       return !findPingNode(nodes, ip);
-    }); // TODO 过滤ping资源对应的ip
-
+    });
     return ips.map(buildIpNode);
   }
 
@@ -157,7 +171,7 @@ function processExitLink(topoData) {
    */
 
 
-  function upgradeExitLinkTarget(link) {
+  function upgradeExitLinkTarget(link, serialize) {
     var destinationIp = link.attributes['network_link.destination_ipv4'];
     var linkSerialize = findElementSerializeById(serialize, link.id);
 
@@ -176,12 +190,6 @@ function processExitLink(topoData) {
       }
     }
   }
-
-  return (0, _extends2["default"])({}, topoData, {
-    nodes: [].concat(nodes, ipNodes),
-    links: newLinks,
-    serialize: serialize
-  });
 } // 从拓扑数据查找
 
 
@@ -189,30 +197,10 @@ 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
+} // 出口链路目的端设置为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;
@@ -228,8 +216,38 @@ function processByConditionResult(topoData) {
       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();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@riil-frontend/component-topology",
-  "version": "9.0.0-a.22",
+  "version": "9.0.0-a.24",
   "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.22/build/index.html",
+  "homepage": "https://unpkg.com/@riil-frontend/component-topology@9.0.0-a.24/build/index.html",
   "gitHead": "2da19ffccbb7ca60a8acf396e39f542c68bb33f5"
 }