@riil-frontend/component-topology 7.0.5 → 7.0.7

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.
@@ -23,7 +23,7 @@ import topoFactory from "./topoFactory";
23
23
  import ElementTagTipConfig from "./tagstips/ElementTagTipConfig";
24
24
  import SelectionModel from "./SelectionModel"; // eslint-disable-next-line no-undef
25
25
 
26
- var version = typeof "7.0.5" === 'string' ? "7.0.5" : null;
26
+ var version = typeof "7.0.7" === 'string' ? "7.0.7" : null;
27
27
  console.info("\u62D3\u6251\u7248\u672C: " + version);
28
28
  /**
29
29
  * 拓扑显示和编辑
@@ -29,17 +29,20 @@ export default {
29
29
  },
30
30
 
31
31
  /**
32
- * 受理告警
33
- * @param {*} params
32
+ * 查询主资源子组件,用于查风险
33
+ * @param {*} params
34
+ * @returns
34
35
  */
35
- handleAlarm: function handleAlarm(params) {
36
+ queryAllComponentsByCiId: function queryAllComponentsByCiId(id) {
36
37
  return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
37
38
  return _regeneratorRuntime.wrap(function _callee2$(_context2) {
38
39
  while (1) {
39
40
  switch (_context2.prev = _context2.next) {
40
41
  case 0:
41
42
  _context2.next = 2;
42
- return request.post('/alert/v1/api/alert/handleAlerts', params);
43
+ return request.post('/mdc/v1/api/cmdb/queryAllComponentsByCiId', {
44
+ id: id
45
+ });
43
46
 
44
47
  case 2:
45
48
  return _context2.abrupt("return", _context2.sent);
@@ -54,16 +57,17 @@ export default {
54
57
  },
55
58
 
56
59
  /**
57
- * 获取用户id
60
+ * 受理告警
61
+ * @param {*} params
58
62
  */
59
- getUserId: function getUserId() {
63
+ handleAlarm: function handleAlarm(params) {
60
64
  return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3() {
61
65
  return _regeneratorRuntime.wrap(function _callee3$(_context3) {
62
66
  while (1) {
63
67
  switch (_context3.prev = _context3.next) {
64
68
  case 0:
65
69
  _context3.next = 2;
66
- return request.post('/auth-ui/v1/api/user/token/checkToken');
70
+ return request.post('/alert/v1/api/alert/handleAlerts', params);
67
71
 
68
72
  case 2:
69
73
  return _context3.abrupt("return", _context3.sent);
@@ -78,16 +82,16 @@ export default {
78
82
  },
79
83
 
80
84
  /**
81
- * 查询概览设置
85
+ * 获取用户id
82
86
  */
83
- getOverviewConfig: function getOverviewConfig(topoId, templateCode) {
87
+ getUserId: function getUserId() {
84
88
  return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee4() {
85
89
  return _regeneratorRuntime.wrap(function _callee4$(_context4) {
86
90
  while (1) {
87
91
  switch (_context4.prev = _context4.next) {
88
92
  case 0:
89
93
  _context4.next = 2;
90
- return request.get("/topo/v1/api/config/overview/" + topoId + "/" + templateCode);
94
+ return request.post('/auth-ui/v1/api/user/token/checkToken');
91
95
 
92
96
  case 2:
93
97
  return _context4.abrupt("return", _context4.sent);
@@ -102,16 +106,16 @@ export default {
102
106
  },
103
107
 
104
108
  /**
105
- * 保存概览设置
109
+ * 查询概览设置
106
110
  */
107
- saveOverviewConfig: function saveOverviewConfig(topoId, templateCode, data) {
111
+ getOverviewConfig: function getOverviewConfig(topoId, templateCode) {
108
112
  return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee5() {
109
113
  return _regeneratorRuntime.wrap(function _callee5$(_context5) {
110
114
  while (1) {
111
115
  switch (_context5.prev = _context5.next) {
112
116
  case 0:
113
117
  _context5.next = 2;
114
- return request.post("/topo/v1/api/config/overview/" + topoId + "/" + templateCode, data);
118
+ return request.get("/topo/v1/api/config/overview/" + topoId + "/" + templateCode);
115
119
 
116
120
  case 2:
117
121
  return _context5.abrupt("return", _context5.sent);
@@ -126,16 +130,16 @@ export default {
126
130
  },
127
131
 
128
132
  /**
129
- * 查询资源指标信息(批量)
133
+ * 保存概览设置
130
134
  */
131
- getResMetricList: function getResMetricList(data) {
135
+ saveOverviewConfig: function saveOverviewConfig(topoId, templateCode, data) {
132
136
  return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee6() {
133
137
  return _regeneratorRuntime.wrap(function _callee6$(_context6) {
134
138
  while (1) {
135
139
  switch (_context6.prev = _context6.next) {
136
140
  case 0:
137
141
  _context6.next = 2;
138
- return request.post("/mdc/v1/api/metric/list", data);
142
+ return request.post("/topo/v1/api/config/overview/" + topoId + "/" + templateCode, data);
139
143
 
140
144
  case 2:
141
145
  return _context6.abrupt("return", _context6.sent);
@@ -150,16 +154,16 @@ export default {
150
154
  },
151
155
 
152
156
  /**
153
- * 查询上架设备类型
157
+ * 查询资源指标信息(批量)
154
158
  */
155
- getDeviceTypeList: function getDeviceTypeList() {
159
+ getResMetricList: function getResMetricList(data) {
156
160
  return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee7() {
157
161
  return _regeneratorRuntime.wrap(function _callee7$(_context7) {
158
162
  while (1) {
159
163
  switch (_context7.prev = _context7.next) {
160
164
  case 0:
161
165
  _context7.next = 2;
162
- return request.post("/room/v1/api/device/type/list", {});
166
+ return request.post("/mdc/v1/api/metric/list", data);
163
167
 
164
168
  case 2:
165
169
  return _context7.abrupt("return", _context7.sent);
@@ -174,16 +178,16 @@ export default {
174
178
  },
175
179
 
176
180
  /**
177
- * 批量查询指标数据
181
+ * 查询上架设备类型
178
182
  */
179
- getMetricList: function getMetricList(data) {
183
+ getDeviceTypeList: function getDeviceTypeList() {
180
184
  return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee8() {
181
185
  return _regeneratorRuntime.wrap(function _callee8$(_context8) {
182
186
  while (1) {
183
187
  switch (_context8.prev = _context8.next) {
184
188
  case 0:
185
189
  _context8.next = 2;
186
- return request.post("/mdc/v1/api/metric/list", data);
190
+ return request.post("/room/v1/api/device/type/list", {});
187
191
 
188
192
  case 2:
189
193
  return _context8.abrupt("return", _context8.sent);
@@ -198,16 +202,16 @@ export default {
198
202
  },
199
203
 
200
204
  /**
201
- * 查询CI信息(通用)
205
+ * 批量查询指标数据
202
206
  */
203
- commonQueryCiData: function commonQueryCiData(params) {
207
+ getMetricList: function getMetricList(data) {
204
208
  return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee9() {
205
209
  return _regeneratorRuntime.wrap(function _callee9$(_context9) {
206
210
  while (1) {
207
211
  switch (_context9.prev = _context9.next) {
208
212
  case 0:
209
213
  _context9.next = 2;
210
- return request.post("/mdc/v1/api/cmdb/commonQueryCiData", params);
214
+ return request.post("/mdc/v1/api/metric/list", data);
211
215
 
212
216
  case 2:
213
217
  return _context9.abrupt("return", _context9.sent);
@@ -219,5 +223,29 @@ export default {
219
223
  }
220
224
  }, _callee9);
221
225
  }))();
226
+ },
227
+
228
+ /**
229
+ * 查询CI信息(通用)
230
+ */
231
+ commonQueryCiData: function commonQueryCiData(params) {
232
+ return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee10() {
233
+ return _regeneratorRuntime.wrap(function _callee10$(_context10) {
234
+ while (1) {
235
+ switch (_context10.prev = _context10.next) {
236
+ case 0:
237
+ _context10.next = 2;
238
+ return request.post("/mdc/v1/api/cmdb/commonQueryCiData", params);
239
+
240
+ case 2:
241
+ return _context10.abrupt("return", _context10.sent);
242
+
243
+ case 3:
244
+ case "end":
245
+ return _context10.stop();
246
+ }
247
+ }
248
+ }, _callee10);
249
+ }))();
222
250
  }
223
251
  };
@@ -102,23 +102,40 @@ export default function ClusterMemberTableContainer(props) {
102
102
  while (1) {
103
103
  switch (_context.prev = _context.next) {
104
104
  case 0:
105
- _params$current = params.current, current = _params$current === void 0 ? 1 : _params$current, _params$pageSize = params.pageSize, pageSize = _params$pageSize === void 0 ? 20 : _params$pageSize, _params$sortBy = params.sortBy, sortBy = _params$sortBy === void 0 ? 'displayName' : _params$sortBy, _params$sortOrder = params.sortOrder, sortOrder = _params$sortOrder === void 0 ? 'asc' : _params$sortOrder;
106
- _context.next = 3;
105
+ _params$current = params.current, current = _params$current === void 0 ? 1 : _params$current, _params$pageSize = params.pageSize, pageSize = _params$pageSize === void 0 ? 20 : _params$pageSize, _params$sortBy = params.sortBy, sortBy = _params$sortBy === void 0 ? 'displayName' : _params$sortBy, _params$sortOrder = params.sortOrder, sortOrder = _params$sortOrder === void 0 ? 'asc' : _params$sortOrder; // 无成员时直接返回
106
+
107
+ if (childrenIds.length) {
108
+ _context.next = 3;
109
+ break;
110
+ }
111
+
112
+ return _context.abrupt("return", {
113
+ success: true,
114
+ data: {
115
+ dataSource: [],
116
+ total: 0,
117
+ current: 1,
118
+ pageSize: pageSize
119
+ }
120
+ });
121
+
122
+ case 3:
123
+ _context.next = 5;
107
124
  return Promise.all([commonQueryCiDataByIds(childrenIds, {
108
125
  pageIndex: current,
109
126
  pageSize: pageSize
110
127
  }), queryLatestMetrics(childrenIds, ['member_role'])]);
111
128
 
112
- case 3:
129
+ case 5:
113
130
  _yield$Promise$all = _context.sent;
114
131
  ciDataResult = _yield$Promise$all[0];
115
132
  memberRoleMetrics = _yield$Promise$all[1];
116
- _context.next = 8;
133
+ _context.next = 10;
117
134
  return topo.ciTyeCache.getCiTypeMap(ciDataResult.data.map(function (item) {
118
135
  return item.typeCode;
119
136
  }));
120
137
 
121
- case 8:
138
+ case 10:
122
139
  ciTypeMap = _context.sent;
123
140
  return _context.abrupt("return", {
124
141
  success: true,
@@ -138,7 +155,7 @@ export default function ClusterMemberTableContainer(props) {
138
155
  }
139
156
  });
140
157
 
141
- case 10:
158
+ case 12:
142
159
  case "end":
143
160
  return _context.stop();
144
161
  }
@@ -304,7 +304,7 @@ export default function ResourceOverview(props) {
304
304
 
305
305
  function _getAlarmRiskData() {
306
306
  _getAlarmRiskData = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3(id) {
307
- var _alarmList, _yield$resourceOvervi, alarmList, _yield$alarmService$g, _alarmList2, _yield$service$getRis, riskList;
307
+ var _alarmList, _yield$resourceOvervi, alarmList, _yield$alarmService$g, _alarmList2, AllComponentsByCiId, _yield$service$getRis, riskList;
308
308
 
309
309
  return _regeneratorRuntime.wrap(function _callee3$(_context3) {
310
310
  while (1) {
@@ -342,7 +342,7 @@ export default function ResourceOverview(props) {
342
342
  };
343
343
  })) || [];
344
344
  setAlarmRiskList(alarmList);
345
- _context3.next = 21;
345
+ _context3.next = 24;
346
346
  break;
347
347
 
348
348
  case 9:
@@ -379,16 +379,24 @@ export default function ResourceOverview(props) {
379
379
  isBaseAlert: false
380
380
  }]
381
381
  };
382
- });
382
+ }); // fix NEWITOM-33635【南昌大学】网络拓扑上双击设备拉开的抽屉中无法看到风险
383
+
383
384
  _context3.next = 17;
385
+ return service.queryAllComponentsByCiId(id);
386
+
387
+ case 17:
388
+ AllComponentsByCiId = _context3.sent;
389
+ _context3.next = 20;
384
390
  return service.getRiskByIds({
385
- ciIdList: [id].concat(childrenIds),
391
+ ciIdList: [id].concat(childrenIds, AllComponentsByCiId.map(function (item) {
392
+ return item.id;
393
+ })),
386
394
  statusList: ['toDeal', 'dealing'],
387
395
  current: 1,
388
396
  pageSize: 10000
389
397
  });
390
398
 
391
- case 17:
399
+ case 20:
392
400
  _yield$service$getRis = _context3.sent;
393
401
  riskList = _yield$service$getRis.content;
394
402
  riskList = riskList.map(function (item) {
@@ -404,7 +412,7 @@ export default function ResourceOverview(props) {
404
412
 
405
413
  setAlarmRiskList([].concat(_alarmList2, riskList));
406
414
 
407
- case 21:
415
+ case 24:
408
416
  case "end":
409
417
  return _context3.stop();
410
418
  }
@@ -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.5" === 'string' ? "7.0.5" : null;
57
+ var version = typeof "7.0.7" === 'string' ? "7.0.7" : null;
58
58
  console.info("\u62D3\u6251\u7248\u672C: " + version);
59
59
  /**
60
60
  * 拓扑显示和编辑
@@ -40,17 +40,20 @@ var _default = {
40
40
  },
41
41
 
42
42
  /**
43
- * 受理告警
44
- * @param {*} params
43
+ * 查询主资源子组件,用于查风险
44
+ * @param {*} params
45
+ * @returns
45
46
  */
46
- handleAlarm: function handleAlarm(params) {
47
+ queryAllComponentsByCiId: function queryAllComponentsByCiId(id) {
47
48
  return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2() {
48
49
  return _regenerator["default"].wrap(function _callee2$(_context2) {
49
50
  while (1) {
50
51
  switch (_context2.prev = _context2.next) {
51
52
  case 0:
52
53
  _context2.next = 2;
53
- return _componentTopologyUtils.request.post('/alert/v1/api/alert/handleAlerts', params);
54
+ return _componentTopologyUtils.request.post('/mdc/v1/api/cmdb/queryAllComponentsByCiId', {
55
+ id: id
56
+ });
54
57
 
55
58
  case 2:
56
59
  return _context2.abrupt("return", _context2.sent);
@@ -65,16 +68,17 @@ var _default = {
65
68
  },
66
69
 
67
70
  /**
68
- * 获取用户id
71
+ * 受理告警
72
+ * @param {*} params
69
73
  */
70
- getUserId: function getUserId() {
74
+ handleAlarm: function handleAlarm(params) {
71
75
  return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee3() {
72
76
  return _regenerator["default"].wrap(function _callee3$(_context3) {
73
77
  while (1) {
74
78
  switch (_context3.prev = _context3.next) {
75
79
  case 0:
76
80
  _context3.next = 2;
77
- return _componentTopologyUtils.request.post('/auth-ui/v1/api/user/token/checkToken');
81
+ return _componentTopologyUtils.request.post('/alert/v1/api/alert/handleAlerts', params);
78
82
 
79
83
  case 2:
80
84
  return _context3.abrupt("return", _context3.sent);
@@ -89,16 +93,16 @@ var _default = {
89
93
  },
90
94
 
91
95
  /**
92
- * 查询概览设置
96
+ * 获取用户id
93
97
  */
94
- getOverviewConfig: function getOverviewConfig(topoId, templateCode) {
98
+ getUserId: function getUserId() {
95
99
  return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee4() {
96
100
  return _regenerator["default"].wrap(function _callee4$(_context4) {
97
101
  while (1) {
98
102
  switch (_context4.prev = _context4.next) {
99
103
  case 0:
100
104
  _context4.next = 2;
101
- return _componentTopologyUtils.request.get("/topo/v1/api/config/overview/" + topoId + "/" + templateCode);
105
+ return _componentTopologyUtils.request.post('/auth-ui/v1/api/user/token/checkToken');
102
106
 
103
107
  case 2:
104
108
  return _context4.abrupt("return", _context4.sent);
@@ -113,16 +117,16 @@ var _default = {
113
117
  },
114
118
 
115
119
  /**
116
- * 保存概览设置
120
+ * 查询概览设置
117
121
  */
118
- saveOverviewConfig: function saveOverviewConfig(topoId, templateCode, data) {
122
+ getOverviewConfig: function getOverviewConfig(topoId, templateCode) {
119
123
  return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee5() {
120
124
  return _regenerator["default"].wrap(function _callee5$(_context5) {
121
125
  while (1) {
122
126
  switch (_context5.prev = _context5.next) {
123
127
  case 0:
124
128
  _context5.next = 2;
125
- return _componentTopologyUtils.request.post("/topo/v1/api/config/overview/" + topoId + "/" + templateCode, data);
129
+ return _componentTopologyUtils.request.get("/topo/v1/api/config/overview/" + topoId + "/" + templateCode);
126
130
 
127
131
  case 2:
128
132
  return _context5.abrupt("return", _context5.sent);
@@ -137,16 +141,16 @@ var _default = {
137
141
  },
138
142
 
139
143
  /**
140
- * 查询资源指标信息(批量)
144
+ * 保存概览设置
141
145
  */
142
- getResMetricList: function getResMetricList(data) {
146
+ saveOverviewConfig: function saveOverviewConfig(topoId, templateCode, data) {
143
147
  return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee6() {
144
148
  return _regenerator["default"].wrap(function _callee6$(_context6) {
145
149
  while (1) {
146
150
  switch (_context6.prev = _context6.next) {
147
151
  case 0:
148
152
  _context6.next = 2;
149
- return _componentTopologyUtils.request.post("/mdc/v1/api/metric/list", data);
153
+ return _componentTopologyUtils.request.post("/topo/v1/api/config/overview/" + topoId + "/" + templateCode, data);
150
154
 
151
155
  case 2:
152
156
  return _context6.abrupt("return", _context6.sent);
@@ -161,16 +165,16 @@ var _default = {
161
165
  },
162
166
 
163
167
  /**
164
- * 查询上架设备类型
168
+ * 查询资源指标信息(批量)
165
169
  */
166
- getDeviceTypeList: function getDeviceTypeList() {
170
+ getResMetricList: function getResMetricList(data) {
167
171
  return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee7() {
168
172
  return _regenerator["default"].wrap(function _callee7$(_context7) {
169
173
  while (1) {
170
174
  switch (_context7.prev = _context7.next) {
171
175
  case 0:
172
176
  _context7.next = 2;
173
- return _componentTopologyUtils.request.post("/room/v1/api/device/type/list", {});
177
+ return _componentTopologyUtils.request.post("/mdc/v1/api/metric/list", data);
174
178
 
175
179
  case 2:
176
180
  return _context7.abrupt("return", _context7.sent);
@@ -185,16 +189,16 @@ var _default = {
185
189
  },
186
190
 
187
191
  /**
188
- * 批量查询指标数据
192
+ * 查询上架设备类型
189
193
  */
190
- getMetricList: function getMetricList(data) {
194
+ getDeviceTypeList: function getDeviceTypeList() {
191
195
  return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee8() {
192
196
  return _regenerator["default"].wrap(function _callee8$(_context8) {
193
197
  while (1) {
194
198
  switch (_context8.prev = _context8.next) {
195
199
  case 0:
196
200
  _context8.next = 2;
197
- return _componentTopologyUtils.request.post("/mdc/v1/api/metric/list", data);
201
+ return _componentTopologyUtils.request.post("/room/v1/api/device/type/list", {});
198
202
 
199
203
  case 2:
200
204
  return _context8.abrupt("return", _context8.sent);
@@ -209,16 +213,16 @@ var _default = {
209
213
  },
210
214
 
211
215
  /**
212
- * 查询CI信息(通用)
216
+ * 批量查询指标数据
213
217
  */
214
- commonQueryCiData: function commonQueryCiData(params) {
218
+ getMetricList: function getMetricList(data) {
215
219
  return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee9() {
216
220
  return _regenerator["default"].wrap(function _callee9$(_context9) {
217
221
  while (1) {
218
222
  switch (_context9.prev = _context9.next) {
219
223
  case 0:
220
224
  _context9.next = 2;
221
- return _componentTopologyUtils.request.post("/mdc/v1/api/cmdb/commonQueryCiData", params);
225
+ return _componentTopologyUtils.request.post("/mdc/v1/api/metric/list", data);
222
226
 
223
227
  case 2:
224
228
  return _context9.abrupt("return", _context9.sent);
@@ -230,6 +234,30 @@ var _default = {
230
234
  }
231
235
  }, _callee9);
232
236
  }))();
237
+ },
238
+
239
+ /**
240
+ * 查询CI信息(通用)
241
+ */
242
+ commonQueryCiData: function commonQueryCiData(params) {
243
+ return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee10() {
244
+ return _regenerator["default"].wrap(function _callee10$(_context10) {
245
+ while (1) {
246
+ switch (_context10.prev = _context10.next) {
247
+ case 0:
248
+ _context10.next = 2;
249
+ return _componentTopologyUtils.request.post("/mdc/v1/api/cmdb/commonQueryCiData", params);
250
+
251
+ case 2:
252
+ return _context10.abrupt("return", _context10.sent);
253
+
254
+ case 3:
255
+ case "end":
256
+ return _context10.stop();
257
+ }
258
+ }
259
+ }, _callee10);
260
+ }))();
233
261
  }
234
262
  };
235
263
  exports["default"] = _default;
@@ -121,23 +121,40 @@ function ClusterMemberTableContainer(props) {
121
121
  while (1) {
122
122
  switch (_context.prev = _context.next) {
123
123
  case 0:
124
- _params$current = params.current, current = _params$current === void 0 ? 1 : _params$current, _params$pageSize = params.pageSize, pageSize = _params$pageSize === void 0 ? 20 : _params$pageSize, _params$sortBy = params.sortBy, sortBy = _params$sortBy === void 0 ? 'displayName' : _params$sortBy, _params$sortOrder = params.sortOrder, sortOrder = _params$sortOrder === void 0 ? 'asc' : _params$sortOrder;
125
- _context.next = 3;
124
+ _params$current = params.current, current = _params$current === void 0 ? 1 : _params$current, _params$pageSize = params.pageSize, pageSize = _params$pageSize === void 0 ? 20 : _params$pageSize, _params$sortBy = params.sortBy, sortBy = _params$sortBy === void 0 ? 'displayName' : _params$sortBy, _params$sortOrder = params.sortOrder, sortOrder = _params$sortOrder === void 0 ? 'asc' : _params$sortOrder; // 无成员时直接返回
125
+
126
+ if (childrenIds.length) {
127
+ _context.next = 3;
128
+ break;
129
+ }
130
+
131
+ return _context.abrupt("return", {
132
+ success: true,
133
+ data: {
134
+ dataSource: [],
135
+ total: 0,
136
+ current: 1,
137
+ pageSize: pageSize
138
+ }
139
+ });
140
+
141
+ case 3:
142
+ _context.next = 5;
126
143
  return Promise.all([(0, _cmdb.commonQueryCiDataByIds)(childrenIds, {
127
144
  pageIndex: current,
128
145
  pageSize: pageSize
129
146
  }), (0, _metric.queryLatestMetrics)(childrenIds, ['member_role'])]);
130
147
 
131
- case 3:
148
+ case 5:
132
149
  _yield$Promise$all = _context.sent;
133
150
  ciDataResult = _yield$Promise$all[0];
134
151
  memberRoleMetrics = _yield$Promise$all[1];
135
- _context.next = 8;
152
+ _context.next = 10;
136
153
  return topo.ciTyeCache.getCiTypeMap(ciDataResult.data.map(function (item) {
137
154
  return item.typeCode;
138
155
  }));
139
156
 
140
- case 8:
157
+ case 10:
141
158
  ciTypeMap = _context.sent;
142
159
  return _context.abrupt("return", {
143
160
  success: true,
@@ -157,7 +174,7 @@ function ClusterMemberTableContainer(props) {
157
174
  }
158
175
  });
159
176
 
160
- case 10:
177
+ case 12:
161
178
  case "end":
162
179
  return _context.stop();
163
180
  }
@@ -336,7 +336,7 @@ function ResourceOverview(props) {
336
336
 
337
337
  function _getAlarmRiskData() {
338
338
  _getAlarmRiskData = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee3(id) {
339
- var _alarmList, _yield$resourceOvervi, alarmList, _yield$alarmService$g, _alarmList2, _yield$service$getRis, riskList;
339
+ var _alarmList, _yield$resourceOvervi, alarmList, _yield$alarmService$g, _alarmList2, AllComponentsByCiId, _yield$service$getRis, riskList;
340
340
 
341
341
  return _regenerator["default"].wrap(function _callee3$(_context3) {
342
342
  while (1) {
@@ -374,7 +374,7 @@ function ResourceOverview(props) {
374
374
  };
375
375
  })) || [];
376
376
  setAlarmRiskList(alarmList);
377
- _context3.next = 21;
377
+ _context3.next = 24;
378
378
  break;
379
379
 
380
380
  case 9:
@@ -411,16 +411,24 @@ function ResourceOverview(props) {
411
411
  isBaseAlert: false
412
412
  }]
413
413
  };
414
- });
414
+ }); // fix NEWITOM-33635【南昌大学】网络拓扑上双击设备拉开的抽屉中无法看到风险
415
+
415
416
  _context3.next = 17;
417
+ return _overview["default"].queryAllComponentsByCiId(id);
418
+
419
+ case 17:
420
+ AllComponentsByCiId = _context3.sent;
421
+ _context3.next = 20;
416
422
  return _overview["default"].getRiskByIds({
417
- ciIdList: [id].concat(childrenIds),
423
+ ciIdList: [id].concat(childrenIds, AllComponentsByCiId.map(function (item) {
424
+ return item.id;
425
+ })),
418
426
  statusList: ['toDeal', 'dealing'],
419
427
  current: 1,
420
428
  pageSize: 10000
421
429
  });
422
430
 
423
- case 17:
431
+ case 20:
424
432
  _yield$service$getRis = _context3.sent;
425
433
  riskList = _yield$service$getRis.content;
426
434
  riskList = riskList.map(function (item) {
@@ -436,7 +444,7 @@ function ResourceOverview(props) {
436
444
 
437
445
  setAlarmRiskList([].concat(_alarmList2, riskList));
438
446
 
439
- case 21:
447
+ case 24:
440
448
  case "end":
441
449
  return _context3.stop();
442
450
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@riil-frontend/component-topology",
3
- "version": "7.0.5",
3
+ "version": "7.0.7",
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@7.0.5/build/index.html",
119
+ "homepage": "https://unpkg.com/@riil-frontend/component-topology@7.0.7/build/index.html",
120
120
  "gitHead": "2da19ffccbb7ca60a8acf396e39f542c68bb33f5"
121
121
  }