@riil-frontend/component-topology 6.0.0-alpha.63 → 6.0.0-alpha.64

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 "6.0.0-alpha.63" === 'string' ? "6.0.0-alpha.63" : null;
+var version = typeof "6.0.0-alpha.64" === 'string' ? "6.0.0-alpha.64" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 /**
  * 拓扑显示和编辑

package/es/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/components/LinkTopo/services/index.js

@@ -99,16 +99,16 @@ function _queryLinkLatestMetrics() {
           case 8:
             // format
             resultData = linkMetricCodes.map(function (code) {
-              var _linkMetrics$find;
-
-              var value = (_linkMetrics$find = linkMetrics.find(function (m) {
+              var metric = linkMetrics.find(function (m) {
                 return m.metricCode === code;
-              })) === null || _linkMetrics$find === void 0 ? void 0 : _linkMetrics$find.metricValue;
+              });
+              var value = metric === null || metric === void 0 ? void 0 : metric.metricValue;
               var metricDef = ciTypeCache.getMetric(linkCi.ciType || linkCi.typeCode, code);
               return {
                 code: code,
                 name: metricDef.name,
-                value: formatMetric(value, metricDef) || ''
+                value: formatMetric(value, metricDef) || '',
+                ts: metric === null || metric === void 0 ? void 0 : metric.ts
               };
             });
             return _context3.abrupt("return", {
@@ -132,18 +132,14 @@ export function queryLinkInterfacesLatestMetrics(_x5) {
 
 function _queryLinkInterfacesLatestMetrics() {
   _queryLinkInterfacesLatestMetrics = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee4(linkCi) {
-    var _linkCi$attributes, sourceType, sourceId, destinationId, destinationType, typeCodes, queryInterfaceMetricsParam, interfaceMetrics, resultData, parseInterfaceMetrics;
+    var _linkCi$attributes, sourceType, sourceId, destinationId, destinationType, typeCodes, queryInterfaceMetricsParam, interfaceMetrics, resultData, findMetricsBySubCiId, parseInterfaceMetrics;
 
     return _regeneratorRuntime.wrap(function _callee4$(_context4) {
       while (1) {
         switch (_context4.prev = _context4.next) {
           case 0:
             parseInterfaceMetrics = function _parseInterfaceMetric(subCiId) {
-              var _metrics$;
-
-              var metrics = interfaceMetrics.filter(function (metric) {
-                return metric.subCiId === subCiId;
-              });
+              var metrics = findMetricsBySubCiId(subCiId);
               return INTERFACE_METRIC_CODES.reduce(function (res, code) {
                 var _metrics$find;
 
@@ -154,10 +150,14 @@ function _queryLinkInterfacesLatestMetrics() {
                 var formatValue = formatMetric(value, metricDef);
                 res[code] = formatValue === 'undefined' ? '-' : formatValue;
                 return res;
-              }, {
-                _ts: (_metrics$ = metrics[0]) === null || _metrics$ === void 0 ? void 0 : _metrics$.ts // 指标时间
+              }, {});
+            };
 
+            findMetricsBySubCiId = function _findMetricsBySubCiId(subCiId) {
+              var metrics = interfaceMetrics.filter(function (metric) {
+                return metric.subCiId === subCiId;
               });
+              return metrics;
             };
 
             _linkCi$attributes = linkCi.attributes, sourceType = _linkCi$attributes.source_type, sourceId = _linkCi$attributes.source_id, destinationId = _linkCi$attributes.destination_id, destinationType = _linkCi$attributes.destination_type;
@@ -174,24 +174,29 @@ function _queryLinkInterfacesLatestMetrics() {
               typeCodes.push(destinationType);
             }
 
-            _context4.next = 8;
+            _context4.next = 9;
             return ciTypeCache.load(typeCodes);
 
-          case 8:
-            _context4.next = 10;
+          case 9:
+            _context4.next = 11;
             return queryLatestMetrics(queryInterfaceMetricsParam);
 
-          case 10:
+          case 11:
             interfaceMetrics = _context4.sent;
             // format
             resultData = {
               sourceMetrics: parseInterfaceMetrics(sourceId),
-              destinationMetrics: destinationId ? parseInterfaceMetrics(destinationId) : null
+              destinationMetrics: destinationId ? parseInterfaceMetrics(destinationId) : null,
+              // 源目的接口指标原始数据。支持关键链路详情过滤最近一小时指标
+              originMetricData: {
+                source: findMetricsBySubCiId(sourceId),
+                destination: destinationId ? findMetricsBySubCiId(destinationId) : []
+              }
             };
             rlog.debug('查询链路接口指标 结果', linkCi);
             return _context4.abrupt("return", resultData);
 
-          case 14:
+          case 15:
           case "end":
             return _context4.stop();
         }

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 "6.0.0-alpha.63" === 'string' ? "6.0.0-alpha.63" : null;
+var version = typeof "6.0.0-alpha.64" === 'string' ? "6.0.0-alpha.64" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 /**
  * 拓扑显示和编辑

package/lib/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/components/LinkTopo/services/index.js

@@ -117,18 +117,18 @@ function _queryLinkLatestMetrics() {
           case 8:
             // format
             resultData = linkMetricCodes.map(function (code) {
-              var _linkMetrics$find;
-
-              var value = (_linkMetrics$find = linkMetrics.find(function (m) {
+              var metric = linkMetrics.find(function (m) {
                 return m.metricCode === code;
-              })) === null || _linkMetrics$find === void 0 ? void 0 : _linkMetrics$find.metricValue;
+              });
+              var value = metric === null || metric === void 0 ? void 0 : metric.metricValue;
 
               var metricDef = _CiTypeCache["default"].getMetric(linkCi.ciType || linkCi.typeCode, code);
 
               return {
                 code: code,
                 name: metricDef.name,
-                value: (0, _attributeFormatter.formatMetric)(value, metricDef) || ''
+                value: (0, _attributeFormatter.formatMetric)(value, metricDef) || '',
+                ts: metric === null || metric === void 0 ? void 0 : metric.ts
               };
             });
             return _context3.abrupt("return", {
@@ -152,18 +152,14 @@ function queryLinkInterfacesLatestMetrics(_x5) {
 
 function _queryLinkInterfacesLatestMetrics() {
   _queryLinkInterfacesLatestMetrics = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee4(linkCi) {
-    var _linkCi$attributes, sourceType, sourceId, destinationId, destinationType, typeCodes, queryInterfaceMetricsParam, interfaceMetrics, resultData, parseInterfaceMetrics;
+    var _linkCi$attributes, sourceType, sourceId, destinationId, destinationType, typeCodes, queryInterfaceMetricsParam, interfaceMetrics, resultData, findMetricsBySubCiId, parseInterfaceMetrics;
 
     return _regenerator["default"].wrap(function _callee4$(_context4) {
       while (1) {
         switch (_context4.prev = _context4.next) {
           case 0:
             parseInterfaceMetrics = function _parseInterfaceMetric(subCiId) {
-              var _metrics$;
-
-              var metrics = interfaceMetrics.filter(function (metric) {
-                return metric.subCiId === subCiId;
-              });
+              var metrics = findMetricsBySubCiId(subCiId);
               return _constants.INTERFACE_METRIC_CODES.reduce(function (res, code) {
                 var _metrics$find;
 
@@ -176,10 +172,14 @@ function _queryLinkInterfacesLatestMetrics() {
                 var formatValue = (0, _attributeFormatter.formatMetric)(value, metricDef);
                 res[code] = formatValue === 'undefined' ? '-' : formatValue;
                 return res;
-              }, {
-                _ts: (_metrics$ = metrics[0]) === null || _metrics$ === void 0 ? void 0 : _metrics$.ts // 指标时间
+              }, {});
+            };
 
+            findMetricsBySubCiId = function _findMetricsBySubCiId(subCiId) {
+              var metrics = interfaceMetrics.filter(function (metric) {
+                return metric.subCiId === subCiId;
               });
+              return metrics;
             };
 
             _linkCi$attributes = linkCi.attributes, sourceType = _linkCi$attributes.source_type, sourceId = _linkCi$attributes.source_id, destinationId = _linkCi$attributes.destination_id, destinationType = _linkCi$attributes.destination_type;
@@ -198,26 +198,31 @@ function _queryLinkInterfacesLatestMetrics() {
               typeCodes.push(destinationType);
             }
 
-            _context4.next = 8;
+            _context4.next = 9;
             return _CiTypeCache["default"].load(typeCodes);
 
-          case 8:
-            _context4.next = 10;
+          case 9:
+            _context4.next = 11;
             return queryLatestMetrics(queryInterfaceMetricsParam);
 
-          case 10:
+          case 11:
             interfaceMetrics = _context4.sent;
             // format
             resultData = {
               sourceMetrics: parseInterfaceMetrics(sourceId),
-              destinationMetrics: destinationId ? parseInterfaceMetrics(destinationId) : null
+              destinationMetrics: destinationId ? parseInterfaceMetrics(destinationId) : null,
+              // 源目的接口指标原始数据。支持关键链路详情过滤最近一小时指标
+              originMetricData: {
+                source: findMetricsBySubCiId(sourceId),
+                destination: destinationId ? findMetricsBySubCiId(destinationId) : []
+              }
             };
 
             _rlog["default"].debug('查询链路接口指标 结果', linkCi);
 
             return _context4.abrupt("return", resultData);
 
-          case 14:
+          case 15:
           case "end":
             return _context4.stop();
         }

package/package.json

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