@riil-frontend/component-topology 11.0.14 → 11.0.17
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.css +1 -1
- package/build/index.js +1 -1
- package/es/core/editor/components/BottomFloatTool/HelpIcon.js +16 -6
- package/es/core/editor/components/BottomFloatTool/HelpIcon.module.scss +7 -0
- package/es/core/models/Alarm.js +41 -32
- package/es/core/models/TopoApp.js +1 -1
- package/lib/core/editor/components/BottomFloatTool/HelpIcon.js +16 -5
- package/lib/core/editor/components/BottomFloatTool/HelpIcon.module.scss +7 -0
- package/lib/core/models/Alarm.js +42 -31
- package/lib/core/models/TopoApp.js +1 -1
- package/package.json +2 -2
@@ -1,22 +1,20 @@
|
|
1
1
|
import _Balloon from "@alifd/next/es/balloon";
|
2
2
|
import _Grid from "@alifd/next/es/grid";
|
3
|
-
import React, { useState, useEffect } from 'react';
|
3
|
+
import React, { useState, useEffect, useRef } from 'react';
|
4
4
|
import styles from "./HelpIcon.module.scss";
|
5
5
|
import useCanvasThemeConfig from "../../../hooks/useCanvasThemeConfig";
|
6
|
+
var Row = _Grid.Row,
|
7
|
+
Col = _Grid.Col;
|
6
8
|
|
7
9
|
function HelpIcon(props) {
|
8
10
|
var topo = props.topo,
|
9
11
|
topoType = props.topoType;
|
10
|
-
var localStorageVal = localStorage.getItem(topoType + 'helpBoxHidden');
|
11
12
|
|
12
13
|
var _useState = useState(),
|
13
14
|
helpBoxIsShow = _useState[0],
|
14
15
|
setHelpBoxIsShow = _useState[1]; //TODO:在主得style里面需要增加color与background属性,根据外部传值进行改变,默认值为$color-text1-4,#fff
|
15
16
|
|
16
17
|
|
17
|
-
var Row = _Grid.Row,
|
18
|
-
Col = _Grid.Col;
|
19
|
-
|
20
18
|
var _useCanvasThemeConfig = useCanvasThemeConfig({
|
21
19
|
topo: topo
|
22
20
|
}),
|
@@ -33,15 +31,27 @@ function HelpIcon(props) {
|
|
33
31
|
|
34
32
|
var topoModState = topo.store.useModelState('topoMod');
|
35
33
|
var graphLoaded = topoModState.graphLoaded;
|
34
|
+
var topoViewerRef = useRef();
|
35
|
+
useEffect(function () {
|
36
|
+
var io = new IntersectionObserver(function (entries) {
|
37
|
+
if (entries[0].isIntersecting) {
|
38
|
+
setHelpBoxIsShow(localStorage.getItem(topoType + 'helpBoxHidden') == 'true' ? false : true);
|
39
|
+
} else {
|
40
|
+
setHelpBoxIsShow(false);
|
41
|
+
}
|
42
|
+
});
|
43
|
+
io.observe(topoViewerRef.current);
|
44
|
+
});
|
36
45
|
useEffect(function () {
|
37
46
|
if (graphLoaded) {
|
38
|
-
setHelpBoxIsShow(
|
47
|
+
setHelpBoxIsShow(localStorage.getItem(topoType + 'helpBoxHidden') == 'true' ? false : true);
|
39
48
|
}
|
40
49
|
}, [topo, graphLoaded]);
|
41
50
|
return /*#__PURE__*/React.createElement(_Balloon, {
|
42
51
|
triggerType: "click",
|
43
52
|
align: "t",
|
44
53
|
trigger: /*#__PURE__*/React.createElement("div", {
|
54
|
+
ref: topoViewerRef,
|
45
55
|
className: styles.topoHelpIconBtn,
|
46
56
|
onClick: function onClick() {
|
47
57
|
open;
|
package/es/core/models/Alarm.js
CHANGED
@@ -1,11 +1,9 @@
|
|
1
1
|
import _Dialog from "@alifd/next/es/dialog";
|
2
2
|
import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
|
3
3
|
import _regeneratorRuntime from "@babel/runtime/regenerator";
|
4
|
-
import topoService from
|
5
|
-
import rlog from
|
6
|
-
import {
|
7
|
-
import { isAvailableArray } from "@riil-frontend/utils";
|
8
|
-
import { createTopoEventListener } from "../event/topoEventListener";
|
4
|
+
import topoService from '@riil-frontend/component-topology-common/es/services/topo';
|
5
|
+
import rlog from '@riil-frontend/component-topology-utils/es/rlog';
|
6
|
+
import { isAvailableArray } from '@riil-frontend/utils';
|
9
7
|
|
10
8
|
var Alarm = /*#__PURE__*/function () {
|
11
9
|
function Alarm() {
|
@@ -85,7 +83,7 @@ var Alarm = /*#__PURE__*/function () {
|
|
85
83
|
return;
|
86
84
|
}
|
87
85
|
|
88
|
-
rlog.info(
|
86
|
+
rlog.info('Alarm.open 打开告警通道', id);
|
89
87
|
this.openTopoAlarm(id); // this.hmGetTopoAlarm(id);
|
90
88
|
|
91
89
|
this.hmGetTopoAlarmByDoc(id);
|
@@ -106,7 +104,7 @@ var Alarm = /*#__PURE__*/function () {
|
|
106
104
|
return;
|
107
105
|
}
|
108
106
|
|
109
|
-
rlog.info(
|
107
|
+
rlog.info('关闭告警通道', currentTopoId); // 取消订阅告警推送
|
110
108
|
// 关闭告警推送通道
|
111
109
|
|
112
110
|
this.closeTopoAlarm(currentTopoId);
|
@@ -126,11 +124,11 @@ var Alarm = /*#__PURE__*/function () {
|
|
126
124
|
|
127
125
|
_proto.confirmOpenWhenLargeResource = function confirmOpenWhenLargeResource(cb) {
|
128
126
|
_Dialog.confirm({
|
129
|
-
title:
|
127
|
+
title: '提示',
|
130
128
|
messageProps: {
|
131
|
-
type:
|
129
|
+
type: 'warning'
|
132
130
|
},
|
133
|
-
content:
|
131
|
+
content: '该拓扑图上节点较多,继续查询告警可能影响系统整体性能,是否暂不显示告警?',
|
134
132
|
onCancel: function onCancel() {
|
135
133
|
cb();
|
136
134
|
}
|
@@ -188,7 +186,7 @@ var Alarm = /*#__PURE__*/function () {
|
|
188
186
|
switch (_context2.prev = _context2.next) {
|
189
187
|
case 0:
|
190
188
|
result = this.getAlarms();
|
191
|
-
rlog.debug(
|
189
|
+
rlog.debug('hmGetTopoAlarmByDoc', result);
|
192
190
|
alarms = result.map(function (item) {
|
193
191
|
return item.obj;
|
194
192
|
});
|
@@ -251,17 +249,17 @@ var Alarm = /*#__PURE__*/function () {
|
|
251
249
|
|
252
250
|
parms = {
|
253
251
|
mainCiIdList: mainCiIdList,
|
254
|
-
alertStatusList: [
|
252
|
+
alertStatusList: ['toDeal', 'dealing'],
|
255
253
|
pageNum: 1,
|
256
254
|
pageSize: 10,
|
257
|
-
sortField:
|
255
|
+
sortField: 'alertLevel',
|
258
256
|
alertLevelList: [],
|
259
257
|
orders: [{
|
260
|
-
property:
|
261
|
-
direction:
|
258
|
+
property: 'alertLevel',
|
259
|
+
direction: 'ASC'
|
262
260
|
}, {
|
263
|
-
property:
|
264
|
-
direction:
|
261
|
+
property: 'createTime',
|
262
|
+
direction: 'DESC'
|
265
263
|
}],
|
266
264
|
createTime: {
|
267
265
|
startTime: startTime,
|
@@ -273,7 +271,7 @@ var Alarm = /*#__PURE__*/function () {
|
|
273
271
|
|
274
272
|
case 9:
|
275
273
|
result = _context3.sent;
|
276
|
-
rlog.debug(
|
274
|
+
rlog.debug('getAlarmById-result', result); // if (alarmIsOpened) {
|
277
275
|
// //this.topo.loadAlarm(result.datas);
|
278
276
|
// this.handleAlarmEvent({ type: "alarm", data: result.datas });
|
279
277
|
// }
|
@@ -345,7 +343,7 @@ var Alarm = /*#__PURE__*/function () {
|
|
345
343
|
switch (_context5.prev = _context5.next) {
|
346
344
|
case 0:
|
347
345
|
// console.log("switchAlarmPopPanel", flag);
|
348
|
-
topoDispatchers = this.topo.store.getModelDispatchers(
|
346
|
+
topoDispatchers = this.topo.store.getModelDispatchers('topoAlarm');
|
349
347
|
topoDispatchers.update({
|
350
348
|
alarmPanelIsOpen: flag
|
351
349
|
});
|
@@ -396,28 +394,39 @@ var Alarm = /*#__PURE__*/function () {
|
|
396
394
|
this.updateState({
|
397
395
|
alarmOpening: true
|
398
396
|
});
|
399
|
-
alarmDispatchers = this.topo.store.getModelDispatchers(
|
397
|
+
alarmDispatchers = this.topo.store.getModelDispatchers('topoAlarm');
|
400
398
|
_context6.next = 8;
|
401
399
|
return alarmDispatchers.resetAlarmDoc();
|
402
400
|
|
403
401
|
case 8:
|
404
|
-
_context6.
|
402
|
+
_context6.prev = 8;
|
403
|
+
_context6.next = 11;
|
405
404
|
return this.topo.serverApi.openTopoAlarm(id);
|
406
405
|
|
407
|
-
case
|
406
|
+
case 11:
|
408
407
|
this.secretKey = _context6.sent;
|
409
|
-
|
408
|
+
rlog.info('openTopoAlarm 打开拓扑告警推送-------------------开始');
|
410
409
|
this.updateState({
|
411
410
|
alarmOpening: false,
|
412
411
|
alarmIsOpened: true
|
413
412
|
});
|
413
|
+
_context6.next = 20;
|
414
|
+
break;
|
415
|
+
|
416
|
+
case 16:
|
417
|
+
_context6.prev = 16;
|
418
|
+
_context6.t0 = _context6["catch"](8);
|
419
|
+
rlog.error('打开拓扑告警推送 失败');
|
420
|
+
this.updateState({
|
421
|
+
alarmOpening: false
|
422
|
+
});
|
414
423
|
|
415
|
-
case
|
424
|
+
case 20:
|
416
425
|
case "end":
|
417
426
|
return _context6.stop();
|
418
427
|
}
|
419
428
|
}
|
420
|
-
}, _callee6, this);
|
429
|
+
}, _callee6, this, [[8, 16]]);
|
421
430
|
}));
|
422
431
|
|
423
432
|
function openTopoAlarm(_x5) {
|
@@ -455,7 +464,7 @@ var Alarm = /*#__PURE__*/function () {
|
|
455
464
|
|
456
465
|
case 3:
|
457
466
|
this.currentTopoId = null;
|
458
|
-
rlog.debug(
|
467
|
+
rlog.debug('useAlarm.useEffect 告警WebSocket 结束');
|
459
468
|
this.updateState({
|
460
469
|
topoAlarmIsOpen: false,
|
461
470
|
alarmOpening: false,
|
@@ -539,7 +548,7 @@ var Alarm = /*#__PURE__*/function () {
|
|
539
548
|
_this$getState4 = this.getState(), alarmIsOpened = _this$getState4.alarmIsOpened;
|
540
549
|
resAndMetrics = this.topo.store.getState().topoMod.resAndMetrics;
|
541
550
|
resIdsList = resAndMetrics.resIdsList, nodeIdsList = resAndMetrics.nodeIdsList, linkIdsList = resAndMetrics.linkIdsList;
|
542
|
-
alarmDispatchers = this.topo.store.getModelDispatchers(
|
551
|
+
alarmDispatchers = this.topo.store.getModelDispatchers('topoAlarm'); // 添加事件
|
543
552
|
// console.log("handleAlarmEvent-接收到推送的原始告警信息", alertData);
|
544
553
|
|
545
554
|
if (!(isAvailableArray(alertData) && isAvailableArray(resIdsList))) {
|
@@ -582,7 +591,7 @@ var Alarm = /*#__PURE__*/function () {
|
|
582
591
|
break;
|
583
592
|
}
|
584
593
|
|
585
|
-
rlog.debug(
|
594
|
+
rlog.debug('过滤掉非本拓扑的告警信息 告警开关-推送告警到ht-alarmIsOpened-sendAl', alarmIsOpened, sendAl);
|
586
595
|
_context9.prev = 12;
|
587
596
|
_context9.next = 15;
|
588
597
|
return alarmDispatchers.combAlarmData({
|
@@ -616,7 +625,7 @@ var Alarm = /*#__PURE__*/function () {
|
|
616
625
|
case 21:
|
617
626
|
_context9.prev = 21;
|
618
627
|
_context9.t0 = _context9["catch"](12);
|
619
|
-
rlog.error(
|
628
|
+
rlog.error('告警发送异常', _context9.t0);
|
620
629
|
|
621
630
|
case 24:
|
622
631
|
case "end":
|
@@ -634,16 +643,16 @@ var Alarm = /*#__PURE__*/function () {
|
|
634
643
|
}();
|
635
644
|
|
636
645
|
_proto.getState = function getState() {
|
637
|
-
return this.topo.store.getModelState(
|
646
|
+
return this.topo.store.getModelState('topoAlarm');
|
638
647
|
};
|
639
648
|
|
640
649
|
_proto.useState = function useState() {
|
641
|
-
var state = this.topo.store.useModelState(
|
650
|
+
var state = this.topo.store.useModelState('topoAlarm');
|
642
651
|
return state;
|
643
652
|
};
|
644
653
|
|
645
654
|
_proto.updateState = function updateState(state) {
|
646
|
-
return this.topo.store.getModelDispatchers(
|
655
|
+
return this.topo.store.getModelDispatchers('topoAlarm').update(state);
|
647
656
|
};
|
648
657
|
|
649
658
|
return Alarm;
|
@@ -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 "11.0.
|
27
|
+
var version = typeof "11.0.17" === 'string' ? "11.0.17" : null;
|
28
28
|
console.info("\u62D3\u6251\u7248\u672C: " + version);
|
29
29
|
/**
|
30
30
|
* 拓扑显示和编辑
|
@@ -19,19 +19,18 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
|
|
19
19
|
|
20
20
|
function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
|
21
21
|
|
22
|
+
var Row = _grid["default"].Row,
|
23
|
+
Col = _grid["default"].Col;
|
24
|
+
|
22
25
|
function HelpIcon(props) {
|
23
26
|
var topo = props.topo,
|
24
27
|
topoType = props.topoType;
|
25
|
-
var localStorageVal = localStorage.getItem(topoType + 'helpBoxHidden');
|
26
28
|
|
27
29
|
var _useState = (0, _react.useState)(),
|
28
30
|
helpBoxIsShow = _useState[0],
|
29
31
|
setHelpBoxIsShow = _useState[1]; //TODO:在主得style里面需要增加color与background属性,根据外部传值进行改变,默认值为$color-text1-4,#fff
|
30
32
|
|
31
33
|
|
32
|
-
var Row = _grid["default"].Row,
|
33
|
-
Col = _grid["default"].Col;
|
34
|
-
|
35
34
|
var _useCanvasThemeConfig = (0, _useCanvasThemeConfig2["default"])({
|
36
35
|
topo: topo
|
37
36
|
}),
|
@@ -48,15 +47,27 @@ function HelpIcon(props) {
|
|
48
47
|
|
49
48
|
var topoModState = topo.store.useModelState('topoMod');
|
50
49
|
var graphLoaded = topoModState.graphLoaded;
|
50
|
+
var topoViewerRef = (0, _react.useRef)();
|
51
|
+
(0, _react.useEffect)(function () {
|
52
|
+
var io = new IntersectionObserver(function (entries) {
|
53
|
+
if (entries[0].isIntersecting) {
|
54
|
+
setHelpBoxIsShow(localStorage.getItem(topoType + 'helpBoxHidden') == 'true' ? false : true);
|
55
|
+
} else {
|
56
|
+
setHelpBoxIsShow(false);
|
57
|
+
}
|
58
|
+
});
|
59
|
+
io.observe(topoViewerRef.current);
|
60
|
+
});
|
51
61
|
(0, _react.useEffect)(function () {
|
52
62
|
if (graphLoaded) {
|
53
|
-
setHelpBoxIsShow(
|
63
|
+
setHelpBoxIsShow(localStorage.getItem(topoType + 'helpBoxHidden') == 'true' ? false : true);
|
54
64
|
}
|
55
65
|
}, [topo, graphLoaded]);
|
56
66
|
return /*#__PURE__*/_react["default"].createElement(_balloon["default"], {
|
57
67
|
triggerType: "click",
|
58
68
|
align: "t",
|
59
69
|
trigger: /*#__PURE__*/_react["default"].createElement("div", {
|
70
|
+
ref: topoViewerRef,
|
60
71
|
className: _HelpIconModule["default"].topoHelpIconBtn,
|
61
72
|
onClick: function onClick() {
|
62
73
|
open;
|
package/lib/core/models/Alarm.js
CHANGED
@@ -15,12 +15,8 @@ var _topo = _interopRequireDefault(require("@riil-frontend/component-topology-co
|
|
15
15
|
|
16
16
|
var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
|
17
17
|
|
18
|
-
var _componentRiilEventEmitter = require("@riil-frontend/component-riil-event-emitter");
|
19
|
-
|
20
18
|
var _utils = require("@riil-frontend/utils");
|
21
19
|
|
22
|
-
var _topoEventListener = require("../event/topoEventListener");
|
23
|
-
|
24
20
|
var Alarm = /*#__PURE__*/function () {
|
25
21
|
function Alarm() {
|
26
22
|
this.topo = void 0;
|
@@ -99,7 +95,7 @@ var Alarm = /*#__PURE__*/function () {
|
|
99
95
|
return;
|
100
96
|
}
|
101
97
|
|
102
|
-
_rlog["default"].info(
|
98
|
+
_rlog["default"].info('Alarm.open 打开告警通道', id);
|
103
99
|
|
104
100
|
this.openTopoAlarm(id); // this.hmGetTopoAlarm(id);
|
105
101
|
|
@@ -121,7 +117,7 @@ var Alarm = /*#__PURE__*/function () {
|
|
121
117
|
return;
|
122
118
|
}
|
123
119
|
|
124
|
-
_rlog["default"].info(
|
120
|
+
_rlog["default"].info('关闭告警通道', currentTopoId); // 取消订阅告警推送
|
125
121
|
// 关闭告警推送通道
|
126
122
|
|
127
123
|
|
@@ -142,11 +138,11 @@ var Alarm = /*#__PURE__*/function () {
|
|
142
138
|
|
143
139
|
_proto.confirmOpenWhenLargeResource = function confirmOpenWhenLargeResource(cb) {
|
144
140
|
_dialog["default"].confirm({
|
145
|
-
title:
|
141
|
+
title: '提示',
|
146
142
|
messageProps: {
|
147
|
-
type:
|
143
|
+
type: 'warning'
|
148
144
|
},
|
149
|
-
content:
|
145
|
+
content: '该拓扑图上节点较多,继续查询告警可能影响系统整体性能,是否暂不显示告警?',
|
150
146
|
onCancel: function onCancel() {
|
151
147
|
cb();
|
152
148
|
}
|
@@ -205,7 +201,7 @@ var Alarm = /*#__PURE__*/function () {
|
|
205
201
|
case 0:
|
206
202
|
result = this.getAlarms();
|
207
203
|
|
208
|
-
_rlog["default"].debug(
|
204
|
+
_rlog["default"].debug('hmGetTopoAlarmByDoc', result);
|
209
205
|
|
210
206
|
alarms = result.map(function (item) {
|
211
207
|
return item.obj;
|
@@ -269,17 +265,17 @@ var Alarm = /*#__PURE__*/function () {
|
|
269
265
|
|
270
266
|
parms = {
|
271
267
|
mainCiIdList: mainCiIdList,
|
272
|
-
alertStatusList: [
|
268
|
+
alertStatusList: ['toDeal', 'dealing'],
|
273
269
|
pageNum: 1,
|
274
270
|
pageSize: 10,
|
275
|
-
sortField:
|
271
|
+
sortField: 'alertLevel',
|
276
272
|
alertLevelList: [],
|
277
273
|
orders: [{
|
278
|
-
property:
|
279
|
-
direction:
|
274
|
+
property: 'alertLevel',
|
275
|
+
direction: 'ASC'
|
280
276
|
}, {
|
281
|
-
property:
|
282
|
-
direction:
|
277
|
+
property: 'createTime',
|
278
|
+
direction: 'DESC'
|
283
279
|
}],
|
284
280
|
createTime: {
|
285
281
|
startTime: startTime,
|
@@ -292,7 +288,7 @@ var Alarm = /*#__PURE__*/function () {
|
|
292
288
|
case 9:
|
293
289
|
result = _context3.sent;
|
294
290
|
|
295
|
-
_rlog["default"].debug(
|
291
|
+
_rlog["default"].debug('getAlarmById-result', result); // if (alarmIsOpened) {
|
296
292
|
// //this.topo.loadAlarm(result.datas);
|
297
293
|
// this.handleAlarmEvent({ type: "alarm", data: result.datas });
|
298
294
|
// }
|
@@ -365,7 +361,7 @@ var Alarm = /*#__PURE__*/function () {
|
|
365
361
|
switch (_context5.prev = _context5.next) {
|
366
362
|
case 0:
|
367
363
|
// console.log("switchAlarmPopPanel", flag);
|
368
|
-
topoDispatchers = this.topo.store.getModelDispatchers(
|
364
|
+
topoDispatchers = this.topo.store.getModelDispatchers('topoAlarm');
|
369
365
|
topoDispatchers.update({
|
370
366
|
alarmPanelIsOpen: flag
|
371
367
|
});
|
@@ -416,28 +412,43 @@ var Alarm = /*#__PURE__*/function () {
|
|
416
412
|
this.updateState({
|
417
413
|
alarmOpening: true
|
418
414
|
});
|
419
|
-
alarmDispatchers = this.topo.store.getModelDispatchers(
|
415
|
+
alarmDispatchers = this.topo.store.getModelDispatchers('topoAlarm');
|
420
416
|
_context6.next = 8;
|
421
417
|
return alarmDispatchers.resetAlarmDoc();
|
422
418
|
|
423
419
|
case 8:
|
424
|
-
_context6.
|
420
|
+
_context6.prev = 8;
|
421
|
+
_context6.next = 11;
|
425
422
|
return this.topo.serverApi.openTopoAlarm(id);
|
426
423
|
|
427
|
-
case
|
424
|
+
case 11:
|
428
425
|
this.secretKey = _context6.sent;
|
429
|
-
|
426
|
+
|
427
|
+
_rlog["default"].info('openTopoAlarm 打开拓扑告警推送-------------------开始');
|
428
|
+
|
430
429
|
this.updateState({
|
431
430
|
alarmOpening: false,
|
432
431
|
alarmIsOpened: true
|
433
432
|
});
|
433
|
+
_context6.next = 20;
|
434
|
+
break;
|
435
|
+
|
436
|
+
case 16:
|
437
|
+
_context6.prev = 16;
|
438
|
+
_context6.t0 = _context6["catch"](8);
|
439
|
+
|
440
|
+
_rlog["default"].error('打开拓扑告警推送 失败');
|
441
|
+
|
442
|
+
this.updateState({
|
443
|
+
alarmOpening: false
|
444
|
+
});
|
434
445
|
|
435
|
-
case
|
446
|
+
case 20:
|
436
447
|
case "end":
|
437
448
|
return _context6.stop();
|
438
449
|
}
|
439
450
|
}
|
440
|
-
}, _callee6, this);
|
451
|
+
}, _callee6, this, [[8, 16]]);
|
441
452
|
}));
|
442
453
|
|
443
454
|
function openTopoAlarm(_x5) {
|
@@ -476,7 +487,7 @@ var Alarm = /*#__PURE__*/function () {
|
|
476
487
|
case 3:
|
477
488
|
this.currentTopoId = null;
|
478
489
|
|
479
|
-
_rlog["default"].debug(
|
490
|
+
_rlog["default"].debug('useAlarm.useEffect 告警WebSocket 结束');
|
480
491
|
|
481
492
|
this.updateState({
|
482
493
|
topoAlarmIsOpen: false,
|
@@ -561,7 +572,7 @@ var Alarm = /*#__PURE__*/function () {
|
|
561
572
|
_this$getState4 = this.getState(), alarmIsOpened = _this$getState4.alarmIsOpened;
|
562
573
|
resAndMetrics = this.topo.store.getState().topoMod.resAndMetrics;
|
563
574
|
resIdsList = resAndMetrics.resIdsList, nodeIdsList = resAndMetrics.nodeIdsList, linkIdsList = resAndMetrics.linkIdsList;
|
564
|
-
alarmDispatchers = this.topo.store.getModelDispatchers(
|
575
|
+
alarmDispatchers = this.topo.store.getModelDispatchers('topoAlarm'); // 添加事件
|
565
576
|
// console.log("handleAlarmEvent-接收到推送的原始告警信息", alertData);
|
566
577
|
|
567
578
|
if (!((0, _utils.isAvailableArray)(alertData) && (0, _utils.isAvailableArray)(resIdsList))) {
|
@@ -604,7 +615,7 @@ var Alarm = /*#__PURE__*/function () {
|
|
604
615
|
break;
|
605
616
|
}
|
606
617
|
|
607
|
-
_rlog["default"].debug(
|
618
|
+
_rlog["default"].debug('过滤掉非本拓扑的告警信息 告警开关-推送告警到ht-alarmIsOpened-sendAl', alarmIsOpened, sendAl);
|
608
619
|
|
609
620
|
_context9.prev = 12;
|
610
621
|
_context9.next = 15;
|
@@ -640,7 +651,7 @@ var Alarm = /*#__PURE__*/function () {
|
|
640
651
|
_context9.prev = 21;
|
641
652
|
_context9.t0 = _context9["catch"](12);
|
642
653
|
|
643
|
-
_rlog["default"].error(
|
654
|
+
_rlog["default"].error('告警发送异常', _context9.t0);
|
644
655
|
|
645
656
|
case 24:
|
646
657
|
case "end":
|
@@ -658,16 +669,16 @@ var Alarm = /*#__PURE__*/function () {
|
|
658
669
|
}();
|
659
670
|
|
660
671
|
_proto.getState = function getState() {
|
661
|
-
return this.topo.store.getModelState(
|
672
|
+
return this.topo.store.getModelState('topoAlarm');
|
662
673
|
};
|
663
674
|
|
664
675
|
_proto.useState = function useState() {
|
665
|
-
var state = this.topo.store.useModelState(
|
676
|
+
var state = this.topo.store.useModelState('topoAlarm');
|
666
677
|
return state;
|
667
678
|
};
|
668
679
|
|
669
680
|
_proto.updateState = function updateState(state) {
|
670
|
-
return this.topo.store.getModelDispatchers(
|
681
|
+
return this.topo.store.getModelDispatchers('topoAlarm').update(state);
|
671
682
|
};
|
672
683
|
|
673
684
|
return Alarm;
|
@@ -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 "11.0.
|
59
|
+
var version = typeof "11.0.17" === 'string' ? "11.0.17" : 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": "11.0.
|
3
|
+
"version": "11.0.17",
|
4
4
|
"description": "拓扑",
|
5
5
|
"scripts": {
|
6
6
|
"start": "build-scripts start",
|
@@ -118,6 +118,6 @@
|
|
118
118
|
"access": "public"
|
119
119
|
},
|
120
120
|
"license": "MIT",
|
121
|
-
"homepage": "https://unpkg.com/@riil-frontend/component-topology@11.0.
|
121
|
+
"homepage": "https://unpkg.com/@riil-frontend/component-topology@11.0.17/build/index.html",
|
122
122
|
"gitHead": "2da19ffccbb7ca60a8acf396e39f542c68bb33f5"
|
123
123
|
}
|