@riil-frontend/component-topology 11.0.30 → 11.0.31

package/lib/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/hooks/useAlarmAndRiskData.js

@@ -40,116 +40,118 @@ var useAlarmAndRiskData = function useAlarmAndRiskData(props) {
 
   function _getAlarmRiskData() {
     _getAlarmRiskData = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(id) {
-      var _alarmList, _yield$resourceOvervi2, alarmList, _yield$alarmService$g2, _alarmList2, AllComponentsByCiId, _yield$service$getRis2, riskList;
+      var _alarmList, _yield$resourceOvervi, alarmList, _yield$alarmService$g, _alarmList2, AllComponentsByCiId, _yield$service$getRis, riskList;
 
       return _regenerator["default"].wrap(function _callee$(_context) {
-        while (1) switch (_context.prev = _context.next) {
-          case 0:
-            if (!isAppTopo) {
-              _context.next = 9;
+        while (1) {
+          switch (_context.prev = _context.next) {
+            case 0:
+              if (!isAppTopo) {
+                _context.next = 9;
+                break;
+              }
+
+              _context.next = 3;
+              return resourceOverviewProps === null || resourceOverviewProps === void 0 ? void 0 : resourceOverviewProps.getData({
+                id: id // metrics: topModelMetrics,
+
+              });
+
+            case 3:
+              _yield$resourceOvervi = _context.sent;
+              alarmList = _yield$resourceOvervi.alarms;
+              alarmList = ((_alarmList = alarmList) === null || _alarmList === void 0 ? void 0 : _alarmList.map(function (item) {
+                return {
+                  type: 'alarm',
+                  icon: 'gaojing-3',
+                  className: "alarm-color-icon-lv" + item.alertLevel,
+                  title: "[" + item.alertObject + "] " + item.alertTitle,
+                  link: "/default/pagecenter/alertDetail/view/" + item.alertId + "?alertId=" + item.alertId + "&resId=" + item.ciId + "&title=" + item.alertObject + "&ruleId=" + item.ruleId,
+                  time: item.createTime,
+                  status: item.status,
+                  params: [{
+                    alertId: item.alertId,
+                    status: 'dealing',
+                    userId: userId,
+                    isBaseAlert: false
+                  }]
+                };
+              })) || [];
+              setAlarmRiskList(alarmList);
+              _context.next = 24;
               break;
-            }
-
-            _context.next = 3;
-            return resourceOverviewProps === null || resourceOverviewProps === void 0 ? void 0 : resourceOverviewProps.getData({
-              id: id // metrics: topModelMetrics,
-
-            });
-
-          case 3:
-            _yield$resourceOvervi2 = _context.sent;
-            alarmList = _yield$resourceOvervi2.alarms;
-            alarmList = ((_alarmList = alarmList) === null || _alarmList === void 0 ? void 0 : _alarmList.map(function (item) {
-              return {
-                type: 'alarm',
-                icon: 'gaojing-3',
-                className: "alarm-color-icon-lv" + item.alertLevel,
-                title: "[" + item.alertObject + "] " + item.alertTitle,
-                link: "/default/pagecenter/alertDetail/view/" + item.alertId + "?alertId=" + item.alertId + "&resId=" + item.ciId + "&title=" + item.alertObject + "&ruleId=" + item.ruleId,
-                time: item.createTime,
-                status: item.status,
-                params: [{
-                  alertId: item.alertId,
-                  status: 'dealing',
-                  userId: userId,
-                  isBaseAlert: false
-                }]
-              };
-            })) || [];
-            setAlarmRiskList(alarmList);
-            _context.next = 24;
-            break;
-
-          case 9:
-            _context.next = 11;
-            return _alarm["default"].getAlarmByIds([id].concat(childrenIds), {
-              alertStatusList: ['toDeal', 'woDealing', 'dealing'],
-              // toDeal: 待处理, dealing：处理中
-              pageNum: 1,
-              pageSize: 10000,
-              sortField: 'alertLevel',
-              sortOrder: 'asc'
-            });
-
-          case 11:
-            _yield$alarmService$g2 = _context.sent;
-            _alarmList2 = _yield$alarmService$g2.datas;
-            // 2022-07-16 后端不支持多列排序，暂通过前端实现,按创建时间倒序
-            _alarmList2 = _alarmList2.sort(function (a, b) {
-              return b.createTime - a.createTime;
-            });
-            _alarmList2 = _alarmList2.map(function (item) {
-              return {
-                type: 'alarm',
-                icon: 'gaojing-3',
-                className: "alarm-color-icon-lv" + item.alertLevel,
-                title: "" + item.alertObject + item.alertTitle,
-                link: "/default/pagecenter/alertDetail/view/" + item.alertId + "?alertId=" + item.alertId + "&resId=" + item.ciId + "&title=" + item.alertObject + "&ruleId=" + item.ruleId,
-                time: item.createTime,
-                status: item.status,
-                params: [{
-                  alertId: item.alertId,
-                  status: 'dealing',
-                  userId: userId,
-                  isBaseAlert: false
-                }]
-              };
-            }); // fix NEWITOM-33635【南昌大学】网络拓扑上双击设备拉开的抽屉中无法看到风险
-
-            _context.next = 17;
-            return _overview["default"].queryAllComponentsByCiId(id);
-
-          case 17:
-            AllComponentsByCiId = _context.sent;
-            _context.next = 20;
-            return _overview["default"].getRiskByIds({
-              ciIdList: [id].concat(childrenIds, AllComponentsByCiId.map(function (item) {
-                return item.id;
-              })),
-              statusList: ['toDeal', 'dealing'],
-              current: 1,
-              pageSize: 10000
-            });
-
-          case 20:
-            _yield$service$getRis2 = _context.sent;
-            riskList = _yield$service$getRis2.content;
-            riskList = riskList.map(function (item) {
-              return {
-                type: 'risk',
-                icon: 'Overall_risk_full',
-                className: 'risk-icon',
-                title: "" + item.ciName + item.itemName,
-                link: "/default/healthCheck/riskReport/" + item.id + "?title=\u68C0\u67E5\u62A5\u544A",
-                time: item.firstFoundTime
-              };
-            }); // console.log('告警和风险', alarmList, riskList);
-
-            setAlarmRiskList([].concat(_alarmList2, riskList));
-
-          case 24:
-          case "end":
-            return _context.stop();
+
+            case 9:
+              _context.next = 11;
+              return _alarm["default"].getAlarmByIds([id].concat(childrenIds), {
+                alertStatusList: ['toDeal', 'woDealing', 'dealing'],
+                // toDeal: 待处理, dealing：处理中
+                pageNum: 1,
+                pageSize: 10000,
+                sortField: 'alertLevel',
+                sortOrder: 'asc'
+              });
+
+            case 11:
+              _yield$alarmService$g = _context.sent;
+              _alarmList2 = _yield$alarmService$g.datas;
+              // 2022-07-16 后端不支持多列排序，暂通过前端实现,按创建时间倒序
+              _alarmList2 = _alarmList2.sort(function (a, b) {
+                return b.createTime - a.createTime;
+              });
+              _alarmList2 = _alarmList2.map(function (item) {
+                return {
+                  type: 'alarm',
+                  icon: 'gaojing-3',
+                  className: "alarm-color-icon-lv" + item.alertLevel,
+                  title: "" + item.alertObject + item.alertTitle,
+                  link: "/default/pagecenter/alertDetail/view/" + item.alertId + "?alertId=" + item.alertId + "&resId=" + item.ciId + "&title=" + item.alertObject + "&ruleId=" + item.ruleId,
+                  time: item.createTime,
+                  status: item.status,
+                  params: [{
+                    alertId: item.alertId,
+                    status: 'dealing',
+                    userId: userId,
+                    isBaseAlert: false
+                  }]
+                };
+              }); // fix NEWITOM-33635【南昌大学】网络拓扑上双击设备拉开的抽屉中无法看到风险
+
+              _context.next = 17;
+              return _overview["default"].queryAllComponentsByCiId(id);
+
+            case 17:
+              AllComponentsByCiId = _context.sent;
+              _context.next = 20;
+              return _overview["default"].getRiskByIds({
+                ciIdList: [id].concat(childrenIds, AllComponentsByCiId.map(function (item) {
+                  return item.id;
+                })),
+                statusList: ['toDeal', 'dealing'],
+                current: 1,
+                pageSize: 10000
+              });
+
+            case 20:
+              _yield$service$getRis = _context.sent;
+              riskList = _yield$service$getRis.content;
+              riskList = riskList.map(function (item) {
+                return {
+                  type: 'risk',
+                  icon: 'Overall_risk_full',
+                  className: 'risk-icon',
+                  title: "" + item.ciName + item.itemName,
+                  link: "/default/healthCheck/riskReport/" + item.id + "?title=\u68C0\u67E5\u62A5\u544A",
+                  time: item.firstFoundTime
+                };
+              }); // console.log('告警和风险', alarmList, riskList);
+
+              setAlarmRiskList([].concat(_alarmList2, riskList));
+
+            case 24:
+            case "end":
+              return _context.stop();
+          }
         }
       }, _callee);
     }));

package/lib/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/hooks/useMetricModels.js

@@ -48,75 +48,77 @@ var useMetricModels = function useMetricModels(props) {
       var monitorMetrics, ciMonitorMetricModels, displayMetricModels, _metricCodes;
 
       return _regenerator["default"].wrap(function _callee$(_context) {
-        while (1) switch (_context.prev = _context.next) {
-          case 0:
-            _context.next = 2;
-            return ((resourceOverviewProps === null || resourceOverviewProps === void 0 ? void 0 : resourceOverviewProps.queryMonitorMetricCodes) || _getCiDisplayMetricModels.queryCiMonitorMetricCodes)(id);
-
-          case 2:
-            monitorMetrics = _context.sent;
-            ciMonitorMetricModels = ciTypeMeta.metrics.filter(function (m) {
-              return !!monitorMetrics.find(function (item) {
-                return item === m.code;
-              });
-            });
-
-            if (resourceData.attributes['network_link.is_crucial']) {
-              ciMonitorMetricModels.unshift({
-                changeValue: null,
-                code: "netDelayRatio",
-                id: "netDelayRatio",
-                isGoldMetric: true,
-                key: null,
-                name: "RTT时延",
-                unit: "ms"
-              });
-              ciMonitorMetricModels.unshift({
-                changeValue: null,
-                code: "retansRatio",
-                id: "retansRatio",
-                isGoldMetric: true,
-                key: null,
-                name: "重传率",
-                unit: "%"
+        while (1) {
+          switch (_context.prev = _context.next) {
+            case 0:
+              _context.next = 2;
+              return ((resourceOverviewProps === null || resourceOverviewProps === void 0 ? void 0 : resourceOverviewProps.queryMonitorMetricCodes) || _getCiDisplayMetricModels.queryCiMonitorMetricCodes)(id);
+
+            case 2:
+              monitorMetrics = _context.sent;
+              ciMonitorMetricModels = ciTypeMeta.metrics.filter(function (m) {
+                return !!monitorMetrics.find(function (item) {
+                  return item === m.code;
+                });
               });
-            } // 未监控不显示指标，临时在这里处理
+
+              if (resourceData.attributes['network_link.is_crucial']) {
+                ciMonitorMetricModels.unshift({
+                  changeValue: null,
+                  code: "netDelayRatio",
+                  id: "netDelayRatio",
+                  isGoldMetric: true,
+                  key: null,
+                  name: "RTT时延",
+                  unit: "ms"
+                });
+                ciMonitorMetricModels.unshift({
+                  changeValue: null,
+                  code: "retansRatio",
+                  id: "retansRatio",
+                  isGoldMetric: true,
+                  key: null,
+                  name: "重传率",
+                  unit: "%"
+                });
+              } // 未监控不显示指标，临时在这里处理
 
 
-            if (!isMonite) {
-              ciMonitorMetricModels = [];
-            }
+              if (!isMonite) {
+                ciMonitorMetricModels = [];
+              }
 
-            displayMetricModels = null; // 支持自定义显示指标范围
+              displayMetricModels = null; // 支持自定义显示指标范围
 
-            if (resourceOverviewProps !== null && resourceOverviewProps !== void 0 && resourceOverviewProps.getMetricCodes) {
-              _metricCodes = resourceOverviewProps === null || resourceOverviewProps === void 0 ? void 0 : resourceOverviewProps.getMetricCodes({
-                type: type,
-                id: id,
-                ciType: ciType
-              });
+              if (resourceOverviewProps !== null && resourceOverviewProps !== void 0 && resourceOverviewProps.getMetricCodes) {
+                _metricCodes = resourceOverviewProps === null || resourceOverviewProps === void 0 ? void 0 : resourceOverviewProps.getMetricCodes({
+                  type: type,
+                  id: id,
+                  ciType: ciType
+                });
 
-              if (_metricCodes) {
-                displayMetricModels = _metricCodes.map(function (code) {
-                  return ciMonitorMetricModels.find(function (item) {
-                    return item.code === code;
+                if (_metricCodes) {
+                  displayMetricModels = _metricCodes.map(function (code) {
+                    return ciMonitorMetricModels.find(function (item) {
+                      return item.code === code;
+                    });
+                  }).filter(function (item) {
+                    return !!item;
                   });
-                }).filter(function (item) {
-                  return !!item;
-                });
+                }
               }
-            }
 
-            if (!displayMetricModels) {
-              displayMetricModels = ciMonitorMetricModels;
-            } // displayMetricModels = displayMetricModels.slice(0, 6);
+              if (!displayMetricModels) {
+                displayMetricModels = ciMonitorMetricModels;
+              } // displayMetricModels = displayMetricModels.slice(0, 6);
 
 
-            return _context.abrupt("return", displayMetricModels);
+              return _context.abrupt("return", displayMetricModels);
 
-          case 10:
-          case "end":
-            return _context.stop();
+            case 10:
+            case "end":
+              return _context.stop();
+          }
         }
       }, _callee);
     }));

package/lib/core/viewer/components/plugins/ResourceDetail/components/WebConsole/WebConsoleForm/hooks/useWebConsole.js

@@ -28,29 +28,31 @@ function _queryWebConsoleUrlById() {
     var _list, list;
 
     return _regenerator["default"].wrap(function _callee2$(_context2) {
-      while (1) switch (_context2.prev = _context2.next) {
-        case 0:
-          _context2.prev = 0;
-          _context2.next = 3;
-          return _topo["default"].resourceWebUrl.list([id]);
+      while (1) {
+        switch (_context2.prev = _context2.next) {
+          case 0:
+            _context2.prev = 0;
+            _context2.next = 3;
+            return _topo["default"].resourceWebUrl.list([id]);
 
-        case 3:
-          list = _context2.sent;
-          ;
-          return _context2.abrupt("return", (_list = list[list.length - 1]) === null || _list === void 0 ? void 0 : _list.webUrl);
+          case 3:
+            list = _context2.sent;
+            ;
+            return _context2.abrupt("return", (_list = list[list.length - 1]) === null || _list === void 0 ? void 0 : _list.webUrl);
 
-        case 8:
-          _context2.prev = 8;
-          _context2.t0 = _context2["catch"](0);
+          case 8:
+            _context2.prev = 8;
+            _context2.t0 = _context2["catch"](0);
 
-          _rlog["default"].error('资源web控制台.加载数据异常', _context2.t0);
+            _rlog["default"].error('资源web控制台.加载数据异常', _context2.t0);
 
-        case 11:
-          return _context2.abrupt("return", null);
+          case 11:
+            return _context2.abrupt("return", null);
 
-        case 12:
-        case "end":
-          return _context2.stop();
+          case 12:
+          case "end":
+            return _context2.stop();
+        }
       }
     }, _callee2, null, [[0, 8]]);
   }));
@@ -90,17 +92,19 @@ function useWebConsole(props) {
   function _save() {
     _save = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(newWebConsoleUrl) {
       return _regenerator["default"].wrap(function _callee$(_context) {
-        while (1) switch (_context.prev = _context.next) {
-          case 0:
-            _context.next = 2;
-            return _topo["default"].resourceWebUrl.save(ciId, newWebConsoleUrl || null);
-
-          case 2:
-            _message["default"].success('保存成功');
-
-          case 3:
-          case "end":
-            return _context.stop();
+        while (1) {
+          switch (_context.prev = _context.next) {
+            case 0:
+              _context.next = 2;
+              return _topo["default"].resourceWebUrl.save(ciId, newWebConsoleUrl || null);
+
+            case 2:
+              _message["default"].success('保存成功');
+
+            case 3:
+            case "end":
+              return _context.stop();
+          }
         }
       }, _callee);
     }));

package/lib/core/viewer/components/plugins/ResourceDetail/getCiDisplayMetricModels.js

@@ -20,21 +20,23 @@ function _queryCiMonitorMetricStrategys() {
   _queryCiMonitorMetricStrategys = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(id) {
     var map, monitorMetrics;
     return _regenerator["default"].wrap(function _callee$(_context) {
-      while (1) switch (_context.prev = _context.next) {
-        case 0:
-          _context.next = 2;
-          return _componentTopologyUtils.request.post('/mdc/v1/api/strategy/queryMonitorMetrics', [id]);
+      while (1) {
+        switch (_context.prev = _context.next) {
+          case 0:
+            _context.next = 2;
+            return _componentTopologyUtils.request.post('/mdc/v1/api/strategy/queryMonitorMetrics', [id]);
 
-        case 2:
-          map = _context.sent;
-          monitorMetrics = (map[id] || []).filter(function (item) {
-            return item.metricType !== 'info';
-          });
-          return _context.abrupt("return", monitorMetrics);
+          case 2:
+            map = _context.sent;
+            monitorMetrics = (map[id] || []).filter(function (item) {
+              return item.metricType !== 'info';
+            });
+            return _context.abrupt("return", monitorMetrics);
 
-        case 5:
-        case "end":
-          return _context.stop();
+          case 5:
+          case "end":
+            return _context.stop();
+        }
       }
     }, _callee);
   }));
@@ -49,20 +51,22 @@ function _queryCiMonitorMetricCodes() {
   _queryCiMonitorMetricCodes = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2(id) {
     var arr;
     return _regenerator["default"].wrap(function _callee2$(_context2) {
-      while (1) switch (_context2.prev = _context2.next) {
-        case 0:
-          _context2.next = 2;
-          return queryCiMonitorMetricStrategys(id);
+      while (1) {
+        switch (_context2.prev = _context2.next) {
+          case 0:
+            _context2.next = 2;
+            return queryCiMonitorMetricStrategys(id);
 
-        case 2:
-          arr = _context2.sent;
-          return _context2.abrupt("return", arr.map(function (item) {
-            return item.code;
-          }));
+          case 2:
+            arr = _context2.sent;
+            return _context2.abrupt("return", arr.map(function (item) {
+              return item.code;
+            }));
 
-        case 4:
-        case "end":
-          return _context2.stop();
+          case 4:
+          case "end":
+            return _context2.stop();
+        }
       }
     }, _callee2);
   }));

package/lib/core/viewer/components/plugins/ResourceDetail/hooks/useUserId.js

@@ -29,38 +29,42 @@ function useUserId(props) {
   function _fetchUserId() {
     _fetchUserId = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2() {
       return _regenerator["default"].wrap(function _callee2$(_context2) {
-        while (1) switch (_context2.prev = _context2.next) {
-          case 0:
-            setUserId(function (prev) {
-              // console.log('获取用户id', prev);
-              // 如果已经获取过，就不再重新获取
-              if (!prev) {
-                (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee() {
-                  var res;
-                  return _regenerator["default"].wrap(function _callee$(_context) {
-                    while (1) switch (_context.prev = _context.next) {
-                      case 0:
-                        _context.next = 2;
-                        return _overview["default"].getUserId();
-
-                      case 2:
-                        res = _context.sent;
-                        setUserId((res === null || res === void 0 ? void 0 : res.user_id) || '');
-
-                      case 4:
-                      case "end":
-                        return _context.stop();
-                    }
-                  }, _callee);
-                }))();
-              }
-
-              return prev;
-            });
-
-          case 1:
-          case "end":
-            return _context2.stop();
+        while (1) {
+          switch (_context2.prev = _context2.next) {
+            case 0:
+              setUserId(function (prev) {
+                // console.log('获取用户id', prev);
+                // 如果已经获取过，就不再重新获取
+                if (!prev) {
+                  (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee() {
+                    var res;
+                    return _regenerator["default"].wrap(function _callee$(_context) {
+                      while (1) {
+                        switch (_context.prev = _context.next) {
+                          case 0:
+                            _context.next = 2;
+                            return _overview["default"].getUserId();
+
+                          case 2:
+                            res = _context.sent;
+                            setUserId((res === null || res === void 0 ? void 0 : res.user_id) || '');
+
+                          case 4:
+                          case "end":
+                            return _context.stop();
+                        }
+                      }
+                    }, _callee);
+                  }))();
+                }
+
+                return prev;
+              });
+
+            case 1:
+            case "end":
+              return _context2.stop();
+          }
         }
       }, _callee2);
     }));

package/lib/core/viewer/components/plugins/ResourceWebControllUrlSettingDialog.js

@@ -59,27 +59,29 @@ function ResourceWebControllUrlSettingDialog(props) {
       var _yield$field$validate, errors, values;
 
       return _regenerator["default"].wrap(function _callee$(_context) {
-        while (1) switch (_context.prev = _context.next) {
-          case 0:
-            _context.next = 2;
-            return field.validatePromise();
+        while (1) {
+          switch (_context.prev = _context.next) {
+            case 0:
+              _context.next = 2;
+              return field.validatePromise();
+
+            case 2:
+              _yield$field$validate = _context.sent;
+              errors = _yield$field$validate.errors;
+              values = _yield$field$validate.values;
+
+              if (errors) {
+                _context.next = 8;
+                break;
+              }
 
-          case 2:
-            _yield$field$validate = _context.sent;
-            errors = _yield$field$validate.errors;
-            values = _yield$field$validate.values;
-
-            if (errors) {
               _context.next = 8;
-              break;
-            }
-
-            _context.next = 8;
-            return resourceWebControllUrl.setting.saveResourceWebUrl(resourceWebControllUrl.setting.getCurrentId(), values.url);
+              return resourceWebControllUrl.setting.saveResourceWebUrl(resourceWebControllUrl.setting.getCurrentId(), values.url);
 
-          case 8:
-          case "end":
-            return _context.stop();
+            case 8:
+            case "end":
+              return _context.stop();
+          }
         }
       }, _callee);
     }));