@riil-frontend/component-topology 11.0.33 → 11.0.35

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

@@ -191,69 +191,67 @@ function _default(topoApp) {
           return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee() {
             var data, isViewGroup, parseGroup, viewGroup, resources, groups;
             return _regenerator["default"].wrap(function _callee$(_context) {
-              while (1) {
-                switch (_context.prev = _context.next) {
-                  case 0:
-                    _context.next = 2;
-                    return topoApp.serverApi.getConditions(topoApp.id);
-
-                  case 2:
-                    data = _context.sent;
-
-                    if ((0, _utils.isAvailableArray)(data)) {
-                      _context.next = 5;
-                      break;
-                    }
+              while (1) switch (_context.prev = _context.next) {
+                case 0:
+                  _context.next = 2;
+                  return topoApp.serverApi.getConditions(topoApp.id);
+
+                case 2:
+                  data = _context.sent;
+
+                  if ((0, _utils.isAvailableArray)(data)) {
+                    _context.next = 5;
+                    break;
+                  }
+
+                  return _context.abrupt("return");
+
+                case 5:
+                  isViewGroup = function isViewGroup(item) {
+                    var _item$topoGroup;
+
+                    return ((_item$topoGroup = item.topoGroup) === null || _item$topoGroup === void 0 ? void 0 : _item$topoGroup.parentId) === _topo.TOPO_PARENT_ID;
+                  };
+
+                  parseGroup = function parseGroup(item) {
+                    var _item$topoGroup2 = item.topoGroup,
+                        topoGroup = _item$topoGroup2 === void 0 ? {} : _item$topoGroup2,
+                        condition = item.condition;
+                    var id = topoGroup.id,
+                        name = topoGroup.name,
+                        layout = topoGroup.layout,
+                        order = topoGroup.order,
+                        parentId = topoGroup.parentId,
+                        styles = topoGroup.styles;
+                    var groupStyles = styles && JSON.parse(styles) || {};
+                    return {
+                      id: id,
+                      name: name,
+                      layout: layout,
+                      order: order,
+                      parentId: parentId,
+                      expanded: groupStyles.expanded || false,
+                      resources: conditionToRes(condition)
+                    };
+                  }; // 视图
 
-                    return _context.abrupt("return");
 
-                  case 5:
-                    isViewGroup = function isViewGroup(item) {
-                      var _item$topoGroup;
+                  viewGroup = data.filter(isViewGroup).map(parseGroup)[0];
+                  resources = viewGroup ? viewGroup.resources : {}; // 容器
 
-                      return ((_item$topoGroup = item.topoGroup) === null || _item$topoGroup === void 0 ? void 0 : _item$topoGroup.parentId) === _topo.TOPO_PARENT_ID;
-                    };
+                  groups = data.filter(function (item) {
+                    return !isViewGroup(item);
+                  }).map(parseGroup);
 
-                    parseGroup = function parseGroup(item) {
-                      var _item$topoGroup2 = item.topoGroup,
-                          topoGroup = _item$topoGroup2 === void 0 ? {} : _item$topoGroup2,
-                          condition = item.condition;
-                      var id = topoGroup.id,
-                          name = topoGroup.name,
-                          layout = topoGroup.layout,
-                          order = topoGroup.order,
-                          parentId = topoGroup.parentId,
-                          styles = topoGroup.styles;
-                      var groupStyles = styles && JSON.parse(styles) || {};
-                      return {
-                        id: id,
-                        name: name,
-                        layout: layout,
-                        order: order,
-                        parentId: parentId,
-                        expanded: groupStyles.expanded || false,
-                        resources: conditionToRes(condition)
-                      };
-                    }; // 视图
-
-
-                    viewGroup = data.filter(isViewGroup).map(parseGroup)[0];
-                    resources = viewGroup ? viewGroup.resources : {}; // 容器
-
-                    groups = data.filter(function (item) {
-                      return !isViewGroup(item);
-                    }).map(parseGroup);
-
-                    _this.update({
-                      viewGroup: viewGroup,
-                      resources: resources,
-                      groups: groups
-                    });
+                  _this.update({
+                    viewGroup: viewGroup,
+                    resources: resources,
+                    groups: groups
+                  });
 
-                  case 11:
-                  case "end":
-                    return _context.stop();
-                }
+                case 11:
+                case "end":
+                  return _context.stop();
               }
             }, _callee);
           }))();
@@ -265,37 +263,35 @@ function _default(topoApp) {
             var editState, resources, _editState$groups, groups, _editState$ipNodes, ipNodes, query, data;
 
             return _regenerator["default"].wrap(function _callee2$(_context2) {
-              while (1) {
-                switch (_context2.prev = _context2.next) {
-                  case 0:
-                    editState = rootState.topoConfig;
-                    resources = editState.resources, _editState$groups = editState.groups, groups = _editState$groups === void 0 ? [] : _editState$groups, _editState$ipNodes = editState.ipNodes, ipNodes = _editState$ipNodes === void 0 ? [] : _editState$ipNodes;
-                    query = {
-                      id: rootState.topoMod.topoId,
+              while (1) switch (_context2.prev = _context2.next) {
+                case 0:
+                  editState = rootState.topoConfig;
+                  resources = editState.resources, _editState$groups = editState.groups, groups = _editState$groups === void 0 ? [] : _editState$groups, _editState$ipNodes = editState.ipNodes, ipNodes = _editState$ipNodes === void 0 ? [] : _editState$ipNodes;
+                  query = {
+                    id: rootState.topoMod.topoId,
+                    resources: resources,
+                    groups: groups,
+                    ipNodes: ipNodes
+                  };
+                  _context2.next = 5;
+                  return _this2.getTopoByConditions(query);
+
+                case 5:
+                  data = _context2.sent;
+
+                  _rlog["default"].debug("按配置查询拓扑数据", {
+                    config: {
                       resources: resources,
-                      groups: groups,
-                      ipNodes: ipNodes
-                    };
-                    _context2.next = 5;
-                    return _this2.getTopoByConditions(query);
-
-                  case 5:
-                    data = _context2.sent;
-
-                    _rlog["default"].debug("按配置查询拓扑数据", {
-                      config: {
-                        resources: resources,
-                        groups: groups
-                      },
-                      data: data
-                    });
+                      groups: groups
+                    },
+                    data: data
+                  });
 
-                    return _context2.abrupt("return", data);
+                  return _context2.abrupt("return", data);
 
-                  case 8:
-                  case "end":
-                    return _context2.stop();
-                }
+                case 8:
+                case "end":
+                  return _context2.stop();
               }
             }, _callee2);
           }))();
@@ -306,20 +302,18 @@ function _default(topoApp) {
           return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee3() {
             var data;
             return _regenerator["default"].wrap(function _callee3$(_context3) {
-              while (1) {
-                switch (_context3.prev = _context3.next) {
-                  case 0:
-                    _context3.next = 2;
-                    return _this3.fetchDataByConfig();
-
-                  case 2:
-                    data = _context3.sent;
-                    return _context3.abrupt("return", data.topoDataTrans);
-
-                  case 4:
-                  case "end":
-                    return _context3.stop();
-                }
+              while (1) switch (_context3.prev = _context3.next) {
+                case 0:
+                  _context3.next = 2;
+                  return _this3.fetchDataByConfig();
+
+                case 2:
+                  data = _context3.sent;
+                  return _context3.abrupt("return", data.topoDataTrans);
+
+                case 4:
+                case "end":
+                  return _context3.stop();
               }
             }, _callee3);
           }))();
@@ -331,69 +325,67 @@ function _default(topoApp) {
             var topoId, resources, groups, exportLinkIdList, ipNodes, viewConditions, groupInfo, data, _yield$Promise$all, dataWithLinkDetail, _combTopoData, topoData, resAndMetrics, topoDataTrans;
 
             return _regenerator["default"].wrap(function _callee4$(_context4) {
-              while (1) {
-                switch (_context4.prev = _context4.next) {
-                  case 0:
-                    _rlog["default"].debug("getTopoByConditions--------", params);
-
-                    topoId = params.id, resources = params.resources, groups = params.groups, exportLinkIdList = params.exportLinkIdList, ipNodes = params.ipNodes;
-                    viewConditions = (0, _topoData2.resToConditions)(resources);
-                    groupInfo = (0, _utils.isAvailableArray)(groups) && groups.map(function (group) {
-                      return (0, _extends2["default"])({}, group, {
-                        layout: (0, _topoData2.getLayoutId)(group.layout),
-                        resources: (0, _topoData2.resToConditions)(group.resources)
-                      });
+              while (1) switch (_context4.prev = _context4.next) {
+                case 0:
+                  _rlog["default"].debug("getTopoByConditions--------", params);
+
+                  topoId = params.id, resources = params.resources, groups = params.groups, exportLinkIdList = params.exportLinkIdList, ipNodes = params.ipNodes;
+                  viewConditions = (0, _topoData2.resToConditions)(resources);
+                  groupInfo = (0, _utils.isAvailableArray)(groups) && groups.map(function (group) {
+                    return (0, _extends2["default"])({}, group, {
+                      layout: (0, _topoData2.getLayoutId)(group.layout),
+                      resources: (0, _topoData2.resToConditions)(group.resources)
                     });
-
-                    _rlog["default"].debug("getTopoByConditions--------", viewConditions, groupInfo);
-
-                    _context4.next = 7;
-                    return topoApp.serverApi.getTopoDataByResource(topoId, viewConditions, groupInfo, exportLinkIdList, ipNodes);
-
-                  case 7:
-                    data = _context4.sent;
-
-                    _rlog["default"].debug("getTopoByConditions--------data", data);
-
-                    _context4.next = 11;
-                    return (0, _getTopoData.buildData)(data);
-
-                  case 11:
-                    data = _context4.sent;
-                    _context4.next = 14;
-                    return Promise.all([(0, _getTopoData.addLinkData)(data), topoApp.ciTyeCache.load((0, _topoData.getCiTypes)(data)), dispatch.customIcon.loadCustomIcons()]);
-
-                  case 14:
-                    _yield$Promise$all = _context4.sent;
-                    dataWithLinkDetail = _yield$Promise$all[0];
-                    _combTopoData = (0, _topoData.combTopoData)({
-                      engine: topoApp,
-                      data: data,
-                      linkTo: null,
-                      globalConfig: state.topoMod.globalConfig
-                    }), topoData = _combTopoData.topoData, resAndMetrics = _combTopoData.resAndMetrics;
-                    dispatch.topoMod.update({
-                      data: dataWithLinkDetail
-                    });
-                    topoDataTrans = (0, _utils2.transformTopoElements)(topoData);
-
-                    _this4.update({
-                      topoData: topoData,
-                      elements: topoDataTrans
-                    });
-
-                    dispatch.topoBizMod.combBatchCiInfo(resAndMetrics); // 返回查询后的数据，便于外部获取到数据后像HT通知更新
-
-                    return _context4.abrupt("return", {
-                      topoData: topoData,
-                      elements: JSON.parse(JSON.stringify(topoDataTrans)),
-                      topoDataTrans: topoDataTrans
-                    });
-
-                  case 22:
-                  case "end":
-                    return _context4.stop();
-                }
+                  });
+
+                  _rlog["default"].debug("getTopoByConditions--------", viewConditions, groupInfo);
+
+                  _context4.next = 7;
+                  return topoApp.serverApi.getTopoDataByResource(topoId, viewConditions, groupInfo, exportLinkIdList, ipNodes);
+
+                case 7:
+                  data = _context4.sent;
+
+                  _rlog["default"].debug("getTopoByConditions--------data", data);
+
+                  _context4.next = 11;
+                  return (0, _getTopoData.buildData)(data);
+
+                case 11:
+                  data = _context4.sent;
+                  _context4.next = 14;
+                  return Promise.all([(0, _getTopoData.addLinkData)(data), topoApp.ciTyeCache.load((0, _topoData.getCiTypes)(data)), dispatch.customIcon.loadCustomIcons()]);
+
+                case 14:
+                  _yield$Promise$all = _context4.sent;
+                  dataWithLinkDetail = _yield$Promise$all[0];
+                  _combTopoData = (0, _topoData.combTopoData)({
+                    engine: topoApp,
+                    data: data,
+                    linkTo: null,
+                    globalConfig: state.topoMod.globalConfig
+                  }), topoData = _combTopoData.topoData, resAndMetrics = _combTopoData.resAndMetrics;
+                  dispatch.topoMod.update({
+                    data: dataWithLinkDetail
+                  });
+                  topoDataTrans = (0, _utils2.transformTopoElements)(topoData);
+
+                  _this4.update({
+                    topoData: topoData,
+                    elements: topoDataTrans
+                  });
+
+                  dispatch.topoBizMod.combBatchCiInfo(resAndMetrics); // 返回查询后的数据，便于外部获取到数据后像HT通知更新
+
+                  return _context4.abrupt("return", {
+                    topoData: topoData,
+                    elements: JSON.parse(JSON.stringify(topoDataTrans)),
+                    topoDataTrans: topoDataTrans
+                  });
+
+                case 22:
+                case "end":
+                  return _context4.stop();
               }
             }, _callee4);
           }))();
@@ -402,33 +394,31 @@ function _default(topoApp) {
           return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee5() {
             var displayConfig, config;
             return _regenerator["default"].wrap(function _callee5$(_context5) {
-              while (1) {
-                switch (_context5.prev = _context5.next) {
-                  case 0:
-                    displayConfig = topoApp.store.getModelState("displayConfig");
-                    config = {
-                      alarmSwitch: displayConfig.alarmSwitch,
-                      alarmListDefaultOpen: displayConfig.alarmListDefaultOpen,
-                      extraConfig: JSON.stringify((0, _extends2["default"])({}, displayConfig, {
-                        // 背景图，便于加载拓扑直接显示背景图
-                        background: topoApp.store.getModelState("background").current,
-                        // 增加保存日志，便于排查链路重复问题 2023-4-12 19:27:18
-                        saveHistories: [{
-                          date: new Date().toLocaleString(),
-                          version: topoApp.version
-                        }].concat(displayConfig.saveHistories || [])
-                      }))
-                    };
-
-                    _rlog["default"].debug("saveGlobalConfig", config);
-
-                    _context5.next = 5;
-                    return topoApp.serverApi.saveTopoSettings(topoApp.id, config);
-
-                  case 5:
-                  case "end":
-                    return _context5.stop();
-                }
+              while (1) switch (_context5.prev = _context5.next) {
+                case 0:
+                  displayConfig = topoApp.store.getModelState("displayConfig");
+                  config = {
+                    alarmSwitch: displayConfig.alarmSwitch,
+                    alarmListDefaultOpen: displayConfig.alarmListDefaultOpen,
+                    extraConfig: JSON.stringify((0, _extends2["default"])({}, displayConfig, {
+                      // 背景图，便于加载拓扑直接显示背景图
+                      background: topoApp.store.getModelState("background").current,
+                      // 增加保存日志，便于排查链路重复问题 2023-4-12 19:27:18
+                      saveHistories: [{
+                        date: new Date().toLocaleString(),
+                        version: topoApp.version
+                      }].concat(displayConfig.saveHistories || [])
+                    }))
+                  };
+
+                  _rlog["default"].debug("saveGlobalConfig", config);
+
+                  _context5.next = 5;
+                  return topoApp.serverApi.saveTopoSettings(topoApp.id, config);
+
+                case 5:
+                case "end":
+                  return _context5.stop();
               }
             }, _callee5);
           }))();
@@ -441,28 +431,26 @@ function _default(topoApp) {
 
             var currentBackground;
             return _regenerator["default"].wrap(function _callee6$(_context6) {
-              while (1) {
-                switch (_context6.prev = _context6.next) {
-                  case 0:
-                    currentBackground = topoApp.store.getModelState("background").current;
-                    _context6.next = 3;
-                    return (0, _topoData2.saveTopo)((0, _extends2["default"])({
-                      topoService: topoApp.serverApi
-                    }, data, {
-                      viewGroupId: (_state$topoConfig$vie = state.topoConfig.viewGroup) === null || _state$topoConfig$vie === void 0 ? void 0 : _state$topoConfig$vie.id,
-                      template: state.topoMod.type,
-                      // 背景图
-                      backgroundId: currentBackground ? currentBackground.id : null
-                    }));
-
-                  case 3:
-                    _context6.next = 5;
-                    return _this5.saveGlobalConfig();
-
-                  case 5:
-                  case "end":
-                    return _context6.stop();
-                }
+              while (1) switch (_context6.prev = _context6.next) {
+                case 0:
+                  currentBackground = topoApp.store.getModelState("background").current;
+                  _context6.next = 3;
+                  return (0, _topoData2.saveTopo)((0, _extends2["default"])({
+                    topoService: topoApp.serverApi
+                  }, data, {
+                    viewGroupId: (_state$topoConfig$vie = state.topoConfig.viewGroup) === null || _state$topoConfig$vie === void 0 ? void 0 : _state$topoConfig$vie.id,
+                    template: state.topoMod.type,
+                    // 背景图
+                    backgroundId: currentBackground ? currentBackground.id : null
+                  }));
+
+                case 3:
+                  _context6.next = 5;
+                  return _this5.saveGlobalConfig();
+
+                case 5:
+                case "end":
+                  return _context6.stop();
               }
             }, _callee6);
           }))();
@@ -471,17 +459,15 @@ function _default(topoApp) {
           return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee7() {
             var topoId, ciIdList;
             return _regenerator["default"].wrap(function _callee7$(_context7) {
-              while (1) {
-                switch (_context7.prev = _context7.next) {
-                  case 0:
-                    topoId = data.id, ciIdList = data.ciIdList;
-                    _context7.next = 3;
-                    return topoApp.serverApi.addToBlocklist(topoId, ciIdList);
-
-                  case 3:
-                  case "end":
-                    return _context7.stop();
-                }
+              while (1) switch (_context7.prev = _context7.next) {
+                case 0:
+                  topoId = data.id, ciIdList = data.ciIdList;
+                  _context7.next = 3;
+                  return topoApp.serverApi.addToBlocklist(topoId, ciIdList);
+
+                case 3:
+                case "end":
+                  return _context7.stop();
               }
             }, _callee7);
           }))();
@@ -496,22 +482,20 @@ function _default(topoApp) {
 
             var ids, ip, result;
             return _regenerator["default"].wrap(function _callee8$(_context8) {
-              while (1) {
-                switch (_context8.prev = _context8.next) {
-                  case 0:
-                    ids = data.ids, ip = data.ip; // console.log("queryAllLinkByIp", ids, ip);
-
-                    _context8.next = 3;
-                    return _networkLink["default"].queryLinksByIp(ids, ip);
-
-                  case 3:
-                    result = _context8.sent;
-                    return _context8.abrupt("return", (_result$data = result === null || result === void 0 ? void 0 : result.data) !== null && _result$data !== void 0 ? _result$data : []);
-
-                  case 5:
-                  case "end":
-                    return _context8.stop();
-                }
+              while (1) switch (_context8.prev = _context8.next) {
+                case 0:
+                  ids = data.ids, ip = data.ip; // console.log("queryAllLinkByIp", ids, ip);
+
+                  _context8.next = 3;
+                  return _networkLink["default"].queryLinksByIp(ids, ip);
+
+                case 3:
+                  result = _context8.sent;
+                  return _context8.abrupt("return", (_result$data = result === null || result === void 0 ? void 0 : result.data) !== null && _result$data !== void 0 ? _result$data : []);
+
+                case 5:
+                case "end":
+                  return _context8.stop();
               }
             }, _callee8);
           }))();

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

@@ -34,12 +34,10 @@ var _default = {
 
         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);
         }))();