@riil-frontend/component-topology 8.0.10 → 8.0.12

package/es/core/event/topoEventListener.js

@@ -0,0 +1,22 @@
+var n = 0;
+export function createTopoEventListener(type, onMessage) {
+  var eventListenerName = "topo_" + n++;
+  var EE = window.EE;
+
+  if (EE) {
+    EE.on('topo', eventListenerName, function (data) {
+      if (data.type === type) {
+        onMessage(data.data);
+      }
+    });
+  }
+
+  return {
+    eventListenerName: eventListenerName,
+    close: function close() {
+      if (EE) {
+        window.EE.removeListener('topo', eventListenerName);
+      }
+    }
+  };
+}

package/es/core/hooks/useAlarm.js

@@ -1,8 +1,8 @@
 import _extends from "@babel/runtime/helpers/extends";
 import { useEffect } from "react";
 import rlog from "@riil-frontend/component-topology-utils/es/rlog";
-import { useCbbEventListener } from "@riil-frontend/component-riil-event-emitter";
 import useGraphAlarmDisplay from "./useGraphAlarmDisplay";
+import useTopoEventListener from "./useTopoEventListener";
 /**
  * 
  * 
@@ -104,20 +104,26 @@ export default function useAlarm(options) {
       received: data,
       all: relateTopoAlarm
     });
-  };
+  }; // 订阅消息
+
 
-  useCbbEventListener("topo", {
-    name: "topo",
+  useTopoEventListener({
+    type: 'alarm',
     onMessage: function onMessage(data) {
       rlog.debug("Topoget--AlertMesage------------", topo, data);
-
-      if (data.type === "alarm") {
-        topo.alarm.handleAlarmEvent(data.data);
-      } else if (data.type === "risk") {
-        handleRiskData(data.data);
-      } else if (data.type === "relateTopoAlarm") {
-        handleRelateTopoAlarm(data.data);
-      }
+      topo.alarm.handleAlarmEvent(data);
+    }
+  });
+  useTopoEventListener({
+    type: 'risk',
+    onMessage: function onMessage(data) {
+      handleRiskData(data);
+    }
+  });
+  useTopoEventListener({
+    type: 'relateTopoAlarm',
+    onMessage: function onMessage(data) {
+      handleRelateTopoAlarm(data);
     }
   });
 }

package/es/core/hooks/useTopoEventListener.js

@@ -1,26 +1,12 @@
-import { useEffect, useMemo } from 'react';
-var n = 0;
+import { useEffect } from 'react';
+import { createTopoEventListener } from "../event/topoEventListener";
 export default function useTopoEventListener(props) {
   var type = props.type,
       onMessage = props.onMessage;
-  var eventListenerName = useMemo(function () {
-    return "topo_" + n++;
-  }, []);
   useEffect(function () {
-    var EE = window.EE;
-
-    if (EE) {
-      window.EE.on('topo', eventListenerName, function (data) {
-        if (data.type === type) {
-          onMessage(data.data);
-        }
-      });
-    }
-
+    var listener = createTopoEventListener(type, onMessage);
     return function () {
-      if (EE) {
-        window.EE.removeListener('topo', eventListenerName);
-      }
+      listener.close();
     };
   }, [type, onMessage]);
 }

package/es/core/models/Alarm.js

@@ -5,9 +5,8 @@ import topoService from "@riil-frontend/component-topology-common/es/services/to
 import rlog from "@riil-frontend/component-topology-utils/es/rlog";
 import { EE } from "@riil-frontend/component-riil-event-emitter";
 import { isAvailableArray } from "@riil-frontend/utils";
+import { createTopoEventListener } from "../event/topoEventListener";
 
-// import moment from "moment";
-// import { alarmListDemo } from "./mocks";
 var Alarm = /*#__PURE__*/function () {
   function Alarm() {
     this.topo = void 0;
@@ -375,8 +374,6 @@ var Alarm = /*#__PURE__*/function () {
   /*#__PURE__*/
   function () {
     var _openTopoAlarm = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee6(id) {
-      var _this2 = this;
-
       var _this$getState2, alarmOpening, topoAlarmIsOpen, alarmDispatchers;
 
       return _regeneratorRuntime.wrap(function _callee6$(_context6) {
@@ -409,17 +406,12 @@ var Alarm = /*#__PURE__*/function () {
             case 10:
               this.secretKey = _context6.sent;
               // rlog.debug("openTopoAlarm 获取初始化告警-------------------开始");
-              EE.on("topo", "topo", function (data, other) {
-                rlog.debug("openTopoAlarm 获取初始化告警------收到信息", data);
-
-                _this2.handleAlarmEvent(data);
-              });
               this.updateState({
                 alarmOpening: false,
                 alarmIsOpened: true
               });
 
-            case 13:
+            case 12:
             case "end":
               return _context6.stop();
           }
@@ -463,16 +455,15 @@ var Alarm = /*#__PURE__*/function () {
             case 3:
               this.currentTopoId = null;
               rlog.debug("useAlarm.useEffect 告警WebSocket 结束");
-              EE.removeListener("topo", "topo");
               this.updateState({
                 topoAlarmIsOpen: false,
                 alarmOpening: false,
                 alarmPanelIsOpen: false
               });
-              _context7.next = 9;
+              _context7.next = 8;
               return this.topo.serverApi.closeTopoAlarm(id, this.secretKey);
 
-            case 9:
+            case 8:
             case "end":
               return _context7.stop();
           }
@@ -551,7 +542,7 @@ var Alarm = /*#__PURE__*/function () {
               // console.log("handleAlarmEvent-接收到推送的原始告警信息", alertData);
 
               if (!(isAvailableArray(alertData) && isAvailableArray(resIdsList))) {
-                _context9.next = 24;
+                _context9.next = 25;
                 break;
               }
 
@@ -586,7 +577,7 @@ var Alarm = /*#__PURE__*/function () {
               }); // rlog.debug("before-combAlarmData", al, bizState);
 
               if (!(sendAl.length > 0)) {
-                _context9.next = 24;
+                _context9.next = 25;
                 break;
               }
 
@@ -603,8 +594,11 @@ var Alarm = /*#__PURE__*/function () {
               alarmlist = _yield$alarmDispatche.alarmlist;
 
               if (alarmIsOpened && !eqFlag) {
-                this.hmGetTopoAlarmByDoc(); // 通知所有告警
+                this.hmGetTopoAlarmByDoc();
+              }
 
+              if (alarmIsOpened) {
+                // 通知所有告警
                 if ((_this$topo$viewProps = this.topo.viewProps) !== null && _this$topo$viewProps !== void 0 && _this$topo$viewProps.onAlarm) {
                   this.topo.viewProps.onAlarm(this.getAlarms().map(function (item) {
                     return item.obj;
@@ -616,20 +610,20 @@ var Alarm = /*#__PURE__*/function () {
                 }
               }
 
-              _context9.next = 24;
+              _context9.next = 25;
               break;
 
-            case 21:
-              _context9.prev = 21;
+            case 22:
+              _context9.prev = 22;
               _context9.t0 = _context9["catch"](12);
               rlog.error("告警发送异常", _context9.t0);
 
-            case 24:
+            case 25:
             case "end":
               return _context9.stop();
           }
         }
-      }, _callee9, this, [[12, 21]]);
+      }, _callee9, this, [[12, 22]]);
     }));
 
     function handleAlarmEvent(_x7) {

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

package/lib/core/event/topoEventListener.js

@@ -0,0 +1,27 @@
+"use strict";
+
+exports.__esModule = true;
+exports.createTopoEventListener = createTopoEventListener;
+var n = 0;
+
+function createTopoEventListener(type, onMessage) {
+  var eventListenerName = "topo_" + n++;
+  var EE = window.EE;
+
+  if (EE) {
+    EE.on('topo', eventListenerName, function (data) {
+      if (data.type === type) {
+        onMessage(data.data);
+      }
+    });
+  }
+
+  return {
+    eventListenerName: eventListenerName,
+    close: function close() {
+      if (EE) {
+        window.EE.removeListener('topo', eventListenerName);
+      }
+    }
+  };
+}

package/lib/core/hooks/useAlarm.js

@@ -11,10 +11,10 @@ var _react = require("react");
 
 var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
 
-var _componentRiilEventEmitter = require("@riil-frontend/component-riil-event-emitter");
-
 var _useGraphAlarmDisplay = _interopRequireDefault(require("./useGraphAlarmDisplay"));
 
+var _useTopoEventListener = _interopRequireDefault(require("./useTopoEventListener"));
+
 /**
  * 
  * 
@@ -117,20 +117,27 @@ function useAlarm(options) {
       received: data,
       all: relateTopoAlarm
     });
-  };
+  }; // 订阅消息
 
-  (0, _componentRiilEventEmitter.useCbbEventListener)("topo", {
-    name: "topo",
+
+  (0, _useTopoEventListener["default"])({
+    type: 'alarm',
     onMessage: function onMessage(data) {
       _rlog["default"].debug("Topoget--AlertMesage------------", topo, data);
 
-      if (data.type === "alarm") {
-        topo.alarm.handleAlarmEvent(data.data);
-      } else if (data.type === "risk") {
-        handleRiskData(data.data);
-      } else if (data.type === "relateTopoAlarm") {
-        handleRelateTopoAlarm(data.data);
-      }
+      topo.alarm.handleAlarmEvent(data);
+    }
+  });
+  (0, _useTopoEventListener["default"])({
+    type: 'risk',
+    onMessage: function onMessage(data) {
+      handleRiskData(data);
+    }
+  });
+  (0, _useTopoEventListener["default"])({
+    type: 'relateTopoAlarm',
+    onMessage: function onMessage(data) {
+      handleRelateTopoAlarm(data);
     }
   });
 }

package/lib/core/hooks/useTopoEventListener.js

@@ -5,29 +5,15 @@ exports["default"] = useTopoEventListener;
 
 var _react = require("react");
 
-var n = 0;
+var _topoEventListener = require("../event/topoEventListener");
 
 function useTopoEventListener(props) {
   var type = props.type,
       onMessage = props.onMessage;
-  var eventListenerName = (0, _react.useMemo)(function () {
-    return "topo_" + n++;
-  }, []);
   (0, _react.useEffect)(function () {
-    var EE = window.EE;
-
-    if (EE) {
-      window.EE.on('topo', eventListenerName, function (data) {
-        if (data.type === type) {
-          onMessage(data.data);
-        }
-      });
-    }
-
+    var listener = (0, _topoEventListener.createTopoEventListener)(type, onMessage);
     return function () {
-      if (EE) {
-        window.EE.removeListener('topo', eventListenerName);
-      }
+      listener.close();
     };
   }, [type, onMessage]);
 }

package/lib/core/models/Alarm.js

@@ -19,8 +19,8 @@ var _componentRiilEventEmitter = require("@riil-frontend/component-riil-event-em
 
 var _utils = require("@riil-frontend/utils");
 
-// import moment from "moment";
-// import { alarmListDemo } from "./mocks";
+var _topoEventListener = require("../event/topoEventListener");
+
 var Alarm = /*#__PURE__*/function () {
   function Alarm() {
     this.topo = void 0;
@@ -394,8 +394,6 @@ var Alarm = /*#__PURE__*/function () {
   /*#__PURE__*/
   function () {
     var _openTopoAlarm = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee6(id) {
-      var _this2 = this;
-
       var _this$getState2, alarmOpening, topoAlarmIsOpen, alarmDispatchers;
 
       return _regenerator["default"].wrap(function _callee6$(_context6) {
@@ -427,20 +425,13 @@ var Alarm = /*#__PURE__*/function () {
 
             case 10:
               this.secretKey = _context6.sent;
-
               // rlog.debug("openTopoAlarm 获取初始化告警-------------------开始");
-              _componentRiilEventEmitter.EE.on("topo", "topo", function (data, other) {
-                _rlog["default"].debug("openTopoAlarm 获取初始化告警------收到信息", data);
-
-                _this2.handleAlarmEvent(data);
-              });
-
               this.updateState({
                 alarmOpening: false,
                 alarmIsOpened: true
               });
 
-            case 13:
+            case 12:
             case "end":
               return _context6.stop();
           }
@@ -486,17 +477,15 @@ var Alarm = /*#__PURE__*/function () {
 
               _rlog["default"].debug("useAlarm.useEffect 告警WebSocket 结束");
 
-              _componentRiilEventEmitter.EE.removeListener("topo", "topo");
-
               this.updateState({
                 topoAlarmIsOpen: false,
                 alarmOpening: false,
                 alarmPanelIsOpen: false
               });
-              _context7.next = 9;
+              _context7.next = 8;
               return this.topo.serverApi.closeTopoAlarm(id, this.secretKey);
 
-            case 9:
+            case 8:
             case "end":
               return _context7.stop();
           }
@@ -575,7 +564,7 @@ var Alarm = /*#__PURE__*/function () {
               // console.log("handleAlarmEvent-接收到推送的原始告警信息", alertData);
 
               if (!((0, _utils.isAvailableArray)(alertData) && (0, _utils.isAvailableArray)(resIdsList))) {
-                _context9.next = 24;
+                _context9.next = 25;
                 break;
               }
 
@@ -610,7 +599,7 @@ var Alarm = /*#__PURE__*/function () {
               }); // rlog.debug("before-combAlarmData", al, bizState);
 
               if (!(sendAl.length > 0)) {
-                _context9.next = 24;
+                _context9.next = 25;
                 break;
               }
 
@@ -628,8 +617,11 @@ var Alarm = /*#__PURE__*/function () {
               alarmlist = _yield$alarmDispatche.alarmlist;
 
               if (alarmIsOpened && !eqFlag) {
-                this.hmGetTopoAlarmByDoc(); // 通知所有告警
+                this.hmGetTopoAlarmByDoc();
+              }
 
+              if (alarmIsOpened) {
+                // 通知所有告警
                 if ((_this$topo$viewProps = this.topo.viewProps) !== null && _this$topo$viewProps !== void 0 && _this$topo$viewProps.onAlarm) {
                   this.topo.viewProps.onAlarm(this.getAlarms().map(function (item) {
                     return item.obj;
@@ -641,21 +633,21 @@ var Alarm = /*#__PURE__*/function () {
                 }
               }
 
-              _context9.next = 24;
+              _context9.next = 25;
               break;
 
-            case 21:
-              _context9.prev = 21;
+            case 22:
+              _context9.prev = 22;
               _context9.t0 = _context9["catch"](12);
 
               _rlog["default"].error("告警发送异常", _context9.t0);
 
-            case 24:
+            case 25:
             case "end":
               return _context9.stop();
           }
         }
-      }, _callee9, this, [[12, 21]]);
+      }, _callee9, this, [[12, 22]]);
     }));
 
     function handleAlarmEvent(_x7) {

package/lib/core/models/TopoApp.js

@@ -56,7 +56,7 @@ var _SelectionModel = _interopRequireDefault(require("./SelectionModel"));
 var _CiCache = _interopRequireDefault(require("./cache/CiCache"));
 
 // eslint-disable-next-line no-undef
-var version = typeof "8.0.10" === 'string' ? "8.0.10" : null;
+var version = typeof "8.0.12" === 'string' ? "8.0.12" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 /**
  * 拓扑显示和编辑

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@riil-frontend/component-topology",
-  "version": "8.0.10",
+  "version": "8.0.12",
   "description": "拓扑",
   "scripts": {
     "start": "build-scripts start",
@@ -116,6 +116,6 @@
     "access": "public"
   },
   "license": "MIT",
-  "homepage": "https://unpkg.com/@riil-frontend/component-topology@8.0.10/build/index.html",
+  "homepage": "https://unpkg.com/@riil-frontend/component-topology@8.0.12/build/index.html",
   "gitHead": "2da19ffccbb7ca60a8acf396e39f542c68bb33f5"
 }