@riil-frontend/component-topology 5.0.5 → 5.0.6

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 (52) hide show
  1. package/build/index.js +8 -8
  2. package/es/components/BatchAttrMetric/setting.js +2 -2
  3. package/es/core/components/DisplaySettingDrawer/demo/Demo.js +2 -4
  4. package/es/core/components/DisplaySettingDrawer/hooks/useDisplaySetting.js +5 -5
  5. package/es/core/editor/components/BackgroundView/index.js +2 -2
  6. package/es/core/editor/components/settings/Settings.js +10 -12
  7. package/es/core/editor/components/settings/common/AlignSetting/index.js +1 -1
  8. package/es/core/editor/components/settings/common/LineType/index.js +1 -1
  9. package/es/core/editor/components/settings/propertyViews/layer/SettingTab/Setting_bak.js +1 -1
  10. package/es/core/editor/components/settings/propertyViews/multipleElements/MultipleElementPropertyView.js +1 -1
  11. package/es/core/editor/components/settings/propertyViews/view/GlobalLayout.js +1 -1
  12. package/es/core/hooks/useTopoEdit.js +6 -6
  13. package/es/core/models/Alarm.js +14 -15
  14. package/es/core/models/TopoApp.js +1 -1
  15. package/es/core/store/models/topoBaseInfoOverview.js +1 -1
  16. package/es/core/viewer/components/plugins/ResourceDetail/ResourceDetailDrawer.js +3 -3
  17. package/es/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/ResourceOverview.js +34 -33
  18. package/es/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/components/LinkTopo/hooks/useMetricPolling.js +6 -5
  19. package/es/networkTopo/components/editor/propertyViews/edge/LinkPropertyView/LinkPropertyView.js +1 -2
  20. package/es/networkTopo/components/editor/propertyViews/edge/addLinkDrawer/AddLinkDrawer.js +9 -11
  21. package/es/networkTopo/components/editor/propertyViews/edge/addLinkDrawer/components/editLinkInfo.js +1 -2
  22. package/es/networkTopo/components/editor/propertyViews/edge/addLinkDrawer/server.js +10 -10
  23. package/es/networkTopo/components/editor/propertyViews/edge/link/BindExitLinkSelect.js +15 -4
  24. package/es/networkTopo/models/LinkDynamicStyleExecutor.js +1 -1
  25. package/es/networkTopo/services/link.js +10 -10
  26. package/es/utils/topoData.js +2 -2
  27. package/lib/components/BatchAttrMetric/setting.js +2 -2
  28. package/lib/core/components/DisplaySettingDrawer/demo/Demo.js +2 -4
  29. package/lib/core/components/DisplaySettingDrawer/hooks/useDisplaySetting.js +5 -5
  30. package/lib/core/editor/components/BackgroundView/index.js +2 -2
  31. package/lib/core/editor/components/settings/Settings.js +10 -12
  32. package/lib/core/editor/components/settings/common/AlignSetting/index.js +1 -1
  33. package/lib/core/editor/components/settings/common/LineType/index.js +1 -1
  34. package/lib/core/editor/components/settings/propertyViews/layer/SettingTab/Setting_bak.js +1 -1
  35. package/lib/core/editor/components/settings/propertyViews/multipleElements/MultipleElementPropertyView.js +1 -1
  36. package/lib/core/editor/components/settings/propertyViews/view/GlobalLayout.js +1 -1
  37. package/lib/core/hooks/useTopoEdit.js +6 -6
  38. package/lib/core/models/Alarm.js +14 -15
  39. package/lib/core/models/TopoApp.js +1 -1
  40. package/lib/core/store/models/topoBaseInfoOverview.js +1 -1
  41. package/lib/core/viewer/components/plugins/ResourceDetail/ResourceDetailDrawer.js +3 -3
  42. package/lib/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/ResourceOverview.js +37 -32
  43. package/lib/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/components/LinkTopo/hooks/useMetricPolling.js +10 -4
  44. package/lib/networkTopo/components/editor/propertyViews/edge/LinkPropertyView/LinkPropertyView.js +1 -2
  45. package/lib/networkTopo/components/editor/propertyViews/edge/addLinkDrawer/AddLinkDrawer.js +9 -11
  46. package/lib/networkTopo/components/editor/propertyViews/edge/addLinkDrawer/components/editLinkInfo.js +1 -2
  47. package/lib/networkTopo/components/editor/propertyViews/edge/addLinkDrawer/server.js +10 -10
  48. package/lib/networkTopo/components/editor/propertyViews/edge/link/BindExitLinkSelect.js +14 -4
  49. package/lib/networkTopo/models/LinkDynamicStyleExecutor.js +1 -1
  50. package/lib/networkTopo/services/link.js +10 -10
  51. package/lib/utils/topoData.js +2 -2
  52. package/package.json +2 -2
@@ -92,7 +92,7 @@ var Setting = function Setting(_ref) {
92
92
  var tableData = useMemo(function () {
93
93
  var _allCiSet$ciType;
94
94
 
95
- console.log('allCiSet,ciType,search', allCiSet, ciType, search);
95
+ // console.log('allCiSet,ciType,search', allCiSet, ciType, search);
96
96
  var list = ((_allCiSet$ciType = allCiSet[ciType]) === null || _allCiSet$ciType === void 0 ? void 0 : _allCiSet$ciType.list) || [];
97
97
 
98
98
  if (search) {
@@ -107,7 +107,7 @@ var Setting = function Setting(_ref) {
107
107
  }, [allCiSet, ciType, search]);
108
108
 
109
109
  function onSearch(value) {
110
- console.log('search', search);
110
+ // console.log('search', search);
111
111
  setSearch(value);
112
112
  }
113
113
 
@@ -51,11 +51,9 @@ export default function Demo() {
51
51
  ,
52
52
  limit: 3 // 单个模板最大可选择选项数量
53
53
  ,
54
- onChange: function onChange(value) {
55
- console.log('onChange');
54
+ onChange: function onChange(value) {// console.log('onChange');
56
55
  },
57
- onCancel: function onCancel() {
58
- console.log('onCancel');
56
+ onCancel: function onCancel() {// console.log('onCancel');
59
57
  },
60
58
  showType: "tip" // 数据类型。
61
59
 
@@ -36,19 +36,19 @@ export default (function (props) {
36
36
  while (1) {
37
37
  switch (_context2.prev = _context2.next) {
38
38
  case 0:
39
- values = settingRef.current.getValues();
40
- console.info('保存显示配置', values); // 保存配置
39
+ values = settingRef.current.getValues(); // console.info('保存显示配置', values)
40
+ // 保存配置
41
41
 
42
42
  prevDisplayConfig = topo.store.getModelState('displayConfig');
43
43
  displayConfig = _extends({}, prevDisplayConfig, values);
44
- _context2.next = 6;
44
+ _context2.next = 5;
45
45
  return topoService.saveTopoSettings(topo.id, {
46
46
  alarmSwitch: displayConfig.alarmSwitch,
47
47
  alarmListDefaultOpen: displayConfig.alarmListDefaultOpen,
48
48
  extraConfig: JSON.stringify(_extends({}, displayConfig))
49
49
  });
50
50
 
51
- case 6:
51
+ case 5:
52
52
  // 刷新指标配置
53
53
  displayConfigDispatchers = topo.store.getModelDispatchers('displayConfig');
54
54
  displayConfigDispatchers.update(displayConfig); // 按配置执行
@@ -60,7 +60,7 @@ export default (function (props) {
60
60
  extraOnOk(displayConfig);
61
61
  }
62
62
 
63
- case 11:
63
+ case 10:
64
64
  case "end":
65
65
  return _context2.stop();
66
66
  }
@@ -38,8 +38,8 @@ function List(props) {
38
38
 
39
39
  case 3:
40
40
  canDelete = _context.sent;
41
- console.log('canDelete', canDelete);
42
41
 
42
+ // console.log('canDelete', canDelete);
43
43
  if (canDelete) {
44
44
  _Dialog.confirm({
45
45
  title: '删除',
@@ -63,7 +63,7 @@ function List(props) {
63
63
  });
64
64
  }
65
65
 
66
- case 6:
66
+ case 5:
67
67
  case "end":
68
68
  return _context.stop();
69
69
  }
@@ -52,13 +52,7 @@ export default function Settings(props) {
52
52
  var updateElementProperty = function updateElementProperty(name, value) {
53
53
  // const element = topo.getDataModel().getDataById(selection[0].id);
54
54
  var gv = topo.view.topoClient.getGraphView();
55
- var element = topo.getSelectionModel().getFirstData();
56
- console.info("updateElementProperty", topo.getSelectionModel().getSelection(), {
57
- selection: selection,
58
- element: element,
59
- name: name,
60
- value: value
61
- });
55
+ var element = topo.getSelectionModel().getFirstData(); // console.info("updateElementProperty",topo.getSelectionModel().getSelection(), { selection, element, name, value });
62
56
 
63
57
  if (name.startsWith("attrObject.")) {
64
58
  element.setAttr(name.replace("attrObject.", ""), value);
@@ -75,9 +69,13 @@ export default function Settings(props) {
75
69
  } else if (name === "image") {
76
70
  element.setImage(value);
77
71
  } else if (name === "layout") {
78
- console.info("element----layout", element, value);
79
- var layouType = value.id === "toward" ? "" + value.id + value.options.subId : value.id;
80
- console.info("element----layout", topo.view.topoClient.htTopoClient, layouType);
72
+ // console.info("element----layout", element, value);
73
+ var layouType = value.id === "toward" ? "" + value.id + value.options.subId : value.id; // console.info(
74
+ // "element----layout",
75
+ // topo.view.topoClient.htTopoClient,
76
+ // layouType
77
+ // );
78
+
81
79
  topo.getHtTopo().layoutInContainer(layouType); // let autoLayout = new ht.layout.AutoLayout(gv);
82
80
  // const layouType=value.id==='toward'?`${value.id}${value.options.subId}`:value.id;
83
81
  // gv.dm().sm().ss(element.getChildren());
@@ -103,9 +101,9 @@ export default function Settings(props) {
103
101
  }
104
102
  } else {
105
103
  selectList = topo.getSelectionModel().getSelection().toArray();
106
- }
104
+ } // console.info("element--selectList", element, selectList);
105
+
107
106
 
108
- console.info("element--selectList", element, selectList);
109
107
  topo.view.topoClient.htTopoClient.setAlignmentBySelectionNodes(value, selectList);
110
108
  }
111
109
  };
@@ -49,7 +49,7 @@ var AlignSetting = function AlignSetting(props) {
49
49
  setValue = _useState[1];
50
50
 
51
51
  var handleChange = function handleChange(data) {
52
- console.log("handleChange", data);
52
+ // console.log("handleChange", data);
53
53
  onChange && onChange(data.value);
54
54
  setValue(data.value); // setValue(data)
55
55
  };
@@ -87,7 +87,7 @@ var LineType = function LineType(props) {
87
87
  };
88
88
 
89
89
  var handleChange = function handleChange(data) {
90
- console.log("handleChange", data);
90
+ // console.log("handleChange", data);
91
91
  topo.historyManager.beginTransaction();
92
92
 
93
93
  if (onChange) {
@@ -108,7 +108,7 @@ export default function Setting(props) {
108
108
  }, [values]);
109
109
 
110
110
  var alignOnChange = function alignOnChange(v) {
111
- console.log("setAlignmentBySelectionNodes", v);
111
+ // console.log("setAlignmentBySelectionNodes", v);
112
112
  topo.view.topoClient.htTopoClient.setAlignmentBySelectionNodes(v);
113
113
 
114
114
  _onChange("groupAlign", v); // topoEditApi.setAlignmentBySelectionNodes(v);
@@ -37,7 +37,7 @@ export default function MultipleElementPropertyView(props) {
37
37
  }, [values]);
38
38
 
39
39
  var alignOnChange = function alignOnChange(v) {
40
- console.log('setAlignmentBySelectionNodes', v);
40
+ // console.log('setAlignmentBySelectionNodes', v);
41
41
  topo.historyManager.beginTransaction();
42
42
  topo.getHtTopo().setAlignmentBySelectionNodes(v);
43
43
 
@@ -12,7 +12,7 @@ export default function GlobalLayout(props) {
12
12
  setLayout = _useState[1];
13
13
 
14
14
  var onChange = function onChange(data) {
15
- console.log("handleChange", data);
15
+ // console.log("handleChange", data);
16
16
  topo.historyManager.beginTransaction();
17
17
  setLayout(data);
18
18
  var layouType = data.id === "toward" ? "" + data.id + data.options.subId : data.id;
@@ -564,17 +564,17 @@ var useTopoEdit = function useTopoEdit(params) {
564
564
  while (1) {
565
565
  switch (_context14.prev = _context14.next) {
566
566
  case 0:
567
- console.log("关联视图的资源", data);
567
+ // console.log("关联视图的资源", data);
568
568
  config = resourceConfig.getConfig();
569
569
  config.resources = data;
570
- _context14.next = 5;
570
+ _context14.next = 4;
571
571
  return resourceConfig.updateConfig(config);
572
572
 
573
- case 5:
574
- _context14.next = 7;
573
+ case 4:
574
+ _context14.next = 6;
575
575
  return editDispatchers.fetchDataByConfig();
576
576
 
577
- case 7:
577
+ case 6:
578
578
  _yield$editDispatcher3 = _context14.sent;
579
579
  elements = _yield$editDispatcher3.elements;
580
580
  saveBind(TopoEvent.DATA_TYPE_RESOURCE_COMBO, elements); // 临时放这里,仅拓扑中心有
@@ -583,7 +583,7 @@ var useTopoEdit = function useTopoEdit(params) {
583
583
  topo.linkDynamicStyleExecutor.execute();
584
584
  }
585
585
 
586
- case 11:
586
+ case 10:
587
587
  case "end":
588
588
  return _context14.stop();
589
589
  }
@@ -356,13 +356,13 @@ var Alarm = /*#__PURE__*/function () {
356
356
  while (1) {
357
357
  switch (_context5.prev = _context5.next) {
358
358
  case 0:
359
- console.log("switchAlarmPopPanel", flag);
359
+ // console.log("switchAlarmPopPanel", flag);
360
360
  topoDispatchers = this.topo.store.getModelDispatchers("topoAlarm");
361
361
  topoDispatchers.update({
362
362
  alarmPanelIsOpen: flag
363
363
  });
364
364
 
365
- case 3:
365
+ case 2:
366
366
  case "end":
367
367
  return _context5.stop();
368
368
  }
@@ -560,11 +560,10 @@ var Alarm = /*#__PURE__*/function () {
560
560
  resAndMetrics = this.topo.store.getState().topoMod.resAndMetrics;
561
561
  resIdsList = resAndMetrics.resIdsList, nodeIdsList = resAndMetrics.nodeIdsList, linkIdsList = resAndMetrics.linkIdsList;
562
562
  alarmDispatchers = this.topo.store.getModelDispatchers("topoAlarm"); // 添加事件
563
-
564
- console.log("handleAlarmEvent-接收到推送的原始告警信息", alertData);
563
+ // console.log("handleAlarmEvent-接收到推送的原始告警信息", alertData);
565
564
 
566
565
  if (!(isAvailableArray(alertData) && isAvailableArray(resIdsList))) {
567
- _context9.next = 25;
566
+ _context9.next = 24;
568
567
  break;
569
568
  }
570
569
 
@@ -599,18 +598,18 @@ var Alarm = /*#__PURE__*/function () {
599
598
  }); // rlog.debug("before-combAlarmData", al, bizState);
600
599
 
601
600
  if (!(sendAl.length > 0)) {
602
- _context9.next = 25;
601
+ _context9.next = 24;
603
602
  break;
604
603
  }
605
604
 
606
605
  rlog.debug("过滤掉非本拓扑的告警信息 告警开关-推送告警到ht-alarmIsOpened-sendAl", alarmIsOpened, sendAl);
607
- _context9.prev = 13;
608
- _context9.next = 16;
606
+ _context9.prev = 12;
607
+ _context9.next = 15;
609
608
  return alarmDispatchers.combAlarmData({
610
609
  alarmdata: sendAl
611
610
  });
612
611
 
613
- case 16:
612
+ case 15:
614
613
  _yield$alarmDispatche = _context9.sent;
615
614
  eqFlag = _yield$alarmDispatche.eqFlag;
616
615
  alarmlist = _yield$alarmDispatche.alarmlist;
@@ -629,20 +628,20 @@ var Alarm = /*#__PURE__*/function () {
629
628
  }
630
629
  }
631
630
 
632
- _context9.next = 25;
631
+ _context9.next = 24;
633
632
  break;
634
633
 
635
- case 22:
636
- _context9.prev = 22;
637
- _context9.t0 = _context9["catch"](13);
634
+ case 21:
635
+ _context9.prev = 21;
636
+ _context9.t0 = _context9["catch"](12);
638
637
  rlog.error("告警发送异常", _context9.t0);
639
638
 
640
- case 25:
639
+ case 24:
641
640
  case "end":
642
641
  return _context9.stop();
643
642
  }
644
643
  }
645
- }, _callee9, this, [[13, 22]]);
644
+ }, _callee9, this, [[12, 21]]);
646
645
  }));
647
646
 
648
647
  function handleAlarmEvent(_x7) {
@@ -21,7 +21,7 @@ import PluginManager from "./PluginManager";
21
21
  import topoFactory from "./topoFactory";
22
22
  import ElementTagTipConfig from "./tagstips/ElementTagTipConfig"; // eslint-disable-next-line no-undef
23
23
 
24
- var version = typeof "5.0.5" === 'string' ? "5.0.5" : null;
24
+ var version = typeof "5.0.6" === 'string' ? "5.0.6" : null;
25
25
  console.info("\u62D3\u6251\u7248\u672C: " + version);
26
26
  /**
27
27
  * 拓扑显示和编辑
@@ -18,7 +18,7 @@ export default {
18
18
  // 定义改变该模型状态的纯函数
19
19
  reducers: {
20
20
  update: function update(prevState, payload) {
21
- console.log('payload', payload);
21
+ // console.log('payload', payload);
22
22
  return _extends({}, prevState, payload);
23
23
  }
24
24
  },
@@ -80,8 +80,8 @@ function ResourceDetailDrawer(props) {
80
80
  switch (_context2.prev = _context2.next) {
81
81
  case 0:
82
82
  setUserId(function (prev) {
83
- console.log('获取用户id', prev); // 如果已经获取过,就不再重新获取
84
-
83
+ // console.log('获取用户id', prev);
84
+ // 如果已经获取过,就不再重新获取
85
85
  if (!prev) {
86
86
  _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
87
87
  var res;
@@ -142,7 +142,7 @@ function ResourceDetailDrawer(props) {
142
142
  }
143
143
 
144
144
  function init(data, targetType) {
145
- console.log('初始化基本信息', data, targetType);
145
+ // console.log('初始化基本信息', data, targetType);
146
146
  var id = data.id,
147
147
  name = data.name,
148
148
  type = data.type,
@@ -27,7 +27,8 @@ import ResourceOverviewMetric from "./ResourceOverviewMetric";
27
27
  import useCiAttrAndMetricData from "./useCiAttrAndMetricData";
28
28
  import Configurator from "./components/Configurator";
29
29
  import { formatMetric } from "../../../../../../models/attributeFormatter";
30
- import LinkTopoCard from "./components/LinkTopo/LinkTopoCard"; // url 处理,UICBB 的地址需截取前缀
30
+ import LinkTopoCard from "./components/LinkTopo/LinkTopoCard";
31
+ import { rlog } from '@riil-frontend/component-topology-utils/lib/rlog'; // url 处理,UICBB 的地址需截取前缀
31
32
 
32
33
  function formatUrl(url) {
33
34
  var _window, _window$location;
@@ -164,8 +165,8 @@ export default function ResourceOverview(props) {
164
165
 
165
166
 
166
167
  var baseInfoCol = useMemo(function () {
167
- var col = [];
168
- console.log('baseInfoCol', ciTypeMeta, props);
168
+ var col = []; // console.log('baseInfoCol', ciTypeMeta, props);
169
+
169
170
  if (type === 'node') col.push({
170
171
  title: '图片名称',
171
172
  dataIndex: 'imageName'
@@ -205,7 +206,7 @@ export default function ResourceOverview(props) {
205
206
  }, [id, ciTypeMeta, type, isDevice]); // 指标可选项
206
207
 
207
208
  var metricCol = useMemo(function () {
208
- console.log('monitorMetricModels', monitorMetricModels);
209
+ // console.log('monitorMetricModels', monitorMetricModels);
209
210
  return (monitorMetricModels === null || monitorMetricModels === void 0 ? void 0 : monitorMetricModels.map(function (item) {
210
211
  return {
211
212
  title: item.name,
@@ -550,15 +551,15 @@ export default function ResourceOverview(props) {
550
551
 
551
552
  case 7:
552
553
  attributeMap = _context5.sent;
553
- console.log('getAttribute', attributeMap);
554
+ // console.log('getAttribute', attributeMap);
554
555
  col = col.filter(function (item) {
555
556
  return !item.hidden;
556
557
  });
557
558
  _iterator = _createForOfIteratorHelperLoose(col);
558
559
 
559
- case 11:
560
+ case 10:
560
561
  if ((_step = _iterator()).done) {
561
- _context5.next = 48;
562
+ _context5.next = 47;
562
563
  break;
563
564
  }
564
565
 
@@ -566,10 +567,10 @@ export default function ResourceOverview(props) {
566
567
  value = formatMetric(attributeMap[item.dataIndex], ciTypeMeta.attributeMap[item.dataIndex]);
567
568
  contentTitle = value;
568
569
  _context5.t0 = item.dataIndex;
569
- _context5.next = _context5.t0 === 'display_name' ? 18 : _context5.t0 === 'ciName' ? 22 : _context5.t0 === 'res_address' ? 25 : _context5.t0 === 'imageName' ? 32 : 36;
570
+ _context5.next = _context5.t0 === 'display_name' ? 17 : _context5.t0 === 'ciName' ? 21 : _context5.t0 === 'res_address' ? 24 : _context5.t0 === 'imageName' ? 31 : 35;
570
571
  break;
571
572
 
572
- case 18:
573
+ case 17:
573
574
  link = "/default/pagecenter/resDetail/view/" + id + "?resId=" + id + "&domainCode=" + ciTypeMeta.domain + "&title=" + attributeMap.display_name + "&ciCode=" + ciType; // 资源跳转链接
574
575
 
575
576
  value = /*#__PURE__*/React.createElement("span", {
@@ -580,18 +581,18 @@ export default function ResourceOverview(props) {
580
581
  to: formatUrl(link)
581
582
  }, attributeMap.display_name || '-'));
582
583
  contentTitle = attributeMap.display_name || '-';
583
- return _context5.abrupt("break", 37);
584
+ return _context5.abrupt("break", 36);
584
585
 
585
- case 22:
586
+ case 21:
586
587
  value = ciTypeMeta.displayName;
587
588
  contentTitle = value;
588
- return _context5.abrupt("break", 37);
589
+ return _context5.abrupt("break", 36);
589
590
 
590
- case 25:
591
- _context5.next = 27;
591
+ case 24:
592
+ _context5.next = 26;
592
593
  return getAddressFormat(attributeMap);
593
594
 
594
- case 27:
595
+ case 26:
595
596
  address = _context5.sent;
596
597
  owned_computer_room = attributeMap.owned_computer_room, owned_cabinet = attributeMap.owned_cabinet; // 跳转3D机房定位设备
597
598
 
@@ -611,18 +612,18 @@ export default function ResourceOverview(props) {
611
612
  }
612
613
 
613
614
  contentTitle = address;
614
- return _context5.abrupt("break", 37);
615
+ return _context5.abrupt("break", 36);
615
616
 
616
- case 32:
617
+ case 31:
617
618
  node = topo.getDataModel().getDataByTag(id);
618
619
  value = (node === null || node === void 0 ? void 0 : node.a('customName')) || (node === null || node === void 0 ? void 0 : node.a('name')) || '-';
619
620
  contentTitle = value;
620
- return _context5.abrupt("break", 37);
621
+ return _context5.abrupt("break", 36);
621
622
 
622
- case 36:
623
- return _context5.abrupt("break", 37);
623
+ case 35:
624
+ return _context5.abrupt("break", 36);
624
625
 
625
- case 37:
626
+ case 36:
626
627
  // 拿翻译字段属性数据
627
628
  if (attributeMap[item.dataIndex] && attributeMap[item.dataIndex + ".name"]) {
628
629
  value = attributeMap[item.dataIndex + ".name"];
@@ -658,15 +659,15 @@ export default function ResourceOverview(props) {
658
659
  contentTitle: contentTitle
659
660
  }));
660
661
 
661
- case 46:
662
- _context5.next = 11;
662
+ case 45:
663
+ _context5.next = 10;
663
664
  break;
664
665
 
665
- case 48:
666
+ case 47:
666
667
  settBaseInfoInitLoading(false);
667
668
  setBaseInfo(infoData);
668
669
 
669
- case 50:
670
+ case 49:
670
671
  case "end":
671
672
  return _context5.stop();
672
673
  }
@@ -760,13 +761,13 @@ export default function ResourceOverview(props) {
760
761
  while (1) {
761
762
  switch (_context7.prev = _context7.next) {
762
763
  case 0:
763
- console.log('metricColChange col', col);
764
+ // console.log('metricColChange col', col);
764
765
  col = (_col2 = col) === null || _col2 === void 0 ? void 0 : _col2.filter(function (item) {
765
766
  return !item.hidden;
766
767
  });
767
768
 
768
769
  if ((_col3 = col) !== null && _col3 !== void 0 && _col3.length) {
769
- _context7.next = 5;
770
+ _context7.next = 4;
770
771
  break;
771
772
  }
772
773
 
@@ -774,7 +775,7 @@ export default function ResourceOverview(props) {
774
775
 
775
776
  return _context7.abrupt("return");
776
777
 
777
- case 5:
778
+ case 4:
778
779
  codes = col.map(function (item) {
779
780
  return item.dataIndex;
780
781
  });
@@ -797,12 +798,12 @@ export default function ResourceOverview(props) {
797
798
  }
798
799
 
799
800
  setMetricInitLoading(true);
800
- _context7.next = 12;
801
+ _context7.next = 11;
801
802
  return service.getMetricList(params);
802
803
 
803
- case 12:
804
+ case 11:
804
805
  metricList = _context7.sent;
805
- console.log('metricColChange', metricList, monitorMetricModels);
806
+ rlog.debug('metricColChange', metricList, monitorMetricModels);
806
807
  setMetric(col.map(function (item, key) {
807
808
  return {
808
809
  code: item.dataIndex,
@@ -827,7 +828,7 @@ export default function ResourceOverview(props) {
827
828
  }, 60000);
828
829
  }
829
830
 
830
- case 17:
831
+ case 16:
831
832
  case "end":
832
833
  return _context7.stop();
833
834
  }
@@ -878,7 +879,7 @@ export default function ResourceOverview(props) {
878
879
  }
879
880
  }
880
881
 
881
- console.log('defaultCols', type, ciType, baseInfo, keyIndicators);
882
+ rlog.debug('defaultCols', type, ciType, baseInfo, keyIndicators);
882
883
  return {
883
884
  baseInfo: baseInfo,
884
885
  keyIndicators: keyIndicators
@@ -1,7 +1,8 @@
1
1
  import _extends from "@babel/runtime/helpers/extends";
2
2
  import React, { useEffect, useState } from 'react';
3
3
  import { useRequest } from 'ahooks';
4
- import { queryLinkInterfacesLatestMetrics, queryLinkLatestMetrics } from "../services"; // 资源节点上方色块展示资源的发送速率发送带宽利用率、接收速率发送接收利用率、总错包数
4
+ import { queryLinkInterfacesLatestMetrics, queryLinkLatestMetrics } from "../services";
5
+ import rlog from '@riil-frontend/component-topology-utils/es/rlog'; // 资源节点上方色块展示资源的发送速率发送带宽利用率、接收速率发送接收利用率、总错包数
5
6
 
6
7
  export default function useMetricPolling(_ref) {
7
8
  var linkCi = _ref.linkCi,
@@ -27,7 +28,7 @@ export default function useMetricPolling(_ref) {
27
28
  setData(_extends({}, data, {
28
29
  linkMetrics: result
29
30
  }));
30
- console.info('链路拓扑指标轮询', result);
31
+ rlog.info('链路拓扑指标轮询', result);
31
32
  }
32
33
  });
33
34
  var queryInterfaceMetricsRequest = useRequest(queryLinkInterfacesLatestMetrics, {
@@ -37,14 +38,14 @@ export default function useMetricPolling(_ref) {
37
38
  manual: true,
38
39
  onSuccess: function onSuccess(result) {
39
40
  setData(_extends({}, data, result));
40
- console.info('链路拓扑指标轮询 queryInterfaceMetricsRequest 结果', result);
41
+ rlog.info('链路拓扑指标轮询 queryInterfaceMetricsRequest 结果', result);
41
42
  }
42
43
  });
43
44
  var linkMetricCodesStr = linkMetricCodes.map(function (item) {
44
45
  return item;
45
46
  }).sort().join(',');
46
47
  useEffect(function () {
47
- console.info('链路拓扑指标轮询 切换', {
48
+ rlog.info('链路拓扑指标轮询 切换', {
48
49
  linkCi: linkCi,
49
50
  linkMetricCodes: linkMetricCodes
50
51
  });
@@ -52,7 +53,7 @@ export default function useMetricPolling(_ref) {
52
53
  return function () {};
53
54
  }, [linkId, linkMetricCodesStr]);
54
55
  useEffect(function () {
55
- console.info('链路拓扑指标轮询 queryInterfaceMetricsRequest 开始', {
56
+ rlog.info('链路拓扑指标轮询 queryInterfaceMetricsRequest 开始', {
56
57
  linkCi: linkCi
57
58
  });
58
59
  queryInterfaceMetricsRequest.run(linkCi);
@@ -13,8 +13,7 @@ export default function LinkPropertyView(props) {
13
13
  linkGroups = _topo$store$useModelS.linkGroups;
14
14
  var link = [].concat(links, linkGroups).find(function (item) {
15
15
  return item.id === edge.getTag();
16
- });
17
- console.log('LinkPropertyView', link);
16
+ }); // console.log('LinkPropertyView',link)
18
17
 
19
18
  if (link) {
20
19
  var readable = link.permission.readable;
@@ -73,10 +73,8 @@ function AddLinkDrawer(props) {
73
73
  while (1) {
74
74
  switch (_context.prev = _context.next) {
75
75
  case 0:
76
- console.log('getPortsById', id, currentLink);
77
-
78
76
  if (id) {
79
- _context.next = 3;
77
+ _context.next = 2;
80
78
  break;
81
79
  }
82
80
 
@@ -85,25 +83,25 @@ function AddLinkDrawer(props) {
85
83
  portsDoc: {}
86
84
  });
87
85
 
88
- case 3:
89
- _context.next = 5;
86
+ case 2:
87
+ _context.next = 4;
90
88
  return service.getPortsById(id);
91
89
 
92
- case 5:
90
+ case 4:
93
91
  result = _context.sent;
94
- _context.next = 8;
92
+ _context.next = 7;
95
93
  return service.queryLinksByNodeId(id);
96
94
 
97
- case 8:
95
+ case 7:
98
96
  links = _context.sent;
99
97
  ifTypes = result.map(function (item) {
100
98
  return item.type;
101
99
  }); // console.log("端口类型列表", ifTypes);
102
100
 
103
- _context.next = 12;
101
+ _context.next = 11;
104
102
  return getInterfaceObject(ifTypes);
105
103
 
106
- case 12:
104
+ case 11:
107
105
  ifDoc = _context.sent;
108
106
  // console.log("端口类型字典", ifDoc);
109
107
  usedPorts = [];
@@ -139,7 +137,7 @@ function AddLinkDrawer(props) {
139
137
  portsDoc: portsDoc
140
138
  });
141
139
 
142
- case 19:
140
+ case 18:
143
141
  case "end":
144
142
  return _context.stop();
145
143
  }
@@ -234,9 +234,8 @@ export default function EditLinkInfo(props) {
234
234
  obj['destination_id'] = ''; // 目的端口
235
235
 
236
236
  obj['destination_type'] = 'ip';
237
- }
237
+ } // console.log('保存数据-obj', obj);
238
238
 
239
- console.log('保存数据-obj', obj);
240
239
 
241
240
  if (isAdd) {
242
241
  obj['network_link.network_category'] = 'CAN';