@riil-frontend/component-topology 7.0.9 → 8.0.0-a.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 (73) hide show
  1. package/build/index.css +1 -1
  2. package/build/index.js +13 -13
  3. package/es/components/BatchAttrMetric/setting.js +0 -2
  4. package/es/core/common/icons/basicIcons.js +57 -0
  5. package/es/core/common/icons/icon.js +4 -6
  6. package/es/core/components/ResourceViewAttributeSetting/Setting.js +5 -11
  7. package/es/core/components/ResourceViewAttributeSetting/nodeCiTypeAttrUtil.js +121 -0
  8. package/es/core/components/TopoView/GraphViewPanel.js +1 -2
  9. package/es/core/components/TopoView/topoView.js +3 -1
  10. package/es/core/editor/components/Toolbar/widgets/EdgeTypeButton/EdgeType.js +42 -24
  11. package/es/core/editor/components/Toolbar/widgets/EdgeTypeButton/LineType.js +7 -2
  12. package/es/core/editor/components/Toolbar/widgets/EdgeTypeButton/LineType.module.scss +4 -0
  13. package/es/core/editor/components/Toolbar/widgets/EdgeTypeButton/index.js +1 -0
  14. package/es/core/editor/utils/edgeTypeStyleUtil.js +2 -3
  15. package/es/core/hooks/useTopoEdit.js +35 -127
  16. package/es/core/models/AttributeMetricDisplay.js +4 -4
  17. package/es/core/models/TopoApp.js +2 -2
  18. package/es/core/models/tagstips/ElementTagTipConfig.js +18 -10
  19. package/es/core/models/topoData.js +9 -1
  20. package/es/core/models/utils/linkUtils.js +53 -91
  21. package/es/core/services/topo/basic.js +34 -0
  22. package/es/core/services/topo/constants.js +1 -0
  23. package/es/core/services/topo/index.js +4 -0
  24. package/es/core/store/models/topoBizMod.js +1 -11
  25. package/es/core/store/models/topoConfig.js +6 -7
  26. package/es/core/store/models/topoMod.js +74 -50
  27. package/es/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/ResourceOverview.js +1 -1
  28. package/es/core/viewer/components/titlebar/widgets/SearchWidget.js +4 -0
  29. package/es/networkTopo/getTopoData.js +72 -64
  30. package/es/networkTopo/models/TopoCenter.js +14 -94
  31. package/es/networkTopo/services/topo/basic.js +30 -10
  32. package/es/networkTopo/store/linkManager.js +0 -1
  33. package/es/networkTopo/store/topoCenter.js +0 -1
  34. package/es/networkTopo/store/topoLinkMod.js +0 -1
  35. package/es/networkTopo/utils/resourcePermissionUtil.js +2 -2
  36. package/es/utils/topoData.js +4 -169
  37. package/lib/components/BatchAttrMetric/setting.js +0 -4
  38. package/lib/core/common/icons/basicIcons.js +62 -0
  39. package/lib/core/common/icons/icon.js +5 -7
  40. package/lib/core/components/ResourceViewAttributeSetting/Setting.js +6 -11
  41. package/lib/core/components/ResourceViewAttributeSetting/nodeCiTypeAttrUtil.js +127 -0
  42. package/lib/core/components/TopoView/GraphViewPanel.js +1 -2
  43. package/lib/core/components/TopoView/topoView.js +4 -1
  44. package/lib/core/editor/components/Toolbar/widgets/EdgeTypeButton/EdgeType.js +43 -24
  45. package/lib/core/editor/components/Toolbar/widgets/EdgeTypeButton/LineType.js +8 -2
  46. package/lib/core/editor/components/Toolbar/widgets/EdgeTypeButton/LineType.module.scss +4 -0
  47. package/lib/core/editor/components/Toolbar/widgets/EdgeTypeButton/index.js +1 -0
  48. package/lib/core/editor/utils/edgeTypeStyleUtil.js +2 -3
  49. package/lib/core/hooks/useTopoEdit.js +35 -129
  50. package/lib/core/models/AttributeMetricDisplay.js +4 -4
  51. package/lib/core/models/TopoApp.js +3 -3
  52. package/lib/core/models/tagstips/ElementTagTipConfig.js +19 -11
  53. package/lib/core/models/topoData.js +9 -1
  54. package/lib/core/models/utils/linkUtils.js +52 -93
  55. package/lib/core/services/topo/basic.js +46 -0
  56. package/lib/core/services/topo/constants.js +6 -0
  57. package/lib/core/services/topo/index.js +16 -0
  58. package/lib/core/store/models/topoBizMod.js +1 -11
  59. package/lib/core/store/models/topoConfig.js +5 -6
  60. package/lib/core/store/models/topoMod.js +71 -48
  61. package/lib/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/ResourceOverview.js +1 -1
  62. package/lib/core/viewer/components/titlebar/widgets/SearchWidget.js +4 -0
  63. package/lib/networkTopo/getTopoData.js +73 -65
  64. package/lib/networkTopo/models/TopoCenter.js +14 -94
  65. package/lib/networkTopo/services/topo/basic.js +30 -10
  66. package/lib/networkTopo/store/linkManager.js +0 -2
  67. package/lib/networkTopo/store/topoCenter.js +0 -2
  68. package/lib/networkTopo/store/topoLinkMod.js +0 -2
  69. package/lib/networkTopo/utils/resourcePermissionUtil.js +2 -2
  70. package/lib/utils/topoData.js +6 -172
  71. package/package.json +2 -2
  72. /package/es/core/services/{topo.js → topo/tagtip.js} +0 -0
  73. /package/lib/core/services/{topo.js → topo/tagtip.js} +0 -0
@@ -51,6 +51,8 @@ var _HistoryManager = _interopRequireDefault(require("../../models/HistoryManage
51
51
 
52
52
  var _editorModule = _interopRequireDefault(require("./editor.module.scss"));
53
53
 
54
+ var _basicIcons = _interopRequireDefault(require("../../common/icons/basicIcons"));
55
+
54
56
  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); }
55
57
 
56
58
  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; }
@@ -107,7 +109,7 @@ var Topology = function Topology(props) {
107
109
  topo: topo,
108
110
  topoId: topoId,
109
111
  isEditing: isEditMode,
110
- onSave: onSave,
112
+ onSave: editorProps.onSave || onSave,
111
113
  nodeDeleteable: nodeDeleteable,
112
114
  onNodeDelete: onNodeDelete,
113
115
  onLineDelete: onLineDelete,
@@ -277,6 +279,7 @@ var Topology = function Topology(props) {
277
279
  }),
278
280
  data: tData,
279
281
  defaultEnterEditMode: defaultEnterEditMode,
282
+ icons: [].concat(graphViewProps.icons || [], _basicIcons["default"]),
280
283
  onCreate: onGraphCreated,
281
284
  onLoaded: handleGraphLoaded,
282
285
  onDataLoaded: handleGraphDataLoaded,
@@ -13,6 +13,8 @@ var _form = _interopRequireDefault(require("@alifd/next/lib/form"));
13
13
 
14
14
  var _react = _interopRequireWildcard(require("react"));
15
15
 
16
+ var _edgeTypeStyleUtil = require("../../../../utils/edgeTypeStyleUtil");
17
+
16
18
  var _EdgeTypeModule = _interopRequireDefault(require("./EdgeType.module.scss"));
17
19
 
18
20
  var _LineType = _interopRequireDefault(require("./LineType"));
@@ -77,43 +79,60 @@ var LINE_MOLD_OPTIONS = [{
77
79
  icon: 'topo_lineMold_dotted_two'
78
80
  }];
79
81
 
80
- function getValuesBySelection(selection) {
82
+ function getValuesByEdges(topo) {
83
+ function getStartPoint(edge) {
84
+ var icons = edge.s('icons') || {};
85
+ return ['sourceArrow', 'sourceSolidCircle', 'sourceNoneCircle'].filter(function (name) {
86
+ return icons[name];
87
+ })[0] || 'nil';
88
+ }
89
+
90
+ function getEndPoint(edge) {
91
+ var icons = edge.s('icons') || {};
92
+ return ['targetArrow', 'targetSolidCircle', 'targetNoneCircle'].filter(function (name) {
93
+ return icons[name];
94
+ })[0] || 'nil';
95
+ }
96
+
97
+ var selectionEdges = (0, _edgeTypeStyleUtil.getEdgesBySelection)(topo);
98
+ var edgeValues = [];
99
+ (0, _edgeTypeStyleUtil.loopEdgesAndChildren)(topo, selectionEdges, function (edge) {
100
+ edgeValues.push({
101
+ lineButton: edge.s('edge.type'),
102
+ startPoint: getStartPoint(edge),
103
+ endPoint: getEndPoint(edge),
104
+ lineMold: edge.a('lineMode') || 'solidLine'
105
+ });
106
+ });
81
107
  var values = {
108
+ lineButton: undefined,
82
109
  startPoint: undefined,
83
110
  endPoint: undefined,
84
111
  lineMold: undefined
85
- }; // 仅一条连线选中时回显
86
-
87
- if (selection.length === 1) {
88
- var edge = selection[0];
89
- values = {
90
- startPoint: 'nil',
91
- endPoint: 'nil',
92
- lineMold: edge.a('lineMode') || 'solidLine'
93
- };
94
- var icons = edge.s('icons') || {};
95
- ['sourceArrow', 'sourceSolidCircle', 'sourceNoneCircle'].forEach(function (name) {
96
- if (icons[name]) {
97
- values.startPoint = name;
98
- }
112
+ };
113
+ Object.keys(values).forEach(function (name) {
114
+ var vals = edgeValues.map(function (item) {
115
+ return item[name];
99
116
  });
100
- ['targetArrow', 'targetSolidCircle', 'targetNoneCircle'].forEach(function (name) {
101
- if (icons[name]) {
102
- values.endPoint = name;
103
- }
104
- });
105
- }
117
+ var isSame = vals.filter(function (val) {
118
+ return val === vals[0];
119
+ }).length === vals.length;
106
120
 
121
+ if (isSame) {
122
+ values[name] = vals[0];
123
+ }
124
+ });
107
125
  return values;
108
126
  }
109
127
 
110
128
  function EdgeType(props) {
111
- var selection = props.selection,
129
+ var topo = props.topo,
130
+ selection = props.selection,
112
131
  _onChange = props.onChange;
113
132
 
114
133
  var field = _field["default"].useField({
115
134
  autoUnmount: false,
116
- values: getValuesBySelection(selection),
135
+ values: getValuesByEdges(topo),
117
136
  onChange: function onChange(name, value) {
118
137
  if (['startPoint', 'endPoint'].includes(name) && value === 'nil') {
119
138
  _onChange(name, null);
@@ -124,7 +143,7 @@ function EdgeType(props) {
124
143
  });
125
144
 
126
145
  (0, _react.useEffect)(function () {
127
- field.setValues(getValuesBySelection(selection));
146
+ field.setValues(getValuesByEdges(topo));
128
147
  }, [selection]);
129
148
  return /*#__PURE__*/_react["default"].createElement("div", {
130
149
  className: _EdgeTypeModule["default"].lineBox
@@ -11,6 +11,8 @@ var _balloon = _interopRequireDefault(require("@alifd/next/lib/balloon"));
11
11
 
12
12
  var _react = _interopRequireWildcard(require("react"));
13
13
 
14
+ var _classnames = _interopRequireDefault(require("classnames"));
15
+
14
16
  var _LineTypeModule = _interopRequireDefault(require("./LineType.module.scss"));
15
17
 
16
18
  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); }
@@ -41,11 +43,14 @@ var LINE_TYPE_OPTIONS = [{
41
43
  }];
42
44
 
43
45
  var LineType = /*#__PURE__*/_react["default"].forwardRef(function (props, ref) {
44
- var onChange = props.onChange;
46
+ var value = props.value,
47
+ onChange = props.onChange;
45
48
 
46
49
  function lineButton(item) {
50
+ var _classNames;
51
+
47
52
  return /*#__PURE__*/_react["default"].createElement(_button["default"], {
48
- className: "" + _LineTypeModule["default"].redioBtn,
53
+ className: (0, _classnames["default"])(_LineTypeModule["default"].redioBtn, (_classNames = {}, _classNames[_LineTypeModule["default"].selected] = value === item.value, _classNames)),
49
54
  onClick: function onClick() {
50
55
  onChange(item.value);
51
56
  }
@@ -67,5 +72,6 @@ var LineType = /*#__PURE__*/_react["default"].forwardRef(function (props, ref) {
67
72
  }));
68
73
  });
69
74
 
75
+ LineType.displayName = 'LineType';
70
76
  var _default = LineType;
71
77
  exports["default"] = _default;
@@ -21,6 +21,10 @@
21
21
  &:hover {
22
22
  background: #F2F7FD !important;
23
23
  }
24
+
25
+ &.selected {
26
+ background: #F2F7FD !important;
27
+ }
24
28
  }
25
29
  .redioBtn:last-child{
26
30
  margin-right: 0;
@@ -128,6 +128,7 @@ function EdgeTypeButton(props) {
128
128
  disabled: disabled,
129
129
  trigger: icon
130
130
  }, !disabled && /*#__PURE__*/_react["default"].createElement(_EdgeType["default"], {
131
+ topo: topo,
131
132
  selection: selection,
132
133
  onChange: handleChange
133
134
  })));
@@ -24,8 +24,7 @@ function getEdgesBySelection(topo) {
24
24
  return nodeIds;
25
25
  };
26
26
 
27
- var getSelectedEdges = function getSelectedEdges(topo) {
28
- var gv = topo.getGraphView();
27
+ var getSelectedEdges = function getSelectedEdges(gv) {
29
28
  var selection = gv.getSelectionModel().getSelection().toArray(); // 选中的连线
30
29
 
31
30
  var edges = selection.filter(function (element) {
@@ -51,7 +50,7 @@ function getEdgesBySelection(topo) {
51
50
  return edges;
52
51
  };
53
52
 
54
- return getSelectedEdges(topo);
53
+ return getSelectedEdges(topo.getGraphView());
55
54
  }
56
55
  /**
57
56
  * 遍历连线及子连线
@@ -725,58 +725,9 @@ var useTopoEdit = function useTopoEdit(params) {
725
725
  };
726
726
  }();
727
727
 
728
- function checkSavePermission(_x13) {
729
- return _checkSavePermission.apply(this, arguments);
730
- }
731
-
732
- function _checkSavePermission() {
733
- _checkSavePermission = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee16(id) {
734
- var permission;
735
- return _regenerator["default"].wrap(function _callee16$(_context16) {
736
- while (1) {
737
- switch (_context16.prev = _context16.next) {
738
- case 0:
739
- _context16.next = 2;
740
- return topoDispatchers.getTopoPermission({
741
- id: id,
742
- update: false
743
- });
744
-
745
- case 2:
746
- permission = _context16.sent;
747
-
748
- if (!_topoPermissionUtil["default"].isEditable(permission)) {
749
- _context16.next = 5;
750
- break;
751
- }
752
-
753
- return _context16.abrupt("return", true);
754
-
755
- case 5:
756
- _dialog["default"].alert({
757
- title: "没有权限进行此操作",
758
- content: "您的权限发生了变化,请联系相关管理员。",
759
- okProps: {
760
- children: "确定"
761
- },
762
- onOk: function onOk() {}
763
- });
764
-
765
- return _context16.abrupt("return", false);
766
-
767
- case 7:
768
- case "end":
769
- return _context16.stop();
770
- }
771
- }
772
- }, _callee16);
773
- }));
774
- return _checkSavePermission.apply(this, arguments);
775
- }
776
-
777
728
  var onSaveTopo = /*#__PURE__*/function () {
778
729
  var _ref6 = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee8(data) {
779
- var id, config, serialize, _config$layout, template, layout, saveConfig, valid, saveData;
730
+ var id, config, serialize, _config$layout, template, layout, saveConfig;
780
731
 
781
732
  return _regenerator["default"].wrap(function _callee8$(_context8) {
782
733
  while (1) {
@@ -785,87 +736,42 @@ var useTopoEdit = function useTopoEdit(params) {
785
736
  id = data.id, config = data.config, serialize = data.serialize;
786
737
  _config$layout = config === null || config === void 0 ? void 0 : config.layout, template = _config$layout.type, layout = _config$layout.layout;
787
738
 
788
- if (!onSave) {
789
- _context8.next = 6;
790
- break;
791
- }
739
+ if (onSave) {
740
+ // 自定义保存
741
+ saveConfig = /*#__PURE__*/function () {
742
+ var _ref7 = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee7() {
743
+ return _regenerator["default"].wrap(function _callee7$(_context7) {
744
+ while (1) {
745
+ switch (_context7.prev = _context7.next) {
746
+ case 0:
747
+ _context7.next = 2;
748
+ return editDispatchers.saveTopo({
749
+ id: id,
750
+ layout: layout,
751
+ serialize: serialize
752
+ });
792
753
 
793
- // 自定义保存
794
- saveConfig = /*#__PURE__*/function () {
795
- var _ref7 = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee7() {
796
- return _regenerator["default"].wrap(function _callee7$(_context7) {
797
- while (1) {
798
- switch (_context7.prev = _context7.next) {
799
- case 0:
800
- _context7.next = 2;
801
- return editDispatchers.saveTopo({
802
- id: id,
803
- layout: layout,
804
- serialize: serialize
805
- });
806
-
807
- case 2:
808
- case "end":
809
- return _context7.stop();
754
+ case 2:
755
+ case "end":
756
+ return _context7.stop();
757
+ }
810
758
  }
811
- }
812
- }, _callee7);
813
- }));
814
-
815
- return function saveConfig() {
816
- return _ref7.apply(this, arguments);
817
- };
818
- }();
819
-
820
- onSave({
821
- data: data,
822
- saveConfig: saveConfig
823
- });
824
- return _context8.abrupt("return");
825
-
826
- case 6:
827
- // TODO 以下逻辑移到拓扑中心
828
- topoEditDispatchers.update({
829
- saving: true
830
- }); // 检查权限
831
-
832
- _context8.next = 9;
833
- return checkSavePermission(id);
834
-
835
- case 9:
836
- valid = _context8.sent;
837
-
838
- if (valid) {
839
- _context8.next = 13;
840
- break;
759
+ }, _callee7);
760
+ }));
761
+
762
+ return function saveConfig() {
763
+ return _ref7.apply(this, arguments);
764
+ };
765
+ }();
766
+
767
+ onSave({
768
+ topo: topo,
769
+ data: data,
770
+ saveConfig: saveConfig
771
+ });
841
772
  }
842
773
 
843
- topoEditDispatchers.update({
844
- saving: false
845
- });
846
- return _context8.abrupt("return");
847
-
848
- case 13:
849
- // 保存
850
- saveData = (0, _extends2["default"])({
851
- id: id,
852
- layout: layout,
853
- serialize: serialize
854
- }, resourceConfig.getConfig());
855
-
856
- _rlog["default"].info("保存", saveData);
857
-
858
- _context8.next = 17;
859
- return editDispatchers.saveTopo(saveData);
860
-
861
- case 17:
862
- topoEditDispatchers.update({
863
- saving: false
864
- });
865
-
866
- _message["default"].success("保存成功!");
867
-
868
- case 19:
774
+ case 3:
869
775
  case "end":
870
776
  return _context8.stop();
871
777
  }
@@ -873,7 +779,7 @@ var useTopoEdit = function useTopoEdit(params) {
873
779
  }, _callee8);
874
780
  }));
875
781
 
876
- return function onSaveTopo(_x14) {
782
+ return function onSaveTopo(_x13) {
877
783
  return _ref6.apply(this, arguments);
878
784
  };
879
785
  }();
@@ -1089,7 +995,7 @@ var useTopoEdit = function useTopoEdit(params) {
1089
995
  }, _callee10);
1090
996
  }));
1091
997
 
1092
- return function bindNodeResource(_x15) {
998
+ return function bindNodeResource(_x14) {
1093
999
  return _ref8.apply(this, arguments);
1094
1000
  };
1095
1001
  }();
@@ -374,7 +374,7 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
374
374
  /*#__PURE__*/
375
375
  function () {
376
376
  var _fetchData = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee() {
377
- var topo, _topo$store$getState$, resIdsList, nodeIdsList, codes, param, transformLinkData, result;
377
+ var topo, _topo$store$getModelS, resIdsList, nodeIdsList, codes, param, transformLinkData, result;
378
378
 
379
379
  return _regenerator["default"].wrap(function _callee$(_context) {
380
380
  while (1) {
@@ -401,7 +401,7 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
401
401
  };
402
402
 
403
403
  topo = this.topo;
404
- _topo$store$getState$ = topo.store.getState().topoBizMod.resAndMetrics, resIdsList = _topo$store$getState$.resIdsList, nodeIdsList = _topo$store$getState$.nodeIdsList; // rlog.debug('根据ci的id获取属性的值-getCiArrByIds', resIdsList, metrics);
404
+ _topo$store$getModelS = topo.store.getModelState('topoBizMod').resAndMetrics, resIdsList = _topo$store$getModelS.resIdsList, nodeIdsList = _topo$store$getModelS.nodeIdsList; // rlog.debug('根据ci的id获取属性的值-getCiArrByIds', resIdsList, metrics);
405
405
  // 无资源,不查询
406
406
 
407
407
  if (resIdsList.length) {
@@ -653,8 +653,8 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
653
653
 
654
654
  var elementTagsAndTips = this.buildTagsTips() // 开锁状态下禁用悬停展示悬浮框
655
655
  .map(function (item) {
656
- var _topo$store$getModelS = topo.store.getModelState('lock'),
657
- lock = _topo$store$getModelS.lock;
656
+ var _topo$store$getModelS2 = topo.store.getModelState('lock'),
657
+ lock = _topo$store$getModelS2.lock;
658
658
 
659
659
  return lock ? item : (0, _extends2["default"])({}, item, {
660
660
  tips: []
@@ -11,14 +11,14 @@ var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/
11
11
 
12
12
  var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
13
13
 
14
- var _topo = _interopRequireDefault(require("@riil-frontend/component-topology-common/es/services/topo"));
15
-
16
14
  var _componentTopologyUtils = require("@riil-frontend/component-topology-utils");
17
15
 
18
16
  var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
19
17
 
20
18
  var _lodash = require("lodash");
21
19
 
20
+ var _topo = _interopRequireDefault(require("../services/topo"));
21
+
22
22
  var _CiTypeCache = _interopRequireDefault(require("./cache/CiTypeCache"));
23
23
 
24
24
  var _Alarm = _interopRequireDefault(require("./Alarm"));
@@ -54,7 +54,7 @@ var _ElementTagTipConfig = _interopRequireDefault(require("./tagstips/ElementTag
54
54
  var _SelectionModel = _interopRequireDefault(require("./SelectionModel"));
55
55
 
56
56
  // eslint-disable-next-line no-undef
57
- var version = typeof "7.0.9" === 'string' ? "7.0.9" : null;
57
+ var version = typeof "8.0.0-a.10" === 'string' ? "8.0.0-a.10" : null;
58
58
  console.info("\u62D3\u6251\u7248\u672C: " + version);
59
59
  /**
60
60
  * 拓扑显示和编辑
@@ -13,7 +13,7 @@ var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/
13
13
 
14
14
  var _utils = require("./utils");
15
15
 
16
- var _topo = require("../../services/topo");
16
+ var _tagtip = require("../../services/topo/tagtip");
17
17
 
18
18
  var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/lib/rlog"));
19
19
 
@@ -21,7 +21,7 @@ var ElementTagTipConfig = /*#__PURE__*/function () {
21
21
  function ElementTagTipConfig(topo) {
22
22
  this.topoData = void 0;
23
23
  this.mtCodes = void 0;
24
- this.mtMetricsMap = void 0;
24
+ this.mtMetricsMap = {};
25
25
  this.mtCiTypeMap = void 0;
26
26
  this.topo = topo;
27
27
  }
@@ -37,29 +37,37 @@ var ElementTagTipConfig = /*#__PURE__*/function () {
37
37
  this.topoData = topoData;
38
38
  this.mtCodes = (0, _utils.getMonitorTemplateCodesFromTopoData)(topoData);
39
39
  _context.prev = 2;
40
- _context.next = 5;
41
- return (0, _topo.getMetricsByMonitorTemplateCodes)(this.mtCodes);
42
40
 
43
- case 5:
41
+ if (!this.mtCodes.length) {
42
+ _context.next = 7;
43
+ break;
44
+ }
45
+
46
+ _context.next = 6;
47
+ return (0, _tagtip.getMetricsByMonitorTemplateCodes)(this.mtCodes);
48
+
49
+ case 6:
44
50
  this.mtMetricsMap = _context.sent;
45
- _context.next = 11;
51
+
52
+ case 7:
53
+ _context.next = 12;
46
54
  break;
47
55
 
48
- case 8:
49
- _context.prev = 8;
56
+ case 9:
57
+ _context.prev = 9;
50
58
  _context.t0 = _context["catch"](2);
51
59
 
52
60
  _rlog["default"].error('查询监控模板指标失败', _context.t0);
53
61
 
54
- case 11:
62
+ case 12:
55
63
  this.mtCiTypeMap = (0, _utils.getMtCodeCiTypeMap)(topoData);
56
64
 
57
- case 12:
65
+ case 13:
58
66
  case "end":
59
67
  return _context.stop();
60
68
  }
61
69
  }
62
- }, _callee, this, [[2, 8]]);
70
+ }, _callee, this, [[2, 9]]);
63
71
  }));
64
72
 
65
73
  function init(_x) {
@@ -18,8 +18,16 @@ var _topo = require("@riil-frontend/component-topology-common/es/services/topo")
18
18
  var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
19
19
 
20
20
  function getLayoutId(layout) {
21
- if (!layout || typeof layout === "string") {
21
+ if (!layout) {
22
22
  return layout;
23
+ } // 拖拽添加分层后点击保存ht传参不正确,临时适配
24
+
25
+
26
+ if (typeof layout === "string") {
27
+ return {
28
+ v: 'towardeast',
29
+ h: 'towardsouth'
30
+ }[layout] || layout;
23
31
  }
24
32
 
25
33
  var id = layout.id,