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

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.
@@ -96,7 +96,8 @@ var Alarm = /*#__PURE__*/function () {
96
96
 
97
97
  _componentTopologyUtils.rlog.info('Alarm.open 打开告警通道', id);
98
98
 
99
- this.openTopoAlarm(id);
99
+ this.openTopoAlarm(id); // this.hmGetTopoAlarm(id);
100
+
100
101
  this.hmGetTopoAlarmByDoc(id);
101
102
  }
102
103
  /**
@@ -226,6 +227,85 @@ var Alarm = /*#__PURE__*/function () {
226
227
  }
227
228
 
228
229
  return hmGetTopoAlarmByDoc;
230
+ }();
231
+
232
+ _proto.hmGetTopoAlarm = /*#__PURE__*/function () {
233
+ var _hmGetTopoAlarm = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee3(id) {
234
+ var mainCiIdList, endTime, startTime, parms, result;
235
+ return _regenerator["default"].wrap(function _callee3$(_context3) {
236
+ while (1) switch (_context3.prev = _context3.next) {
237
+ case 0:
238
+ mainCiIdList = this.topo.dataModel.getDatas().filter(function (ci) {
239
+ return !!ci.operation;
240
+ }) // 过滤掉权限
241
+ .map(function (ci) {
242
+ return ci.id;
243
+ });
244
+
245
+ if (!(mainCiIdList.length === 0)) {
246
+ _context3.next = 4;
247
+ break;
248
+ }
249
+
250
+ this.updateState({
251
+ alarmData: [],
252
+ alarmPanelIsOpen: false
253
+ });
254
+ return _context3.abrupt("return");
255
+
256
+ case 4:
257
+ //rlog.debug("获取告警列表", mainCiIdList);
258
+ endTime = null; // new Date().valueOf();
259
+
260
+ startTime = null; // moment().subtract(1, "months").valueOf();
261
+
262
+ parms = {
263
+ mainCiIdList: mainCiIdList,
264
+ alertStatusList: ['toDeal', 'dealing'],
265
+ pageNum: 1,
266
+ pageSize: 10,
267
+ sortField: 'alertLevel',
268
+ alertLevelList: [],
269
+ orders: [{
270
+ property: 'alertLevel',
271
+ direction: 'ASC'
272
+ }, {
273
+ property: 'createTime',
274
+ direction: 'DESC'
275
+ }],
276
+ createTime: {
277
+ startTime: startTime,
278
+ endTime: endTime
279
+ }
280
+ };
281
+ _context3.next = 9;
282
+ return _topo["default"].getAlarmByIds(parms);
283
+
284
+ case 9:
285
+ result = _context3.sent;
286
+
287
+ _componentTopologyUtils.rlog.debug('getAlarmById-result', result); // if (alarmIsOpened) {
288
+ // //this.topo.loadAlarm(result.datas);
289
+ // this.handleAlarmEvent({ type: "alarm", data: result.datas });
290
+ // }
291
+ // this.updateState({
292
+ // alarmData: result.datas.length > 0 ? result.datas : [],
293
+ // alarmPanelIsOpen: result.datas.length > 0,
294
+ // });
295
+
296
+
297
+ case 11:
298
+ case "end":
299
+ return _context3.stop();
300
+ }
301
+ }, _callee3, this);
302
+ }));
303
+
304
+ function hmGetTopoAlarm(_x2) {
305
+ return _hmGetTopoAlarm.apply(this, arguments);
306
+ }
307
+
308
+ return hmGetTopoAlarm;
229
309
  }()
230
310
  /**
231
311
  * 直接装载告警数据(可装载mock列表)
@@ -236,9 +316,9 @@ var Alarm = /*#__PURE__*/function () {
236
316
  _proto.setAlarmDataByMock =
237
317
  /*#__PURE__*/
238
318
  function () {
239
- var _setAlarmDataByMock = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee3(datas) {
240
- return _regenerator["default"].wrap(function _callee3$(_context3) {
241
- while (1) switch (_context3.prev = _context3.next) {
319
+ var _setAlarmDataByMock = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee4(datas) {
320
+ return _regenerator["default"].wrap(function _callee4$(_context4) {
321
+ while (1) switch (_context4.prev = _context4.next) {
242
322
  case 0:
243
323
  this.updateState({
244
324
  alarmData: datas.length > 0 ? datas : [],
@@ -247,12 +327,12 @@ var Alarm = /*#__PURE__*/function () {
247
327
 
248
328
  case 1:
249
329
  case "end":
250
- return _context3.stop();
330
+ return _context4.stop();
251
331
  }
252
- }, _callee3, this);
332
+ }, _callee4, this);
253
333
  }));
254
334
 
255
- function setAlarmDataByMock(_x2) {
335
+ function setAlarmDataByMock(_x3) {
256
336
  return _setAlarmDataByMock.apply(this, arguments);
257
337
  }
258
338
 
@@ -267,10 +347,10 @@ var Alarm = /*#__PURE__*/function () {
267
347
  _proto.switchAlarmPopPanel =
268
348
  /*#__PURE__*/
269
349
  function () {
270
- var _switchAlarmPopPanel = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee4(flag) {
350
+ var _switchAlarmPopPanel = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee5(flag) {
271
351
  var topoDispatchers;
272
- return _regenerator["default"].wrap(function _callee4$(_context4) {
273
- while (1) switch (_context4.prev = _context4.next) {
352
+ return _regenerator["default"].wrap(function _callee5$(_context5) {
353
+ while (1) switch (_context5.prev = _context5.next) {
274
354
  case 0:
275
355
  // console.log("switchAlarmPopPanel", flag);
276
356
  topoDispatchers = this.topo.store.getModelDispatchers('topoAlarm');
@@ -280,12 +360,12 @@ var Alarm = /*#__PURE__*/function () {
280
360
 
281
361
  case 2:
282
362
  case "end":
283
- return _context4.stop();
363
+ return _context5.stop();
284
364
  }
285
- }, _callee4, this);
365
+ }, _callee5, this);
286
366
  }));
287
367
 
288
- function switchAlarmPopPanel(_x3) {
368
+ function switchAlarmPopPanel(_x4) {
289
369
  return _switchAlarmPopPanel.apply(this, arguments);
290
370
  }
291
371
 
@@ -301,21 +381,21 @@ var Alarm = /*#__PURE__*/function () {
301
381
  _proto.openTopoAlarm =
302
382
  /*#__PURE__*/
303
383
  function () {
304
- var _openTopoAlarm = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee5(id) {
384
+ var _openTopoAlarm = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee6(id) {
305
385
  var _this$getState2, alarmOpening, topoAlarmIsOpen, alarmDispatchers;
306
386
 
307
- return _regenerator["default"].wrap(function _callee5$(_context5) {
308
- while (1) switch (_context5.prev = _context5.next) {
387
+ return _regenerator["default"].wrap(function _callee6$(_context6) {
388
+ while (1) switch (_context6.prev = _context6.next) {
309
389
  case 0:
310
390
  // 如果当前拓扑图开启中或已开启则退出
311
391
  _this$getState2 = this.getState(), alarmOpening = _this$getState2.alarmOpening, topoAlarmIsOpen = _this$getState2.topoAlarmIsOpen;
312
392
 
313
393
  if (!(this.currentTopoId === id && (topoAlarmIsOpen || alarmOpening))) {
314
- _context5.next = 3;
394
+ _context6.next = 3;
315
395
  break;
316
396
  }
317
397
 
318
- return _context5.abrupt("return");
398
+ return _context6.abrupt("return");
319
399
 
320
400
  case 3:
321
401
  this.currentTopoId = id;
@@ -323,16 +403,16 @@ var Alarm = /*#__PURE__*/function () {
323
403
  alarmOpening: true
324
404
  });
325
405
  alarmDispatchers = this.topo.store.getModelDispatchers('topoAlarm');
326
- _context5.next = 8;
406
+ _context6.next = 8;
327
407
  return alarmDispatchers.resetAlarmDoc();
328
408
 
329
409
  case 8:
330
- _context5.prev = 8;
331
- _context5.next = 11;
410
+ _context6.prev = 8;
411
+ _context6.next = 11;
332
412
  return this.topo.serverApi.openTopoAlarm(id);
333
413
 
334
414
  case 11:
335
- this.secretKey = _context5.sent;
415
+ this.secretKey = _context6.sent;
336
416
 
337
417
  _componentTopologyUtils.rlog.info('openTopoAlarm 打开拓扑告警推送-------------------开始');
338
418
 
@@ -340,12 +420,12 @@ var Alarm = /*#__PURE__*/function () {
340
420
  alarmOpening: false,
341
421
  alarmIsOpened: true
342
422
  });
343
- _context5.next = 20;
423
+ _context6.next = 20;
344
424
  break;
345
425
 
346
426
  case 16:
347
- _context5.prev = 16;
348
- _context5.t0 = _context5["catch"](8);
427
+ _context6.prev = 16;
428
+ _context6.t0 = _context6["catch"](8);
349
429
 
350
430
  _componentTopologyUtils.rlog.error('打开拓扑告警推送 失败');
351
431
 
@@ -355,12 +435,12 @@ var Alarm = /*#__PURE__*/function () {
355
435
 
356
436
  case 20:
357
437
  case "end":
358
- return _context5.stop();
438
+ return _context6.stop();
359
439
  }
360
- }, _callee5, this, [[8, 16]]);
440
+ }, _callee6, this, [[8, 16]]);
361
441
  }));
362
442
 
363
- function openTopoAlarm(_x4) {
443
+ function openTopoAlarm(_x5) {
364
444
  return _openTopoAlarm.apply(this, arguments);
365
445
  }
366
446
 
@@ -376,21 +456,21 @@ var Alarm = /*#__PURE__*/function () {
376
456
  _proto.closeTopoAlarm =
377
457
  /*#__PURE__*/
378
458
  function () {
379
- var _closeTopoAlarm = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee6(id) {
459
+ var _closeTopoAlarm = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee7(id) {
380
460
  var _this$getState3, alarmIsOpened, alarmOpening;
381
461
 
382
- return _regenerator["default"].wrap(function _callee6$(_context6) {
383
- while (1) switch (_context6.prev = _context6.next) {
462
+ return _regenerator["default"].wrap(function _callee7$(_context7) {
463
+ while (1) switch (_context7.prev = _context7.next) {
384
464
  case 0:
385
465
  // 如果未开启则退出
386
466
  _this$getState3 = this.getState(), alarmIsOpened = _this$getState3.alarmIsOpened, alarmOpening = _this$getState3.alarmOpening;
387
467
 
388
468
  if (!(!alarmIsOpened && !alarmOpening)) {
389
- _context6.next = 3;
469
+ _context7.next = 3;
390
470
  break;
391
471
  }
392
472
 
393
- return _context6.abrupt("return");
473
+ return _context7.abrupt("return");
394
474
 
395
475
  case 3:
396
476
  this.currentTopoId = null;
@@ -402,17 +482,17 @@ var Alarm = /*#__PURE__*/function () {
402
482
  alarmOpening: false,
403
483
  alarmPanelIsOpen: false
404
484
  });
405
- _context6.next = 8;
485
+ _context7.next = 8;
406
486
  return this.topo.serverApi.closeTopoAlarm(id, this.secretKey);
407
487
 
408
488
  case 8:
409
489
  case "end":
410
- return _context6.stop();
490
+ return _context7.stop();
411
491
  }
412
- }, _callee6, this);
492
+ }, _callee7, this);
413
493
  }));
414
494
 
415
- function closeTopoAlarm(_x5) {
495
+ function closeTopoAlarm(_x6) {
416
496
  return _closeTopoAlarm.apply(this, arguments);
417
497
  }
418
498
 
@@ -437,20 +517,20 @@ var Alarm = /*#__PURE__*/function () {
437
517
  _proto.restart =
438
518
  /*#__PURE__*/
439
519
  function () {
440
- var _restart = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee7() {
520
+ var _restart = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee8() {
441
521
  var id;
442
- return _regenerator["default"].wrap(function _callee7$(_context7) {
443
- while (1) switch (_context7.prev = _context7.next) {
522
+ return _regenerator["default"].wrap(function _callee8$(_context8) {
523
+ while (1) switch (_context8.prev = _context8.next) {
444
524
  case 0:
445
525
  id = this.currentTopoId;
446
- _context7.next = 3;
526
+ _context8.next = 3;
447
527
  return this.openTopoAlarm(id);
448
528
 
449
529
  case 3:
450
530
  case "end":
451
- return _context7.stop();
531
+ return _context8.stop();
452
532
  }
453
- }, _callee7, this);
533
+ }, _callee8, this);
454
534
  }));
455
535
 
456
536
  function restart() {
@@ -467,11 +547,11 @@ var Alarm = /*#__PURE__*/function () {
467
547
  _proto.handleAlarmEvent =
468
548
  /*#__PURE__*/
469
549
  function () {
470
- var _handleAlarmEvent = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee8(alertData) {
550
+ var _handleAlarmEvent = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee9(alertData) {
471
551
  var _this$getState4, alarmIsOpened, resAndMetrics, resIdsList, nodeIdsList, linkIdsList, alarmDispatchers, sendAl, idsList, operations, _yield$alarmDispatche2, eqFlag, alarmlist, _this$topo$viewProps, _this$topo$viewProps2;
472
552
 
473
- return _regenerator["default"].wrap(function _callee8$(_context8) {
474
- while (1) switch (_context8.prev = _context8.next) {
553
+ return _regenerator["default"].wrap(function _callee9$(_context9) {
554
+ while (1) switch (_context9.prev = _context9.next) {
475
555
  case 0:
476
556
  _this$getState4 = this.getState(), alarmIsOpened = _this$getState4.alarmIsOpened;
477
557
  resAndMetrics = this.topo.store.getState().topoMod.resAndMetrics;
@@ -481,7 +561,7 @@ var Alarm = /*#__PURE__*/function () {
481
561
  console.log("handleAlarmEvent-接收到推送的原始告警信息", alertData);
482
562
 
483
563
  if (!((0, _utils.isAvailableArray)(alertData) && (0, _utils.isAvailableArray)(resIdsList))) {
484
- _context8.next = 27;
564
+ _context9.next = 27;
485
565
  break;
486
566
  }
487
567
 
@@ -495,10 +575,16 @@ var Alarm = /*#__PURE__*/function () {
495
575
  }
496
576
  });
497
577
  alertData.forEach(function (item, index) {
498
- var _item$resourceId;
578
+ var _item$resourceId, _item$alertCode;
499
579
 
500
580
  var ciId = (_item$resourceId = item.resourceId) !== null && _item$resourceId !== void 0 ? _item$resourceId : item.ciId;
501
581
  var isSub = false;
582
+
583
+ if ((_item$alertCode = item.alertCode) !== null && _item$alertCode !== void 0 && _item$alertCode.startsWith("cmp")) {
584
+ ciId = "sub:" + item.mainCiId;
585
+ isSub = true;
586
+ }
587
+
502
588
  var obj = {
503
589
  id: ciId,
504
590
  level: item.alertLevel,
@@ -513,25 +599,26 @@ var Alarm = /*#__PURE__*/function () {
513
599
 
514
600
  if (resIdsList.indexOf(ciId) >= 0 && operations.indexOf(ciId) < 0) {
515
601
  sendAl.push(obj);
516
- }
602
+ } // const ciId = `${isSub}+${item.resourceId ?? item.ciId}`;
603
+
517
604
  });
518
605
  console.log("before-combAlarmData", sendAl, idsList);
519
606
 
520
607
  if (!(sendAl.length > 0)) {
521
- _context8.next = 27;
608
+ _context9.next = 27;
522
609
  break;
523
610
  }
524
611
 
525
612
  _componentTopologyUtils.rlog.debug('过滤掉非本拓扑的告警信息 告警开关-推送告警到ht-alarmIsOpened-sendAl', alarmIsOpened, sendAl);
526
613
 
527
- _context8.prev = 15;
528
- _context8.next = 18;
614
+ _context9.prev = 15;
615
+ _context9.next = 18;
529
616
  return alarmDispatchers.combAlarmData({
530
617
  alarmdata: sendAl
531
618
  });
532
619
 
533
620
  case 18:
534
- _yield$alarmDispatche2 = _context8.sent;
621
+ _yield$alarmDispatche2 = _context9.sent;
535
622
  eqFlag = _yield$alarmDispatche2.eqFlag;
536
623
  alarmlist = _yield$alarmDispatche2.alarmlist;
537
624
 
@@ -551,23 +638,23 @@ var Alarm = /*#__PURE__*/function () {
551
638
  }
552
639
  }
553
640
 
554
- _context8.next = 27;
641
+ _context9.next = 27;
555
642
  break;
556
643
 
557
644
  case 24:
558
- _context8.prev = 24;
559
- _context8.t0 = _context8["catch"](15);
645
+ _context9.prev = 24;
646
+ _context9.t0 = _context9["catch"](15);
560
647
 
561
- _componentTopologyUtils.rlog.error('告警发送异常', _context8.t0);
648
+ _componentTopologyUtils.rlog.error('告警发送异常', _context9.t0);
562
649
 
563
650
  case 27:
564
651
  case "end":
565
- return _context8.stop();
652
+ return _context9.stop();
566
653
  }
567
- }, _callee8, this, [[15, 24]]);
654
+ }, _callee9, this, [[15, 24]]);
568
655
  }));
569
656
 
570
- function handleAlarmEvent(_x6) {
657
+ function handleAlarmEvent(_x7) {
571
658
  return _handleAlarmEvent.apply(this, arguments);
572
659
  }
573
660
 
@@ -541,7 +541,7 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
541
541
  });
542
542
  });
543
543
 
544
- _componentTopologyUtils.rlog.debug('推送标注 => ht', elementTagsAndTips);
544
+ _componentTopologyUtils.rlog.debug('推送标注 => ht 失败', elementTagsAndTips);
545
545
 
546
546
  var htTopo = topo.getHtTopo();
547
547
 
@@ -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.0.0-dev.24" === 'string' ? "12.0.0-dev.24" : null;
57
+ var version = typeof "12.0.0-dev.25" === 'string' ? "12.0.0-dev.25" : null;
58
58
  console.info("\u62D3\u6251\u7248\u672C: " + version);
59
59
  /**
60
60
  * 拓扑显示和编辑
@@ -15,7 +15,11 @@ var _useEventData = _interopRequireDefault(require("../../../../hooks/useEventDa
15
15
 
16
16
  function AlarmButton(props) {
17
17
  var topo = props.topo;
18
- var alarmState = topo.store.useModelState("topoAlarm");
18
+
19
+ var _topo$store$useModel = topo.store.useModel("topoAlarm"),
20
+ alarmState = _topo$store$useModel[0],
21
+ alarmDispatchers = _topo$store$useModel[1];
22
+
19
23
  var alarmPanelIsOpen = alarmState.alarmPanelIsOpen;
20
24
  var alarmData = (0, _useEventData["default"])({
21
25
  topo: topo
@@ -30,7 +30,7 @@ function getCiRefAttributesMap(ciDatas, ciTypeMap) {
30
30
  var id = ciData.id;
31
31
  var attributeMap = ciData.attributeMap || ciData.attributes;
32
32
  ciRefAttributeMap[id] = [];
33
- var typeCode = ciData.ciType || ciData.typeCode;
33
+ var typeCode = ciData.typeCode || ciData.ciType;
34
34
  var ciTypeMeta = ciTypeMap[typeCode];
35
35
 
36
36
  if (ciTypeMeta) {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@riil-frontend/component-topology",
3
- "version": "12.0.0-dev.24",
3
+ "version": "12.0.0-dev.25",
4
4
  "description": "拓扑",
5
5
  "scripts": {
6
6
  "start": "build-scripts start",
@@ -123,6 +123,6 @@
123
123
  "access": "public"
124
124
  },
125
125
  "license": "MIT",
126
- "homepage": "https://unpkg.com/@riil-frontend/component-topology@12.0.0-dev.24/build/index.html",
126
+ "homepage": "https://unpkg.com/@riil-frontend/component-topology@12.0.0-dev.25/build/index.html",
127
127
  "gitHead": "2da19ffccbb7ca60a8acf396e39f542c68bb33f5"
128
128
  }