@riil-frontend/component-topology 12.0.0-dev.25 → 12.0.0-dev.27

package/es/core/editor/components/Toolbar/widgets/Layout/index.js

@@ -7,7 +7,7 @@ import React, { useState, useMemo } from 'react';
 import LayoutSettings from "./components/LayoutSettings";
 import WidgetBox from "../WidgetBox";
 import DropdownButton from "../components/DropdownButton";
-import { isGroup, isLayer } from "../../../../../../utils/htElementDataUtil";
+import { isGroup, isLayer, isNode } from "../../../../../../utils/htElementDataUtil";
 
 function Layout(props) {
   var topo = props.topo,
@@ -147,7 +147,7 @@ function isLayoutEnabled(props) {
   } //中心节点布局,选中一个节点不是分层的情况下，按钮亮起
 
 
-  if (topoShowType !== 'layers' && selection.length === 1) {
+  if (topoShowType !== 'layers' && selection.length === 1 && (isNode(selection[0]) || isGroup(selection[0]))) {
     return true;
   }
 

package/es/core/editor/utils/edgeTypeStyleUtil.js

@@ -77,29 +77,6 @@ export function isNodeAllEdges(topo) {
   });
   return inEdges;
 }
-/**
- * 遍历连线及子连线
- * @param {*} topo 
- * @param {*} edges 
- * @param {*} operateEdgeFn 
- */
-
-export function loopEdgesAndChildren(topo, edges, operateEdgeFn) {
-  var htTopo = topo.getHtTopo();
-  edges.forEach(function (edge) {
-    operateEdgeFn(edge);
-
-    if (edge.isEdgeGroupAgent()) {
-      // 连线组折叠时同时设置子连线
-      var edgeChildren = edge.getEdgeGroup().getEdges().toArray();
-      htTopo.toggleEdgeGroup(edge.getSource(), edge.getTarget(), true);
-      edgeChildren.forEach(function (edgeChild) {
-        operateEdgeFn(edgeChild);
-      });
-      htTopo.toggleEdgeGroup(edge.getSource(), edge.getTarget(), false);
-    }
-  });
-}
 /**
  * 设置连线及子连线。带回退事务控制
  * @param {*} topo 

package/es/core/hooks/useAlarm.js

@@ -2,128 +2,178 @@ 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";
+import useTopoEventListener from "./useTopoEventListener"; // 告警在活状态
+
+var showAlarmStatus = ["toDeal", "dealing", "change", "woDealing"];
 /**
- * 
- * 
- * @param {*} options 
+ * 告警是否在活
+ * @param {*} alarm 
+ * @returns 
  */
 
-export default function useAlarm(options) {
-  var topo = options.topo;
-  var store = topo.store;
+var isAlarmAlive = function isAlarmAlive(alarm) {
+  return showAlarmStatus.indexOf(alarm.status) >= 0;
+};
 
-  var _topo$store$useModelS = topo.store.useModelState('displayConfig'),
-      alarmSwitch = _topo$store$useModelS.alarmSwitch,
-      alarmListDefaultOpen = _topo$store$useModelS.alarmListDefaultOpen;
+var handleRiskData = function handleRiskData(topo, receivedData) {
+  var _risks, _topo$viewProps, _topo$viewProps2;
 
-  useGraphAlarmDisplay({
-    topo: topo,
-    alarmSwitch: alarmSwitch
-  });
+  // 非在活状态：
+  // 已修复 recovered
+  // 已关闭 closed
+  var prevRisks = topo.store.getModelState('topoAlarm').risks;
+
+  var isLiveRisk = function isLiveRisk(data) {
+    return ['recovered', 'closed'].indexOf(data.status) === -1;
+  };
+
+  var hasCiPermission = function hasCiPermission(data) {
+    var _data$resourceId;
 
-  var handleRiskData = function handleRiskData(receivedData) {
-    var _risks, _topo$viewProps, _topo$viewProps2;
+    var ciId = (_data$resourceId = data.resourceId) !== null && _data$resourceId !== void 0 ? _data$resourceId : data.ciId;
+    var ci = topo.dataModel.getDataById(ciId);
+    return !!(ci !== null && ci !== void 0 && ci.operation);
+  }; // 合并
 
-    // 非在活状态：
-    // 已修复 recovered
-    // 已关闭 closed
-    var prevRisks = topo.store.getModelState('topoAlarm').risks;
 
-    var isLiveRisk = function isLiveRisk(data) {
-      return ['recovered', 'closed'].indexOf(data.status) === -1;
-    };
+  var risks = prevRisks.map(function (risk) {
+    var newRisk = receivedData.find(function (item) {
+      return item.id === risk.id;
+    });
+    return newRisk || risk;
+  }); // 新的
 
-    var hasCiPermission = function hasCiPermission(data) {
-      var _data$resourceId;
+  var addRisks = receivedData.filter(function (risk) {
+    return !prevRisks.find(function (item) {
+      return item.id === risk.id;
+    });
+  }).filter(hasCiPermission);
 
-      var ciId = (_data$resourceId = data.resourceId) !== null && _data$resourceId !== void 0 ? _data$resourceId : data.ciId;
-      var ci = topo.dataModel.getDataById(ciId);
-      return ci && ci.operation;
-    }; // 合并
+  (_risks = risks).push.apply(_risks, addRisks); // 过滤掉无权限、非在活的
 
 
-    var risks = prevRisks.map(function (risk) {
-      var newRisk = receivedData.find(function (item) {
-        return item.id === risk.id;
-      });
-      return newRisk || risk;
-    }); // 新的
+  risks = risks.filter(isLiveRisk).filter(hasCiPermission).sort(function (a, b) {
+    return a.executeTime - b.executeTime;
+  });
+  rlog.debug('更新风险', {
+    prevRisks: prevRisks,
+    receivedData: receivedData,
+    risks: risks
+  });
+  topo.store.getModelDispatchers('topoAlarm').update({
+    risks: risks
+  }); // 获取配置
 
-    var addRisks = receivedData.filter(function (risk) {
-      return !prevRisks.find(function (item) {
-        return item.id === risk.id;
-      });
-    }).filter(hasCiPermission);
+  var _topo$store$getModelS = topo.store.getModelState('displayConfig'),
+      alarmSwitch = _topo$store$getModelS.alarmSwitch,
+      alarmListDefaultOpen = _topo$store$getModelS.alarmListDefaultOpen; // 告警静默
 
-    (_risks = risks).push.apply(_risks, addRisks); // 过滤掉无权限、非在活的
 
+  if (alarmSwitch === false) {
+    return;
+  } // 告警列表
 
-    risks = risks.filter(isLiveRisk).filter(hasCiPermission).sort(function (a, b) {
-      return a.executeTime - b.executeTime;
-    });
-    rlog.debug('更新风险', {
-      prevRisks: prevRisks,
-      receivedData: receivedData,
-      risks: risks
-    });
-    topo.store.getModelDispatchers('topoAlarm').update({
-      risks: risks
+
+  if (addRisks.length && alarmListDefaultOpen) {
+    topo.alarm.updateState({
+      alarmPanelIsOpen: true
     });
+  }
 
-    if (alarmSwitch === false) {
-      // 告警静默
-      return;
-    }
+  if ((_topo$viewProps = topo.viewProps) !== null && _topo$viewProps !== void 0 && _topo$viewProps.onRisk) {
+    topo.viewProps.onRisk(risks);
+  }
 
-    if (addRisks.length && alarmListDefaultOpen) {
-      topo.alarm.updateState({
-        alarmPanelIsOpen: true
-      });
-    }
+  if ((_topo$viewProps2 = topo.viewProps) !== null && _topo$viewProps2 !== void 0 && _topo$viewProps2.onResourceEvent) {
+    topo.viewProps.onResourceEvent(topo.alarm.getEvents());
+  }
+};
+/**
+ * 关联拓扑告警级别消息处理
+ * @param {*} topo 
+ * @param {*} data 
+ */
 
-    if ((_topo$viewProps = topo.viewProps) !== null && _topo$viewProps !== void 0 && _topo$viewProps.onRisk) {
-      topo.viewProps.onRisk(risks);
-    }
 
-    if ((_topo$viewProps2 = topo.viewProps) !== null && _topo$viewProps2 !== void 0 && _topo$viewProps2.onResourceEvent) {
-      topo.viewProps.onResourceEvent(topo.alarm.getEvents());
-    }
-  };
+var handleRelateTopoAlarm = function handleRelateTopoAlarm(topo, data) {
+  var relateTopoAlarm = _extends({}, topo.store.getModelState('topoAlarm').relateTopoAlarm);
 
-  var handleRelateTopoAlarm = function handleRelateTopoAlarm(data) {
-    var relateTopoAlarm = _extends({}, topo.store.getModelState('topoAlarm').relateTopoAlarm);
+  data.forEach(function (item) {
+    var alertLevel = item.alertLevel;
 
-    data.forEach(function (item) {
+    if (alertLevel === -1) {
+      // -1表示删除
+      delete relateTopoAlarm[item.topoId];
+    } else {
       relateTopoAlarm[item.topoId] = item.alertLevel;
+    }
+  });
+  topo.store.getModelDispatchers('topoAlarm').update({
+    relateTopoAlarm: relateTopoAlarm
+  });
+  rlog.debug("\u5173\u8054\u62D3\u6251\u544A\u8B66\uFF1A\u6536\u5230 " + data.length, {
+    received: data,
+    all: relateTopoAlarm
+  });
+};
+/**
+ * 处理分级告警
+ * @param {*} alarms 
+ * @returns 
+ */
+
+
+function convertAlarmData(alarms) {
+  return alarms.map(function (alarm) {
+    var resourceId = alarm.resourceId; // 分级资源id转换
+
+    if (alarm.cmpAlertId) {
+      resourceId = "sub:" + alarm.mainCiId;
+    }
+
+    return _extends({}, alarm, {
+      // 数据id
+      resourceId: resourceId,
+      // 是否在活
+      alive: isAlarmAlive(alarm)
     });
-    topo.store.getModelDispatchers('topoAlarm').update({
-      relateTopoAlarm: relateTopoAlarm
-    });
-    rlog.debug("\u5173\u8054\u62D3\u6251\u544A\u8B66\uFF1A\u6536\u5230 " + data.length, {
-      received: data,
-      all: relateTopoAlarm
-    });
-  }; // 订阅消息
+  });
+}
+/**
+ * 
+ * 
+ * @param {*} options 
+ */
+
+
+export default function useAlarm(options) {
+  var topo = options.topo;
+
+  var _topo$store$useModelS = topo.store.useModelState('displayConfig'),
+      alarmSwitch = _topo$store$useModelS.alarmSwitch;
 
+  useGraphAlarmDisplay({
+    topo: topo,
+    alarmSwitch: alarmSwitch
+  }); // 订阅消息
 
   useTopoEventListener({
     type: 'alarm',
     onMessage: function onMessage(data) {
       rlog.debug("Topoget--AlertMesage------------", topo, data);
-      topo.alarm.handleAlarmEvent(data);
+      topo.alarm.handleAlarmEvent(convertAlarmData(data));
     }
   });
   useTopoEventListener({
     type: 'risk',
     onMessage: function onMessage(data) {
-      handleRiskData(data);
+      handleRiskData(topo, data);
     }
   });
   useTopoEventListener({
     type: 'relateTopoAlarm',
     onMessage: function onMessage(data) {
-      handleRelateTopoAlarm(data);
+      handleRelateTopoAlarm(topo, data);
     }
   });
 }

package/es/core/hooks/useCmpLinkAlarm.js

@@ -0,0 +1,153 @@
+import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
+import _extends from "@babel/runtime/helpers/extends";
+import _regeneratorRuntime from "@babel/runtime/regenerator";
+import { useEffect, useState, useMemo } from "react";
+import { useRequest } from 'ahooks';
+import DictCache from "../models/cache/DictCache";
+
+function addCmpLinkOfflineStatusForDisplayLineColor(cis, cmpLinkRunStatusList) {
+  return cis.map(function (ci) {
+    var cmpLinkRunStatusData = cmpLinkRunStatusList.find(function (item) {
+      return item.id === ci.id;
+    });
+
+    if (cmpLinkRunStatusData) {
+      return _extends({}, ci, {
+        manageStatus: cmpLinkRunStatusData.runStatus === '2' ? 0 : 3
+      });
+    }
+
+    return ci;
+  });
+}
+
+function getCmpLinIds(datas) {
+  var linkIds = datas.filter(function (item) {
+    return item.isSubResource && item.typeCode === 'network_link';
+  }).map(function (item) {
+    return item.ciId;
+  });
+  return linkIds;
+}
+/**
+ * 分级链路下級鏈路
+ * @param {*} props 
+ * @returns 
+ */
+
+
+export default function useCmpLinkAlarm(props) {
+  var topo = props.topo,
+      resources = props.resources,
+      graphLoaded = props.graphLoaded;
+
+  var _useState = useState(getCmpLinIds(resources)),
+      cmpLinkIds = _useState[0],
+      setCmpLinkIds = _useState[1];
+
+  var _useState2 = useState([]),
+      cmpLinkRunStatus = _useState2[0],
+      setCmpLinkRunStatus = _useState2[1];
+
+  var cmpLinkAlarmLevels = useMemo(function () {
+    return cmpLinkRunStatus // 3:fault:重要故障; 4:urgently:紧急故障 』为红色
+    .filter(function (item) {
+      return ['3', '4'].includes(item.runStatus);
+    }).map(function (item) {
+      return {
+        id: item.id,
+        level: 1
+      };
+    });
+  }, [cmpLinkRunStatus]);
+  useEffect(function () {
+    var ids = getCmpLinIds(resources);
+
+    if (cmpLinkIds.join(',') !== ids.join(',')) {
+      setCmpLinkIds(ids);
+    }
+  }, [resources]);
+
+  function getCmpLinkRunStatus(_x) {
+    return _getCmpLinkRunStatus.apply(this, arguments);
+  } // 轮询hooks
+
+
+  function _getCmpLinkRunStatus() {
+    _getCmpLinkRunStatus = _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'],
+              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 _getCmpLinkRunStatus.apply(this, arguments);
+  }
+
+  var _useRequest = useRequest(getCmpLinkRunStatus, {
+    pollingInterval: 60 * 1000,
+    pollingWhenHidden: false,
+    // debounceInterval: 200,
+    manual: true,
+    onSuccess: function onSuccess(result) {
+      setCmpLinkRunStatus(result.map(function (item) {
+        return {
+          id: "sub:" + item.id,
+          runStatus: item.metrics.run_status
+        };
+      }));
+    }
+  }),
+      run = _useRequest.run;
+
+  useEffect(function () {
+    if (graphLoaded) {
+      run(cmpLinkIds);
+    }
+  }, [graphLoaded, cmpLinkIds]);
+  return {
+    cmpLinkRunStatus: cmpLinkRunStatus,
+    cmpLinkAlarmLevels: cmpLinkAlarmLevels,
+    addCmpLinkOfflineStatusForDisplayLineColor: addCmpLinkOfflineStatusForDisplayLineColor
+  };
+}
+;

package/es/core/hooks/useEventData.js

@@ -1,7 +1,6 @@
 import _extends from "@babel/runtime/helpers/extends";
 export default function useEventData(props) {
-  var topo = props.topo;
-  var topoDatas = topo.dataModel.useDatas();
+  var topo = props.topo; // const topoDatas = topo.dataModel.useDatas()
 
   var _topo$store$useModelS = topo.store.useModelState('topoAlarm'),
       risks = _topo$store$useModelS.risks,

package/es/core/hooks/useGraphAlarmDisplay.js

@@ -1,7 +1,8 @@
-import { useEffect } from "react";
+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";
 /**
  * 获取ci的最高告警级别
  * @param {Array} alarmList 
@@ -9,16 +10,9 @@ import { removeManageStatus, showManageStatus } from "../utils/showGraphManageSt
  * @returns 
  */
 
-function getCiAlarmLevelMap(alarmList, risks) {
+function getCiAlarmLevelMap(alarmList) {
   var ciIdLevelMap = {};
-  [].concat(alarmList, risks.map(function (item) {
-    var _item$resourceId;
-
-    return {
-      id: (_item$resourceId = item.resourceId) !== null && _item$resourceId !== void 0 ? _item$resourceId : item.ciId,
-      level: 5
-    };
-  })).forEach(function (item) {
+  alarmList.forEach(function (item) {
     var level = ciIdLevelMap[item.id]; // 优先显示高等级告警。值小的等级高
 
     if (!level || item.level < level) {
@@ -30,8 +24,8 @@ function getCiAlarmLevelMap(alarmList, risks) {
   return ciIdLevelMap;
 }
 
-function getGraphCiElementAlarmLevels(resources, alarmList, risks) {
-  var ciIdLevelMap = getCiAlarmLevelMap(alarmList, risks);
+function getGraphCiElementAlarmLevels(resources, alarmList) {
+  var ciIdLevelMap = getCiAlarmLevelMap(alarmList);
   return Object.keys(ciIdLevelMap).map(function (id) {
     return {
       id: id,
@@ -94,12 +88,32 @@ export default function useGraphAlarmDisplay(options) {
       risks = _topo$alarm$useState.risks,
       relateTopoAlarm = _topo$alarm$useState.relateTopoAlarm;
 
-  var resources = topo.dataModel.useCis();
-
-  function getCisEventLevel() {
-    return getGraphCiElementAlarmLevels(resources, alarmList || [], risks);
-  }
-
+  var oldResources = topo.dataModel.useCis(); // 分级拓扑下级链路特殊处理
+
+  var _useCmpLinkAlarm = useCmpLinkAlarm({
+    topo: topo,
+    resources: oldResources,
+    graphLoaded: graphLoaded
+  }),
+      cmpLinkAlarmLevels = _useCmpLinkAlarm.cmpLinkAlarmLevels,
+      cmpLinkRunStatus = _useCmpLinkAlarm.cmpLinkRunStatus,
+      addCmpLinkOfflineStatusForDisplayLineColor = _useCmpLinkAlarm.addCmpLinkOfflineStatusForDisplayLineColor;
+
+  var resources = useMemo(function () {
+    return addCmpLinkOfflineStatusForDisplayLineColor(oldResources, cmpLinkRunStatus);
+  }, [oldResources, cmpLinkRunStatus]); // ci告警级别
+
+  var cisEventLevel = useMemo(function () {
+    var levels = [].concat(alarmList || [], cmpLinkAlarmLevels, risks.map(function (item) {
+      var _item$resourceId;
+
+      return {
+        id: (_item$resourceId = item.resourceId) !== null && _item$resourceId !== void 0 ? _item$resourceId : item.ciId,
+        level: 5
+      };
+    }));
+    return getGraphCiElementAlarmLevels(resources, levels);
+  }, [resources, alarmList, cmpLinkAlarmLevels, risks]);
   useEffect(function () {
     showAlarm();
     showManageStatus({
@@ -108,7 +122,7 @@ export default function useGraphAlarmDisplay(options) {
       isEditMode: isEditMode,
       graphLoaded: graphLoaded,
       alarmSwitch: alarmSwitch,
-      cisEventLevel: getCisEventLevel()
+      cisEventLevel: cisEventLevel
     });
 
     function showAlarm() {
@@ -120,12 +134,11 @@ export default function useGraphAlarmDisplay(options) {
         // 告警静默
         topo.view.loadAlarm([]);
         return;
-      }
+      } // 关联拓扑告警
 
-      var finalAlarms = getCisEventLevel(); // 关联拓扑告警
 
       var relateTopoAlarms = getRelateTopoNodeAlarmLevels(topo, relateTopoAlarm);
-      var elementsAlarmLevels = [].concat(finalAlarms, relateTopoAlarms); // 将告警级别放入ht元素，便于测试
+      var elementsAlarmLevels = [].concat(cisEventLevel, relateTopoAlarms); // 将告警级别放入ht元素，便于测试
 
       getElements(topo.getDataModel()).filter(function (item) {
         return !!item.getTag();
@@ -152,5 +165,5 @@ export default function useGraphAlarmDisplay(options) {
         resources: resources
       });
     };
-  }, [graphLoaded, resources, alarmSwitch, alarmList, risks, relateTopoAlarm]);
+  }, [graphLoaded, resources, alarmSwitch, cisEventLevel, relateTopoAlarm]);
 }

package/es/core/hooks/useTopoEdit.js

@@ -95,10 +95,6 @@ var useTopoEdit = function useTopoEdit(params) {
             return topoDispatchers.setTopoType(TPL_TREE);
 
           case 7:
-            // 更新配置
-            // resourceConfig.updateConfig(config);
-            // 更新配置对应的资源、链路
-            // editDispatchers.fetchDataByConfig();
             topo.historyManager.endTransaction();
 
           case 8: