@riil-frontend/component-topology 12.1.5 → 12.1.8

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/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) {
@@ -31,18 +33,13 @@ function getGraphCiElementAlarmLevels(resources, alarmList) {
       id: id,
       level: ciIdLevelMap[id]
     };
-  }).filter(function (alarm) {
-    var resource = resources.find(function (item) {
-      return item.id === alarm.id;
-    });
-    return !!resource;
   });
 }
 /**
  * 获得关联拓扑节点告警级别
- * @param {*} topo 
- * @param {*} relateTopoAlarm 
- * @returns 
+ * @param {*} topo
+ * @param {*} relateTopoAlarm
+ * @returns
  */
 
 
@@ -50,7 +47,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,25 +67,25 @@ 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,
       risks = _topo$alarm$useState.risks,
       relateTopoAlarm = _topo$alarm$useState.relateTopoAlarm;
 
-  var oldResources = topo.dataModel.useCis(); // 分级拓扑下级链路特殊处理
+  var oldResources = topo.dataModel.useCis(); // 分级拓扑下级链路特殊处理。待迁移到业务模块
 
   var _useCmpLinkAlarm = useCmpLinkAlarm({
     topo: topo,
@@ -101,10 +98,17 @@ export default function useGraphAlarmDisplay(options) {
 
   var resources = useMemo(function () {
     return addCmpLinkOfflineStatusForDisplayLineColor(oldResources, cmpLinkRunStatus);
-  }, [oldResources, cmpLinkRunStatus]); // ci告警级别
+  }, [oldResources, cmpLinkRunStatus]); // 拓扑链路通断告警特殊处理。待迁移到业务模块
+
+  var _useLinkAlarmDisplay = useLinkAlarmDisplay({
+    resources: resources,
+    alarmList: alarmList
+  }),
+      linkBreakAlarmLevels = _useLinkAlarmDisplay.linkBreakAlarmLevels; // ci告警级别
+
 
   var cisEventLevel = useMemo(function () {
-    var levels = [].concat(alarmList || [], cmpLinkAlarmLevels, risks.map(function (item) {
+    var alarmLevels = [].concat(alarmList || [], cmpLinkAlarmLevels, linkBreakAlarmLevels, risks.map(function (item) {
       var _item$resourceId;
 
       return {
@@ -112,7 +116,19 @@ export default function useGraphAlarmDisplay(options) {
         level: 5
       };
     }));
-    return getGraphCiElementAlarmLevels(resources, levels);
+    return getGraphCiElementAlarmLevels(resources, alarmLevels) // 过滤元素不存在
+    .filter(function (alarm) {
+      var resource = resources.find(function (item) {
+        return item.id === alarm.id;
+      });
+      return !!resource;
+    }) // v1.7 过滤掉断开状态的链路，不显示告警
+    .filter(function (alarm) {
+      var resource = resources.find(function (item) {
+        return item.id === alarm.id;
+      });
+      return !resource.breakState;
+    });
   }, [resources, alarmList, cmpLinkAlarmLevels, risks]);
   useEffect(function () {
     showAlarm();
@@ -136,7 +152,7 @@ export default function useGraphAlarmDisplay(options) {
         // 告警静默
         topo.view.loadAlarm([]);
         return;
-      } // 关联拓扑告警
+      } // 关联拓扑告警。待迁移到业务模块
 
 
       var relateTopoAlarms = getRelateTopoNodeAlarmLevels(topo, relateTopoAlarm);
@@ -150,17 +166,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,58 @@
+import { useEffect, useState, useMemo } from "react";
+import _ from "lodash";
+
+function getLinkDev(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;
+
+  if (!alarmList) {
+    return [];
+  }
+
+  var alarms = alarmList.filter(function (alarm) {
+    var _alarm$obj;
+
+    return ((_alarm$obj = alarm.obj) === null || _alarm$obj === void 0 ? void 0 : _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 resources = props.resources,
+      alarmList = props.alarmList;
+  var linkBreakAlarmLevels = getlinkAlarmLevels(alarmList, resources);
+  return {
+    linkBreakAlarmLevels: linkBreakAlarmLevels
+  };
+}

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.5" === 'string' ? "12.1.5" : null;
+var version = typeof "12.1.8" === 'string' ? "12.1.8" : 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/es/core/utils/showGraphManageStatusUtil.js

@@ -14,39 +14,41 @@ export function showManageStatus(options) {
   }; // 首次加载和监控状态变化后，更新节点和连线置灰状态
 
 
-  if (graphLoaded) {
-    resources.forEach(function (resource) {
-      var type = resource.type,
-          id = resource.id,
-          manageStatus = resource.manageStatus,
-          permission = resource.permission;
-      var isNotMonite = manageStatus === 0;
-      var readable = !!(permission !== null && permission !== void 0 && permission.readable); // 未监控 && 有查看权限 && (告警静默 || 没有告警)，才显示未监控状态
+  if (!graphLoaded) {
+    return;
+  }
 
-      var showUnMoniteStatus = isNotMonite && readable && (alarmSwitch === false || !hasAlarm(id));
-      var element = topo.getDataModel().getDataByTag(id);
-      if (!element) return; // ht元素设置是否显示监控状态，是否展示，用于缩小色块时显示未监控颜色
+  resources.forEach(function (resource) {
+    var type = resource.type,
+        id = resource.id,
+        manageStatus = resource.manageStatus,
+        permission = resource.permission;
+    var isNotMonite = manageStatus === 0;
+    var readable = !!(permission !== null && permission !== void 0 && permission.readable); // 显示未监控状态条件：未监控 && 有查看权限 && (告警静默 || 没有告警)
 
-      element.a('ci.isMonitoring', !showUnMoniteStatus);
+    var showUnMoniteStatus = isNotMonite && readable && (alarmSwitch === false || !hasAlarm(id));
+    var element = topo.getDataModel().getDataByTag(id);
+    if (!element) return; // ht元素设置是否显示监控状态，是否展示，用于缩小色块时显示未监控颜色
 
-      if (type === 'node') {
-        try {
-          if (showUnMoniteStatus) {
-            topo.getHtTopo().setNodeStyleIcon(element, {
-              styleIcon: 'unMoniter',
-              icon: 'resource.subIcon.unMoniter'
-            });
-          } else {
-            element.removeStyleIcon('unMoniter');
-          }
-        } catch (error) {
-          rlog.error('设置监控图标异常', element, error);
+    element.a('ci.isMonitoring', !showUnMoniteStatus);
+
+    if (type === 'node') {
+      try {
+        if (showUnMoniteStatus) {
+          topo.getHtTopo().setNodeStyleIcon(element, {
+            styleIcon: 'unMoniter',
+            icon: 'resource.subIcon.unMoniter'
+          });
+        } else {
+          element.removeStyleIcon('unMoniter');
         }
-      } else {
-        setElementRuntimeStyle(element, 'color', showUnMoniteStatus ? '#C9CED2' : undefined);
+      } catch (error) {
+        rlog.error('设置监控图标异常', element, error);
       }
-    });
-  }
+    } else {
+      setElementRuntimeStyle(element, 'color', showUnMoniteStatus ? '#C9CED2' : undefined);
+    }
+  });
 }
 export function removeManageStatus(options) {
   var topo = options.topo,

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

@@ -5,6 +5,7 @@ import _Icon from "@alifd/next/es/icon";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import React from 'react';
 import moment from 'moment';
+import { history as iceHistory } from 'create-app-shared';
 import BlockBox from "./BlockBox";
 import Link from "../../../../../../../components/Link";
 import service from "../../../../../../services/overview";
@@ -37,7 +38,7 @@ function EventsCard(props) {
       log.debug('formatUrl(url)', url);
       topo.viewProps.jumpto(url);
     } else {
-      getHistory().push(formatUrl(url));
+      (getHistory() || iceHistory).push(formatUrl(url));
     }
   }; // 告警table列配置
 
@@ -47,34 +48,19 @@ function EventsCard(props) {
     dataIndex: "title",
     key: "title",
     cell: function cell(value, index, record) {
-      return (
-        /*#__PURE__*/
-        // <div
-        //   className={styles["alarm-title"]}
-        //   title={value}
-        //   onClick={closeDetailDrawer}
-        // >
-        //   <Icon
-        //     type={record.icon}
-        //     size="xs"
-        //     className={`${styles["alarm-color-icon"]} ${record.className}`}
-        //   />
-        //   <Link to={formatUrl(record.link)}>{value}</Link>
-        // </div>
-        React.createElement("div", {
-          className: styles['alarm-title'],
-          title: value,
-          onClick: function onClick() {
-            jumpTo(record.link);
-          }
-        }, /*#__PURE__*/React.createElement(_Icon, {
-          type: record.icon,
-          size: "xs",
-          className: styles['alarm-color-icon'] + " " + record.className
-        }), /*#__PURE__*/React.createElement("span", {
-          className: styles.link
-        }, value))
-      );
+      return /*#__PURE__*/React.createElement("div", {
+        className: styles['alarm-title'],
+        title: value,
+        onClick: function onClick() {
+          jumpTo(record.link);
+        }
+      }, /*#__PURE__*/React.createElement(_Icon, {
+        type: record.icon,
+        size: "xs",
+        className: styles['alarm-color-icon'] + " " + record.className
+      }), /*#__PURE__*/React.createElement("span", {
+        className: styles.link
+      }, value));
     }
   }, {
     title: "时间",