@riil-frontend/component-topology 12.1.0-dev.8 → 12.1.1

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/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/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;
@@ -26,11 +24,8 @@ exports.getNodeDatas = getNodeDatas;
 exports.getNodes = getNodes;
 exports.getNodesByGroupIdOrTag = getNodesByGroupIdOrTag;
 exports.isEdge = isEdge;
-exports.isEdgeGroup = isEdgeGroup;
 exports.isEdgeGroupAgent = isEdgeGroupAgent;
-exports.isEdgeGroupExpanded = isEdgeGroupExpanded;
 exports.isEdgeVisible = isEdgeVisible;
-exports.isExistedElement = isExistedElement;
 exports.isGroup = isGroup;
 exports.isLayer = isLayer;
 exports.isNode = isNode;
@@ -174,16 +169,6 @@ function getNodeData(element) {
 function getEdges(dataModel) {
   return getElements(dataModel).filter(isValidEdge);
 }
-/**
- * 是否连线组
- * @param {ht.Edge} edge
- * @returns
- */
-
-
-function isEdgeGroup(edge) {
-  return isEdge(edge) && edge.a('x.edgegroup.isEdgeGroup');
-}
 /**
  * 是否连线组代理
  * @param {*} edge
@@ -192,17 +177,7 @@ function isEdgeGroup(edge) {
 
 
 function isEdgeGroupAgent(edge) {
-  return isEdgeGroup(edge);
-}
-/**
- * TODO
- * @param {*} edge 
- * @returns 
- */
-
-
-function isEdgeGroupExpanded(edge) {
-  return isEdge(edge) && edge.getEdgeGroup() && !!edge.s("edge.expanded");
+  return isEdge(edge) && edge.a('x.edgegroup.isEdgeGroup');
 }
 
 function isEdgeVisible(edge) {
@@ -233,66 +208,6 @@ 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
- */
-
-
-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);
-}
-/**
- * 获得连线组连线列表
- * @param {*} dataModel 
- * @returns 
- */
-
-
-function getEdgeGroups(dataModel) {
-  var edgeGroups = [];
-  getEdges(dataModel).forEach(function (edge) {
-    var group = edge.getEdgeGroup();
-
-    if (group && !edgeGroups.includes(group)) {
-      edgeGroups.push(group);
-    }
-  });
-  return edgeGroups;
-}
 /**
  * 获得连线组连线列表
  * @param {*} dataModel 
@@ -306,7 +221,7 @@ function getEdgeGroupAgents(dataModel) {
 
 function getEdgeDatas(dataModel) {
   return getEdges(dataModel).filter(function (edge) {
-    return !isEdgeGroup(edge);
+    return !isEdgeGroupAgent(edge);
   }).map(function (element) {
     var _element$getSource, _element$getTarget;
 
@@ -415,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;
   } // 识别区域
@@ -427,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/lib/utils/topoData.js

@@ -231,7 +231,7 @@ function buildGlobal(_ref2) {
       // 是否可编辑----控制[编辑]按钮
       moveable: true,
       // 节点是否可移动
-      toggleGroupByDblClick: true
+      toggleGroupByDblClick: false
     }, (result === null || result === void 0 ? void 0 : (_result$global2 = result.global) === null || _result$global2 === void 0 ? void 0 : _result$global2.control) || {}, (result === null || result === void 0 ? void 0 : (_result$customGlobal = result.customGlobal) === null || _result$customGlobal === void 0 ? void 0 : _result$customGlobal.control) || {}),
     topoDisplayConfig: (0, _extends2["default"])({
       // alarmSwitch: (result.global || {}).alarmSwitch ?? true,

package/package.json

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

package/es/networkTopo/models/LinkTagsTipsBuilder.js

@@ -1,235 +0,0 @@
-import _extends from "@babel/runtime/helpers/extends";
-
-/**
- * 连线组标注、悬浮框数据构建
- */
-import { rlog } from '@riil-frontend/component-topology-utils';
-import { getEdgeGroups } from "../../utils/htElementUtils";
-import AttributeFormatter from "../../core/models/attributeFormatter"; // 参与计算的链路指标
-
-var metrics = [// 总流速
-{
-  code: 'interface_totalbps',
-  calcType: 'sum'
-}, // 带宽利用率
-{
-  code: 'bandwidth_utilization',
-  calcType: 'avg'
-}, // 发送带宽利用率
-{
-  code: 'out_bandwidth_utilization',
-  calcType: 'avg',
-  showWhenSameSource: true
-}, // 接收带宽利用率
-{
-  code: 'in_bandwidth_utilization',
-  calcType: 'avg',
-  showWhenSameSource: true
-}, {
-  code: 'out_rate',
-  calcType: 'sum',
-  showWhenSameSource: true
-}, {
-  code: 'in_rate',
-  calcType: 'sum',
-  showWhenSameSource: true
-}];
-var calcFnMap = {
-  sum: function sum(values) {
-    return values.reduce(function (total, val) {
-      return total + parseInt(val || 0, 10);
-    }, 0);
-  },
-  avg: function avg(values) {
-    return values.reduce(function (total, val) {
-      return total + parseFloat(val || 0, 10);
-    }, 0) / values.length;
-  }
-};
-
-var LinkTagsTipsBuilder = /*#__PURE__*/function () {
-  function LinkTagsTipsBuilder(amDisplay) {
-    this.amDisplay = void 0;
-    this.topo = void 0;
-    this.amDisplay = amDisplay;
-    this.topo = amDisplay.topo;
-  }
-
-  var _proto = LinkTagsTipsBuilder.prototype;
-
-  _proto.getExtElementTagsAndTips = function getExtElementTagsAndTips() {
-    return this.getEdgeGroupTagsAndTips();
-  }
-  /**
-   * 获得未关联聚合链路的连线组标注和悬浮框数据
-   * @param {*} ciTagsAndTips 
-   * @returns 
-   */
-  ;
-
-  _proto.getEdgeGroupTagsAndTips = function getEdgeGroupTagsAndTips() {
-    var _this = this;
-
-    var ciConfigs = this.amDisplay.getResourceTagTipConfig();
-    var data = this.amDisplay.getData();
-    var topo = this.topo;
-    var dm = this.topo.getDataModel(); // 获取所有连线组，排除关联聚合链路，排除无子链路
-
-    var groups = getEdgeGroups(dm).map(getGroupInfo).filter(function (item) {
-      return !!item;
-    }); // 计算标注和指标
-
-    var edgeGroupsTagsTips = groups.map(function (_ref) {
-      var groupId = _ref.groupId,
-          linkChildren = _ref.children;
-      var config = ciConfigs.find(function (item) {
-        return item.id === linkChildren[0].id;
-      });
-      return _this.buildEdgeGroupTagTagsAndTips({
-        groupId: groupId,
-        config: config,
-        linkChildren: linkChildren,
-        data: data
-      });
-    }); // 获得连线组及子链路
-    // 关联聚合链路、无子链路 时返回null
-
-    function getGroupInfo(group) {
-      var edges = group.getEdges().toArray();
-      var edge = edges[0];
-      var edgeGroupData = topo.getHtTopo().getEdgeGroupData(edge.getSource(), edge.getTarget()); // eslint-disable-next-line no-underscore-dangle
-
-      var linkId = edgeGroupData.data._attrObject.id;
-
-      if (linkId) {
-        return null;
-      }
-
-      var linkChildren = getLinkChildren(edges);
-
-      if (!linkChildren.length) {
-        return null;
-      }
-
-      return {
-        groupId: [edge.getSource().getId(), edge.getTarget().getId()].sort().join('-'),
-        children: linkChildren
-      };
-    }
-
-    function getLinkChildren(edges) {
-      return edges.map(function (edge) {
-        var edgeData = topo.getHtTopo().getEdgeData(edge); // eslint-disable-next-line no-underscore-dangle
-
-        var childLinkId = edgeData._tag;
-
-        if (childLinkId) {
-          return topo.dataModel.getDataById(childLinkId);
-        }
-
-        return null;
-      }).filter(function (item) {
-        return !!item;
-      }).filter(function (link) {
-        return link.ciType === 'network_link';
-      });
-    }
-
-    return edgeGroupsTagsTips;
-  };
-
-  _proto.buildEdgeGroupTagTagsAndTips = function buildEdgeGroupTagTagsAndTips(_ref2) {
-    var _this2 = this;
-
-    var groupId = _ref2.groupId,
-        config = _ref2.config,
-        linkChildren = _ref2.linkChildren,
-        data = _ref2.data;
-
-    // 查询配置，过滤不在范围内的属性
-    var finalConfig = _extends({}, config, {
-      tags: config.tags.filter(function (item) {
-        return _this2.filterField(item, linkChildren);
-      }),
-      tips: config.tips.filter(function (item) {
-        return _this2.filterField(item, linkChildren);
-      })
-    }); // 构造数据，计算指标值
-
-
-    var mergeData = this.buildData(data, linkChildren);
-    rlog.debug('buildEdgeGroupTagTagsAndTips', {
-      groupId: groupId,
-      config: config,
-      linkChildren: linkChildren,
-      data: data,
-      finalConfig: finalConfig,
-      mergeData: mergeData
-    }); // 构造标注、悬浮框数据
-
-    var formatter = new AttributeFormatter(this.topo);
-    return {
-      type: 'edgeGroup',
-      edgeGroupId: groupId,
-      tags: formatter.formatAttrs(finalConfig.tags, mergeData),
-      tips: formatter.formatAttrs(finalConfig.tips, mergeData)
-    };
-  } // eslint-disable-next-line class-methods-use-this
-  ;
-
-  _proto.filterField = function filterField(item, linkChildren) {
-    var fieldConfig = metrics.find(function (m) {
-      return item.code === m.code;
-    });
-
-    if (item.type !== 'metric' || !fieldConfig) {
-      return false;
-    } // 如果需要校验取值接口，如果取值接口为不同设备的接口，则不显示这四个指标
-
-
-    if (fieldConfig.showWhenSameSource) {
-      var sources = [];
-      linkChildren.forEach(function (link) {
-        if (sources.indexOf(link.source) === -1) {
-          sources.push(link.source);
-        }
-      });
-
-      if (sources.length > 1) {
-        return false;
-      }
-    }
-
-    return true;
-  } // eslint-disable-next-line class-methods-use-this
-  ;
-
-  _proto.buildData = function buildData(data, linkChildren) {
-    var linkChildrenData = linkChildren.map(function (link) {
-      return data.find(function (item) {
-        return item.id === link.id;
-      });
-    });
-    var mergeData = {
-      ciType: 'network_link',
-      metricMap: {}
-    };
-    metrics.forEach(function (m) {
-      try {
-        var values = linkChildrenData.map(function (linkData) {
-          return linkData.metricMap[m.code];
-        });
-        mergeData.metricMap[m.code] = calcFnMap[m.calcType](values);
-      } catch (error) {
-        rlog.warn('连线组指标计算异常', error);
-      }
-    }); // console.error(groupId, {config, linkChildrenData, mergeData})
-
-    return mergeData;
-  };
-
-  return LinkTagsTipsBuilder;
-}();
-
-export { LinkTagsTipsBuilder as default };
-;