@riil-frontend/component-topology 10.0.35 → 10.0.37

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 (25) hide show
  1. package/build/1.js +2 -2
  2. package/build/2.js +1 -1
  3. package/build/index.css +1 -1
  4. package/build/index.js +18 -18
  5. package/es/core/editor/components/Toolbar/widgets/EdgeTypeButton/LineType.js +4 -0
  6. package/es/core/editor/components/Toolbar/widgets/IconSelect/IconSelect.js +1 -2
  7. package/es/core/editor/components/Toolbar/widgets/IconSelect/index.js +1 -2
  8. package/es/core/editor/components/Toolbar/widgets/NodeImageButton/NodeImageButton.js +3 -3
  9. package/es/core/hooks/useTopoEdit.js +11 -14
  10. package/es/core/models/Alarm.js +16 -17
  11. package/es/core/models/TopoApp.js +1 -1
  12. package/es/core/store/models/topoConfig.js +10 -11
  13. package/es/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/ResourceOverview.js +2 -2
  14. package/es/networkTopo/models/IpNodeTagsTipsBuilder.js +2 -2
  15. package/lib/core/editor/components/Toolbar/widgets/EdgeTypeButton/LineType.js +4 -0
  16. package/lib/core/editor/components/Toolbar/widgets/IconSelect/IconSelect.js +1 -2
  17. package/lib/core/editor/components/Toolbar/widgets/IconSelect/index.js +1 -2
  18. package/lib/core/editor/components/Toolbar/widgets/NodeImageButton/NodeImageButton.js +3 -3
  19. package/lib/core/hooks/useTopoEdit.js +11 -14
  20. package/lib/core/models/Alarm.js +16 -17
  21. package/lib/core/models/TopoApp.js +1 -1
  22. package/lib/core/store/models/topoConfig.js +10 -11
  23. package/lib/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/ResourceOverview.js +2 -2
  24. package/lib/networkTopo/models/IpNodeTagsTipsBuilder.js +2 -2
  25. package/package.json +2 -2
@@ -12,6 +12,10 @@ var LINE_TYPE_OPTIONS = [{
12
12
  value: 'oposite',
13
13
  label: '内向双向箭头',
14
14
  icon: 'topo_linear_icon_narrow_straightline'
15
+ }, {
16
+ value: 'v.h',
17
+ label: '折线',
18
+ icon: 'topo_linear_icon_horizontal_foldline'
15
19
  }, {
16
20
  value: 'h.v',
17
21
  label: '折线',
@@ -48,8 +48,7 @@ var TopoIconSelect = function TopoIconSelect(props, ref) {
48
48
  });
49
49
 
50
50
  var handleChange = function handleChange(v) {
51
- console.log('handleChange: ', v);
52
-
51
+ // console.log('handleChange: ', v);
53
52
  if (typeof onChange === 'function') {
54
53
  onChange(v.id);
55
54
  }
@@ -47,8 +47,7 @@ var TopoIconSelect = function TopoIconSelect(props, ref) {
47
47
  });
48
48
 
49
49
  var handleChange = function handleChange(v) {
50
- console.log('handleChange: ', v);
51
-
50
+ // console.log('handleChange: ', v);
52
51
  if (typeof onChange === 'function') {
53
52
  onChange(v.id);
54
53
  }
@@ -47,12 +47,12 @@ function NodeImageButton(props) {
47
47
  }, [selection]);
48
48
 
49
49
  var onChange = function onChange(prop) {
50
- console.log("onChange-prop", prop, selection); //const { name, value } = prop;
50
+ // console.log("onChange-prop", prop, selection);
51
+ //const { name, value } = prop;
51
52
  // const gv = topo.view.topoClient.getGraphView();
52
53
  //const element = topo.getSelectionModel().getFirstData();
54
+ var elements = selection; // console.log("onChange-elements", elements);
53
55
 
54
- var elements = selection;
55
- console.log("onChange-elements", elements);
56
56
  elements.forEach(function (element) {
57
57
  if (isElementSetImageEnabled(element)) {
58
58
  element.setImage(prop);
@@ -979,16 +979,14 @@ var useTopoEdit = function useTopoEdit(params) {
979
979
  while (1) {
980
980
  switch (_context16.prev = _context16.next) {
981
981
  case 0:
982
- console.log("bindIPtoNode", txtValue, nodeElement);
983
-
984
982
  if (txtValue) {
985
- _context16.next = 3;
983
+ _context16.next = 2;
986
984
  break;
987
985
  }
988
986
 
989
987
  return _context16.abrupt("return");
990
988
 
991
- case 3:
989
+ case 2:
992
990
  // if (txtValue === nodeElement.a('bindIp')) {
993
991
  // return;
994
992
  // }
@@ -998,28 +996,28 @@ var useTopoEdit = function useTopoEdit(params) {
998
996
  isUnique = isUniqueIp(dm, txtValue, nodeElement); // 获取关联链路
999
997
 
1000
998
  if (!isUnique) {
1001
- _context16.next = 25;
999
+ _context16.next = 23;
1002
1000
  break;
1003
1001
  }
1004
1002
 
1005
1003
  ip = buildIpNode(txtValue);
1006
- _context16.next = 9;
1004
+ _context16.next = 8;
1007
1005
  return deleteExLink(nodeElement);
1008
1006
 
1009
- case 9:
1007
+ case 8:
1010
1008
  nodeElement.a(ip);
1011
1009
  nodeElement.setName(txtValue);
1012
1010
  nodeElement.setTag("ip:" + txtValue); // 获取配置
1013
1011
 
1014
1012
  configObj = topo.resourceConfig.getConfig();
1015
- _context16.next = 15;
1013
+ _context16.next = 14;
1016
1014
  return resourceConfig.updateConfig(configObj);
1017
1015
 
1018
- case 15:
1019
- _context16.next = 17;
1016
+ case 14:
1017
+ _context16.next = 16;
1020
1018
  return editDispatchers.fetchDataByConfig();
1021
1019
 
1022
- case 17:
1020
+ case 16:
1023
1021
  configData = _context16.sent;
1024
1022
  // console.log("configData",configObj, configData);
1025
1023
  _elements = configData.elements;
@@ -1038,8 +1036,7 @@ var useTopoEdit = function useTopoEdit(params) {
1038
1036
  nodes: [],
1039
1037
  links: newLink,
1040
1038
  linkGroups: newLinkGroup
1041
- };
1042
- console.log("createElementsData", createElementsData);
1039
+ }; // console.log("createElementsData", createElementsData);
1043
1040
 
1044
1041
  if ([].concat(newLink, newLinkGroup).length > 0) {
1045
1042
  _htTopo = topo.getHtTopo();
@@ -1047,7 +1044,7 @@ var useTopoEdit = function useTopoEdit(params) {
1047
1044
  _htTopo.createElements(createElementsData);
1048
1045
  }
1049
1046
 
1050
- case 25:
1047
+ case 23:
1051
1048
  case "end":
1052
1049
  return _context16.stop();
1053
1050
  }
@@ -165,8 +165,8 @@ var Alarm = /*#__PURE__*/function () {
165
165
  return a.obj.createTime - b.obj.createTime;
166
166
  }).sort(function (a, b) {
167
167
  return a.level > b.level ? 1 : -1;
168
- });
169
- console.log("getAlarms-sb", alarms);
168
+ }); // console.log("getAlarms-sb", alarms);
169
+
170
170
  return alarms;
171
171
  };
172
172
 
@@ -543,7 +543,7 @@ var Alarm = /*#__PURE__*/function () {
543
543
  // console.log("handleAlarmEvent-接收到推送的原始告警信息", alertData);
544
544
 
545
545
  if (!(isAvailableArray(alertData) && isAvailableArray(resIdsList))) {
546
- _context9.next = 27;
546
+ _context9.next = 24;
547
547
  break;
548
548
  }
549
549
 
@@ -575,28 +575,27 @@ var Alarm = /*#__PURE__*/function () {
575
575
  }
576
576
 
577
577
  return obj;
578
- });
579
- console.log("before-combAlarmData", sendAl, idsList);
578
+ }); // console.log("before-combAlarmData", sendAl, idsList);
580
579
 
581
580
  if (!(sendAl.length > 0)) {
582
- _context9.next = 27;
581
+ _context9.next = 24;
583
582
  break;
584
583
  }
585
584
 
586
585
  rlog.debug("过滤掉非本拓扑的告警信息 告警开关-推送告警到ht-alarmIsOpened-sendAl", alarmIsOpened, sendAl);
587
- _context9.prev = 13;
588
- _context9.next = 16;
586
+ _context9.prev = 12;
587
+ _context9.next = 15;
589
588
  return alarmDispatchers.combAlarmData({
590
589
  alarmdata: sendAl
591
590
  });
592
591
 
593
- case 16:
592
+ case 15:
594
593
  _yield$alarmDispatche = _context9.sent;
595
594
  eqFlag = _yield$alarmDispatche.eqFlag;
596
595
  alarmlist = _yield$alarmDispatche.alarmlist;
597
- console.log("handleAlarmEvent", alarmIsOpened, eqFlag);
598
- console.log("handleAlarmEvent-topo.viewProps", this.topo.viewProps);
599
596
 
597
+ // console.log("handleAlarmEvent", alarmIsOpened,eqFlag);
598
+ // console.log("handleAlarmEvent-topo.viewProps", this.topo.viewProps);
600
599
  if (alarmIsOpened) {
601
600
  this.hmGetTopoAlarmByDoc(); // 通知所有告警
602
601
 
@@ -611,20 +610,20 @@ var Alarm = /*#__PURE__*/function () {
611
610
  }
612
611
  }
613
612
 
614
- _context9.next = 27;
613
+ _context9.next = 24;
615
614
  break;
616
615
 
617
- case 24:
618
- _context9.prev = 24;
619
- _context9.t0 = _context9["catch"](13);
616
+ case 21:
617
+ _context9.prev = 21;
618
+ _context9.t0 = _context9["catch"](12);
620
619
  rlog.error("告警发送异常", _context9.t0);
621
620
 
622
- case 27:
621
+ case 24:
623
622
  case "end":
624
623
  return _context9.stop();
625
624
  }
626
625
  }
627
- }, _callee9, this, [[13, 24]]);
626
+ }, _callee9, this, [[12, 21]]);
628
627
  }));
629
628
 
630
629
  function handleAlarmEvent(_x7) {
@@ -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 "10.0.35" === 'string' ? "10.0.35" : null;
27
+ var version = typeof "10.0.37" === 'string' ? "10.0.37" : null;
28
28
  console.info("\u62D3\u6251\u7248\u672C: " + version);
29
29
  /**
30
30
  * 拓扑显示和编辑
@@ -252,8 +252,8 @@ export default function (topoApp) {
252
252
  switch (_context2.prev = _context2.next) {
253
253
  case 0:
254
254
  editState = rootState.topoConfig;
255
- resources = editState.resources, _editState$groups = editState.groups, groups = _editState$groups === void 0 ? [] : _editState$groups, _editState$exportLink = editState.exportLinkIdList, exportLinkIdList = _editState$exportLink === void 0 ? [] : _editState$exportLink, _editState$ipNodes = editState.ipNodes, ipNodes = _editState$ipNodes === void 0 ? [] : _editState$ipNodes;
256
- console.log("editState", editState);
255
+ resources = editState.resources, _editState$groups = editState.groups, groups = _editState$groups === void 0 ? [] : _editState$groups, _editState$exportLink = editState.exportLinkIdList, exportLinkIdList = _editState$exportLink === void 0 ? [] : _editState$exportLink, _editState$ipNodes = editState.ipNodes, ipNodes = _editState$ipNodes === void 0 ? [] : _editState$ipNodes; // console.log("editState", editState);
256
+
257
257
  query = {
258
258
  id: rootState.topoMod.topoId,
259
259
  resources: resources,
@@ -261,10 +261,10 @@ export default function (topoApp) {
261
261
  exportLinkIdList: exportLinkIdList,
262
262
  ipNodes: ipNodes
263
263
  };
264
- _context2.next = 6;
264
+ _context2.next = 5;
265
265
  return _this2.getTopoByConditions(query);
266
266
 
267
- case 6:
267
+ case 5:
268
268
  data = _context2.sent;
269
269
  rlog.debug("按配置查询拓扑数据", {
270
270
  config: {
@@ -275,7 +275,7 @@ export default function (topoApp) {
275
275
  });
276
276
  return _context2.abrupt("return", data);
277
277
 
278
- case 9:
278
+ case 8:
279
279
  case "end":
280
280
  return _context2.stop();
281
281
  }
@@ -475,17 +475,16 @@ export default function (topoApp) {
475
475
  while (1) {
476
476
  switch (_context8.prev = _context8.next) {
477
477
  case 0:
478
- ids = data.ids, ip = data.ip;
479
- console.log("queryAllLinkByIp", ids, ip);
480
- _context8.next = 4;
478
+ ids = data.ids, ip = data.ip; // console.log("queryAllLinkByIp", ids, ip);
479
+
480
+ _context8.next = 3;
481
481
  return networkLinkServer.queryLinksByIp(ids, ip);
482
482
 
483
- case 4:
483
+ case 3:
484
484
  result = _context8.sent;
485
- console.log("queryAllLinkByIp-result", result);
486
485
  return _context8.abrupt("return", (_result$data = result === null || result === void 0 ? void 0 : result.data) !== null && _result$data !== void 0 ? _result$data : []);
487
486
 
488
- case 7:
487
+ case 5:
489
488
  case "end":
490
489
  return _context8.stop();
491
490
  }
@@ -172,15 +172,15 @@ export default function ResourceOverview(props) {
172
172
 
173
173
  case 3:
174
174
  power = _context.sent;
175
- console.log(power);
176
175
 
176
+ // console.log(power)
177
177
  if (power.data.length) {
178
178
  window.open("" + window.location.origin + roomLink);
179
179
  } else {
180
180
  _Message.error('无访问权限,请联系管理员');
181
181
  }
182
182
 
183
- case 6:
183
+ case 5:
184
184
  case "end":
185
185
  return _context.stop();
186
186
  }
@@ -28,8 +28,8 @@ var IpNodeTagsTipsBuilder = /*#__PURE__*/function () {
28
28
  });
29
29
  var topo = this.topo;
30
30
  var dm = this.topo.getDataModel();
31
- var config = topo.attributeMetricDisplay.getConfig();
32
- console.log("getIpNodeTagsAndTips", config, ipNodes);
31
+ var config = topo.attributeMetricDisplay.getConfig(); // console.log("getIpNodeTagsAndTips", config, ipNodes);
32
+
33
33
  var tagDatas = config.nodeTag && !config.nodeTag.isCustom ? config.nodeTag.data : [];
34
34
  var tipDatas = config.nodeTip && !config.nodeTip.isCustom ? config.nodeTip.data : [];
35
35
  var tagHasIpv4 = tagDatas.filter(function (item) {
@@ -28,6 +28,10 @@ var LINE_TYPE_OPTIONS = [{
28
28
  value: 'oposite',
29
29
  label: '内向双向箭头',
30
30
  icon: 'topo_linear_icon_narrow_straightline'
31
+ }, {
32
+ value: 'v.h',
33
+ label: '折线',
34
+ icon: 'topo_linear_icon_horizontal_foldline'
31
35
  }, {
32
36
  value: 'h.v',
33
37
  label: '折线',
@@ -62,8 +62,7 @@ var TopoIconSelect = function TopoIconSelect(props, ref) {
62
62
  });
63
63
 
64
64
  var handleChange = function handleChange(v) {
65
- console.log('handleChange: ', v);
66
-
65
+ // console.log('handleChange: ', v);
67
66
  if (typeof onChange === 'function') {
68
67
  onChange(v.id);
69
68
  }
@@ -60,8 +60,7 @@ var TopoIconSelect = function TopoIconSelect(props, ref) {
60
60
  });
61
61
 
62
62
  var handleChange = function handleChange(v) {
63
- console.log('handleChange: ', v);
64
-
63
+ // console.log('handleChange: ', v);
65
64
  if (typeof onChange === 'function') {
66
65
  onChange(v.id);
67
66
  }
@@ -64,12 +64,12 @@ function NodeImageButton(props) {
64
64
  }, [selection]);
65
65
 
66
66
  var onChange = function onChange(prop) {
67
- console.log("onChange-prop", prop, selection); //const { name, value } = prop;
67
+ // console.log("onChange-prop", prop, selection);
68
+ //const { name, value } = prop;
68
69
  // const gv = topo.view.topoClient.getGraphView();
69
70
  //const element = topo.getSelectionModel().getFirstData();
71
+ var elements = selection; // console.log("onChange-elements", elements);
70
72
 
71
- var elements = selection;
72
- console.log("onChange-elements", elements);
73
73
  elements.forEach(function (element) {
74
74
  if (isElementSetImageEnabled(element)) {
75
75
  element.setImage(prop);
@@ -1020,16 +1020,14 @@ var useTopoEdit = function useTopoEdit(params) {
1020
1020
  while (1) {
1021
1021
  switch (_context16.prev = _context16.next) {
1022
1022
  case 0:
1023
- console.log("bindIPtoNode", txtValue, nodeElement);
1024
-
1025
1023
  if (txtValue) {
1026
- _context16.next = 3;
1024
+ _context16.next = 2;
1027
1025
  break;
1028
1026
  }
1029
1027
 
1030
1028
  return _context16.abrupt("return");
1031
1029
 
1032
- case 3:
1030
+ case 2:
1033
1031
  // if (txtValue === nodeElement.a('bindIp')) {
1034
1032
  // return;
1035
1033
  // }
@@ -1039,28 +1037,28 @@ var useTopoEdit = function useTopoEdit(params) {
1039
1037
  isUnique = (0, _exitLinkUtil.isUniqueIp)(dm, txtValue, nodeElement); // 获取关联链路
1040
1038
 
1041
1039
  if (!isUnique) {
1042
- _context16.next = 25;
1040
+ _context16.next = 23;
1043
1041
  break;
1044
1042
  }
1045
1043
 
1046
1044
  ip = (0, _exitLinkUtil.buildIpNode)(txtValue);
1047
- _context16.next = 9;
1045
+ _context16.next = 8;
1048
1046
  return deleteExLink(nodeElement);
1049
1047
 
1050
- case 9:
1048
+ case 8:
1051
1049
  nodeElement.a(ip);
1052
1050
  nodeElement.setName(txtValue);
1053
1051
  nodeElement.setTag("ip:" + txtValue); // 获取配置
1054
1052
 
1055
1053
  configObj = topo.resourceConfig.getConfig();
1056
- _context16.next = 15;
1054
+ _context16.next = 14;
1057
1055
  return resourceConfig.updateConfig(configObj);
1058
1056
 
1059
- case 15:
1060
- _context16.next = 17;
1057
+ case 14:
1058
+ _context16.next = 16;
1061
1059
  return editDispatchers.fetchDataByConfig();
1062
1060
 
1063
- case 17:
1061
+ case 16:
1064
1062
  configData = _context16.sent;
1065
1063
  // console.log("configData",configObj, configData);
1066
1064
  _elements = configData.elements;
@@ -1079,8 +1077,7 @@ var useTopoEdit = function useTopoEdit(params) {
1079
1077
  nodes: [],
1080
1078
  links: newLink,
1081
1079
  linkGroups: newLinkGroup
1082
- };
1083
- console.log("createElementsData", createElementsData);
1080
+ }; // console.log("createElementsData", createElementsData);
1084
1081
 
1085
1082
  if ([].concat(newLink, newLinkGroup).length > 0) {
1086
1083
  _htTopo = topo.getHtTopo();
@@ -1088,7 +1085,7 @@ var useTopoEdit = function useTopoEdit(params) {
1088
1085
  _htTopo.createElements(createElementsData);
1089
1086
  }
1090
1087
 
1091
- case 25:
1088
+ case 23:
1092
1089
  case "end":
1093
1090
  return _context16.stop();
1094
1091
  }
@@ -181,8 +181,8 @@ var Alarm = /*#__PURE__*/function () {
181
181
  return a.obj.createTime - b.obj.createTime;
182
182
  }).sort(function (a, b) {
183
183
  return a.level > b.level ? 1 : -1;
184
- });
185
- console.log("getAlarms-sb", alarms);
184
+ }); // console.log("getAlarms-sb", alarms);
185
+
186
186
  return alarms;
187
187
  };
188
188
 
@@ -565,7 +565,7 @@ var Alarm = /*#__PURE__*/function () {
565
565
  // console.log("handleAlarmEvent-接收到推送的原始告警信息", alertData);
566
566
 
567
567
  if (!((0, _utils.isAvailableArray)(alertData) && (0, _utils.isAvailableArray)(resIdsList))) {
568
- _context9.next = 27;
568
+ _context9.next = 24;
569
569
  break;
570
570
  }
571
571
 
@@ -597,29 +597,28 @@ var Alarm = /*#__PURE__*/function () {
597
597
  }
598
598
 
599
599
  return obj;
600
- });
601
- console.log("before-combAlarmData", sendAl, idsList);
600
+ }); // console.log("before-combAlarmData", sendAl, idsList);
602
601
 
603
602
  if (!(sendAl.length > 0)) {
604
- _context9.next = 27;
603
+ _context9.next = 24;
605
604
  break;
606
605
  }
607
606
 
608
607
  _rlog["default"].debug("过滤掉非本拓扑的告警信息 告警开关-推送告警到ht-alarmIsOpened-sendAl", alarmIsOpened, sendAl);
609
608
 
610
- _context9.prev = 13;
611
- _context9.next = 16;
609
+ _context9.prev = 12;
610
+ _context9.next = 15;
612
611
  return alarmDispatchers.combAlarmData({
613
612
  alarmdata: sendAl
614
613
  });
615
614
 
616
- case 16:
615
+ case 15:
617
616
  _yield$alarmDispatche = _context9.sent;
618
617
  eqFlag = _yield$alarmDispatche.eqFlag;
619
618
  alarmlist = _yield$alarmDispatche.alarmlist;
620
- console.log("handleAlarmEvent", alarmIsOpened, eqFlag);
621
- console.log("handleAlarmEvent-topo.viewProps", this.topo.viewProps);
622
619
 
620
+ // console.log("handleAlarmEvent", alarmIsOpened,eqFlag);
621
+ // console.log("handleAlarmEvent-topo.viewProps", this.topo.viewProps);
623
622
  if (alarmIsOpened) {
624
623
  this.hmGetTopoAlarmByDoc(); // 通知所有告警
625
624
 
@@ -634,21 +633,21 @@ var Alarm = /*#__PURE__*/function () {
634
633
  }
635
634
  }
636
635
 
637
- _context9.next = 27;
636
+ _context9.next = 24;
638
637
  break;
639
638
 
640
- case 24:
641
- _context9.prev = 24;
642
- _context9.t0 = _context9["catch"](13);
639
+ case 21:
640
+ _context9.prev = 21;
641
+ _context9.t0 = _context9["catch"](12);
643
642
 
644
643
  _rlog["default"].error("告警发送异常", _context9.t0);
645
644
 
646
- case 27:
645
+ case 24:
647
646
  case "end":
648
647
  return _context9.stop();
649
648
  }
650
649
  }
651
- }, _callee9, this, [[13, 24]]);
650
+ }, _callee9, this, [[12, 21]]);
652
651
  }));
653
652
 
654
653
  function handleAlarmEvent(_x7) {
@@ -56,7 +56,7 @@ var _SelectionModel = _interopRequireDefault(require("./SelectionModel"));
56
56
  var _CiCache = _interopRequireDefault(require("./cache/CiCache"));
57
57
 
58
58
  // eslint-disable-next-line no-undef
59
- var version = typeof "10.0.35" === 'string' ? "10.0.35" : null;
59
+ var version = typeof "10.0.37" === 'string' ? "10.0.37" : null;
60
60
  console.info("\u62D3\u6251\u7248\u672C: " + version);
61
61
  /**
62
62
  * 拓扑显示和编辑
@@ -273,8 +273,8 @@ function _default(topoApp) {
273
273
  switch (_context2.prev = _context2.next) {
274
274
  case 0:
275
275
  editState = rootState.topoConfig;
276
- resources = editState.resources, _editState$groups = editState.groups, groups = _editState$groups === void 0 ? [] : _editState$groups, _editState$exportLink = editState.exportLinkIdList, exportLinkIdList = _editState$exportLink === void 0 ? [] : _editState$exportLink, _editState$ipNodes = editState.ipNodes, ipNodes = _editState$ipNodes === void 0 ? [] : _editState$ipNodes;
277
- console.log("editState", editState);
276
+ resources = editState.resources, _editState$groups = editState.groups, groups = _editState$groups === void 0 ? [] : _editState$groups, _editState$exportLink = editState.exportLinkIdList, exportLinkIdList = _editState$exportLink === void 0 ? [] : _editState$exportLink, _editState$ipNodes = editState.ipNodes, ipNodes = _editState$ipNodes === void 0 ? [] : _editState$ipNodes; // console.log("editState", editState);
277
+
278
278
  query = {
279
279
  id: rootState.topoMod.topoId,
280
280
  resources: resources,
@@ -282,10 +282,10 @@ function _default(topoApp) {
282
282
  exportLinkIdList: exportLinkIdList,
283
283
  ipNodes: ipNodes
284
284
  };
285
- _context2.next = 6;
285
+ _context2.next = 5;
286
286
  return _this2.getTopoByConditions(query);
287
287
 
288
- case 6:
288
+ case 5:
289
289
  data = _context2.sent;
290
290
 
291
291
  _rlog["default"].debug("按配置查询拓扑数据", {
@@ -298,7 +298,7 @@ function _default(topoApp) {
298
298
 
299
299
  return _context2.abrupt("return", data);
300
300
 
301
- case 9:
301
+ case 8:
302
302
  case "end":
303
303
  return _context2.stop();
304
304
  }
@@ -505,17 +505,16 @@ function _default(topoApp) {
505
505
  while (1) {
506
506
  switch (_context8.prev = _context8.next) {
507
507
  case 0:
508
- ids = data.ids, ip = data.ip;
509
- console.log("queryAllLinkByIp", ids, ip);
510
- _context8.next = 4;
508
+ ids = data.ids, ip = data.ip; // console.log("queryAllLinkByIp", ids, ip);
509
+
510
+ _context8.next = 3;
511
511
  return _networkLink["default"].queryLinksByIp(ids, ip);
512
512
 
513
- case 4:
513
+ case 3:
514
514
  result = _context8.sent;
515
- console.log("queryAllLinkByIp-result", result);
516
515
  return _context8.abrupt("return", (_result$data = result === null || result === void 0 ? void 0 : result.data) !== null && _result$data !== void 0 ? _result$data : []);
517
516
 
518
- case 7:
517
+ case 5:
519
518
  case "end":
520
519
  return _context8.stop();
521
520
  }
@@ -206,15 +206,15 @@ function ResourceOverview(props) {
206
206
 
207
207
  case 3:
208
208
  power = _context.sent;
209
- console.log(power);
210
209
 
210
+ // console.log(power)
211
211
  if (power.data.length) {
212
212
  window.open("" + window.location.origin + roomLink);
213
213
  } else {
214
214
  _message["default"].error('无访问权限,请联系管理员');
215
215
  }
216
216
 
217
- case 6:
217
+ case 5:
218
218
  case "end":
219
219
  return _context.stop();
220
220
  }
@@ -37,8 +37,8 @@ var IpNodeTagsTipsBuilder = /*#__PURE__*/function () {
37
37
  });
38
38
  var topo = this.topo;
39
39
  var dm = this.topo.getDataModel();
40
- var config = topo.attributeMetricDisplay.getConfig();
41
- console.log("getIpNodeTagsAndTips", config, ipNodes);
40
+ var config = topo.attributeMetricDisplay.getConfig(); // console.log("getIpNodeTagsAndTips", config, ipNodes);
41
+
42
42
  var tagDatas = config.nodeTag && !config.nodeTag.isCustom ? config.nodeTag.data : [];
43
43
  var tipDatas = config.nodeTip && !config.nodeTip.isCustom ? config.nodeTip.data : [];
44
44
  var tagHasIpv4 = tagDatas.filter(function (item) {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@riil-frontend/component-topology",
3
- "version": "10.0.35",
3
+ "version": "10.0.37",
4
4
  "description": "拓扑",
5
5
  "scripts": {
6
6
  "start": "build-scripts start",
@@ -116,6 +116,6 @@
116
116
  "access": "public"
117
117
  },
118
118
  "license": "MIT",
119
- "homepage": "https://unpkg.com/@riil-frontend/component-topology@10.0.35/build/index.html",
119
+ "homepage": "https://unpkg.com/@riil-frontend/component-topology@10.0.37/build/index.html",
120
120
  "gitHead": "2da19ffccbb7ca60a8acf396e39f542c68bb33f5"
121
121
  }