@riil-frontend/component-topology 13.0.0-dev.1 → 13.0.0-dev.2

package/lib/core/viewer/components/plugins/ElementDetailDrawer/hooks/useElementDetailManager.js

@@ -9,6 +9,8 @@ var _react = _interopRequireWildcard(require("react"));
 
 var _DefaultDetailContent = _interopRequireDefault(require("../../ResourceDetail/DefaultDetailContent"));
 
+var _htElementUtils = require("../../../../../../utils/htElementUtils");
+
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
@@ -74,9 +76,8 @@ function useElementDetailManager(props) {
   }
 
   function openByHtElement(htElement) {
-    var isEdgeGroupAgent = htElement instanceof ht.Edge && htElement.isEdgeGroupAgent() && !htElement.s('edge.expanded');
     open({
-      id: isEdgeGroupAgent || !htElement.getTag() ? "ht:" + htElement.getId() : htElement.getTag(),
+      id: (0, _htElementUtils.isEdgeGroupAgent)(htElement) || !htElement.getTag() ? "ht:" + htElement.getId() : htElement.getTag(),
       htElement: htElement
     });
   }

package/lib/networkTopo/models/EdgeGroupTagTipBuilder.js

@@ -22,11 +22,11 @@ var EdgeGroupTagTipBuilder = /*#__PURE__*/function () {
 
     var topo = this.topo;
     var dm = this.topo.getDataModel();
-    var edgeGroupsTagsTips = (0, _htElementUtils.getEdgeGroups)(dm).map(function (edgeGroup) {
-      var edge = edgeGroup.getEdges().getArray()[0]; // 获取配置的链路
-
-      var linkId = (0, _edgeGroupTagUtil.getEdgeGroupLinkIdConfig)(edge, topo);
-      var edgeGroupId = [edge.getSourceAgent().getId(), edge.getTargetAgent().getId()];
+    var edgeGroupAgents = (0, _htElementUtils.getEdgeGroupAgents)(dm);
+    var edgeGroupsTagsTips = edgeGroupAgents.map(function (edgeGroupAgent) {
+      // 获取配置的链路
+      var linkId = (0, _edgeGroupTagUtil.getEdgeGroupLinkIdConfig)(edgeGroupAgent, topo);
+      var edgeGroupId = [edgeGroupAgent.getSource().getId(), edgeGroupAgent.getTarget().getId()];
       var data = {
         tags: [],
         tips: []
@@ -37,7 +37,7 @@ var EdgeGroupTagTipBuilder = /*#__PURE__*/function () {
       }
 
       return {
-        htId: edge.getId(),
+        htId: edgeGroupAgent.getId(),
         edgeGroupId: edgeGroupId,
         tags: data.tags,
         tips: data.tips,

package/lib/networkTopo/models/LinkDynamicStyleExecutor.js

@@ -3,14 +3,10 @@
 exports.__esModule = true;
 exports["default"] = void 0;
 
-var _componentTopologyUtils = require("@riil-frontend/component-topology-utils");
-
 var _clusterUtil = require("../../utils/clusterUtil");
 
 var _htElementUtils = require("../../utils/htElementUtils");
 
-var _linkUtil = require("../utils/linkUtil");
-
 // network_link.actual_bandwidth
 function calcEdgeWidth(actualBandwidth) {
   if (!actualBandwidth) {
@@ -61,16 +57,17 @@ var LinkDynamicStyleExecutor = /*#__PURE__*/function () {
   var _proto = LinkDynamicStyleExecutor.prototype;
 
   _proto.execute = function execute() {
-    var _this = this;
+    var _topo$historyManager,
+        _this = this,
+        _topo$historyManager2;
 
     var topo = this.topo;
 
     var _topo$dataModel$getDa = topo.dataModel.getData(),
-        links = _topo$dataModel$getDa.links,
-        linkGroups = _topo$dataModel$getDa.linkGroups;
+        links = _topo$dataModel$getDa.links;
 
     var dataModel = this.topo.getDataModel();
-    topo.historyManager && topo.historyManager.setDisabled(true, '链路动态样式'); // 1、如果连线可见，设置线宽
+    (_topo$historyManager = topo.historyManager) === null || _topo$historyManager === void 0 ? void 0 : _topo$historyManager.setDisabled(true, '链路动态粗细'); // 1、如果连线可见，设置线宽
 
     links.forEach(function (link) {
       var edge = dataModel.getDataByTag(link.id);
@@ -78,63 +75,8 @@ var LinkDynamicStyleExecutor = /*#__PURE__*/function () {
       if (edge) {
         edge.s('edge.width', _this.calcLinkEdgeWidth(link));
       }
-    }); // 2、如果连线组关联链路并可见，设置线宽
-
-    linkGroups.forEach(function (link) {
-      // 聚合链路是连线/连线组，并可以查询到
-      var edge = topo.getDataModel().getDataByTag(link.id);
-
-      if (edge) {
-        edge.s('edge.width', _this.calcLinkEdgeWidth(link));
-        return;
-      } // 聚合链路是连线组（编辑模式还未关联业务信息）
-
-
-      var edgeGroup = (0, _htElementUtils.getEdgeGroupByNodeTags)(dataModel, link.source, link.target);
-
-      if (edgeGroup) {
-        var edgeGroupAgent = edgeGroup.getEdgeGroupAgent(); // 判断是显示的连线组元素
-
-        if (edgeGroupAgent) {
-          edgeGroup.getEdgeGroupAgent().s('edge.width', _this.calcLinkEdgeWidth(link));
-        }
-      } else {
-        _componentTopologyUtils.rlog.warn('动态链路样式执行：未找到聚合链路的ht元素', link);
-      }
-    }); // 3、如果连线组未关联链路并可见，设置线宽。
-
-    var edges = (0, _htElementUtils.getEdges)(dataModel);
-    edges.forEach(function (edge) {
-      try {
-        // 获取两端代理节点
-        var sourceAgent = edge.getSourceAgent();
-        var targetAgent = edge.getTargetAgent();
-        var sourceId = sourceAgent.getTag();
-        var targetId = targetAgent.getTag(); // 查询是否有聚合链路
-
-        var aggLink = linkGroups.find(function (link) {
-          return link.source === sourceId && link.target === targetId || link.target === sourceId && link.source === targetId;
-        }); // 如果连线组未关联链路并可见
-
-        if (!aggLink && edge.isEdgeGroupAgent()) {
-          // 查询两端代理节点（包含子节点）间的子链路列表
-          var sourceCiIds = getChildrenNodeCiIds([sourceAgent]);
-          var targetCiIds = getChildrenNodeCiIds([targetAgent]);
-          var aggLinks = (0, _linkUtil.getLinksBetweenNodes)(linkGroups, sourceCiIds, targetCiIds);
-          var phyLinks = (0, _linkUtil.getLinksBetweenNodes)(links, sourceCiIds, targetCiIds);
-          var linkBetweenNodes = aggLinks.length ? aggLinks : phyLinks; // 如果有子链路，计算线宽并设置
-
-          if (linkBetweenNodes.length) {
-            var edgeWidth = _this.calcEdgeGroupEdgeWidth(linkBetweenNodes);
-
-            edge.s('edge.width', edgeWidth);
-          }
-        }
-      } catch (error) {
-        _componentTopologyUtils.rlog.error('连线组未关联链路并可见，设置线宽：异常', edge, error);
-      }
     });
-    topo.historyManager && topo.historyManager.setDisabled(false, '链路动态样式');
+    (_topo$historyManager2 = topo.historyManager) === null || _topo$historyManager2 === void 0 ? void 0 : _topo$historyManager2.setDisabled(false, '链路动态粗细');
   }
   /**
    * 处理单个连线组切换。有链路时设置

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

@@ -430,7 +430,7 @@ var _default = (0, _extends2["default"])({
   * @param {Array} groups
   * @returns
   */
-  getTopoDataByResource: function getTopoDataByResource(id, resources, groups) {
+  getTopoDataByResource: function getTopoDataByResource(id, resources, groups, relateTopoIdList) {
     return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee13() {
       var _result$nodes2, _result$links2;
 
@@ -450,7 +450,9 @@ var _default = (0, _extends2["default"])({
 
             obj = prepareGroupParams(data);
             _context13.next = 5;
-            return _componentTopologyUtils.request.post(API_ROOT + "/structure/byCondition/" + id, (0, _extends2["default"])({}, obj));
+            return _componentTopologyUtils.request.post(API_ROOT + "/structure/byCondition/" + id, (0, _extends2["default"])({}, obj, {
+              relateTopoIdList: relateTopoIdList
+            }));
 
           case 5:
             result = _context13.sent;

package/lib/networkTopo/utils/edgeGroupTagUtil.js

@@ -65,8 +65,8 @@ function getEdgeGroupLinkIdConfig(edgeGroup, topo) {
 }
 
 function getEdgeGroupConfigId(edgeGroup) {
-  var sourceNode = edgeGroup.getSourceAgent();
-  var targetNode = edgeGroup.getTargetAgent();
+  var sourceNode = edgeGroup.getSource();
+  var targetNode = edgeGroup.getTarget();
   var sourceId = sourceNode.a('uuid');
   var targetId = targetNode.a('uuid');
   return [sourceId, targetId].sort().join(',');

package/lib/networkTopo/utils/exitLinkUtil.js

@@ -251,9 +251,10 @@ function updateLinkTarget(links, nodes) {
 
 
 function processByConditionResult(topoData, groupConfigs) {
-  var nodes = topoData.nodes,
+  var groups = topoData.groups,
+      nodes = topoData.nodes,
       links = topoData.links;
-  var ipNodes = getIpNodes(groupConfigs, nodes); // 出口链路目的端设置为IP节点或者ping资源节点id
+  var ipNodes = getIpNodes(groupConfigs, topoData); // 出口链路目的端设置为IP节点或者ping资源节点id
 
   var newLinks = updateLinkTarget(links, nodes);
   return (0, _extends2["default"])({}, topoData, {
@@ -261,15 +262,26 @@ function processByConditionResult(topoData, groupConfigs) {
     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);
+  function getIpNodes(groupConfigs, _ref) {
+    var groups = _ref.groups,
+        nodes = _ref.nodes;
+    var ipNodes = [];
+    groupConfigs.forEach(function (g) {
+      g.condition.linkIps // 过滤ping资源对应的ip节点
+      .filter(function (ip) {
+        return !findPingNode(nodes, ip);
+      }).map(function (ip) {
+        var topoGroup = g.topoGroup;
+        var group = groups.find(function (item) {
+          return item.id === topoGroup.id || item.tag === topoGroup.tag;
+        });
+        ipNodes.push((0, _extends2["default"])({}, buildIpNode(ip), {
+          // 解决区域里有ip添加资源ip消失的问题
+          'groupId': group === null || group === void 0 ? void 0 : group.id,
+          'groupTag': group === null || group === void 0 ? void 0 : group.tag
+        }));
+      });
     });
-    return ips.map(buildIpNode);
+    return ipNodes;
   }
 }

package/lib/networkTopo/utils/relateTopoDataUtil.js

@@ -0,0 +1,49 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+exports.__esModule = true;
+exports.processBothTopoData = processBothTopoData;
+exports.processByConditionTopoData = processByConditionTopoData;
+
+var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
+
+// 关联拓扑数据
+
+/**
+ * 升级历史数据：子拓扑节点序列化数据
+ * 构造子拓扑节点
+ * 构造子拓扑链路
+ * @param {*} ctx 
+ */
+function processBothTopoData(ctx) {
+  var topoData = ctx.topoData;
+  var serialize = upgradeSerializeRelateTopoNode(topoData.serialize);
+  return (0, _extends2["default"])({}, topoData, {
+    serialize: serialize
+  });
+}
+/**
+ * 构造子拓扑节点
+ * 构造子拓扑链路
+ * @param {*} ctx 
+ */
+
+
+function processByConditionTopoData(ctx) {
+  var topoData = ctx.topoData;
+  return (0, _extends2["default"])({}, topoData);
+}
+/**
+ * 升级历史数据：子拓扑节点序列化数据
+ * @param {*} serialize 
+ */
+
+
+function upgradeSerializeRelateTopoNode(serialize) {
+  return serialize;
+}
+
+function getRelateTopoIdsFromSerialize(serialize) {
+  return serialize;
+}

package/lib/style.js

@@ -1,7 +1,7 @@
 require('@riil-frontend/component-topology-graph/lib/style');
 require('@alifd/next/lib/box/style');
-require('@riil-frontend/component-topology-utils/lib/style');
 require('@alifd/next/lib/message/style');
+require('@riil-frontend/component-topology-utils/lib/style');
 require('@riil-frontend/utils/lib/style');
 require('@riil-frontend/component-riil-event-emitter/lib/style');
 require('@alifd/next/lib/menu-button/style');

package/lib/utils/clusterUtil.js

@@ -103,7 +103,7 @@ function isClusterHtElement(element) {
 }
 
 function isClusterMemberHtElement(element) {
-  return element && element.getParent() && isClusterHtElement(element.getParent());
+  return (element === null || element === void 0 ? void 0 : element.getParent()) && isClusterHtElement(element.getParent());
 }
 /**
  * 集群无权限时收起
@@ -140,7 +140,7 @@ function upgradeV103GraphClusterNode(topo, topoData) {
     var topoDataTrans = (0, _utils.transformTopoElements)(topoData);
     var dm = topo.getDataModel();
     var unExistedList = topoDataTrans.filter(function (data) {
-      return !(0, _htElementUtils.isExistedElement)(topo.getHtTopo(), dm, data);
+      return !(0, _htElementUtils.containsElement)(dm, data);
     });
 
     if (!unExistedList.length) {

package/lib/utils/htElementUtils.js

@@ -3,11 +3,9 @@
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 
 exports.__esModule = true;
+exports.containsElement = containsElement;
 exports.getEdgeDatas = getEdgeDatas;
 exports.getEdgeGroupAgents = getEdgeGroupAgents;
-exports.getEdgeGroupByNodeTags = getEdgeGroupByNodeTags;
-exports.getEdgeGroupByNodes = getEdgeGroupByNodes;
-exports.getEdgeGroups = getEdgeGroups;
 exports.getEdges = getEdges;
 exports.getEdgesBetweenNodes = getEdgesBetweenNodes;
 exports.getElements = getElements;
@@ -27,8 +25,7 @@ exports.getNodes = getNodes;
 exports.getNodesByGroupIdOrTag = getNodesByGroupIdOrTag;
 exports.isEdge = isEdge;
 exports.isEdgeGroupAgent = isEdgeGroupAgent;
-exports.isEdgeGroupExpanded = isEdgeGroupExpanded;
-exports.isExistedElement = isExistedElement;
+exports.isEdgeVisible = isEdgeVisible;
 exports.isGroup = isGroup;
 exports.isLayer = isLayer;
 exports.isNode = isNode;
@@ -172,10 +169,6 @@ function getNodeData(element) {
 function getEdges(dataModel) {
   return getElements(dataModel).filter(isValidEdge);
 }
-
-function isEdgeGroupExpanded(edge) {
-  return isEdge(edge) && edge.getEdgeGroup() && !!edge.s("edge.expanded");
-}
 /**
  * 是否连线组代理
  * @param {*} edge
@@ -184,7 +177,11 @@ function isEdgeGroupExpanded(edge) {
 
 
 function isEdgeGroupAgent(edge) {
-  return isEdge(edge) && edge.getEdgeGroup() && edge.isEdgeGroupAgent();
+  return isEdge(edge) && edge.a('x.edgegroup.isEdgeGroup');
+}
+
+function isEdgeVisible(edge) {
+  return edge.s('2d.visible') || edge.s('2d.visible') === undefined;
 }
 /**
  * 获得两个节点间的连线列表
@@ -212,66 +209,20 @@ function getEdgesBetweenNodes(node1, node2) {
   return edges;
 }
 /**
- * 获得节点间的连线组，连线<=1时返回null
- * @returns
- */
-
-
-function getEdgeGroupByNodes(node1, node2) {
-  var htEdgeGroup = null;
-  getEdgesBetweenNodes(node1, node2).forEach(function (edge) {
-    if (!htEdgeGroup) {
-      htEdgeGroup = edge.getEdgeGroup();
-    }
-  });
-
-  if (!htEdgeGroup) {
-    return null;
-  }
-
-  return new _EdgeGroup["default"](htEdgeGroup);
-}
-/**
- * 获得节点间的连线组，连线<=1时返回null
- * @returns
+ * 获得连线组连线列表
+ * @param {*} dataModel 
+ * @returns 
  */
 
 
-function getEdgeGroupByNodeTags(dataModel, nodeTag1, nodeTag2) {
-  var node1 = dataModel.getDataByTag(nodeTag1);
-  var node2 = dataModel.getDataByTag(nodeTag2);
-
-  if (!node1 || !node2) {
-    console.warn("getEdgeGroupByNodes 未找到节点", {
-      node1: node1,
-      node2: node2,
-      nodeTag1: nodeTag1,
-      nodeTag2: nodeTag2
-    });
-    return null;
-  }
-
-  return getEdgeGroupByNodes(node1, node2);
-}
-
-function getEdgeGroups(dataModel) {
-  var edgeGroups = [];
-  getEdges(dataModel).forEach(function (edge) {
-    var group = edge.getEdgeGroup();
-
-    if (group && !edgeGroups.includes(group)) {
-      edgeGroups.push(group);
-    }
-  });
-  return edgeGroups;
-}
-
 function getEdgeGroupAgents(dataModel) {
   return getEdges(dataModel).filter(isEdgeGroupAgent);
 }
 
 function getEdgeDatas(dataModel) {
-  return getEdges(dataModel).map(function (element) {
+  return getEdges(dataModel).filter(function (edge) {
+    return !isEdgeGroupAgent(edge);
+  }).map(function (element) {
     var _element$getSource, _element$getTarget;
 
     return (0, _extends3["default"])({}, element.getAttrObject(), {
@@ -379,10 +330,14 @@ function setElementRuntimeStyle(element, name, value) {
 }
 /**
  * 判断拓扑图是否存在元素
+ * 
+ * @param {*} dataModel 
+ * @param {{id?: string, tag?: string}} data 
+ * @returns 
  */
 
 
-function isExistedElement(htTopo, dataModel, data) {
+function containsElement(dataModel, data) {
   if (dataModel.getDataByTag(data.id)) {
     return true;
   } // 识别区域
@@ -391,34 +346,5 @@ function isExistedElement(htTopo, dataModel, data) {
   var element = getElements(dataModel).find(function (item) {
     return data.tag && item.a("tag") === data.tag;
   });
-
-  if (element) {
-    return true;
-  } // 连线/连线组
-
-
-  var edges = getEdges(dataModel);
-
-  for (var i = 0; i < edges.length; i++) {
-    var edge = edges[i]; // 如果连线组折叠，判断子连线
-
-    var edgeData = htTopo.getEdgeData(edge);
-
-    if (edgeData) {
-      // eslint-disable-next-line no-underscore-dangle
-      var id = edgeData._attrObject.id;
-
-      if (id === data.id) {
-        return true;
-      }
-    } // 如果连线组展开，判断连线组
-    // eslint-disable-next-line no-underscore-dangle
-
-
-    if (edge.__edgeGroup && edge.__edgeGroup._tag === data.id) {
-      return true;
-    }
-  }
-
-  return false;
+  return !!element;
 }

package/package.json

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