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

package/es/core/hooks/useAlarm.js

@@ -2,165 +2,128 @@ 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"; // 告警在活状态
-
-var showAlarmStatus = ["toDeal", "dealing", "change", "woDealing"];
+import useTopoEventListener from "./useTopoEventListener";
 /**
- * 告警是否在活
- * @param {*} alarm 
- * @returns 
+ * 
+ * 
+ * @param {*} options 
  */
 
-var isAlarmAlive = function isAlarmAlive(alarm) {
-  return showAlarmStatus.indexOf(alarm.status) >= 0;
-};
-
-var handleRiskData = function handleRiskData(topo, receivedData) {
-  var _risks, _topo$viewProps, _topo$viewProps2;
-
-  // 非在活状态：
-  // 已修复 recovered
-  // 已关闭 closed
-  var prevRisks = topo.store.getModelState('topoAlarm').risks;
-
-  var isLiveRisk = function isLiveRisk(data) {
-    return ['recovered', 'closed'].indexOf(data.status) === -1;
-  };
+export default function useAlarm(options) {
+  var topo = options.topo;
+  var store = topo.store;
 
-  var hasCiPermission = function hasCiPermission(data) {
-    var _data$resourceId;
+  var _topo$store$useModelS = topo.store.useModelState('displayConfig'),
+      alarmSwitch = _topo$store$useModelS.alarmSwitch,
+      alarmListDefaultOpen = _topo$store$useModelS.alarmListDefaultOpen;
 
-    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);
-  }; // 合并
+  useGraphAlarmDisplay({
+    topo: topo,
+    alarmSwitch: alarmSwitch
+  });
 
+  var handleRiskData = function handleRiskData(receivedData) {
+    var _risks, _topo$viewProps, _topo$viewProps2;
 
-  var risks = prevRisks.map(function (risk) {
-    var newRisk = receivedData.find(function (item) {
-      return item.id === risk.id;
-    });
-    return newRisk || risk;
-  }); // 新的
+    // 非在活状态：
+    // 已修复 recovered
+    // 已关闭 closed
+    var prevRisks = topo.store.getModelState('topoAlarm').risks;
 
-  var addRisks = receivedData.filter(function (risk) {
-    return !prevRisks.find(function (item) {
-      return item.id === risk.id;
-    });
-  }).filter(hasCiPermission);
+    var isLiveRisk = function isLiveRisk(data) {
+      return ['recovered', 'closed'].indexOf(data.status) === -1;
+    };
 
-  (_risks = risks).push.apply(_risks, addRisks); // 过滤掉无权限、非在活的
+    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 && ci.operation;
+    }; // 合并
 
-  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 _topo$store$getModelS = topo.store.getModelState('displayConfig'),
-      alarmSwitch = _topo$store$getModelS.alarmSwitch,
-      alarmListDefaultOpen = _topo$store$getModelS.alarmListDefaultOpen; // 告警静默
+    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);
 
-  if (alarmSwitch === false) {
-    return;
-  } // 告警列表
+    (_risks = risks).push.apply(_risks, addRisks); // 过滤掉无权限、非在活的
 
 
-  if (addRisks.length && alarmListDefaultOpen) {
-    topo.alarm.updateState({
-      alarmPanelIsOpen: true
+    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 ((_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);
-
-  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 
- */
-
 
-function convertAlarmData(alarms) {
-  return alarms.map(function (alarm) {
-    var resourceId = alarm.resourceId; // 分级资源id转换
+    if (alarmSwitch === false) {
+      // 告警静默
+      return;
+    }
 
-    if (alarm.cmpAlertId) {
-      resourceId = "sub:" + alarm.mainCiId;
+    if (addRisks.length && alarmListDefaultOpen) {
+      topo.alarm.updateState({
+        alarmPanelIsOpen: true
+      });
     }
 
-    return _extends({}, alarm, {
-      // 数据id
-      resourceId: resourceId,
-      // 是否在活
-      alive: isAlarmAlive(alarm)
-    });
-  });
-}
-/**
- * 
- * 
- * @param {*} options 
- */
+    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());
+    }
+  };
 
-export default function useAlarm(options) {
-  var topo = options.topo;
+  var handleRelateTopoAlarm = function handleRelateTopoAlarm(data) {
+    var relateTopoAlarm = _extends({}, topo.store.getModelState('topoAlarm').relateTopoAlarm);
 
-  var _topo$store$useModelS = topo.store.useModelState('displayConfig'),
-      alarmSwitch = _topo$store$useModelS.alarmSwitch;
+    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
+    });
+  }; // 订阅消息
 
-  useGraphAlarmDisplay({
-    topo: topo,
-    alarmSwitch: alarmSwitch
-  }); // 订阅消息
 
   useTopoEventListener({
     type: 'alarm',
     onMessage: function onMessage(data) {
       rlog.debug("Topoget--AlertMesage------------", topo, data);
-      topo.alarm.handleAlarmEvent(convertAlarmData(data));
+      topo.alarm.handleAlarmEvent(data);
     }
   });
   useTopoEventListener({
     type: 'risk',
     onMessage: function onMessage(data) {
-      handleRiskData(topo, data);
+      handleRiskData(data);
     }
   });
   useTopoEventListener({
     type: 'relateTopoAlarm',
     onMessage: function onMessage(data) {
-      handleRelateTopoAlarm(topo, data);
+      handleRelateTopoAlarm(data);
     }
   });
 }

package/es/core/hooks/useEventData.js

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

package/es/core/models/Alarm.js

@@ -83,7 +83,8 @@ var Alarm = /*#__PURE__*/function () {
     }
 
     rlog.info('Alarm.open 打开告警通道', id);
-    this.openTopoAlarm(id);
+    this.openTopoAlarm(id); // this.hmGetTopoAlarm(id);
+
     this.hmGetTopoAlarmByDoc(id);
   }
   /**
@@ -210,6 +211,83 @@ var Alarm = /*#__PURE__*/function () {
     }
 
     return hmGetTopoAlarmByDoc;
+  }();
+
+  _proto.hmGetTopoAlarm = /*#__PURE__*/function () {
+    var _hmGetTopoAlarm = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3(id) {
+      var mainCiIdList, endTime, startTime, parms, result;
+      return _regeneratorRuntime.wrap(function _callee3$(_context3) {
+        while (1) switch (_context3.prev = _context3.next) {
+          case 0:
+            mainCiIdList = this.topo.dataModel.getDatas().filter(function (ci) {
+              return !!ci.operation;
+            }) // 过滤掉权限
+            .map(function (ci) {
+              return ci.id;
+            });
+
+            if (!(mainCiIdList.length === 0)) {
+              _context3.next = 4;
+              break;
+            }
+
+            this.updateState({
+              alarmData: [],
+              alarmPanelIsOpen: false
+            });
+            return _context3.abrupt("return");
+
+          case 4:
+            //rlog.debug("获取告警列表", mainCiIdList);
+            endTime = null; // new Date().valueOf();
+
+            startTime = null; // moment().subtract(1, "months").valueOf();
+
+            parms = {
+              mainCiIdList: mainCiIdList,
+              alertStatusList: ['toDeal', 'dealing'],
+              pageNum: 1,
+              pageSize: 10,
+              sortField: 'alertLevel',
+              alertLevelList: [],
+              orders: [{
+                property: 'alertLevel',
+                direction: 'ASC'
+              }, {
+                property: 'createTime',
+                direction: 'DESC'
+              }],
+              createTime: {
+                startTime: startTime,
+                endTime: endTime
+              }
+            };
+            _context3.next = 9;
+            return topoService.getAlarmByIds(parms);
+
+          case 9:
+            result = _context3.sent;
+            rlog.debug('getAlarmById-result', result); // if (alarmIsOpened) {
+            //   //this.topo.loadAlarm(result.datas);
+            //   this.handleAlarmEvent({ type: "alarm", data: result.datas });
+            // }
+            // this.updateState({
+            //   alarmData: result.datas.length > 0 ? result.datas : [],
+            //   alarmPanelIsOpen: result.datas.length > 0,
+            // });
+
+          case 11:
+          case "end":
+            return _context3.stop();
+        }
+      }, _callee3, this);
+    }));
+
+    function hmGetTopoAlarm(_x2) {
+      return _hmGetTopoAlarm.apply(this, arguments);
+    }
+
+    return hmGetTopoAlarm;
   }()
   /**
    * 直接装载告警数据（可装载mock列表）
@@ -220,9 +298,9 @@ var Alarm = /*#__PURE__*/function () {
   _proto.setAlarmDataByMock =
   /*#__PURE__*/
   function () {
-    var _setAlarmDataByMock = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3(datas) {
-      return _regeneratorRuntime.wrap(function _callee3$(_context3) {
-        while (1) switch (_context3.prev = _context3.next) {
+    var _setAlarmDataByMock = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee4(datas) {
+      return _regeneratorRuntime.wrap(function _callee4$(_context4) {
+        while (1) switch (_context4.prev = _context4.next) {
           case 0:
             this.updateState({
               alarmData: datas.length > 0 ? datas : [],
@@ -231,12 +309,12 @@ var Alarm = /*#__PURE__*/function () {
 
           case 1:
           case "end":
-            return _context3.stop();
+            return _context4.stop();
         }
-      }, _callee3, this);
+      }, _callee4, this);
     }));
 
-    function setAlarmDataByMock(_x2) {
+    function setAlarmDataByMock(_x3) {
       return _setAlarmDataByMock.apply(this, arguments);
     }
 
@@ -251,10 +329,10 @@ var Alarm = /*#__PURE__*/function () {
   _proto.switchAlarmPopPanel =
   /*#__PURE__*/
   function () {
-    var _switchAlarmPopPanel = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee4(flag) {
+    var _switchAlarmPopPanel = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee5(flag) {
       var topoDispatchers;
-      return _regeneratorRuntime.wrap(function _callee4$(_context4) {
-        while (1) switch (_context4.prev = _context4.next) {
+      return _regeneratorRuntime.wrap(function _callee5$(_context5) {
+        while (1) switch (_context5.prev = _context5.next) {
           case 0:
             // console.log("switchAlarmPopPanel", flag);
             topoDispatchers = this.topo.store.getModelDispatchers('topoAlarm');
@@ -264,12 +342,12 @@ var Alarm = /*#__PURE__*/function () {
 
           case 2:
           case "end":
-            return _context4.stop();
+            return _context5.stop();
         }
-      }, _callee4, this);
+      }, _callee5, this);
     }));
 
-    function switchAlarmPopPanel(_x3) {
+    function switchAlarmPopPanel(_x4) {
       return _switchAlarmPopPanel.apply(this, arguments);
     }
 
@@ -285,21 +363,21 @@ var Alarm = /*#__PURE__*/function () {
   _proto.openTopoAlarm =
   /*#__PURE__*/
   function () {
-    var _openTopoAlarm = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee5(id) {
+    var _openTopoAlarm = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee6(id) {
       var _this$getState2, alarmOpening, topoAlarmIsOpen, alarmDispatchers;
 
-      return _regeneratorRuntime.wrap(function _callee5$(_context5) {
-        while (1) switch (_context5.prev = _context5.next) {
+      return _regeneratorRuntime.wrap(function _callee6$(_context6) {
+        while (1) switch (_context6.prev = _context6.next) {
           case 0:
             // 如果当前拓扑图开启中或已开启则退出
             _this$getState2 = this.getState(), alarmOpening = _this$getState2.alarmOpening, topoAlarmIsOpen = _this$getState2.topoAlarmIsOpen;
 
             if (!(this.currentTopoId === id && (topoAlarmIsOpen || alarmOpening))) {
-              _context5.next = 3;
+              _context6.next = 3;
               break;
             }
 
-            return _context5.abrupt("return");
+            return _context6.abrupt("return");
 
           case 3:
             this.currentTopoId = id;
@@ -307,27 +385,27 @@ var Alarm = /*#__PURE__*/function () {
               alarmOpening: true
             });
             alarmDispatchers = this.topo.store.getModelDispatchers('topoAlarm');
-            _context5.next = 8;
+            _context6.next = 8;
             return alarmDispatchers.resetAlarmDoc();
 
           case 8:
-            _context5.prev = 8;
-            _context5.next = 11;
+            _context6.prev = 8;
+            _context6.next = 11;
             return this.topo.serverApi.openTopoAlarm(id);
 
           case 11:
-            this.secretKey = _context5.sent;
+            this.secretKey = _context6.sent;
             rlog.info('openTopoAlarm 打开拓扑告警推送-------------------开始');
             this.updateState({
               alarmOpening: false,
               alarmIsOpened: true
             });
-            _context5.next = 20;
+            _context6.next = 20;
             break;
 
           case 16:
-            _context5.prev = 16;
-            _context5.t0 = _context5["catch"](8);
+            _context6.prev = 16;
+            _context6.t0 = _context6["catch"](8);
             rlog.error('打开拓扑告警推送 失败');
             this.updateState({
               alarmOpening: false
@@ -335,12 +413,12 @@ var Alarm = /*#__PURE__*/function () {
 
           case 20:
           case "end":
-            return _context5.stop();
+            return _context6.stop();
         }
-      }, _callee5, this, [[8, 16]]);
+      }, _callee6, this, [[8, 16]]);
     }));
 
-    function openTopoAlarm(_x4) {
+    function openTopoAlarm(_x5) {
       return _openTopoAlarm.apply(this, arguments);
     }
 
@@ -356,21 +434,21 @@ var Alarm = /*#__PURE__*/function () {
   _proto.closeTopoAlarm =
   /*#__PURE__*/
   function () {
-    var _closeTopoAlarm = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee6(id) {
+    var _closeTopoAlarm = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee7(id) {
       var _this$getState3, alarmIsOpened, alarmOpening;
 
-      return _regeneratorRuntime.wrap(function _callee6$(_context6) {
-        while (1) switch (_context6.prev = _context6.next) {
+      return _regeneratorRuntime.wrap(function _callee7$(_context7) {
+        while (1) switch (_context7.prev = _context7.next) {
           case 0:
             // 如果未开启则退出
             _this$getState3 = this.getState(), alarmIsOpened = _this$getState3.alarmIsOpened, alarmOpening = _this$getState3.alarmOpening;
 
             if (!(!alarmIsOpened && !alarmOpening)) {
-              _context6.next = 3;
+              _context7.next = 3;
               break;
             }
 
-            return _context6.abrupt("return");
+            return _context7.abrupt("return");
 
           case 3:
             this.currentTopoId = null;
@@ -380,17 +458,17 @@ var Alarm = /*#__PURE__*/function () {
               alarmOpening: false,
               alarmPanelIsOpen: false
             });
-            _context6.next = 8;
+            _context7.next = 8;
             return this.topo.serverApi.closeTopoAlarm(id, this.secretKey);
 
           case 8:
           case "end":
-            return _context6.stop();
+            return _context7.stop();
         }
-      }, _callee6, this);
+      }, _callee7, this);
     }));
 
-    function closeTopoAlarm(_x5) {
+    function closeTopoAlarm(_x6) {
       return _closeTopoAlarm.apply(this, arguments);
     }
 
@@ -415,20 +493,20 @@ var Alarm = /*#__PURE__*/function () {
   _proto.restart =
   /*#__PURE__*/
   function () {
-    var _restart = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee7() {
+    var _restart = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee8() {
       var id;
-      return _regeneratorRuntime.wrap(function _callee7$(_context7) {
-        while (1) switch (_context7.prev = _context7.next) {
+      return _regeneratorRuntime.wrap(function _callee8$(_context8) {
+        while (1) switch (_context8.prev = _context8.next) {
           case 0:
             id = this.currentTopoId;
-            _context7.next = 3;
+            _context8.next = 3;
             return this.openTopoAlarm(id);
 
           case 3:
           case "end":
-            return _context7.stop();
+            return _context8.stop();
         }
-      }, _callee7, this);
+      }, _callee8, this);
     }));
 
     function restart() {
@@ -445,11 +523,11 @@ var Alarm = /*#__PURE__*/function () {
   _proto.handleAlarmEvent =
   /*#__PURE__*/
   function () {
-    var _handleAlarmEvent = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee8(alertData) {
+    var _handleAlarmEvent = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee9(alertData) {
       var _this$getState4, alarmIsOpened, resAndMetrics, resIdsList, nodeIdsList, linkIdsList, alarmDispatchers, sendAl, idsList, operations, _yield$alarmDispatche2, eqFlag, alarmlist, _this$topo$viewProps, _this$topo$viewProps2;
 
-      return _regeneratorRuntime.wrap(function _callee8$(_context8) {
-        while (1) switch (_context8.prev = _context8.next) {
+      return _regeneratorRuntime.wrap(function _callee9$(_context9) {
+        while (1) switch (_context9.prev = _context9.next) {
           case 0:
             _this$getState4 = this.getState(), alarmIsOpened = _this$getState4.alarmIsOpened;
             resAndMetrics = this.topo.store.getState().topoMod.resAndMetrics;
@@ -459,7 +537,7 @@ var Alarm = /*#__PURE__*/function () {
             console.log("handleAlarmEvent-接收到推送的原始告警信息", alertData);
 
             if (!(isAvailableArray(alertData) && isAvailableArray(resIdsList))) {
-              _context8.next = 27;
+              _context9.next = 27;
               break;
             }
 
@@ -473,10 +551,16 @@ var Alarm = /*#__PURE__*/function () {
               }
             });
             alertData.forEach(function (item, index) {
-              var _item$resourceId;
+              var _item$resourceId, _item$alertCode;
 
               var ciId = (_item$resourceId = item.resourceId) !== null && _item$resourceId !== void 0 ? _item$resourceId : item.ciId;
               var isSub = false;
+
+              if ((_item$alertCode = item.alertCode) !== null && _item$alertCode !== void 0 && _item$alertCode.startsWith("cmp")) {
+                ciId = "sub:" + item.mainCiId;
+                isSub = true;
+              }
+
               var obj = {
                 id: ciId,
                 level: item.alertLevel,
@@ -491,24 +575,25 @@ var Alarm = /*#__PURE__*/function () {
 
               if (resIdsList.indexOf(ciId) >= 0 && operations.indexOf(ciId) < 0) {
                 sendAl.push(obj);
-              }
+              } // const ciId = `${isSub}+${item.resourceId ?? item.ciId}`;
+
             });
             console.log("before-combAlarmData", sendAl, idsList);
 
             if (!(sendAl.length > 0)) {
-              _context8.next = 27;
+              _context9.next = 27;
               break;
             }
 
             rlog.debug('过滤掉非本拓扑的告警信息 告警开关-推送告警到ht-alarmIsOpened-sendAl', alarmIsOpened, sendAl);
-            _context8.prev = 15;
-            _context8.next = 18;
+            _context9.prev = 15;
+            _context9.next = 18;
             return alarmDispatchers.combAlarmData({
               alarmdata: sendAl
             });
 
           case 18:
-            _yield$alarmDispatche2 = _context8.sent;
+            _yield$alarmDispatche2 = _context9.sent;
             eqFlag = _yield$alarmDispatche2.eqFlag;
             alarmlist = _yield$alarmDispatche2.alarmlist;
 
@@ -528,22 +613,22 @@ var Alarm = /*#__PURE__*/function () {
               }
             }
 
-            _context8.next = 27;
+            _context9.next = 27;
             break;
 
           case 24:
-            _context8.prev = 24;
-            _context8.t0 = _context8["catch"](15);
-            rlog.error('告警发送异常', _context8.t0);
+            _context9.prev = 24;
+            _context9.t0 = _context9["catch"](15);
+            rlog.error('告警发送异常', _context9.t0);
 
           case 27:
           case "end":
-            return _context8.stop();
+            return _context9.stop();
         }
-      }, _callee8, this, [[15, 24]]);
+      }, _callee9, this, [[15, 24]]);
     }));
 
-    function handleAlarmEvent(_x6) {
+    function handleAlarmEvent(_x7) {
       return _handleAlarmEvent.apply(this, arguments);
     }
 

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