@riil-frontend/component-topology 12.0.0-dev.9 → 12.1.0-dev.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 (90) 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/TemplateButton/index.module.scss +1 -1
  5. package/es/core/components/AlarmListPanel/components/AlarmListItem.js +58 -3
  6. package/es/core/components/TopoView/topoView.js +5 -1
  7. package/es/core/editor/components/Toolbar/widgets/EdgeColorButton/EdgeColorButton.js +5 -12
  8. package/es/core/editor/components/Toolbar/widgets/EdgeTypeButton/EdgeType.js +27 -10
  9. package/es/core/editor/components/Toolbar/widgets/EdgeTypeButton/EdgeType.module.scss +21 -1
  10. package/es/core/editor/components/Toolbar/widgets/EdgeTypeButton/LineType.js +9 -0
  11. package/es/core/editor/components/Toolbar/widgets/EdgeTypeButton/index.js +2 -2
  12. package/es/core/editor/components/Toolbar/widgets/Layout/index.js +16 -2
  13. package/es/core/editor/hooks/useKeyboardShortcut.js +3 -1
  14. package/es/core/editor/utils/copyElementUtil.js +12 -0
  15. package/es/core/editor/utils/edgeTypeStyleUtil.js +8 -30
  16. package/es/core/hooks/useAlarm.js +131 -81
  17. package/es/core/hooks/useCmpLinkAlarm.js +153 -0
  18. package/es/core/hooks/useEventData.js +1 -2
  19. package/es/core/hooks/useGraphAlarmDisplay.js +91 -56
  20. package/es/core/hooks/useResourceConfig.js +1 -3
  21. package/es/core/hooks/useTopoEdit.js +31 -43
  22. package/es/core/models/Alarm.js +69 -142
  23. package/es/core/models/AttributeMetricDisplay.js +9 -3
  24. package/es/core/models/TopoApp.js +1 -1
  25. package/es/core/models/cache/CiCache.d.ts +1 -1
  26. package/es/core/models/cache/CiCache.js +3 -3
  27. package/es/core/models/topoData.js +0 -1
  28. package/es/core/models/utils/linkUtils.js +20 -13
  29. package/es/core/services/topo/basic.js +2 -2
  30. package/es/core/store/models/topoConfig.js +7 -10
  31. package/es/core/store/models/topoMod.js +81 -134
  32. package/es/core/utils/edgeUtil.js +8 -0
  33. package/es/core/utils/metricUtil.js +8 -4
  34. package/es/core/utils/showGraphManageStatusUtil.js +3 -2
  35. package/es/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/components/LinkTopo/LinkTopoCard.js +2 -2
  36. package/es/core/viewer/components/plugins/ViewerPlugin.js +3 -1
  37. package/es/core/viewer/components/titlebar/widgets/AlarmButton.js +1 -5
  38. package/es/networkTopo/components/TopoView.js +6 -11
  39. package/es/networkTopo/hooks/useEdgeExpand.js +2 -3
  40. package/es/networkTopo/services/topo/basic.js +3 -3
  41. package/es/networkTopo/store/topoCenter.js +260 -223
  42. package/es/style.js +1 -1
  43. package/es/utils/ResourceConfigUtil.js +3 -36
  44. package/es/utils/ciRefAttributeTranslateUtil.d.ts +9 -2
  45. package/es/utils/ciRefAttributeTranslateUtil.js +8 -9
  46. package/es/utils/topoData.js +1 -1
  47. package/lib/components/TemplateButton/index.module.scss +1 -1
  48. package/lib/core/components/AlarmListPanel/components/AlarmListItem.js +60 -3
  49. package/lib/core/components/TopoView/topoView.js +5 -1
  50. package/lib/core/editor/components/Toolbar/widgets/EdgeColorButton/EdgeColorButton.js +6 -12
  51. package/lib/core/editor/components/Toolbar/widgets/EdgeTypeButton/EdgeType.js +27 -9
  52. package/lib/core/editor/components/Toolbar/widgets/EdgeTypeButton/EdgeType.module.scss +21 -1
  53. package/lib/core/editor/components/Toolbar/widgets/EdgeTypeButton/LineType.js +8 -0
  54. package/lib/core/editor/components/Toolbar/widgets/EdgeTypeButton/index.js +1 -1
  55. package/lib/core/editor/components/Toolbar/widgets/Layout/index.js +16 -2
  56. package/lib/core/editor/hooks/useKeyboardShortcut.js +2 -0
  57. package/lib/core/editor/utils/copyElementUtil.js +15 -0
  58. package/lib/core/editor/utils/edgeTypeStyleUtil.js +8 -31
  59. package/lib/core/hooks/useAlarm.js +130 -79
  60. package/lib/core/hooks/useCmpLinkAlarm.js +166 -0
  61. package/lib/core/hooks/useEventData.js +1 -2
  62. package/lib/core/hooks/useGraphAlarmDisplay.js +91 -55
  63. package/lib/core/hooks/useResourceConfig.js +1 -3
  64. package/lib/core/hooks/useTopoEdit.js +30 -42
  65. package/lib/core/models/Alarm.js +69 -144
  66. package/lib/core/models/AttributeMetricDisplay.js +10 -2
  67. package/lib/core/models/TopoApp.js +1 -1
  68. package/lib/core/models/cache/CiCache.d.ts +1 -1
  69. package/lib/core/models/cache/CiCache.js +3 -3
  70. package/lib/core/models/topoData.js +0 -1
  71. package/lib/core/models/utils/linkUtils.js +21 -13
  72. package/lib/core/services/topo/basic.js +2 -2
  73. package/lib/core/store/models/topoConfig.js +7 -10
  74. package/lib/core/store/models/topoMod.js +81 -134
  75. package/lib/core/utils/edgeUtil.js +10 -0
  76. package/lib/core/utils/metricUtil.js +8 -4
  77. package/lib/core/utils/showGraphManageStatusUtil.js +3 -2
  78. package/lib/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/components/LinkTopo/LinkTopoCard.js +2 -2
  79. package/lib/core/viewer/components/plugins/ViewerPlugin.js +3 -1
  80. package/lib/core/viewer/components/titlebar/widgets/AlarmButton.js +1 -5
  81. package/lib/networkTopo/components/TopoView.js +5 -14
  82. package/lib/networkTopo/hooks/useEdgeExpand.js +2 -3
  83. package/lib/networkTopo/services/topo/basic.js +3 -3
  84. package/lib/networkTopo/store/topoCenter.js +262 -225
  85. package/lib/style.js +1 -1
  86. package/lib/utils/ResourceConfigUtil.js +3 -38
  87. package/lib/utils/ciRefAttributeTranslateUtil.d.ts +9 -2
  88. package/lib/utils/ciRefAttributeTranslateUtil.js +8 -9
  89. package/lib/utils/topoData.js +1 -1
  90. package/package.json +2 -2
@@ -15,7 +15,7 @@ import useGroupAddResource from "./useGroupAddResource";
15
15
  import { findGroupChildren } from "../../utils/topoData";
16
16
  import { isResourceElement } from "../../utils/htElementDataUtil";
17
17
  import { isClusterHtElement, isClusterMemberHtElement } from "../../utils/clusterUtil";
18
- import { mergeExportLinkData } from "../models/utils/linkUtils";
18
+ import { isExitLink, mergeExportLinkData } from "../models/utils/linkUtils";
19
19
  import { isUniqueIp, buildIpNode } from "../../networkTopo/utils/exitLinkUtil";
20
20
 
21
21
  var useTopoEdit = function useTopoEdit(params) {
@@ -95,10 +95,6 @@ var useTopoEdit = function useTopoEdit(params) {
95
95
  return topoDispatchers.setTopoType(TPL_TREE);
96
96
 
97
97
  case 7:
98
- // 更新配置
99
- // resourceConfig.updateConfig(config);
100
- // 更新配置对应的资源、链路
101
- // editDispatchers.fetchDataByConfig();
102
98
  topo.historyManager.endTransaction();
103
99
 
104
100
  case 8:
@@ -349,33 +345,26 @@ var useTopoEdit = function useTopoEdit(params) {
349
345
  var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee4(node) {
350
346
  var _node$getEdges$toArra, _node$getEdges;
351
347
 
352
- var config, edges, exportLinkIdList;
348
+ var edges;
353
349
  return _regeneratorRuntime.wrap(function _callee4$(_context4) {
354
350
  while (1) switch (_context4.prev = _context4.next) {
355
351
  case 0:
356
- config = resourceConfig.getConfig(); // console.log("删除关联在节点上的出口链路- node, config", node, config);
352
+ // console.log("删除关联在节点上的出口链路- node, config", node, config);
353
+ edges = (_node$getEdges$toArra = (_node$getEdges = node.getEdges()) === null || _node$getEdges === void 0 ? void 0 : _node$getEdges.toArray()) !== null && _node$getEdges$toArra !== void 0 ? _node$getEdges$toArra : [];
357
354
 
358
- edges = (_node$getEdges$toArra = (_node$getEdges = node.getEdges()) === null || _node$getEdges === void 0 ? void 0 : _node$getEdges.toArray()) !== null && _node$getEdges$toArra !== void 0 ? _node$getEdges$toArra : []; // const exLink = [];
355
+ if (edges.length > 0) {
356
+ edges.map(function (edge) {
357
+ if (edge.getTag()) {
358
+ var link = topo.dataModel.getDataById(edge.getTag());
359
359
 
360
- if (!(edges.length > 0)) {
361
- _context4.next = 8;
362
- break;
360
+ if (link && isExitLink(link)) {
361
+ topo.getGraphView().dm().remove(edge);
362
+ }
363
+ }
364
+ });
363
365
  }
364
366
 
365
- exportLinkIdList = [].concat(config.exportLinkIdList); //console.log("删除关联在节点上的出口链路- edges", edges,exportLinkIdList);
366
-
367
- edges.map(function (edge) {
368
- if (edge.a("dtype") === "link" && exportLinkIdList.indexOf(edge.getTag()) >= 0) {
369
- // exLink.push(edge);
370
- topo.getGraphView().dm().remove(edge);
371
- exportLinkIdList.splice(config.exportLinkIdList.indexOf(edge.getTag()), 1);
372
- }
373
- });
374
- config.exportLinkIdList = exportLinkIdList;
375
- _context4.next = 8;
376
- return resourceConfig.updateConfig(config);
377
-
378
- case 8:
367
+ case 2:
379
368
  case "end":
380
369
  return _context4.stop();
381
370
  }
@@ -831,7 +820,9 @@ var useTopoEdit = function useTopoEdit(params) {
831
820
  return _regeneratorRuntime.wrap(function _callee8$(_context8) {
832
821
  while (1) switch (_context8.prev = _context8.next) {
833
822
  case 0:
834
- dm = htTopo.getGraphView().dm(); // 创建
823
+ dm = htTopo.getGraphView().dm(); // 移除旧节点。先删除后创建,解决ip节点替换ping资源后链路丢失问题
824
+
825
+ dm.remove(node); // 创建
835
826
 
836
827
  newLinkElements = findUNExistedLinkElements(elements);
837
828
  createElementsData = null;
@@ -892,22 +883,13 @@ var useTopoEdit = function useTopoEdit(params) {
892
883
 
893
884
 
894
885
  sm = htTopo.getGraphView().sm();
895
- sm.setSelection([newElement]); // 移除旧节点
886
+ sm.setSelection([newElement]); // 临时放这里,仅拓扑中心有
896
887
 
897
- dm.remove(node); // saveBind(TopoEvent.DATA_TYPE_RESOURCE_SINGLE, newDatas);
898
- // node.a("customName", null);
899
- // 删除关联在节点上的出口链路
900
-
901
- _context8.next = 12;
902
- return deleteExLink(node);
903
-
904
- case 12:
905
- // 临时放这里,仅拓扑中心有
906
888
  if (topo.linkDynamicStyleExecutor) {
907
889
  topo.linkDynamicStyleExecutor.execute();
908
890
  }
909
891
 
910
- case 13:
892
+ case 11:
911
893
  case "end":
912
894
  return _context8.stop();
913
895
  }
@@ -970,10 +952,11 @@ var useTopoEdit = function useTopoEdit(params) {
970
952
  break;
971
953
  }
972
954
 
955
+ topo.historyManager.endTransaction();
956
+
973
957
  _Message.error("关联资源失败");
974
958
 
975
- rlog.warn("关联资源失败");
976
- topo.historyManager.endTransaction();
959
+ rlog.error("关联资源失败");
977
960
  return _context9.abrupt("return", false);
978
961
 
979
962
  case 23:
@@ -1005,7 +988,7 @@ var useTopoEdit = function useTopoEdit(params) {
1005
988
 
1006
989
  function _relateNodeIp() {
1007
990
  _relateNodeIp = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee15(txtValue, nodeElement) {
1008
- var dm, isUnique, ip, configObj, configData, _elements2, newLinkElements, newLink, newLinkGroup, createElementsData, _htTopo;
991
+ var dm, isUnique, ipNodeData, configObj, configData, _elements2, newLinkElements, newLink, newLinkGroup, createElementsData, _htTopo;
1009
992
 
1010
993
  return _regeneratorRuntime.wrap(function _callee15$(_context15) {
1011
994
  while (1) switch (_context15.prev = _context15.next) {
@@ -1031,12 +1014,12 @@ var useTopoEdit = function useTopoEdit(params) {
1031
1014
  break;
1032
1015
  }
1033
1016
 
1034
- ip = buildIpNode(txtValue);
1017
+ ipNodeData = buildIpNode(txtValue);
1035
1018
  _context15.next = 8;
1036
1019
  return deleteExLink(nodeElement);
1037
1020
 
1038
1021
  case 8:
1039
- nodeElement.a(ip);
1022
+ nodeElement.a(ipNodeData);
1040
1023
  nodeElement.setName(txtValue);
1041
1024
  nodeElement.setTag("ip:" + txtValue); // 获取配置
1042
1025
 
@@ -1073,7 +1056,12 @@ var useTopoEdit = function useTopoEdit(params) {
1073
1056
  if ([].concat(newLink, newLinkGroup).length > 0) {
1074
1057
  _htTopo = topo.getHtTopo();
1075
1058
 
1076
- _htTopo.createElements(createElementsData);
1059
+ _htTopo.createElements(createElementsData); // 临时放这里,仅拓扑中心有
1060
+
1061
+
1062
+ if (topo.linkDynamicStyleExecutor) {
1063
+ topo.linkDynamicStyleExecutor.execute();
1064
+ }
1077
1065
  }
1078
1066
 
1079
1067
  case 24:
@@ -83,8 +83,7 @@ var Alarm = /*#__PURE__*/function () {
83
83
  }
84
84
 
85
85
  rlog.info('Alarm.open 打开告警通道', id);
86
- this.openTopoAlarm(id); // this.hmGetTopoAlarm(id);
87
-
86
+ this.openTopoAlarm(id);
88
87
  this.hmGetTopoAlarmByDoc(id);
89
88
  }
90
89
  /**
@@ -211,83 +210,6 @@ var Alarm = /*#__PURE__*/function () {
211
210
  }
212
211
 
213
212
  return hmGetTopoAlarmByDoc;
214
- }();
215
-
216
- _proto.hmGetTopoAlarm = /*#__PURE__*/function () {
217
- var _hmGetTopoAlarm = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3(id) {
218
- var mainCiIdList, endTime, startTime, parms, result;
219
- return _regeneratorRuntime.wrap(function _callee3$(_context3) {
220
- while (1) switch (_context3.prev = _context3.next) {
221
- case 0:
222
- mainCiIdList = this.topo.dataModel.getDatas().filter(function (ci) {
223
- return !!ci.operation;
224
- }) // 过滤掉权限
225
- .map(function (ci) {
226
- return ci.id;
227
- });
228
-
229
- if (!(mainCiIdList.length === 0)) {
230
- _context3.next = 4;
231
- break;
232
- }
233
-
234
- this.updateState({
235
- alarmData: [],
236
- alarmPanelIsOpen: false
237
- });
238
- return _context3.abrupt("return");
239
-
240
- case 4:
241
- //rlog.debug("获取告警列表", mainCiIdList);
242
- endTime = null; // new Date().valueOf();
243
-
244
- startTime = null; // moment().subtract(1, "months").valueOf();
245
-
246
- parms = {
247
- mainCiIdList: mainCiIdList,
248
- alertStatusList: ['toDeal', 'dealing'],
249
- pageNum: 1,
250
- pageSize: 10,
251
- sortField: 'alertLevel',
252
- alertLevelList: [],
253
- orders: [{
254
- property: 'alertLevel',
255
- direction: 'ASC'
256
- }, {
257
- property: 'createTime',
258
- direction: 'DESC'
259
- }],
260
- createTime: {
261
- startTime: startTime,
262
- endTime: endTime
263
- }
264
- };
265
- _context3.next = 9;
266
- return topoService.getAlarmByIds(parms);
267
-
268
- case 9:
269
- result = _context3.sent;
270
- rlog.debug('getAlarmById-result', result); // if (alarmIsOpened) {
271
- // //this.topo.loadAlarm(result.datas);
272
- // this.handleAlarmEvent({ type: "alarm", data: result.datas });
273
- // }
274
- // this.updateState({
275
- // alarmData: result.datas.length > 0 ? result.datas : [],
276
- // alarmPanelIsOpen: result.datas.length > 0,
277
- // });
278
-
279
- case 11:
280
- case "end":
281
- return _context3.stop();
282
- }
283
- }, _callee3, this);
284
- }));
285
-
286
- function hmGetTopoAlarm(_x2) {
287
- return _hmGetTopoAlarm.apply(this, arguments);
288
- }
289
-
290
- return hmGetTopoAlarm;
291
213
  }()
292
214
  /**
293
215
  * 直接装载告警数据(可装载mock列表)
@@ -298,9 +220,9 @@ var Alarm = /*#__PURE__*/function () {
298
220
  _proto.setAlarmDataByMock =
299
221
  /*#__PURE__*/
300
222
  function () {
301
- var _setAlarmDataByMock = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee4(datas) {
302
- return _regeneratorRuntime.wrap(function _callee4$(_context4) {
303
- while (1) switch (_context4.prev = _context4.next) {
223
+ var _setAlarmDataByMock = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3(datas) {
224
+ return _regeneratorRuntime.wrap(function _callee3$(_context3) {
225
+ while (1) switch (_context3.prev = _context3.next) {
304
226
  case 0:
305
227
  this.updateState({
306
228
  alarmData: datas.length > 0 ? datas : [],
@@ -309,12 +231,12 @@ var Alarm = /*#__PURE__*/function () {
309
231
 
310
232
  case 1:
311
233
  case "end":
312
- return _context4.stop();
234
+ return _context3.stop();
313
235
  }
314
- }, _callee4, this);
236
+ }, _callee3, this);
315
237
  }));
316
238
 
317
- function setAlarmDataByMock(_x3) {
239
+ function setAlarmDataByMock(_x2) {
318
240
  return _setAlarmDataByMock.apply(this, arguments);
319
241
  }
320
242
 
@@ -329,10 +251,10 @@ var Alarm = /*#__PURE__*/function () {
329
251
  _proto.switchAlarmPopPanel =
330
252
  /*#__PURE__*/
331
253
  function () {
332
- var _switchAlarmPopPanel = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee5(flag) {
254
+ var _switchAlarmPopPanel = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee4(flag) {
333
255
  var topoDispatchers;
334
- return _regeneratorRuntime.wrap(function _callee5$(_context5) {
335
- while (1) switch (_context5.prev = _context5.next) {
256
+ return _regeneratorRuntime.wrap(function _callee4$(_context4) {
257
+ while (1) switch (_context4.prev = _context4.next) {
336
258
  case 0:
337
259
  // console.log("switchAlarmPopPanel", flag);
338
260
  topoDispatchers = this.topo.store.getModelDispatchers('topoAlarm');
@@ -342,12 +264,12 @@ var Alarm = /*#__PURE__*/function () {
342
264
 
343
265
  case 2:
344
266
  case "end":
345
- return _context5.stop();
267
+ return _context4.stop();
346
268
  }
347
- }, _callee5, this);
269
+ }, _callee4, this);
348
270
  }));
349
271
 
350
- function switchAlarmPopPanel(_x4) {
272
+ function switchAlarmPopPanel(_x3) {
351
273
  return _switchAlarmPopPanel.apply(this, arguments);
352
274
  }
353
275
 
@@ -363,21 +285,21 @@ var Alarm = /*#__PURE__*/function () {
363
285
  _proto.openTopoAlarm =
364
286
  /*#__PURE__*/
365
287
  function () {
366
- var _openTopoAlarm = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee6(id) {
288
+ var _openTopoAlarm = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee5(id) {
367
289
  var _this$getState2, alarmOpening, topoAlarmIsOpen, alarmDispatchers;
368
290
 
369
- return _regeneratorRuntime.wrap(function _callee6$(_context6) {
370
- while (1) switch (_context6.prev = _context6.next) {
291
+ return _regeneratorRuntime.wrap(function _callee5$(_context5) {
292
+ while (1) switch (_context5.prev = _context5.next) {
371
293
  case 0:
372
294
  // 如果当前拓扑图开启中或已开启则退出
373
295
  _this$getState2 = this.getState(), alarmOpening = _this$getState2.alarmOpening, topoAlarmIsOpen = _this$getState2.topoAlarmIsOpen;
374
296
 
375
297
  if (!(this.currentTopoId === id && (topoAlarmIsOpen || alarmOpening))) {
376
- _context6.next = 3;
298
+ _context5.next = 3;
377
299
  break;
378
300
  }
379
301
 
380
- return _context6.abrupt("return");
302
+ return _context5.abrupt("return");
381
303
 
382
304
  case 3:
383
305
  this.currentTopoId = id;
@@ -385,27 +307,27 @@ var Alarm = /*#__PURE__*/function () {
385
307
  alarmOpening: true
386
308
  });
387
309
  alarmDispatchers = this.topo.store.getModelDispatchers('topoAlarm');
388
- _context6.next = 8;
310
+ _context5.next = 8;
389
311
  return alarmDispatchers.resetAlarmDoc();
390
312
 
391
313
  case 8:
392
- _context6.prev = 8;
393
- _context6.next = 11;
314
+ _context5.prev = 8;
315
+ _context5.next = 11;
394
316
  return this.topo.serverApi.openTopoAlarm(id);
395
317
 
396
318
  case 11:
397
- this.secretKey = _context6.sent;
319
+ this.secretKey = _context5.sent;
398
320
  rlog.info('openTopoAlarm 打开拓扑告警推送-------------------开始');
399
321
  this.updateState({
400
322
  alarmOpening: false,
401
323
  alarmIsOpened: true
402
324
  });
403
- _context6.next = 20;
325
+ _context5.next = 20;
404
326
  break;
405
327
 
406
328
  case 16:
407
- _context6.prev = 16;
408
- _context6.t0 = _context6["catch"](8);
329
+ _context5.prev = 16;
330
+ _context5.t0 = _context5["catch"](8);
409
331
  rlog.error('打开拓扑告警推送 失败');
410
332
  this.updateState({
411
333
  alarmOpening: false
@@ -413,12 +335,12 @@ var Alarm = /*#__PURE__*/function () {
413
335
 
414
336
  case 20:
415
337
  case "end":
416
- return _context6.stop();
338
+ return _context5.stop();
417
339
  }
418
- }, _callee6, this, [[8, 16]]);
340
+ }, _callee5, this, [[8, 16]]);
419
341
  }));
420
342
 
421
- function openTopoAlarm(_x5) {
343
+ function openTopoAlarm(_x4) {
422
344
  return _openTopoAlarm.apply(this, arguments);
423
345
  }
424
346
 
@@ -434,21 +356,21 @@ var Alarm = /*#__PURE__*/function () {
434
356
  _proto.closeTopoAlarm =
435
357
  /*#__PURE__*/
436
358
  function () {
437
- var _closeTopoAlarm = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee7(id) {
359
+ var _closeTopoAlarm = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee6(id) {
438
360
  var _this$getState3, alarmIsOpened, alarmOpening;
439
361
 
440
- return _regeneratorRuntime.wrap(function _callee7$(_context7) {
441
- while (1) switch (_context7.prev = _context7.next) {
362
+ return _regeneratorRuntime.wrap(function _callee6$(_context6) {
363
+ while (1) switch (_context6.prev = _context6.next) {
442
364
  case 0:
443
365
  // 如果未开启则退出
444
366
  _this$getState3 = this.getState(), alarmIsOpened = _this$getState3.alarmIsOpened, alarmOpening = _this$getState3.alarmOpening;
445
367
 
446
368
  if (!(!alarmIsOpened && !alarmOpening)) {
447
- _context7.next = 3;
369
+ _context6.next = 3;
448
370
  break;
449
371
  }
450
372
 
451
- return _context7.abrupt("return");
373
+ return _context6.abrupt("return");
452
374
 
453
375
  case 3:
454
376
  this.currentTopoId = null;
@@ -458,17 +380,17 @@ var Alarm = /*#__PURE__*/function () {
458
380
  alarmOpening: false,
459
381
  alarmPanelIsOpen: false
460
382
  });
461
- _context7.next = 8;
383
+ _context6.next = 8;
462
384
  return this.topo.serverApi.closeTopoAlarm(id, this.secretKey);
463
385
 
464
386
  case 8:
465
387
  case "end":
466
- return _context7.stop();
388
+ return _context6.stop();
467
389
  }
468
- }, _callee7, this);
390
+ }, _callee6, this);
469
391
  }));
470
392
 
471
- function closeTopoAlarm(_x6) {
393
+ function closeTopoAlarm(_x5) {
472
394
  return _closeTopoAlarm.apply(this, arguments);
473
395
  }
474
396
 
@@ -493,20 +415,20 @@ var Alarm = /*#__PURE__*/function () {
493
415
  _proto.restart =
494
416
  /*#__PURE__*/
495
417
  function () {
496
- var _restart = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee8() {
418
+ var _restart = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee7() {
497
419
  var id;
498
- return _regeneratorRuntime.wrap(function _callee8$(_context8) {
499
- while (1) switch (_context8.prev = _context8.next) {
420
+ return _regeneratorRuntime.wrap(function _callee7$(_context7) {
421
+ while (1) switch (_context7.prev = _context7.next) {
500
422
  case 0:
501
423
  id = this.currentTopoId;
502
- _context8.next = 3;
424
+ _context7.next = 3;
503
425
  return this.openTopoAlarm(id);
504
426
 
505
427
  case 3:
506
428
  case "end":
507
- return _context8.stop();
429
+ return _context7.stop();
508
430
  }
509
- }, _callee8, this);
431
+ }, _callee7, this);
510
432
  }));
511
433
 
512
434
  function restart() {
@@ -523,26 +445,28 @@ var Alarm = /*#__PURE__*/function () {
523
445
  _proto.handleAlarmEvent =
524
446
  /*#__PURE__*/
525
447
  function () {
526
- var _handleAlarmEvent = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee9(alertData) {
448
+ var _handleAlarmEvent = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee8(alertData) {
527
449
  var _this$getState4, alarmIsOpened, resAndMetrics, resIdsList, nodeIdsList, linkIdsList, alarmDispatchers, sendAl, idsList, operations, _yield$alarmDispatche2, eqFlag, alarmlist, _this$topo$viewProps, _this$topo$viewProps2;
528
450
 
529
- return _regeneratorRuntime.wrap(function _callee9$(_context9) {
530
- while (1) switch (_context9.prev = _context9.next) {
451
+ return _regeneratorRuntime.wrap(function _callee8$(_context8) {
452
+ while (1) switch (_context8.prev = _context8.next) {
531
453
  case 0:
532
454
  _this$getState4 = this.getState(), alarmIsOpened = _this$getState4.alarmIsOpened;
533
455
  resAndMetrics = this.topo.store.getState().topoMod.resAndMetrics;
534
456
  resIdsList = resAndMetrics.resIdsList, nodeIdsList = resAndMetrics.nodeIdsList, linkIdsList = resAndMetrics.linkIdsList;
535
457
  alarmDispatchers = this.topo.store.getModelDispatchers('topoAlarm'); // 添加事件
536
- // console.log("handleAlarmEvent-接收到推送的原始告警信息", alertData);
458
+
459
+ console.log("handleAlarmEvent-接收到推送的原始告警信息", alertData);
537
460
 
538
461
  if (!(isAvailableArray(alertData) && isAvailableArray(resIdsList))) {
539
- _context9.next = 24;
462
+ _context8.next = 27;
540
463
  break;
541
464
  }
542
465
 
543
466
  sendAl = [];
544
467
  idsList = [].concat(nodeIdsList, linkIdsList);
545
468
  operations = [];
469
+ console.log('idsList---------', idsList);
546
470
  idsList.forEach(function (idItem) {
547
471
  if (idItem.operation === null) {
548
472
  operations.push(idItem.ciId);
@@ -552,6 +476,7 @@ var Alarm = /*#__PURE__*/function () {
552
476
  var _item$resourceId;
553
477
 
554
478
  var ciId = (_item$resourceId = item.resourceId) !== null && _item$resourceId !== void 0 ? _item$resourceId : item.ciId;
479
+ var isSub = false;
555
480
  var obj = {
556
481
  id: ciId,
557
482
  level: item.alertLevel,
@@ -560,28 +485,30 @@ var Alarm = /*#__PURE__*/function () {
560
485
  obj: item,
561
486
  info: item.alertType,
562
487
  ciCode: item === null || item === void 0 ? void 0 : item.ciCode,
563
- ruleId: item === null || item === void 0 ? void 0 : item.ruleId
488
+ ruleId: item === null || item === void 0 ? void 0 : item.ruleId,
489
+ isSub: isSub
564
490
  };
565
491
 
566
492
  if (resIdsList.indexOf(ciId) >= 0 && operations.indexOf(ciId) < 0) {
567
493
  sendAl.push(obj);
568
494
  }
569
- }); // console.log("before-combAlarmData", sendAl, idsList);
495
+ });
496
+ console.log("before-combAlarmData", sendAl, idsList);
570
497
 
571
498
  if (!(sendAl.length > 0)) {
572
- _context9.next = 24;
499
+ _context8.next = 27;
573
500
  break;
574
501
  }
575
502
 
576
503
  rlog.debug('过滤掉非本拓扑的告警信息 告警开关-推送告警到ht-alarmIsOpened-sendAl', alarmIsOpened, sendAl);
577
- _context9.prev = 12;
578
- _context9.next = 15;
504
+ _context8.prev = 15;
505
+ _context8.next = 18;
579
506
  return alarmDispatchers.combAlarmData({
580
507
  alarmdata: sendAl
581
508
  });
582
509
 
583
- case 15:
584
- _yield$alarmDispatche2 = _context9.sent;
510
+ case 18:
511
+ _yield$alarmDispatche2 = _context8.sent;
585
512
  eqFlag = _yield$alarmDispatche2.eqFlag;
586
513
  alarmlist = _yield$alarmDispatche2.alarmlist;
587
514
 
@@ -601,22 +528,22 @@ var Alarm = /*#__PURE__*/function () {
601
528
  }
602
529
  }
603
530
 
604
- _context9.next = 24;
531
+ _context8.next = 27;
605
532
  break;
606
533
 
607
- case 21:
608
- _context9.prev = 21;
609
- _context9.t0 = _context9["catch"](12);
610
- rlog.error('告警发送异常', _context9.t0);
611
-
612
534
  case 24:
535
+ _context8.prev = 24;
536
+ _context8.t0 = _context8["catch"](15);
537
+ rlog.error('告警发送异常', _context8.t0);
538
+
539
+ case 27:
613
540
  case "end":
614
- return _context9.stop();
541
+ return _context8.stop();
615
542
  }
616
- }, _callee9, this, [[12, 21]]);
543
+ }, _callee8, this, [[15, 24]]);
617
544
  }));
618
545
 
619
- function handleAlarmEvent(_x7) {
546
+ function handleAlarmEvent(_x6) {
620
547
  return _handleAlarmEvent.apply(this, arguments);
621
548
  }
622
549
 
@@ -525,15 +525,21 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
525
525
  return _extends({}, item, {
526
526
  tags: tags
527
527
  });
528
- }); // rlog.debug(`AttributeMetricDisplay.updateTagsTips ${new Date().toLocaleString()}`, elementTagsAndTips);
529
-
528
+ });
529
+ rlog.debug('推送标注 => ht', elementTagsAndTips);
530
530
  var htTopo = topo.getHtTopo();
531
531
 
532
532
  if (htTopo) {
533
533
  var _topo$historyManager, _topo$historyManager2;
534
534
 
535
535
  (_topo$historyManager = topo.historyManager) === null || _topo$historyManager === void 0 ? void 0 : _topo$historyManager.setDisabled(true, '加载标注');
536
- htTopo.loadTagAndTip(JSON.parse(JSON.stringify(elementTagsAndTips)));
536
+
537
+ try {
538
+ htTopo.loadTagAndTip(JSON.parse(JSON.stringify(elementTagsAndTips)));
539
+ } catch (error) {
540
+ rlog.error('推送标注 => ht 失败', error);
541
+ }
542
+
537
543
  (_topo$historyManager2 = topo.historyManager) === null || _topo$historyManager2 === void 0 ? void 0 : _topo$historyManager2.setDisabled(false, '加载标注');
538
544
  }
539
545
  }
@@ -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.0.0-dev.9" === 'string' ? "12.0.0-dev.9" : null;
27
+ var version = typeof "12.1.0-dev.1" === 'string' ? "12.1.0-dev.1" : null;
28
28
  console.info("\u62D3\u6251\u7248\u672C: " + version);
29
29
  /**
30
30
  * 拓扑显示和编辑
@@ -11,7 +11,7 @@ declare class CiCache {
11
11
  * @param ids {string[]}
12
12
  * @returns {Promise<Object>}
13
13
  */
14
- load(ids: string[]): Promise<Object>;
14
+ load(ids: string[], refreshCiCache?: boolean): Promise<Object>;
15
15
  getCi(id: string): Object;
16
16
  }
17
17
  declare const _default: CiCache;
@@ -23,14 +23,14 @@ var CiCache = /*#__PURE__*/function () {
23
23
  _proto.load =
24
24
  /*#__PURE__*/
25
25
  function () {
26
- var _load = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(ids) {
26
+ var _load = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(ids, refreshCiCache) {
27
27
  var _this = this;
28
28
 
29
29
  var unloadCiIds, cis, map;
30
30
  return _regeneratorRuntime.wrap(function _callee$(_context) {
31
31
  while (1) switch (_context.prev = _context.next) {
32
32
  case 0:
33
- unloadCiIds = ids.filter(function (id) {
33
+ unloadCiIds = refreshCiCache === true ? ids : ids.filter(function (id) {
34
34
  return !_this.ciMap[id];
35
35
  });
36
36
 
@@ -62,7 +62,7 @@ var CiCache = /*#__PURE__*/function () {
62
62
  }, _callee, this);
63
63
  }));
64
64
 
65
- function load(_x) {
65
+ function load(_x, _x2) {
66
66
  return _load.apply(this, arguments);
67
67
  }
68
68
 
@@ -105,7 +105,6 @@ function _saveTopo() {
105
105
  return topoService.bindResourceToTopo(topoId, {
106
106
  groups: groupInfo,
107
107
  linkIps: linkIps,
108
- // exportLinkIdList,
109
108
  relateTopoIdList: relateTopoIdList
110
109
  });
111
110