@riil-frontend/component-topology 12.1.4 → 12.1.7

package/es/core/components/TopoView/topoView.js

@@ -140,7 +140,10 @@ var Topology = function Topology(props) {
     });
 
     if (onLoad) {
-      onLoad();
+      onLoad({
+        topo: topo,
+        topoData: topoData
+      });
     }
   }, [topoData]);
   var handleGraphLoaded = useCallback(function () {
@@ -180,7 +183,10 @@ var Topology = function Topology(props) {
     }
 
     if (onLoad) {
-      onLoad();
+      onLoad({
+        topo: topo,
+        topoData: topoData
+      });
     }
   }, [topoData]);
 

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

@@ -32,11 +32,12 @@ var LINE_TYPE_OPTIONS = [{
   value: 'doublearc',
   label: '双弧线',
   icon: 'topo_linear_icon_arcline'
-}, {
-  value: 'points',
-  label: '自由线形',
-  icon: 'topo_linear_icon_pointsline'
-}];
+} // {
+//   value: 'points',
+//   label: '自由线形',
+//   icon: 'topo_linear_icon_pointsline',
+// },
+];
 var LineType = /*#__PURE__*/React.forwardRef(function (props, ref) {
   var value = props.value,
       onChange = props.onChange,

package/es/core/hooks/useAlarm.js

@@ -2,18 +2,8 @@ import _extends from "@babel/runtime/helpers/extends";
 import { useEffect } from "react";
 import rlog from "@riil-frontend/component-topology-utils/es/rlog";
 import useGraphAlarmDisplay from "./useGraphAlarmDisplay";
-import useTopoEventListener from "./useTopoEventListener"; // 告警在活状态
-
-var showAlarmStatus = ["toDeal", "dealing", "change", "woDealing"];
-/**
- * 告警是否在活
- * @param {*} alarm 
- * @returns 
- */
-
-var isAlarmAlive = function isAlarmAlive(alarm) {
-  return showAlarmStatus.indexOf(alarm.status) >= 0;
-};
+import useTopoEventListener from "./useTopoEventListener";
+import { isAlarmAlive } from "../utils/alarmUtil";
 
 var handleRiskData = function handleRiskData(topo, receivedData) {
   var _risks, _topo$viewProps, _topo$viewProps2;
@@ -23,7 +13,7 @@ var handleRiskData = function handleRiskData(topo, receivedData) {
   // 已关闭 closed
   var prevRisks = topo.store.getModelState('topoAlarm').risks;
 
-  var isLiveRisk = function isLiveRisk(data) {
+  var isRiskAlive = function isRiskAlive(data) {
     return ['recovered', 'closed'].indexOf(data.status) === -1;
   };
 
@@ -52,7 +42,7 @@ var handleRiskData = function handleRiskData(topo, receivedData) {
   (_risks = risks).push.apply(_risks, addRisks); // 过滤掉无权限、非在活的
 
 
-  risks = risks.filter(isLiveRisk).filter(hasCiPermission).sort(function (a, b) {
+  risks = risks.filter(isRiskAlive).filter(hasCiPermission).sort(function (a, b) {
     return a.executeTime - b.executeTime;
   });
   rlog.debug('更新风险', {

package/es/core/hooks/useGraphAlarmDisplay.js

@@ -1,13 +1,15 @@
 import { useEffect, useMemo } from "react";
-import rlog from "@riil-frontend/component-topology-utils/es/rlog";
+import loglevel from 'loglevel';
 import { getElements } from "../../utils/htElementUtils";
 import { removeManageStatus, showManageStatus } from "../utils/showGraphManageStatusUtil";
 import useCmpLinkAlarm from "./useCmpLinkAlarm";
+import useLinkAlarmDisplay from "./useLinkAlarmDisplay";
+var rlog = loglevel.getLogger('topo');
 /**
  * 获取ci的最高告警级别
- * @param {Array} alarmList 
- * @param {*} risks 
- * @returns 
+ * @param {Array} alarmList
+ * @param {*} risks
+ * @returns
  */
 
 function getCiAlarmLevelMap(alarmList) {
@@ -40,9 +42,9 @@ function getGraphCiElementAlarmLevels(resources, alarmList) {
 }
 /**
  * 获得关联拓扑节点告警级别
- * @param {*} topo 
- * @param {*} relateTopoAlarm 
- * @returns 
+ * @param {*} topo
+ * @param {*} relateTopoAlarm
+ * @returns
  */
 
 
@@ -50,7 +52,7 @@ function getRelateTopoNodeAlarmLevels(topo, relateTopoAlarm) {
   return Object.keys(relateTopoAlarm).map(function (topoId) {
     var level = relateTopoAlarm[topoId];
     var relateTopoNode = topo.getDataModel().getDatas().toArray().find(function (node) {
-      return "" + node.a('bindTopo') === "" + topoId;
+      return "" + node.a("bindTopo") === "" + topoId;
     });
 
     if (!level || !relateTopoNode) {
@@ -70,18 +72,18 @@ function getRelateTopoNodeAlarmLevels(topo, relateTopoAlarm) {
 function getGraphElementAlarmLevels(resources) {}
 /**
  * 告警显示到ht拓扑
- * 
- * @param {*} options 
+ *
+ * @param {*} options
  */
 
 
 export default function useGraphAlarmDisplay(options) {
   var topo = options.topo,
       alarmSwitch = options.alarmSwitch;
-  var topoState = topo.store.useModelState('topoMod');
+  var topoState = topo.store.useModelState("topoMod");
   var graphLoaded = topoState.graphLoaded,
       viewState = topoState.viewState;
-  var isEditMode = viewState === 'edit';
+  var isEditMode = viewState === "edit";
 
   var _topo$alarm$useState = topo.alarm.useState(),
       alarmList = _topo$alarm$useState.alarmList,
@@ -99,12 +101,29 @@ export default function useGraphAlarmDisplay(options) {
       cmpLinkRunStatus = _useCmpLinkAlarm.cmpLinkRunStatus,
       addCmpLinkOfflineStatusForDisplayLineColor = _useCmpLinkAlarm.addCmpLinkOfflineStatusForDisplayLineColor;
 
-  var resources = useMemo(function () {
+  var cmpRes = useMemo(function () {
     return addCmpLinkOfflineStatusForDisplayLineColor(oldResources, cmpLinkRunStatus);
-  }, [oldResources, cmpLinkRunStatus]); // ci告警级别
+  }, [oldResources, cmpLinkRunStatus]); // 拓扑链路特殊处理
+
+  var _useLinkAlarmDisplay = useLinkAlarmDisplay({
+    topo: topo,
+    resources: cmpRes,
+    graphLoaded: graphLoaded,
+    alarmList: alarmList
+  }),
+      linkRunStatus = _useLinkAlarmDisplay.linkRunStatus,
+      getlinkAlarmLevels = _useLinkAlarmDisplay.getlinkAlarmLevels; // const resources = useMemo(() => addLinkOfflineStatusForDisplayLineColor(cmpRes, linkRunStatus), [cmpRes, linkRunStatus])
+
+
+  var linkAlarmLevels = getlinkAlarmLevels(alarmList, cmpRes);
+  var resources = [].concat(cmpRes); //1.7 需求，过滤掉断开状态的链路
+  //  const resources = cmpRes.filter((item) => {
+  //     return !item.breakState;
+  //   });
+  // ci告警级别
 
   var cisEventLevel = useMemo(function () {
-    var levels = [].concat(alarmList || [], cmpLinkAlarmLevels, risks.map(function (item) {
+    var levels = [].concat(alarmList || [], cmpLinkAlarmLevels, linkAlarmLevels, risks.map(function (item) {
       var _item$resourceId;
 
       return {
@@ -150,17 +169,17 @@ export default function useGraphAlarmDisplay(options) {
         var alarmLevel = (_elementsAlarmLevels$ = elementsAlarmLevels.find(function (item) {
           return item.id === element.getTag() || item.elementId === element.getId();
         })) === null || _elementsAlarmLevels$ === void 0 ? void 0 : _elementsAlarmLevels$.level;
-        element.a('alarmLevel', alarmLevel);
+        element.a("alarmLevel", alarmLevel);
       });
-      rlog.debug('推送告警 => ht', {
+      rlog.debug("推送告警 => ht", {
         alarms: elementsAlarmLevels,
         relateTopoAlarmMap: relateTopoAlarm,
         relateTopoAlarms: relateTopoAlarms
       }); // 更新到ht拓扑
 
-      (_topo$historyManager = topo.historyManager) === null || _topo$historyManager === void 0 ? void 0 : _topo$historyManager.setDisabled(true, '推送告警');
+      (_topo$historyManager = topo.historyManager) === null || _topo$historyManager === void 0 ? void 0 : _topo$historyManager.setDisabled(true, "推送告警");
       topo.view.loadAlarm(elementsAlarmLevels);
-      (_topo$historyManager2 = topo.historyManager) === null || _topo$historyManager2 === void 0 ? void 0 : _topo$historyManager2.setDisabled(false, '推送告警');
+      (_topo$historyManager2 = topo.historyManager) === null || _topo$historyManager2 === void 0 ? void 0 : _topo$historyManager2.setDisabled(false, "推送告警");
     }
 
     return function () {

package/es/core/hooks/useLinkAlarmDisplay.js

@@ -0,0 +1,161 @@
+import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
+import _regeneratorRuntime from "@babel/runtime/regenerator";
+import { useEffect, useState, useMemo } from "react";
+import { useRequest } from "ahooks";
+import _ from "lodash";
+import DictCache from "../models/cache/DictCache";
+
+function getLinkDev(datas) {
+  // console.log("datas------------------", datas);
+  var linkDevDoc = {};
+  var linkIds = datas.filter(function (item) {
+    return item.ciType === "network_link";
+  }).map(function (item) {
+    linkDevDoc[item.id] = [item.source, item.target];
+    return item.id;
+  });
+  return {
+    linkIds: linkIds,
+    linkDevDoc: linkDevDoc
+  };
+}
+
+function getlinkAlarmLevels(alarmList, resources) {
+  var _getLinkDev = getLinkDev(resources),
+      linkDevDoc = _getLinkDev.linkDevDoc; // console.log("linkAlarmLevels-----------1", linkDevDoc, alarmList);
+
+
+  if (!alarmList) {
+    return [];
+  }
+
+  var alarms = alarmList.filter(function (alarm) {
+    return alarm.obj.alertTypeCode === "availAlert";
+  }).map(function (item) {
+    return item.id;
+  });
+  return Object.keys(linkDevDoc).filter(function (item) {
+    return _.intersection(linkDevDoc[item], alarms).length > 0;
+  }).map(function (item) {
+    return {
+      id: item,
+      level: 1
+    };
+  });
+  ;
+}
+/**
+ * 处理链路显示
+ * @param {*} props
+ * @returns
+ */
+
+
+export default function useLinkAlarmDisplay(props) {
+  var topo = props.topo,
+      resources = props.resources,
+      graphLoaded = props.graphLoaded,
+      alarmList = props.alarmList;
+
+  var _useState = useState(getLinkDev(resources).linkIds),
+      linkIds = _useState[0],
+      setLinkIds = _useState[1];
+
+  var _useState2 = useState([]),
+      linkRunStatus = _useState2[0],
+      setLinkRunStatus = _useState2[1];
+
+  var _useState3 = useState(getLinkDev(resources).linkDevDoc),
+      linkDev = _useState3[0],
+      setLinkDev = _useState3[1]; // console.log("alarmList----------sssss", alarmList);
+
+
+  useEffect(function () {
+    var ids = getLinkDev(resources).linkIds;
+
+    if (linkIds.join(",") !== ids.join(",")) {
+      setLinkIds(ids);
+    }
+  }, [resources]);
+
+  function getLinkRunStatus(_x) {
+    return _getLinkRunStatus.apply(this, arguments);
+  } // 轮询hooks
+
+
+  function _getLinkRunStatus() {
+    _getLinkRunStatus = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(ids) {
+      var _yield$Promise$all, ciMetricsResult;
+
+      return _regeneratorRuntime.wrap(function _callee$(_context) {
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            if (ids.length) {
+              _context.next = 2;
+              break;
+            }
+
+            return _context.abrupt("return", []);
+
+          case 2:
+            _context.t0 = Promise;
+            _context.t1 = // 查询指标值
+            topo.serverApi.ciInfo.batchQueryCiInfo({
+              ciId: [],
+              codes: ["run_status", "remote_ping_status"],
+              relationId: ids.map(function (id) {
+                return {
+                  ciId: id,
+                  operation: "delete"
+                };
+              })
+            });
+            _context.next = 6;
+            return DictCache.init();
+
+          case 6:
+            _context.t2 = _context.sent;
+            _context.t3 = [_context.t1, _context.t2];
+            _context.next = 10;
+            return _context.t0.all.call(_context.t0, _context.t3);
+
+          case 10:
+            _yield$Promise$all = _context.sent;
+            ciMetricsResult = _yield$Promise$all[0];
+            return _context.abrupt("return", ciMetricsResult);
+
+          case 13:
+          case "end":
+            return _context.stop();
+        }
+      }, _callee);
+    }));
+    return _getLinkRunStatus.apply(this, arguments);
+  }
+
+  var _useRequest = useRequest(getLinkRunStatus, {
+    pollingInterval: 60 * 1000,
+    pollingWhenHidden: false,
+    // debounceInterval: 200,
+    manual: true,
+    onSuccess: function onSuccess(result) {
+      setLinkRunStatus(result.map(function (item) {
+        return {
+          id: item.id,
+          runStatus: item.metrics.run_status
+        };
+      }));
+    }
+  }),
+      run = _useRequest.run;
+
+  useEffect(function () {
+    if (graphLoaded) {
+      run(linkIds);
+    }
+  }, [graphLoaded, linkIds]);
+  return {
+    linkRunStatus: linkRunStatus,
+    getlinkAlarmLevels: getlinkAlarmLevels
+  };
+}

package/es/core/models/Alarm.js

@@ -1,9 +1,9 @@
 import _Dialog from "@alifd/next/es/dialog";
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
-import topoService from '@riil-frontend/component-topology-common/es/services/topo';
-import { rlog } from '@riil-frontend/component-topology-utils';
+import loglevel from 'loglevel';
 import { isAvailableArray } from '@riil-frontend/utils';
+var rlog = loglevel.getLogger('topo');
 
 var Alarm = /*#__PURE__*/function () {
   function Alarm() {
@@ -456,7 +456,7 @@ var Alarm = /*#__PURE__*/function () {
             resIdsList = resAndMetrics.resIdsList, nodeIdsList = resAndMetrics.nodeIdsList, linkIdsList = resAndMetrics.linkIdsList;
             alarmDispatchers = this.topo.store.getModelDispatchers('topoAlarm'); // 添加事件
 
-            console.log("handleAlarmEvent-接收到推送的原始告警信息", alertData);
+            rlog.debug("handleAlarmEvent-接收到推送的原始告警信息", alertData);
 
             if (!(isAvailableArray(alertData) && isAvailableArray(resIdsList))) {
               _context8.next = 25;

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

package/es/core/store/models/topoAlarm.js

@@ -5,9 +5,11 @@ import _regeneratorRuntime from "@babel/runtime/regenerator";
 /**
  * 告警
  */
-import rlog from "@riil-frontend/component-topology-utils/es/rlog";
+import loglevel from 'loglevel';
 import _ from "lodash";
-var showAlarmStatus = ["toDeal", "dealing", "change", "woDealing"];
+var rlog = loglevel.getLogger('topo'); // 在活告警状态
+
+var aliveAlarmStatus = ["toDeal", "dealing", "change", "woDealing"];
 
 var sortList = function sortList(a, b) {
   if (a.level === b.level) {
@@ -111,7 +113,7 @@ export default function (topo) {
 
                           if ((resIdsList || []).indexOf(rid) >= 0) {
                             if (record.indexOf(item.alertId) < 0) {
-                              if (showAlarmStatus.indexOf(item.status) >= 0) {
+                              if (aliveAlarmStatus.indexOf(item.status) >= 0) {
                                 // rlog.debug("这是一条新告警", item);
                                 record.push(item.alertId);
 
@@ -141,7 +143,7 @@ export default function (topo) {
                               //   item
                               // );
 
-                              if (showAlarmStatus.indexOf(item.status) >= 0) {
+                              if (aliveAlarmStatus.indexOf(item.status) >= 0) {
                                 if (item.status === "change") {
                                   old = doc[rid][sliceTag];
 
@@ -210,7 +212,7 @@ export default function (topo) {
                       // rlog.debug('xxxxxxxxxxxxxxxxxxxx', doc[id][0], alarmObj.status);
 
 
-                      return showAlarmStatus.indexOf(alarmObj.status) >= 0 ? alarmObj : null;
+                      return aliveAlarmStatus.indexOf(alarmObj.status) >= 0 ? alarmObj : null;
                     } else {
                       return null;
                     }

package/es/core/utils/alarmUtil.js

@@ -0,0 +1,11 @@
+// 告警在活状态
+var Alarm_alive_Status = ["toDeal", "dealing", "change", "woDealing"];
+/**
+ * 告警是否在活
+ * @param {*} alarm 
+ * @returns 
+ */
+
+export var isAlarmAlive = function isAlarmAlive(alarm) {
+  return Alarm_alive_Status.includes(alarm.status);
+};

package/lib/core/components/TopoView/topoView.js

@@ -178,7 +178,10 @@ var Topology = function Topology(props) {
     });
 
     if (onLoad) {
-      onLoad();
+      onLoad({
+        topo: topo,
+        topoData: topoData
+      });
     }
   }, [topoData]);
   var handleGraphLoaded = (0, _react.useCallback)(function () {
@@ -218,7 +221,10 @@ var Topology = function Topology(props) {
     }
 
     if (onLoad) {
-      onLoad();
+      onLoad({
+        topo: topo,
+        topoData: topoData
+      });
     }
   }, [topoData]);
 

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

@@ -48,11 +48,12 @@ var LINE_TYPE_OPTIONS = [{
   value: 'doublearc',
   label: '双弧线',
   icon: 'topo_linear_icon_arcline'
-}, {
-  value: 'points',
-  label: '自由线形',
-  icon: 'topo_linear_icon_pointsline'
-}];
+} // {
+//   value: 'points',
+//   label: '自由线形',
+//   icon: 'topo_linear_icon_pointsline',
+// },
+];
 
 var LineType = /*#__PURE__*/_react["default"].forwardRef(function (props, ref) {
   var value = props.value,

package/lib/core/hooks/useAlarm.js

@@ -15,17 +15,7 @@ var _useGraphAlarmDisplay = _interopRequireDefault(require("./useGraphAlarmDispl
 
 var _useTopoEventListener = _interopRequireDefault(require("./useTopoEventListener"));
 
-// 告警在活状态
-var showAlarmStatus = ["toDeal", "dealing", "change", "woDealing"];
-/**
- * 告警是否在活
- * @param {*} alarm 
- * @returns 
- */
-
-var isAlarmAlive = function isAlarmAlive(alarm) {
-  return showAlarmStatus.indexOf(alarm.status) >= 0;
-};
+var _alarmUtil = require("../utils/alarmUtil");
 
 var handleRiskData = function handleRiskData(topo, receivedData) {
   var _risks, _topo$viewProps, _topo$viewProps2;
@@ -35,7 +25,7 @@ var handleRiskData = function handleRiskData(topo, receivedData) {
   // 已关闭 closed
   var prevRisks = topo.store.getModelState('topoAlarm').risks;
 
-  var isLiveRisk = function isLiveRisk(data) {
+  var isRiskAlive = function isRiskAlive(data) {
     return ['recovered', 'closed'].indexOf(data.status) === -1;
   };
 
@@ -64,7 +54,7 @@ var handleRiskData = function handleRiskData(topo, receivedData) {
   (_risks = risks).push.apply(_risks, addRisks); // 过滤掉无权限、非在活的
 
 
-  risks = risks.filter(isLiveRisk).filter(hasCiPermission).sort(function (a, b) {
+  risks = risks.filter(isRiskAlive).filter(hasCiPermission).sort(function (a, b) {
     return a.executeTime - b.executeTime;
   });
 
@@ -149,7 +139,7 @@ function convertAlarmData(alarms) {
       // 数据id
       resourceId: resourceId,
       // 是否在活
-      alive: isAlarmAlive(alarm)
+      alive: (0, _alarmUtil.isAlarmAlive)(alarm)
     });
   });
 }

package/lib/core/hooks/useGraphAlarmDisplay.js

@@ -7,7 +7,7 @@ exports["default"] = useGraphAlarmDisplay;
 
 var _react = require("react");
 
-var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
+var _loglevel = _interopRequireDefault(require("loglevel"));
 
 var _htElementUtils = require("../../utils/htElementUtils");
 
@@ -15,12 +15,17 @@ var _showGraphManageStatusUtil = require("../utils/showGraphManageStatusUtil");
 
 var _useCmpLinkAlarm2 = _interopRequireDefault(require("./useCmpLinkAlarm"));
 
+var _useLinkAlarmDisplay2 = _interopRequireDefault(require("./useLinkAlarmDisplay"));
+
+var rlog = _loglevel["default"].getLogger('topo');
 /**
  * 获取ci的最高告警级别
- * @param {Array} alarmList 
- * @param {*} risks 
- * @returns 
+ * @param {Array} alarmList
+ * @param {*} risks
+ * @returns
  */
+
+
 function getCiAlarmLevelMap(alarmList) {
   var ciIdLevelMap = {};
   alarmList.forEach(function (item) {
@@ -51,9 +56,9 @@ function getGraphCiElementAlarmLevels(resources, alarmList) {
 }
 /**
  * 获得关联拓扑节点告警级别
- * @param {*} topo 
- * @param {*} relateTopoAlarm 
- * @returns 
+ * @param {*} topo
+ * @param {*} relateTopoAlarm
+ * @returns
  */
 
 
@@ -61,7 +66,7 @@ function getRelateTopoNodeAlarmLevels(topo, relateTopoAlarm) {
   return Object.keys(relateTopoAlarm).map(function (topoId) {
     var level = relateTopoAlarm[topoId];
     var relateTopoNode = topo.getDataModel().getDatas().toArray().find(function (node) {
-      return "" + node.a('bindTopo') === "" + topoId;
+      return "" + node.a("bindTopo") === "" + topoId;
     });
 
     if (!level || !relateTopoNode) {
@@ -81,18 +86,18 @@ function getRelateTopoNodeAlarmLevels(topo, relateTopoAlarm) {
 function getGraphElementAlarmLevels(resources) {}
 /**
  * 告警显示到ht拓扑
- * 
- * @param {*} options 
+ *
+ * @param {*} options
  */
 
 
 function useGraphAlarmDisplay(options) {
   var topo = options.topo,
       alarmSwitch = options.alarmSwitch;
-  var topoState = topo.store.useModelState('topoMod');
+  var topoState = topo.store.useModelState("topoMod");
   var graphLoaded = topoState.graphLoaded,
       viewState = topoState.viewState;
-  var isEditMode = viewState === 'edit';
+  var isEditMode = viewState === "edit";
 
   var _topo$alarm$useState = topo.alarm.useState(),
       alarmList = _topo$alarm$useState.alarmList,
@@ -110,12 +115,29 @@ function useGraphAlarmDisplay(options) {
       cmpLinkRunStatus = _useCmpLinkAlarm.cmpLinkRunStatus,
       addCmpLinkOfflineStatusForDisplayLineColor = _useCmpLinkAlarm.addCmpLinkOfflineStatusForDisplayLineColor;
 
-  var resources = (0, _react.useMemo)(function () {
+  var cmpRes = (0, _react.useMemo)(function () {
     return addCmpLinkOfflineStatusForDisplayLineColor(oldResources, cmpLinkRunStatus);
-  }, [oldResources, cmpLinkRunStatus]); // ci告警级别
+  }, [oldResources, cmpLinkRunStatus]); // 拓扑链路特殊处理
+
+  var _useLinkAlarmDisplay = (0, _useLinkAlarmDisplay2["default"])({
+    topo: topo,
+    resources: cmpRes,
+    graphLoaded: graphLoaded,
+    alarmList: alarmList
+  }),
+      linkRunStatus = _useLinkAlarmDisplay.linkRunStatus,
+      getlinkAlarmLevels = _useLinkAlarmDisplay.getlinkAlarmLevels; // const resources = useMemo(() => addLinkOfflineStatusForDisplayLineColor(cmpRes, linkRunStatus), [cmpRes, linkRunStatus])
+
+
+  var linkAlarmLevels = getlinkAlarmLevels(alarmList, cmpRes);
+  var resources = [].concat(cmpRes); //1.7 需求，过滤掉断开状态的链路
+  //  const resources = cmpRes.filter((item) => {
+  //     return !item.breakState;
+  //   });
+  // ci告警级别
 
   var cisEventLevel = (0, _react.useMemo)(function () {
-    var levels = [].concat(alarmList || [], cmpLinkAlarmLevels, risks.map(function (item) {
+    var levels = [].concat(alarmList || [], cmpLinkAlarmLevels, linkAlarmLevels, risks.map(function (item) {
       var _item$resourceId;
 
       return {
@@ -161,19 +183,17 @@ function useGraphAlarmDisplay(options) {
         var alarmLevel = (_elementsAlarmLevels$ = elementsAlarmLevels.find(function (item) {
           return item.id === element.getTag() || item.elementId === element.getId();
         })) === null || _elementsAlarmLevels$ === void 0 ? void 0 : _elementsAlarmLevels$.level;
-        element.a('alarmLevel', alarmLevel);
+        element.a("alarmLevel", alarmLevel);
       });
-
-      _rlog["default"].debug('推送告警 => ht', {
+      rlog.debug("推送告警 => ht", {
         alarms: elementsAlarmLevels,
         relateTopoAlarmMap: relateTopoAlarm,
         relateTopoAlarms: relateTopoAlarms
       }); // 更新到ht拓扑
 
-
-      (_topo$historyManager = topo.historyManager) === null || _topo$historyManager === void 0 ? void 0 : _topo$historyManager.setDisabled(true, '推送告警');
+      (_topo$historyManager = topo.historyManager) === null || _topo$historyManager === void 0 ? void 0 : _topo$historyManager.setDisabled(true, "推送告警");
       topo.view.loadAlarm(elementsAlarmLevels);
-      (_topo$historyManager2 = topo.historyManager) === null || _topo$historyManager2 === void 0 ? void 0 : _topo$historyManager2.setDisabled(false, '推送告警');
+      (_topo$historyManager2 = topo.historyManager) === null || _topo$historyManager2 === void 0 ? void 0 : _topo$historyManager2.setDisabled(false, "推送告警");
     }
 
     return function () {