@riil-frontend/component-topology 11.0.29 → 11.0.30

package/lib/networkTopo/models/EdgeGroupTagTipBuilder.js

@@ -2,8 +2,11 @@
 
 exports.__esModule = true;
 exports["default"] = void 0;
+
 var _htElementUtils = require("../../utils/htElementUtils");
+
 var _edgeGroupTagUtil = require("../utils/edgeGroupTagUtil");
+
 var EdgeGroupTagTipBuilder = /*#__PURE__*/function () {
   function EdgeGroupTagTipBuilder(amDisplay) {
     this.amDisplay = void 0;
@@ -11,23 +14,28 @@ var EdgeGroupTagTipBuilder = /*#__PURE__*/function () {
     this.amDisplay = amDisplay;
     this.topo = amDisplay.topo;
   }
+
   var _proto = EdgeGroupTagTipBuilder.prototype;
+
   _proto.getExtElementTagsAndTips = function getExtElementTagsAndTips() {
     var _this = this;
+
     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 edge = edgeGroup.getEdges().getArray()[0]; // 获取配置的链路
+
       var linkId = (0, _edgeGroupTagUtil.getEdgeGroupLinkIdConfig)(edge, topo);
       var edgeGroupId = [edge.getSourceAgent().getId(), edge.getTargetAgent().getId()];
       var data = {
         tags: [],
         tips: []
       };
+
       if (linkId) {
         data = _this.amDisplay.buildElementTagsTips(linkId);
       }
+
       return {
         htId: edge.getId(),
         edgeGroupId: edgeGroupId,
@@ -40,7 +48,9 @@ var EdgeGroupTagTipBuilder = /*#__PURE__*/function () {
     });
     return edgeGroupsTagsTips;
   };
+
   return EdgeGroupTagTipBuilder;
 }();
+
 exports["default"] = EdgeGroupTagTipBuilder;
 ;

package/lib/networkTopo/models/ExtElementTagTipBuilder.js

@@ -1,10 +1,14 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
 exports.__esModule = true;
 exports["default"] = void 0;
+
 var _IpNodeTagsTipsBuilder = _interopRequireDefault(require("./IpNodeTagsTipsBuilder"));
+
 var _EdgeGroupTagTipBuilder = _interopRequireDefault(require("./EdgeGroupTagTipBuilder"));
+
 var ExtElementTagTipBuilder = /*#__PURE__*/function () {
   function ExtElementTagTipBuilder(amDisplay) {
     this.amDisplay = void 0;
@@ -12,11 +16,15 @@ var ExtElementTagTipBuilder = /*#__PURE__*/function () {
     this.amDisplay = amDisplay;
     this.topo = amDisplay.topo;
   }
+
   var _proto = ExtElementTagTipBuilder.prototype;
+
   _proto.getExtElementTagsAndTips = function getExtElementTagsAndTips() {
     return [].concat(new _IpNodeTagsTipsBuilder["default"](this.amDisplay).getExtElementTagsAndTips(), new _EdgeGroupTagTipBuilder["default"](this.amDisplay).getExtElementTagsAndTips());
   };
+
   return ExtElementTagTipBuilder;
 }();
+
 exports["default"] = ExtElementTagTipBuilder;
 ;

package/lib/networkTopo/models/IpNodeTagsTipsBuilder.js

@@ -1,11 +1,16 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
 exports.__esModule = true;
 exports["default"] = void 0;
+
 var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
+
 var _htElementUtils = require("../../utils/htElementUtils");
+
 var _attributeFormatter = _interopRequireDefault(require("../../core/models/attributeFormatter"));
+
 /**
  * 连线组标注、悬浮框数据构建
  */
@@ -16,10 +21,13 @@ var IpNodeTagsTipsBuilder = /*#__PURE__*/function () {
     this.amDisplay = amDisplay;
     this.topo = amDisplay.topo;
   }
+
   var _proto = IpNodeTagsTipsBuilder.prototype;
+
   _proto.getExtElementTagsAndTips = function getExtElementTagsAndTips() {
     return this.getIpNodeTagsAndTips();
   };
+
   _proto.getIpNodeTagsAndTips = function getIpNodeTagsAndTips() {
     // const ciConfigs = this.amDisplay.getResourceTagTipConfig();
     var tts = [];
@@ -29,8 +37,7 @@ var IpNodeTagsTipsBuilder = /*#__PURE__*/function () {
     });
     var topo = this.topo;
     var dm = this.topo.getDataModel();
-    var config = topo.attributeMetricDisplay.getConfig();
-    // console.log("getIpNodeTagsAndTips", config, ipNodes);
+    var config = topo.attributeMetricDisplay.getConfig(); // console.log("getIpNodeTagsAndTips", config, ipNodes);
 
     var tagDatas = config.nodeTag && !config.nodeTag.isCustom ? config.nodeTag.data : [];
     var tipDatas = config.nodeTip && !config.nodeTip.isCustom ? config.nodeTip.data : [];
@@ -42,6 +49,7 @@ var IpNodeTagsTipsBuilder = /*#__PURE__*/function () {
     }).length > 0;
     ipNodes.map(function (node) {
       var tags = [];
+
       if (tagHasIpv4) {
         tags.push({
           type: "attribute",
@@ -54,7 +62,9 @@ var IpNodeTagsTipsBuilder = /*#__PURE__*/function () {
           originValue: node.bindIp
         });
       }
+
       var tips = [];
+
       if (tipHasIpv4) {
         tips.push({
           type: "attribute",
@@ -67,6 +77,7 @@ var IpNodeTagsTipsBuilder = /*#__PURE__*/function () {
           originValue: node.bindIp
         });
       }
+
       tts.push({
         type: node,
         id: node.id,
@@ -76,6 +87,8 @@ var IpNodeTagsTipsBuilder = /*#__PURE__*/function () {
     });
     return tts;
   };
+
   return IpNodeTagsTipsBuilder;
 }();
+
 exports["default"] = IpNodeTagsTipsBuilder;

package/lib/networkTopo/models/LinkDynamicStyleExecutor.js

@@ -1,12 +1,18 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
 exports.__esModule = true;
 exports["default"] = void 0;
+
 var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
+
 var _clusterUtil = require("../../utils/clusterUtil");
+
 var _htElementUtils = require("../../utils/htElementUtils");
+
 var _linkUtil = require("../utils/linkUtil");
+
 // network_link.actual_bandwidth
 function calcEdgeWidth(actualBandwidth) {
   if (!actualBandwidth) {
@@ -21,11 +27,13 @@ function calcEdgeWidth(actualBandwidth) {
     return 6;
   }
 }
+
 var getChildrenNodeCiIds = function getChildrenNodeCiIds(nodes) {
   var ciIds = [];
   nodes.forEach(function (node) {
     if ((0, _htElementUtils.isNode)(node) || (0, _clusterUtil.isClusterHtElement)(node)) {
       var nodeTag = node.getTag();
+
       if (nodeTag) {
         ciIds.push(nodeTag);
       }
@@ -39,58 +47,64 @@ var getChildrenNodeCiIds = function getChildrenNodeCiIds(nodes) {
   });
   return ciIds;
 };
+
 var LinkDynamicStyleExecutor = /*#__PURE__*/function () {
   function LinkDynamicStyleExecutor(topo) {
     // network_link.actual_bandwidth
     this.calcEdgeWidth = calcEdgeWidth;
     this.topo = topo;
   }
-
   /**
    * 仅链路、包含链路的连线组生效
    * 支撑场景：显示模式拓扑打开、显示模式全量切换单多链路、编辑模式拓扑打开、编辑模式修改链路值、编辑模式单个切换连线
    */
+
+
   var _proto = LinkDynamicStyleExecutor.prototype;
+
   _proto.execute = function execute() {
     var _this = this;
+
     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,
+        linkGroups = _topo$dataModel$getDa.linkGroups;
+
     var dataModel = this.topo.getDataModel();
-    topo.historyManager && topo.historyManager.setDisabled(true, '链路动态样式');
+    topo.historyManager && topo.historyManager.setDisabled(true, '链路动态样式'); // 1、如果连线可见，设置线宽
 
-    // 1、如果连线可见，设置线宽
     links.forEach(function (link) {
       var edge = dataModel.getDataByTag(link.id);
+
       if (edge) {
         edge.s('edge.width', _this.calcLinkEdgeWidth(link));
       }
-    });
+    }); // 2、如果连线组关联链路并可见，设置线宽
 
-    // 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();
-        // 判断是显示的连线组元素
+        var edgeGroupAgent = edgeGroup.getEdgeGroupAgent(); // 判断是显示的连线组元素
+
         if (edgeGroupAgent) {
           edgeGroup.getEdgeGroupAgent().s('edge.width', _this.calcLinkEdgeWidth(link));
         }
       } else {
         _rlog["default"].warn('动态链路样式执行：未找到聚合链路的ht元素', link);
       }
-    });
+    }); // 3、如果连线组未关联链路并可见，设置线宽。
 
-    // 3、如果连线组未关联链路并可见，设置线宽。
     var edges = (0, _htElementUtils.getEdges)(dataModel);
     edges.forEach(function (edge) {
       try {
@@ -98,22 +112,23 @@ var LinkDynamicStyleExecutor = /*#__PURE__*/function () {
         var sourceAgent = edge.getSourceAgent();
         var targetAgent = edge.getTargetAgent();
         var sourceId = sourceAgent.getTag();
-        var targetId = targetAgent.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;
-          // 如果有子链路，计算线宽并设置
+          var linkBetweenNodes = aggLinks.length ? aggLinks : phyLinks; // 如果有子链路，计算线宽并设置
+
           if (linkBetweenNodes.length) {
             var edgeWidth = _this.calcEdgeGroupEdgeWidth(linkBetweenNodes);
+
             edge.s('edge.width', edgeWidth);
           }
         }
@@ -123,22 +138,27 @@ var LinkDynamicStyleExecutor = /*#__PURE__*/function () {
     });
     topo.historyManager && topo.historyManager.setDisabled(false, '链路动态样式');
   }
-
   /**
    * 处理单个连线组切换。有链路时设置
-   */;
+   */
+  ;
+
   _proto.handleEdgeToggle = function handleEdgeToggle(_ref) {
     var _this2 = this;
+
     var expanded = _ref.expanded,
-      edges = _ref.edges,
-      edgeGroup = _ref.edgeGroup;
+        edges = _ref.edges,
+        edgeGroup = _ref.edgeGroup;
+
     if (expanded) {
       // 展开，
       edges.filter(function (edge) {
         return edge.getTag();
       }).forEach(function (edge) {
         var id = edge.getTag();
+
         var links = _this2.topo.store.getModelState('topoMod').data.links;
+
         var link = links.find(function (item) {
           return item.id === id;
         });
@@ -153,36 +173,44 @@ var LinkDynamicStyleExecutor = /*#__PURE__*/function () {
         return link.source === source && link.target === target || link.target === source && link.source === target;
       });
     }
-  }
-
-  // eslint-disable-next-line class-methods-use-this
+  } // eslint-disable-next-line class-methods-use-this
   ;
+
   _proto.calcEdgeGroupEdgeWidth = function calcEdgeGroupEdgeWidth(links) {
     var displayConfig = this.topo.store.getModelState('displayConfig');
     var autoChangeEdgeWidth = displayConfig.autoChangeEdgeWidth !== false;
+
     if (!autoChangeEdgeWidth) {
       return 3;
     }
+
     if (!links.length) {
       return 3;
     }
+
     var total = 0;
     links.forEach(function (link) {
       var actualBandwidth = link.attributes['network_link.actual_bandwidth'];
+
       if (actualBandwidth) {
         total += actualBandwidth;
       }
     });
     return this.calcEdgeWidth(total);
   };
+
   _proto.calcLinkEdgeWidth = function calcLinkEdgeWidth(link) {
     var displayConfig = this.topo.store.getModelState('displayConfig');
     var autoChangeEdgeWidth = displayConfig.autoChangeEdgeWidth !== false;
+
     if (!autoChangeEdgeWidth) {
       return 3;
     }
+
     return this.calcEdgeWidth(link.attributes['network_link.actual_bandwidth']);
   };
+
   return LinkDynamicStyleExecutor;
 }();
+
 exports["default"] = LinkDynamicStyleExecutor;

package/lib/networkTopo/models/LinkTagsTipsBuilder.js

@@ -1,35 +1,36 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
 exports.__esModule = true;
 exports["default"] = void 0;
+
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
+
 var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
+
 var _htElementUtils = require("../../utils/htElementUtils");
+
 var _attributeFormatter = _interopRequireDefault(require("../../core/models/attributeFormatter"));
+
 /**
  * 连线组标注、悬浮框数据构建
  */
-
 // 参与计算的链路指标
-var metrics = [
-// 总流速
+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',
@@ -55,6 +56,7 @@ var calcFnMap = {
     }, 0) / values.length;
   }
 };
+
 var LinkTagsTipsBuilder = /*#__PURE__*/function () {
   function LinkTagsTipsBuilder(amDisplay) {
     this.amDisplay = void 0;
@@ -62,32 +64,34 @@ var LinkTagsTipsBuilder = /*#__PURE__*/function () {
     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 dm = this.topo.getDataModel(); // 获取所有连线组，排除关联聚合链路，排除无子链路
 
-    // 获取所有连线组，排除关联聚合链路，排除无子链路
     var groups = (0, _htElementUtils.getEdgeGroups)(dm).map(getGroupInfo).filter(function (item) {
       return !!item;
-    });
+    }); // 计算标注和指标
 
-    // 计算标注和指标
     var edgeGroupsTagsTips = groups.map(function (_ref) {
       var groupId = _ref.groupId,
-        linkChildren = _ref.children;
+          linkChildren = _ref.children;
       var config = ciConfigs.find(function (item) {
         return item.id === linkChildren[0].id;
       });
@@ -97,36 +101,42 @@ var LinkTagsTipsBuilder = /*#__PURE__*/function () {
         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 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 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;
@@ -134,14 +144,17 @@ var LinkTagsTipsBuilder = /*#__PURE__*/function () {
         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;
+        config = _ref2.config,
+        linkChildren = _ref2.linkChildren,
+        data = _ref2.data;
     // 查询配置，过滤不在范围内的属性
     var finalConfig = (0, _extends2["default"])({}, config, {
       tags: config.tags.filter(function (item) {
@@ -150,10 +163,10 @@ var LinkTagsTipsBuilder = /*#__PURE__*/function () {
       tips: config.tips.filter(function (item) {
         return _this2.filterField(item, linkChildren);
       })
-    });
+    }); // 构造数据，计算指标值
 
-    // 构造数据，计算指标值
     var mergeData = this.buildData(data, linkChildren);
+
     _rlog["default"].debug('buildEdgeGroupTagTagsAndTips', {
       groupId: groupId,
       config: config,
@@ -161,9 +174,9 @@ var LinkTagsTipsBuilder = /*#__PURE__*/function () {
       data: data,
       finalConfig: finalConfig,
       mergeData: mergeData
-    });
+    }); // 构造标注、悬浮框数据
+
 
-    // 构造标注、悬浮框数据
     var formatter = new _attributeFormatter["default"](this.topo);
     return {
       type: 'edgeGroup',
@@ -171,19 +184,19 @@ var LinkTagsTipsBuilder = /*#__PURE__*/function () {
       tags: formatter.formatAttrs(finalConfig.tags, mergeData),
       tips: formatter.formatAttrs(finalConfig.tips, mergeData)
     };
-  }
-
-  // eslint-disable-next-line class-methods-use-this
+  } // 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) {
@@ -191,15 +204,16 @@ var LinkTagsTipsBuilder = /*#__PURE__*/function () {
           sources.push(link.source);
         }
       });
+
       if (sources.length > 1) {
         return false;
       }
     }
-    return true;
-  }
 
-  // eslint-disable-next-line class-methods-use-this
+    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) {
@@ -219,12 +233,13 @@ var LinkTagsTipsBuilder = /*#__PURE__*/function () {
       } catch (error) {
         _rlog["default"].warn('连线组指标计算异常', error);
       }
-    });
+    }); // console.error(groupId, {config, linkChildrenData, mergeData})
 
-    // console.error(groupId, {config, linkChildrenData, mergeData})
     return mergeData;
   };
+
   return LinkTagsTipsBuilder;
 }();
+
 exports["default"] = LinkTagsTipsBuilder;
 ;