@riil-frontend/component-topology 12.1.1 → 12.1.3

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

@@ -46,40 +46,34 @@ export function isAggLink(link) {
 
   return (link === null || link === void 0 ? void 0 : (_link$attributes2 = link.attributes) === null || _link$attributes2 === void 0 ? void 0 : _link$attributes2.destination_type) === "network.agg_interface" && (link === null || link === void 0 ? void 0 : (_link$attributes3 = link.attributes) === null || _link$attributes3 === void 0 ? void 0 : _link$attributes3.source_type) === "network.agg_interface";
 }
-export function mergeLinksData(links, linkCis, nodes, interfaceCiMap, interfaceDoc) {
+export function mergeLinksData(links, linkCis, nodes, ciMap, interfaceDoc) {
   var linkCiMap = keyBy(links, "id");
   return links.map(function (link) {
-    var _interfaceCiMap$attri, _interfaceCiMap$attri2;
+    var _ciMap$attributes$net, _ciMap$attributes$net2, _ciMap$attributes$sou, _ciMap$attributes$des;
 
     var linkCi = linkCiMap[link.id];
 
-    var attributes = _extends({}, linkCi === null || linkCi === void 0 ? void 0 : linkCi.attributes);
+    var attributes = _extends({}, linkCi === null || linkCi === void 0 ? void 0 : linkCi.attributes); // 翻译
 
-    var sourceNode = nodes.find(function (node) {
-      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 _extends({}, link, {
       attributes: _extends({}, attributes, {
         // 源/目的设备
         "network_link.source_device_id_object": {
-          displayName: sourceNode === null || sourceNode === void 0 ? void 0 : sourceNode.name
+          displayName: (_ciMap$attributes$net = ciMap[attributes["network_link.source_device_id"]]) === null || _ciMap$attributes$net === void 0 ? void 0 : _ciMap$attributes$net.attributes["display_name"]
         },
         "network_link.destination_device_id_object": {
-          displayName: targetNode === null || targetNode === void 0 ? void 0 : targetNode.name
+          displayName: (_ciMap$attributes$net2 = ciMap[attributes["network_link.destination_device_id"]]) === null || _ciMap$attributes$net2 === void 0 ? void 0 : _ciMap$attributes$net2.attributes["display_name"]
         },
         // 源/目的接口类型
         source_type_object: interfaceDoc[attributes.source_type],
         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: (_ciMap$attributes$sou = ciMap[attributes.source_id]) === null || _ciMap$attributes$sou === void 0 ? void 0 : _ciMap$attributes$sou.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: (_ciMap$attributes$des = ciMap[attributes.destination_id]) === null || _ciMap$attributes$des === void 0 ? void 0 : _ciMap$attributes$des.attributes["display_name"]
         }
       })
     });
@@ -91,7 +85,7 @@ export function getLinksDetail(_x, _x2) {
 
 function _getLinksDetail() {
   _getLinksDetail = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(links, nodes) {
-    var linkCis, interfaceIds, interfaceTypes, interfaceCiMap, interfaceDoc;
+    var linkCis, ciMap, ciIds, interfaceTypes, loadCiMap, interfaceDoc;
     return _regeneratorRuntime.wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
@@ -104,11 +98,20 @@ function _getLinksDetail() {
 
         case 2:
           linkCis = links;
-          interfaceIds = [].concat(linkCis.map(function (item) {
+          ciMap = keyBy(nodes, "id");
+          ciIds = _.uniq([].concat(linkCis.map(function (item) {
+            return item.attributes['network_link.destination_device_id'];
+          }), linkCis.map(function (item) {
+            return item.attributes['network_link.source_device_id'];
+          }), linkCis.map(function (item) {
             return item.attributes.source_id;
           }), linkCis.map(function (item) {
             return item.attributes.destination_id;
-          }));
+          }))).filter(function (item) {
+            return !!item;
+          }).filter(function (item) {
+            return !ciMap[item];
+          });
           interfaceTypes = _.compact(_.uniq([].concat(linkCis.map(function (item) {
             return item.attributes.source_type;
           }), linkCis.map(function (item) {
@@ -116,19 +119,21 @@ function _getLinksDetail() {
           })))).filter(function (item) {
             return item !== "ip";
           });
-          _context.next = 7;
-          return CiCache.load(interfaceIds);
+          _context.next = 8;
+          return CiCache.load(ciIds);
 
-        case 7:
-          interfaceCiMap = _context.sent;
-          _context.next = 10;
+        case 8:
+          loadCiMap = _context.sent;
+          _context.next = 11;
           return CiTypeCache.load(interfaceTypes);
 
-        case 10:
+        case 11:
           interfaceDoc = _context.sent;
-          return _context.abrupt("return", mergeLinksData(links, linkCis, nodes, interfaceCiMap, interfaceDoc));
+          Object.assign(ciMap, loadCiMap); // console.log('getLinksDetail-mergeLinksData', { relations, interfaceIds, interfaceCis, })
+
+          return _context.abrupt("return", mergeLinksData(links, linkCis, nodes, ciMap, interfaceDoc));
 
-        case 12:
+        case 14:
         case "end":
           return _context.stop();
       }

package/es/core/store/models/topoMod.js

@@ -395,7 +395,8 @@ export default function (topoApp) {
                     globalConfig: extraConfig,
                     type: (_result$config = result.config) === null || _result$config === void 0 ? void 0 : _result$config.showType,
                     topoData: topoData,
-                    resAndMetrics: resAndMetrics
+                    resAndMetrics: resAndMetrics,
+                    loading: false
                   });
 
                 case 47:
@@ -425,11 +426,7 @@ export default function (topoApp) {
                   rlog.info('topoMod.initTopoData 初始化拓扑图数据完成. 耗时: ', endTime.diff(startTime, 'seconds', true));
                   topoApp.options.onLoad();
 
-                  _this3.update({
-                    loading: false
-                  });
-
-                case 62:
+                case 61:
                 case "end":
                   return _context4.stop();
               }

package/es/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/EventsCard.js

@@ -10,11 +10,11 @@ import Link from "../../../../../../../components/Link";
 import service from "../../../../../../services/overview";
 import styles from "./index.module.scss";
 import { getHistory } from '@riil-frontend/component-topology-utils';
+import loglevel from 'loglevel';
 
 function formatUrl(url) {
   var _window, _window$location;
 
-  console.log(url);
   var prefix = '/default/pagecenter';
 
   if (((_window = window) === null || _window === void 0 ? void 0 : (_window$location = _window.location) === null || _window$location === void 0 ? void 0 : _window$location.pathname.indexOf(prefix)) === 0 && (url === null || url === void 0 ? void 0 : url.indexOf(prefix)) === 0) {
@@ -28,12 +28,14 @@ function EventsCard(props) {
   var alarmRiskList = props.alarmRiskList,
       closeDetailDrawer = props.closeDetailDrawer,
       onHandleAlarm = props.onHandleAlarm;
+  var log = loglevel.getLogger('topo');
 
   var jumpTo = function jumpTo(url) {
     closeDetailDrawer();
 
     if (topo.viewProps.jumpto) {
-      topo.viewProps.jumpto(formatUrl(url));
+      log.debug('formatUrl(url)', url);
+      topo.viewProps.jumpto(url);
     } else {
       getHistory().push(formatUrl(url));
     }

package/es/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/ResourceOverview.js

@@ -883,7 +883,8 @@ export default function ResourceOverview(props) {
       return item.code;
     }),
     getOverviewConfig: resourceOverviewProps.getOverviewConfig,
-    saveOverviewConfig: resourceOverviewProps.saveOverviewConfig
+    saveOverviewConfig: resourceOverviewProps.saveOverviewConfig,
+    jumpto: topo.viewProps.jumpto
   }) : /*#__PURE__*/React.createElement(BlockBox, {
     headerTitle: "\u5173\u952E\u6307\u6807",
     headerExtra: /*#__PURE__*/React.createElement(Configurator, {

package/es/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/components/LinkTopo/LinkTopo.js

@@ -7,7 +7,8 @@ import styles from "./LinkTopo.module.scss";
 export default function LinkTopo(props) {
   var data = props.data,
       linkMetricCodes = props.linkMetricCodes,
-      openFlow = props.openFlow;
+      openFlow = props.openFlow,
+      jumpto = props.jumpto;
   var metricData = useMetricPolling({
     linkCi: data,
     linkMetricCodes: linkMetricCodes
@@ -33,7 +34,7 @@ export default function LinkTopo(props) {
     data: data // 链路ci数据
     ,
     isNarrow: true,
-    jumpto: getHistory().push
+    jumpto: jumpto || getHistory().push
   }, metricData, {
     openFlow: openFlow
   })));

package/es/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/components/LinkTopo/LinkTopoCard.js

@@ -13,7 +13,8 @@ export default function LinkTopoCard(props) {
       defaultCols = props.defaultCols,
       metricCol = props.metricCol,
       metricColChange = props.metricColChange,
-      metricCodes = props.metricCodes; // eslint-disable-next-line camelcase
+      metricCodes = props.metricCodes,
+      jumpto = props.jumpto; // eslint-disable-next-line camelcase
 
   var supportTemplates = (data === null || data === void 0 ? void 0 : (_data$attributes = data.attributes) === null || _data$attributes === void 0 ? void 0 : _data$attributes.support_templates) || ''; // 该资源监控模板
 
@@ -104,6 +105,7 @@ export default function LinkTopoCard(props) {
     linkMetricCodes: openFlow && openFlow.name == '查看流量构成' ? metricCodes : metricCodes.filter(function (i) {
       return i != 'netDelayRatio' && i != 'retansRatio';
     }),
-    openFlow: openFlow
+    openFlow: openFlow,
+    jumpto: jumpto
   }));
 }

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

@@ -1,7 +1,5 @@
-import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/objectWithoutPropertiesLoose";
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _extends from "@babel/runtime/helpers/extends";
-var _excluded = ["groups", "resources"];
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import { request } from '@riil-frontend/component-topology-utils';
 import { rlog } from '@riil-frontend/component-topology-utils';
@@ -9,6 +7,7 @@ import blackList from "./blacklist";
 import { TOPO_API_ROOT } from "./constants";
 import { getBatchCi as _getBatchCi, getBatchCiMetric as _getBatchCiMetric } from "../model";
 import { processByConditionResult, processExitLink } from "../../utils/exitLinkUtil";
+import * as relateTopoDataUtil from "../../utils/relateTopoDataUtil";
 var API_ROOT = TOPO_API_ROOT;
 /**
  * 拓扑图（看做一个容器）的“父容器”ID
@@ -49,7 +48,7 @@ function prepareResourceParams(conditions, query) {
   return {
     dynamicCondition: dynamicCondition,
     fixedConditionIdList: (staticRes || []).filter(function (ciId) {
-      return !ciId.startsWith('ip:');
+      return !ciId.includes(':');
     }),
     linkIps: (staticRes || []).filter(function (ciId) {
       return ciId.startsWith('ip:');
@@ -98,7 +97,8 @@ function prepareGroupParams(modifiedGroups) {
     };
   }).filter(Boolean);
   return {
-    groups: groups
+    groups: groups,
+    relateTopoIdList: relateTopoDataUtil.getRelateTopoIdListFromConfig(modifiedGroups)
   };
 }
 
@@ -389,16 +389,20 @@ export default _extends({
 
           case 2:
             result = _context12.sent;
-            return _context12.abrupt("return", processExitLink(_extends({}, result, {
+            result = _extends({}, 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 _extends({}, item, {
                   ciType: 'network_link'
                 });
-              })
-            })));
+              }),
+              serialize: result.serialize ? JSON.parse(result.serialize) : undefined
+            });
+            result = relateTopoDataUtil.processBothTopoData(result);
+            result = processExitLink(result);
+            return _context12.abrupt("return", result);
 
-          case 4:
+          case 7:
           case "end":
             return _context12.stop();
         }
@@ -417,7 +421,7 @@ export default _extends({
     return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee13() {
       var _result$nodes2, _result$links2;
 
-      var data, obj, result;
+      var data, params, result;
       return _regeneratorRuntime.wrap(function _callee13$(_context13) {
         while (1) switch (_context13.prev = _context13.next) {
           case 0:
@@ -431,22 +435,28 @@ export default _extends({
               });
             }
 
-            obj = prepareGroupParams(data);
+            params = prepareGroupParams(data);
             _context13.next = 5;
-            return request.post(API_ROOT + "/structure/byCondition/" + id, _extends({}, obj));
+            return request.post(API_ROOT + "/structure/byCondition/" + id, params);
 
           case 5:
             result = _context13.sent;
-            return _context13.abrupt("return", processByConditionResult(_extends({}, result, {
+            result = _extends({}, 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 _extends({}, item, {
                   ciType: 'network_link'
                 });
               })
-            }), obj.groups));
+            });
+            result = relateTopoDataUtil.processByConditionTopoData({
+              data: result,
+              config: data
+            });
+            result = processByConditionResult(result, params.groups);
+            return _context13.abrupt("return", result);
 
-          case 7:
+          case 10:
           case "end":
             return _context13.stop();
         }
@@ -463,11 +473,11 @@ export default _extends({
   */
   bindResourceToTopo: function bindResourceToTopo(id, config) {
     return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee14() {
-      var groups, resources, otherConfig, newGroups, obj;
+      var groups, resources, newGroups, obj;
       return _regeneratorRuntime.wrap(function _callee14$(_context14) {
         while (1) switch (_context14.prev = _context14.next) {
           case 0:
-            groups = config.groups, resources = config.resources, otherConfig = _objectWithoutPropertiesLoose(config, _excluded);
+            groups = config.groups, resources = config.resources;
             newGroups = Array.isArray(groups) ? groups : [];
 
             if (resources) {
@@ -481,7 +491,7 @@ export default _extends({
 
             obj = prepareGroupParams(newGroups);
             _context14.next = 6;
-            return request.post(API_ROOT + "/resource/" + id, _extends({}, otherConfig, obj));
+            return request.post(API_ROOT + "/resource/" + id, obj);
 
           case 6:
             return _context14.abrupt("return", _context14.sent);

package/es/networkTopo/utils/exitLinkUtil.js

@@ -36,11 +36,11 @@ export function buildIpNode(ip) {
 }
 
 function getHtSerialize(serialize) {
-  if (serialize) {
+  if (serialize && typeof serialize === 'string') {
     return JSON.parse(serialize);
   }
 
-  return null;
+  return serialize;
 }
 
 function isExitLink(link) {

package/es/networkTopo/utils/relateTopoDataUtil.js

@@ -0,0 +1,144 @@
+import _extends from "@babel/runtime/helpers/extends";
+// 关联拓扑数据
+
+/**
+ * 升级历史数据：子拓扑节点序列化数据
+ * 构造子拓扑节点
+ * 构造子拓扑链路
+ * @param {*} ctx 
+ */
+export function processBothTopoData(topoData) {
+  var nodes = topoData.nodes,
+      links = topoData.links;
+  var serialize = upgradeSerializeOldTopoNode(topoData.serialize);
+  return _extends({}, topoData, {
+    nodes: [].concat(nodes, buildTopoNodeDatasFromSerialize(serialize)),
+    links: buildTopoLinks(links),
+    serialize: serialize
+  });
+}
+/**
+ * 构造子拓扑节点
+ * 构造子拓扑链路
+ * @param {*} ctx 
+ */
+
+export function processByConditionTopoData(ctx) {
+  var data = ctx.data,
+      config = ctx.config;
+  var nodes = data.nodes,
+      links = data.links;
+  return _extends({}, data, {
+    nodes: [].concat(nodes, buildTopoNodeDatas(config)),
+    links: buildTopoLinks(links)
+  });
+}
+export function getRelateTopoIdListFromConfig(groups) {
+  var relateTopoIdList = [];
+  groups.forEach(function (g) {
+    g.resources["static"].filter(function (ciId) {
+      return ciId.startsWith('topo:');
+    }).map(function (ciId) {
+      return ciId.replace('topo:', '');
+    }).map(function (topoId) {
+      if (!relateTopoIdList.includes(topoId)) {
+        relateTopoIdList.push(topoId);
+      }
+    });
+  });
+  return relateTopoIdList;
+}
+export function buildTopoNode(topoId) {
+  return {
+    id: "topo:" + topoId,
+    //   name: ,
+    bindType: "topo",
+    // 绑定资源类型。关联资源 值为空，关联IP ip
+    bindTopo: topoId,
+    // TODO 所属区域，从序列化拿
+    // 'groupId': null,
+    // 'groupTag': null,
+    // 'attributes': [],
+    // 'metrics': [],
+    type: "node",
+    isbinding: true,
+    // 'dtype': 'device'
+    operation: "delete"
+  };
+}
+
+function buildTopoLinks(links) {
+  return links.map(function (link) {
+    return _extends({}, link, {
+      "source": link.sourceType ? link.sourceType + ':' + link.source : link.source,
+      "target": link.targetType ? link.targetType + ':' + link.target : link.target
+    });
+  });
+}
+/**
+ * 升级历史数据：子拓扑节点序列化数据
+ * @param {*} serialize 
+ */
+
+
+function upgradeSerializeOldTopoNode(serialize) {
+  if (serialize) {
+    var isOldTopoNode = function isOldTopoNode(ele) {
+      return isTopoNode(ele) && !ele.p.tag;
+    };
+
+    var oldTopoNodes = serialize.d.filter(isOldTopoNode);
+    oldTopoNodes.forEach(function (node) {
+      var _node$a;
+
+      var topoId = (_node$a = node.a) === null || _node$a === void 0 ? void 0 : _node$a.bindTopo;
+      node.a = _extends({}, node.a, buildTopoNode(topoId));
+      node.p.tag = "topo:" + topoId;
+    });
+  }
+
+  return serialize;
+}
+
+function isTopoNode(ele) {
+  var _ele$a;
+
+  return !!((_ele$a = ele.a) !== null && _ele$a !== void 0 && _ele$a.bindTopo);
+}
+
+function buildTopoNodeDatasFromSerialize(serialize) {
+  if (!serialize) {
+    return [];
+  }
+
+  var topoNodes = serialize.d.filter(isTopoNode);
+  var topoNodeDatas = topoNodes.map(function (node) {
+    var _node$a2;
+
+    var topoId = (_node$a2 = node.a) === null || _node$a2 === void 0 ? void 0 : _node$a2.bindTopo;
+    return buildTopoNode(topoId);
+  });
+  return topoNodeDatas;
+}
+
+function buildTopoNodeDatas(config) {
+  var topoNodeDatas = [];
+  config.forEach(function (g) {
+    g.resources["static"].filter(function (ciId) {
+      return ciId.startsWith('topo:');
+    }).map(function (ciId) {
+      return ciId.replace('topo:', '');
+    }).map(function (topoId) {
+      topoNodeDatas.push(_extends({}, buildTopoNode(topoId), {
+        // 添加资源拓扑节点消失的问题
+        'groupId': g.id,
+        'groupTag': g.tag
+      }));
+    });
+  });
+  return topoNodeDatas;
+}
+
+function getRelateTopoIdsFromSerialize(serialize) {
+  return serialize;
+}

package/es/utils/ResourceConfigUtil.js

@@ -41,23 +41,8 @@ function getResourceConfigFromHt(topo) {
   return {
     layers: sortBy(layers, 'order'),
     groups: groups,
-    resources: resources,
-    relateTopoIdList: getRelateTopoIdList(dataModel)
+    resources: resources
   };
-} // 查询关联拓扑id列表
-
-
-function getRelateTopoIdList(dataModel) {
-  return getNodes(dataModel).reduce(function (topoIds, node) {
-    var bindType = node.a('bindType');
-    var bindTopo = node.a('bindTopo');
-
-    if (bindType === 'topo' && bindTopo && !topoIds.includes(bindTopo)) {
-      return [].concat(topoIds, [bindTopo]);
-    }
-
-    return topoIds;
-  }, []);
 }
 
 function getLayerDatas(dataModel) {

package/es/utils/htElementUtils.js

@@ -142,7 +142,9 @@ export function getEdgesBetweenNodes(node1, node2) {
     return edges;
   }
 
-  node1Edges.toArray().filter(isValidEdge).forEach(function (edge) {
+  node1Edges.toArray().filter(isValidEdge).filter(function (edge) {
+    return !isEdgeGroupAgent(edge);
+  }).forEach(function (edge) {
     var isEdgeBetweenNodes = edge.getSource().getTag() === node2.getTag() || edge.getTarget().getTag() === node2.getTag();
 
     if (isEdgeBetweenNodes) {