@riil-frontend/component-topology 12.0.0-dev.24 → 12.0.0-dev.26

package/es/core/hooks/useCmpLinkAlarm.js

@@ -0,0 +1,27 @@
+/**
+ * 分级链路
+ * @param {*} props 
+ * @returns 
+ */
+export default function useCmpLinkAlarm(props) {
+  var topo = props.topo;
+
+  var _topo$store$useModelS = topo.store.useModelState('topoBizMod'),
+      attrsAndMetrics = _topo$store$useModelS.attrsAndMetrics;
+
+  var cmpLinkAlarmLevels = attrsAndMetrics.filter(function (item) {
+    return item.typeCode === 'network_link';
+  }) // 3:fault:重要故障; 4:urgently:紧急故障 』为红色
+  .filter(function (item) {
+    return ['3', '4'].includes(item.metrics.run_status);
+  }).map(function (item) {
+    return {
+      id: item.id,
+      level: 1
+    };
+  });
+  return {
+    cmpLinkAlarmLevels: cmpLinkAlarmLevels
+  };
+}
+;

package/es/core/hooks/useGraphAlarmDisplay.js

@@ -1,7 +1,8 @@
-import { useEffect } from "react";
+import { useEffect, useMemo } from "react";
 import rlog from "@riil-frontend/component-topology-utils/es/rlog";
 import { getElements } from "../../utils/htElementUtils";
 import { removeManageStatus, showManageStatus } from "../utils/showGraphManageStatusUtil";
+import useCmpLinkAlarm from "./useCmpLinkAlarm";
 /**
  * 获取ci的最高告警级别
  * @param {Array} alarmList 
@@ -9,16 +10,9 @@ import { removeManageStatus, showManageStatus } from "../utils/showGraphManageSt
  * @returns 
  */
 
-function getCiAlarmLevelMap(alarmList, risks) {
+function getCiAlarmLevelMap(alarmList) {
   var ciIdLevelMap = {};
-  [].concat(alarmList, risks.map(function (item) {
-    var _item$resourceId;
-
-    return {
-      id: (_item$resourceId = item.resourceId) !== null && _item$resourceId !== void 0 ? _item$resourceId : item.ciId,
-      level: 5
-    };
-  })).forEach(function (item) {
+  alarmList.forEach(function (item) {
     var level = ciIdLevelMap[item.id]; // 优先显示高等级告警。值小的等级高
 
     if (!level || item.level < level) {
@@ -30,8 +24,8 @@ function getCiAlarmLevelMap(alarmList, risks) {
   return ciIdLevelMap;
 }
 
-function getGraphCiElementAlarmLevels(resources, alarmList, risks) {
-  var ciIdLevelMap = getCiAlarmLevelMap(alarmList, risks);
+function getGraphCiElementAlarmLevels(resources, alarmList) {
+  var ciIdLevelMap = getCiAlarmLevelMap(alarmList);
   return Object.keys(ciIdLevelMap).map(function (id) {
     return {
       id: id,
@@ -96,8 +90,33 @@ export default function useGraphAlarmDisplay(options) {
 
   var resources = topo.dataModel.useCis();
 
+  var _useCmpLinkAlarm = useCmpLinkAlarm({
+    topo: topo
+  }),
+      cmpLinkAlarmLevels = _useCmpLinkAlarm.cmpLinkAlarmLevels;
+
+  var cisEventLevel = useMemo(function () {
+    var levels = [].concat(alarmList || [], cmpLinkAlarmLevels, risks.map(function (item) {
+      var _item$resourceId;
+
+      return {
+        id: (_item$resourceId = item.resourceId) !== null && _item$resourceId !== void 0 ? _item$resourceId : item.ciId,
+        level: 5
+      };
+    }));
+    return getGraphCiElementAlarmLevels(resources, levels);
+  }, [resources, alarmList, cmpLinkAlarmLevels, risks]);
+
   function getCisEventLevel() {
-    return getGraphCiElementAlarmLevels(resources, alarmList || [], risks);
+    var levels = [].concat(alarmList || [], cmpLinkAlarmLevels, risks.map(function (item) {
+      var _item$resourceId2;
+
+      return {
+        id: (_item$resourceId2 = item.resourceId) !== null && _item$resourceId2 !== void 0 ? _item$resourceId2 : item.ciId,
+        level: 5
+      };
+    }));
+    return getGraphCiElementAlarmLevels(resources, levels);
   }
 
   useEffect(function () {
@@ -152,5 +171,5 @@ export default function useGraphAlarmDisplay(options) {
         resources: resources
       });
     };
-  }, [graphLoaded, resources, alarmSwitch, alarmList, risks, relateTopoAlarm]);
+  }, [graphLoaded, resources, alarmSwitch, alarmList, risks, relateTopoAlarm, cmpLinkAlarmLevels]);
 }

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 "12.0.0-dev.24" === 'string' ? "12.0.0-dev.24" : null;
+var version = typeof "12.0.0-dev.26" === 'string' ? "12.0.0-dev.26" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 /**
  * 拓扑显示和编辑

package/lib/core/hooks/useCmpLinkAlarm.js

@@ -0,0 +1,33 @@
+"use strict";
+
+exports.__esModule = true;
+exports["default"] = useCmpLinkAlarm;
+
+/**
+ * 分级链路
+ * @param {*} props 
+ * @returns 
+ */
+function useCmpLinkAlarm(props) {
+  var topo = props.topo;
+
+  var _topo$store$useModelS = topo.store.useModelState('topoBizMod'),
+      attrsAndMetrics = _topo$store$useModelS.attrsAndMetrics;
+
+  var cmpLinkAlarmLevels = attrsAndMetrics.filter(function (item) {
+    return item.typeCode === 'network_link';
+  }) // 3:fault:重要故障; 4:urgently:紧急故障 』为红色
+  .filter(function (item) {
+    return ['3', '4'].includes(item.metrics.run_status);
+  }).map(function (item) {
+    return {
+      id: item.id,
+      level: 1
+    };
+  });
+  return {
+    cmpLinkAlarmLevels: cmpLinkAlarmLevels
+  };
+}
+
+;

package/lib/core/hooks/useGraphAlarmDisplay.js

@@ -13,22 +13,17 @@ var _htElementUtils = require("../../utils/htElementUtils");
 
 var _showGraphManageStatusUtil = require("../utils/showGraphManageStatusUtil");
 
+var _useCmpLinkAlarm2 = _interopRequireDefault(require("./useCmpLinkAlarm"));
+
 /**
  * 获取ci的最高告警级别
  * @param {Array} alarmList 
  * @param {*} risks 
  * @returns 
  */
-function getCiAlarmLevelMap(alarmList, risks) {
+function getCiAlarmLevelMap(alarmList) {
   var ciIdLevelMap = {};
-  [].concat(alarmList, risks.map(function (item) {
-    var _item$resourceId;
-
-    return {
-      id: (_item$resourceId = item.resourceId) !== null && _item$resourceId !== void 0 ? _item$resourceId : item.ciId,
-      level: 5
-    };
-  })).forEach(function (item) {
+  alarmList.forEach(function (item) {
     var level = ciIdLevelMap[item.id]; // 优先显示高等级告警。值小的等级高
 
     if (!level || item.level < level) {
@@ -40,8 +35,8 @@ function getCiAlarmLevelMap(alarmList, risks) {
   return ciIdLevelMap;
 }
 
-function getGraphCiElementAlarmLevels(resources, alarmList, risks) {
-  var ciIdLevelMap = getCiAlarmLevelMap(alarmList, risks);
+function getGraphCiElementAlarmLevels(resources, alarmList) {
+  var ciIdLevelMap = getCiAlarmLevelMap(alarmList);
   return Object.keys(ciIdLevelMap).map(function (id) {
     return {
       id: id,
@@ -106,8 +101,33 @@ function useGraphAlarmDisplay(options) {
 
   var resources = topo.dataModel.useCis();
 
+  var _useCmpLinkAlarm = (0, _useCmpLinkAlarm2["default"])({
+    topo: topo
+  }),
+      cmpLinkAlarmLevels = _useCmpLinkAlarm.cmpLinkAlarmLevels;
+
+  var cisEventLevel = (0, _react.useMemo)(function () {
+    var levels = [].concat(alarmList || [], cmpLinkAlarmLevels, risks.map(function (item) {
+      var _item$resourceId;
+
+      return {
+        id: (_item$resourceId = item.resourceId) !== null && _item$resourceId !== void 0 ? _item$resourceId : item.ciId,
+        level: 5
+      };
+    }));
+    return getGraphCiElementAlarmLevels(resources, levels);
+  }, [resources, alarmList, cmpLinkAlarmLevels, risks]);
+
   function getCisEventLevel() {
-    return getGraphCiElementAlarmLevels(resources, alarmList || [], risks);
+    var levels = [].concat(alarmList || [], cmpLinkAlarmLevels, risks.map(function (item) {
+      var _item$resourceId2;
+
+      return {
+        id: (_item$resourceId2 = item.resourceId) !== null && _item$resourceId2 !== void 0 ? _item$resourceId2 : item.ciId,
+        level: 5
+      };
+    }));
+    return getGraphCiElementAlarmLevels(resources, levels);
   }
 
   (0, _react.useEffect)(function () {
@@ -164,5 +184,5 @@ function useGraphAlarmDisplay(options) {
         resources: resources
       });
     };
-  }, [graphLoaded, resources, alarmSwitch, alarmList, risks, relateTopoAlarm]);
+  }, [graphLoaded, resources, alarmSwitch, alarmList, risks, relateTopoAlarm, cmpLinkAlarmLevels]);
 }

package/lib/core/models/TopoApp.js

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

package/package.json

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