@riil-frontend/component-topology 8.0.0-a.1 → 8.0.0-a.11

package/lib/core/models/utils/linkUtils.js

@@ -4,7 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 
 exports.__esModule = true;
 exports.buildTopoLinkData = buildTopoLinkData;
-exports.getInterfaceObject = exports.compatibleWith = void 0;
+exports.compatibleWith = void 0;
 exports.getLinksDetail = getLinksDetail;
 exports.isCrucialLink = isCrucialLink;
 exports.isExitLink = isExitLink;
@@ -13,11 +13,9 @@ exports.showLinkByConfig = exports.plurals = void 0;
 
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 
-var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
-
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 
-var _topo = _interopRequireDefault(require("@riil-frontend/component-topology-common/es/services/topo"));
+var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 
 var _keyBy = _interopRequireDefault(require("lodash/keyBy"));
 
@@ -27,6 +25,8 @@ var _services = require("../../services");
 
 var _htElementUtils = require("../../../utils/htElementUtils");
 
+var _CiTypeCache = _interopRequireDefault(require("../cache/CiTypeCache"));
+
 // 查询所有连线
 // const interfaceTypeMap = {
 //   "network.interface": {
@@ -56,43 +56,6 @@ function isExitLink(link) {
   return (link === null || link === void 0 ? void 0 : link.attributes) && !(link !== null && link !== void 0 && link.attributes['destination_id']);
 }
 
-var getInterfaceObject = /*#__PURE__*/function () {
-  var _ref = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(codes) {
-    var query, promises, result, ifDoc;
-    return _regenerator["default"].wrap(function _callee$(_context) {
-      while (1) {
-        switch (_context.prev = _context.next) {
-          case 0:
-            query = _lodash["default"].compact(_lodash["default"].uniq(codes));
-            promises = query.map(_services.queryModelAsset);
-            _context.next = 4;
-            return Promise.all(promises);
-
-          case 4:
-            result = _context.sent;
-            ifDoc = {};
-            result.map(function (ifItem) {
-              ifDoc[ifItem.code] = {
-                displayName: ifItem.displayName
-              };
-            });
-            return _context.abrupt("return", ifDoc);
-
-          case 8:
-          case "end":
-            return _context.stop();
-        }
-      }
-    }, _callee);
-  }));
-
-  return function getInterfaceObject(_x) {
-    return _ref.apply(this, arguments);
-  };
-}();
-
-exports.getInterfaceObject = getInterfaceObject;
-
 function mergeLinksData(links, linkCis, nodes, interfaceCis, interfaceDoc) {
   var linkCiMap = (0, _keyBy["default"])(links, 'id');
   return links.map(function (link) {
@@ -135,57 +98,59 @@ function mergeLinksData(links, linkCis, nodes, interfaceCis, interfaceDoc) {
   });
 }
 
-function getLinksDetail(_x2, _x3) {
+function getLinksDetail(_x, _x2) {
   return _getLinksDetail.apply(this, arguments);
 }
 
 function _getLinksDetail() {
-  _getLinksDetail = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2(links, nodes) {
+  _getLinksDetail = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(links, nodes) {
     var linkCis, interfaceIds, interfaceTypes, interfaceCis, interfaceDoc;
-    return _regenerator["default"].wrap(function _callee2$(_context2) {
+    return _regenerator["default"].wrap(function _callee$(_context) {
       while (1) {
-        switch (_context2.prev = _context2.next) {
+        switch (_context.prev = _context.next) {
           case 0:
             if (!(!links || !links.length)) {
-              _context2.next = 2;
+              _context.next = 2;
               break;
             }
 
-            return _context2.abrupt("return", []);
+            return _context.abrupt("return", []);
 
           case 2:
             // const linkCis = await topoService.relation.batchQueryRelation(
             //   links.map((link) => link.id)
             // );
             linkCis = links;
-            interfaceIds = [];
-            interfaceTypes = [];
-            linkCis.forEach(function (item) {
-              interfaceIds.push(item.attributes.source_id);
-              interfaceIds.push(item.attributes.destination_id);
-              interfaceTypes.push(item.attributes.source_type);
-              interfaceTypes.push(item.attributes.destination_type);
+            interfaceIds = [].concat(linkCis.map(function (item) {
+              return item.attributes.source_id;
+            }), linkCis.map(function (item) {
+              return item.attributes.destination_id;
+            }));
+            interfaceTypes = _lodash["default"].compact(_lodash["default"].uniq([].concat(linkCis.map(function (item) {
+              return item.attributes.source_type;
+            }), linkCis.map(function (item) {
+              return item.attributes.destination_type;
+            })))).filter(function (item) {
+              return item !== 'ip';
             });
-            _context2.next = 8;
+            _context.next = 7;
             return (0, _services.queryCisByIds)(interfaceIds);
 
-          case 8:
-            interfaceCis = _context2.sent;
-            _context2.next = 11;
-            return getInterfaceObject(interfaceTypes.filter(function (item) {
-              return item !== 'ip';
-            }));
+          case 7:
+            interfaceCis = _context.sent;
+            _context.next = 10;
+            return _CiTypeCache["default"].getCiTypeMap(interfaceTypes);
 
-          case 11:
-            interfaceDoc = _context2.sent;
-            return _context2.abrupt("return", mergeLinksData(links, linkCis, nodes, interfaceCis, interfaceDoc));
+          case 10:
+            interfaceDoc = _context.sent;
+            return _context.abrupt("return", mergeLinksData(links, linkCis, nodes, interfaceCis, interfaceDoc));
 
-          case 13:
+          case 12:
           case "end":
-            return _context2.stop();
+            return _context.stop();
         }
       }
-    }, _callee2);
+    }, _callee);
   }));
   return _getLinksDetail.apply(this, arguments);
 }

package/lib/core/services/overview.js

@@ -13,6 +13,10 @@ var _componentTopologyUtils = require("@riil-frontend/component-topology-utils")
 
 var _cmdb = require("./cmdb");
 
+// 机房可上架设备类型缓存数据
+var roomDeviceTypeList = null; // 资源子组件缓存
+
+var ciComponentsMap = {};
 var _default = {
   /**
    * 根据资源id获取风险
@@ -46,19 +50,31 @@ var _default = {
    */
   queryAllComponentsByCiId: function queryAllComponentsByCiId(id) {
     return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2() {
+      var components;
       return _regenerator["default"].wrap(function _callee2$(_context2) {
         while (1) {
           switch (_context2.prev = _context2.next) {
             case 0:
-              _context2.next = 2;
+              components = ciComponentsMap[id];
+
+              if (components) {
+                _context2.next = 6;
+                break;
+              }
+
+              _context2.next = 4;
               return _componentTopologyUtils.request.post('/mdc/v1/api/cmdb/queryAllComponentsByCiId', {
                 id: id
               });
 
-            case 2:
-              return _context2.abrupt("return", _context2.sent);
+            case 4:
+              components = _context2.sent;
+              ciComponentsMap[id] = components;
 
-            case 3:
+            case 6:
+              return _context2.abrupt("return", components);
+
+            case 7:
             case "end":
               return _context2.stop();
           }
@@ -197,13 +213,21 @@ var _default = {
         while (1) {
           switch (_context8.prev = _context8.next) {
             case 0:
-              _context8.next = 2;
-              return _componentTopologyUtils.request.post("/room/v1/api/device/type/list", {});
+              if (roomDeviceTypeList) {
+                _context8.next = 4;
+                break;
+              }
 
-            case 2:
-              return _context8.abrupt("return", _context8.sent);
+              _context8.next = 3;
+              return _componentTopologyUtils.request.post("/room/v1/api/device/type/list", {});
 
             case 3:
+              roomDeviceTypeList = _context8.sent;
+
+            case 4:
+              return _context8.abrupt("return", roomDeviceTypeList);
+
+            case 5:
             case "end":
               return _context8.stop();
           }

package/lib/core/services/topo/basic.js

@@ -0,0 +1,46 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+exports.__esModule = true;
+exports["default"] = void 0;
+
+var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
+
+var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
+
+var _componentTopologyUtils = require("@riil-frontend/component-topology-utils");
+
+var _constants = require("./constants");
+
+var _default = {
+  /**
+  * 保存拓扑绘制数据（第三方库内部结构，无需关心含义）
+  * @param {Number} id Topo ID
+  * @param {String} data ht拓扑序列化数据
+  * @returns
+  */
+  saveSerializeData: function saveSerializeData(id, data) {
+    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:
+              _context.next = 2;
+              return _componentTopologyUtils.request.post(_constants.TOPO_API_ROOT + "/structure/" + id, {
+                data: data
+              });
+
+            case 2:
+              return _context.abrupt("return", _context.sent);
+
+            case 3:
+            case "end":
+              return _context.stop();
+          }
+        }
+      }, _callee);
+    }))();
+  }
+};
+exports["default"] = _default;

package/lib/core/services/topo/constants.js

@@ -0,0 +1,6 @@
+"use strict";
+
+exports.__esModule = true;
+exports.TOPO_API_ROOT = void 0;
+var TOPO_API_ROOT = '/topo/v1/api';
+exports.TOPO_API_ROOT = TOPO_API_ROOT;

package/lib/core/services/topo/index.js

@@ -0,0 +1,16 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+exports.__esModule = true;
+exports["default"] = void 0;
+
+var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
+
+var _topo = _interopRequireDefault(require("@riil-frontend/component-topology-common/es/services/topo"));
+
+var _basic = _interopRequireDefault(require("./basic"));
+
+var _default = (0, _extends2["default"])({}, _topo["default"], _basic["default"]);
+
+exports["default"] = _default;

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

@@ -407,7 +407,12 @@ function _default(topoApp) {
                       alarmListDefaultOpen: displayConfig.alarmListDefaultOpen,
                       extraConfig: JSON.stringify((0, _extends2["default"])({}, displayConfig, {
                         // 背景图，便于加载拓扑直接显示背景图
-                        background: topoApp.store.getModelState("background").current
+                        background: topoApp.store.getModelState("background").current,
+                        // 增加保存日志，便于排查链路重复问题 2023-4-12 19:27:18
+                        saveHistories: [{
+                          date: new Date().toLocaleString(),
+                          version: topoApp.version
+                        }].concat(displayConfig.saveHistories || [])
                       }))
                     };