@riil-frontend/component-topology 13.0.5 → 13.0.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.
@@ -9,10 +9,6 @@ var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"))
9
9
 
10
10
  var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
11
11
 
12
- var _button = _interopRequireDefault(require("@alifd/next/lib/button"));
13
-
14
- var _icon = _interopRequireDefault(require("@alifd/next/lib/icon"));
15
-
16
12
  var _message = _interopRequireDefault(require("@alifd/next/lib/message"));
17
13
 
18
14
  var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
@@ -311,8 +307,7 @@ function ResourceOverview(props) {
311
307
 
312
308
  function getAddressFormat(_x3) {
313
309
  return _getAddressFormat.apply(this, arguments);
314
- } // 告警table列配置
315
-
310
+ }
316
311
 
317
312
  function _getAddressFormat() {
318
313
  _getAddressFormat = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee3(_ref2) {
@@ -358,102 +353,6 @@ function ResourceOverview(props) {
358
353
  return _getAddressFormat.apply(this, arguments);
359
354
  }
360
355
 
361
- var columns = [{
362
- title: '描述',
363
- dataIndex: 'title',
364
- key: 'title',
365
- cell: function cell(value, index, record) {
366
- return /*#__PURE__*/_react["default"].createElement("div", {
367
- className: _indexModule["default"]['alarm-title'],
368
- title: value,
369
- onClick: onClose
370
- }, /*#__PURE__*/_react["default"].createElement(_icon["default"], {
371
- type: record.icon,
372
- size: "xs",
373
- className: _indexModule["default"]['alarm-color-icon'] + " " + record.className
374
- }), /*#__PURE__*/_react["default"].createElement(_Link["default"], {
375
- className: _indexModule["default"].link,
376
- to: formatUrl(record.link)
377
- }, value));
378
- }
379
- }, {
380
- title: '时间',
381
- dataIndex: 'time',
382
- key: 'time',
383
- width: 144,
384
- cell: function cell(value, index, record) {
385
- return /*#__PURE__*/_react["default"].createElement("div", {
386
- title: (0, _moment["default"])(value).format('YYYY-MM-DD HH:mm:ss')
387
- }, (0, _moment["default"])(value).format('YYYY-MM-DD HH:mm:ss'));
388
- }
389
- }, {
390
- title: '操作',
391
- dataIndex: 'status',
392
- key: 'status',
393
- width: 64,
394
- cell: function cell(status, index, record) {
395
- if (record.type === 'alarm') {
396
- return status === 'toDeal' ? /*#__PURE__*/_react["default"].createElement(_button["default"], {
397
- text: true,
398
- type: "primary",
399
- onClick: function onClick() {
400
- return alarmRiskOperation(record.type, record.params);
401
- }
402
- }, "\u53D7\u7406") : /*#__PURE__*/_react["default"].createElement(_button["default"], {
403
- disabled: true,
404
- text: true,
405
- type: "primary"
406
- }, "\u5DF2\u53D7\u7406");
407
- } else {
408
- // return <Button text type="primary" onClick={() => alarmRiskOperation(record.type, record)}>受理</Button>
409
- return '';
410
- }
411
- }
412
- }]; // 告警/风险 操作 (受理)
413
-
414
- function alarmRiskOperation(_x4, _x5) {
415
- return _alarmRiskOperation.apply(this, arguments);
416
- }
417
-
418
- function _alarmRiskOperation() {
419
- _alarmRiskOperation = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee4(type, params) {
420
- var res;
421
- return _regenerator["default"].wrap(function _callee4$(_context4) {
422
- while (1) switch (_context4.prev = _context4.next) {
423
- case 0:
424
- if (!(type === 'alarm')) {
425
- _context4.next = 6;
426
- break;
427
- }
428
-
429
- _context4.next = 3;
430
- return _overview["default"].handleAlarm(params);
431
-
432
- case 3:
433
- res = _context4.sent;
434
-
435
- _message["default"].success('受理成功');
436
-
437
- refreshAlarmData(id); // if (isAppTopo) {
438
- // const {
439
- // displayName: ciName,
440
- // attributeMap: modelAttributeMap,
441
- // domain,
442
- // } = topo.ciTyeCache.getCiType(ciType);
443
- // initAppTopo(monitorMetricModels, modelAttributeMap, ciName, domain);
444
- // } else {
445
- // getAlarmRiskData(id);
446
- // }
447
-
448
- case 6:
449
- case "end":
450
- return _context4.stop();
451
- }
452
- }, _callee4);
453
- }));
454
- return _alarmRiskOperation.apply(this, arguments);
455
- }
456
-
457
356
  var elementData = {
458
357
  id: id,
459
358
  ciType: ciType,
@@ -461,36 +360,36 @@ function ResourceOverview(props) {
461
360
  name: resourceData.name ? resourceData.name : resourceData.attributes.name
462
361
  }; // 基本信息设置改变
463
362
 
464
- function baseInfoColChange(_x6) {
363
+ function baseInfoColChange(_x4) {
465
364
  return _baseInfoColChange.apply(this, arguments);
466
365
  } // 获取属性信息
467
366
 
468
367
 
469
368
  function _baseInfoColChange() {
470
- _baseInfoColChange = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee5(col) {
369
+ _baseInfoColChange = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee4(col) {
471
370
  var _col;
472
371
 
473
372
  var infoData, attributeMap, _loop, _iterator, _step;
474
373
 
475
- return _regenerator["default"].wrap(function _callee5$(_context6) {
476
- while (1) switch (_context6.prev = _context6.next) {
374
+ return _regenerator["default"].wrap(function _callee4$(_context5) {
375
+ while (1) switch (_context5.prev = _context5.next) {
477
376
  case 0:
478
377
  if ((_col = col) !== null && _col !== void 0 && _col.length) {
479
- _context6.next = 3;
378
+ _context5.next = 3;
480
379
  break;
481
380
  }
482
381
 
483
382
  setBaseInfo([]);
484
- return _context6.abrupt("return");
383
+ return _context5.abrupt("return");
485
384
 
486
385
  case 3:
487
386
  settBaseInfoInitLoading(true);
488
387
  infoData = [];
489
- _context6.next = 7;
388
+ _context5.next = 7;
490
389
  return getAttribute(id);
491
390
 
492
391
  case 7:
493
- attributeMap = _context6.sent;
392
+ attributeMap = _context5.sent;
494
393
  // console.log('getAttribute', attributeMap);
495
394
  col = col.filter(function (item) {
496
395
  return !item.hidden;
@@ -498,14 +397,14 @@ function ResourceOverview(props) {
498
397
  _loop = /*#__PURE__*/_regenerator["default"].mark(function _loop() {
499
398
  var item, value, contentTitle, link, address, owned_computer_room, owned_cabinet, roomLink, node, data, _ref3, _ref3$, _item, _attributeMap, object, _object2, displayName, attr;
500
399
 
501
- return _regenerator["default"].wrap(function _loop$(_context5) {
502
- while (1) switch (_context5.prev = _context5.next) {
400
+ return _regenerator["default"].wrap(function _loop$(_context4) {
401
+ while (1) switch (_context4.prev = _context4.next) {
503
402
  case 0:
504
403
  item = _step.value;
505
404
  value = (0, _metricUtil.formatMetric)(attributeMap[item.dataIndex], ciTypeMeta.attributeMap[item.dataIndex]);
506
405
  contentTitle = value;
507
- _context5.t0 = item.dataIndex;
508
- _context5.next = _context5.t0 === 'display_name' ? 6 : _context5.t0 === 'ciName' ? 9 : _context5.t0 === 'res_address' ? 12 : _context5.t0 === 'imageName' ? 19 : 23;
406
+ _context4.t0 = item.dataIndex;
407
+ _context4.next = _context4.t0 === 'display_name' ? 6 : _context4.t0 === 'ciName' ? 9 : _context4.t0 === 'res_address' ? 12 : _context4.t0 === 'imageName' ? 19 : 23;
509
408
  break;
510
409
 
511
410
  case 6:
@@ -526,19 +425,19 @@ function ResourceOverview(props) {
526
425
  }
527
426
 
528
427
  contentTitle = attributeMap.display_name || '-';
529
- return _context5.abrupt("break", 24);
428
+ return _context4.abrupt("break", 24);
530
429
 
531
430
  case 9:
532
431
  value = ciTypeMeta.displayName;
533
432
  contentTitle = value;
534
- return _context5.abrupt("break", 24);
433
+ return _context4.abrupt("break", 24);
535
434
 
536
435
  case 12:
537
- _context5.next = 14;
436
+ _context4.next = 14;
538
437
  return getAddressFormat(attributeMap);
539
438
 
540
439
  case 14:
541
- address = _context5.sent;
440
+ address = _context4.sent;
542
441
  owned_computer_room = attributeMap.owned_computer_room, owned_cabinet = attributeMap.owned_cabinet; // 跳转3D机房定位设备
543
442
 
544
443
  if (owned_computer_room && owned_cabinet) {
@@ -557,16 +456,16 @@ function ResourceOverview(props) {
557
456
  }
558
457
 
559
458
  contentTitle = address;
560
- return _context5.abrupt("break", 24);
459
+ return _context4.abrupt("break", 24);
561
460
 
562
461
  case 19:
563
462
  node = topo.getDataModel().getDataByTag(id);
564
463
  value = (node === null || node === void 0 ? void 0 : node.a('customName')) || (node === null || node === void 0 ? void 0 : node.a('name')) || '-';
565
464
  contentTitle = value;
566
- return _context5.abrupt("break", 24);
465
+ return _context4.abrupt("break", 24);
567
466
 
568
467
  case 23:
569
- return _context5.abrupt("break", 24);
468
+ return _context4.abrupt("break", 24);
570
469
 
571
470
  case 24:
572
471
  // 拿翻译字段属性数据
@@ -606,7 +505,7 @@ function ResourceOverview(props) {
606
505
 
607
506
  case 33:
608
507
  case "end":
609
- return _context5.stop();
508
+ return _context4.stop();
610
509
  }
611
510
  }, _loop);
612
511
  });
@@ -614,14 +513,14 @@ function ResourceOverview(props) {
614
513
 
615
514
  case 11:
616
515
  if ((_step = _iterator()).done) {
617
- _context6.next = 15;
516
+ _context5.next = 15;
618
517
  break;
619
518
  }
620
519
 
621
- return _context6.delegateYield(_loop(), "t0", 13);
520
+ return _context5.delegateYield(_loop(), "t0", 13);
622
521
 
623
522
  case 13:
624
- _context6.next = 11;
523
+ _context5.next = 11;
625
524
  break;
626
525
 
627
526
  case 15:
@@ -630,56 +529,56 @@ function ResourceOverview(props) {
630
529
 
631
530
  case 17:
632
531
  case "end":
633
- return _context6.stop();
532
+ return _context5.stop();
634
533
  }
635
- }, _callee5);
534
+ }, _callee4);
636
535
  }));
637
536
  return _baseInfoColChange.apply(this, arguments);
638
537
  }
639
538
 
640
- function getAttribute(_x7) {
539
+ function getAttribute(_x5) {
641
540
  return _getAttribute.apply(this, arguments);
642
541
  } // 指标设置改变
643
542
 
644
543
 
645
544
  function _getAttribute() {
646
- _getAttribute = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee6(id) {
545
+ _getAttribute = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee5(id) {
647
546
  var _yield$resourceOvervi2, baseInfos, res, _ref4, attributes;
648
547
 
649
- return _regenerator["default"].wrap(function _callee6$(_context7) {
650
- while (1) switch (_context7.prev = _context7.next) {
548
+ return _regenerator["default"].wrap(function _callee5$(_context6) {
549
+ while (1) switch (_context6.prev = _context6.next) {
651
550
  case 0:
652
551
  if (id) {
653
- _context7.next = 2;
552
+ _context6.next = 2;
654
553
  break;
655
554
  }
656
555
 
657
- return _context7.abrupt("return");
556
+ return _context6.abrupt("return");
658
557
 
659
558
  case 2:
660
559
  if (!(resourceOverviewProps !== null && resourceOverviewProps !== void 0 && resourceOverviewProps.getData)) {
661
- _context7.next = 9;
560
+ _context6.next = 9;
662
561
  break;
663
562
  }
664
563
 
665
- _context7.next = 5;
564
+ _context6.next = 5;
666
565
  return resourceOverviewProps === null || resourceOverviewProps === void 0 ? void 0 : resourceOverviewProps.getData({
667
566
  id: id
668
567
  });
669
568
 
670
569
  case 5:
671
- _yield$resourceOvervi2 = _context7.sent;
570
+ _yield$resourceOvervi2 = _context6.sent;
672
571
  baseInfos = _yield$resourceOvervi2.baseInfos;
673
572
 
674
573
  if (!baseInfos) {
675
- _context7.next = 9;
574
+ _context6.next = 9;
676
575
  break;
677
576
  }
678
577
 
679
- return _context7.abrupt("return", baseInfos);
578
+ return _context6.abrupt("return", baseInfos);
680
579
 
681
580
  case 9:
682
- _context7.next = 11;
581
+ _context6.next = 11;
683
582
  return _overview["default"].commonQueryCiData({
684
583
  condition: "id('" + id + "')",
685
584
  refAttribute: true,
@@ -692,31 +591,31 @@ function ResourceOverview(props) {
692
591
  });
693
592
 
694
593
  case 11:
695
- res = _context7.sent;
594
+ res = _context6.sent;
696
595
  _ref4 = (res === null || res === void 0 ? void 0 : res.data[0]) || {}, attributes = _ref4.attributes;
697
- return _context7.abrupt("return", attributes || {});
596
+ return _context6.abrupt("return", attributes || {});
698
597
 
699
598
  case 14:
700
599
  case "end":
701
- return _context7.stop();
600
+ return _context6.stop();
702
601
  }
703
- }, _callee6);
602
+ }, _callee5);
704
603
  }));
705
604
  return _getAttribute.apply(this, arguments);
706
605
  }
707
606
 
708
- function metricColChange(_x8) {
607
+ function metricColChange(_x6) {
709
608
  return _metricColChange.apply(this, arguments);
710
609
  }
711
610
 
712
611
  function _metricColChange() {
713
- _metricColChange = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee7(col) {
612
+ _metricColChange = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee6(col) {
714
613
  var _col2, _col3;
715
614
 
716
615
  var codes, endTime, params, _ref6, times, metricList, metricLists;
717
616
 
718
- return _regenerator["default"].wrap(function _callee7$(_context8) {
719
- while (1) switch (_context8.prev = _context8.next) {
617
+ return _regenerator["default"].wrap(function _callee6$(_context7) {
618
+ while (1) switch (_context7.prev = _context7.next) {
720
619
  case 0:
721
620
  // console.log('metricColChange col', col);
722
621
  col = (_col2 = col) === null || _col2 === void 0 ? void 0 : _col2.filter(function (item) {
@@ -724,13 +623,13 @@ function ResourceOverview(props) {
724
623
  });
725
624
 
726
625
  if ((_col3 = col) !== null && _col3 !== void 0 && _col3.length) {
727
- _context8.next = 4;
626
+ _context7.next = 4;
728
627
  break;
729
628
  }
730
629
 
731
630
  setMetric([]); // Message.error('指标未设置')
732
631
 
733
- return _context8.abrupt("return");
632
+ return _context7.abrupt("return");
734
633
 
735
634
  case 4:
736
635
  codes = col.map(function (item) {
@@ -755,11 +654,11 @@ function ResourceOverview(props) {
755
654
  }
756
655
 
757
656
  setMetricInitLoading(true);
758
- _context8.next = 11;
657
+ _context7.next = 11;
759
658
  return _overview["default"].getMetricList(params);
760
659
 
761
660
  case 11:
762
- metricList = _context8.sent;
661
+ metricList = _context7.sent;
763
662
  metricLists = metricList.concat(getNewMetricList());
764
663
 
765
664
  _rlog.rlog.debug('metricColChange', metricLists, monitorMetricModels);
@@ -790,9 +689,9 @@ function ResourceOverview(props) {
790
689
 
791
690
  case 17:
792
691
  case "end":
793
- return _context8.stop();
692
+ return _context7.stop();
794
693
  }
795
- }, _callee7);
694
+ }, _callee6);
796
695
  }));
797
696
  return _metricColChange.apply(this, arguments);
798
697
  }
@@ -8,15 +8,15 @@ var _react = require("react");
8
8
  /**
9
9
  * 默认情况下,拓扑图不存在链路的动态效果
10
10
  * 未监控的链路,不展示动态效果
11
- * @param {*} props
11
+ * @param {*} props
12
12
  */
13
13
  function useEdgeFlow(props) {
14
14
  var topo = props.topo;
15
- var topoState = topo.store.useModelState('topoMod');
16
- var displayConfig = topo.store.useModelState('displayConfig');
15
+ var topoState = topo.store.useModelState("topoMod");
16
+ var displayConfig = topo.store.useModelState("displayConfig");
17
17
  var graphLoaded = topoState.graphLoaded,
18
18
  viewState = topoState.viewState;
19
- var isViewer = viewState !== 'edit';
19
+ var isViewer = viewState !== "edit";
20
20
  var edgeFlow = displayConfig.edgeFlow,
21
21
  edgeFlowDirection = displayConfig.edgeFlowDirection;
22
22
  var resources = topo.dataModel.useCis();
@@ -26,7 +26,7 @@ function useEdgeFlow(props) {
26
26
  var edgeFlowConfig = edgeFlow ? {
27
27
  type: edgeFlow,
28
28
  // 必填,支持传送带drip、光点point、箭头arrow
29
- direction: !edgeFlowDirection || edgeFlowDirection === 'from' ? 'to' : 'from' // 流动方向,可为空. 默认上行目的到源
29
+ direction: !edgeFlowDirection || edgeFlowDirection === "from" ? "to" : "from" // 流动方向,可为空. 默认上行目的到源
30
30
 
31
31
  } : null;
32
32
  topo.getHtTopo().setGlobalEdgeFlow(edgeFlowConfig); // 未监控的链路,不展示动态效果
@@ -39,8 +39,12 @@ function useEdgeFlow(props) {
39
39
  var element = topo.getDataModel().getDataByTag(id);
40
40
  if (!element) return;
41
41
 
42
- if (element instanceof ht.Edge && isNotMonite) {
43
- element.s('flow', false);
42
+ if (element instanceof ht.Edge) {
43
+ var isBreak = element.a("linkbreak");
44
+
45
+ if (isNotMonite || isBreak) {
46
+ element.s("flow", false);
47
+ }
44
48
  }
45
49
  });
46
50
  }
package/lib/style.js CHANGED
@@ -11,14 +11,14 @@ require('@alifd/next/lib/tab/style');
11
11
  require('@alifd/next/lib/table/style');
12
12
  require('@riil-frontend/component-table-layout/lib/style');
13
13
  require('@riil-frontend/component-pager/lib/style');
14
- require('@alifd/next/lib/button/style');
15
- require('@alifd/next/lib/icon/style');
16
14
  require('@alifd/next/lib/loading/style');
17
15
  require('@alifd/next/lib/divider/style');
18
16
  require('@riil-frontend/component-no-data-page/lib/style');
19
17
 
20
18
  require('@alifd/next/lib/overlay/style');
21
19
  require('@alifd/next/lib/checkbox/style');
20
+ require('@alifd/next/lib/button/style');
21
+ require('@alifd/next/lib/icon/style');
22
22
  require('@riil-frontend/component-crucial-link-topo/lib/style');
23
23
  require('@alifd/next/lib/switch/style');
24
24
  require('@alifd/next/lib/input/style');
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@riil-frontend/component-topology",
3
- "version": "13.0.5",
3
+ "version": "13.0.8",
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@13.0.5/build/index.html",
126
+ "homepage": "https://unpkg.com/@riil-frontend/component-topology@13.0.8/build/index.html",
127
127
  "gitHead": "2da19ffccbb7ca60a8acf396e39f542c68bb33f5"
128
128
  }