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

package/es/components/collapse/Collapse.module.scss

@@ -37,20 +37,21 @@
     flex-direction: column;
 
     :global {
-      .#{$css-prefix}collapse-panel-content {
-        flex: 1;
-        overflow: auto;
-      }
       .#{$css-prefix}collapse-panel.#{$css-prefix}collapse-panel-expanded {
         flex: 1;
         display: flex;
         flex-direction: column;
+        overflow: auto;
         
         .#{$css-prefix}collapse-panel-content {
           flex: 1;
           overflow: auto;
         }
       }
+      .#{$css-prefix}collapse-panel-content {
+        flex: 1;
+        overflow: auto;
+      }
     }
   }
 

package/es/core/editor/components/Sidebar/views/ImagePanel/HtCustomImagePanel.js

@@ -1,4 +1,5 @@
 import React, { useEffect, useRef } from 'react';
+import ResizeObserver from 'resize-observer-polyfill';
 import rlog from '@riil-frontend/component-topology-utils/es/rlog';
 import styles from "./HtImagePalette.module.scss";
 /**
@@ -25,10 +26,20 @@ export default function HtCustomImagePanel(props) {
       });
     } catch (error) {
       rlog.error('初始化资源面板失败', error);
-    } // 注销组件
+    }
 
+    var hanleResize = function hanleResize() {
+      if (viewRef.current) {
+        topo.getHtTopo().invalideComponents();
+      }
+    };
+
+    var resizeObserver = new ResizeObserver(hanleResize);
+    resizeObserver.observe(container); // 注销组件
 
     return function () {
+      resizeObserver.disconnect();
+
       if (viewRef.current) {
         viewRef.current.destroy();
         viewRef.current = null;

package/es/core/editor/components/Sidebar/views/ImagePanel/HtImagePalette.js

@@ -1,5 +1,6 @@
 import React, { useEffect, useRef } from 'react';
 import rlog from '@riil-frontend/component-topology-utils/es/rlog';
+import ResizeObserver from 'resize-observer-polyfill';
 import styles from "./HtImagePalette.module.scss";
 /**
  * 组件面板
@@ -23,13 +24,22 @@ export default function HtImagePalette(props) {
       viewRef.current = htTopo.createImagePalette(container, {
         icons: icons
       });
-      console.error(viewRef.current);
     } catch (error) {
       rlog.error('初始化资源面板失败', error);
-    } // 注销组件
+    }
 
+    var hanleResize = function hanleResize() {
+      if (viewRef.current) {
+        topo.getHtTopo().invalideComponents();
+      }
+    };
+
+    var resizeObserver = new ResizeObserver(hanleResize);
+    resizeObserver.observe(container); // 注销组件
 
     return function () {
+      resizeObserver.disconnect();
+
       if (viewRef.current) {
         viewRef.current.destroy();
         viewRef.current = null;

package/es/core/editor/components/Sidebar/views/ImagePanel/HtImagePalette.module.scss

@@ -1,5 +1,5 @@
 .container {
   width: 100%;
   height: 100%;
-  overflow: auto;
+  overflow: hidden;
 }

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/editor/components/Toolbar/widgets/components/textStyleSetting/ElementTextStyleSetting/colorUtil.js

@@ -0,0 +1,50 @@
+import Color from 'color';
+/**
+ * 解析颜色字符串为对象
+ * 
+ * @param {string} colorStr 
+ * @returns {null|{hex, rgb:{r,g,b,a}}}
+ */
+
+export function parseColor(colorStr) {
+  if (!colorStr) {
+    return null;
+  }
+
+  var color = Color(colorStr);
+  var rgb = color.rgb();
+  return {
+    hex: color.hex(),
+    rgb: {
+      r: rgb.color[0],
+      g: rgb.color[1],
+      b: rgb.color[2],
+      a: rgb.valpha
+    }
+  };
+}
+export function formatHexColor(color) {
+  return color ? color.hex : null;
+}
+/**
+ * 格式化背景rgba颜色
+ * @param {{background, opacity}} prevColor
+ * @param {{background, opacity}} currentColor
+ */
+
+export function formatBackgroundRgbaColor(prevColor, currentColor) {
+  if (!('background' in currentColor) && !('opacity' in currentColor)) {
+    return null;
+  }
+
+  var colorObj = Object.assign(prevColor, currentColor);
+  var background = colorObj.background,
+      opacity = colorObj.opacity;
+
+  if (!background) {
+    return null;
+  }
+
+  var rgb = background.rgb;
+  return "rgba(" + rgb.r + ", " + rgb.g + ", " + rgb.b + ", " + opacity + ")";
+}

package/es/core/editor/components/Toolbar/widgets/components/textStyleSetting/ElementTextStyleSetting/elements/edgeTag.js

@@ -1,9 +1,14 @@
 export function getTextStyle(element) {
   return {
     color: null,
+    // 文字颜色
     fontFamily: null,
-    fontSize: null,
-    fontStyle: []
+    fontSize: null // fontBold: false, // 文字样式加粗 @V1.2
+    // fontItalic: false, // 文字样式斜体 @V1.2
+    // fontUnderline: false, // 文字样式下划线 @V1.2
+    // background: {rgb: {}, hex: ''}, // 背景颜色，rgba格式。null表示无
+    // opacity: 1, // 背景透明度。值范围 0-1, null，null表示无
+
   };
 }
 export function setTextStyle(element, style) {}

package/es/core/editor/components/Toolbar/widgets/components/textStyleSetting/ElementTextStyleSetting/elements/text.js

@@ -1,19 +1,34 @@
 import _extends from "@babel/runtime/helpers/extends";
 import fontStyleUtil from "../../../../../../settings/common/text/fontStyleUtil";
+import { formatBackgroundRgbaColor, parseColor } from "../colorUtil";
 export function getTextStyle(element) {
+  var _background$rgb;
+
   var underline = element.s('text.decoration') === 'underline';
+  var background = parseColor(element.s('textBackground'));
   return _extends({
-    color: null,
+    color: parseColor(element.s('text.color')),
     underline: underline
-  }, fontStyleUtil.toMap(element.s('text.font')));
+  }, fontStyleUtil.toMap(element.s('text.font')), {
+    background: background,
+    // 背景颜色，格式: {rgba: {}, hex: ''} | null
+    opacity: background === null || background === void 0 ? void 0 : (_background$rgb = background.rgb) === null || _background$rgb === void 0 ? void 0 : _background$rgb.a // 背景透明度。值范围 0-1, null，null表示无
+
+  });
 }
 export function setTextStyle(element, style) {
-  var underline = style.underline;
-
   if ('underline' in style) {
-    element.s('text.decoration', underline ? 'underline' : null);
+    element.s('text.decoration', style.underline ? 'underline' : null);
   }
 
+  if ('color' in style) {
+    element.s('text.color', style.color.hex);
+  } // 背景颜色
+
+
+  var prevStyle = getTextStyle(element);
+  element.s('textBackground', formatBackgroundRgbaColor(prevStyle, style));
+
   var fontStyle = _extends({}, getTextStyle(element), style);
 
   var fontStr = fontStyleUtil.build(fontStyle);

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.35" === 'string' ? "6.0.0-alpha.35" : 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/components/collapse/Collapse.module.scss

@@ -37,20 +37,21 @@
     flex-direction: column;
 
     :global {
-      .#{$css-prefix}collapse-panel-content {
-        flex: 1;
-        overflow: auto;
-      }
       .#{$css-prefix}collapse-panel.#{$css-prefix}collapse-panel-expanded {
         flex: 1;
         display: flex;
         flex-direction: column;
+        overflow: auto;
         
         .#{$css-prefix}collapse-panel-content {
           flex: 1;
           overflow: auto;
         }
       }
+      .#{$css-prefix}collapse-panel-content {
+        flex: 1;
+        overflow: auto;
+      }
     }
   }
 

package/lib/core/editor/components/Sidebar/views/ImagePanel/HtCustomImagePanel.js

@@ -7,6 +7,8 @@ exports["default"] = HtCustomImagePanel;
 
 var _react = _interopRequireWildcard(require("react"));
 
+var _resizeObserverPolyfill = _interopRequireDefault(require("resize-observer-polyfill"));
+
 var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
 
 var _HtImagePaletteModule = _interopRequireDefault(require("./HtImagePalette.module.scss"));
@@ -38,10 +40,20 @@ function HtCustomImagePanel(props) {
       });
     } catch (error) {
       _rlog["default"].error('初始化资源面板失败', error);
-    } // 注销组件
+    }
+
+    var hanleResize = function hanleResize() {
+      if (viewRef.current) {
+        topo.getHtTopo().invalideComponents();
+      }
+    };
 
+    var resizeObserver = new _resizeObserverPolyfill["default"](hanleResize);
+    resizeObserver.observe(container); // 注销组件
 
     return function () {
+      resizeObserver.disconnect();
+
       if (viewRef.current) {
         viewRef.current.destroy();
         viewRef.current = null;

package/lib/core/editor/components/Sidebar/views/ImagePanel/HtImagePalette.js

@@ -9,6 +9,8 @@ var _react = _interopRequireWildcard(require("react"));
 
 var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
 
+var _resizeObserverPolyfill = _interopRequireDefault(require("resize-observer-polyfill"));
+
 var _HtImagePaletteModule = _interopRequireDefault(require("./HtImagePalette.module.scss"));
 
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
@@ -36,13 +38,22 @@ function HtImagePalette(props) {
       viewRef.current = htTopo.createImagePalette(container, {
         icons: icons
       });
-      console.error(viewRef.current);
     } catch (error) {
       _rlog["default"].error('初始化资源面板失败', error);
-    } // 注销组件
+    }
+
+    var hanleResize = function hanleResize() {
+      if (viewRef.current) {
+        topo.getHtTopo().invalideComponents();
+      }
+    };
 
+    var resizeObserver = new _resizeObserverPolyfill["default"](hanleResize);
+    resizeObserver.observe(container); // 注销组件
 
     return function () {
+      resizeObserver.disconnect();
+
       if (viewRef.current) {
         viewRef.current.destroy();
         viewRef.current = null;

package/lib/core/editor/components/Sidebar/views/ImagePanel/HtImagePalette.module.scss

@@ -1,5 +1,5 @@
 .container {
   width: 100%;
   height: 100%;
-  overflow: auto;
+  overflow: hidden;
 }

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/editor/components/Toolbar/widgets/components/textStyleSetting/ElementTextStyleSetting/colorUtil.js

@@ -0,0 +1,61 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+exports.__esModule = true;
+exports.formatBackgroundRgbaColor = formatBackgroundRgbaColor;
+exports.formatHexColor = formatHexColor;
+exports.parseColor = parseColor;
+
+var _color = _interopRequireDefault(require("color"));
+
+/**
+ * 解析颜色字符串为对象
+ * 
+ * @param {string} colorStr 
+ * @returns {null|{hex, rgb:{r,g,b,a}}}
+ */
+function parseColor(colorStr) {
+  if (!colorStr) {
+    return null;
+  }
+
+  var color = (0, _color["default"])(colorStr);
+  var rgb = color.rgb();
+  return {
+    hex: color.hex(),
+    rgb: {
+      r: rgb.color[0],
+      g: rgb.color[1],
+      b: rgb.color[2],
+      a: rgb.valpha
+    }
+  };
+}
+
+function formatHexColor(color) {
+  return color ? color.hex : null;
+}
+/**
+ * 格式化背景rgba颜色
+ * @param {{background, opacity}} prevColor
+ * @param {{background, opacity}} currentColor
+ */
+
+
+function formatBackgroundRgbaColor(prevColor, currentColor) {
+  if (!('background' in currentColor) && !('opacity' in currentColor)) {
+    return null;
+  }
+
+  var colorObj = Object.assign(prevColor, currentColor);
+  var background = colorObj.background,
+      opacity = colorObj.opacity;
+
+  if (!background) {
+    return null;
+  }
+
+  var rgb = background.rgb;
+  return "rgba(" + rgb.r + ", " + rgb.g + ", " + rgb.b + ", " + opacity + ")";
+}

package/lib/core/editor/components/Toolbar/widgets/components/textStyleSetting/ElementTextStyleSetting/elements/edgeTag.js

@@ -8,9 +8,14 @@ exports.setTextStyle = setTextStyle;
 function getTextStyle(element) {
   return {
     color: null,
+    // 文字颜色
     fontFamily: null,
-    fontSize: null,
-    fontStyle: []
+    fontSize: null // fontBold: false, // 文字样式加粗 @V1.2
+    // fontItalic: false, // 文字样式斜体 @V1.2
+    // fontUnderline: false, // 文字样式下划线 @V1.2
+    // background: {rgb: {}, hex: ''}, // 背景颜色，rgba格式。null表示无
+    // opacity: 1, // 背景透明度。值范围 0-1, null，null表示无
+
   };
 }
 

package/lib/core/editor/components/Toolbar/widgets/components/textStyleSetting/ElementTextStyleSetting/elements/text.js

@@ -11,21 +11,36 @@ var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends")
 
 var _fontStyleUtil = _interopRequireDefault(require("../../../../../../settings/common/text/fontStyleUtil"));
 
+var _colorUtil = require("../colorUtil");
+
 function getTextStyle(element) {
+  var _background$rgb;
+
   var underline = element.s('text.decoration') === 'underline';
+  var background = (0, _colorUtil.parseColor)(element.s('textBackground'));
   return (0, _extends2["default"])({
-    color: null,
+    color: (0, _colorUtil.parseColor)(element.s('text.color')),
     underline: underline
-  }, _fontStyleUtil["default"].toMap(element.s('text.font')));
+  }, _fontStyleUtil["default"].toMap(element.s('text.font')), {
+    background: background,
+    // 背景颜色，格式: {rgba: {}, hex: ''} | null
+    opacity: background === null || background === void 0 ? void 0 : (_background$rgb = background.rgb) === null || _background$rgb === void 0 ? void 0 : _background$rgb.a // 背景透明度。值范围 0-1, null，null表示无
+
+  });
 }
 
 function setTextStyle(element, style) {
-  var underline = style.underline;
-
   if ('underline' in style) {
-    element.s('text.decoration', underline ? 'underline' : null);
+    element.s('text.decoration', style.underline ? 'underline' : null);
   }
 
+  if ('color' in style) {
+    element.s('text.color', style.color.hex);
+  } // 背景颜色
+
+
+  var prevStyle = getTextStyle(element);
+  element.s('textBackground', (0, _colorUtil.formatBackgroundRgbaColor)(prevStyle, style));
   var fontStyle = (0, _extends2["default"])({}, getTextStyle(element), style);
 
   var fontStr = _fontStyleUtil["default"].build(fontStyle);

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.35" === 'string' ? "6.0.0-alpha.35" : 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;