@riil-frontend/component-topology 12.1.7 → 12.1.8
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 +28 -28
- package/es/core/hooks/useGraphAlarmDisplay.js +20 -23
- package/es/core/hooks/useLinkAlarmDisplay.js +9 -112
- package/es/core/models/TopoApp.js +1 -1
- package/es/core/utils/showGraphManageStatusUtil.js +30 -28
- package/es/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/EventsCard.js +15 -29
- package/es/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/ResourceOverview.js +52 -151
- package/es/style.js +2 -2
- package/lib/core/hooks/useGraphAlarmDisplay.js +20 -23
- package/lib/core/hooks/useLinkAlarmDisplay.js +9 -116
- package/lib/core/models/TopoApp.js +1 -1
- package/lib/core/utils/showGraphManageStatusUtil.js +33 -31
- package/lib/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/EventsCard.js +16 -29
- package/lib/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/ResourceOverview.js +52 -153
- package/lib/style.js +2 -2
- package/package.json +2 -2
@@ -1,6 +1,4 @@
|
|
1
1
|
import _extends from "@babel/runtime/helpers/extends";
|
2
|
-
import _Button from "@alifd/next/es/button";
|
3
|
-
import _Icon from "@alifd/next/es/icon";
|
4
2
|
import _Message from "@alifd/next/es/message";
|
5
3
|
import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
|
6
4
|
|
@@ -277,8 +275,7 @@ export default function ResourceOverview(props) {
|
|
277
275
|
|
278
276
|
function getAddressFormat(_x3) {
|
279
277
|
return _getAddressFormat.apply(this, arguments);
|
280
|
-
}
|
281
|
-
|
278
|
+
}
|
282
279
|
|
283
280
|
function _getAddressFormat() {
|
284
281
|
_getAddressFormat = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3(_ref2) {
|
@@ -324,102 +321,6 @@ export default function ResourceOverview(props) {
|
|
324
321
|
return _getAddressFormat.apply(this, arguments);
|
325
322
|
}
|
326
323
|
|
327
|
-
var columns = [{
|
328
|
-
title: '描述',
|
329
|
-
dataIndex: 'title',
|
330
|
-
key: 'title',
|
331
|
-
cell: function cell(value, index, record) {
|
332
|
-
return /*#__PURE__*/React.createElement("div", {
|
333
|
-
className: styles['alarm-title'],
|
334
|
-
title: value,
|
335
|
-
onClick: onClose
|
336
|
-
}, /*#__PURE__*/React.createElement(_Icon, {
|
337
|
-
type: record.icon,
|
338
|
-
size: "xs",
|
339
|
-
className: styles['alarm-color-icon'] + " " + record.className
|
340
|
-
}), /*#__PURE__*/React.createElement(Link, {
|
341
|
-
className: styles.link,
|
342
|
-
to: formatUrl(record.link)
|
343
|
-
}, value));
|
344
|
-
}
|
345
|
-
}, {
|
346
|
-
title: '时间',
|
347
|
-
dataIndex: 'time',
|
348
|
-
key: 'time',
|
349
|
-
width: 144,
|
350
|
-
cell: function cell(value, index, record) {
|
351
|
-
return /*#__PURE__*/React.createElement("div", {
|
352
|
-
title: moment(value).format('YYYY-MM-DD HH:mm:ss')
|
353
|
-
}, moment(value).format('YYYY-MM-DD HH:mm:ss'));
|
354
|
-
}
|
355
|
-
}, {
|
356
|
-
title: '操作',
|
357
|
-
dataIndex: 'status',
|
358
|
-
key: 'status',
|
359
|
-
width: 64,
|
360
|
-
cell: function cell(status, index, record) {
|
361
|
-
if (record.type === 'alarm') {
|
362
|
-
return status === 'toDeal' ? /*#__PURE__*/React.createElement(_Button, {
|
363
|
-
text: true,
|
364
|
-
type: "primary",
|
365
|
-
onClick: function onClick() {
|
366
|
-
return alarmRiskOperation(record.type, record.params);
|
367
|
-
}
|
368
|
-
}, "\u53D7\u7406") : /*#__PURE__*/React.createElement(_Button, {
|
369
|
-
disabled: true,
|
370
|
-
text: true,
|
371
|
-
type: "primary"
|
372
|
-
}, "\u5DF2\u53D7\u7406");
|
373
|
-
} else {
|
374
|
-
// return <Button text type="primary" onClick={() => alarmRiskOperation(record.type, record)}>受理</Button>
|
375
|
-
return '';
|
376
|
-
}
|
377
|
-
}
|
378
|
-
}]; // 告警/风险 操作 (受理)
|
379
|
-
|
380
|
-
function alarmRiskOperation(_x4, _x5) {
|
381
|
-
return _alarmRiskOperation.apply(this, arguments);
|
382
|
-
}
|
383
|
-
|
384
|
-
function _alarmRiskOperation() {
|
385
|
-
_alarmRiskOperation = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee4(type, params) {
|
386
|
-
var res;
|
387
|
-
return _regeneratorRuntime.wrap(function _callee4$(_context4) {
|
388
|
-
while (1) switch (_context4.prev = _context4.next) {
|
389
|
-
case 0:
|
390
|
-
if (!(type === 'alarm')) {
|
391
|
-
_context4.next = 6;
|
392
|
-
break;
|
393
|
-
}
|
394
|
-
|
395
|
-
_context4.next = 3;
|
396
|
-
return service.handleAlarm(params);
|
397
|
-
|
398
|
-
case 3:
|
399
|
-
res = _context4.sent;
|
400
|
-
|
401
|
-
_Message.success('受理成功');
|
402
|
-
|
403
|
-
refreshAlarmData(id); // if (isAppTopo) {
|
404
|
-
// const {
|
405
|
-
// displayName: ciName,
|
406
|
-
// attributeMap: modelAttributeMap,
|
407
|
-
// domain,
|
408
|
-
// } = topo.ciTyeCache.getCiType(ciType);
|
409
|
-
// initAppTopo(monitorMetricModels, modelAttributeMap, ciName, domain);
|
410
|
-
// } else {
|
411
|
-
// getAlarmRiskData(id);
|
412
|
-
// }
|
413
|
-
|
414
|
-
case 6:
|
415
|
-
case "end":
|
416
|
-
return _context4.stop();
|
417
|
-
}
|
418
|
-
}, _callee4);
|
419
|
-
}));
|
420
|
-
return _alarmRiskOperation.apply(this, arguments);
|
421
|
-
}
|
422
|
-
|
423
324
|
var elementData = {
|
424
325
|
id: id,
|
425
326
|
ciType: ciType,
|
@@ -427,36 +328,36 @@ export default function ResourceOverview(props) {
|
|
427
328
|
name: resourceData.name ? resourceData.name : resourceData.attributes.name
|
428
329
|
}; // 基本信息设置改变
|
429
330
|
|
430
|
-
function baseInfoColChange(
|
331
|
+
function baseInfoColChange(_x4) {
|
431
332
|
return _baseInfoColChange.apply(this, arguments);
|
432
333
|
} // 获取属性信息
|
433
334
|
|
434
335
|
|
435
336
|
function _baseInfoColChange() {
|
436
|
-
_baseInfoColChange = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function
|
337
|
+
_baseInfoColChange = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee4(col) {
|
437
338
|
var _col;
|
438
339
|
|
439
340
|
var infoData, attributeMap, _loop, _iterator, _step;
|
440
341
|
|
441
|
-
return _regeneratorRuntime.wrap(function
|
442
|
-
while (1) switch (
|
342
|
+
return _regeneratorRuntime.wrap(function _callee4$(_context5) {
|
343
|
+
while (1) switch (_context5.prev = _context5.next) {
|
443
344
|
case 0:
|
444
345
|
if ((_col = col) !== null && _col !== void 0 && _col.length) {
|
445
|
-
|
346
|
+
_context5.next = 3;
|
446
347
|
break;
|
447
348
|
}
|
448
349
|
|
449
350
|
setBaseInfo([]);
|
450
|
-
return
|
351
|
+
return _context5.abrupt("return");
|
451
352
|
|
452
353
|
case 3:
|
453
354
|
settBaseInfoInitLoading(true);
|
454
355
|
infoData = [];
|
455
|
-
|
356
|
+
_context5.next = 7;
|
456
357
|
return getAttribute(id);
|
457
358
|
|
458
359
|
case 7:
|
459
|
-
attributeMap =
|
360
|
+
attributeMap = _context5.sent;
|
460
361
|
// console.log('getAttribute', attributeMap);
|
461
362
|
col = col.filter(function (item) {
|
462
363
|
return !item.hidden;
|
@@ -464,14 +365,14 @@ export default function ResourceOverview(props) {
|
|
464
365
|
_loop = /*#__PURE__*/_regeneratorRuntime.mark(function _loop() {
|
465
366
|
var item, value, contentTitle, link, address, owned_computer_room, owned_cabinet, roomLink, node, data, _ref3, _ref3$, _item, _attributeMap, object, _object2, displayName, attr;
|
466
367
|
|
467
|
-
return _regeneratorRuntime.wrap(function _loop$(
|
468
|
-
while (1) switch (
|
368
|
+
return _regeneratorRuntime.wrap(function _loop$(_context4) {
|
369
|
+
while (1) switch (_context4.prev = _context4.next) {
|
469
370
|
case 0:
|
470
371
|
item = _step.value;
|
471
372
|
value = formatMetric(attributeMap[item.dataIndex], ciTypeMeta.attributeMap[item.dataIndex]);
|
472
373
|
contentTitle = value;
|
473
|
-
|
474
|
-
|
374
|
+
_context4.t0 = item.dataIndex;
|
375
|
+
_context4.next = _context4.t0 === 'display_name' ? 6 : _context4.t0 === 'ciName' ? 9 : _context4.t0 === 'res_address' ? 12 : _context4.t0 === 'imageName' ? 19 : 23;
|
475
376
|
break;
|
476
377
|
|
477
378
|
case 6:
|
@@ -492,19 +393,19 @@ export default function ResourceOverview(props) {
|
|
492
393
|
}
|
493
394
|
|
494
395
|
contentTitle = attributeMap.display_name || '-';
|
495
|
-
return
|
396
|
+
return _context4.abrupt("break", 24);
|
496
397
|
|
497
398
|
case 9:
|
498
399
|
value = ciTypeMeta.displayName;
|
499
400
|
contentTitle = value;
|
500
|
-
return
|
401
|
+
return _context4.abrupt("break", 24);
|
501
402
|
|
502
403
|
case 12:
|
503
|
-
|
404
|
+
_context4.next = 14;
|
504
405
|
return getAddressFormat(attributeMap);
|
505
406
|
|
506
407
|
case 14:
|
507
|
-
address =
|
408
|
+
address = _context4.sent;
|
508
409
|
owned_computer_room = attributeMap.owned_computer_room, owned_cabinet = attributeMap.owned_cabinet; // 跳转3D机房定位设备
|
509
410
|
|
510
411
|
if (owned_computer_room && owned_cabinet) {
|
@@ -523,16 +424,16 @@ export default function ResourceOverview(props) {
|
|
523
424
|
}
|
524
425
|
|
525
426
|
contentTitle = address;
|
526
|
-
return
|
427
|
+
return _context4.abrupt("break", 24);
|
527
428
|
|
528
429
|
case 19:
|
529
430
|
node = topo.getDataModel().getDataByTag(id);
|
530
431
|
value = (node === null || node === void 0 ? void 0 : node.a('customName')) || (node === null || node === void 0 ? void 0 : node.a('name')) || '-';
|
531
432
|
contentTitle = value;
|
532
|
-
return
|
433
|
+
return _context4.abrupt("break", 24);
|
533
434
|
|
534
435
|
case 23:
|
535
|
-
return
|
436
|
+
return _context4.abrupt("break", 24);
|
536
437
|
|
537
438
|
case 24:
|
538
439
|
// 拿翻译字段属性数据
|
@@ -572,7 +473,7 @@ export default function ResourceOverview(props) {
|
|
572
473
|
|
573
474
|
case 33:
|
574
475
|
case "end":
|
575
|
-
return
|
476
|
+
return _context4.stop();
|
576
477
|
}
|
577
478
|
}, _loop);
|
578
479
|
});
|
@@ -580,14 +481,14 @@ export default function ResourceOverview(props) {
|
|
580
481
|
|
581
482
|
case 11:
|
582
483
|
if ((_step = _iterator()).done) {
|
583
|
-
|
484
|
+
_context5.next = 15;
|
584
485
|
break;
|
585
486
|
}
|
586
487
|
|
587
|
-
return
|
488
|
+
return _context5.delegateYield(_loop(), "t0", 13);
|
588
489
|
|
589
490
|
case 13:
|
590
|
-
|
491
|
+
_context5.next = 11;
|
591
492
|
break;
|
592
493
|
|
593
494
|
case 15:
|
@@ -596,56 +497,56 @@ export default function ResourceOverview(props) {
|
|
596
497
|
|
597
498
|
case 17:
|
598
499
|
case "end":
|
599
|
-
return
|
500
|
+
return _context5.stop();
|
600
501
|
}
|
601
|
-
},
|
502
|
+
}, _callee4);
|
602
503
|
}));
|
603
504
|
return _baseInfoColChange.apply(this, arguments);
|
604
505
|
}
|
605
506
|
|
606
|
-
function getAttribute(
|
507
|
+
function getAttribute(_x5) {
|
607
508
|
return _getAttribute.apply(this, arguments);
|
608
509
|
} // 指标设置改变
|
609
510
|
|
610
511
|
|
611
512
|
function _getAttribute() {
|
612
|
-
_getAttribute = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function
|
513
|
+
_getAttribute = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee5(id) {
|
613
514
|
var _yield$resourceOvervi2, baseInfos, res, _ref4, attributes;
|
614
515
|
|
615
|
-
return _regeneratorRuntime.wrap(function
|
616
|
-
while (1) switch (
|
516
|
+
return _regeneratorRuntime.wrap(function _callee5$(_context6) {
|
517
|
+
while (1) switch (_context6.prev = _context6.next) {
|
617
518
|
case 0:
|
618
519
|
if (id) {
|
619
|
-
|
520
|
+
_context6.next = 2;
|
620
521
|
break;
|
621
522
|
}
|
622
523
|
|
623
|
-
return
|
524
|
+
return _context6.abrupt("return");
|
624
525
|
|
625
526
|
case 2:
|
626
527
|
if (!(resourceOverviewProps !== null && resourceOverviewProps !== void 0 && resourceOverviewProps.getData)) {
|
627
|
-
|
528
|
+
_context6.next = 9;
|
628
529
|
break;
|
629
530
|
}
|
630
531
|
|
631
|
-
|
532
|
+
_context6.next = 5;
|
632
533
|
return resourceOverviewProps === null || resourceOverviewProps === void 0 ? void 0 : resourceOverviewProps.getData({
|
633
534
|
id: id
|
634
535
|
});
|
635
536
|
|
636
537
|
case 5:
|
637
|
-
_yield$resourceOvervi2 =
|
538
|
+
_yield$resourceOvervi2 = _context6.sent;
|
638
539
|
baseInfos = _yield$resourceOvervi2.baseInfos;
|
639
540
|
|
640
541
|
if (!baseInfos) {
|
641
|
-
|
542
|
+
_context6.next = 9;
|
642
543
|
break;
|
643
544
|
}
|
644
545
|
|
645
|
-
return
|
546
|
+
return _context6.abrupt("return", baseInfos);
|
646
547
|
|
647
548
|
case 9:
|
648
|
-
|
549
|
+
_context6.next = 11;
|
649
550
|
return service.commonQueryCiData({
|
650
551
|
condition: "id('" + id + "')",
|
651
552
|
refAttribute: true,
|
@@ -658,31 +559,31 @@ export default function ResourceOverview(props) {
|
|
658
559
|
});
|
659
560
|
|
660
561
|
case 11:
|
661
|
-
res =
|
562
|
+
res = _context6.sent;
|
662
563
|
_ref4 = (res === null || res === void 0 ? void 0 : res.data[0]) || {}, attributes = _ref4.attributes;
|
663
|
-
return
|
564
|
+
return _context6.abrupt("return", attributes || {});
|
664
565
|
|
665
566
|
case 14:
|
666
567
|
case "end":
|
667
|
-
return
|
568
|
+
return _context6.stop();
|
668
569
|
}
|
669
|
-
},
|
570
|
+
}, _callee5);
|
670
571
|
}));
|
671
572
|
return _getAttribute.apply(this, arguments);
|
672
573
|
}
|
673
574
|
|
674
|
-
function metricColChange(
|
575
|
+
function metricColChange(_x6) {
|
675
576
|
return _metricColChange.apply(this, arguments);
|
676
577
|
}
|
677
578
|
|
678
579
|
function _metricColChange() {
|
679
|
-
_metricColChange = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function
|
580
|
+
_metricColChange = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee6(col) {
|
680
581
|
var _col2, _col3;
|
681
582
|
|
682
583
|
var codes, endTime, params, _ref6, times, metricList, metricLists;
|
683
584
|
|
684
|
-
return _regeneratorRuntime.wrap(function
|
685
|
-
while (1) switch (
|
585
|
+
return _regeneratorRuntime.wrap(function _callee6$(_context7) {
|
586
|
+
while (1) switch (_context7.prev = _context7.next) {
|
686
587
|
case 0:
|
687
588
|
// console.log('metricColChange col', col);
|
688
589
|
col = (_col2 = col) === null || _col2 === void 0 ? void 0 : _col2.filter(function (item) {
|
@@ -690,13 +591,13 @@ export default function ResourceOverview(props) {
|
|
690
591
|
});
|
691
592
|
|
692
593
|
if ((_col3 = col) !== null && _col3 !== void 0 && _col3.length) {
|
693
|
-
|
594
|
+
_context7.next = 4;
|
694
595
|
break;
|
695
596
|
}
|
696
597
|
|
697
598
|
setMetric([]); // Message.error('指标未设置')
|
698
599
|
|
699
|
-
return
|
600
|
+
return _context7.abrupt("return");
|
700
601
|
|
701
602
|
case 4:
|
702
603
|
codes = col.map(function (item) {
|
@@ -721,11 +622,11 @@ export default function ResourceOverview(props) {
|
|
721
622
|
}
|
722
623
|
|
723
624
|
setMetricInitLoading(true);
|
724
|
-
|
625
|
+
_context7.next = 11;
|
725
626
|
return service.getMetricList(params);
|
726
627
|
|
727
628
|
case 11:
|
728
|
-
metricList =
|
629
|
+
metricList = _context7.sent;
|
729
630
|
metricLists = metricList.concat(getNewMetricList());
|
730
631
|
rlog.debug('metricColChange', metricLists, monitorMetricModels);
|
731
632
|
setMetric(col.map(function (item, key) {
|
@@ -754,9 +655,9 @@ export default function ResourceOverview(props) {
|
|
754
655
|
|
755
656
|
case 17:
|
756
657
|
case "end":
|
757
|
-
return
|
658
|
+
return _context7.stop();
|
758
659
|
}
|
759
|
-
},
|
660
|
+
}, _callee6);
|
760
661
|
}));
|
761
662
|
return _metricColChange.apply(this, arguments);
|
762
663
|
}
|
package/es/style.js
CHANGED
@@ -11,14 +11,14 @@ import '@alifd/next/es/tab/style';
|
|
11
11
|
import '@alifd/next/es/table/style';
|
12
12
|
import '@riil-frontend/component-table-layout/es/style';
|
13
13
|
import '@riil-frontend/component-pager/es/style';
|
14
|
-
import '@alifd/next/es/button/style';
|
15
|
-
import '@alifd/next/es/icon/style';
|
16
14
|
import '@alifd/next/es/loading/style';
|
17
15
|
import '@alifd/next/es/divider/style';
|
18
16
|
import '@riil-frontend/component-no-data-page/es/style';
|
19
17
|
|
20
18
|
import '@alifd/next/es/overlay/style';
|
21
19
|
import '@alifd/next/es/checkbox/style';
|
20
|
+
import '@alifd/next/es/button/style';
|
21
|
+
import '@alifd/next/es/icon/style';
|
22
22
|
import '@riil-frontend/component-crucial-link-topo/es/style';
|
23
23
|
import '@alifd/next/es/switch/style';
|
24
24
|
import '@alifd/next/es/input/style';
|
@@ -47,11 +47,6 @@ function getGraphCiElementAlarmLevels(resources, alarmList) {
|
|
47
47
|
id: id,
|
48
48
|
level: ciIdLevelMap[id]
|
49
49
|
};
|
50
|
-
}).filter(function (alarm) {
|
51
|
-
var resource = resources.find(function (item) {
|
52
|
-
return item.id === alarm.id;
|
53
|
-
});
|
54
|
-
return !!resource;
|
55
50
|
});
|
56
51
|
}
|
57
52
|
/**
|
@@ -104,7 +99,7 @@ function useGraphAlarmDisplay(options) {
|
|
104
99
|
risks = _topo$alarm$useState.risks,
|
105
100
|
relateTopoAlarm = _topo$alarm$useState.relateTopoAlarm;
|
106
101
|
|
107
|
-
var oldResources = topo.dataModel.useCis(); //
|
102
|
+
var oldResources = topo.dataModel.useCis(); // 分级拓扑下级链路特殊处理。待迁移到业务模块
|
108
103
|
|
109
104
|
var _useCmpLinkAlarm = (0, _useCmpLinkAlarm2["default"])({
|
110
105
|
topo: topo,
|
@@ -115,29 +110,19 @@ function useGraphAlarmDisplay(options) {
|
|
115
110
|
cmpLinkRunStatus = _useCmpLinkAlarm.cmpLinkRunStatus,
|
116
111
|
addCmpLinkOfflineStatusForDisplayLineColor = _useCmpLinkAlarm.addCmpLinkOfflineStatusForDisplayLineColor;
|
117
112
|
|
118
|
-
var
|
113
|
+
var resources = (0, _react.useMemo)(function () {
|
119
114
|
return addCmpLinkOfflineStatusForDisplayLineColor(oldResources, cmpLinkRunStatus);
|
120
|
-
}, [oldResources, cmpLinkRunStatus]); //
|
115
|
+
}, [oldResources, cmpLinkRunStatus]); // 拓扑链路通断告警特殊处理。待迁移到业务模块
|
121
116
|
|
122
117
|
var _useLinkAlarmDisplay = (0, _useLinkAlarmDisplay2["default"])({
|
123
|
-
|
124
|
-
resources: cmpRes,
|
125
|
-
graphLoaded: graphLoaded,
|
118
|
+
resources: resources,
|
126
119
|
alarmList: alarmList
|
127
120
|
}),
|
128
|
-
|
129
|
-
getlinkAlarmLevels = _useLinkAlarmDisplay.getlinkAlarmLevels; // const resources = useMemo(() => addLinkOfflineStatusForDisplayLineColor(cmpRes, linkRunStatus), [cmpRes, linkRunStatus])
|
130
|
-
|
121
|
+
linkBreakAlarmLevels = _useLinkAlarmDisplay.linkBreakAlarmLevels; // ci告警级别
|
131
122
|
|
132
|
-
var linkAlarmLevels = getlinkAlarmLevels(alarmList, cmpRes);
|
133
|
-
var resources = [].concat(cmpRes); //1.7 需求,过滤掉断开状态的链路
|
134
|
-
// const resources = cmpRes.filter((item) => {
|
135
|
-
// return !item.breakState;
|
136
|
-
// });
|
137
|
-
// ci告警级别
|
138
123
|
|
139
124
|
var cisEventLevel = (0, _react.useMemo)(function () {
|
140
|
-
var
|
125
|
+
var alarmLevels = [].concat(alarmList || [], cmpLinkAlarmLevels, linkBreakAlarmLevels, risks.map(function (item) {
|
141
126
|
var _item$resourceId;
|
142
127
|
|
143
128
|
return {
|
@@ -145,7 +130,19 @@ function useGraphAlarmDisplay(options) {
|
|
145
130
|
level: 5
|
146
131
|
};
|
147
132
|
}));
|
148
|
-
return getGraphCiElementAlarmLevels(resources,
|
133
|
+
return getGraphCiElementAlarmLevels(resources, alarmLevels) // 过滤元素不存在
|
134
|
+
.filter(function (alarm) {
|
135
|
+
var resource = resources.find(function (item) {
|
136
|
+
return item.id === alarm.id;
|
137
|
+
});
|
138
|
+
return !!resource;
|
139
|
+
}) // v1.7 过滤掉断开状态的链路,不显示告警
|
140
|
+
.filter(function (alarm) {
|
141
|
+
var resource = resources.find(function (item) {
|
142
|
+
return item.id === alarm.id;
|
143
|
+
});
|
144
|
+
return !resource.breakState;
|
145
|
+
});
|
149
146
|
}, [resources, alarmList, cmpLinkAlarmLevels, risks]);
|
150
147
|
(0, _react.useEffect)(function () {
|
151
148
|
showAlarm();
|
@@ -169,7 +166,7 @@ function useGraphAlarmDisplay(options) {
|
|
169
166
|
// 告警静默
|
170
167
|
topo.view.loadAlarm([]);
|
171
168
|
return;
|
172
|
-
} //
|
169
|
+
} // 关联拓扑告警。待迁移到业务模块
|
173
170
|
|
174
171
|
|
175
172
|
var relateTopoAlarms = getRelateTopoNodeAlarmLevels(topo, relateTopoAlarm);
|
@@ -5,22 +5,14 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
|
|
5
5
|
exports.__esModule = true;
|
6
6
|
exports["default"] = useLinkAlarmDisplay;
|
7
7
|
|
8
|
-
var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
|
9
|
-
|
10
|
-
var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
|
11
|
-
|
12
8
|
var _react = require("react");
|
13
9
|
|
14
|
-
var _ahooks = require("ahooks");
|
15
|
-
|
16
10
|
var _lodash = _interopRequireDefault(require("lodash"));
|
17
11
|
|
18
|
-
var _DictCache = _interopRequireDefault(require("../models/cache/DictCache"));
|
19
|
-
|
20
12
|
function getLinkDev(datas) {
|
21
|
-
// console.log("datas------------------", datas);
|
22
13
|
var linkDevDoc = {};
|
23
|
-
var linkIds = datas
|
14
|
+
var linkIds = datas //
|
15
|
+
.filter(function (item) {
|
24
16
|
return item.ciType === "network_link";
|
25
17
|
}).map(function (item) {
|
26
18
|
linkDevDoc[item.id] = [item.source, item.target];
|
@@ -34,15 +26,16 @@ function getLinkDev(datas) {
|
|
34
26
|
|
35
27
|
function getlinkAlarmLevels(alarmList, resources) {
|
36
28
|
var _getLinkDev = getLinkDev(resources),
|
37
|
-
linkDevDoc = _getLinkDev.linkDevDoc;
|
38
|
-
|
29
|
+
linkDevDoc = _getLinkDev.linkDevDoc;
|
39
30
|
|
40
31
|
if (!alarmList) {
|
41
32
|
return [];
|
42
33
|
}
|
43
34
|
|
44
35
|
var alarms = alarmList.filter(function (alarm) {
|
45
|
-
|
36
|
+
var _alarm$obj;
|
37
|
+
|
38
|
+
return ((_alarm$obj = alarm.obj) === null || _alarm$obj === void 0 ? void 0 : _alarm$obj.alertTypeCode) === "availAlert";
|
46
39
|
}).map(function (item) {
|
47
40
|
return item.id;
|
48
41
|
});
|
@@ -64,110 +57,10 @@ function getlinkAlarmLevels(alarmList, resources) {
|
|
64
57
|
|
65
58
|
|
66
59
|
function useLinkAlarmDisplay(props) {
|
67
|
-
var
|
68
|
-
resources = props.resources,
|
69
|
-
graphLoaded = props.graphLoaded,
|
60
|
+
var resources = props.resources,
|
70
61
|
alarmList = props.alarmList;
|
71
|
-
|
72
|
-
var _useState = (0, _react.useState)(getLinkDev(resources).linkIds),
|
73
|
-
linkIds = _useState[0],
|
74
|
-
setLinkIds = _useState[1];
|
75
|
-
|
76
|
-
var _useState2 = (0, _react.useState)([]),
|
77
|
-
linkRunStatus = _useState2[0],
|
78
|
-
setLinkRunStatus = _useState2[1];
|
79
|
-
|
80
|
-
var _useState3 = (0, _react.useState)(getLinkDev(resources).linkDevDoc),
|
81
|
-
linkDev = _useState3[0],
|
82
|
-
setLinkDev = _useState3[1]; // console.log("alarmList----------sssss", alarmList);
|
83
|
-
|
84
|
-
|
85
|
-
(0, _react.useEffect)(function () {
|
86
|
-
var ids = getLinkDev(resources).linkIds;
|
87
|
-
|
88
|
-
if (linkIds.join(",") !== ids.join(",")) {
|
89
|
-
setLinkIds(ids);
|
90
|
-
}
|
91
|
-
}, [resources]);
|
92
|
-
|
93
|
-
function getLinkRunStatus(_x) {
|
94
|
-
return _getLinkRunStatus.apply(this, arguments);
|
95
|
-
} // 轮询hooks
|
96
|
-
|
97
|
-
|
98
|
-
function _getLinkRunStatus() {
|
99
|
-
_getLinkRunStatus = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(ids) {
|
100
|
-
var _yield$Promise$all, ciMetricsResult;
|
101
|
-
|
102
|
-
return _regenerator["default"].wrap(function _callee$(_context) {
|
103
|
-
while (1) switch (_context.prev = _context.next) {
|
104
|
-
case 0:
|
105
|
-
if (ids.length) {
|
106
|
-
_context.next = 2;
|
107
|
-
break;
|
108
|
-
}
|
109
|
-
|
110
|
-
return _context.abrupt("return", []);
|
111
|
-
|
112
|
-
case 2:
|
113
|
-
_context.t0 = Promise;
|
114
|
-
_context.t1 = // 查询指标值
|
115
|
-
topo.serverApi.ciInfo.batchQueryCiInfo({
|
116
|
-
ciId: [],
|
117
|
-
codes: ["run_status", "remote_ping_status"],
|
118
|
-
relationId: ids.map(function (id) {
|
119
|
-
return {
|
120
|
-
ciId: id,
|
121
|
-
operation: "delete"
|
122
|
-
};
|
123
|
-
})
|
124
|
-
});
|
125
|
-
_context.next = 6;
|
126
|
-
return _DictCache["default"].init();
|
127
|
-
|
128
|
-
case 6:
|
129
|
-
_context.t2 = _context.sent;
|
130
|
-
_context.t3 = [_context.t1, _context.t2];
|
131
|
-
_context.next = 10;
|
132
|
-
return _context.t0.all.call(_context.t0, _context.t3);
|
133
|
-
|
134
|
-
case 10:
|
135
|
-
_yield$Promise$all = _context.sent;
|
136
|
-
ciMetricsResult = _yield$Promise$all[0];
|
137
|
-
return _context.abrupt("return", ciMetricsResult);
|
138
|
-
|
139
|
-
case 13:
|
140
|
-
case "end":
|
141
|
-
return _context.stop();
|
142
|
-
}
|
143
|
-
}, _callee);
|
144
|
-
}));
|
145
|
-
return _getLinkRunStatus.apply(this, arguments);
|
146
|
-
}
|
147
|
-
|
148
|
-
var _useRequest = (0, _ahooks.useRequest)(getLinkRunStatus, {
|
149
|
-
pollingInterval: 60 * 1000,
|
150
|
-
pollingWhenHidden: false,
|
151
|
-
// debounceInterval: 200,
|
152
|
-
manual: true,
|
153
|
-
onSuccess: function onSuccess(result) {
|
154
|
-
setLinkRunStatus(result.map(function (item) {
|
155
|
-
return {
|
156
|
-
id: item.id,
|
157
|
-
runStatus: item.metrics.run_status
|
158
|
-
};
|
159
|
-
}));
|
160
|
-
}
|
161
|
-
}),
|
162
|
-
run = _useRequest.run;
|
163
|
-
|
164
|
-
(0, _react.useEffect)(function () {
|
165
|
-
if (graphLoaded) {
|
166
|
-
run(linkIds);
|
167
|
-
}
|
168
|
-
}, [graphLoaded, linkIds]);
|
62
|
+
var linkBreakAlarmLevels = getlinkAlarmLevels(alarmList, resources);
|
169
63
|
return {
|
170
|
-
|
171
|
-
getlinkAlarmLevels: getlinkAlarmLevels
|
64
|
+
linkBreakAlarmLevels: linkBreakAlarmLevels
|
172
65
|
};
|
173
66
|
}
|
@@ -54,7 +54,7 @@ var _SelectionModel = _interopRequireDefault(require("./SelectionModel"));
|
|
54
54
|
var _CiCache = _interopRequireDefault(require("./cache/CiCache"));
|
55
55
|
|
56
56
|
// eslint-disable-next-line no-undef
|
57
|
-
var version = typeof "12.1.
|
57
|
+
var version = typeof "12.1.8" === 'string' ? "12.1.8" : null;
|
58
58
|
console.info("\u62D3\u6251\u7248\u672C: " + version);
|
59
59
|
/**
|
60
60
|
* 拓扑显示和编辑
|