@riil-frontend/component-topology 8.0.10 → 8.0.12
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/build/index.js +1 -1
- package/es/core/event/topoEventListener.js +22 -0
- package/es/core/hooks/useAlarm.js +18 -12
- package/es/core/hooks/useTopoEventListener.js +4 -18
- package/es/core/models/Alarm.js +15 -21
- package/es/core/models/TopoApp.js +1 -1
- package/lib/core/event/topoEventListener.js +27 -0
- package/lib/core/hooks/useAlarm.js +19 -12
- package/lib/core/hooks/useTopoEventListener.js +3 -17
- package/lib/core/models/Alarm.js +16 -24
- package/lib/core/models/TopoApp.js +1 -1
- package/package.json +2 -2
@@ -0,0 +1,22 @@
|
|
1
|
+
var n = 0;
|
2
|
+
export function createTopoEventListener(type, onMessage) {
|
3
|
+
var eventListenerName = "topo_" + n++;
|
4
|
+
var EE = window.EE;
|
5
|
+
|
6
|
+
if (EE) {
|
7
|
+
EE.on('topo', eventListenerName, function (data) {
|
8
|
+
if (data.type === type) {
|
9
|
+
onMessage(data.data);
|
10
|
+
}
|
11
|
+
});
|
12
|
+
}
|
13
|
+
|
14
|
+
return {
|
15
|
+
eventListenerName: eventListenerName,
|
16
|
+
close: function close() {
|
17
|
+
if (EE) {
|
18
|
+
window.EE.removeListener('topo', eventListenerName);
|
19
|
+
}
|
20
|
+
}
|
21
|
+
};
|
22
|
+
}
|
@@ -1,8 +1,8 @@
|
|
1
1
|
import _extends from "@babel/runtime/helpers/extends";
|
2
2
|
import { useEffect } from "react";
|
3
3
|
import rlog from "@riil-frontend/component-topology-utils/es/rlog";
|
4
|
-
import { useCbbEventListener } from "@riil-frontend/component-riil-event-emitter";
|
5
4
|
import useGraphAlarmDisplay from "./useGraphAlarmDisplay";
|
5
|
+
import useTopoEventListener from "./useTopoEventListener";
|
6
6
|
/**
|
7
7
|
*
|
8
8
|
*
|
@@ -104,20 +104,26 @@ export default function useAlarm(options) {
|
|
104
104
|
received: data,
|
105
105
|
all: relateTopoAlarm
|
106
106
|
});
|
107
|
-
};
|
107
|
+
}; // 订阅消息
|
108
|
+
|
108
109
|
|
109
|
-
|
110
|
-
|
110
|
+
useTopoEventListener({
|
111
|
+
type: 'alarm',
|
111
112
|
onMessage: function onMessage(data) {
|
112
113
|
rlog.debug("Topoget--AlertMesage------------", topo, data);
|
113
|
-
|
114
|
-
|
115
|
-
|
116
|
-
|
117
|
-
|
118
|
-
|
119
|
-
|
120
|
-
|
114
|
+
topo.alarm.handleAlarmEvent(data);
|
115
|
+
}
|
116
|
+
});
|
117
|
+
useTopoEventListener({
|
118
|
+
type: 'risk',
|
119
|
+
onMessage: function onMessage(data) {
|
120
|
+
handleRiskData(data);
|
121
|
+
}
|
122
|
+
});
|
123
|
+
useTopoEventListener({
|
124
|
+
type: 'relateTopoAlarm',
|
125
|
+
onMessage: function onMessage(data) {
|
126
|
+
handleRelateTopoAlarm(data);
|
121
127
|
}
|
122
128
|
});
|
123
129
|
}
|
@@ -1,26 +1,12 @@
|
|
1
|
-
import { useEffect
|
2
|
-
|
1
|
+
import { useEffect } from 'react';
|
2
|
+
import { createTopoEventListener } from "../event/topoEventListener";
|
3
3
|
export default function useTopoEventListener(props) {
|
4
4
|
var type = props.type,
|
5
5
|
onMessage = props.onMessage;
|
6
|
-
var eventListenerName = useMemo(function () {
|
7
|
-
return "topo_" + n++;
|
8
|
-
}, []);
|
9
6
|
useEffect(function () {
|
10
|
-
var
|
11
|
-
|
12
|
-
if (EE) {
|
13
|
-
window.EE.on('topo', eventListenerName, function (data) {
|
14
|
-
if (data.type === type) {
|
15
|
-
onMessage(data.data);
|
16
|
-
}
|
17
|
-
});
|
18
|
-
}
|
19
|
-
|
7
|
+
var listener = createTopoEventListener(type, onMessage);
|
20
8
|
return function () {
|
21
|
-
|
22
|
-
window.EE.removeListener('topo', eventListenerName);
|
23
|
-
}
|
9
|
+
listener.close();
|
24
10
|
};
|
25
11
|
}, [type, onMessage]);
|
26
12
|
}
|
package/es/core/models/Alarm.js
CHANGED
@@ -5,9 +5,8 @@ import topoService from "@riil-frontend/component-topology-common/es/services/to
|
|
5
5
|
import rlog from "@riil-frontend/component-topology-utils/es/rlog";
|
6
6
|
import { EE } from "@riil-frontend/component-riil-event-emitter";
|
7
7
|
import { isAvailableArray } from "@riil-frontend/utils";
|
8
|
+
import { createTopoEventListener } from "../event/topoEventListener";
|
8
9
|
|
9
|
-
// import moment from "moment";
|
10
|
-
// import { alarmListDemo } from "./mocks";
|
11
10
|
var Alarm = /*#__PURE__*/function () {
|
12
11
|
function Alarm() {
|
13
12
|
this.topo = void 0;
|
@@ -375,8 +374,6 @@ var Alarm = /*#__PURE__*/function () {
|
|
375
374
|
/*#__PURE__*/
|
376
375
|
function () {
|
377
376
|
var _openTopoAlarm = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee6(id) {
|
378
|
-
var _this2 = this;
|
379
|
-
|
380
377
|
var _this$getState2, alarmOpening, topoAlarmIsOpen, alarmDispatchers;
|
381
378
|
|
382
379
|
return _regeneratorRuntime.wrap(function _callee6$(_context6) {
|
@@ -409,17 +406,12 @@ var Alarm = /*#__PURE__*/function () {
|
|
409
406
|
case 10:
|
410
407
|
this.secretKey = _context6.sent;
|
411
408
|
// rlog.debug("openTopoAlarm 获取初始化告警-------------------开始");
|
412
|
-
EE.on("topo", "topo", function (data, other) {
|
413
|
-
rlog.debug("openTopoAlarm 获取初始化告警------收到信息", data);
|
414
|
-
|
415
|
-
_this2.handleAlarmEvent(data);
|
416
|
-
});
|
417
409
|
this.updateState({
|
418
410
|
alarmOpening: false,
|
419
411
|
alarmIsOpened: true
|
420
412
|
});
|
421
413
|
|
422
|
-
case
|
414
|
+
case 12:
|
423
415
|
case "end":
|
424
416
|
return _context6.stop();
|
425
417
|
}
|
@@ -463,16 +455,15 @@ var Alarm = /*#__PURE__*/function () {
|
|
463
455
|
case 3:
|
464
456
|
this.currentTopoId = null;
|
465
457
|
rlog.debug("useAlarm.useEffect 告警WebSocket 结束");
|
466
|
-
EE.removeListener("topo", "topo");
|
467
458
|
this.updateState({
|
468
459
|
topoAlarmIsOpen: false,
|
469
460
|
alarmOpening: false,
|
470
461
|
alarmPanelIsOpen: false
|
471
462
|
});
|
472
|
-
_context7.next =
|
463
|
+
_context7.next = 8;
|
473
464
|
return this.topo.serverApi.closeTopoAlarm(id, this.secretKey);
|
474
465
|
|
475
|
-
case
|
466
|
+
case 8:
|
476
467
|
case "end":
|
477
468
|
return _context7.stop();
|
478
469
|
}
|
@@ -551,7 +542,7 @@ var Alarm = /*#__PURE__*/function () {
|
|
551
542
|
// console.log("handleAlarmEvent-接收到推送的原始告警信息", alertData);
|
552
543
|
|
553
544
|
if (!(isAvailableArray(alertData) && isAvailableArray(resIdsList))) {
|
554
|
-
_context9.next =
|
545
|
+
_context9.next = 25;
|
555
546
|
break;
|
556
547
|
}
|
557
548
|
|
@@ -586,7 +577,7 @@ var Alarm = /*#__PURE__*/function () {
|
|
586
577
|
}); // rlog.debug("before-combAlarmData", al, bizState);
|
587
578
|
|
588
579
|
if (!(sendAl.length > 0)) {
|
589
|
-
_context9.next =
|
580
|
+
_context9.next = 25;
|
590
581
|
break;
|
591
582
|
}
|
592
583
|
|
@@ -603,8 +594,11 @@ var Alarm = /*#__PURE__*/function () {
|
|
603
594
|
alarmlist = _yield$alarmDispatche.alarmlist;
|
604
595
|
|
605
596
|
if (alarmIsOpened && !eqFlag) {
|
606
|
-
this.hmGetTopoAlarmByDoc();
|
597
|
+
this.hmGetTopoAlarmByDoc();
|
598
|
+
}
|
607
599
|
|
600
|
+
if (alarmIsOpened) {
|
601
|
+
// 通知所有告警
|
608
602
|
if ((_this$topo$viewProps = this.topo.viewProps) !== null && _this$topo$viewProps !== void 0 && _this$topo$viewProps.onAlarm) {
|
609
603
|
this.topo.viewProps.onAlarm(this.getAlarms().map(function (item) {
|
610
604
|
return item.obj;
|
@@ -616,20 +610,20 @@ var Alarm = /*#__PURE__*/function () {
|
|
616
610
|
}
|
617
611
|
}
|
618
612
|
|
619
|
-
_context9.next =
|
613
|
+
_context9.next = 25;
|
620
614
|
break;
|
621
615
|
|
622
|
-
case
|
623
|
-
_context9.prev =
|
616
|
+
case 22:
|
617
|
+
_context9.prev = 22;
|
624
618
|
_context9.t0 = _context9["catch"](12);
|
625
619
|
rlog.error("告警发送异常", _context9.t0);
|
626
620
|
|
627
|
-
case
|
621
|
+
case 25:
|
628
622
|
case "end":
|
629
623
|
return _context9.stop();
|
630
624
|
}
|
631
625
|
}
|
632
|
-
}, _callee9, this, [[12,
|
626
|
+
}, _callee9, this, [[12, 22]]);
|
633
627
|
}));
|
634
628
|
|
635
629
|
function handleAlarmEvent(_x7) {
|
@@ -24,7 +24,7 @@ import ElementTagTipConfig from "./tagstips/ElementTagTipConfig";
|
|
24
24
|
import SelectionModel from "./SelectionModel";
|
25
25
|
import CiCache from "./cache/CiCache"; // eslint-disable-next-line no-undef
|
26
26
|
|
27
|
-
var version = typeof "8.0.
|
27
|
+
var version = typeof "8.0.12" === 'string' ? "8.0.12" : null;
|
28
28
|
console.info("\u62D3\u6251\u7248\u672C: " + version);
|
29
29
|
/**
|
30
30
|
* 拓扑显示和编辑
|
@@ -0,0 +1,27 @@
|
|
1
|
+
"use strict";
|
2
|
+
|
3
|
+
exports.__esModule = true;
|
4
|
+
exports.createTopoEventListener = createTopoEventListener;
|
5
|
+
var n = 0;
|
6
|
+
|
7
|
+
function createTopoEventListener(type, onMessage) {
|
8
|
+
var eventListenerName = "topo_" + n++;
|
9
|
+
var EE = window.EE;
|
10
|
+
|
11
|
+
if (EE) {
|
12
|
+
EE.on('topo', eventListenerName, function (data) {
|
13
|
+
if (data.type === type) {
|
14
|
+
onMessage(data.data);
|
15
|
+
}
|
16
|
+
});
|
17
|
+
}
|
18
|
+
|
19
|
+
return {
|
20
|
+
eventListenerName: eventListenerName,
|
21
|
+
close: function close() {
|
22
|
+
if (EE) {
|
23
|
+
window.EE.removeListener('topo', eventListenerName);
|
24
|
+
}
|
25
|
+
}
|
26
|
+
};
|
27
|
+
}
|
@@ -11,10 +11,10 @@ var _react = require("react");
|
|
11
11
|
|
12
12
|
var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
|
13
13
|
|
14
|
-
var _componentRiilEventEmitter = require("@riil-frontend/component-riil-event-emitter");
|
15
|
-
|
16
14
|
var _useGraphAlarmDisplay = _interopRequireDefault(require("./useGraphAlarmDisplay"));
|
17
15
|
|
16
|
+
var _useTopoEventListener = _interopRequireDefault(require("./useTopoEventListener"));
|
17
|
+
|
18
18
|
/**
|
19
19
|
*
|
20
20
|
*
|
@@ -117,20 +117,27 @@ function useAlarm(options) {
|
|
117
117
|
received: data,
|
118
118
|
all: relateTopoAlarm
|
119
119
|
});
|
120
|
-
};
|
120
|
+
}; // 订阅消息
|
121
121
|
|
122
|
-
|
123
|
-
|
122
|
+
|
123
|
+
(0, _useTopoEventListener["default"])({
|
124
|
+
type: 'alarm',
|
124
125
|
onMessage: function onMessage(data) {
|
125
126
|
_rlog["default"].debug("Topoget--AlertMesage------------", topo, data);
|
126
127
|
|
127
|
-
|
128
|
-
|
129
|
-
|
130
|
-
|
131
|
-
|
132
|
-
|
133
|
-
|
128
|
+
topo.alarm.handleAlarmEvent(data);
|
129
|
+
}
|
130
|
+
});
|
131
|
+
(0, _useTopoEventListener["default"])({
|
132
|
+
type: 'risk',
|
133
|
+
onMessage: function onMessage(data) {
|
134
|
+
handleRiskData(data);
|
135
|
+
}
|
136
|
+
});
|
137
|
+
(0, _useTopoEventListener["default"])({
|
138
|
+
type: 'relateTopoAlarm',
|
139
|
+
onMessage: function onMessage(data) {
|
140
|
+
handleRelateTopoAlarm(data);
|
134
141
|
}
|
135
142
|
});
|
136
143
|
}
|
@@ -5,29 +5,15 @@ exports["default"] = useTopoEventListener;
|
|
5
5
|
|
6
6
|
var _react = require("react");
|
7
7
|
|
8
|
-
var
|
8
|
+
var _topoEventListener = require("../event/topoEventListener");
|
9
9
|
|
10
10
|
function useTopoEventListener(props) {
|
11
11
|
var type = props.type,
|
12
12
|
onMessage = props.onMessage;
|
13
|
-
var eventListenerName = (0, _react.useMemo)(function () {
|
14
|
-
return "topo_" + n++;
|
15
|
-
}, []);
|
16
13
|
(0, _react.useEffect)(function () {
|
17
|
-
var
|
18
|
-
|
19
|
-
if (EE) {
|
20
|
-
window.EE.on('topo', eventListenerName, function (data) {
|
21
|
-
if (data.type === type) {
|
22
|
-
onMessage(data.data);
|
23
|
-
}
|
24
|
-
});
|
25
|
-
}
|
26
|
-
|
14
|
+
var listener = (0, _topoEventListener.createTopoEventListener)(type, onMessage);
|
27
15
|
return function () {
|
28
|
-
|
29
|
-
window.EE.removeListener('topo', eventListenerName);
|
30
|
-
}
|
16
|
+
listener.close();
|
31
17
|
};
|
32
18
|
}, [type, onMessage]);
|
33
19
|
}
|
package/lib/core/models/Alarm.js
CHANGED
@@ -19,8 +19,8 @@ var _componentRiilEventEmitter = require("@riil-frontend/component-riil-event-em
|
|
19
19
|
|
20
20
|
var _utils = require("@riil-frontend/utils");
|
21
21
|
|
22
|
-
|
23
|
-
|
22
|
+
var _topoEventListener = require("../event/topoEventListener");
|
23
|
+
|
24
24
|
var Alarm = /*#__PURE__*/function () {
|
25
25
|
function Alarm() {
|
26
26
|
this.topo = void 0;
|
@@ -394,8 +394,6 @@ var Alarm = /*#__PURE__*/function () {
|
|
394
394
|
/*#__PURE__*/
|
395
395
|
function () {
|
396
396
|
var _openTopoAlarm = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee6(id) {
|
397
|
-
var _this2 = this;
|
398
|
-
|
399
397
|
var _this$getState2, alarmOpening, topoAlarmIsOpen, alarmDispatchers;
|
400
398
|
|
401
399
|
return _regenerator["default"].wrap(function _callee6$(_context6) {
|
@@ -427,20 +425,13 @@ var Alarm = /*#__PURE__*/function () {
|
|
427
425
|
|
428
426
|
case 10:
|
429
427
|
this.secretKey = _context6.sent;
|
430
|
-
|
431
428
|
// rlog.debug("openTopoAlarm 获取初始化告警-------------------开始");
|
432
|
-
_componentRiilEventEmitter.EE.on("topo", "topo", function (data, other) {
|
433
|
-
_rlog["default"].debug("openTopoAlarm 获取初始化告警------收到信息", data);
|
434
|
-
|
435
|
-
_this2.handleAlarmEvent(data);
|
436
|
-
});
|
437
|
-
|
438
429
|
this.updateState({
|
439
430
|
alarmOpening: false,
|
440
431
|
alarmIsOpened: true
|
441
432
|
});
|
442
433
|
|
443
|
-
case
|
434
|
+
case 12:
|
444
435
|
case "end":
|
445
436
|
return _context6.stop();
|
446
437
|
}
|
@@ -486,17 +477,15 @@ var Alarm = /*#__PURE__*/function () {
|
|
486
477
|
|
487
478
|
_rlog["default"].debug("useAlarm.useEffect 告警WebSocket 结束");
|
488
479
|
|
489
|
-
_componentRiilEventEmitter.EE.removeListener("topo", "topo");
|
490
|
-
|
491
480
|
this.updateState({
|
492
481
|
topoAlarmIsOpen: false,
|
493
482
|
alarmOpening: false,
|
494
483
|
alarmPanelIsOpen: false
|
495
484
|
});
|
496
|
-
_context7.next =
|
485
|
+
_context7.next = 8;
|
497
486
|
return this.topo.serverApi.closeTopoAlarm(id, this.secretKey);
|
498
487
|
|
499
|
-
case
|
488
|
+
case 8:
|
500
489
|
case "end":
|
501
490
|
return _context7.stop();
|
502
491
|
}
|
@@ -575,7 +564,7 @@ var Alarm = /*#__PURE__*/function () {
|
|
575
564
|
// console.log("handleAlarmEvent-接收到推送的原始告警信息", alertData);
|
576
565
|
|
577
566
|
if (!((0, _utils.isAvailableArray)(alertData) && (0, _utils.isAvailableArray)(resIdsList))) {
|
578
|
-
_context9.next =
|
567
|
+
_context9.next = 25;
|
579
568
|
break;
|
580
569
|
}
|
581
570
|
|
@@ -610,7 +599,7 @@ var Alarm = /*#__PURE__*/function () {
|
|
610
599
|
}); // rlog.debug("before-combAlarmData", al, bizState);
|
611
600
|
|
612
601
|
if (!(sendAl.length > 0)) {
|
613
|
-
_context9.next =
|
602
|
+
_context9.next = 25;
|
614
603
|
break;
|
615
604
|
}
|
616
605
|
|
@@ -628,8 +617,11 @@ var Alarm = /*#__PURE__*/function () {
|
|
628
617
|
alarmlist = _yield$alarmDispatche.alarmlist;
|
629
618
|
|
630
619
|
if (alarmIsOpened && !eqFlag) {
|
631
|
-
this.hmGetTopoAlarmByDoc();
|
620
|
+
this.hmGetTopoAlarmByDoc();
|
621
|
+
}
|
632
622
|
|
623
|
+
if (alarmIsOpened) {
|
624
|
+
// 通知所有告警
|
633
625
|
if ((_this$topo$viewProps = this.topo.viewProps) !== null && _this$topo$viewProps !== void 0 && _this$topo$viewProps.onAlarm) {
|
634
626
|
this.topo.viewProps.onAlarm(this.getAlarms().map(function (item) {
|
635
627
|
return item.obj;
|
@@ -641,21 +633,21 @@ var Alarm = /*#__PURE__*/function () {
|
|
641
633
|
}
|
642
634
|
}
|
643
635
|
|
644
|
-
_context9.next =
|
636
|
+
_context9.next = 25;
|
645
637
|
break;
|
646
638
|
|
647
|
-
case
|
648
|
-
_context9.prev =
|
639
|
+
case 22:
|
640
|
+
_context9.prev = 22;
|
649
641
|
_context9.t0 = _context9["catch"](12);
|
650
642
|
|
651
643
|
_rlog["default"].error("告警发送异常", _context9.t0);
|
652
644
|
|
653
|
-
case
|
645
|
+
case 25:
|
654
646
|
case "end":
|
655
647
|
return _context9.stop();
|
656
648
|
}
|
657
649
|
}
|
658
|
-
}, _callee9, this, [[12,
|
650
|
+
}, _callee9, this, [[12, 22]]);
|
659
651
|
}));
|
660
652
|
|
661
653
|
function handleAlarmEvent(_x7) {
|
@@ -56,7 +56,7 @@ var _SelectionModel = _interopRequireDefault(require("./SelectionModel"));
|
|
56
56
|
var _CiCache = _interopRequireDefault(require("./cache/CiCache"));
|
57
57
|
|
58
58
|
// eslint-disable-next-line no-undef
|
59
|
-
var version = typeof "8.0.
|
59
|
+
var version = typeof "8.0.12" === 'string' ? "8.0.12" : null;
|
60
60
|
console.info("\u62D3\u6251\u7248\u672C: " + version);
|
61
61
|
/**
|
62
62
|
* 拓扑显示和编辑
|
package/package.json
CHANGED
@@ -1,6 +1,6 @@
|
|
1
1
|
{
|
2
2
|
"name": "@riil-frontend/component-topology",
|
3
|
-
"version": "8.0.
|
3
|
+
"version": "8.0.12",
|
4
4
|
"description": "拓扑",
|
5
5
|
"scripts": {
|
6
6
|
"start": "build-scripts start",
|
@@ -116,6 +116,6 @@
|
|
116
116
|
"access": "public"
|
117
117
|
},
|
118
118
|
"license": "MIT",
|
119
|
-
"homepage": "https://unpkg.com/@riil-frontend/component-topology@8.0.
|
119
|
+
"homepage": "https://unpkg.com/@riil-frontend/component-topology@8.0.12/build/index.html",
|
120
120
|
"gitHead": "2da19ffccbb7ca60a8acf396e39f542c68bb33f5"
|
121
121
|
}
|