@riil-frontend/component-topology 5.0.0-alpha.9 → 5.0.2

package/es/core/hooks/useGraphAlarmDisplay.js

@@ -50,7 +50,8 @@ export default function useGraphAlarmDisplay(options) {
 
   var _topo$alarm$useState = topo.alarm.useState(),
       alarmList = _topo$alarm$useState.alarmList,
-      risks = _topo$alarm$useState.risks;
+      risks = _topo$alarm$useState.risks,
+      relateTopoAlarm = _topo$alarm$useState.relateTopoAlarm;
 
   var resources = topo.dataModel.useCis();
 
@@ -100,9 +101,30 @@ export default function useGraphAlarmDisplay(options) {
           return item.id === element.getTag();
         })) === null || _finalAlarms$find === void 0 ? void 0 : _finalAlarms$find.level;
         element.a('alarmLevel', alarmLevel);
+      });
+      var relateTopoAlarms = Object.keys(relateTopoAlarm).map(function (topoId) {
+        var level = relateTopoAlarm[topoId];
+        var relateTopoNode = topo.getDataModel().getDatas().toArray().find(function (node) {
+          return "" + node.a('bindTopo') === "" + topoId;
+        });
+
+        if (!level || !relateTopoNode) {
+          return null;
+        }
+
+        return {
+          elementId: relateTopoNode.getId(),
+          level: level
+        };
+      }).filter(function (item) {
+        return !!item;
+      });
+      rlog.debug("\u5173\u8054\u62D3\u6251\u544A\u8B66\uFF1A\u63A8\u9001ht " + Object.keys(relateTopoAlarms).length, {
+        all: relateTopoAlarm,
+        graphAlarm: relateTopoAlarms
       }); // 更新到ht拓扑
 
-      topo.view.loadAlarm(finalAlarms);
+      topo.view.loadAlarm([].concat(finalAlarms, relateTopoAlarms));
     }
 
     return function () {
@@ -111,5 +133,5 @@ export default function useGraphAlarmDisplay(options) {
         resources: resources
       });
     };
-  }, [isEditMode, graphLoaded, resources, alarmSwitch, alarmList, risks]);
+  }, [isEditMode, graphLoaded, resources, alarmSwitch, alarmList, risks, relateTopoAlarm]);
 }

package/es/core/hooks/useResourceConfig.js

@@ -45,7 +45,8 @@ export default function (props) {
     return {
       resources: config.resources,
       groups: config.groups,
-      exportLinkIdList: config.exportLinkIdList
+      exportLinkIdList: config.exportLinkIdList,
+      relateTopoIdList: config.relateTopoIdList
     };
   };
 

package/es/core/hooks/useRouterAdapter.js

@@ -1,3 +1,4 @@
+import { setHistory } from '@riil-frontend/component-topology-utils';
 import { setLink } from "../../components/Link";
 /**
  * Link组件支持传入，以便于支持页签keepalive
@@ -5,10 +6,15 @@ import { setLink } from "../../components/Link";
  */
 
 export default function useRouterAdapter(props) {
-  var topoContext = props.topoContext;
+  var topoContext = props.topoContext,
+      history = props.history;
   var Link = topoContext.Link;
 
   if (Link) {
     setLink(Link);
   }
+
+  if (history) {
+    setHistory(history);
+  }
 }