@riil-frontend/component-topology 3.5.9 → 3.5.12

package/es/core/models/TopoApp.js

@@ -20,7 +20,7 @@ import { updateEdgeExpanded } from "../utils/edgeUtil";
 import PluginManager from "./PluginManager";
 import topoFactory from "./topoFactory"; // eslint-disable-next-line no-undef
 
-var version = typeof "3.5.9" === 'string' ? "3.5.9" : null;
+var version = typeof "3.5.12" === 'string' ? "3.5.12" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 /**
  * 拓扑显示和编辑

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

@@ -461,7 +461,7 @@ export default function ResourceOverview(props) {
             case 0:
               _context5.next = 2;
               return alarmService.getAlarmByIds([id], {
-                alertStatusList: ['toDeal', 'dealing'],
+                alertStatusList: ['toDeal', 'woDealing', 'dealing'],
                 // toDeal: 待处理, dealing：处理中
                 pageNum: 1,
                 pageSize: 999,

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

@@ -43,12 +43,16 @@ function _queryCiMonitorMetricCodes() {
       while (1) {
         switch (_context2.prev = _context2.next) {
           case 0:
-            arr = queryCiMonitorMetricStrategys(id);
+            _context2.next = 2;
+            return queryCiMonitorMetricStrategys(id);
+
+          case 2:
+            arr = _context2.sent;
             return _context2.abrupt("return", arr.map(function (item) {
               return item.code;
             }));
 
-          case 2:
+          case 4:
           case "end":
             return _context2.stop();
         }

package/es/models/topoAlarm.js

@@ -8,7 +8,7 @@ import _regeneratorRuntime from "@babel/runtime/regenerator";
 import rlog from "@riil-frontend/component-topology-utils/es/rlog";
 import _ from "lodash";
 import { sortList } from "../utils/topoData";
-var showAlarmStatus = ["toDeal", "dealing", "change"];
+var showAlarmStatus = ["toDeal", "dealing", "change", "woDealing"];
 export default function (topo) {
   return {
     // 定义 model 的初始 state

package/es/topoCenter/models/LinkTagsTipsBuilder.js

@@ -5,7 +5,7 @@ import _extends from "@babel/runtime/helpers/extends";
  */
 import rlog from '@riil-frontend/component-topology-utils/es/rlog';
 import groupBy from 'lodash/groupBy';
-import { getEdgeGroupByNodeTags } from "../../utils/htElementUtils";
+import { getEdgeGroupByNodeTags, getEdgeGroups } from "../../utils/htElementUtils";
 import AttributeFormatter from "../../core/models/attributeFormatter"; // 参与计算的链路指标
 
 var metrics = [// 总流速
@@ -76,40 +76,22 @@ var LinkTagsTipsBuilder = /*#__PURE__*/function () {
     var _this = this;
 
     var ciConfigs = this.amDisplay.getResourceTagTipConfig();
-    var data = this.amDisplay.getData(); // 查询没有关联链路的连线组及对应子链路列表
-
-    var _this$topo$dataModel$ = this.topo.dataModel.getData(),
-        links = _this$topo$dataModel$.links,
-        linkGroups = _this$topo$dataModel$.linkGroups;
-
-    var getLinkUId = function getLinkUId(link) {
-      return [link.source, link.target].sort().join('-');
-    };
-
-    var linkGroupUIds = linkGroups.filter(function (link) {
-      return link.ciType === 'network_link';
-    }).map(function (link) {
-      return getLinkUId(link);
-    }); // 查询没有聚合链路的物理链路/出口链路
-
-    var noParentLinks = links.filter(function (link) {
-      return link.ciType === 'network_link';
-    }).map(function (link) {
-      return _extends({}, link, {
-        linkUId: getLinkUId(link)
+    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;
+      console.error(1111, {
+        ciConfigs: ciConfigs,
+        linkChildren: linkChildren,
+        data: data
       });
-    }).filter(function (link) {
-      return linkGroupUIds.indexOf(link.linkUId) === -1;
-    });
-    var groupMap = groupBy(noParentLinks, 'linkUId'); // 计算标注和指标
-
-    var edgeGroupsTagsTips = Object.keys(groupMap) // 过滤非连线组
-    .filter(function (groupId) {
-      var linkChildren = groupMap[groupId];
-      var edgeGroup = getEdgeGroupByNodeTags(_this.topo.getDataModel(), linkChildren[0].source, linkChildren[0].target);
-      return !!edgeGroup;
-    }).map(function (groupId) {
-      var linkChildren = groupMap[groupId];
       var config = ciConfigs.find(function (item) {
         return item.id === linkChildren[0].id;
       });
@@ -122,26 +104,80 @@ var LinkTagsTipsBuilder = /*#__PURE__*/function () {
     }); // console.error({
     //   noParentLinks, groupMap, edgeGroups: edgeGroupsTagsTips, ciTagsAndTips, 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(_ref) {
+  _proto.buildEdgeGroupTagTagsAndTips = function buildEdgeGroupTagTagsAndTips(_ref2) {
     var _this2 = this;
 
-    var groupId = _ref.groupId,
-        config = _ref.config,
-        linkChildren = _ref.linkChildren,
-        data = _ref.data;
+    var groupId = _ref2.groupId,
+        config = _ref2.config,
+        linkChildren = _ref2.linkChildren,
+        data = _ref2.data;
+    var connectTypes = ['physical_link.', 'export_link.'];
+
+    var replaceMetricConfigCode = function replaceMetricConfigCode(item) {
+      var code = item.code;
+      connectTypes.forEach(function (prefix) {
+        code = code.replace(prefix, 'physical_link.');
+      });
+      return _extends({}, item, {
+        code: code
+      });
+    }; // 查询配置，过滤不在范围内的属性
+
 
-    // 查询配置，过滤不在范围内的属性
     var finalConfig = _extends({}, config, {
       tags: config.tags.filter(function (item) {
         return _this2.filterField(item, linkChildren);
-      }),
+      }).map(replaceMetricConfigCode),
       tips: config.tips.filter(function (item) {
         return _this2.filterField(item, linkChildren);
-      })
+      }).map(replaceMetricConfigCode)
     }); // 构造数据，计算指标值
 
 
@@ -194,15 +230,14 @@ var LinkTagsTipsBuilder = /*#__PURE__*/function () {
       ciType: 'network_link',
       metricMap: {}
     };
-    var connectType = linkChildren[0].attributes['network_link.connect_type'];
     metrics.forEach(function (m) {
-      var metricCode = "" + connectTypePrefixMap[connectType] + m.code;
-
       try {
         var values = linkChildrenData.map(function (linkData) {
+          var connectType = linkData.attributeMap['network_link.connect_type'];
+          var metricCode = "" + connectTypePrefixMap[connectType] + m.code;
           return linkData.metricMap[metricCode];
         });
-        mergeData.metricMap[metricCode] = calcFnMap[m.calcType](values);
+        mergeData.metricMap["physical_link." + m.code] = calcFnMap[m.calcType](values);
       } catch (error) {
         rlog.warn('连线组指标计算异常', error);
       }

package/es/utils/htElementUtils.js

@@ -189,8 +189,15 @@ export function getEdgeGroupByNodeTags(dataModel, nodeTag1, nodeTag2) {
   return getEdgeGroupByNodes(node1, node2);
 }
 export function getEdgeGroups(dataModel) {
-  var edgeGroup = null;
-  return [];
+  var edgeGroups = [];
+  getEdges(dataModel).forEach(function (edge) {
+    var group = edge.getEdgeGroup();
+
+    if (group && !edgeGroups.includes(group)) {
+      edgeGroups.push(group);
+    }
+  });
+  return edgeGroups;
 }
 export function getEdgeDatas(dataModel) {
   return getEdges(dataModel).map(function (element) {

package/lib/core/models/TopoApp.js

@@ -48,7 +48,7 @@ var _PluginManager = _interopRequireDefault(require("./PluginManager"));
 var _topoFactory = _interopRequireDefault(require("./topoFactory"));
 
 // eslint-disable-next-line no-undef
-var version = typeof "3.5.9" === 'string' ? "3.5.9" : null;
+var version = typeof "3.5.12" === 'string' ? "3.5.12" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 /**
  * 拓扑显示和编辑

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

@@ -493,7 +493,7 @@ function ResourceOverview(props) {
             case 0:
               _context5.next = 2;
               return _alarm["default"].getAlarmByIds([id], {
-                alertStatusList: ['toDeal', 'dealing'],
+                alertStatusList: ['toDeal', 'woDealing', 'dealing'],
                 // toDeal: 待处理, dealing：处理中
                 pageNum: 1,
                 pageSize: 999,

package/lib/core/viewer/components/plugins/ResourceDetail/getCiDisplayMetricModels.js

@@ -54,12 +54,16 @@ function _queryCiMonitorMetricCodes() {
       while (1) {
         switch (_context2.prev = _context2.next) {
           case 0:
-            arr = queryCiMonitorMetricStrategys(id);
+            _context2.next = 2;
+            return queryCiMonitorMetricStrategys(id);
+
+          case 2:
+            arr = _context2.sent;
             return _context2.abrupt("return", arr.map(function (item) {
               return item.code;
             }));
 
-          case 2:
+          case 4:
           case "end":
             return _context2.stop();
         }

package/lib/models/topoAlarm.js

@@ -20,7 +20,7 @@ var _topoData = require("../utils/topoData");
 /**
  * 告警
  */
-var showAlarmStatus = ["toDeal", "dealing", "change"];
+var showAlarmStatus = ["toDeal", "dealing", "change", "woDealing"];
 
 function _default(topo) {
   return {

package/lib/topoCenter/models/LinkTagsTipsBuilder.js

@@ -87,40 +87,22 @@ var LinkTagsTipsBuilder = /*#__PURE__*/function () {
     var _this = this;
 
     var ciConfigs = this.amDisplay.getResourceTagTipConfig();
-    var data = this.amDisplay.getData(); // 查询没有关联链路的连线组及对应子链路列表
-
-    var _this$topo$dataModel$ = this.topo.dataModel.getData(),
-        links = _this$topo$dataModel$.links,
-        linkGroups = _this$topo$dataModel$.linkGroups;
-
-    var getLinkUId = function getLinkUId(link) {
-      return [link.source, link.target].sort().join('-');
-    };
-
-    var linkGroupUIds = linkGroups.filter(function (link) {
-      return link.ciType === 'network_link';
-    }).map(function (link) {
-      return getLinkUId(link);
-    }); // 查询没有聚合链路的物理链路/出口链路
-
-    var noParentLinks = links.filter(function (link) {
-      return link.ciType === 'network_link';
-    }).map(function (link) {
-      return (0, _extends2["default"])({}, link, {
-        linkUId: getLinkUId(link)
+    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;
+      console.error(1111, {
+        ciConfigs: ciConfigs,
+        linkChildren: linkChildren,
+        data: data
       });
-    }).filter(function (link) {
-      return linkGroupUIds.indexOf(link.linkUId) === -1;
-    });
-    var groupMap = (0, _groupBy["default"])(noParentLinks, 'linkUId'); // 计算标注和指标
-
-    var edgeGroupsTagsTips = Object.keys(groupMap) // 过滤非连线组
-    .filter(function (groupId) {
-      var linkChildren = groupMap[groupId];
-      var edgeGroup = (0, _htElementUtils.getEdgeGroupByNodeTags)(_this.topo.getDataModel(), linkChildren[0].source, linkChildren[0].target);
-      return !!edgeGroup;
-    }).map(function (groupId) {
-      var linkChildren = groupMap[groupId];
       var config = ciConfigs.find(function (item) {
         return item.id === linkChildren[0].id;
       });
@@ -133,25 +115,80 @@ var LinkTagsTipsBuilder = /*#__PURE__*/function () {
     }); // console.error({
     //   noParentLinks, groupMap, edgeGroups: edgeGroupsTagsTips, ciTagsAndTips, 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(_ref) {
+  _proto.buildEdgeGroupTagTagsAndTips = function buildEdgeGroupTagTagsAndTips(_ref2) {
     var _this2 = this;
 
-    var groupId = _ref.groupId,
-        config = _ref.config,
-        linkChildren = _ref.linkChildren,
-        data = _ref.data;
-    // 查询配置，过滤不在范围内的属性
+    var groupId = _ref2.groupId,
+        config = _ref2.config,
+        linkChildren = _ref2.linkChildren,
+        data = _ref2.data;
+    var connectTypes = ['physical_link.', 'export_link.'];
+
+    var replaceMetricConfigCode = function replaceMetricConfigCode(item) {
+      var code = item.code;
+      connectTypes.forEach(function (prefix) {
+        code = code.replace(prefix, 'physical_link.');
+      });
+      return (0, _extends2["default"])({}, item, {
+        code: code
+      });
+    }; // 查询配置，过滤不在范围内的属性
+
+
     var finalConfig = (0, _extends2["default"])({}, config, {
       tags: config.tags.filter(function (item) {
         return _this2.filterField(item, linkChildren);
-      }),
+      }).map(replaceMetricConfigCode),
       tips: config.tips.filter(function (item) {
         return _this2.filterField(item, linkChildren);
-      })
+      }).map(replaceMetricConfigCode)
     }); // 构造数据，计算指标值
 
     var mergeData = this.buildData(data, linkChildren); // 构造标注、悬浮框数据
@@ -203,15 +240,14 @@ var LinkTagsTipsBuilder = /*#__PURE__*/function () {
       ciType: 'network_link',
       metricMap: {}
     };
-    var connectType = linkChildren[0].attributes['network_link.connect_type'];
     metrics.forEach(function (m) {
-      var metricCode = "" + connectTypePrefixMap[connectType] + m.code;
-
       try {
         var values = linkChildrenData.map(function (linkData) {
+          var connectType = linkData.attributeMap['network_link.connect_type'];
+          var metricCode = "" + connectTypePrefixMap[connectType] + m.code;
           return linkData.metricMap[metricCode];
         });
-        mergeData.metricMap[metricCode] = calcFnMap[m.calcType](values);
+        mergeData.metricMap["physical_link." + m.code] = calcFnMap[m.calcType](values);
       } catch (error) {
         _rlog["default"].warn('连线组指标计算异常', error);
       }

package/lib/utils/htElementUtils.js

@@ -247,8 +247,15 @@ function getEdgeGroupByNodeTags(dataModel, nodeTag1, nodeTag2) {
 }
 
 function getEdgeGroups(dataModel) {
-  var edgeGroup = null;
-  return [];
+  var edgeGroups = [];
+  getEdges(dataModel).forEach(function (edge) {
+    var group = edge.getEdgeGroup();
+
+    if (group && !edgeGroups.includes(group)) {
+      edgeGroups.push(group);
+    }
+  });
+  return edgeGroups;
 }
 
 function getEdgeDatas(dataModel) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@riil-frontend/component-topology",
-  "version": "3.5.9",
+  "version": "3.5.12",
   "description": "拓扑",
   "scripts": {
     "start": "build-scripts start",
@@ -42,7 +42,7 @@
     "@alifd/biz-anchor": "^1.1.7",
     "@ice/store": "^1.4.2",
     "@riil-frontend/component-topo-icon-select": "^1.0.16",
-    "@riil-frontend/component-topology-utils": "^2.0.20-alpha.0",
+    "@riil-frontend/component-topology-utils": "^2.1.0",
     "classnames": "^2.2.3",
     "prop-types": "^15.5.8",
     "react-color": "^2.19.3",
@@ -110,6 +110,6 @@
     "access": "public"
   },
   "license": "MIT",
-  "homepage": "https://unpkg.com/@riil-frontend/component-topology@3.5.9/build/index.html",
+  "homepage": "https://unpkg.com/@riil-frontend/component-topology@3.5.12/build/index.html",
   "gitHead": "2da19ffccbb7ca60a8acf396e39f542c68bb33f5"
 }