@riil-frontend/component-topology 13.0.4 → 13.0.6

package/es/core/hooks/useGraphAlarmDisplay.js

@@ -2,8 +2,8 @@ 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";
-import useLinkAlarmDisplay from "./useLinkAlarmDisplay";
+import useCmpLinkAlarm from "./useCmpLinkAlarm"; // import useLinkAlarmDisplay from "./useLinkAlarmDisplay";
+
 /**
  * 获取ci的最高告警级别
  * @param {Array} alarmList
@@ -102,26 +102,23 @@ export default function useGraphAlarmDisplay(options) {
 
   var cmpRes = useMemo(function () {
     return addCmpLinkOfflineStatusForDisplayLineColor(oldResources, cmpLinkRunStatus);
-  }, [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 = cmpRes.filter(function (item) {
-    return !item.breakState;
-  }); // ci告警级别
+  }, [oldResources, cmpLinkRunStatus]);
+  var resources = [].concat(cmpRes); // 拓扑链路特殊处理 暂时屏蔽这部分处理
+  // const {
+  //   // linkAlarmLevels,
+  //   linkRunStatus,
+  //   getlinkAlarmLevels,
+  // } = useLinkAlarmDisplay({ topo, resources: cmpRes, graphLoaded, alarmList });
+  // const linkAlarmLevels = getlinkAlarmLevels(alarmList, cmpRes);
+  // 排除掉处于断开状态的链路
+  // const resources = cmpRes.filter((item) => {
+  //   return !item.breakState;
+  // });
+  /// 屏蔽------------
+  // ci告警级别
 
   var cisEventLevel = useMemo(function () {
-    var levels = [].concat(alarmList || [], cmpLinkAlarmLevels, linkAlarmLevels, risks.map(function (item) {
+    var levels = [].concat(alarmList || [], cmpLinkAlarmLevels, risks.map(function (item) {
       var _item$resourceId;
 
       return {

package/es/core/hooks/usePolling.js

@@ -124,6 +124,7 @@ var usePolling = function usePolling(props) {
                     position: 17,
                     icon: "resource.link.linkbreak"
                   });
+                  element === null || element === void 0 ? void 0 : element.a('linkbreak', true);
                   topo.dataModel.updateData([_extends({}, link, {
                     breakState: true
                   })]);

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

package/es/networkTopo/hooks/viewer/useEdgeFlow.js

@@ -1,17 +1,17 @@
-import { useEffect } from 'react';
+import { useEffect } from "react";
 /**
  * 默认情况下，拓扑图不存在链路的动态效果
  * 未监控的链路，不展示动态效果
- * @param {*} props 
+ * @param {*} props
  */
 
 export default function useEdgeFlow(props) {
   var topo = props.topo;
-  var topoState = topo.store.useModelState('topoMod');
-  var displayConfig = topo.store.useModelState('displayConfig');
+  var topoState = topo.store.useModelState("topoMod");
+  var displayConfig = topo.store.useModelState("displayConfig");
   var graphLoaded = topoState.graphLoaded,
       viewState = topoState.viewState;
-  var isViewer = viewState !== 'edit';
+  var isViewer = viewState !== "edit";
   var edgeFlow = displayConfig.edgeFlow,
       edgeFlowDirection = displayConfig.edgeFlowDirection;
   var resources = topo.dataModel.useCis();
@@ -21,7 +21,7 @@ export default function useEdgeFlow(props) {
       var edgeFlowConfig = edgeFlow ? {
         type: edgeFlow,
         // 必填，支持传送带drip、光点point、箭头arrow
-        direction: !edgeFlowDirection || edgeFlowDirection === 'from' ? 'to' : 'from' // 流动方向，可为空. 默认上行目的到源
+        direction: !edgeFlowDirection || edgeFlowDirection === "from" ? "to" : "from" // 流动方向，可为空. 默认上行目的到源
 
       } : null;
       topo.getHtTopo().setGlobalEdgeFlow(edgeFlowConfig); // 未监控的链路，不展示动态效果
@@ -34,8 +34,12 @@ export default function useEdgeFlow(props) {
           var element = topo.getDataModel().getDataByTag(id);
           if (!element) return;
 
-          if (element instanceof ht.Edge && isNotMonite) {
-            element.s('flow', false);
+          if (element instanceof ht.Edge) {
+            var isBreak = element.a("linkbreak");
+
+            if (isNotMonite || isBreak) {
+              element.s("flow", false);
+            }
           }
         });
       }

package/lib/core/hooks/useGraphAlarmDisplay.js

@@ -15,7 +15,7 @@ var _showGraphManageStatusUtil = require("../utils/showGraphManageStatusUtil");
 
 var _useCmpLinkAlarm2 = _interopRequireDefault(require("./useCmpLinkAlarm"));
 
-var _useLinkAlarmDisplay2 = _interopRequireDefault(require("./useLinkAlarmDisplay"));
+// import useLinkAlarmDisplay from "./useLinkAlarmDisplay";
 
 /**
  * 获取ci的最高告警级别
@@ -114,26 +114,23 @@ function useGraphAlarmDisplay(options) {
 
   var cmpRes = (0, _react.useMemo)(function () {
     return addCmpLinkOfflineStatusForDisplayLineColor(oldResources, cmpLinkRunStatus);
-  }, [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 = cmpRes.filter(function (item) {
-    return !item.breakState;
-  }); // ci告警级别
+  }, [oldResources, cmpLinkRunStatus]);
+  var resources = [].concat(cmpRes); // 拓扑链路特殊处理 暂时屏蔽这部分处理
+  // const {
+  //   // linkAlarmLevels,
+  //   linkRunStatus,
+  //   getlinkAlarmLevels,
+  // } = useLinkAlarmDisplay({ topo, resources: cmpRes, graphLoaded, alarmList });
+  // const linkAlarmLevels = getlinkAlarmLevels(alarmList, cmpRes);
+  // 排除掉处于断开状态的链路
+  // const resources = cmpRes.filter((item) => {
+  //   return !item.breakState;
+  // });
+  /// 屏蔽------------
+  // ci告警级别
 
   var cisEventLevel = (0, _react.useMemo)(function () {
-    var levels = [].concat(alarmList || [], cmpLinkAlarmLevels, linkAlarmLevels, risks.map(function (item) {
+    var levels = [].concat(alarmList || [], cmpLinkAlarmLevels, risks.map(function (item) {
       var _item$resourceId;
 
       return {

package/lib/core/hooks/usePolling.js

@@ -143,6 +143,7 @@ var usePolling = function usePolling(props) {
                     position: 17,
                     icon: "resource.link.linkbreak"
                   });
+                  element === null || element === void 0 ? void 0 : element.a('linkbreak', true);
                   topo.dataModel.updateData([(0, _extends2["default"])({}, link, {
                     breakState: true
                   })]);

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

package/lib/networkTopo/hooks/viewer/useEdgeFlow.js

@@ -8,15 +8,15 @@ var _react = require("react");
 /**
  * 默认情况下，拓扑图不存在链路的动态效果
  * 未监控的链路，不展示动态效果
- * @param {*} props 
+ * @param {*} props
  */
 function useEdgeFlow(props) {
   var topo = props.topo;
-  var topoState = topo.store.useModelState('topoMod');
-  var displayConfig = topo.store.useModelState('displayConfig');
+  var topoState = topo.store.useModelState("topoMod");
+  var displayConfig = topo.store.useModelState("displayConfig");
   var graphLoaded = topoState.graphLoaded,
       viewState = topoState.viewState;
-  var isViewer = viewState !== 'edit';
+  var isViewer = viewState !== "edit";
   var edgeFlow = displayConfig.edgeFlow,
       edgeFlowDirection = displayConfig.edgeFlowDirection;
   var resources = topo.dataModel.useCis();
@@ -26,7 +26,7 @@ function useEdgeFlow(props) {
       var edgeFlowConfig = edgeFlow ? {
         type: edgeFlow,
         // 必填，支持传送带drip、光点point、箭头arrow
-        direction: !edgeFlowDirection || edgeFlowDirection === 'from' ? 'to' : 'from' // 流动方向，可为空. 默认上行目的到源
+        direction: !edgeFlowDirection || edgeFlowDirection === "from" ? "to" : "from" // 流动方向，可为空. 默认上行目的到源
 
       } : null;
       topo.getHtTopo().setGlobalEdgeFlow(edgeFlowConfig); // 未监控的链路，不展示动态效果
@@ -39,8 +39,12 @@ function useEdgeFlow(props) {
           var element = topo.getDataModel().getDataByTag(id);
           if (!element) return;
 
-          if (element instanceof ht.Edge && isNotMonite) {
-            element.s('flow', false);
+          if (element instanceof ht.Edge) {
+            var isBreak = element.a("linkbreak");
+
+            if (isNotMonite || isBreak) {
+              element.s("flow", false);
+            }
           }
         });
       }

package/package.json

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