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

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.0-a.9" === 'string' ? "8.0.0-a.9" : 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/viewer/components/plugins/ResourceDetail/components/ResourceOverview/ResourceOverview.js

@@ -954,7 +954,8 @@ export default function ResourceOverview(props) {
       ciAttrAndMetricData: ciAttrAndMetricData
     },
     data: metric,
-    loading: metricInitLoading
+    loading: metricInitLoading,
+    formatMetricLatestValue: resourceOverviewProps.formatMetricLatestValue
   })), /*#__PURE__*/React.createElement(EventsCard, {
     alarmRiskList: alarmRiskList,
     closeDetailDrawer: onClose,

package/es/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/ResourceOverviewMetric.js

@@ -60,7 +60,8 @@ export default function ResourceOverviewMetric(props) {
   var topo = props.topo,
       type = props.type,
       data = props.data,
-      loading = props.loading;
+      loading = props.loading,
+      formatMetricLatestValue = props.formatMetricLatestValue;
 
   function formatValue(itemData) {
     var _list;
@@ -69,7 +70,8 @@ export default function ResourceOverviewMetric(props) {
         metricItem = itemData.metricItem,
         list = itemData.list;
     var format = metricValueFormat({
-      value: (_list = list[list.length - 1]) === null || _list === void 0 ? void 0 : _list.metricValue,
+      // 支持业务拓扑历史时间点指标值处理
+      value: formatMetricLatestValue ? formatMetricLatestValue(list) : (_list = list[list.length - 1]) === null || _list === void 0 ? void 0 : _list.metricValue,
       dataType: metricItem.dataType,
       dict: topo.dictCache.getDictObject(),
       unit: metricItem.unit,

package/es/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/components/LinkTopo/hooks/useMetricPolling.js

@@ -21,7 +21,7 @@ export default function useMetricPolling(_ref) {
 
 
   var queryLinkMetricsRequest = useRequest(queryLinkLatestMetrics, {
-    pollingInterval: 1000 * 15,
+    pollingInterval: 60 * 1000,
     pollingWhenHidden: false,
     debounceInterval: 200,
     manual: true,
@@ -31,7 +31,7 @@ export default function useMetricPolling(_ref) {
     }
   });
   var queryInterfaceMetricsRequest = useRequest(queryLinkInterfacesLatestMetrics, {
-    pollingInterval: 1000 * 15,
+    pollingInterval: 60 * 1000,
     pollingWhenHidden: false,
     debounceInterval: 200,
     manual: true,

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

@@ -92,9 +92,9 @@ var useMetricModels = function useMetricModels(props) {
   }
 
   var request = useRequest(fetchData, {
-    pollingInterval: 1000 * 5,
-    // pollingWhenHidden: false,
-    // debounceInterval: 1000,
+    pollingInterval: 1000 * 60,
+    pollingWhenHidden: false,
+    // debounceInterval: 200,
     manual: true,
     onSuccess: function onSuccess(newMetricModels) {
       var a = metricModels.map(function (item) {

package/lib/core/hooks/usePolling.js

@@ -34,9 +34,9 @@ var usePolling = function usePolling(props) {
   var resIdsList = resAndMetrics === null || resAndMetrics === void 0 ? void 0 : resAndMetrics.resIdsList; // 轮询hooks
 
   var _useRequest = (0, _ahooks.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/lib/core/models/TopoApp.js

@@ -54,7 +54,7 @@ var _ElementTagTipConfig = _interopRequireDefault(require("./tagstips/ElementTag
 var _SelectionModel = _interopRequireDefault(require("./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.0-a.9" === 'string' ? "8.0.0-a.9" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 /**
  * 拓扑显示和编辑

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/viewer/components/plugins/ResourceDetail/components/ResourceOverview/ResourceOverview.js

@@ -989,7 +989,8 @@ function ResourceOverview(props) {
       ciAttrAndMetricData: ciAttrAndMetricData
     },
     data: metric,
-    loading: metricInitLoading
+    loading: metricInitLoading,
+    formatMetricLatestValue: resourceOverviewProps.formatMetricLatestValue
   })), /*#__PURE__*/_react["default"].createElement(_EventsCard["default"], {
     alarmRiskList: alarmRiskList,
     closeDetailDrawer: onClose,

package/lib/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/ResourceOverviewMetric.js

@@ -78,7 +78,8 @@ function ResourceOverviewMetric(props) {
   var topo = props.topo,
       type = props.type,
       data = props.data,
-      loading = props.loading;
+      loading = props.loading,
+      formatMetricLatestValue = props.formatMetricLatestValue;
 
   function formatValue(itemData) {
     var _list;
@@ -87,7 +88,8 @@ function ResourceOverviewMetric(props) {
         metricItem = itemData.metricItem,
         list = itemData.list;
     var format = (0, _utils.metricValueFormat)({
-      value: (_list = list[list.length - 1]) === null || _list === void 0 ? void 0 : _list.metricValue,
+      // 支持业务拓扑历史时间点指标值处理
+      value: formatMetricLatestValue ? formatMetricLatestValue(list) : (_list = list[list.length - 1]) === null || _list === void 0 ? void 0 : _list.metricValue,
       dataType: metricItem.dataType,
       dict: topo.dictCache.getDictObject(),
       unit: metricItem.unit,

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

@@ -37,7 +37,7 @@ function useMetricPolling(_ref) {
 
 
   var queryLinkMetricsRequest = (0, _ahooks.useRequest)(_services.queryLinkLatestMetrics, {
-    pollingInterval: 1000 * 15,
+    pollingInterval: 60 * 1000,
     pollingWhenHidden: false,
     debounceInterval: 200,
     manual: true,
@@ -48,7 +48,7 @@ function useMetricPolling(_ref) {
     }
   });
   var queryInterfaceMetricsRequest = (0, _ahooks.useRequest)(_services.queryLinkInterfacesLatestMetrics, {
-    pollingInterval: 1000 * 15,
+    pollingInterval: 60 * 1000,
     pollingWhenHidden: false,
     debounceInterval: 200,
     manual: true,

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

@@ -103,9 +103,9 @@ var useMetricModels = function useMetricModels(props) {
   }
 
   var request = (0, _ahooks.useRequest)(fetchData, {
-    pollingInterval: 1000 * 5,
-    // pollingWhenHidden: false,
-    // debounceInterval: 1000,
+    pollingInterval: 1000 * 60,
+    pollingWhenHidden: false,
+    // debounceInterval: 200,
     manual: true,
     onSuccess: function onSuccess(newMetricModels) {
       var a = metricModels.map(function (item) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@riil-frontend/component-topology",
-  "version": "8.0.0-a.8",
+  "version": "8.0.0-a.9",
   "description": "拓扑",
   "scripts": {
     "start": "build-scripts start",
@@ -116,6 +116,6 @@
     "access": "public"
   },
   "license": "MIT",
-  "homepage": "https://unpkg.com/@riil-frontend/component-topology@8.0.0-a.8/build/index.html",
+  "homepage": "https://unpkg.com/@riil-frontend/component-topology@8.0.0-a.9/build/index.html",
   "gitHead": "2da19ffccbb7ca60a8acf396e39f542c68bb33f5"
 }