@riil-frontend/component-topology 12.1.0-dev.8 → 12.1.1

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.
Files changed (64) hide show
  1. package/build/1.js +1 -1
  2. package/build/index.css +1 -1
  3. package/build/index.js +14 -14
  4. package/es/components/ResourceSelectDrawer/ResourceSelectDrawer.js +1 -1
  5. package/es/core/components/AlarmListPanel/components/AlarmListItem.js +2 -2
  6. package/es/core/components/TopoView/topoView.js +7 -4
  7. package/es/core/editor/components/Sidebar/views/ImagePanel/ImagePanel.js +11 -3
  8. package/es/core/editor/components/Toolbar/widgets/Layout/index.js +2 -2
  9. package/es/core/editor/components/settings/core/updateElementProperty.js +3 -2
  10. package/es/core/editor/components/settings/propertyViews/view/GlobalEdgeToggle.js +2 -2
  11. package/es/core/editor/hooks/useKeyboardShortcut.js +4 -0
  12. package/es/core/editor/hooks/useNewElementTheme.js +20 -16
  13. package/es/core/hooks/useGraphAlarmDisplay.js +4 -0
  14. package/es/core/hooks/usePolling.js +2 -1
  15. package/es/core/hooks/useTopoEdit.js +208 -243
  16. package/es/core/models/Alarm.js +14 -15
  17. package/es/core/models/AttributeMetricDisplay.js +4 -3
  18. package/es/core/models/HistoryManager.js +11 -9
  19. package/es/core/models/TopoApp.js +17 -15
  20. package/es/core/models/topoData.js +7 -14
  21. package/es/core/models/utils/linkUtils.js +2 -2
  22. package/es/core/store/models/topoConfig.js +7 -11
  23. package/es/core/utils/edgeUtil.js +7 -11
  24. package/es/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/EventsCard.js +51 -13
  25. package/es/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/components/LinkTopo/LinkTopo.module.scss +1 -1
  26. package/es/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/index.module.scss +8 -0
  27. package/es/networkTopo/models/LinkDynamicStyleExecutor.js +7 -63
  28. package/es/networkTopo/utils/exitLinkUtil.js +23 -11
  29. package/es/style.js +1 -1
  30. package/es/utils/clusterUtil.js +3 -3
  31. package/es/utils/htElementUtils.js +8 -108
  32. package/es/utils/topoData.js +1 -1
  33. package/lib/components/ResourceSelectDrawer/ResourceSelectDrawer.js +1 -1
  34. package/lib/core/components/AlarmListPanel/components/AlarmListItem.js +2 -2
  35. package/lib/core/components/TopoView/topoView.js +15 -19
  36. package/lib/core/editor/components/Sidebar/views/ImagePanel/ImagePanel.js +12 -3
  37. package/lib/core/editor/components/Toolbar/widgets/Layout/index.js +1 -1
  38. package/lib/core/editor/components/settings/core/updateElementProperty.js +7 -2
  39. package/lib/core/editor/components/settings/propertyViews/view/GlobalEdgeToggle.js +2 -2
  40. package/lib/core/editor/hooks/useKeyboardShortcut.js +4 -0
  41. package/lib/core/editor/hooks/useNewElementTheme.js +20 -16
  42. package/lib/core/hooks/useGraphAlarmDisplay.js +4 -0
  43. package/lib/core/hooks/usePolling.js +6 -5
  44. package/lib/core/hooks/useTopoEdit.js +214 -267
  45. package/lib/core/models/Alarm.js +14 -15
  46. package/lib/core/models/AttributeMetricDisplay.js +6 -6
  47. package/lib/core/models/HistoryManager.js +13 -17
  48. package/lib/core/models/TopoApp.js +18 -15
  49. package/lib/core/models/topoData.js +7 -14
  50. package/lib/core/models/utils/linkUtils.js +1 -1
  51. package/lib/core/store/models/topoConfig.js +13 -25
  52. package/lib/core/utils/edgeUtil.js +6 -10
  53. package/lib/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/EventsCard.js +52 -13
  54. package/lib/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/components/LinkTopo/LinkTopo.module.scss +1 -1
  55. package/lib/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/index.module.scss +8 -0
  56. package/lib/networkTopo/models/LinkDynamicStyleExecutor.js +6 -64
  57. package/lib/networkTopo/utils/exitLinkUtil.js +23 -11
  58. package/lib/style.js +1 -1
  59. package/lib/utils/clusterUtil.js +2 -2
  60. package/lib/utils/htElementUtils.js +9 -119
  61. package/lib/utils/topoData.js +1 -1
  62. package/package.json +2 -2
  63. package/es/networkTopo/models/LinkTagsTipsBuilder.js +0 -235
  64. package/lib/networkTopo/models/LinkTagsTipsBuilder.js +0 -245
@@ -459,14 +459,14 @@ var Alarm = /*#__PURE__*/function () {
459
459
  console.log("handleAlarmEvent-接收到推送的原始告警信息", alertData);
460
460
 
461
461
  if (!(isAvailableArray(alertData) && isAvailableArray(resIdsList))) {
462
- _context8.next = 27;
462
+ _context8.next = 25;
463
463
  break;
464
464
  }
465
465
 
466
466
  sendAl = [];
467
467
  idsList = [].concat(nodeIdsList, linkIdsList);
468
- operations = [];
469
- console.log('idsList---------', idsList);
468
+ operations = []; // console.log('idsList---------', idsList)
469
+
470
470
  idsList.forEach(function (idItem) {
471
471
  if (idItem.operation === null) {
472
472
  operations.push(idItem.ciId);
@@ -492,22 +492,21 @@ var Alarm = /*#__PURE__*/function () {
492
492
  if (resIdsList.indexOf(ciId) >= 0 && operations.indexOf(ciId) < 0) {
493
493
  sendAl.push(obj);
494
494
  }
495
- });
496
- console.log("before-combAlarmData", sendAl, idsList);
495
+ }); // console.log("before-combAlarmData", sendAl, idsList);
497
496
 
498
497
  if (!(sendAl.length > 0)) {
499
- _context8.next = 27;
498
+ _context8.next = 25;
500
499
  break;
501
500
  }
502
501
 
503
502
  rlog.debug('过滤掉非本拓扑的告警信息 告警开关-推送告警到ht-alarmIsOpened-sendAl', alarmIsOpened, sendAl);
504
- _context8.prev = 15;
505
- _context8.next = 18;
503
+ _context8.prev = 13;
504
+ _context8.next = 16;
506
505
  return alarmDispatchers.combAlarmData({
507
506
  alarmdata: sendAl
508
507
  });
509
508
 
510
- case 18:
509
+ case 16:
511
510
  _yield$alarmDispatche2 = _context8.sent;
512
511
  eqFlag = _yield$alarmDispatche2.eqFlag;
513
512
  alarmlist = _yield$alarmDispatche2.alarmlist;
@@ -528,19 +527,19 @@ var Alarm = /*#__PURE__*/function () {
528
527
  }
529
528
  }
530
529
 
531
- _context8.next = 27;
530
+ _context8.next = 25;
532
531
  break;
533
532
 
534
- case 24:
535
- _context8.prev = 24;
536
- _context8.t0 = _context8["catch"](15);
533
+ case 22:
534
+ _context8.prev = 22;
535
+ _context8.t0 = _context8["catch"](13);
537
536
  rlog.error('告警发送异常', _context8.t0);
538
537
 
539
- case 27:
538
+ case 25:
540
539
  case "end":
541
540
  return _context8.stop();
542
541
  }
543
- }, _callee8, this, [[15, 24]]);
542
+ }, _callee8, this, [[13, 22]]);
544
543
  }));
545
544
 
546
545
  function handleAlarmEvent(_x6) {
@@ -1,13 +1,14 @@
1
1
  import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
2
2
  import _extends from "@babel/runtime/helpers/extends";
3
3
  import _regeneratorRuntime from "@babel/runtime/regenerator";
4
- import { rlog } from '@riil-frontend/component-topology-utils';
4
+ import Logger from 'loglevel';
5
5
  import { DEFAULT_NODE_TAG_COMMON_CONFIG, DEFAULT_TIP_COMMON_CONFIG } from "../../constants/ResourceInfoDisplay";
6
6
  import { isMonitoring } from "../utils/manageStatusUtil";
7
7
  import AttributeFormatter from "./attributeFormatter";
8
8
  import DictCache from "./cache/DictCache";
9
9
  import { getNodesNameVisible as _getNodesNameVisible, updateNodesNameVisible as _updateNodesNameVisible } from "./utils/nodeNameVisibleUtil";
10
10
  import { translateCisRefAttributeName } from "../../utils/ciRefAttributeTranslateUtil";
11
+ var rlog = Logger.getLogger('topo');
11
12
 
12
13
  function isGraphField(item) {
13
14
  return item.type === 'graph';
@@ -526,7 +527,7 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
526
527
  tags: tags
527
528
  });
528
529
  });
529
- rlog.debug('推送标注 => ht', elementTagsAndTips);
530
+ rlog.debug(' ==> ht: 推送标注', elementTagsAndTips);
530
531
  var htTopo = topo.getHtTopo();
531
532
 
532
533
  if (htTopo) {
@@ -537,7 +538,7 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
537
538
  try {
538
539
  htTopo.loadTagAndTip(JSON.parse(JSON.stringify(elementTagsAndTips)));
539
540
  } catch (error) {
540
- rlog.error('推送标注 => ht 失败', error);
541
+ rlog.error(' ==> ht: 推送标注失败', error);
541
542
  }
542
543
 
543
544
  (_topo$historyManager2 = topo.historyManager) === null || _topo$historyManager2 === void 0 ? void 0 : _topo$historyManager2.setDisabled(false, '加载标注');
@@ -1,5 +1,7 @@
1
1
  import _extends from "@babel/runtime/helpers/extends";
2
2
  import { rlog } from '@riil-frontend/component-topology-utils';
3
+ import Logger from 'loglevel';
4
+ var log = Logger.getLogger('topo.HistoryManager');
3
5
  var ht = window.ht;
4
6
 
5
7
  var HistoryManager = /*#__PURE__*/function () {
@@ -10,7 +12,7 @@ var HistoryManager = /*#__PURE__*/function () {
10
12
  this.topo = topo;
11
13
  this.htHistoryManager = htHistoryManager;
12
14
  htHistoryManager.clear();
13
- rlog.info('HistoryManager 初始化', htHistoryManager);
15
+ log.info('HistoryManager 初始化', htHistoryManager);
14
16
  this.updateStore = this.updateStore.bind(this);
15
17
  this.init();
16
18
  }
@@ -58,10 +60,10 @@ var HistoryManager = /*#__PURE__*/function () {
58
60
 
59
61
  _proto.setDisabled = function setDisabled(disabled, message) {
60
62
  this.htHistoryManager.setDisabled(disabled);
61
- rlog.debug("HistoryManager.setDisabled " + (disabled ? '禁用' : '启用') + (message ? "(" + message + ")" : '') + ": " + this.toString(), this.getHistories());
63
+ log.debug("HistoryManager.setDisabled: " + (disabled ? '禁用' : '启用') + ". <" + message + ">, " + this.toString() + ", ", 'Histories: ', this.getHistories());
62
64
  };
63
65
 
64
- _proto.beginTransaction = function beginTransaction() {
66
+ _proto.beginTransaction = function beginTransaction(name) {
65
67
  var _this = this;
66
68
 
67
69
  this.htHistoryManager.beginTransaction();
@@ -92,7 +94,7 @@ var HistoryManager = /*#__PURE__*/function () {
92
94
  oldValue: _this.topo.store.getModelState(item.modelName)[item.property]
93
95
  });
94
96
  });
95
- rlog.debug("HistoryManager.beginTransaction: " + this.toString(), this.getHistories());
97
+ log.debug("HistoryManager.beginTransaction: " + this.toString(), this.getHistories());
96
98
  };
97
99
 
98
100
  _proto.addStoreHistory = function addStoreHistory() {
@@ -117,16 +119,16 @@ var HistoryManager = /*#__PURE__*/function () {
117
119
  type: 'store',
118
120
  data: storeChanged
119
121
  });
120
- rlog.debug('HistoryManager.addStoreHistory', storeChanged);
122
+ log.debug('HistoryManager.addStoreHistory', storeChanged);
121
123
  }
122
124
 
123
125
  this.storeHistory = [];
124
126
  };
125
127
 
126
- _proto.endTransaction = function endTransaction() {
128
+ _proto.endTransaction = function endTransaction(name) {
127
129
  this.addStoreHistory();
128
130
  this.htHistoryManager.endTransaction();
129
- rlog.debug("HistoryManager.endTransaction: " + this.toString(), this.getHistories());
131
+ log.debug("HistoryManager.endTransaction: " + this.toString(), this.getHistories());
130
132
  };
131
133
 
132
134
  _proto.clear = function clear() {
@@ -170,7 +172,7 @@ var HistoryManager = /*#__PURE__*/function () {
170
172
  return;
171
173
  }
172
174
 
173
- rlog.debug('HistoryManager.undo', this.getHistories(), this.getHistoryIndex());
175
+ log.debug('HistoryManager.undo', this.getHistories(), this.getHistoryIndex());
174
176
  var storeHistory = this.getCurrentStoreHistory(true);
175
177
 
176
178
  if (storeHistory) {
@@ -188,7 +190,7 @@ var HistoryManager = /*#__PURE__*/function () {
188
190
  _proto.redo = function redo() {
189
191
  var _this4 = this;
190
192
 
191
- rlog.debug('HistoryManager.redo', this.getHistories(), this.getHistoryIndex());
193
+ log.debug('HistoryManager.redo', this.getHistories(), this.getHistoryIndex());
192
194
  var storeHistory = this.getCurrentStoreHistory(false);
193
195
 
194
196
  if (storeHistory) {
@@ -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 "12.1.0-dev.8" === 'string' ? "12.1.0-dev.8" : null;
27
+ var version = typeof "12.1.1" === 'string' ? "12.1.1" : null;
28
28
  console.info("\u62D3\u6251\u7248\u672C: " + version);
29
29
  /**
30
30
  * 拓扑显示和编辑
@@ -508,38 +508,39 @@ var Topo = /*#__PURE__*/function () {
508
508
  while (1) switch (_context12.prev = _context12.next) {
509
509
  case 0:
510
510
  rlog.info('TopoApp.enterEditMode');
511
+ this.historyManager = null;
511
512
 
512
513
  if (!this.options.onSwitchToEditModeBegin) {
513
- _context12.next = 4;
514
+ _context12.next = 5;
514
515
  break;
515
516
  }
516
517
 
517
- _context12.next = 4;
518
+ _context12.next = 5;
518
519
  return this.options.onSwitchToEditModeBegin(this);
519
520
 
520
- case 4:
521
+ case 5:
521
522
  topoDispatchers = this.store.getModelDispatchers('topoMod');
522
- _context12.next = 7;
523
+ _context12.next = 8;
523
524
  return topoDispatchers.update({
524
525
  viewState: 'edit'
525
526
  });
526
527
 
527
- case 7:
528
- _context12.next = 9;
528
+ case 8:
529
+ _context12.next = 10;
529
530
  return this.view.switchToEditMode();
530
531
 
531
- case 9:
532
+ case 10:
532
533
  updateEdgeExpanded(this);
533
534
 
534
535
  if (!this.options.onSwitchToEditMode) {
535
- _context12.next = 13;
536
+ _context12.next = 14;
536
537
  break;
537
538
  }
538
539
 
539
- _context12.next = 13;
540
+ _context12.next = 14;
540
541
  return this.options.onSwitchToEditMode(this);
541
542
 
542
- case 13:
543
+ case 14:
543
544
  if (this.getDataModel()) {
544
545
  // 更新节点名称显示隐藏
545
546
  this.attributeMetricDisplay.updateNodesNameVisible();
@@ -549,7 +550,7 @@ var Topo = /*#__PURE__*/function () {
549
550
  iconManageDispatchers = this.store.getModelDispatchers('customIcon');
550
551
  iconManageDispatchers.loadEditorIcons();
551
552
 
552
- case 16:
553
+ case 17:
553
554
  case "end":
554
555
  return _context12.stop();
555
556
  }
@@ -573,18 +574,19 @@ var Topo = /*#__PURE__*/function () {
573
574
  return this.view.switchToViewMode();
574
575
 
575
576
  case 2:
577
+ this.historyManager = null;
576
578
  editDispatchers = this.store.getModelDispatchers('topoConfig');
577
579
  editDispatchers.switchToViewMode(this.id);
578
580
 
579
581
  if (!this.options.onSwitchToViewMode) {
580
- _context13.next = 7;
582
+ _context13.next = 8;
581
583
  break;
582
584
  }
583
585
 
584
- _context13.next = 7;
586
+ _context13.next = 8;
585
587
  return this.options.onSwitchToViewMode(this);
586
588
 
587
- case 7:
589
+ case 8:
588
590
  case "end":
589
591
  return _context13.stop();
590
592
  }
@@ -41,7 +41,7 @@ export function saveTopo(_x) {
41
41
 
42
42
  function _saveTopo() {
43
43
  _saveTopo = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(data) {
44
- var topoService, topoId, template, layout, backgroundId, globalConfig, serialize, resources, groups, relateTopoIdList, viewGroupId, groupInfo, viewResources, linkIps;
44
+ var topoService, topoId, template, layout, backgroundId, globalConfig, serialize, resources, groups, relateTopoIdList, viewGroupId, groupInfo, viewResources;
45
45
  return _regeneratorRuntime.wrap(function _callee$(_context) {
46
46
  while (1) switch (_context.prev = _context.next) {
47
47
  case 0:
@@ -72,7 +72,7 @@ function _saveTopo() {
72
72
 
73
73
  case 8:
74
74
  if (!(resources || groups)) {
75
- _context.next = 16;
75
+ _context.next = 15;
76
76
  break;
77
77
  }
78
78
 
@@ -94,30 +94,23 @@ function _saveTopo() {
94
94
  });
95
95
  }
96
96
 
97
- linkIps = []; // resources?.static.map((nodeId) => {
98
- // if (nodeId.startsWith("ip_")) {
99
- // linkIps.push(nodeId.replace("ip_", ""));
100
- // }
101
- // });
102
-
103
97
  rlog.debug("saveTopo-groupInfo", groupInfo);
104
- _context.next = 16;
98
+ _context.next = 15;
105
99
  return topoService.bindResourceToTopo(topoId, {
106
100
  groups: groupInfo,
107
- linkIps: linkIps,
108
101
  relateTopoIdList: relateTopoIdList
109
102
  });
110
103
 
111
- case 16:
104
+ case 15:
112
105
  if (!serialize) {
113
- _context.next = 19;
106
+ _context.next = 18;
114
107
  break;
115
108
  }
116
109
 
117
- _context.next = 19;
110
+ _context.next = 18;
118
111
  return topoService.saveSerializeData(topoId, serialize);
119
112
 
120
- case 19:
113
+ case 18:
121
114
  case "end":
122
115
  return _context.stop();
123
116
  }
@@ -4,7 +4,7 @@ import _regeneratorRuntime from "@babel/runtime/regenerator";
4
4
  import keyBy from "lodash/keyBy";
5
5
  import _ from "lodash"; // 查询所有连线
6
6
 
7
- import { getEdges, isEdgeGroup } from "../../../utils/htElementUtils";
7
+ import { getEdges, isEdgeGroupAgent } from "../../../utils/htElementUtils";
8
8
  import CiTypeCache from "../cache/CiTypeCache";
9
9
  import CiCache from "../cache/CiCache"; // const interfaceTypeMap = {
10
10
  // "network.interface": {
@@ -172,7 +172,7 @@ export var showLinkByConfig = function showLinkByConfig(props) {
172
172
  var gv = topo.getGraphView();
173
173
  var dm = gv.getDataModel();
174
174
  var edges = getEdges(dm).filter(function (edge) {
175
- return !isEdgeGroup(edge);
175
+ return !isEdgeGroupAgent(edge);
176
176
  }); // console.log("edges", edges);
177
177
 
178
178
  var showPhy = types.indexOf("phy") >= 0;
@@ -8,13 +8,14 @@ import _regeneratorRuntime from "@babel/runtime/regenerator";
8
8
  import { getUUID, isAvailableArray } from "@riil-frontend/utils";
9
9
  import { transformTopoElements } from "@riil-frontend/component-topology-graph/es/utils";
10
10
  import { TOPO_PARENT_ID } from "@riil-frontend/component-topology-common/es/services/topo";
11
- import rlog from "@riil-frontend/component-topology-utils/es/rlog";
11
+ import Logger from 'loglevel';
12
12
  import { removeFromArray } from "../../../utils/format";
13
13
  import { DEFAULT_GROUP } from "../../../utils/template";
14
14
  import { combTopoData, getCiTypes } from "../../../utils/topoData";
15
15
  import { saveTopo as _saveTopo, resToConditions, getLayoutId } from "../../../core/models/topoData";
16
16
  import networkLinkServer from "../../../networkTopo/services/topo/networkLink";
17
17
  import { addLinkData, buildData as buildTopoData } from "../../../networkTopo/getTopoData";
18
+ var rlog = Logger.getLogger('topo');
18
19
 
19
20
  var newGroupWithUUID = function newGroupWithUUID(group) {
20
21
  if (group === void 0) {
@@ -259,13 +260,7 @@ export default function (topoApp) {
259
260
 
260
261
  case 5:
261
262
  data = _context2.sent;
262
- rlog.debug("按配置查询拓扑数据", {
263
- config: {
264
- resources: resources,
265
- groups: groups
266
- },
267
- data: data
268
- });
263
+ rlog.debug("按配置查询拓扑数据. 参数:", query, ", 返回结果: ", data);
269
264
  return _context2.abrupt("return", data);
270
265
 
271
266
  case 8:
@@ -327,10 +322,11 @@ export default function (topoApp) {
327
322
 
328
323
  case 11:
329
324
  data = _context4.sent;
330
- _context4.next = 14;
325
+ rlog.debug("getTopoByConditions--------", data, groupInfo);
326
+ _context4.next = 15;
331
327
  return Promise.all([addLinkData(data), topoApp.ciTyeCache.load(getCiTypes(data)), dispatch.customIcon.loadCustomIcons()]);
332
328
 
333
- case 14:
329
+ case 15:
334
330
  _yield$Promise$all = _context4.sent;
335
331
  dataWithLinkDetail = _yield$Promise$all[0];
336
332
  _combTopoData = combTopoData({
@@ -357,7 +353,7 @@ export default function (topoApp) {
357
353
  topoDataTrans: topoDataTrans
358
354
  });
359
355
 
360
- case 22:
356
+ case 23:
361
357
  case "end":
362
358
  return _context4.stop();
363
359
  }
@@ -1,13 +1,13 @@
1
1
  import rlog from "@riil-frontend/component-topology-utils/es/rlog";
2
2
  import { showLinkByConfig } from "../models/utils/linkUtils";
3
- import { isEdgeGroup } from "../../utils/htElementUtils";
3
+ import { isEdgeGroupAgent } from "../../utils/htElementUtils";
4
4
  /**
5
5
  * 是否手工连线
6
6
  * @param {*} edge
7
7
  */
8
8
 
9
9
  export function isCustomEdge(edge) {
10
- return !isEdgeGroup(edge) && (edge.a('type') == 'line' || !edge.a('type'));
10
+ return !isEdgeGroupAgent(edge) && (edge.a('type') == 'line' || !edge.a('type'));
11
11
  }
12
12
  /**
13
13
  * 根据配置更新连线展开折叠状态
@@ -16,7 +16,7 @@ export function isCustomEdge(edge) {
16
16
  */
17
17
 
18
18
  export var updateEdgeExpanded = function updateEdgeExpanded(topo) {
19
- var _topo$historyManager, _topo$historyManager2;
19
+ var _topo$historyManager, _topo$historyManager2, _topo$linkDynamicStyl;
20
20
 
21
21
  var _topo$store$getModelS = topo.store.getModelState("topoMod"),
22
22
  viewState = _topo$store$getModelS.viewState;
@@ -29,8 +29,7 @@ export var updateEdgeExpanded = function updateEdgeExpanded(topo) {
29
29
  }
30
30
 
31
31
  var _topo$store$getModelS2 = topo.store.getModelState("displayConfig"),
32
- expandAllEdges = _topo$store$getModelS2.expandAllEdges; // console.log("expandAllEdges----------", expandAllEdges);
33
-
32
+ expandAllEdges = _topo$store$getModelS2.expandAllEdges;
34
33
 
35
34
  (_topo$historyManager = topo.historyManager) === null || _topo$historyManager === void 0 ? void 0 : _topo$historyManager.setDisabled(true, '连线展开控制');
36
35
 
@@ -39,10 +38,10 @@ export var updateEdgeExpanded = function updateEdgeExpanded(topo) {
39
38
  topo: topo,
40
39
  showType: 1
41
40
  });
42
- htTopo.collapseAllEdgeGroups();
41
+ htTopo.toggleAllEdgeGroups(false);
43
42
  rlog.debug("updateEdgeExpanded 折叠");
44
43
  } else {
45
- htTopo.expandAllEdgeGroups();
44
+ htTopo.toggleAllEdgeGroups(true);
46
45
  showLinkByConfig({
47
46
  topo: topo,
48
47
  showType: expandAllEdges,
@@ -52,8 +51,5 @@ export var updateEdgeExpanded = function updateEdgeExpanded(topo) {
52
51
  }
53
52
 
54
53
  (_topo$historyManager2 = topo.historyManager) === null || _topo$historyManager2 === void 0 ? void 0 : _topo$historyManager2.setDisabled(false, '连线展开控制');
55
-
56
- if (topo.linkDynamicStyleExecutor) {
57
- topo.linkDynamicStyleExecutor.execute();
58
- }
54
+ (_topo$linkDynamicStyl = topo.linkDynamicStyleExecutor) === null || _topo$linkDynamicStyl === void 0 ? void 0 : _topo$linkDynamicStyl.execute();
59
55
  };
@@ -9,32 +9,70 @@ import BlockBox from "./BlockBox";
9
9
  import Link from "../../../../../../../components/Link";
10
10
  import service from "../../../../../../services/overview";
11
11
  import styles from "./index.module.scss";
12
+ import { getHistory } from '@riil-frontend/component-topology-utils';
12
13
 
13
14
  function formatUrl(url) {
14
- return url;
15
+ var _window, _window$location;
16
+
17
+ console.log(url);
18
+ var prefix = '/default/pagecenter';
19
+
20
+ if (((_window = window) === null || _window === void 0 ? void 0 : (_window$location = _window.location) === null || _window$location === void 0 ? void 0 : _window$location.pathname.indexOf(prefix)) === 0 && (url === null || url === void 0 ? void 0 : url.indexOf(prefix)) === 0) {
21
+ return url.split(prefix)[1];
22
+ } else {
23
+ return url;
24
+ }
15
25
  }
16
26
 
17
27
  function EventsCard(props) {
18
28
  var alarmRiskList = props.alarmRiskList,
19
29
  closeDetailDrawer = props.closeDetailDrawer,
20
- onHandleAlarm = props.onHandleAlarm; // 告警table列配置
30
+ onHandleAlarm = props.onHandleAlarm;
31
+
32
+ var jumpTo = function jumpTo(url) {
33
+ closeDetailDrawer();
34
+
35
+ if (topo.viewProps.jumpto) {
36
+ topo.viewProps.jumpto(formatUrl(url));
37
+ } else {
38
+ getHistory().push(formatUrl(url));
39
+ }
40
+ }; // 告警table列配置
41
+
21
42
 
22
43
  var columns = [{
23
44
  title: "描述",
24
45
  dataIndex: "title",
25
46
  key: "title",
26
47
  cell: function cell(value, index, record) {
27
- return /*#__PURE__*/React.createElement("div", {
28
- className: styles["alarm-title"],
29
- title: value,
30
- onClick: closeDetailDrawer
31
- }, /*#__PURE__*/React.createElement(_Icon, {
32
- type: record.icon,
33
- size: "xs",
34
- className: styles["alarm-color-icon"] + " " + record.className
35
- }), /*#__PURE__*/React.createElement(Link, {
36
- to: formatUrl(record.link)
37
- }, value));
48
+ return (
49
+ /*#__PURE__*/
50
+ // <div
51
+ // className={styles["alarm-title"]}
52
+ // title={value}
53
+ // onClick={closeDetailDrawer}
54
+ // >
55
+ // <Icon
56
+ // type={record.icon}
57
+ // size="xs"
58
+ // className={`${styles["alarm-color-icon"]} ${record.className}`}
59
+ // />
60
+ // <Link to={formatUrl(record.link)}>{value}</Link>
61
+ // </div>
62
+ React.createElement("div", {
63
+ className: styles['alarm-title'],
64
+ title: value,
65
+ onClick: function onClick() {
66
+ jumpTo(record.link);
67
+ }
68
+ }, /*#__PURE__*/React.createElement(_Icon, {
69
+ type: record.icon,
70
+ size: "xs",
71
+ className: styles['alarm-color-icon'] + " " + record.className
72
+ }), /*#__PURE__*/React.createElement("span", {
73
+ className: styles.link
74
+ }, value))
75
+ );
38
76
  }
39
77
  }, {
40
78
  title: "时间",
@@ -1,7 +1,7 @@
1
1
  .container {
2
2
  width: 100%;
3
3
  height: 100%;
4
- min-height: 250px;
4
+ min-height: 260px;
5
5
  position: relative;
6
6
  .floatBox{
7
7
  position: absolute;
@@ -154,3 +154,11 @@
154
154
  background-color: transparent;
155
155
  border-color: transparent;
156
156
  }
157
+ .link{
158
+ width: 100%;
159
+ overflow: hidden;
160
+ text-overflow: ellipsis;
161
+ white-space: nowrap;
162
+ color: var(--color-link-1);
163
+ cursor: pointer;
164
+ }
@@ -1,7 +1,5 @@
1
- import { rlog } from '@riil-frontend/component-topology-utils';
2
1
  import { isClusterHtElement } from "../../utils/clusterUtil";
3
- import { getEdgeGroupByNodeTags, getEdges, isNode } from "../../utils/htElementUtils";
4
- import { getLinksBetweenNodes } from "../utils/linkUtil"; // network_link.actual_bandwidth
2
+ import { isNode } from "../../utils/htElementUtils"; // network_link.actual_bandwidth
5
3
 
6
4
  function calcEdgeWidth(actualBandwidth) {
7
5
  if (!actualBandwidth) {
@@ -52,16 +50,17 @@ var LinkDynamicStyleExecutor = /*#__PURE__*/function () {
52
50
  var _proto = LinkDynamicStyleExecutor.prototype;
53
51
 
54
52
  _proto.execute = function execute() {
55
- var _this = this;
53
+ var _topo$historyManager,
54
+ _this = this,
55
+ _topo$historyManager2;
56
56
 
57
57
  var topo = this.topo;
58
58
 
59
59
  var _topo$dataModel$getDa = topo.dataModel.getData(),
60
- links = _topo$dataModel$getDa.links,
61
- linkGroups = _topo$dataModel$getDa.linkGroups;
60
+ links = _topo$dataModel$getDa.links;
62
61
 
63
62
  var dataModel = this.topo.getDataModel();
64
- topo.historyManager && topo.historyManager.setDisabled(true, '链路动态样式'); // 1、如果连线可见,设置线宽
63
+ (_topo$historyManager = topo.historyManager) === null || _topo$historyManager === void 0 ? void 0 : _topo$historyManager.setDisabled(true, '链路动态粗细'); // 1、如果连线可见,设置线宽
65
64
 
66
65
  links.forEach(function (link) {
67
66
  var edge = dataModel.getDataByTag(link.id);
@@ -69,63 +68,8 @@ var LinkDynamicStyleExecutor = /*#__PURE__*/function () {
69
68
  if (edge) {
70
69
  edge.s('edge.width', _this.calcLinkEdgeWidth(link));
71
70
  }
72
- }); // 2、如果连线组关联链路并可见,设置线宽
73
-
74
- linkGroups.forEach(function (link) {
75
- // 聚合链路是连线/连线组,并可以查询到
76
- var edge = topo.getDataModel().getDataByTag(link.id);
77
-
78
- if (edge) {
79
- edge.s('edge.width', _this.calcLinkEdgeWidth(link));
80
- return;
81
- } // 聚合链路是连线组(编辑模式还未关联业务信息)
82
-
83
-
84
- var edgeGroup = getEdgeGroupByNodeTags(dataModel, link.source, link.target);
85
-
86
- if (edgeGroup) {
87
- var edgeGroupAgent = edgeGroup.getEdgeGroupAgent(); // 判断是显示的连线组元素
88
-
89
- if (edgeGroupAgent) {
90
- edgeGroup.getEdgeGroupAgent().s('edge.width', _this.calcLinkEdgeWidth(link));
91
- }
92
- } else {
93
- rlog.warn('动态链路样式执行:未找到聚合链路的ht元素', link);
94
- }
95
- }); // 3、如果连线组未关联链路并可见,设置线宽。
96
-
97
- var edges = getEdges(dataModel);
98
- edges.forEach(function (edge) {
99
- try {
100
- // 获取两端代理节点
101
- var sourceAgent = edge.getSourceAgent();
102
- var targetAgent = edge.getTargetAgent();
103
- var sourceId = sourceAgent.getTag();
104
- var targetId = targetAgent.getTag(); // 查询是否有聚合链路
105
-
106
- var aggLink = linkGroups.find(function (link) {
107
- return link.source === sourceId && link.target === targetId || link.target === sourceId && link.source === targetId;
108
- }); // 如果连线组未关联链路并可见
109
-
110
- if (!aggLink && edge.isEdgeGroupAgent()) {
111
- // 查询两端代理节点(包含子节点)间的子链路列表
112
- var sourceCiIds = getChildrenNodeCiIds([sourceAgent]);
113
- var targetCiIds = getChildrenNodeCiIds([targetAgent]);
114
- var aggLinks = getLinksBetweenNodes(linkGroups, sourceCiIds, targetCiIds);
115
- var phyLinks = getLinksBetweenNodes(links, sourceCiIds, targetCiIds);
116
- var linkBetweenNodes = aggLinks.length ? aggLinks : phyLinks; // 如果有子链路,计算线宽并设置
117
-
118
- if (linkBetweenNodes.length) {
119
- var edgeWidth = _this.calcEdgeGroupEdgeWidth(linkBetweenNodes);
120
-
121
- edge.s('edge.width', edgeWidth);
122
- }
123
- }
124
- } catch (error) {
125
- rlog.error('连线组未关联链路并可见,设置线宽:异常', edge, error);
126
- }
127
71
  });
128
- topo.historyManager && topo.historyManager.setDisabled(false, '链路动态样式');
72
+ (_topo$historyManager2 = topo.historyManager) === null || _topo$historyManager2 === void 0 ? void 0 : _topo$historyManager2.setDisabled(false, '链路动态粗细');
129
73
  }
130
74
  /**
131
75
  * 处理单个连线组切换。有链路时设置