@riil-frontend/component-topology 8.0.0-a.8 → 8.0.1

package/es/core/hooks/usePolling.js

@@ -21,9 +21,9 @@ var usePolling = function usePolling(props) {
   var resIdsList = resAndMetrics === null || resAndMetrics === void 0 ? void 0 : resAndMetrics.resIdsList; // 轮询hooks
 
   var _useRequest = useRequest(refresh, {
-    pollingInterval: 1000 * 15,
-    // pollingWhenHidden: false,
-    // debounceInterval: 1000,
+    pollingInterval: 60 * 1000,
+    pollingWhenHidden: false,
+    // debounceInterval: 200,
     manual: true,
     onSuccess: function onSuccess(result) {
       if (result) {

package/es/core/models/TopoApp.js

@@ -23,7 +23,7 @@ import topoFactory from "./topoFactory";
 import ElementTagTipConfig from "./tagstips/ElementTagTipConfig";
 import SelectionModel from "./SelectionModel"; // eslint-disable-next-line no-undef
 
-var version = typeof "8.0.0-a.8" === 'string' ? "8.0.0-a.8" : null;
+var version = typeof "8.0.1" === 'string' ? "8.0.1" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 /**
  * 拓扑显示和编辑

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

@@ -1,12 +1,12 @@
-import _extends from "@babel/runtime/helpers/extends";
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
+import _extends from "@babel/runtime/helpers/extends";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
-import topoService from '@riil-frontend/component-topology-common/es/services/topo';
 import keyBy from 'lodash/keyBy';
 import _ from 'lodash';
 import { queryCisByIds, queryModelAsset } from "../../services"; // 查询所有连线
 
-import { getEdges } from "../../../utils/htElementUtils"; // const interfaceTypeMap = {
+import { getEdges } from "../../../utils/htElementUtils";
+import CiTypeCache from "../cache/CiTypeCache"; // const interfaceTypeMap = {
 //   "network.interface": {
 //     displayName: "网络接口",
 //   },
@@ -33,40 +33,6 @@ export function isCrucialLink(link) {
 export function isExitLink(link) {
   return (link === null || link === void 0 ? void 0 : link.attributes) && !(link !== null && link !== void 0 && link.attributes['destination_id']);
 }
-export var getInterfaceObject = /*#__PURE__*/function () {
-  var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(codes) {
-    var query, promises, result, ifDoc;
-    return _regeneratorRuntime.wrap(function _callee$(_context) {
-      while (1) {
-        switch (_context.prev = _context.next) {
-          case 0:
-            query = _.compact(_.uniq(codes));
-            promises = query.map(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);
-  };
-}();
 export function mergeLinksData(links, linkCis, nodes, interfaceCis, interfaceDoc) {
   var linkCiMap = keyBy(links, 'id');
   return links.map(function (link) {
@@ -110,57 +76,59 @@ export function mergeLinksData(links, linkCis, nodes, interfaceCis, interfaceDoc
     });
   });
 }
-export function getLinksDetail(_x2, _x3) {
+export function getLinksDetail(_x, _x2) {
   return _getLinksDetail.apply(this, arguments);
 }
 
 function _getLinksDetail() {
-  _getLinksDetail = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(links, nodes) {
+  _getLinksDetail = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(links, nodes) {
     var linkCis, interfaceIds, interfaceTypes, interfaceCis, interfaceDoc;
-    return _regeneratorRuntime.wrap(function _callee2$(_context2) {
+    return _regeneratorRuntime.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 = _.compact(_.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 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.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/es/core/services/overview.js

@@ -1,7 +1,11 @@
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import { request } from '@riil-frontend/component-topology-utils';
-import { commonQueryCiDataByIds } from "./cmdb";
+import { commonQueryCiDataByIds } from "./cmdb"; // 机房可上架设备类型缓存数据
+
+var roomDeviceTypeList = null; // 资源子组件缓存
+
+var ciComponentsMap = {};
 export default {
   /**
    * 根据资源id获取风险
@@ -35,19 +39,31 @@ export default {
    */
   queryAllComponentsByCiId: function queryAllComponentsByCiId(id) {
     return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
+      var components;
       return _regeneratorRuntime.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 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();
           }
@@ -186,13 +202,21 @@ export default {
         while (1) {
           switch (_context8.prev = _context8.next) {
             case 0:
-              _context8.next = 2;
-              return 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 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/es/core/store/models/topoAlarm.js

@@ -7,8 +7,16 @@ import _regeneratorRuntime from "@babel/runtime/regenerator";
  */
 import rlog from "@riil-frontend/component-topology-utils/es/rlog";
 import _ from "lodash";
-import { sortList } from "../../../utils/topoData";
 var showAlarmStatus = ["toDeal", "dealing", "change", "woDealing"];
+
+var sortList = function sortList(a, b) {
+  if (a.level === b.level) {
+    return a.obj.createTime - b.obj.createTime;
+  } else {
+    return a.level - b.level;
+  }
+};
+
 export default function (topo) {
   return {
     // 定义 model 的初始 state