@riil-frontend/component-topology 3.5.6 → 3.5.9

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 (12) hide show
  1. package/build/index.js +1 -1
  2. package/es/core/models/TopoApp.js +1 -1
  3. package/es/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/ResourceOverview.js +30 -34
  4. package/es/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/hooks/useMetricModels.js +13 -9
  5. package/es/core/viewer/components/plugins/ResourceDetail/getCiDisplayMetricModels.js +32 -10
  6. package/es/topoCenter/components/editor/propertyViews/edge/addLinkDrawer/components/editLinkInfo.js +3 -5
  7. package/lib/core/models/TopoApp.js +1 -1
  8. package/lib/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/ResourceOverview.js +30 -34
  9. package/lib/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/hooks/useMetricModels.js +13 -9
  10. package/lib/core/viewer/components/plugins/ResourceDetail/getCiDisplayMetricModels.js +34 -11
  11. package/lib/topoCenter/components/editor/propertyViews/edge/addLinkDrawer/components/editLinkInfo.js +3 -5
  12. package/package.json +2 -2
package/es/core/models/TopoApp.js CHANGED
@@ -20,7 +20,7 @@ import { updateEdgeExpanded } from "../utils/edgeUtil";
20
20
  import PluginManager from "./PluginManager";
21
21
  import topoFactory from "./topoFactory"; // eslint-disable-next-line no-undef
22
22
 
23
- var version = typeof "3.5.6" === 'string' ? "3.5.6" : null;
23
+ var version = typeof "3.5.9" === 'string' ? "3.5.9" : null;
24
24
  console.info("\u62D3\u6251\u7248\u672C: " + version);
25
25
  /**
26
26
  * 拓扑显示和编辑
package/es/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/ResourceOverview.js CHANGED
@@ -127,6 +127,9 @@ export default function ResourceOverview(props) {
127
127
  monitorMetricModels = _useMetricModels.metricModels,
128
128
  metricInitLoading = _useMetricModels.initLoading;
129
129
 
130
+ topo.resourceOverviewDrawer = {
131
+ refreshData: init
132
+ };
130
133
  useEffect(function () {
131
134
  if (monitorMetricModels) {
132
135
  init();
@@ -141,14 +144,13 @@ export default function ResourceOverview(props) {
141
144
  _init = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
142
145
  var _topo$options$resourc, _modelAttributeMap$ow, _modelAttributeMap$, _modelAttributeMap$2, _modelAttributeMap$3, _modelAttributeMap$di, _modelAttributeMap$ip, _modelAttributeMap$as, _modelAttributeMap$5, _modelAttributeMap$6, _modelAttributeMap$so, _attributeMap$source_, _modelAttributeMap$de, _attributeMap$destina, _modelAttributeMap$ne;
143
146
 
144
- var displayMetricModels, ciName, modelAttributeMap, domain, isAppTopoFlag, attributeMap, metrics, res_address, _attributeMap$, rated_bandwidth, _modelAttributeMap$4, connect_type;
147
+ var ciName, modelAttributeMap, domain, isAppTopoFlag, attributeMap, metrics, res_address, _attributeMap$, rated_bandwidth, _modelAttributeMap$4, connect_type;
145
148
 
146
149
  return _regeneratorRuntime.wrap(function _callee$(_context) {
147
150
  while (1) {
148
151
  switch (_context.prev = _context.next) {
149
152
  case 0:
150
- console.log('初始化/更新概览 props', props);
151
- displayMetricModels = monitorMetricModels; // 指标模型
153
+ console.log('初始化/更新概览 props', props); // 指标模型
152
154
 
153
155
  ciName = ciTypeMeta.displayName, modelAttributeMap = ciTypeMeta.attributeMap, domain = ciTypeMeta.domain; // 应用拓扑处理
154
156
 
@@ -157,14 +159,14 @@ export default function ResourceOverview(props) {
157
159
  setIsAppTopo(isAppTopoFlag);
158
160
 
159
161
  if (!isAppTopoFlag) {
160
- _context.next = 9;
162
+ _context.next = 8;
161
163
  break;
162
164
  }
163
165
 
164
- initAppTopo(displayMetricModels, modelAttributeMap, ciName, domain);
166
+ initAppTopo(monitorMetricModels, modelAttributeMap, ciName, domain);
165
167
  return _context.abrupt("return");
166
168
 
167
- case 9:
169
+ case 8:
168
170
  // 拓扑（默认） ---------------------------
169
171
  // 基本信息
170
172
  attributeMap = ciAttrAndMetricData.attributeMap, metrics = ciAttrAndMetricData.metrics;
@@ -174,24 +176,24 @@ export default function ResourceOverview(props) {
174
176
  res_address = false;
175
177
 
176
178
  if (!((_modelAttributeMap$ow = modelAttributeMap.owned_computer_room) !== null && _modelAttributeMap$ow !== void 0 && _modelAttributeMap$ow.userVisible)) {
177
- _context.next = 18;
179
+ _context.next = 17;
178
180
  break;
179
181
  }
180
182
 
181
- _context.next = 15;
183
+ _context.next = 14;
182
184
  return getAddressFormat(attributeMap);
183
185
 
184
- case 15:
186
+ case 14:
185
187
  res_address = _context.sent;
186
- _context.next = 19;
188
+ _context.next = 18;
187
189
  break;
188
190
 
189
- case 18:
191
+ case 17:
190
192
  if ((_modelAttributeMap$ = modelAttributeMap[ciType + ".computer_room"]) !== null && _modelAttributeMap$ !== void 0 && _modelAttributeMap$.userVisible || (_modelAttributeMap$2 = modelAttributeMap[ciType + ".area"]) !== null && _modelAttributeMap$2 !== void 0 && _modelAttributeMap$2.userVisible) {
191
193
  res_address = attributeMap[ciType + ".computer_room "] || attributeMap[ciType + ".area"] ? " " + (((_attributeMap$ = attributeMap[ciType + ".area_object"]) === null || _attributeMap$ === void 0 ? void 0 : _attributeMap$.displayName) || '') + " " + (attributeMap[ciType + ".computer_room"] || '') : false;
192
194
  }
193
195
 
194
- case 19:
196
+ case 18:
195
197
  // 链路带宽(取实际带宽)
196
198
  rated_bandwidth = false;
197
199
 
@@ -223,7 +225,7 @@ export default function ResourceOverview(props) {
223
225
  'network_link.connect_type': (_modelAttributeMap$ne = modelAttributeMap['network_link.connect_type']) !== null && _modelAttributeMap$ne !== void 0 && _modelAttributeMap$ne.userVisible ? connect_type : false
224
226
  }); // 资源/链路-关键指标 数据 metrics，模型 topo.ciTyeCache.getCiType(ciType)
225
227
 
226
- setIndicator(displayMetricModels.map(function (item) {
228
+ setIndicator(monitorMetricModels.map(function (item) {
227
229
  var _findItem;
228
230
 
229
231
  return _extends({}, item, {
@@ -233,7 +235,7 @@ export default function ResourceOverview(props) {
233
235
 
234
236
  getAlarmRiskData(id);
235
237
 
236
- case 25:
238
+ case 24:
237
239
  case "end":
238
240
  return _context.stop();
239
241
  }
@@ -258,49 +260,44 @@ export default function ResourceOverview(props) {
258
260
  while (1) {
259
261
  switch (_context2.prev = _context2.next) {
260
262
  case 0:
261
- topo.resourceOverviewDrawer = {
262
- refreshData: function refreshData() {
263
- init();
264
- }
265
- };
266
- _context2.next = 3;
263
+ _context2.next = 2;
267
264
  return (_topo$options$resourc2 = topo.options.resourceOverviewDrawer) === null || _topo$options$resourc2 === void 0 ? void 0 : _topo$options$resourc2.getData({
268
265
  id: id,
269
266
  metrics: topModelMetrics
270
267
  });
271
268
 
272
- case 3:
269
+ case 2:
273
270
  _yield$topo$options$r = _context2.sent;
274
271
  metrics = _yield$topo$options$r.metrics;
275
272
  alarmList = _yield$topo$options$r.alarms;
276
273
  console.log('应用拓扑 参数获取', metrics, alarmList);
277
- _context2.next = 9;
274
+ _context2.next = 8;
278
275
  return getAttribute(id);
279
276
 
280
- case 9:
277
+ case 8:
281
278
  attributeMap = _context2.sent;
282
279
  // 位置
283
280
  res_address = false;
284
281
 
285
282
  if (!((_modelAttributeMap$ow2 = modelAttributeMap.owned_computer_room) !== null && _modelAttributeMap$ow2 !== void 0 && _modelAttributeMap$ow2.userVisible)) {
286
- _context2.next = 17;
283
+ _context2.next = 16;
287
284
  break;
288
285
  }
289
286
 
290
- _context2.next = 14;
287
+ _context2.next = 13;
291
288
  return getAddressFormat(attributeMap);
292
289
 
293
- case 14:
290
+ case 13:
294
291
  res_address = _context2.sent;
295
- _context2.next = 18;
292
+ _context2.next = 17;
296
293
  break;
297
294
 
298
- case 17:
295
+ case 16:
299
296
  if ((_modelAttributeMap$7 = modelAttributeMap[ciType + ".computer_room"]) !== null && _modelAttributeMap$7 !== void 0 && _modelAttributeMap$7.userVisible || (_modelAttributeMap$8 = modelAttributeMap[ciType + ".area"]) !== null && _modelAttributeMap$8 !== void 0 && _modelAttributeMap$8.userVisible) {
300
297
  res_address = attributeMap[ciType + ".computer_room "] || attributeMap[ciType + ".area"] ? " " + (((_attributeMap$2 = attributeMap[ciType + ".area_object"]) === null || _attributeMap$2 === void 0 ? void 0 : _attributeMap$2.displayName) || '') + " " + (attributeMap[ciType + ".computer_room"] || '') : false;
301
298
  }
302
299
 
303
- case 18:
300
+ case 17:
304
301
  setBaseInfo({
305
302
  // 资源
306
303
  // display_name: modelAttributeMap['display_name'] ? attributeMap.display_name : false,
@@ -340,7 +337,7 @@ export default function ResourceOverview(props) {
340
337
  })) || [];
341
338
  setAlarmRiskList(alarmList);
342
339
 
343
- case 22:
340
+ case 21:
344
341
  case "end":
345
342
  return _context2.stop();
346
343
  }
@@ -584,7 +581,7 @@ export default function ResourceOverview(props) {
584
581
 
585
582
  function _alarmRiskOperation() {
586
583
  _alarmRiskOperation = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee6(type, params) {
587
- var res, _topo$ciTyeCache$getC, modelMetrics, ciName, modelAttributeMap, domain, topModelMetrics;
584
+ var res, _topo$ciTyeCache$getC, ciName, modelAttributeMap, domain;
588
585
 
589
586
  return _regeneratorRuntime.wrap(function _callee6$(_context6) {
590
587
  while (1) {
@@ -604,9 +601,8 @@ export default function ResourceOverview(props) {
604
601
  _Message.success('受理成功');
605
602
 
606
603
  if (isAppTopo) {
607
- _topo$ciTyeCache$getC = topo.ciTyeCache.getCiType(ciType), modelMetrics = _topo$ciTyeCache$getC.metrics, ciName = _topo$ciTyeCache$getC.displayName, modelAttributeMap = _topo$ciTyeCache$getC.attributeMap, domain = _topo$ciTyeCache$getC.domain;
608
- topModelMetrics = modelMetrics.slice(0, 6);
609
- initAppTopo(topModelMetrics, modelAttributeMap, ciName, domain);
604
+ _topo$ciTyeCache$getC = topo.ciTyeCache.getCiType(ciType), ciName = _topo$ciTyeCache$getC.displayName, modelAttributeMap = _topo$ciTyeCache$getC.attributeMap, domain = _topo$ciTyeCache$getC.domain;
605
+ initAppTopo(monitorMetricModels, modelAttributeMap, ciName, domain);
610
606
  } else {
611
607
  getAlarmRiskData(id);
612
608
  }
package/es/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/hooks/useMetricModels.js CHANGED
@@ -2,7 +2,7 @@ import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
2
2
  import _regeneratorRuntime from "@babel/runtime/regenerator";
3
3
  import { useRequest } from 'ahooks';
4
4
  import { useEffect, useState } from 'react';
5
- import queryCiMonitorMetricModels from "../../../getCiDisplayMetricModels";
5
+ import { queryCiMonitorMetricCodes } from "../../../getCiDisplayMetricModels";
6
6
  /**
7
7
  * 概览指标定义
8
8
  * @param {*} props
@@ -33,21 +33,25 @@ var useMetricModels = function useMetricModels(props) {
33
33
 
34
34
  function _fetchData() {
35
35
  _fetchData = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
36
- var mmm, displayMetricModels, _metricCodes;
36
+ var monitorMetrics, ciMonitorMetricModels, displayMetricModels, _metricCodes;
37
37
 
38
38
  return _regeneratorRuntime.wrap(function _callee$(_context) {
39
39
  while (1) {
40
40
  switch (_context.prev = _context.next) {
41
41
  case 0:
42
42
  _context.next = 2;
43
- return queryCiMonitorMetricModels(id, ciTypeMeta.metrics);
43
+ return ((resourceOverviewProps === null || resourceOverviewProps === void 0 ? void 0 : resourceOverviewProps.queryMonitorMetricCodes) || queryCiMonitorMetricCodes)(id);
44
44
 
45
45
  case 2:
46
- mmm = _context.sent;
46
+ monitorMetrics = _context.sent;
47
+ ciMonitorMetricModels = ciTypeMeta.metrics.filter(function (m) {
48
+ return !!monitorMetrics.find(function (item) {
49
+ return item === m.code;
50
+ });
51
+ }); // 未监控不显示指标，临时在这里处理
47
52
 
48
- // 未监控不显示指标，临时在这里处理
49
53
  if (!isMonite) {
50
- mmm = [];
54
+ ciMonitorMetricModels = [];
51
55
  }
52
56
 
53
57
  displayMetricModels = null; // 支持自定义显示指标范围
@@ -61,7 +65,7 @@ var useMetricModels = function useMetricModels(props) {
61
65
 
62
66
  if (_metricCodes) {
63
67
  displayMetricModels = _metricCodes.map(function (code) {
64
- return mmm.find(function (item) {
68
+ return ciMonitorMetricModels.find(function (item) {
65
69
  return item.code === code;
66
70
  });
67
71
  }).filter(function (item) {
@@ -71,13 +75,13 @@ var useMetricModels = function useMetricModels(props) {
71
75
  }
72
76
 
73
77
  if (!displayMetricModels) {
74
- displayMetricModels = mmm;
78
+ displayMetricModels = ciMonitorMetricModels;
75
79
  }
76
80
 
77
81
  displayMetricModels = displayMetricModels.slice(0, 6);
78
82
  return _context.abrupt("return", displayMetricModels);
79
83
 
80
- case 9:
84
+ case 10:
81
85
  case "end":
82
86
  return _context.stop();
83
87
  }
package/es/core/viewer/components/plugins/ResourceDetail/getCiDisplayMetricModels.js CHANGED
@@ -1,12 +1,12 @@
1
1
  import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
2
2
  import _regeneratorRuntime from "@babel/runtime/regenerator";
3
3
  import { request } from '@riil-frontend/component-topology-utils';
4
- export default function queryCiMonitorMetricModels(_x, _x2) {
5
- return _queryCiMonitorMetricModels.apply(this, arguments);
4
+ export function queryCiMonitorMetricStrategys(_x) {
5
+ return _queryCiMonitorMetricStrategys.apply(this, arguments);
6
6
  }
7
7
 
8
- function _queryCiMonitorMetricModels() {
9
- _queryCiMonitorMetricModels = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(id, metricModels) {
8
+ function _queryCiMonitorMetricStrategys() {
9
+ _queryCiMonitorMetricStrategys = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(id) {
10
10
  var map, monitorMetrics;
11
11
  return _regeneratorRuntime.wrap(function _callee$(_context) {
12
12
  while (1) {
@@ -20,11 +20,7 @@ function _queryCiMonitorMetricModels() {
20
20
  monitorMetrics = (map[id] || []).filter(function (item) {
21
21
  return item.metricType !== 'info';
22
22
  });
23
- return _context.abrupt("return", metricModels.filter(function (m) {
24
- return !!monitorMetrics.find(function (item) {
25
- return item.code === m.code;
26
- });
27
- }));
23
+ return _context.abrupt("return", monitorMetrics);
28
24
 
29
25
  case 5:
30
26
  case "end":
@@ -33,5 +29,31 @@ function _queryCiMonitorMetricModels() {
33
29
  }
34
30
  }, _callee);
35
31
  }));
36
- return _queryCiMonitorMetricModels.apply(this, arguments);
32
+ return _queryCiMonitorMetricStrategys.apply(this, arguments);
33
+ }
34
+
35
+ export function queryCiMonitorMetricCodes(_x2) {
36
+ return _queryCiMonitorMetricCodes.apply(this, arguments);
37
+ }
38
+
39
+ function _queryCiMonitorMetricCodes() {
40
+ _queryCiMonitorMetricCodes = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(id) {
41
+ var arr;
42
+ return _regeneratorRuntime.wrap(function _callee2$(_context2) {
43
+ while (1) {
44
+ switch (_context2.prev = _context2.next) {
45
+ case 0:
46
+ arr = queryCiMonitorMetricStrategys(id);
47
+ return _context2.abrupt("return", arr.map(function (item) {
48
+ return item.code;
49
+ }));
50
+
51
+ case 2:
52
+ case "end":
53
+ return _context2.stop();
54
+ }
55
+ }
56
+ }, _callee2);
57
+ }));
58
+ return _queryCiMonitorMetricCodes.apply(this, arguments);
37
59
  }
package/es/topoCenter/components/editor/propertyViews/edge/addLinkDrawer/components/editLinkInfo.js CHANGED
@@ -370,16 +370,14 @@ export default function EditLinkInfo(props) {
370
370
  label: "\u94FE\u63A5\u65B9\u5F0F"
371
371
  }), /*#__PURE__*/React.createElement(RadioGroup, {
372
372
  name: "connect_type",
373
- disabled: true,
373
+ disabled: !isAdd,
374
374
  onChange: function onChange(v) {
375
375
  connectHandleChange(v);
376
376
  }
377
377
  }, /*#__PURE__*/React.createElement(_Radio, {
378
378
  id: "phy",
379
- value: "phy" // disabled={
380
- // target.ciType === "customNode" || !targetValue.ipAddress||targetValue.ports.length === 0
381
- // }
382
-
379
+ value: "phy",
380
+ disabled: target.ciType === "customNode" || !targetValue.ipAddress || targetValue.ports.length === 0
383
381
  }, "\u7269\u7406/\u805A\u5408"), /*#__PURE__*/React.createElement(_Radio, {
384
382
  id: "exit",
385
383
  value: "exit"
package/lib/core/models/TopoApp.js CHANGED
@@ -48,7 +48,7 @@ var _PluginManager = _interopRequireDefault(require("./PluginManager"));
48
48
  var _topoFactory = _interopRequireDefault(require("./topoFactory"));
49
49
 
50
50
  // eslint-disable-next-line no-undef
51
- var version = typeof "3.5.6" === 'string' ? "3.5.6" : null;
51
+ var version = typeof "3.5.9" === 'string' ? "3.5.9" : null;
52
52
  console.info("\u62D3\u6251\u7248\u672C: " + version);
53
53
  /**
54
54
  * 拓扑显示和编辑
package/lib/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/ResourceOverview.js CHANGED
@@ -159,6 +159,9 @@ function ResourceOverview(props) {
159
159
  monitorMetricModels = _useMetricModels.metricModels,
160
160
  metricInitLoading = _useMetricModels.initLoading;
161
161
 
162
+ topo.resourceOverviewDrawer = {
163
+ refreshData: init
164
+ };
162
165
  (0, _react.useEffect)(function () {
163
166
  if (monitorMetricModels) {
164
167
  init();
@@ -173,14 +176,13 @@ function ResourceOverview(props) {
173
176
  _init = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee() {
174
177
  var _topo$options$resourc, _modelAttributeMap$ow, _modelAttributeMap$, _modelAttributeMap$2, _modelAttributeMap$3, _modelAttributeMap$di, _modelAttributeMap$ip, _modelAttributeMap$as, _modelAttributeMap$5, _modelAttributeMap$6, _modelAttributeMap$so, _attributeMap$source_, _modelAttributeMap$de, _attributeMap$destina, _modelAttributeMap$ne;
175
178
 
176
- var displayMetricModels, ciName, modelAttributeMap, domain, isAppTopoFlag, attributeMap, metrics, res_address, _attributeMap$, rated_bandwidth, _modelAttributeMap$4, connect_type;
179
+ var ciName, modelAttributeMap, domain, isAppTopoFlag, attributeMap, metrics, res_address, _attributeMap$, rated_bandwidth, _modelAttributeMap$4, connect_type;
177
180
 
178
181
  return _regenerator["default"].wrap(function _callee$(_context) {
179
182
  while (1) {
180
183
  switch (_context.prev = _context.next) {
181
184
  case 0:
182
- console.log('初始化/更新概览 props', props);
183
- displayMetricModels = monitorMetricModels; // 指标模型
185
+ console.log('初始化/更新概览 props', props); // 指标模型
184
186
 
185
187
  ciName = ciTypeMeta.displayName, modelAttributeMap = ciTypeMeta.attributeMap, domain = ciTypeMeta.domain; // 应用拓扑处理
186
188
 
@@ -189,14 +191,14 @@ function ResourceOverview(props) {
189
191
  setIsAppTopo(isAppTopoFlag);
190
192
 
191
193
  if (!isAppTopoFlag) {
192
- _context.next = 9;
194
+ _context.next = 8;
193
195
  break;
194
196
  }
195
197
 
196
- initAppTopo(displayMetricModels, modelAttributeMap, ciName, domain);
198
+ initAppTopo(monitorMetricModels, modelAttributeMap, ciName, domain);
197
199
  return _context.abrupt("return");
198
200
 
199
- case 9:
201
+ case 8:
200
202
  // 拓扑（默认） ---------------------------
201
203
  // 基本信息
202
204
  attributeMap = ciAttrAndMetricData.attributeMap, metrics = ciAttrAndMetricData.metrics;
@@ -206,24 +208,24 @@ function ResourceOverview(props) {
206
208
  res_address = false;
207
209
 
208
210
  if (!((_modelAttributeMap$ow = modelAttributeMap.owned_computer_room) !== null && _modelAttributeMap$ow !== void 0 && _modelAttributeMap$ow.userVisible)) {
209
- _context.next = 18;
211
+ _context.next = 17;
210
212
  break;
211
213
  }
212
214
 
213
- _context.next = 15;
215
+ _context.next = 14;
214
216
  return getAddressFormat(attributeMap);
215
217
 
216
- case 15:
218
+ case 14:
217
219
  res_address = _context.sent;
218
- _context.next = 19;
220
+ _context.next = 18;
219
221
  break;
220
222
 
221
- case 18:
223
+ case 17:
222
224
  if ((_modelAttributeMap$ = modelAttributeMap[ciType + ".computer_room"]) !== null && _modelAttributeMap$ !== void 0 && _modelAttributeMap$.userVisible || (_modelAttributeMap$2 = modelAttributeMap[ciType + ".area"]) !== null && _modelAttributeMap$2 !== void 0 && _modelAttributeMap$2.userVisible) {
223
225
  res_address = attributeMap[ciType + ".computer_room "] || attributeMap[ciType + ".area"] ? " " + (((_attributeMap$ = attributeMap[ciType + ".area_object"]) === null || _attributeMap$ === void 0 ? void 0 : _attributeMap$.displayName) || '') + " " + (attributeMap[ciType + ".computer_room"] || '') : false;
224
226
  }
225
227
 
226
- case 19:
228
+ case 18:
227
229
  // 链路带宽(取实际带宽)
228
230
  rated_bandwidth = false;
229
231
 
@@ -255,7 +257,7 @@ function ResourceOverview(props) {
255
257
  'network_link.connect_type': (_modelAttributeMap$ne = modelAttributeMap['network_link.connect_type']) !== null && _modelAttributeMap$ne !== void 0 && _modelAttributeMap$ne.userVisible ? connect_type : false
256
258
  }); // 资源/链路-关键指标 数据 metrics，模型 topo.ciTyeCache.getCiType(ciType)
257
259
 
258
- setIndicator(displayMetricModels.map(function (item) {
260
+ setIndicator(monitorMetricModels.map(function (item) {
259
261
  var _findItem;
260
262
 
261
263
  return (0, _extends2["default"])({}, item, {
@@ -265,7 +267,7 @@ function ResourceOverview(props) {
265
267
 
266
268
  getAlarmRiskData(id);
267
269
 
268
- case 25:
270
+ case 24:
269
271
  case "end":
270
272
  return _context.stop();
271
273
  }
@@ -290,49 +292,44 @@ function ResourceOverview(props) {
290
292
  while (1) {
291
293
  switch (_context2.prev = _context2.next) {
292
294
  case 0:
293
- topo.resourceOverviewDrawer = {
294
- refreshData: function refreshData() {
295
- init();
296
- }
297
- };
298
- _context2.next = 3;
295
+ _context2.next = 2;
299
296
  return (_topo$options$resourc2 = topo.options.resourceOverviewDrawer) === null || _topo$options$resourc2 === void 0 ? void 0 : _topo$options$resourc2.getData({
300
297
  id: id,
301
298
  metrics: topModelMetrics
302
299
  });
303
300
 
304
- case 3:
301
+ case 2:
305
302
  _yield$topo$options$r = _context2.sent;
306
303
  metrics = _yield$topo$options$r.metrics;
307
304
  alarmList = _yield$topo$options$r.alarms;
308
305
  console.log('应用拓扑 参数获取', metrics, alarmList);
309
- _context2.next = 9;
306
+ _context2.next = 8;
310
307
  return getAttribute(id);
311
308
 
312
- case 9:
309
+ case 8:
313
310
  attributeMap = _context2.sent;
314
311
  // 位置
315
312
  res_address = false;
316
313
 
317
314
  if (!((_modelAttributeMap$ow2 = modelAttributeMap.owned_computer_room) !== null && _modelAttributeMap$ow2 !== void 0 && _modelAttributeMap$ow2.userVisible)) {
318
- _context2.next = 17;
315
+ _context2.next = 16;
319
316
  break;
320
317
  }
321
318
 
322
- _context2.next = 14;
319
+ _context2.next = 13;
323
320
  return getAddressFormat(attributeMap);
324
321
 
325
- case 14:
322
+ case 13:
326
323
  res_address = _context2.sent;
327
- _context2.next = 18;
324
+ _context2.next = 17;
328
325
  break;
329
326
 
330
- case 17:
327
+ case 16:
331
328
  if ((_modelAttributeMap$7 = modelAttributeMap[ciType + ".computer_room"]) !== null && _modelAttributeMap$7 !== void 0 && _modelAttributeMap$7.userVisible || (_modelAttributeMap$8 = modelAttributeMap[ciType + ".area"]) !== null && _modelAttributeMap$8 !== void 0 && _modelAttributeMap$8.userVisible) {
332
329
  res_address = attributeMap[ciType + ".computer_room "] || attributeMap[ciType + ".area"] ? " " + (((_attributeMap$2 = attributeMap[ciType + ".area_object"]) === null || _attributeMap$2 === void 0 ? void 0 : _attributeMap$2.displayName) || '') + " " + (attributeMap[ciType + ".computer_room"] || '') : false;
333
330
  }
334
331
 
335
- case 18:
332
+ case 17:
336
333
  setBaseInfo({
337
334
  // 资源
338
335
  // display_name: modelAttributeMap['display_name'] ? attributeMap.display_name : false,
@@ -372,7 +369,7 @@ function ResourceOverview(props) {
372
369
  })) || [];
373
370
  setAlarmRiskList(alarmList);
374
371
 
375
- case 22:
372
+ case 21:
376
373
  case "end":
377
374
  return _context2.stop();
378
375
  }
@@ -616,7 +613,7 @@ function ResourceOverview(props) {
616
613
 
617
614
  function _alarmRiskOperation() {
618
615
  _alarmRiskOperation = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee6(type, params) {
619
- var res, _topo$ciTyeCache$getC, modelMetrics, ciName, modelAttributeMap, domain, topModelMetrics;
616
+ var res, _topo$ciTyeCache$getC, ciName, modelAttributeMap, domain;
620
617
 
621
618
  return _regenerator["default"].wrap(function _callee6$(_context6) {
622
619
  while (1) {
@@ -636,9 +633,8 @@ function ResourceOverview(props) {
636
633
  _message["default"].success('受理成功');
637
634
 
638
635
  if (isAppTopo) {
639
- _topo$ciTyeCache$getC = topo.ciTyeCache.getCiType(ciType), modelMetrics = _topo$ciTyeCache$getC.metrics, ciName = _topo$ciTyeCache$getC.displayName, modelAttributeMap = _topo$ciTyeCache$getC.attributeMap, domain = _topo$ciTyeCache$getC.domain;
640
- topModelMetrics = modelMetrics.slice(0, 6);
641
- initAppTopo(topModelMetrics, modelAttributeMap, ciName, domain);
636
+ _topo$ciTyeCache$getC = topo.ciTyeCache.getCiType(ciType), ciName = _topo$ciTyeCache$getC.displayName, modelAttributeMap = _topo$ciTyeCache$getC.attributeMap, domain = _topo$ciTyeCache$getC.domain;
637
+ initAppTopo(monitorMetricModels, modelAttributeMap, ciName, domain);
642
638
  } else {
643
639
  getAlarmRiskData(id);
644
640
  }
package/lib/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/hooks/useMetricModels.js CHANGED
@@ -13,7 +13,7 @@ var _ahooks = require("ahooks");
13
13
 
14
14
  var _react = require("react");
15
15
 
16
- var _getCiDisplayMetricModels = _interopRequireDefault(require("../../../getCiDisplayMetricModels"));
16
+ var _getCiDisplayMetricModels = require("../../../getCiDisplayMetricModels");
17
17
 
18
18
  /**
19
19
  * 概览指标定义
@@ -44,21 +44,25 @@ var useMetricModels = function useMetricModels(props) {
44
44
 
45
45
  function _fetchData() {
46
46
  _fetchData = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee() {
47
- var mmm, displayMetricModels, _metricCodes;
47
+ var monitorMetrics, ciMonitorMetricModels, displayMetricModels, _metricCodes;
48
48
 
49
49
  return _regenerator["default"].wrap(function _callee$(_context) {
50
50
  while (1) {
51
51
  switch (_context.prev = _context.next) {
52
52
  case 0:
53
53
  _context.next = 2;
54
- return (0, _getCiDisplayMetricModels["default"])(id, ciTypeMeta.metrics);
54
+ return ((resourceOverviewProps === null || resourceOverviewProps === void 0 ? void 0 : resourceOverviewProps.queryMonitorMetricCodes) || _getCiDisplayMetricModels.queryCiMonitorMetricCodes)(id);
55
55
 
56
56
  case 2:
57
- mmm = _context.sent;
57
+ monitorMetrics = _context.sent;
58
+ ciMonitorMetricModels = ciTypeMeta.metrics.filter(function (m) {
59
+ return !!monitorMetrics.find(function (item) {
60
+ return item === m.code;
61
+ });
62
+ }); // 未监控不显示指标，临时在这里处理
58
63
 
59
- // 未监控不显示指标，临时在这里处理
60
64
  if (!isMonite) {
61
- mmm = [];
65
+ ciMonitorMetricModels = [];
62
66
  }
63
67
 
64
68
  displayMetricModels = null; // 支持自定义显示指标范围
@@ -72,7 +76,7 @@ var useMetricModels = function useMetricModels(props) {
72
76
 
73
77
  if (_metricCodes) {
74
78
  displayMetricModels = _metricCodes.map(function (code) {
75
- return mmm.find(function (item) {
79
+ return ciMonitorMetricModels.find(function (item) {
76
80
  return item.code === code;
77
81
  });
78
82
  }).filter(function (item) {
@@ -82,13 +86,13 @@ var useMetricModels = function useMetricModels(props) {
82
86
  }
83
87
 
84
88
  if (!displayMetricModels) {
85
- displayMetricModels = mmm;
89
+ displayMetricModels = ciMonitorMetricModels;
86
90
  }
87
91
 
88
92
  displayMetricModels = displayMetricModels.slice(0, 6);
89
93
  return _context.abrupt("return", displayMetricModels);
90
94
 
91
- case 9:
95
+ case 10:
92
96
  case "end":
93
97
  return _context.stop();
94
98
  }