@riil-frontend/component-topology 12.0.0-dev.21 → 12.0.0-dev.24

package/es/core/models/AttributeMetricDisplay.js

@@ -526,7 +526,7 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
         tags: tags
       });
     });
-    rlog.debug('推送标注 => ht 失败', elementTagsAndTips);
+    rlog.debug('推送标注 => ht', elementTagsAndTips);
     var htTopo = topo.getHtTopo();
 
     if (htTopo) {

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

package/es/core/viewer/components/titlebar/widgets/AlarmButton.js

@@ -5,11 +5,7 @@ import useEventData from "../../../../hooks/useEventData";
 
 function AlarmButton(props) {
   var topo = props.topo;
-
-  var _topo$store$useModel = topo.store.useModel("topoAlarm"),
-      alarmState = _topo$store$useModel[0],
-      alarmDispatchers = _topo$store$useModel[1];
-
+  var alarmState = topo.store.useModelState("topoAlarm");
   var alarmPanelIsOpen = alarmState.alarmPanelIsOpen;
   var alarmData = useEventData({
     topo: topo

package/es/utils/ciRefAttributeTranslateUtil.js

@@ -16,7 +16,7 @@ function getCiRefAttributesMap(ciDatas, ciTypeMap) {
     var id = ciData.id;
     var attributeMap = ciData.attributeMap || ciData.attributes;
     ciRefAttributeMap[id] = [];
-    var typeCode = ciData.typeCode || ciData.ciType;
+    var typeCode = ciData.ciType || ciData.typeCode;
     var ciTypeMeta = ciTypeMap[typeCode];
 
     if (ciTypeMeta) {

package/lib/components/TemplateButton/index.module.scss

@@ -26,7 +26,7 @@
   line-height: 20px;
   font-size: 18px;
   margin-top: 14px;
-  color: $color-text1-3;
+  color: $color-text1-4;
   outline: none;
 }
 

package/lib/core/hooks/useAlarm.js

@@ -15,129 +15,167 @@ var _useGraphAlarmDisplay = _interopRequireDefault(require("./useGraphAlarmDispl
 
 var _useTopoEventListener = _interopRequireDefault(require("./useTopoEventListener"));
 
+// 告警在活状态
+var showAlarmStatus = ["toDeal", "dealing", "change", "woDealing"];
 /**
- * 
- * 
- * @param {*} options 
+ * 告警是否在活
+ * @param {*} alarm 
+ * @returns 
  */
-function useAlarm(options) {
-  var topo = options.topo;
-  var store = topo.store;
 
-  var _topo$store$useModelS = topo.store.useModelState('displayConfig'),
-      alarmSwitch = _topo$store$useModelS.alarmSwitch,
-      alarmListDefaultOpen = _topo$store$useModelS.alarmListDefaultOpen;
+var isAlarmAlive = function isAlarmAlive(alarm) {
+  return showAlarmStatus.indexOf(alarm.status) >= 0;
+};
 
-  (0, _useGraphAlarmDisplay["default"])({
-    topo: topo,
-    alarmSwitch: alarmSwitch
-  });
+var handleRiskData = function handleRiskData(topo, receivedData) {
+  var _risks, _topo$viewProps, _topo$viewProps2;
 
-  var handleRiskData = function handleRiskData(receivedData) {
-    var _risks, _topo$viewProps, _topo$viewProps2;
+  // 非在活状态：
+  // 已修复 recovered
+  // 已关闭 closed
+  var prevRisks = topo.store.getModelState('topoAlarm').risks;
 
-    // 非在活状态：
-    // 已修复 recovered
-    // 已关闭 closed
-    var prevRisks = topo.store.getModelState('topoAlarm').risks;
+  var isLiveRisk = function isLiveRisk(data) {
+    return ['recovered', 'closed'].indexOf(data.status) === -1;
+  };
 
-    var isLiveRisk = function isLiveRisk(data) {
-      return ['recovered', 'closed'].indexOf(data.status) === -1;
-    };
+  var hasCiPermission = function hasCiPermission(data) {
+    var _data$resourceId;
 
-    var hasCiPermission = function hasCiPermission(data) {
-      var _data$resourceId;
+    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 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 risks = prevRisks.map(function (risk) {
+    var newRisk = receivedData.find(function (item) {
+      return item.id === risk.id;
+    });
+    return newRisk || risk;
+  }); // 新的
 
-    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);
 
-    var addRisks = receivedData.filter(function (risk) {
-      return !prevRisks.find(function (item) {
-        return item.id === risk.id;
-      });
-    }).filter(hasCiPermission);
+  (_risks = risks).push.apply(_risks, addRisks); // 过滤掉无权限、非在活的
 
-    (_risks = risks).push.apply(_risks, addRisks); // 过滤掉无权限、非在活的
 
+  risks = risks.filter(isLiveRisk).filter(hasCiPermission).sort(function (a, b) {
+    return a.executeTime - b.executeTime;
+  });
 
-    risks = risks.filter(isLiveRisk).filter(hasCiPermission).sort(function (a, b) {
-      return a.executeTime - b.executeTime;
-    });
+  _rlog["default"].debug('更新风险', {
+    prevRisks: prevRisks,
+    receivedData: receivedData,
+    risks: risks
+  });
+
+  topo.store.getModelDispatchers('topoAlarm').update({
+    risks: risks
+  }); // 获取配置
+
+  var _topo$store$getModelS = topo.store.getModelState('displayConfig'),
+      alarmSwitch = _topo$store$getModelS.alarmSwitch,
+      alarmListDefaultOpen = _topo$store$getModelS.alarmListDefaultOpen; // 告警静默
 
-    _rlog["default"].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());
+  }
+};
+
+var handleRelateTopoAlarm = function handleRelateTopoAlarm(topo, data) {
+  var relateTopoAlarm = (0, _extends2["default"])({}, topo.store.getModelState('topoAlarm').relateTopoAlarm);
+  data.forEach(function (item) {
+    relateTopoAlarm[item.topoId] = item.alertLevel;
+  });
+  topo.store.getModelDispatchers('topoAlarm').update({
+    relateTopoAlarm: relateTopoAlarm
+  });
+
+  _rlog["default"].debug("\u5173\u8054\u62D3\u6251\u544A\u8B66\uFF1A\u6536\u5230 " + data.length, {
+    received: data,
+    all: relateTopoAlarm
+  });
+};
+/**
+ * 处理分级告警
+ * @param {*} alarms 
+ * @returns 
+ */
 
-    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());
+function convertAlarmData(alarms) {
+  return alarms.map(function (alarm) {
+    var resourceId = alarm.resourceId; // 分级资源id转换
+
+    if (alarm.cmpAlertId) {
+      resourceId = "sub:" + alarm.mainCiId;
     }
-  };
 
-  var handleRelateTopoAlarm = function handleRelateTopoAlarm(data) {
-    var relateTopoAlarm = (0, _extends2["default"])({}, topo.store.getModelState('topoAlarm').relateTopoAlarm);
-    data.forEach(function (item) {
-      relateTopoAlarm[item.topoId] = item.alertLevel;
-    });
-    topo.store.getModelDispatchers('topoAlarm').update({
-      relateTopoAlarm: relateTopoAlarm
+    return (0, _extends2["default"])({}, alarm, {
+      // 数据id
+      resourceId: resourceId,
+      // 是否在活
+      alive: isAlarmAlive(alarm)
     });
+  });
+}
+/**
+ * 
+ * 
+ * @param {*} options 
+ */
 
-    _rlog["default"].debug("\u5173\u8054\u62D3\u6251\u544A\u8B66\uFF1A\u6536\u5230 " + data.length, {
-      received: data,
-      all: relateTopoAlarm
-    });
-  }; // 订阅消息
 
+function useAlarm(options) {
+  var topo = options.topo;
+
+  var _topo$store$useModelS = topo.store.useModelState('displayConfig'),
+      alarmSwitch = _topo$store$useModelS.alarmSwitch;
+
+  (0, _useGraphAlarmDisplay["default"])({
+    topo: topo,
+    alarmSwitch: alarmSwitch
+  }); // 订阅消息
 
   (0, _useTopoEventListener["default"])({
     type: 'alarm',
     onMessage: function onMessage(data) {
       _rlog["default"].debug("Topoget--AlertMesage------------", topo, data);
 
-      topo.alarm.handleAlarmEvent(data);
+      topo.alarm.handleAlarmEvent(convertAlarmData(data));
     }
   });
   (0, _useTopoEventListener["default"])({
     type: 'risk',
     onMessage: function onMessage(data) {
-      handleRiskData(data);
+      handleRiskData(topo, data);
     }
   });
   (0, _useTopoEventListener["default"])({
     type: 'relateTopoAlarm',
     onMessage: function onMessage(data) {
-      handleRelateTopoAlarm(data);
+      handleRelateTopoAlarm(topo, data);
     }
   });
 }

package/lib/core/hooks/useEventData.js

@@ -8,8 +8,7 @@ exports["default"] = useEventData;
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 
 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,