@riil-frontend/component-topology 8.0.0-a.1 → 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 (55) hide show
  1. package/build/index.css +1 -1
  2. package/build/index.js +13 -13
  3. package/es/core/common/icons/basicIcons.js +1 -1
  4. package/es/core/common/icons/icon.js +6 -2
  5. package/es/core/editor/components/Toolbar/widgets/EdgeTypeButton/EdgeType.js +42 -24
  6. package/es/core/editor/components/Toolbar/widgets/EdgeTypeButton/LineType.js +7 -2
  7. package/es/core/editor/components/Toolbar/widgets/EdgeTypeButton/LineType.module.scss +4 -0
  8. package/es/core/editor/components/Toolbar/widgets/EdgeTypeButton/index.js +1 -0
  9. package/es/core/editor/utils/edgeTypeStyleUtil.js +2 -3
  10. package/es/core/hooks/usePolling.js +3 -3
  11. package/es/core/models/TopoApp.js +2 -2
  12. package/es/core/models/tagstips/ElementTagTipConfig.js +1 -1
  13. package/es/core/models/topoData.js +9 -1
  14. package/es/core/models/utils/linkUtils.js +31 -63
  15. package/es/core/services/topo/basic.js +34 -0
  16. package/es/core/services/topo/constants.js +1 -0
  17. package/es/core/services/topo/index.js +4 -0
  18. package/es/core/store/models/topoConfig.js +6 -1
  19. package/es/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/ResourceOverview.js +3 -2
  20. package/es/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/ResourceOverviewMetric.js +4 -2
  21. package/es/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/components/LinkTopo/hooks/useMetricPolling.js +2 -2
  22. package/es/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/hooks/useMetricModels.js +3 -3
  23. package/es/core/viewer/components/titlebar/widgets/SearchWidget.js +4 -0
  24. package/es/networkTopo/services/topo/basic.js +4 -2
  25. package/es/networkTopo/store/linkManager.js +0 -1
  26. package/es/networkTopo/store/topoCenter.js +0 -1
  27. package/es/networkTopo/store/topoLinkMod.js +0 -1
  28. package/lib/core/common/icons/basicIcons.js +1 -1
  29. package/lib/core/common/icons/icon.js +6 -2
  30. package/lib/core/editor/components/Toolbar/widgets/EdgeTypeButton/EdgeType.js +43 -24
  31. package/lib/core/editor/components/Toolbar/widgets/EdgeTypeButton/LineType.js +8 -2
  32. package/lib/core/editor/components/Toolbar/widgets/EdgeTypeButton/LineType.module.scss +4 -0
  33. package/lib/core/editor/components/Toolbar/widgets/EdgeTypeButton/index.js +1 -0
  34. package/lib/core/editor/utils/edgeTypeStyleUtil.js +2 -3
  35. package/lib/core/hooks/usePolling.js +3 -3
  36. package/lib/core/models/TopoApp.js +3 -3
  37. package/lib/core/models/tagstips/ElementTagTipConfig.js +2 -2
  38. package/lib/core/models/topoData.js +9 -1
  39. package/lib/core/models/utils/linkUtils.js +32 -67
  40. package/lib/core/services/topo/basic.js +46 -0
  41. package/lib/core/services/topo/constants.js +6 -0
  42. package/lib/core/services/topo/index.js +16 -0
  43. package/lib/core/store/models/topoConfig.js +6 -1
  44. package/lib/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/ResourceOverview.js +3 -2
  45. package/lib/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/ResourceOverviewMetric.js +4 -2
  46. package/lib/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/components/LinkTopo/hooks/useMetricPolling.js +2 -2
  47. package/lib/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/hooks/useMetricModels.js +3 -3
  48. package/lib/core/viewer/components/titlebar/widgets/SearchWidget.js +4 -0
  49. package/lib/networkTopo/services/topo/basic.js +4 -2
  50. package/lib/networkTopo/store/linkManager.js +0 -2
  51. package/lib/networkTopo/store/topoCenter.js +0 -2
  52. package/lib/networkTopo/store/topoLinkMod.js +0 -2
  53. package/package.json +2 -2
  54. /package/es/core/services/{topo.js → topo/tagtip.js} +0 -0
  55. /package/lib/core/services/{topo.js → topo/tagtip.js} +0 -0
@@ -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
  * 遍历连线及子连线
@@ -34,9 +34,9 @@ var usePolling = function usePolling(props) {
34
34
  var resIdsList = resAndMetrics === null || resAndMetrics === void 0 ? void 0 : resAndMetrics.resIdsList; // 轮询hooks
35
35
 
36
36
  var _useRequest = (0, _ahooks.useRequest)(refresh, {
37
- pollingInterval: 1000 * 15,
38
- // pollingWhenHidden: false,
39
- // debounceInterval: 1000,
37
+ pollingInterval: 60 * 1000,
38
+ pollingWhenHidden: false,
39
+ // debounceInterval: 200,
40
40
  manual: true,
41
41
  onSuccess: function onSuccess(result) {
42
42
  if (result) {
@@ -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 "8.0.0-a.1" === 'string' ? "8.0.0-a.1" : 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
 
@@ -44,7 +44,7 @@ var ElementTagTipConfig = /*#__PURE__*/function () {
44
44
  }
45
45
 
46
46
  _context.next = 6;
47
- return (0, _topo.getMetricsByMonitorTemplateCodes)(this.mtCodes);
47
+ return (0, _tagtip.getMetricsByMonitorTemplateCodes)(this.mtCodes);
48
48
 
49
49
  case 6:
50
50
  this.mtMetricsMap = _context.sent;
@@ -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,
@@ -4,7 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
4
4
 
5
5
  exports.__esModule = true;
6
6
  exports.buildTopoLinkData = buildTopoLinkData;
7
- exports.getInterfaceObject = exports.compatibleWith = void 0;
7
+ exports.compatibleWith = void 0;
8
8
  exports.getLinksDetail = getLinksDetail;
9
9
  exports.isCrucialLink = isCrucialLink;
10
10
  exports.isExitLink = isExitLink;
@@ -13,11 +13,9 @@ exports.showLinkByConfig = exports.plurals = void 0;
13
13
 
14
14
  var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
15
15
 
16
- var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
17
-
18
16
  var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
19
17
 
20
- var _topo = _interopRequireDefault(require("@riil-frontend/component-topology-common/es/services/topo"));
18
+ var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
21
19
 
22
20
  var _keyBy = _interopRequireDefault(require("lodash/keyBy"));
23
21
 
@@ -27,6 +25,8 @@ var _services = require("../../services");
27
25
 
28
26
  var _htElementUtils = require("../../../utils/htElementUtils");
29
27
 
28
+ var _CiTypeCache = _interopRequireDefault(require("../cache/CiTypeCache"));
29
+
30
30
  // 查询所有连线
31
31
  // const interfaceTypeMap = {
32
32
  // "network.interface": {
@@ -56,43 +56,6 @@ function isExitLink(link) {
56
56
  return (link === null || link === void 0 ? void 0 : link.attributes) && !(link !== null && link !== void 0 && link.attributes['destination_id']);
57
57
  }
58
58
 
59
- var getInterfaceObject = /*#__PURE__*/function () {
60
- var _ref = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(codes) {
61
- var query, promises, result, ifDoc;
62
- return _regenerator["default"].wrap(function _callee$(_context) {
63
- while (1) {
64
- switch (_context.prev = _context.next) {
65
- case 0:
66
- query = _lodash["default"].compact(_lodash["default"].uniq(codes));
67
- promises = query.map(_services.queryModelAsset);
68
- _context.next = 4;
69
- return Promise.all(promises);
70
-
71
- case 4:
72
- result = _context.sent;
73
- ifDoc = {};
74
- result.map(function (ifItem) {
75
- ifDoc[ifItem.code] = {
76
- displayName: ifItem.displayName
77
- };
78
- });
79
- return _context.abrupt("return", ifDoc);
80
-
81
- case 8:
82
- case "end":
83
- return _context.stop();
84
- }
85
- }
86
- }, _callee);
87
- }));
88
-
89
- return function getInterfaceObject(_x) {
90
- return _ref.apply(this, arguments);
91
- };
92
- }();
93
-
94
- exports.getInterfaceObject = getInterfaceObject;
95
-
96
59
  function mergeLinksData(links, linkCis, nodes, interfaceCis, interfaceDoc) {
97
60
  var linkCiMap = (0, _keyBy["default"])(links, 'id');
98
61
  return links.map(function (link) {
@@ -135,57 +98,59 @@ function mergeLinksData(links, linkCis, nodes, interfaceCis, interfaceDoc) {
135
98
  });
136
99
  }
137
100
 
138
- function getLinksDetail(_x2, _x3) {
101
+ function getLinksDetail(_x, _x2) {
139
102
  return _getLinksDetail.apply(this, arguments);
140
103
  }
141
104
 
142
105
  function _getLinksDetail() {
143
- _getLinksDetail = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2(links, nodes) {
106
+ _getLinksDetail = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(links, nodes) {
144
107
  var linkCis, interfaceIds, interfaceTypes, interfaceCis, interfaceDoc;
145
- return _regenerator["default"].wrap(function _callee2$(_context2) {
108
+ return _regenerator["default"].wrap(function _callee$(_context) {
146
109
  while (1) {
147
- switch (_context2.prev = _context2.next) {
110
+ switch (_context.prev = _context.next) {
148
111
  case 0:
149
112
  if (!(!links || !links.length)) {
150
- _context2.next = 2;
113
+ _context.next = 2;
151
114
  break;
152
115
  }
153
116
 
154
- return _context2.abrupt("return", []);
117
+ return _context.abrupt("return", []);
155
118
 
156
119
  case 2:
157
120
  // const linkCis = await topoService.relation.batchQueryRelation(
158
121
  // links.map((link) => link.id)
159
122
  // );
160
123
  linkCis = links;
161
- interfaceIds = [];
162
- interfaceTypes = [];
163
- linkCis.forEach(function (item) {
164
- interfaceIds.push(item.attributes.source_id);
165
- interfaceIds.push(item.attributes.destination_id);
166
- interfaceTypes.push(item.attributes.source_type);
167
- interfaceTypes.push(item.attributes.destination_type);
124
+ interfaceIds = [].concat(linkCis.map(function (item) {
125
+ return item.attributes.source_id;
126
+ }), linkCis.map(function (item) {
127
+ return item.attributes.destination_id;
128
+ }));
129
+ interfaceTypes = _lodash["default"].compact(_lodash["default"].uniq([].concat(linkCis.map(function (item) {
130
+ return item.attributes.source_type;
131
+ }), linkCis.map(function (item) {
132
+ return item.attributes.destination_type;
133
+ })))).filter(function (item) {
134
+ return item !== 'ip';
168
135
  });
169
- _context2.next = 8;
136
+ _context.next = 7;
170
137
  return (0, _services.queryCisByIds)(interfaceIds);
171
138
 
172
- case 8:
173
- interfaceCis = _context2.sent;
174
- _context2.next = 11;
175
- return getInterfaceObject(interfaceTypes.filter(function (item) {
176
- return item !== 'ip';
177
- }));
139
+ case 7:
140
+ interfaceCis = _context.sent;
141
+ _context.next = 10;
142
+ return _CiTypeCache["default"].getCiTypeMap(interfaceTypes);
178
143
 
179
- case 11:
180
- interfaceDoc = _context2.sent;
181
- return _context2.abrupt("return", mergeLinksData(links, linkCis, nodes, interfaceCis, interfaceDoc));
144
+ case 10:
145
+ interfaceDoc = _context.sent;
146
+ return _context.abrupt("return", mergeLinksData(links, linkCis, nodes, interfaceCis, interfaceDoc));
182
147
 
183
- case 13:
148
+ case 12:
184
149
  case "end":
185
- return _context2.stop();
150
+ return _context.stop();
186
151
  }
187
152
  }
188
- }, _callee2);
153
+ }, _callee);
189
154
  }));
190
155
  return _getLinksDetail.apply(this, arguments);
191
156
  }
@@ -0,0 +1,46 @@
1
+ "use strict";
2
+
3
+ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
4
+
5
+ exports.__esModule = true;
6
+ exports["default"] = void 0;
7
+
8
+ var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
9
+
10
+ var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
11
+
12
+ var _componentTopologyUtils = require("@riil-frontend/component-topology-utils");
13
+
14
+ var _constants = require("./constants");
15
+
16
+ var _default = {
17
+ /**
18
+ * 保存拓扑绘制数据(第三方库内部结构,无需关心含义)
19
+ * @param {Number} id Topo ID
20
+ * @param {String} data ht拓扑序列化数据
21
+ * @returns
22
+ */
23
+ saveSerializeData: function saveSerializeData(id, data) {
24
+ return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee() {
25
+ return _regenerator["default"].wrap(function _callee$(_context) {
26
+ while (1) {
27
+ switch (_context.prev = _context.next) {
28
+ case 0:
29
+ _context.next = 2;
30
+ return _componentTopologyUtils.request.post(_constants.TOPO_API_ROOT + "/structure/" + id, {
31
+ data: data
32
+ });
33
+
34
+ case 2:
35
+ return _context.abrupt("return", _context.sent);
36
+
37
+ case 3:
38
+ case "end":
39
+ return _context.stop();
40
+ }
41
+ }
42
+ }, _callee);
43
+ }))();
44
+ }
45
+ };
46
+ exports["default"] = _default;
@@ -0,0 +1,6 @@
1
+ "use strict";
2
+
3
+ exports.__esModule = true;
4
+ exports.TOPO_API_ROOT = void 0;
5
+ var TOPO_API_ROOT = '/topo/v1/api';
6
+ exports.TOPO_API_ROOT = TOPO_API_ROOT;
@@ -0,0 +1,16 @@
1
+ "use strict";
2
+
3
+ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
4
+
5
+ exports.__esModule = true;
6
+ exports["default"] = void 0;
7
+
8
+ var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
9
+
10
+ var _topo = _interopRequireDefault(require("@riil-frontend/component-topology-common/es/services/topo"));
11
+
12
+ var _basic = _interopRequireDefault(require("./basic"));
13
+
14
+ var _default = (0, _extends2["default"])({}, _topo["default"], _basic["default"]);
15
+
16
+ exports["default"] = _default;
@@ -407,7 +407,12 @@ function _default(topoApp) {
407
407
  alarmListDefaultOpen: displayConfig.alarmListDefaultOpen,
408
408
  extraConfig: JSON.stringify((0, _extends2["default"])({}, displayConfig, {
409
409
  // 背景图,便于加载拓扑直接显示背景图
410
- background: topoApp.store.getModelState("background").current
410
+ background: topoApp.store.getModelState("background").current,
411
+ // 增加保存日志,便于排查链路重复问题 2023-4-12 19:27:18
412
+ saveHistories: [{
413
+ date: new Date().toLocaleString(),
414
+ version: topoApp.version
415
+ }].concat(displayConfig.saveHistories || [])
411
416
  }))
412
417
  };
413
418
 
@@ -557,7 +557,7 @@ function ResourceOverview(props) {
557
557
  ciType: ciType,
558
558
  type: type,
559
559
  // name: '123'
560
- name: props.name
560
+ name: props.name ? props.name : props.resourceData.attributes.name
561
561
  }; // 基本信息设置改变
562
562
 
563
563
  function baseInfoColChange(_x5) {
@@ -989,7 +989,8 @@ function ResourceOverview(props) {
989
989
  ciAttrAndMetricData: ciAttrAndMetricData
990
990
  },
991
991
  data: metric,
992
- loading: metricInitLoading
992
+ loading: metricInitLoading,
993
+ formatMetricLatestValue: resourceOverviewProps.formatMetricLatestValue
993
994
  })), /*#__PURE__*/_react["default"].createElement(_EventsCard["default"], {
994
995
  alarmRiskList: alarmRiskList,
995
996
  closeDetailDrawer: onClose,
@@ -78,7 +78,8 @@ function ResourceOverviewMetric(props) {
78
78
  var topo = props.topo,
79
79
  type = props.type,
80
80
  data = props.data,
81
- loading = props.loading;
81
+ loading = props.loading,
82
+ formatMetricLatestValue = props.formatMetricLatestValue;
82
83
 
83
84
  function formatValue(itemData) {
84
85
  var _list;
@@ -87,7 +88,8 @@ function ResourceOverviewMetric(props) {
87
88
  metricItem = itemData.metricItem,
88
89
  list = itemData.list;
89
90
  var format = (0, _utils.metricValueFormat)({
90
- value: (_list = list[list.length - 1]) === null || _list === void 0 ? void 0 : _list.metricValue,
91
+ // 支持业务拓扑历史时间点指标值处理
92
+ value: formatMetricLatestValue ? formatMetricLatestValue(list) : (_list = list[list.length - 1]) === null || _list === void 0 ? void 0 : _list.metricValue,
91
93
  dataType: metricItem.dataType,
92
94
  dict: topo.dictCache.getDictObject(),
93
95
  unit: metricItem.unit,
@@ -37,7 +37,7 @@ function useMetricPolling(_ref) {
37
37
 
38
38
 
39
39
  var queryLinkMetricsRequest = (0, _ahooks.useRequest)(_services.queryLinkLatestMetrics, {
40
- pollingInterval: 1000 * 15,
40
+ pollingInterval: 60 * 1000,
41
41
  pollingWhenHidden: false,
42
42
  debounceInterval: 200,
43
43
  manual: true,
@@ -48,7 +48,7 @@ function useMetricPolling(_ref) {
48
48
  }
49
49
  });
50
50
  var queryInterfaceMetricsRequest = (0, _ahooks.useRequest)(_services.queryLinkInterfacesLatestMetrics, {
51
- pollingInterval: 1000 * 15,
51
+ pollingInterval: 60 * 1000,
52
52
  pollingWhenHidden: false,
53
53
  debounceInterval: 200,
54
54
  manual: true,
@@ -103,9 +103,9 @@ var useMetricModels = function useMetricModels(props) {
103
103
  }
104
104
 
105
105
  var request = (0, _ahooks.useRequest)(fetchData, {
106
- pollingInterval: 1000 * 5,
107
- // pollingWhenHidden: false,
108
- // debounceInterval: 1000,
106
+ pollingInterval: 1000 * 60,
107
+ pollingWhenHidden: false,
108
+ // debounceInterval: 200,
109
109
  manual: true,
110
110
  onSuccess: function onSuccess(newMetricModels) {
111
111
  var a = metricModels.map(function (item) {
@@ -65,6 +65,10 @@ function SearchWidget(props) {
65
65
 
66
66
  var onChange = function onChange(value) {
67
67
  setSearchValue(value);
68
+
69
+ if (!value) {
70
+ topo.searchElements(searchType, value);
71
+ }
68
72
  };
69
73
 
70
74
  return /*#__PURE__*/_react["default"].createElement(_search["default"], {
@@ -553,7 +553,7 @@ var _default = (0, _extends2["default"])({
553
553
  /**
554
554
  * 保存拓扑绘制数据(第三方库内部结构,无需关心含义)
555
555
  * @param {Number} id Topo ID
556
- * @param {String} data
556
+ * @param {String} data ht拓扑序列化数据
557
557
  * @returns
558
558
  */
559
559
  saveSerializeData: function saveSerializeData(id, data) {
@@ -563,7 +563,9 @@ var _default = (0, _extends2["default"])({
563
563
  switch (_context15.prev = _context15.next) {
564
564
  case 0:
565
565
  _context15.next = 2;
566
- return _componentTopologyUtils.request.post(API_ROOT + "/structure/" + id, data);
566
+ return _componentTopologyUtils.request.post(API_ROOT + "/structure/" + id, {
567
+ data: data
568
+ });
567
569
 
568
570
  case 2:
569
571
  return _context15.abrupt("return", _context15.sent);
@@ -13,8 +13,6 @@ var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends")
13
13
 
14
14
  var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
15
15
 
16
- var _topo = _interopRequireDefault(require("@riil-frontend/component-topology-common/es/services/topo"));
17
-
18
16
  /**
19
17
  * 链路新增、编辑 Model
20
18
  */
@@ -13,8 +13,6 @@ var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends")
13
13
 
14
14
  var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
15
15
 
16
- var _topo = _interopRequireDefault(require("@riil-frontend/component-topology-common/es/services/topo"));
17
-
18
16
  /**
19
17
  * 拓扑中心 Model
20
18
  *
@@ -13,8 +13,6 @@ var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends")
13
13
 
14
14
  var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
15
15
 
16
- var _topo = _interopRequireDefault(require("@riil-frontend/component-topology-common/es/services/topo"));
17
-
18
16
  /**
19
17
  * 拓扑链路相关 Model
20
18
  */
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@riil-frontend/component-topology",
3
- "version": "8.0.0-a.1",
3
+ "version": "8.0.0-a.10",
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@8.0.0-a.1/build/index.html",
119
+ "homepage": "https://unpkg.com/@riil-frontend/component-topology@8.0.0-a.10/build/index.html",
120
120
  "gitHead": "2da19ffccbb7ca60a8acf396e39f542c68bb33f5"
121
121
  }
File without changes
File without changes