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

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

@@ -5,7 +5,6 @@ import WidgetBox from "./WidgetBox";
 import ColorPanel from "../../../../../components/ColorPanel";
 import FontColorRange from "../../../../../components/ColorPanel/components/FontColorRange";
 import styles from "./FontColorButton.module.scss";
-import useFontStyleSetting from "../hooks/useFontStyleSetting";
 
 function FontFamilySelect(props) {
   var value = props.value,
@@ -16,9 +15,6 @@ function FontFamilySelect(props) {
       disabled = _useState[0],
       setDisabled = _useState[1];
 
-  var fontStyleSetting = useFontStyleSetting({
-    topo: topo
-  });
   console.log(topo, 'topo这里需要处理颜色改变的事情');
 
   var backOpacityChange = function backOpacityChange(value) {

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

@@ -40,11 +40,15 @@ function FontFamilyWidget(props) {
   }, /*#__PURE__*/React.createElement(FontFamilySelect, {
     value: style.fontFamily,
     onChange: function onChange(val) {
+      topo.historyManager.beginTransaction();
       setStyle({
         fontFamily: val
       });
+      topo.historyManager.endTransaction();
     }
   }));
 }
 
-export default textStyleSettingRouter(FontFamilyWidget);
+export default textStyleSettingRouter(FontFamilyWidget, {
+  names: ['fontFamily']
+});

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

@@ -37,11 +37,15 @@ function FontSizeWidget(props) {
   }, /*#__PURE__*/React.createElement(FontSizeSelect, {
     value: style.fontSize,
     onChange: function onChange(val) {
+      topo.historyManager.beginTransaction();
       setStyle({
         fontSize: val
       });
+      topo.historyManager.endTransaction();
     }
   }));
 }
 
-export default textStyleSettingRouter(FontSizeWidget);
+export default textStyleSettingRouter(FontSizeWidget, {
+  names: ['fontSize']
+});

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

@@ -73,7 +73,9 @@ function FontStyleButton(props) {
    */
 
   var handleChange = function handleChange(selectedKeys) {
+    topo.historyManager.beginTransaction();
     setStyle(formatStyle(selectedKeys));
+    topo.historyManager.endTransaction();
   };
 
   return /*#__PURE__*/React.createElement(WidgetBox, {
@@ -105,4 +107,6 @@ function FontStyleButton(props) {
   })));
 }
 
-export default textStyleSettingRouter(FontStyleButton);
+export default textStyleSettingRouter(FontStyleButton, {
+  names: ['bold', 'italic', 'underline']
+});

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/ElementTextStyleSetting.js

@@ -1,6 +1,6 @@
 import _extends from "@babel/runtime/helpers/extends";
 import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/objectWithoutPropertiesLoose";
-var _excluded = ["Component"];
+var _excluded = ["Component", "styleNames"];
 import React, { useMemo, useState } from 'react';
 import { getTextStyle, setTextStyle } from "./textStyleUtil";
 
@@ -8,6 +8,7 @@ function ElementTextStyleSetting(props) {
   var topo = props.topo;
 
   var Component = props.Component,
+      styleNames = props.styleNames,
       widgetProps = _objectWithoutPropertiesLoose(props, _excluded); // 选中的元素
 
 
@@ -20,7 +21,7 @@ function ElementTextStyleSetting(props) {
     return topo.getHtTopo().getGraphView().getSelectionModel().getSelection().toArray();
   }, [selection, topo]);
   var value = useMemo(function () {
-    return getTextStyle(htSelection) || {};
+    return getTextStyle(htSelection, styleNames) || {};
   }, [htSelection, topo]);
   var setStyle = useMemo(function () {
     return function (style) {

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

@@ -27,12 +27,35 @@ export function getElementTextStyle(element) {
 
   return null;
 }
-export function getTextStyle(htSelection) {
+export function getTextStyle(htSelection, styleNames) {
   if (htSelection.length === 1) {
     var element = htSelection[0];
     return getElementTextStyle(element);
-  } // 多选时值相同返回？
+  } else if (htSelection.length) {
+    // 多选时值相同返回？
+    var values = htSelection.map(function (element) {
+      return getElementTextStyle(element);
+    }).filter(function (item) {
+      return !!item;
+    });
 
+    if (!values.length) {
+      return null;
+    }
+
+    var value = {};
+    styleNames.forEach(function (styleName) {
+      var val = values[0][styleName];
+      var different = values.filter(function (obj) {
+        return obj[styleName] !== val;
+      });
+
+      if (!different.length) {
+        value[styleName] = val;
+      }
+    });
+    return Object.keys(value).length ? value : null;
+  }
 
   return null;
 }

package/es/core/editor/components/Toolbar/widgets/components/textStyleSetting/textStyleSettingRouter.js

@@ -4,13 +4,16 @@ import ElementTextStyleSetting from "./ElementTextStyleSetting/ElementTextStyleS
 import GlobalTagStyleSetting from "./GlobalTagStyleSetting/GlobalTagStyleSetting";
 
 function textStyleSettingRouter(Component, options) {
+  var names = (options === null || options === void 0 ? void 0 : options.names) || [];
   return function TextStyleSettingButton(props) {
     var topo = props.topo;
     var selection = topo.selectionManager.useHtSelection();
     var Widget = !selection.length ? GlobalTagStyleSetting : ElementTextStyleSetting;
     return /*#__PURE__*/React.createElement(Widget, _extends({
       Component: Component
-    }, props));
+    }, props, {
+      styleNames: names
+    }));
   };
 }
 

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.32" === 'string' ? "6.0.0-alpha.32" : 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/FontColorButton.js

@@ -17,8 +17,6 @@ var _FontColorRange = _interopRequireDefault(require("../../../../../components/
 
 var _FontColorButtonModule = _interopRequireDefault(require("./FontColorButton.module.scss"));
 
-var _useFontStyleSetting = _interopRequireDefault(require("../hooks/useFontStyleSetting"));
-
 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); }
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
@@ -33,9 +31,6 @@ function FontFamilySelect(props) {
       disabled = _useState[0],
       setDisabled = _useState[1];
 
-  var fontStyleSetting = (0, _useFontStyleSetting["default"])({
-    topo: topo
-  });
   console.log(topo, 'topo这里需要处理颜色改变的事情');
 
   var backOpacityChange = function backOpacityChange(value) {

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

@@ -54,13 +54,17 @@ function FontFamilyWidget(props) {
   }, /*#__PURE__*/_react["default"].createElement(FontFamilySelect, {
     value: style.fontFamily,
     onChange: function onChange(val) {
+      topo.historyManager.beginTransaction();
       setStyle({
         fontFamily: val
       });
+      topo.historyManager.endTransaction();
     }
   }));
 }
 
-var _default = (0, _textStyleSettingRouter["default"])(FontFamilyWidget);
+var _default = (0, _textStyleSettingRouter["default"])(FontFamilyWidget, {
+  names: ['fontFamily']
+});
 
 exports["default"] = _default;

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

@@ -51,13 +51,17 @@ function FontSizeWidget(props) {
   }, /*#__PURE__*/_react["default"].createElement(FontSizeSelect, {
     value: style.fontSize,
     onChange: function onChange(val) {
+      topo.historyManager.beginTransaction();
       setStyle({
         fontSize: val
       });
+      topo.historyManager.endTransaction();
     }
   }));
 }
 
-var _default = (0, _textStyleSettingRouter["default"])(FontSizeWidget);
+var _default = (0, _textStyleSettingRouter["default"])(FontSizeWidget, {
+  names: ['fontSize']
+});
 
 exports["default"] = _default;

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

@@ -89,7 +89,9 @@ function FontStyleButton(props) {
    */
 
   var handleChange = function handleChange(selectedKeys) {
+    topo.historyManager.beginTransaction();
     setStyle(formatStyle(selectedKeys));
+    topo.historyManager.endTransaction();
   };
 
   return /*#__PURE__*/_react["default"].createElement(_WidgetBox["default"], {
@@ -121,6 +123,8 @@ function FontStyleButton(props) {
   })));
 }
 
-var _default = (0, _textStyleSettingRouter["default"])(FontStyleButton);
+var _default = (0, _textStyleSettingRouter["default"])(FontStyleButton, {
+  names: ['bold', 'italic', 'underline']
+});
 
 exports["default"] = _default;

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/ElementTextStyleSetting.js

@@ -13,7 +13,7 @@ var _react = _interopRequireWildcard(require("react"));
 
 var _textStyleUtil = require("./textStyleUtil");
 
-var _excluded = ["Component"];
+var _excluded = ["Component", "styleNames"];
 
 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); }
 
@@ -22,6 +22,7 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
 function ElementTextStyleSetting(props) {
   var topo = props.topo;
   var Component = props.Component,
+      styleNames = props.styleNames,
       widgetProps = (0, _objectWithoutPropertiesLoose2["default"])(props, _excluded); // 选中的元素
 
   var selection = topo.selectionManager.useSelection();
@@ -33,7 +34,7 @@ function ElementTextStyleSetting(props) {
     return topo.getHtTopo().getGraphView().getSelectionModel().getSelection().toArray();
   }, [selection, topo]);
   var value = (0, _react.useMemo)(function () {
-    return (0, _textStyleUtil.getTextStyle)(htSelection) || {};
+    return (0, _textStyleUtil.getTextStyle)(htSelection, styleNames) || {};
   }, [htSelection, topo]);
   var setStyle = (0, _react.useMemo)(function () {
     return function (style) {

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

@@ -38,12 +38,35 @@ function getElementTextStyle(element) {
   return null;
 }
 
-function getTextStyle(htSelection) {
+function getTextStyle(htSelection, styleNames) {
   if (htSelection.length === 1) {
     var element = htSelection[0];
     return getElementTextStyle(element);
-  } // 多选时值相同返回？
+  } else if (htSelection.length) {
+    // 多选时值相同返回？
+    var values = htSelection.map(function (element) {
+      return getElementTextStyle(element);
+    }).filter(function (item) {
+      return !!item;
+    });
 
+    if (!values.length) {
+      return null;
+    }
+
+    var value = {};
+    styleNames.forEach(function (styleName) {
+      var val = values[0][styleName];
+      var different = values.filter(function (obj) {
+        return obj[styleName] !== val;
+      });
+
+      if (!different.length) {
+        value[styleName] = val;
+      }
+    });
+    return Object.keys(value).length ? value : null;
+  }
 
   return null;
 }

package/lib/core/editor/components/Toolbar/widgets/components/textStyleSetting/textStyleSettingRouter.js

@@ -14,13 +14,16 @@ var _ElementTextStyleSetting = _interopRequireDefault(require("./ElementTextStyl
 var _GlobalTagStyleSetting = _interopRequireDefault(require("./GlobalTagStyleSetting/GlobalTagStyleSetting"));
 
 function textStyleSettingRouter(Component, options) {
+  var names = (options === null || options === void 0 ? void 0 : options.names) || [];
   return function TextStyleSettingButton(props) {
     var topo = props.topo;
     var selection = topo.selectionManager.useHtSelection();
     var Widget = !selection.length ? _GlobalTagStyleSetting["default"] : _ElementTextStyleSetting["default"];
     return /*#__PURE__*/_react["default"].createElement(Widget, (0, _extends2["default"])({
       Component: Component
-    }, props));
+    }, props, {
+      styleNames: names
+    }));
   };
 }
 

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.32" === 'string' ? "6.0.0-alpha.32" : 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.32",
+  "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.32/build/index.html",
+  "homepage": "https://unpkg.com/@riil-frontend/component-topology@6.0.0-alpha.34/build/index.html",
   "gitHead": "2da19ffccbb7ca60a8acf396e39f542c68bb33f5"
 }

package/es/core/editor/components/Toolbar/hooks/textStyleSetting/EmptySetting.js

@@ -1,8 +0,0 @@
-export function useValues(topo) {
-  return {
-    color: null,
-    fontFamily: null,
-    fontSize: null,
-    fontStyle: []
-  };
-}

package/es/core/editor/components/Toolbar/hooks/textStyleSetting/edgeTagSetting.js

@@ -1,8 +0,0 @@
-export function useValues(topo) {
-  return {
-    color: null,
-    fontFamily: null,
-    fontSize: null,
-    fontStyle: []
-  };
-}

package/es/core/editor/components/Toolbar/hooks/textStyleSetting/globalTag.js

@@ -1,36 +0,0 @@
-import _extends from "@babel/runtime/helpers/extends";
-var defaultStyle = {
-  color: '#AFB9C2',
-  fontFamily: '微软雅黑'
-};
-export function useValues(topo) {
-  var displayConfigState = topo.store.useModelState('displayConfig');
-  var nodeLabelStyle = displayConfigState.nodeLabelStyle,
-      defaultEdgeLabelStyle = displayConfigState.defaultEdgeLabelStyle;
-  return {
-    color: (nodeLabelStyle === null || nodeLabelStyle === void 0 ? void 0 : nodeLabelStyle.color) || defaultStyle.color,
-    fontFamily: (nodeLabelStyle === null || nodeLabelStyle === void 0 ? void 0 : nodeLabelStyle.fontFamily) || defaultStyle.fontFamily,
-    fontSize: nodeLabelStyle === null || nodeLabelStyle === void 0 ? void 0 : nodeLabelStyle.fontSize
-  };
-}
-export var setGlobalTagStyle = function setGlobalTagStyle(topo, styleData) {
-  var _topo$store$getModel = topo.store.getModel('displayConfig'),
-      displayConfigState = _topo$store$getModel[0],
-      displayConfigDispatchers = _topo$store$getModel[1];
-
-  var nodeLabelStyle = displayConfigState.nodeLabelStyle,
-      defaultEdgeLabelStyle = displayConfigState.defaultEdgeLabelStyle;
-
-  var globalNodeLabelStyle = _extends({}, nodeLabelStyle, styleData);
-
-  topo.getHtTopo().setGlobalNodeLabelStyle(globalNodeLabelStyle);
-
-  var globalEdgeTagStyle = _extends({}, defaultEdgeLabelStyle, styleData);
-
-  topo.getHtTopo().setGlobalEdgeTagStyle(globalEdgeTagStyle);
-  displayConfigDispatchers.update({
-    nodeLabelStyle: globalNodeLabelStyle,
-    defaultEdgeLabelStyle: globalEdgeTagStyle
-  });
-};
-export function setStyle() {}

package/es/core/editor/components/Toolbar/hooks/textStyleSetting/nodeTagSetting.js

@@ -1,8 +0,0 @@
-export function useValues(topo) {
-  return {
-    color: null,
-    fontFamily: null,
-    fontSize: null,
-    fontStyle: []
-  };
-}

package/es/core/editor/components/Toolbar/hooks/textStyleSetting/text.js

@@ -1,8 +0,0 @@
-export function useValues(topo) {
-  return {
-    color: null,
-    fontFamily: null,
-    fontSize: null,
-    fontStyle: []
-  };
-}