@riil-frontend/component-topology 12.0.0-dev.3 → 12.0.0-dev.31

package/es/core/editor/store/topoEdit.js

@@ -5,7 +5,7 @@ import _regeneratorRuntime from "@babel/runtime/regenerator";
 /**
  * 拓扑编辑 Model
  */
-import rlog from '@riil-frontend/component-topology-utils/es/rlog';
+import { rlog } from '@riil-frontend/component-topology-utils';
 var initState = {
   // 是否就绪
   ready: false,

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

@@ -9,6 +9,18 @@ export function handleCopyHotkey(event, options) {
     copy(options.topo);
   }
 }
+export function initPasteEventListener() {
+  document.addEventListener("paste", handlePasteEventListener);
+}
+export function destroyPasteEventListener() {
+  document.removeEventListener("paste", handlePasteEventListener);
+}
+
+function handlePasteEventListener(e) {
+  var clipdata = e.clipboardData || window.clipboardData;
+  console.log("主动粘贴", clipdata.getData("text/plain"));
+}
+
 export function handlePasteHotkey(event, options) {
   var target = event.target || event.srcElement;
   var tagName = target.tagName;

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

@@ -1,5 +1,4 @@
-import { getEdges } from "../../../utils/htElementUtils";
-import { getEdgesBetweenNodes } from "../../../utils/htElementUtils";
+import { getEdges, getEdgesBetweenNodes } from "../../../utils/htElementUtils";
 var ht = window.ht;
 export function getEdgesBySelection(topo) {
   var getChildrenNodeIds = function getChildrenNodeIds(nodes) {
@@ -105,16 +104,18 @@ export function loopEdgesAndChildren(topo, edges, operateEdgeFn) {
  * 设置连线及子连线。带回退事务控制
  * @param {*} topo 
  * @param {*} edges 
- * @param {*} operateEdgeFn 
+ * @param {*} updateEdgeFn 
  */
 
-export function setEdgesAndChildren(topo, edges, operateEdgeFn) {
+export function updateEdgesData(topo, edges, updateEdgeFn) {
   topo.historyManager.beginTransaction();
-  loopEdgesAndChildren(topo, edges, operateEdgeFn);
+  edges.forEach(function (edge) {
+    updateEdgeFn(edge);
+  });
   topo.historyManager.endTransaction();
 }
 /**
- * 批量设置连线线形
+ * 批量设置连线线形。带回退事务控制
  * 
  * @param {*} edges 
  * @param {*} type 
@@ -123,7 +124,7 @@ export function setEdgesAndChildren(topo, edges, operateEdgeFn) {
 
 export function setEdgesType(edges, type, topo) {
   var htTopo = topo.getHtTopo();
-  setEdgesAndChildren(topo, edges, function (edge) {
+  updateEdgesData(topo, edges, function (edge) {
     htTopo.setGraphLinear(edge, {
       type: type
     });

package/es/core/hooks/ht/useHtDataPropertyChangeListener.js

@@ -1,4 +1,4 @@
-import rlog from '@riil-frontend/component-topology-utils/es/rlog';
+import { rlog } from '@riil-frontend/component-topology-utils';
 import { useEffect } from 'react';
 export default function useHtDataPropertyChangeListener(props) {
   var topo = props.topo,

package/es/core/hooks/useAlarm.js

@@ -2,128 +2,165 @@ 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 handleRiskData = function handleRiskData(receivedData) {
-    var _risks, _topo$viewProps, _topo$viewProps2;
+  var hasCiPermission = function hasCiPermission(data) {
+    var _data$resourceId;
 
-    // 非在活状态：
-    // 已修复 recovered
-    // 已关闭 closed
-    var prevRisks = topo.store.getModelState('topoAlarm').risks;
+    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);
+  }; // 合并
 
-    var isLiveRisk = function isLiveRisk(data) {
-      return ['recovered', 'closed'].indexOf(data.status) === -1;
-    };
 
-    var hasCiPermission = function hasCiPermission(data) {
-      var _data$resourceId;
+  var risks = prevRisks.map(function (risk) {
+    var newRisk = receivedData.find(function (item) {
+      return item.id === risk.id;
+    });
+    return newRisk || risk;
+  }); // 新的
 
-      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;
-    }; // 合并
+  var addRisks = receivedData.filter(function (risk) {
+    return !prevRisks.find(function (item) {
+      return item.id === risk.id;
+    });
+  }).filter(hasCiPermission);
 
+  (_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;
-    }); // 新的
 
-    var addRisks = receivedData.filter(function (risk) {
-      return !prevRisks.find(function (item) {
-        return item.id === risk.id;
-      });
-    }).filter(hasCiPermission);
+  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
+  }); // 获取配置
 
-    (_risks = risks).push.apply(_risks, addRisks); // 过滤掉无权限、非在活的
+  var _topo$store$getModelS = topo.store.getModelState('displayConfig'),
+      alarmSwitch = _topo$store$getModelS.alarmSwitch,
+      alarmListDefaultOpen = _topo$store$getModelS.alarmListDefaultOpen; // 告警静默
 
 
-    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 (alarmSwitch === false) {
+    return;
+  } // 告警列表
+
+
+  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());
+  }
+};
 
-    if ((_topo$viewProps = topo.viewProps) !== null && _topo$viewProps !== void 0 && _topo$viewProps.onRisk) {
-      topo.viewProps.onRisk(risks);
-    }
+var handleRelateTopoAlarm = function handleRelateTopoAlarm(topo, data) {
+  var relateTopoAlarm = _extends({}, topo.store.getModelState('topoAlarm').relateTopoAlarm);
 
-    if ((_topo$viewProps2 = topo.viewProps) !== null && _topo$viewProps2 !== void 0 && _topo$viewProps2.onResourceEvent) {
-      topo.viewProps.onResourceEvent(topo.alarm.getEvents());
-    }
-  };
+  data.forEach(function (item) {
+    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 
+ */
 
-  var handleRelateTopoAlarm = function handleRelateTopoAlarm(data) {
-    var relateTopoAlarm = _extends({}, topo.store.getModelState('topoAlarm').relateTopoAlarm);
 
-    data.forEach(function (item) {
-      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
+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)
     });
-  }; // 订阅消息
+  });
+}
+/**
+ * 
+ * 
+ * @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/useCiAttributeChange.js

@@ -1,11 +1,22 @@
 import _extends from "@babel/runtime/helpers/extends";
-import rlog from '@riil-frontend/component-topology-utils/es/rlog';
+import { rlog } from '@riil-frontend/component-topology-utils';
 import CiCache from "../models/cache/CiCache";
 import useTopoEventListener from "./useTopoEventListener";
 
+function ciExistTopo(topoData, ciChangeData) {
+  if (!topoData) {
+    return false;
+  }
+
+  var ciIds = [].concat(topoData.nodes, topoData.links, topoData.linkGroups).map(function (data) {
+    return data.ciId || data.id;
+  });
+  return ciIds.includes(ciChangeData.id);
+}
+
 function mergeData(cis, ciChangeData) {
   var matchData = function matchData(item) {
-    return item.id === ciChangeData.id || item.ciId === ciChangeData.id;
+    return (item.ciId || item.id) === ciChangeData.id;
   };
 
   if (!cis.find(matchData)) {
@@ -13,16 +24,26 @@ function mergeData(cis, ciChangeData) {
   }
 
   return cis.map(function (ci) {
-    if (matchData(ci)) {
-      return _extends({}, ci, {
-        id: ci.id,
-        attributes: _extends({}, ci.attributes, ciChangeData.attributes)
-      });
+    if (!matchData(ci)) {
+      return ci;
     }
 
-    return ci;
+    return _extends({}, ci, {
+      id: ci.id,
+      attributes: _extends({}, ci.attributes, ciChangeData.attributes)
+    });
   });
 }
+
+function mergeTopoData(topoData, ciChangeData) {
+  var newData = _extends({}, topoData, {
+    nodes: mergeData(topoData.nodes, ciChangeData),
+    links: mergeData(topoData.links, ciChangeData),
+    linkGroups: mergeData(topoData.linkGroups, ciChangeData)
+  });
+
+  return newData;
+}
 /**
  * 监听ci属性变更
  * 
@@ -38,13 +59,8 @@ export default function useCiAttributeChange(props) {
       // 更新拓扑数据
       var topoData = topo.store.getModelState('topoMod').data;
 
-      if (topoData) {
-        var newData = _extends({}, topoData, {
-          nodes: mergeData(topoData.nodes, ciChangeData),
-          links: mergeData(topoData.links, ciChangeData),
-          linkGroups: mergeData(topoData.linkGroups, ciChangeData)
-        });
-
+      if (ciExistTopo(topoData, ciChangeData)) {
+        var newData = mergeTopoData(topoData, ciChangeData);
         var topoDispatchers = topo.store.getModelDispatchers('topoMod');
         topoDispatchers.update({
           data: newData

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,