@riil-frontend/component-topology 11.0.30 → 11.0.31

package/lib/core/store/models/topoAlarm.js

@@ -59,21 +59,23 @@ function _default(topo) {
 
           return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee() {
             return _regenerator["default"].wrap(function _callee$(_context) {
-              while (1) switch (_context.prev = _context.next) {
-                case 0:
-                  _this.update({
-                    alarmDoc: {},
-                    alarmList: [],
-                    alarmRecord: [],
-                    risks: [],
-                    relateTopoAlarm: {}
-                  });
-
-                  return _context.abrupt("return", "resetAlarmDoc Over");
-
-                case 2:
-                case "end":
-                  return _context.stop();
+              while (1) {
+                switch (_context.prev = _context.next) {
+                  case 0:
+                    _this.update({
+                      alarmDoc: {},
+                      alarmList: [],
+                      alarmRecord: [],
+                      risks: [],
+                      relateTopoAlarm: {}
+                    });
+
+                    return _context.abrupt("return", "resetAlarmDoc Over");
+
+                  case 2:
+                  case "end":
+                    return _context.stop();
+                }
               }
             }, _callee);
           }))();
@@ -85,165 +87,145 @@ function _default(topo) {
           return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2() {
             var alarmdata, _state$topoAlarm, alarmDoc, alarmRecord, currentAlarmList, _state$topoMod, resAndMetrics, topoData, resIdsList, doc, record, _loop, i, alarmlist, eqFlag;
 
-            return _regenerator["default"].wrap(function _callee2$(_context3) {
-              while (1) switch (_context3.prev = _context3.next) {
-                case 0:
-                  alarmdata = conditions.alarmdata;
-                  _state$topoAlarm = state.topoAlarm, alarmDoc = _state$topoAlarm.alarmDoc, alarmRecord = _state$topoAlarm.alarmRecord, currentAlarmList = _state$topoAlarm.alarmList;
-                  _state$topoMod = state.topoMod, resAndMetrics = _state$topoMod.resAndMetrics, topoData = _state$topoMod.topoData;
-                  resIdsList = resAndMetrics.resIdsList;
-                  doc = (0, _extends2["default"])({}, alarmDoc); // rlog.debug(
-                  //   " 归档处理告警信息.doc, alarmdata,resIdsList,alarmRecord",
-                  //   doc,
-                  //   alarmdata,
-                  //   resIdsList,
-                  //   alarmRecord
-                  // );
-                  // rlog.debug("topoAlarmMod.combAlarmData-alarmDoc, alarmRecord ", alarmDoc, alarmRecord );
-
-                  record = _lodash["default"].uniq(alarmRecord); // rlog.debug("告警归档-doc, record, alarmRecord", doc, record, alarmRecord);
-
-                  _loop = /*#__PURE__*/_regenerator["default"].mark(function _loop() {
-                    var item, rid, newArr, sliceTag, old, _newArr, _newArr2;
-
-                    return _regenerator["default"].wrap(function _loop$(_context2) {
-                      while (1) switch (_context2.prev = _context2.next) {
-                        case 0:
-                          item = (0, _extends2["default"])({}, alarmdata[i]); // demo mock
-                          // if (item.alertId === 9144) {
-                          //   item.level = Math.floor(Math.random() * 4) + 1;
-                          //   if (item.level === 4) {
-                          //     item.status = "reset";
-                          //   }
-                          // }
-                          // over
-
-                          rid = item.id; // rlog.debug("处理一条告警", item, rid, item.status, record);
-
-                          if ((resIdsList || []).indexOf(rid) >= 0) {
-                            if (record.indexOf(item.alertId) < 0) {
-                              if (showAlarmStatus.indexOf(item.status) >= 0) {
-                                // rlog.debug("这是一条新告警", item);
-                                record.push(item.alertId);
-
-                                if (doc.hasOwnProperty(rid)) {
-                                  if (doc[rid].findIndex(function (x) {
-                                    return x.alertId === item.alertId;
-                                  }) < 0) {
-                                    newArr = [].concat(doc[rid]);
-                                    newArr.push(item);
-                                    doc[rid] = newArr.sort(sortList);
-                                  }
-                                } else {
-                                  doc[rid] = [item];
-                                }
-                              } else {
-                                _rlog["default"].warn("接收到异常或已关闭的告警", item);
+            return _regenerator["default"].wrap(function _callee2$(_context2) {
+              while (1) {
+                switch (_context2.prev = _context2.next) {
+                  case 0:
+                    alarmdata = conditions.alarmdata;
+                    _state$topoAlarm = state.topoAlarm, alarmDoc = _state$topoAlarm.alarmDoc, alarmRecord = _state$topoAlarm.alarmRecord, currentAlarmList = _state$topoAlarm.alarmList;
+                    _state$topoMod = state.topoMod, resAndMetrics = _state$topoMod.resAndMetrics, topoData = _state$topoMod.topoData;
+                    resIdsList = resAndMetrics.resIdsList;
+                    doc = (0, _extends2["default"])({}, alarmDoc); // rlog.debug(
+                    //   " 归档处理告警信息.doc, alarmdata,resIdsList,alarmRecord",
+                    //   doc,
+                    //   alarmdata,
+                    //   resIdsList,
+                    //   alarmRecord
+                    // );
+                    // rlog.debug("topoAlarmMod.combAlarmData-alarmDoc, alarmRecord ", alarmDoc, alarmRecord );
+
+                    record = _lodash["default"].uniq(alarmRecord); // rlog.debug("告警归档-doc, record, alarmRecord", doc, record, alarmRecord);
+
+                    _loop = function _loop(i) {
+                      var item = (0, _extends2["default"])({}, alarmdata[i]); // demo mock
+                      // if (item.alertId === 9144) {
+                      //   item.level = Math.floor(Math.random() * 4) + 1;
+                      //   if (item.level === 4) {
+                      //     item.status = "reset";
+                      //   }
+                      // }
+                      // over
+
+                      var rid = item.id; // rlog.debug("处理一条告警", item, rid, item.status, record);
+
+                      if ((resIdsList || []).indexOf(rid) >= 0) {
+                        if (record.indexOf(item.alertId) < 0) {
+                          if (showAlarmStatus.indexOf(item.status) >= 0) {
+                            // rlog.debug("这是一条新告警", item);
+                            record.push(item.alertId);
+
+                            if (doc.hasOwnProperty(rid)) {
+                              if (doc[rid].findIndex(function (x) {
+                                return x.alertId === item.alertId;
+                              }) < 0) {
+                                var newArr = [].concat(doc[rid]);
+                                newArr.push(item);
+                                doc[rid] = newArr.sort(sortList);
                               }
                             } else {
-                              sliceTag = doc[rid].findIndex(function (x) {
-                                return x.alertId === item.alertId;
-                              }); // rlog.debug(
-                              //   "已有资源告警-doc-rid-record-sliceTag-item",
-                              //   doc,
-                              //   rid,
-                              //   record,
-                              //   sliceTag,
-                              //   item
-                              // );
-
-                              if (showAlarmStatus.indexOf(item.status) >= 0) {
-                                if (item.status === "change") {
-                                  old = doc[rid][sliceTag];
-
-                                  if (old.level !== item.level) {
-                                    _newArr = [].concat(doc[rid]);
-
-                                    _newArr.splice(sliceTag, 1, (0, _extends2["default"])({}, item, {
-                                      status: old.status
-                                    }));
-
-                                    doc[rid] = _newArr.sort(sortList);
-
-                                    _rlog["default"].debug("告警级别变更", doc[rid], item);
-                                  } else {
-                                    _rlog["default"].debug("接收到异常的重复告警", item);
-                                  }
-                                } else {// rlog.debug("重复告警", item);
-                                }
+                              doc[rid] = [item];
+                            }
+                          } else {
+                            _rlog["default"].warn("接收到异常或已关闭的告警", item);
+                          }
+                        } else {
+                          var sliceTag = doc[rid].findIndex(function (x) {
+                            return x.alertId === item.alertId;
+                          }); // rlog.debug(
+                          //   "已有资源告警-doc-rid-record-sliceTag-item",
+                          //   doc,
+                          //   rid,
+                          //   record,
+                          //   sliceTag,
+                          //   item
+                          // );
+
+                          if (showAlarmStatus.indexOf(item.status) >= 0) {
+                            if (item.status === "change") {
+                              var old = doc[rid][sliceTag];
+
+                              if (old.level !== item.level) {
+                                var _newArr = [].concat(doc[rid]);
+
+                                _newArr.splice(sliceTag, 1, (0, _extends2["default"])({}, item, {
+                                  status: old.status
+                                }));
+
+                                doc[rid] = _newArr.sort(sortList);
+
+                                _rlog["default"].debug("告警级别变更", doc[rid], item);
                               } else {
-                                if (sliceTag >= 0) {
-                                  _newArr2 = [].concat(doc[rid]);
-
-                                  _newArr2.splice(sliceTag, 1);
+                                _rlog["default"].debug("接收到异常的重复告警", item);
+                              }
+                            } else {// rlog.debug("重复告警", item);
+                            }
+                          } else {
+                            if (sliceTag >= 0) {
+                              var _newArr2 = [].concat(doc[rid]);
 
-                                  doc[rid] = _newArr2;
-                                }
+                              _newArr2.splice(sliceTag, 1);
 
-                                _rlog["default"].debug("该告警移除状态-status", item.status, doc[rid], doc);
+                              doc[rid] = _newArr2;
+                            }
 
-                                if (doc[rid].length === 0) {
-                                  delete doc[rid];
-                                }
+                            _rlog["default"].debug("该告警移除状态-status", item.status, doc[rid], doc);
 
-                                record.splice(record.indexOf(item.alertId), 1);
-                              }
+                            if (doc[rid].length === 0) {
+                              delete doc[rid];
                             }
+
+                            record.splice(record.indexOf(item.alertId), 1);
                           }
+                        }
+                      }
+                    };
+
+                    for (i = 0; i < alarmdata.length; i++) {
+                      _loop(i);
+                    } // rlog.debug("准备发送的告警", doc, record);
+
+
+                    alarmlist = _lodash["default"].compact(Object.keys(doc).map(function (id) {
+                      if (doc[id].length > 0) {
+                        var alarmObj = (0, _extends2["default"])({}, doc[id][0], {
+                          id: id
+                        }); // 传递给HT时，链路要用r开头的id
+                        // rlog.debug('xxxxxxxxxxxxxxxxxxxx', doc[id][0], alarmObj.status);
 
-                        case 3:
-                        case "end":
-                          return _context2.stop();
+                        return showAlarmStatus.indexOf(alarmObj.status) >= 0 ? alarmObj : null;
+                      } else {
+                        return null;
                       }
-                    }, _loop);
-                  });
-                  i = 0;
-
-                case 8:
-                  if (!(i < alarmdata.length)) {
-                    _context3.next = 13;
-                    break;
-                  }
-
-                  return _context3.delegateYield(_loop(), "t0", 10);
-
-                case 10:
-                  i++;
-                  _context3.next = 8;
-                  break;
-
-                case 13:
-                  // rlog.debug("准备发送的告警", doc, record);
-                  alarmlist = _lodash["default"].compact(Object.keys(doc).map(function (id) {
-                    if (doc[id].length > 0) {
-                      var alarmObj = (0, _extends2["default"])({}, doc[id][0], {
-                        id: id
-                      }); // 传递给HT时，链路要用r开头的id
-                      // rlog.debug('xxxxxxxxxxxxxxxxxxxx', doc[id][0], alarmObj.status);
-
-                      return showAlarmStatus.indexOf(alarmObj.status) >= 0 ? alarmObj : null;
-                    } else {
-                      return null;
-                    }
-                  }));
-                  eqFlag = _lodash["default"].isEqual(_lodash["default"].sortBy(alarmlist), _lodash["default"].sortBy(currentAlarmList));
-
-                  _rlog["default"].debug("告警归档结束", eqFlag, currentAlarmList, alarmlist, doc, record);
-
-                  _this2.update({
-                    alarmDoc: doc,
-                    alarmRecord: record,
-                    alarmList: eqFlag ? currentAlarmList : alarmlist
-                  });
-
-                  return _context3.abrupt("return", {
-                    eqFlag: eqFlag,
-                    alarmlist: alarmlist
-                  });
-
-                case 18:
-                case "end":
-                  return _context3.stop();
+                    }));
+                    eqFlag = _lodash["default"].isEqual(_lodash["default"].sortBy(alarmlist), _lodash["default"].sortBy(currentAlarmList));
+
+                    _rlog["default"].debug("告警归档结束", eqFlag, currentAlarmList, alarmlist, doc, record);
+
+                    _this2.update({
+                      alarmDoc: doc,
+                      alarmRecord: record,
+                      alarmList: eqFlag ? currentAlarmList : alarmlist
+                    });
+
+                    return _context2.abrupt("return", {
+                      eqFlag: eqFlag,
+                      alarmlist: alarmlist
+                    });
+
+                  case 13:
+                  case "end":
+                    return _context2.stop();
+                }
               }
             }, _callee2);
           }))();

package/lib/core/store/models/topoBaseInfoOverview.js

@@ -39,10 +39,12 @@ var _default = {
       init: function init(payload, rootState) {
         return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee() {
           return _regenerator["default"].wrap(function _callee$(_context) {
-            while (1) switch (_context.prev = _context.next) {
-              case 0:
-              case "end":
-                return _context.stop();
+            while (1) {
+              switch (_context.prev = _context.next) {
+                case 0:
+                case "end":
+                  return _context.stop();
+              }
             }
           }, _callee);
         }))();

package/lib/core/store/models/topoBizMod.js

@@ -48,17 +48,19 @@ function _default(engine) {
 
           return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee() {
             return _regenerator["default"].wrap(function _callee$(_context) {
-              while (1) switch (_context.prev = _context.next) {
-                case 0:
-                  _this.update({
-                    resAndMetrics: conditions
-                  });
-
-                  return _context.abrupt("return", {});
-
-                case 2:
-                case "end":
-                  return _context.stop();
+              while (1) {
+                switch (_context.prev = _context.next) {
+                  case 0:
+                    _this.update({
+                      resAndMetrics: conditions
+                    });
+
+                    return _context.abrupt("return", {});
+
+                  case 2:
+                  case "end":
+                    return _context.stop();
+                }
               }
             }, _callee);
           }))();
@@ -68,29 +70,31 @@ function _default(engine) {
           return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2() {
             var resIdsList, result;
             return _regenerator["default"].wrap(function _callee2$(_context2) {
-              while (1) switch (_context2.prev = _context2.next) {
-                case 0:
-                  resIdsList = state.topoBizMod.resAndMetrics.resIdsList; // rlog.debug('根据ci的id获取属性的值-getCiArrByIds', resIdsList);
-                  // const ciIds = encodeURIComponent(resIdsList);
-
-                  _context2.prev = 1;
-                  _context2.next = 4;
-                  return _topo["default"].getBatchCiArr({
-                    ids: resIdsList
-                  });
-
-                case 4:
-                  result = _context2.sent;
-                  return _context2.abrupt("return", result.content);
-
-                case 8:
-                  _context2.prev = 8;
-                  _context2.t0 = _context2["catch"](1);
-                  return _context2.abrupt("return", null);
-
-                case 11:
-                case "end":
-                  return _context2.stop();
+              while (1) {
+                switch (_context2.prev = _context2.next) {
+                  case 0:
+                    resIdsList = state.topoBizMod.resAndMetrics.resIdsList; // rlog.debug('根据ci的id获取属性的值-getCiArrByIds', resIdsList);
+                    // const ciIds = encodeURIComponent(resIdsList);
+
+                    _context2.prev = 1;
+                    _context2.next = 4;
+                    return _topo["default"].getBatchCiArr({
+                      ids: resIdsList
+                    });
+
+                  case 4:
+                    result = _context2.sent;
+                    return _context2.abrupt("return", result.content);
+
+                  case 8:
+                    _context2.prev = 8;
+                    _context2.t0 = _context2["catch"](1);
+                    return _context2.abrupt("return", null);
+
+                  case 11:
+                  case "end":
+                    return _context2.stop();
+                }
               }
             }, _callee2, null, [[1, 8]]);
           }))();