@riil-frontend/component-topology 9.0.0-a.33 → 9.0.0-a.36

package/es/core/editor/components/Toolbar/widgets/EdgeTypeButton/LineType.js

@@ -21,7 +21,7 @@ var LINE_TYPE_OPTIONS = [{
   label: '双折线',
   icon: 'topo_linear_icon_bilinear'
 }, {
-  value: 'arc',
+  value: 'ripple',
   label: '单弧线',
   icon: 'topo_linear_icon_arc_line'
 }, {

package/es/core/models/TopoApp.js

@@ -24,7 +24,7 @@ import ElementTagTipConfig from "./tagstips/ElementTagTipConfig";
 import SelectionModel from "./SelectionModel";
 import CiCache from "./cache/CiCache"; // eslint-disable-next-line no-undef
 
-var version = typeof "9.0.0-a.33" === 'string' ? "9.0.0-a.33" : null;
+var version = typeof "9.0.0-a.36" === 'string' ? "9.0.0-a.36" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 /**
  * 拓扑显示和编辑

package/es/networkTopo/models/IpNodeTagsTipsBuilder.js

@@ -0,0 +1,235 @@
+import _extends from "@babel/runtime/helpers/extends";
+
+/**
+ * 连线组标注、悬浮框数据构建
+ */
+import rlog from '@riil-frontend/component-topology-utils/es/rlog';
+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 IpNodeTagsTipsBuilder = /*#__PURE__*/function () {
+  function IpNodeTagsTipsBuilder(amDisplay) {
+    this.amDisplay = void 0;
+    this.topo = void 0;
+    this.amDisplay = amDisplay;
+    this.topo = amDisplay.topo;
+  }
+
+  var _proto = IpNodeTagsTipsBuilder.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 IpNodeTagsTipsBuilder;
+}();
+
+export { IpNodeTagsTipsBuilder as default };
+;

package/es/networkTopo/models/LinkDynamicStyleExecutor.js

@@ -169,11 +169,11 @@ var LinkDynamicStyleExecutor = /*#__PURE__*/function () {
     var autoChangeEdgeWidth = displayConfig.autoChangeEdgeWidth !== false;
 
     if (!autoChangeEdgeWidth) {
-      return 2;
+      return 3;
     }
 
     if (!links.length) {
-      return 2;
+      return 3;
     }
 
     var total = 0;
@@ -192,7 +192,7 @@ var LinkDynamicStyleExecutor = /*#__PURE__*/function () {
     var autoChangeEdgeWidth = displayConfig.autoChangeEdgeWidth !== false;
 
     if (!autoChangeEdgeWidth) {
-      return 2;
+      return 3;
     }
 
     return this.calcEdgeWidth(link.attributes['network_link.actual_bandwidth']);

package/lib/core/editor/components/Toolbar/widgets/EdgeTypeButton/LineType.js

@@ -37,7 +37,7 @@ var LINE_TYPE_OPTIONS = [{
   label: '双折线',
   icon: 'topo_linear_icon_bilinear'
 }, {
-  value: 'arc',
+  value: 'ripple',
   label: '单弧线',
   icon: 'topo_linear_icon_arc_line'
 }, {

package/lib/core/models/TopoApp.js

@@ -56,7 +56,7 @@ var _SelectionModel = _interopRequireDefault(require("./SelectionModel"));
 var _CiCache = _interopRequireDefault(require("./cache/CiCache"));
 
 // eslint-disable-next-line no-undef
-var version = typeof "9.0.0-a.33" === 'string' ? "9.0.0-a.33" : null;
+var version = typeof "9.0.0-a.36" === 'string' ? "9.0.0-a.36" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 /**
  * 拓扑显示和编辑

package/lib/networkTopo/models/IpNodeTagsTipsBuilder.js

@@ -0,0 +1,245 @@
+"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 = [// 总流速
+{
+  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 IpNodeTagsTipsBuilder = /*#__PURE__*/function () {
+  function IpNodeTagsTipsBuilder(amDisplay) {
+    this.amDisplay = void 0;
+    this.topo = void 0;
+    this.amDisplay = amDisplay;
+    this.topo = amDisplay.topo;
+  }
+
+  var _proto = IpNodeTagsTipsBuilder.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 = (0, _htElementUtils.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 = (0, _extends2["default"])({}, 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["default"].debug('buildEdgeGroupTagTagsAndTips', {
+      groupId: groupId,
+      config: config,
+      linkChildren: linkChildren,
+      data: data,
+      finalConfig: finalConfig,
+      mergeData: mergeData
+    }); // 构造标注、悬浮框数据
+
+
+    var formatter = new _attributeFormatter["default"](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["default"].warn('连线组指标计算异常', error);
+      }
+    }); // console.error(groupId, {config, linkChildrenData, mergeData})
+
+    return mergeData;
+  };
+
+  return IpNodeTagsTipsBuilder;
+}();
+
+exports["default"] = IpNodeTagsTipsBuilder;
+;

package/lib/networkTopo/models/LinkDynamicStyleExecutor.js

@@ -180,11 +180,11 @@ var LinkDynamicStyleExecutor = /*#__PURE__*/function () {
     var autoChangeEdgeWidth = displayConfig.autoChangeEdgeWidth !== false;
 
     if (!autoChangeEdgeWidth) {
-      return 2;
+      return 3;
     }
 
     if (!links.length) {
-      return 2;
+      return 3;
     }
 
     var total = 0;
@@ -203,7 +203,7 @@ var LinkDynamicStyleExecutor = /*#__PURE__*/function () {
     var autoChangeEdgeWidth = displayConfig.autoChangeEdgeWidth !== false;
 
     if (!autoChangeEdgeWidth) {
-      return 2;
+      return 3;
     }
 
     return this.calcEdgeWidth(link.attributes['network_link.actual_bandwidth']);

package/package.json

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