@riil-frontend/component-topology 6.0.0-alpha.33 → 6.0.0-alpha.34

package/es/core/editor/components/Toolbar/widgets/components/ButtonBox.js

@@ -23,7 +23,7 @@ function ButtonBox(props) {
   }, otherProps), children, showArrow && /*#__PURE__*/React.createElement(React.Fragment, null, "\xA0", /*#__PURE__*/React.createElement(_Icon, {
     type: "tree_fold_arrow",
     size: "xxs",
-    className: classNames(styles.icon, (_classNames2 = {}, _classNames2[styles.active] = active, _classNames2))
+    className: classNames(styles.icon, (_classNames2 = {}, _classNames2[styles.active] = active, _classNames2[styles.disabled] = disabled, _classNames2))
   })));
 }
 

package/es/core/editor/components/Toolbar/widgets/components/ButtonBox.module.scss

@@ -27,4 +27,7 @@
   &.active {
     transform: rotate(180deg) scale(0.5) !important;
   }
+  &.disabled {
+    color: #C9CED2;
+  }
 }

package/es/core/models/TopoApp.js

@@ -22,7 +22,7 @@ import topoFactory from "./topoFactory";
 import ElementTagTipConfig from "./tagstips/ElementTagTipConfig";
 import SelectionManager from "./SelectionManager"; // eslint-disable-next-line no-undef
 
-var version = typeof "6.0.0-alpha.33" === 'string' ? "6.0.0-alpha.33" : null;
+var version = typeof "6.0.0-alpha.34" === 'string' ? "6.0.0-alpha.34" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 /**
  * 拓扑显示和编辑

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

@@ -13,7 +13,8 @@ export default function useMetricPolling(_ref) {
     sourceMetrics: null,
     destinationMetrics: null,
     // 链路指标列表
-    linkMetrics: []
+    linkMetrics: [],
+    linkMetricsTs: null
   }),
       data = _useState[0],
       setData = _useState[1]; // 轮询hooks
@@ -25,9 +26,7 @@ export default function useMetricPolling(_ref) {
     debounceInterval: 200,
     manual: true,
     onSuccess: function onSuccess(result) {
-      setData(_extends({}, data, {
-        linkMetrics: result
-      }));
+      setData(_extends({}, data, result));
       rlog.info('链路拓扑指标轮询', result);
     }
   });

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

@@ -68,6 +68,8 @@ export function queryLinkLatestMetrics(_x3, _x4) {
 
 function _queryLinkLatestMetrics() {
   _queryLinkLatestMetrics = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3(linkCi, linkMetricCodes) {
+    var _linkMetrics$;
+
     var linkMetrics, resultData;
     return _regeneratorRuntime.wrap(function _callee3$(_context3) {
       while (1) {
@@ -91,6 +93,10 @@ function _queryLinkLatestMetrics() {
 
           case 5:
             linkMetrics = _context3.sent;
+            _context3.next = 8;
+            return ciTypeCache.load([linkCi.ciType || linkCi.typeCode]);
+
+          case 8:
             // format
             resultData = linkMetricCodes.map(function (code) {
               var _linkMetrics$find;
@@ -98,16 +104,19 @@ function _queryLinkLatestMetrics() {
               var value = (_linkMetrics$find = linkMetrics.find(function (m) {
                 return m.metricCode === code;
               })) === null || _linkMetrics$find === void 0 ? void 0 : _linkMetrics$find.metricValue;
-              var metricDef = ciTypeCache.getMetric(linkCi.ciType, code);
+              var metricDef = ciTypeCache.getMetric(linkCi.ciType || linkCi.typeCode, code);
               return {
                 code: code,
                 name: metricDef.name,
                 value: formatMetric(value, metricDef) || ''
               };
             });
-            return _context3.abrupt("return", resultData);
+            return _context3.abrupt("return", {
+              linkMetrics: resultData,
+              linkMetricsTs: (_linkMetrics$ = linkMetrics[0]) === null || _linkMetrics$ === void 0 ? void 0 : _linkMetrics$.ts
+            });
 
-          case 8:
+          case 10:
           case "end":
             return _context3.stop();
         }
@@ -130,6 +139,8 @@ function _queryLinkInterfacesLatestMetrics() {
         switch (_context4.prev = _context4.next) {
           case 0:
             parseInterfaceMetrics = function _parseInterfaceMetric(subCiId) {
+              var _metrics$;
+
               var metrics = interfaceMetrics.filter(function (metric) {
                 return metric.subCiId === subCiId;
               });
@@ -139,11 +150,14 @@ function _queryLinkInterfacesLatestMetrics() {
                 var value = (_metrics$find = metrics.find(function (m) {
                   return m.metricCode === code;
                 })) === null || _metrics$find === void 0 ? void 0 : _metrics$find.metricValue;
-                var metricDef = ciTypeCache.getMetric(linkCi.ciType, code);
+                var metricDef = ciTypeCache.getMetric(linkCi.ciType || linkCi.typeCode, code);
                 var formatValue = formatMetric(value, metricDef);
                 res[code] = formatValue === 'undefined' ? '-' : formatValue;
                 return res;
-              }, {});
+              }, {
+                _ts: (_metrics$ = metrics[0]) === null || _metrics$ === void 0 ? void 0 : _metrics$.ts // 指标时间
+
+              });
             };
 
             _linkCi$attributes = linkCi.attributes, sourceType = _linkCi$attributes.source_type, sourceId = _linkCi$attributes.source_id, destinationId = _linkCi$attributes.destination_id, destinationType = _linkCi$attributes.destination_type;

package/lib/core/editor/components/Toolbar/widgets/components/ButtonBox.js

@@ -36,7 +36,7 @@ function ButtonBox(props) {
   }, otherProps), children, showArrow && /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, "\xA0", /*#__PURE__*/_react["default"].createElement(_icon["default"], {
     type: "tree_fold_arrow",
     size: "xxs",
-    className: (0, _classnames["default"])(_ButtonBoxModule["default"].icon, (_classNames2 = {}, _classNames2[_ButtonBoxModule["default"].active] = active, _classNames2))
+    className: (0, _classnames["default"])(_ButtonBoxModule["default"].icon, (_classNames2 = {}, _classNames2[_ButtonBoxModule["default"].active] = active, _classNames2[_ButtonBoxModule["default"].disabled] = disabled, _classNames2))
   })));
 }
 

package/lib/core/editor/components/Toolbar/widgets/components/ButtonBox.module.scss

@@ -27,4 +27,7 @@
   &.active {
     transform: rotate(180deg) scale(0.5) !important;
   }
+  &.disabled {
+    color: #C9CED2;
+  }
 }

package/lib/core/models/TopoApp.js

@@ -52,7 +52,7 @@ var _ElementTagTipConfig = _interopRequireDefault(require("./tagstips/ElementTag
 var _SelectionManager = _interopRequireDefault(require("./SelectionManager"));
 
 // eslint-disable-next-line no-undef
-var version = typeof "6.0.0-alpha.33" === 'string' ? "6.0.0-alpha.33" : null;
+var version = typeof "6.0.0-alpha.34" === 'string' ? "6.0.0-alpha.34" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 /**
  * 拓扑显示和编辑

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

@@ -29,7 +29,8 @@ function useMetricPolling(_ref) {
     sourceMetrics: null,
     destinationMetrics: null,
     // 链路指标列表
-    linkMetrics: []
+    linkMetrics: [],
+    linkMetricsTs: null
   }),
       data = _useState[0],
       setData = _useState[1]; // 轮询hooks
@@ -41,9 +42,7 @@ function useMetricPolling(_ref) {
     debounceInterval: 200,
     manual: true,
     onSuccess: function onSuccess(result) {
-      setData((0, _extends2["default"])({}, data, {
-        linkMetrics: result
-      }));
+      setData((0, _extends2["default"])({}, data, result));
 
       _rlog["default"].info('链路拓扑指标轮询', result);
     }

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

@@ -86,6 +86,8 @@ function queryLinkLatestMetrics(_x3, _x4) {
 
 function _queryLinkLatestMetrics() {
   _queryLinkLatestMetrics = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee3(linkCi, linkMetricCodes) {
+    var _linkMetrics$;
+
     var linkMetrics, resultData;
     return _regenerator["default"].wrap(function _callee3$(_context3) {
       while (1) {
@@ -109,6 +111,10 @@ function _queryLinkLatestMetrics() {
 
           case 5:
             linkMetrics = _context3.sent;
+            _context3.next = 8;
+            return _CiTypeCache["default"].load([linkCi.ciType || linkCi.typeCode]);
+
+          case 8:
             // format
             resultData = linkMetricCodes.map(function (code) {
               var _linkMetrics$find;
@@ -117,7 +123,7 @@ function _queryLinkLatestMetrics() {
                 return m.metricCode === code;
               })) === null || _linkMetrics$find === void 0 ? void 0 : _linkMetrics$find.metricValue;
 
-              var metricDef = _CiTypeCache["default"].getMetric(linkCi.ciType, code);
+              var metricDef = _CiTypeCache["default"].getMetric(linkCi.ciType || linkCi.typeCode, code);
 
               return {
                 code: code,
@@ -125,9 +131,12 @@ function _queryLinkLatestMetrics() {
                 value: (0, _attributeFormatter.formatMetric)(value, metricDef) || ''
               };
             });
-            return _context3.abrupt("return", resultData);
+            return _context3.abrupt("return", {
+              linkMetrics: resultData,
+              linkMetricsTs: (_linkMetrics$ = linkMetrics[0]) === null || _linkMetrics$ === void 0 ? void 0 : _linkMetrics$.ts
+            });
 
-          case 8:
+          case 10:
           case "end":
             return _context3.stop();
         }
@@ -150,6 +159,8 @@ function _queryLinkInterfacesLatestMetrics() {
         switch (_context4.prev = _context4.next) {
           case 0:
             parseInterfaceMetrics = function _parseInterfaceMetric(subCiId) {
+              var _metrics$;
+
               var metrics = interfaceMetrics.filter(function (metric) {
                 return metric.subCiId === subCiId;
               });
@@ -160,12 +171,15 @@ function _queryLinkInterfacesLatestMetrics() {
                   return m.metricCode === code;
                 })) === null || _metrics$find === void 0 ? void 0 : _metrics$find.metricValue;
 
-                var metricDef = _CiTypeCache["default"].getMetric(linkCi.ciType, code);
+                var metricDef = _CiTypeCache["default"].getMetric(linkCi.ciType || linkCi.typeCode, code);
 
                 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 // 指标时间
+
+              });
             };
 
             _linkCi$attributes = linkCi.attributes, sourceType = _linkCi$attributes.source_type, sourceId = _linkCi$attributes.source_id, destinationId = _linkCi$attributes.destination_id, destinationType = _linkCi$attributes.destination_type;

package/package.json

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