@riil-frontend/component-topology 12.1.7 → 12.1.8

package/es/core/hooks/useGraphAlarmDisplay.js

@@ -33,11 +33,6 @@ 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;
   });
 }
 /**
@@ -90,7 +85,7 @@ export default function useGraphAlarmDisplay(options) {
       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,29 +96,19 @@ export default function useGraphAlarmDisplay(options) {
       cmpLinkRunStatus = _useCmpLinkAlarm.cmpLinkRunStatus,
       addCmpLinkOfflineStatusForDisplayLineColor = _useCmpLinkAlarm.addCmpLinkOfflineStatusForDisplayLineColor;
 
-  var cmpRes = useMemo(function () {
+  var resources = useMemo(function () {
     return addCmpLinkOfflineStatusForDisplayLineColor(oldResources, cmpLinkRunStatus);
-  }, [oldResources, cmpLinkRunStatus]); // 拓扑链路特殊处理
+  }, [oldResources, cmpLinkRunStatus]); // 拓扑链路通断告警特殊处理。待迁移到业务模块
 
   var _useLinkAlarmDisplay = useLinkAlarmDisplay({
-    topo: topo,
-    resources: cmpRes,
-    graphLoaded: graphLoaded,
+    resources: resources,
     alarmList: alarmList
   }),
-      linkRunStatus = _useLinkAlarmDisplay.linkRunStatus,
-      getlinkAlarmLevels = _useLinkAlarmDisplay.getlinkAlarmLevels; // const resources = useMemo(() => addLinkOfflineStatusForDisplayLineColor(cmpRes, linkRunStatus), [cmpRes, linkRunStatus])
-
+      linkBreakAlarmLevels = _useLinkAlarmDisplay.linkBreakAlarmLevels; // ci告警级别
 
-  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, linkAlarmLevels, risks.map(function (item) {
+    var alarmLevels = [].concat(alarmList || [], cmpLinkAlarmLevels, linkBreakAlarmLevels, risks.map(function (item) {
       var _item$resourceId;
 
       return {
@@ -131,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();
@@ -155,7 +152,7 @@ export default function useGraphAlarmDisplay(options) {
         // 告警静默
         topo.view.loadAlarm([]);
         return;
-      } // 关联拓扑告警
+      } // 关联拓扑告警。待迁移到业务模块
 
 
       var relateTopoAlarms = getRelateTopoNodeAlarmLevels(topo, relateTopoAlarm);

package/es/core/hooks/useLinkAlarmDisplay.js

@@ -1,14 +1,10 @@
-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) {
+  var linkIds = datas // 
+  .filter(function (item) {
     return item.ciType === "network_link";
   }).map(function (item) {
     linkDevDoc[item.id] = [item.source, item.target];
@@ -22,15 +18,16 @@ function getLinkDev(datas) {
 
 function getlinkAlarmLevels(alarmList, resources) {
   var _getLinkDev = getLinkDev(resources),
-      linkDevDoc = _getLinkDev.linkDevDoc; // console.log("linkAlarmLevels-----------1", linkDevDoc, alarmList);
-
+      linkDevDoc = _getLinkDev.linkDevDoc;
 
   if (!alarmList) {
     return [];
   }
 
   var alarms = alarmList.filter(function (alarm) {
-    return alarm.obj.alertTypeCode === "availAlert";
+    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;
   });
@@ -52,110 +49,10 @@ function getlinkAlarmLevels(alarmList, resources) {
 
 
 export default function useLinkAlarmDisplay(props) {
-  var topo = props.topo,
-      resources = props.resources,
-      graphLoaded = props.graphLoaded,
+  var resources = props.resources,
       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]);
+  var linkBreakAlarmLevels = getlinkAlarmLevels(alarmList, resources);
   return {
-    linkRunStatus: linkRunStatus,
-    getlinkAlarmLevels: getlinkAlarmLevels
+    linkBreakAlarmLevels: linkBreakAlarmLevels
   };
 }

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

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: "时间",