@riil-frontend/component-topology 12.1.0-dev.1 → 12.1.0-dev.10

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 (66) 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/core/components/AlarmListPanel/components/AlarmListItem.js +2 -2
  5. package/es/core/editor/components/Toolbar/widgets/EdgeColorButton/EdgeColorButton.js +2 -2
  6. package/es/core/editor/components/Toolbar/widgets/EdgeTypeButton/LineType.js +5 -15
  7. package/es/core/editor/components/Toolbar/widgets/FontFamilyWidget.js +2 -27
  8. package/es/core/editor/components/Toolbar/widgets/FontSizeWidget.js +3 -28
  9. package/es/core/editor/components/Toolbar/widgets/FontStyleButton.js +6 -52
  10. package/es/core/editor/components/Toolbar/widgets/Layout/index.js +2 -2
  11. package/es/core/editor/components/Toolbar/widgets/components/FontFamilySelect.js +29 -0
  12. package/es/core/editor/components/Toolbar/widgets/components/FontSizeSelect.js +29 -0
  13. package/es/core/editor/components/Toolbar/widgets/components/FontStyleSelect.js +71 -0
  14. package/es/core/editor/components/settings/propertyViews/view/GlobalEdgeToggle.js +2 -2
  15. package/es/core/editor/hooks/useNewElementTheme.js +20 -16
  16. package/es/core/editor/utils/edgeTypeStyleUtil.js +11 -9
  17. package/es/core/hooks/usePolling.js +2 -1
  18. package/es/core/hooks/useTopoEdit.js +169 -231
  19. package/es/core/models/Alarm.js +14 -15
  20. package/es/core/models/AttributeMetricDisplay.js +2 -1
  21. package/es/core/models/HistoryManager.js +11 -9
  22. package/es/core/models/TopoApp.js +23 -31
  23. package/es/core/models/utils/linkUtils.js +20 -19
  24. package/es/core/store/models/topoConfig.js +2 -1
  25. package/es/core/utils/edgeUtil.js +7 -10
  26. package/es/core/viewer/components/plugins/ElementDetailDrawer/hooks/useElementDetailManager.js +2 -2
  27. package/es/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/EventsCard.js +51 -13
  28. package/es/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/index.module.scss +8 -0
  29. package/es/networkTopo/models/EdgeGroupTagTipBuilder.js +7 -7
  30. package/es/networkTopo/models/LinkDynamicStyleExecutor.js +7 -63
  31. package/es/networkTopo/utils/edgeGroupTagUtil.js +2 -2
  32. package/es/utils/clusterUtil.js +3 -3
  33. package/es/utils/htElementUtils.js +16 -84
  34. package/lib/core/components/AlarmListPanel/components/AlarmListItem.js +2 -2
  35. package/lib/core/editor/components/Toolbar/widgets/EdgeColorButton/EdgeColorButton.js +2 -2
  36. package/lib/core/editor/components/Toolbar/widgets/EdgeTypeButton/LineType.js +5 -14
  37. package/lib/core/editor/components/Toolbar/widgets/FontFamilyWidget.js +3 -28
  38. package/lib/core/editor/components/Toolbar/widgets/FontSizeWidget.js +3 -28
  39. package/lib/core/editor/components/Toolbar/widgets/FontStyleButton.js +6 -56
  40. package/lib/core/editor/components/Toolbar/widgets/Layout/index.js +1 -1
  41. package/lib/core/editor/components/Toolbar/widgets/components/FontFamilySelect.js +38 -0
  42. package/lib/core/editor/components/Toolbar/widgets/components/FontSizeSelect.js +38 -0
  43. package/lib/core/editor/components/Toolbar/widgets/components/FontStyleSelect.js +83 -0
  44. package/lib/core/editor/components/settings/propertyViews/view/GlobalEdgeToggle.js +2 -2
  45. package/lib/core/editor/hooks/useNewElementTheme.js +20 -16
  46. package/lib/core/editor/utils/edgeTypeStyleUtil.js +10 -8
  47. package/lib/core/hooks/usePolling.js +6 -5
  48. package/lib/core/hooks/useTopoEdit.js +177 -257
  49. package/lib/core/models/Alarm.js +14 -15
  50. package/lib/core/models/AttributeMetricDisplay.js +6 -6
  51. package/lib/core/models/HistoryManager.js +13 -17
  52. package/lib/core/models/TopoApp.js +22 -29
  53. package/lib/core/models/utils/linkUtils.js +19 -18
  54. package/lib/core/store/models/topoConfig.js +9 -16
  55. package/lib/core/utils/edgeUtil.js +8 -10
  56. package/lib/core/viewer/components/plugins/ElementDetailDrawer/hooks/useElementDetailManager.js +3 -2
  57. package/lib/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/EventsCard.js +52 -13
  58. package/lib/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/index.module.scss +8 -0
  59. package/lib/networkTopo/models/EdgeGroupTagTipBuilder.js +6 -6
  60. package/lib/networkTopo/models/LinkDynamicStyleExecutor.js +6 -64
  61. package/lib/networkTopo/utils/edgeGroupTagUtil.js +2 -2
  62. package/lib/utils/clusterUtil.js +2 -2
  63. package/lib/utils/htElementUtils.js +19 -93
  64. package/package.json +2 -2
  65. package/es/networkTopo/models/LinkTagsTipsBuilder.js +0 -235
  66. package/lib/networkTopo/models/LinkTagsTipsBuilder.js +0 -245
@@ -481,14 +481,14 @@ var Alarm = /*#__PURE__*/function () {
481
481
  console.log("handleAlarmEvent-接收到推送的原始告警信息", alertData);
482
482
 
483
483
  if (!((0, _utils.isAvailableArray)(alertData) && (0, _utils.isAvailableArray)(resIdsList))) {
484
- _context8.next = 27;
484
+ _context8.next = 25;
485
485
  break;
486
486
  }
487
487
 
488
488
  sendAl = [];
489
489
  idsList = [].concat(nodeIdsList, linkIdsList);
490
- operations = [];
491
- console.log('idsList---------', idsList);
490
+ operations = []; // console.log('idsList---------', idsList)
491
+
492
492
  idsList.forEach(function (idItem) {
493
493
  if (idItem.operation === null) {
494
494
  operations.push(idItem.ciId);
@@ -514,23 +514,22 @@ var Alarm = /*#__PURE__*/function () {
514
514
  if (resIdsList.indexOf(ciId) >= 0 && operations.indexOf(ciId) < 0) {
515
515
  sendAl.push(obj);
516
516
  }
517
- });
518
- console.log("before-combAlarmData", sendAl, idsList);
517
+ }); // console.log("before-combAlarmData", sendAl, idsList);
519
518
 
520
519
  if (!(sendAl.length > 0)) {
521
- _context8.next = 27;
520
+ _context8.next = 25;
522
521
  break;
523
522
  }
524
523
 
525
524
  _componentTopologyUtils.rlog.debug('过滤掉非本拓扑的告警信息 告警开关-推送告警到ht-alarmIsOpened-sendAl', alarmIsOpened, sendAl);
526
525
 
527
- _context8.prev = 15;
528
- _context8.next = 18;
526
+ _context8.prev = 13;
527
+ _context8.next = 16;
529
528
  return alarmDispatchers.combAlarmData({
530
529
  alarmdata: sendAl
531
530
  });
532
531
 
533
- case 18:
532
+ case 16:
534
533
  _yield$alarmDispatche2 = _context8.sent;
535
534
  eqFlag = _yield$alarmDispatche2.eqFlag;
536
535
  alarmlist = _yield$alarmDispatche2.alarmlist;
@@ -551,20 +550,20 @@ var Alarm = /*#__PURE__*/function () {
551
550
  }
552
551
  }
553
552
 
554
- _context8.next = 27;
553
+ _context8.next = 25;
555
554
  break;
556
555
 
557
- case 24:
558
- _context8.prev = 24;
559
- _context8.t0 = _context8["catch"](15);
556
+ case 22:
557
+ _context8.prev = 22;
558
+ _context8.t0 = _context8["catch"](13);
560
559
 
561
560
  _componentTopologyUtils.rlog.error('告警发送异常', _context8.t0);
562
561
 
563
- case 27:
562
+ case 25:
564
563
  case "end":
565
564
  return _context8.stop();
566
565
  }
567
- }, _callee8, this, [[15, 24]]);
566
+ }, _callee8, this, [[13, 22]]);
568
567
  }));
569
568
 
570
569
  function handleAlarmEvent(_x6) {
@@ -11,7 +11,7 @@ var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/
11
11
 
12
12
  var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
13
13
 
14
- var _componentTopologyUtils = require("@riil-frontend/component-topology-utils");
14
+ var _loglevel = _interopRequireDefault(require("loglevel"));
15
15
 
16
16
  var _ResourceInfoDisplay = require("../../constants/ResourceInfoDisplay");
17
17
 
@@ -25,6 +25,8 @@ var _nodeNameVisibleUtil = require("./utils/nodeNameVisibleUtil");
25
25
 
26
26
  var _ciRefAttributeTranslateUtil = require("../../utils/ciRefAttributeTranslateUtil");
27
27
 
28
+ var rlog = _loglevel["default"].getLogger('topo');
29
+
28
30
  function isGraphField(item) {
29
31
  return item.type === 'graph';
30
32
  }
@@ -451,7 +453,7 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
451
453
  });
452
454
  });
453
455
  } else {
454
- _componentTopologyUtils.rlog.warn("\u63A8\u9001\u5C5E\u6027\u6307\u6807\u6570\u636E\uFF1A\u672A\u67E5\u8BE2\u5230ciType " + ciType, ciData);
456
+ rlog.warn("\u63A8\u9001\u5C5E\u6027\u6307\u6807\u6570\u636E\uFF1A\u672A\u67E5\u8BE2\u5230ciType " + ciType, ciData);
455
457
  }
456
458
  });
457
459
  refIds = Object.keys(refIdMap);
@@ -540,9 +542,7 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
540
542
  tags: tags
541
543
  });
542
544
  });
543
-
544
- _componentTopologyUtils.rlog.debug('推送标注 => ht', elementTagsAndTips);
545
-
545
+ rlog.debug('推送标注 => ht', elementTagsAndTips);
546
546
  var htTopo = topo.getHtTopo();
547
547
 
548
548
  if (htTopo) {
@@ -553,7 +553,7 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
553
553
  try {
554
554
  htTopo.loadTagAndTip(JSON.parse(JSON.stringify(elementTagsAndTips)));
555
555
  } catch (error) {
556
- _componentTopologyUtils.rlog.error('推送标注 => ht 失败', error);
556
+ rlog.error('推送标注 => ht 失败', error);
557
557
  }
558
558
 
559
559
  (_topo$historyManager2 = topo.historyManager) === null || _topo$historyManager2 === void 0 ? void 0 : _topo$historyManager2.setDisabled(false, '加载标注');
@@ -9,6 +9,10 @@ var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends")
9
9
 
10
10
  var _componentTopologyUtils = require("@riil-frontend/component-topology-utils");
11
11
 
12
+ var _loglevel = _interopRequireDefault(require("loglevel"));
13
+
14
+ var log = _loglevel["default"].getLogger('topo.HistoryManager');
15
+
12
16
  var ht = window.ht;
13
17
 
14
18
  var HistoryManager = /*#__PURE__*/function () {
@@ -19,9 +23,7 @@ var HistoryManager = /*#__PURE__*/function () {
19
23
  this.topo = topo;
20
24
  this.htHistoryManager = htHistoryManager;
21
25
  htHistoryManager.clear();
22
-
23
- _componentTopologyUtils.rlog.info('HistoryManager 初始化', htHistoryManager);
24
-
26
+ log.info('HistoryManager 初始化', htHistoryManager);
25
27
  this.updateStore = this.updateStore.bind(this);
26
28
  this.init();
27
29
  }
@@ -69,11 +71,10 @@ var HistoryManager = /*#__PURE__*/function () {
69
71
 
70
72
  _proto.setDisabled = function setDisabled(disabled, message) {
71
73
  this.htHistoryManager.setDisabled(disabled);
72
-
73
- _componentTopologyUtils.rlog.debug("HistoryManager.setDisabled " + (disabled ? '禁用' : '启用') + (message ? "(" + message + ")" : '') + ": " + this.toString(), this.getHistories());
74
+ log.debug("HistoryManager.setDisabled " + (disabled ? '禁用' : '启用') + (message ? "(" + message + ")" : '') + ": " + this.toString(), this.getHistories());
74
75
  };
75
76
 
76
- _proto.beginTransaction = function beginTransaction() {
77
+ _proto.beginTransaction = function beginTransaction(name) {
77
78
  var _this = this;
78
79
 
79
80
  this.htHistoryManager.beginTransaction();
@@ -104,8 +105,7 @@ var HistoryManager = /*#__PURE__*/function () {
104
105
  oldValue: _this.topo.store.getModelState(item.modelName)[item.property]
105
106
  });
106
107
  });
107
-
108
- _componentTopologyUtils.rlog.debug("HistoryManager.beginTransaction: " + this.toString(), this.getHistories());
108
+ log.debug("HistoryManager.beginTransaction: " + this.toString(), this.getHistories());
109
109
  };
110
110
 
111
111
  _proto.addStoreHistory = function addStoreHistory() {
@@ -130,18 +130,16 @@ var HistoryManager = /*#__PURE__*/function () {
130
130
  type: 'store',
131
131
  data: storeChanged
132
132
  });
133
-
134
- _componentTopologyUtils.rlog.debug('HistoryManager.addStoreHistory', storeChanged);
133
+ log.debug('HistoryManager.addStoreHistory', storeChanged);
135
134
  }
136
135
 
137
136
  this.storeHistory = [];
138
137
  };
139
138
 
140
- _proto.endTransaction = function endTransaction() {
139
+ _proto.endTransaction = function endTransaction(name) {
141
140
  this.addStoreHistory();
142
141
  this.htHistoryManager.endTransaction();
143
-
144
- _componentTopologyUtils.rlog.debug("HistoryManager.endTransaction: " + this.toString(), this.getHistories());
142
+ log.debug("HistoryManager.endTransaction: " + this.toString(), this.getHistories());
145
143
  };
146
144
 
147
145
  _proto.clear = function clear() {
@@ -185,8 +183,7 @@ var HistoryManager = /*#__PURE__*/function () {
185
183
  return;
186
184
  }
187
185
 
188
- _componentTopologyUtils.rlog.debug('HistoryManager.undo', this.getHistories(), this.getHistoryIndex());
189
-
186
+ log.debug('HistoryManager.undo', this.getHistories(), this.getHistoryIndex());
190
187
  var storeHistory = this.getCurrentStoreHistory(true);
191
188
 
192
189
  if (storeHistory) {
@@ -204,8 +201,7 @@ var HistoryManager = /*#__PURE__*/function () {
204
201
  _proto.redo = function redo() {
205
202
  var _this4 = this;
206
203
 
207
- _componentTopologyUtils.rlog.debug('HistoryManager.redo', this.getHistories(), this.getHistoryIndex());
208
-
204
+ log.debug('HistoryManager.redo', this.getHistories(), this.getHistoryIndex());
209
205
  var storeHistory = this.getCurrentStoreHistory(false);
210
206
 
211
207
  if (storeHistory) {
@@ -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.0-dev.1" === 'string' ? "12.1.0-dev.1" : null;
57
+ var version = typeof "12.1.0-dev.10" === 'string' ? "12.1.0-dev.10" : null;
58
58
  console.info("\u62D3\u6251\u7248\u672C: " + version);
59
59
  /**
60
60
  * 拓扑显示和编辑
@@ -218,37 +218,29 @@ var Topo = /*#__PURE__*/function () {
218
218
 
219
219
  _proto.getData = function getData() {
220
220
  return {
221
- groups: this.getGroups(),
222
- nodes: this.getNodes(),
223
- lines: this.getLines(),
221
+ groups: (0, _htElementUtils.getGroupDatas)(this.getDataModel()),
222
+ nodes: (0, _htElementUtils.getNodes)(this.getDataModel()).filter(function (node) {
223
+ return !!node.getTag();
224
+ }).map(_htElementUtils.getNodeData),
224
225
  customNodes: (0, _htElementUtils.getNodeDatas)(this.getDataModel()).filter(function (item) {
225
226
  return !item.id;
226
227
  }),
227
- customLines: this.getEdges().filter(function (item) {
228
+ lines: (0, _htElementUtils.getEdgeDatas)(this.getDataModel()).filter(function (item) {
229
+ return !!item.id;
230
+ }),
231
+ customLines: (0, _htElementUtils.getEdgeDatas)(this.getDataModel()).filter(function (item) {
228
232
  return !item.id;
229
233
  })
230
234
  };
231
- };
232
-
233
- _proto.getGroups = function getGroups() {
234
- return (0, _htElementUtils.getGroupDatas)(this.getDataModel());
235
- };
236
-
237
- _proto.getNodes = function getNodes() {
238
- var nodes = (0, _htElementUtils.getNodes)(this.getDataModel()).filter(function (node) {
239
- return !!node.getTag();
240
- });
241
- return nodes.map(_htElementUtils.getNodeData);
242
- };
235
+ }
236
+ /**
237
+ * @deprecated 待移除。uicbb有使用
238
+ * @returns
239
+ */
240
+ ;
243
241
 
244
242
  _proto.getLines = function getLines() {
245
- return this.getEdges().filter(function (item) {
246
- return !!item.id;
247
- });
248
- };
249
-
250
- _proto.getEdges = function getEdges() {
251
- return (0, _htElementUtils.getEdgeDatas)(this.getDataModel());
243
+ return this.getData().lines;
252
244
  }
253
245
  /**
254
246
  * 全量更新数据
@@ -307,18 +299,19 @@ var Topo = /*#__PURE__*/function () {
307
299
  /*#__PURE__*/
308
300
  function () {
309
301
  var _addElements = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee5(elements) {
310
- var data;
302
+ var prevData, data;
311
303
  return _regenerator["default"].wrap(function _callee5$(_context5) {
312
304
  while (1) switch (_context5.prev = _context5.next) {
313
305
  case 0:
306
+ prevData = this.getData();
314
307
  data = {
315
- groups: [].concat(this.getGroups(), elements.groups || []),
316
- nodes: [].concat(this.getNodes(), elements.nodes || []),
317
- lines: [].concat(this.getLines(), elements.lines || [])
308
+ groups: [].concat(prevData.groups, elements.groups || []),
309
+ nodes: [].concat(prevData.nodes, elements.nodes || []),
310
+ lines: [].concat(prevData.lines, elements.lines || [])
318
311
  };
319
312
  this.updateElements(data); // TODO 更新store,触发属性、指标模型加载,更新指标
320
313
 
321
- case 2:
314
+ case 3:
322
315
  case "end":
323
316
  return _context5.stop();
324
317
  }
@@ -186,7 +186,8 @@ var plurals = {
186
186
  2: ["phy"],
187
187
  3: ["agg"],
188
188
  4: ["phy", "agg"]
189
- };
189
+ }; // 待办:移到网络拓扑组件
190
+
190
191
  exports.plurals = plurals;
191
192
 
192
193
  var showLinkByConfig = function showLinkByConfig(props) {
@@ -200,29 +201,29 @@ var showLinkByConfig = function showLinkByConfig(props) {
200
201
 
201
202
  var gv = topo.getGraphView();
202
203
  var dm = gv.getDataModel();
203
- var edges = (0, _htElementUtils.getEdges)(dm); // console.log("edges", edges);
204
+ var edges = (0, _htElementUtils.getEdges)(dm).filter(function (edge) {
205
+ return !(0, _htElementUtils.isEdgeGroupAgent)(edge);
206
+ }); // console.log("edges", edges);
204
207
 
205
208
  var showPhy = types.indexOf("phy") >= 0;
206
209
  var showAgg = types.indexOf("agg") >= 0; // console.log("edges----types",showType, types,showPhy, showAgg);
207
210
 
208
- if (Array.isArray(edges) && edges.length > 0) {
209
- edges.forEach(function (edge) {
210
- if (showType === 1 || showType === true) {
211
- // 单链路全部显示
212
- // console.log("单链路全部显示", edge);
213
- edge.s("x.visible", true);
214
- } else {
215
- var d = topo.dataModel.getDataById(edge.getTag()); // 判断是否聚合链路
211
+ edges.forEach(function (edge) {
212
+ if (showType === 1 || showType === true) {
213
+ // 单链路全部显示
214
+ // console.log("单链路全部显示", edge);
215
+ edge.s("x.visible", true);
216
+ } else {
217
+ var d = topo.dataModel.getDataById(edge.getTag()); // 判断是否聚合链路
216
218
 
217
- if (isAggLink(d)) {
218
- edge.s("x.visible", showAgg);
219
- } else {
220
- // console.log("edge", edge, d, showAgg);
221
- edge.s("x.visible", showPhy);
222
- }
219
+ if (isAggLink(d)) {
220
+ edge.s("x.visible", showAgg);
221
+ } else {
222
+ // console.log("edge", edge, d, showAgg);
223
+ edge.s("x.visible", showPhy);
223
224
  }
224
- });
225
- }
225
+ }
226
+ });
226
227
  };
227
228
 
228
229
  exports.showLinkByConfig = showLinkByConfig;
@@ -17,7 +17,7 @@ var _utils2 = require("@riil-frontend/component-topology-graph/es/utils");
17
17
 
18
18
  var _topo = require("@riil-frontend/component-topology-common/es/services/topo");
19
19
 
20
- var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
20
+ var _loglevel = _interopRequireDefault(require("loglevel"));
21
21
 
22
22
  var _format = require("../../../utils/format");
23
23
 
@@ -34,6 +34,8 @@ var _getTopoData = require("../../../networkTopo/getTopoData");
34
34
  /**
35
35
  * 拓扑配置
36
36
  */
37
+ var rlog = _loglevel["default"].getLogger('topo');
38
+
37
39
  var newGroupWithUUID = function newGroupWithUUID(group) {
38
40
  if (group === void 0) {
39
41
  group = _template.DEFAULT_GROUP;
@@ -96,7 +98,7 @@ function conditionToRes(conditions) {
96
98
  }
97
99
 
98
100
  function updateGroupData(groups, index, data) {
99
- _rlog["default"].debug("容器侦查-----updateGroupData", groups, index, data);
101
+ rlog.debug("容器侦查-----updateGroupData", groups, index, data);
100
102
 
101
103
  if (groups && groups[index]) {
102
104
  var group = (0, _extends2["default"])({}, groups[index], data);
@@ -276,15 +278,13 @@ function _default(topoApp) {
276
278
 
277
279
  case 5:
278
280
  data = _context2.sent;
279
-
280
- _rlog["default"].debug("按配置查询拓扑数据", {
281
+ rlog.debug("按配置查询拓扑数据", {
281
282
  config: {
282
283
  resources: resources,
283
284
  groups: groups
284
285
  },
285
286
  data: data
286
287
  });
287
-
288
288
  return _context2.abrupt("return", data);
289
289
 
290
290
  case 8:
@@ -325,8 +325,7 @@ function _default(topoApp) {
325
325
  return _regenerator["default"].wrap(function _callee4$(_context4) {
326
326
  while (1) switch (_context4.prev = _context4.next) {
327
327
  case 0:
328
- _rlog["default"].debug("getTopoByConditions--------", params);
329
-
328
+ rlog.debug("getTopoByConditions--------", params);
330
329
  topoId = params.id, resources = params.resources, groups = params.groups;
331
330
  viewConditions = (0, _topoData2.resToConditions)(resources);
332
331
  groupInfo = (0, _utils.isAvailableArray)(groups) && groups.map(function (group) {
@@ -335,17 +334,13 @@ function _default(topoApp) {
335
334
  resources: (0, _topoData2.resToConditions)(group.resources)
336
335
  });
337
336
  });
338
-
339
- _rlog["default"].debug("getTopoByConditions--------", viewConditions, groupInfo);
340
-
337
+ rlog.debug("getTopoByConditions--------", viewConditions, groupInfo);
341
338
  _context4.next = 7;
342
339
  return topoApp.serverApi.getTopoDataByResource(topoId, viewConditions, groupInfo);
343
340
 
344
341
  case 7:
345
342
  data = _context4.sent;
346
-
347
- _rlog["default"].debug("getTopoByConditions--------data", data);
348
-
343
+ rlog.debug("getTopoByConditions--------data", data);
349
344
  _context4.next = 11;
350
345
  return (0, _getTopoData.buildData)(data);
351
346
 
@@ -408,9 +403,7 @@ function _default(topoApp) {
408
403
  }].concat(displayConfig.saveHistories || [])
409
404
  }))
410
405
  };
411
-
412
- _rlog["default"].debug("saveGlobalConfig", config);
413
-
406
+ rlog.debug("saveGlobalConfig", config);
414
407
  _context5.next = 5;
415
408
  return topoApp.serverApi.saveTopoSettings(topoApp.id, config);
416
409
 
@@ -10,12 +10,14 @@ var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-ut
10
10
 
11
11
  var _linkUtils = require("../models/utils/linkUtils");
12
12
 
13
+ var _htElementUtils = require("../../utils/htElementUtils");
14
+
13
15
  /**
14
16
  * 是否手工连线
15
17
  * @param {*} edge
16
18
  */
17
19
  function isCustomEdge(edge) {
18
- return !edge.isEdgeGroupAgent() && (edge.a('type') == 'line' || !edge.a('type'));
20
+ return !(0, _htElementUtils.isEdgeGroupAgent)(edge) && (edge.a('type') == 'line' || !edge.a('type'));
19
21
  }
20
22
  /**
21
23
  * 根据配置更新连线展开折叠状态
@@ -25,7 +27,7 @@ function isCustomEdge(edge) {
25
27
 
26
28
 
27
29
  var updateEdgeExpanded = function updateEdgeExpanded(topo) {
28
- var _topo$historyManager, _topo$historyManager2;
30
+ var _topo$historyManager, _topo$historyManager2, _topo$linkDynamicStyl;
29
31
 
30
32
  var _topo$store$getModelS = topo.store.getModelState("topoMod"),
31
33
  viewState = _topo$store$getModelS.viewState;
@@ -38,8 +40,7 @@ var updateEdgeExpanded = function updateEdgeExpanded(topo) {
38
40
  }
39
41
 
40
42
  var _topo$store$getModelS2 = topo.store.getModelState("displayConfig"),
41
- expandAllEdges = _topo$store$getModelS2.expandAllEdges; // console.log("expandAllEdges----------", expandAllEdges);
42
-
43
+ expandAllEdges = _topo$store$getModelS2.expandAllEdges;
43
44
 
44
45
  (_topo$historyManager = topo.historyManager) === null || _topo$historyManager === void 0 ? void 0 : _topo$historyManager.setDisabled(true, '连线展开控制');
45
46
 
@@ -48,11 +49,11 @@ var updateEdgeExpanded = function updateEdgeExpanded(topo) {
48
49
  topo: topo,
49
50
  showType: 1
50
51
  });
51
- htTopo.collapseAllEdgeGroups();
52
+ htTopo.toggleAllEdgeGroups(false);
52
53
 
53
54
  _rlog["default"].debug("updateEdgeExpanded 折叠");
54
55
  } else {
55
- htTopo.expandAllEdgeGroups();
56
+ htTopo.toggleAllEdgeGroups(true);
56
57
  (0, _linkUtils.showLinkByConfig)({
57
58
  topo: topo,
58
59
  showType: expandAllEdges,
@@ -63,10 +64,7 @@ var updateEdgeExpanded = function updateEdgeExpanded(topo) {
63
64
  }
64
65
 
65
66
  (_topo$historyManager2 = topo.historyManager) === null || _topo$historyManager2 === void 0 ? void 0 : _topo$historyManager2.setDisabled(false, '连线展开控制');
66
-
67
- if (topo.linkDynamicStyleExecutor) {
68
- topo.linkDynamicStyleExecutor.execute();
69
- }
67
+ (_topo$linkDynamicStyl = topo.linkDynamicStyleExecutor) === null || _topo$linkDynamicStyl === void 0 ? void 0 : _topo$linkDynamicStyl.execute();
70
68
  };
71
69
 
72
70
  exports.updateEdgeExpanded = updateEdgeExpanded;
@@ -9,6 +9,8 @@ var _react = _interopRequireWildcard(require("react"));
9
9
 
10
10
  var _DefaultDetailContent = _interopRequireDefault(require("../../ResourceDetail/DefaultDetailContent"));
11
11
 
12
+ var _htElementUtils = require("../../../../../../utils/htElementUtils");
13
+
12
14
  function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
13
15
 
14
16
  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; }
@@ -74,9 +76,8 @@ function useElementDetailManager(props) {
74
76
  }
75
77
 
76
78
  function openByHtElement(htElement) {
77
- var isEdgeGroupAgent = htElement instanceof ht.Edge && htElement.isEdgeGroupAgent() && !htElement.s('edge.expanded');
78
79
  open({
79
- id: isEdgeGroupAgent || !htElement.getTag() ? "ht:" + htElement.getId() : htElement.getTag(),
80
+ id: (0, _htElementUtils.isEdgeGroupAgent)(htElement) || !htElement.getTag() ? "ht:" + htElement.getId() : htElement.getTag(),
80
81
  htElement: htElement
81
82
  });
82
83
  }
@@ -27,31 +27,70 @@ var _overview = _interopRequireDefault(require("../../../../../../services/overv
27
27
 
28
28
  var _indexModule = _interopRequireDefault(require("./index.module.scss"));
29
29
 
30
+ var _componentTopologyUtils = require("@riil-frontend/component-topology-utils");
31
+
30
32
  function formatUrl(url) {
31
- return url;
33
+ var _window, _window$location;
34
+
35
+ console.log(url);
36
+ var prefix = '/default/pagecenter';
37
+
38
+ 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) {
39
+ return url.split(prefix)[1];
40
+ } else {
41
+ return url;
42
+ }
32
43
  }
33
44
 
34
45
  function EventsCard(props) {
35
46
  var alarmRiskList = props.alarmRiskList,
36
47
  closeDetailDrawer = props.closeDetailDrawer,
37
- onHandleAlarm = props.onHandleAlarm; // 告警table列配置
48
+ onHandleAlarm = props.onHandleAlarm;
49
+
50
+ var jumpTo = function jumpTo(url) {
51
+ closeDetailDrawer();
52
+
53
+ if (topo.viewProps.jumpto) {
54
+ topo.viewProps.jumpto(url);
55
+ } else {
56
+ (0, _componentTopologyUtils.getHistory)().push(formatUrl(url));
57
+ }
58
+ }; // 告警table列配置
59
+
38
60
 
39
61
  var columns = [{
40
62
  title: "描述",
41
63
  dataIndex: "title",
42
64
  key: "title",
43
65
  cell: function cell(value, index, record) {
44
- return /*#__PURE__*/_react["default"].createElement("div", {
45
- className: _indexModule["default"]["alarm-title"],
46
- title: value,
47
- onClick: closeDetailDrawer
48
- }, /*#__PURE__*/_react["default"].createElement(_icon["default"], {
49
- type: record.icon,
50
- size: "xs",
51
- className: _indexModule["default"]["alarm-color-icon"] + " " + record.className
52
- }), /*#__PURE__*/_react["default"].createElement(_Link["default"], {
53
- to: formatUrl(record.link)
54
- }, value));
66
+ return (
67
+ /*#__PURE__*/
68
+ // <div
69
+ // className={styles["alarm-title"]}
70
+ // title={value}
71
+ // onClick={closeDetailDrawer}
72
+ // >
73
+ // <Icon
74
+ // type={record.icon}
75
+ // size="xs"
76
+ // className={`${styles["alarm-color-icon"]} ${record.className}`}
77
+ // />
78
+ // <Link to={formatUrl(record.link)}>{value}</Link>
79
+ // </div>
80
+ _react["default"].createElement("div", {
81
+ className: _indexModule["default"]['alarm-title'],
82
+ title: value,
83
+ onClick: function onClick() {
84
+ jumpTo(record.link);
85
+ }
86
+ }, /*#__PURE__*/_react["default"].createElement(_icon["default"], {
87
+ type: record.icon,
88
+ size: "xs",
89
+ className: _indexModule["default"]['alarm-color-icon'] + " " + record.className
90
+ }), /*#__PURE__*/_react["default"].createElement("span", {
91
+ className: _indexModule["default"].link
92
+ }, value))
93
+ );
55
94
  }
56
95
  }, {
57
96
  title: "时间",
@@ -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
+ }
@@ -22,11 +22,11 @@ var EdgeGroupTagTipBuilder = /*#__PURE__*/function () {
22
22
 
23
23
  var topo = this.topo;
24
24
  var dm = this.topo.getDataModel();
25
- var edgeGroupsTagsTips = (0, _htElementUtils.getEdgeGroups)(dm).map(function (edgeGroup) {
26
- var edge = edgeGroup.getEdges().getArray()[0]; // 获取配置的链路
27
-
28
- var linkId = (0, _edgeGroupTagUtil.getEdgeGroupLinkIdConfig)(edge, topo);
29
- var edgeGroupId = [edge.getSourceAgent().getId(), edge.getTargetAgent().getId()];
25
+ var edgeGroupAgents = (0, _htElementUtils.getEdgeGroupAgents)(dm);
26
+ var edgeGroupsTagsTips = edgeGroupAgents.map(function (edgeGroupAgent) {
27
+ // 获取配置的链路
28
+ var linkId = (0, _edgeGroupTagUtil.getEdgeGroupLinkIdConfig)(edgeGroupAgent, topo);
29
+ var edgeGroupId = [edgeGroupAgent.getSource().getId(), edgeGroupAgent.getTarget().getId()];
30
30
  var data = {
31
31
  tags: [],
32
32
  tips: []
@@ -37,7 +37,7 @@ var EdgeGroupTagTipBuilder = /*#__PURE__*/function () {
37
37
  }
38
38
 
39
39
  return {
40
- htId: edge.getId(),
40
+ htId: edgeGroupAgent.getId(),
41
41
  edgeGroupId: edgeGroupId,
42
42
  tags: data.tags,
43
43
  tips: data.tips,