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

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

@@ -4,6 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 
 exports.__esModule = true;
 exports["default"] = void 0;
+exports.getEnabledFields = getEnabledFields;
 exports.getFieldDisabled = getFieldDisabled;
 exports.getTextStyle = getTextStyle;
 exports.setTextStyle = setTextStyle;
@@ -59,6 +60,16 @@ function setTextStyle(element, style, topo) {
     topo.getHtTopo().setEdgeLabelStyle(element, tagStyle);
   }
 }
+/**
+ * 
+ * @param {*} element 
+ * @returns {Array}
+ */
+
+
+function getEnabledFields(element) {
+  return ['fontFamily', 'color', 'background', 'opacity'];
+}
 
 function getFieldDisabled(element) {
   return {
@@ -69,6 +80,7 @@ function getFieldDisabled(element) {
 var _default = {
   getTextStyle: getTextStyle,
   setTextStyle: setTextStyle,
+  getEnabledFields: getEnabledFields,
   getFieldDisabled: getFieldDisabled
 };
 exports["default"] = _default;

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

@@ -4,6 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 
 exports.__esModule = true;
 exports["default"] = void 0;
+exports.getEnabledFields = getEnabledFields;
 exports.getFieldDisabled = getFieldDisabled;
 exports.getTextStyle = getTextStyle;
 exports.setTextStyle = setTextStyle;
@@ -45,18 +46,29 @@ function setTextStyle(element, style, topo) {
 
   if ('color' in style) {
     element.s('group.title.color', style.color.hex);
-  } // 背景颜色
+  }
 
+  if ('background' in style || 'opacity' in style) {
+    // 背景颜色
+    var prevStyle = getTextStyle(element);
+    element.s('group.title.background', (0, _colorUtil.formatBackgroundRgbaColor)(prevStyle, style));
+  }
 
-  var prevStyle = getTextStyle(element);
-  element.s('group.title.background', (0, _colorUtil.formatBackgroundRgbaColor)(prevStyle, style));
   var fontStyle = (0, _extends2["default"])({}, getTextStyle(element), style);
 
-  var fontStr = _fontStyleUtil["default"].build(_fontStyleUtil["default"].removeBoldItalic(fontStyle));
+  var fontStr = _fontStyleUtil["default"].build(fontStyle);
 
   element.s('group.title.font', fontStr);
 }
 
+function getEnabledFields(element) {
+  if (!element.isExpanded()) {
+    return ['fontFamily', 'fontSize', 'color', 'background', 'opacity'];
+  }
+
+  return ['fontFamily', 'fontSize', 'bold', 'italic', 'color', 'background', 'opacity'];
+}
+
 function getFieldDisabled(element) {
   if (!element.isExpanded()) {
     return {
@@ -70,6 +82,7 @@ function getFieldDisabled(element) {
 var _default = {
   getTextStyle: getTextStyle,
   setTextStyle: setTextStyle,
+  getEnabledFields: getEnabledFields,
   getFieldDisabled: getFieldDisabled
 };
 exports["default"] = _default;

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

@@ -4,6 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 
 exports.__esModule = true;
 exports["default"] = void 0;
+exports.getEnabledFields = getEnabledFields;
 exports.getTextStyle = getTextStyle;
 exports.setTextStyle = setTextStyle;
 
@@ -70,9 +71,20 @@ function setTextStyle(element, style) {
   labelStyle.font = fontStr;
   setLabelStyle(element, labelStyle);
 }
+/**
+ * 
+ * @param {*} element 
+ * @returns {Array}
+ */
+
+
+function getEnabledFields(element) {
+  return ['fontFamily', 'fontSize', 'bold', 'italic', 'color', 'background', 'opacity'];
+}
 
 var _default = {
   getTextStyle: getTextStyle,
-  setTextStyle: setTextStyle
+  setTextStyle: setTextStyle,
+  getEnabledFields: getEnabledFields
 };
 exports["default"] = _default;

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

@@ -4,6 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 
 exports.__esModule = true;
 exports["default"] = void 0;
+exports.getEnabledFields = getEnabledFields;
 exports.getFieldDisabled = getFieldDisabled;
 exports.getTextStyle = getTextStyle;
 exports.setTextStyle = setTextStyle;
@@ -60,15 +61,30 @@ function setTextStyle(element, style, topo) {
   }
 }
 
+function getEnabledFields(element) {
+  return ['fontFamily', 'color', 'background', 'opacity'];
+}
+/**
+ * 获得字段是否禁用
+ * 
+ * @param {*} element 
+ * @returns 
+ */
+
+
 function getFieldDisabled(element) {
   return {
-    fontSize: true
+    fontSize: true,
+    bold: true,
+    italic: true,
+    underline: true
   };
 }
 
 var _default = {
   getTextStyle: getTextStyle,
   setTextStyle: setTextStyle,
+  getEnabledFields: getEnabledFields,
   getFieldDisabled: getFieldDisabled
 };
 exports["default"] = _default;

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

@@ -4,6 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 
 exports.__esModule = true;
 exports["default"] = void 0;
+exports.getEnabledFields = getEnabledFields;
 exports.getTextStyle = getTextStyle;
 exports.setTextStyle = setTextStyle;
 
@@ -41,8 +42,13 @@ function setTextStyle(element, style) {
   element.s('text.font', fontStr);
 }
 
+function getEnabledFields(element) {
+  return ['fontFamily', 'fontSize', 'bold', 'italic', 'underline', 'color', 'background', 'opacity'];
+}
+
 var _default = {
   getTextStyle: getTextStyle,
-  setTextStyle: setTextStyle
+  setTextStyle: setTextStyle,
+  getEnabledFields: getEnabledFields
 };
 exports["default"] = _default;

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

@@ -4,6 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 
 exports.__esModule = true;
 exports.getElementTextStyle = getElementTextStyle;
+exports.getElementTextStyleEnabledFields = getElementTextStyleEnabledFields;
 exports.getElementTextStyleFieldDisabled = getElementTextStyleFieldDisabled;
 exports.getTextStyle = getTextStyle;
 exports.setTextStyle = setTextStyle;
@@ -58,48 +59,74 @@ function getElementTextStyleFieldDisabled(element) {
   return null;
 }
 
+function getElementTextStyleEnabledFields(element) {
+  var type = getElementType(element);
+  var handler = _elements["default"][type];
+
+  if (handler && handler.getEnabledFields) {
+    return handler.getEnabledFields(element);
+  }
+
+  return null;
+}
+
 function getTextStyle(htSelection, styleNames) {
-  // 多选时值相同返回？
-  var values = htSelection.map(function (element) {
-    return getElementTextStyle(element);
-  }).filter(function (item) {
-    return !!item;
-  });
+  var elementValues = [];
+  var elementEnabledFieldsMap = {};
+  var enabledFields = [];
+  htSelection.forEach(function (element) {
+    var id = element.getId();
+    var elementTextStyle = getElementTextStyle(element);
+    elementValues.push({
+      id: id,
+      values: elementTextStyle
+    });
+    var elementEnabledFields = getElementTextStyleEnabledFields(element) || [];
+    elementEnabledFieldsMap[id] = elementEnabledFields;
+    enabledFields.push.apply(enabledFields, elementEnabledFields);
+  }); // 多选时值相同返回，排除元素禁用的字段值
+
   var value = {};
+  styleNames.forEach(function (styleName) {
+    // 查询该字段多元素的值列表，排除元素禁用的字段值
+    var fieldValueList = elementValues.reduce(function (result, item) {
+      // 元素字段是否禁用
+      var disabled = !elementEnabledFieldsMap[item.id].includes(styleName);
+
+      if (!item.values || disabled) {
+        return result;
+      }
 
-  if (values.length) {
-    styleNames.forEach(function (styleName) {
-      var val = values[0][styleName];
-      var different = values.filter(function (obj) {
-        return obj[styleName] !== val;
-      });
+      return [].concat(result, [item.values[styleName]]);
+    }, []); // 对比是否一样，如果一样则使用
 
-      if (!different.length) {
-        value[styleName] = val;
-      }
+    var val = fieldValueList[0];
+    var different = fieldValueList.filter(function (item) {
+      return item !== val;
     });
-  } // 多选时元素都不支持字段时禁用
-
 
-  var fieldDisableds = htSelection.map(function (element) {
-    return getElementTextStyleFieldDisabled(element);
-  }).filter(function (item) {
-    return !!item;
+    if (!different.length) {
+      value[styleName] = val;
+    }
   });
+  var disabled = true; // 字段如果没有元素启用则禁用
+
   var fieldDisabled = styleNames.reduce(function (result, fieldName) {
     var _extends2;
 
-    var disabled = fieldDisableds.length && fieldDisableds.filter(function (item) {
-      return !!item[fieldName];
-    }).length === fieldDisableds.length;
-    return (0, _extends3["default"])({}, result, (_extends2 = {}, _extends2[fieldName] = disabled, _extends2));
+    if (enabledFields.includes(fieldName)) {
+      disabled = false;
+    }
+
+    return (0, _extends3["default"])({}, result, (_extends2 = {}, _extends2[fieldName] = !enabledFields.includes(fieldName), _extends2));
   }, {});
   return {
+    disabled: disabled,
     style: value,
     fieldDisabled: fieldDisabled,
     debugData: {
-      values: values,
-      fieldDisableds: fieldDisableds
+      elementValues: elementValues,
+      elementEnabledFieldsMap: elementEnabledFieldsMap
     }
   };
 }

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

@@ -37,6 +37,7 @@ function GlobalTagStyleSetting(props) {
     };
   }, []);
   return /*#__PURE__*/_react["default"].createElement(Component, (0, _extends2["default"])({
+    disabled: true,
     style: values,
     setStyle: setStyle,
     fieldDisabled: fieldDisabled

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.62" === 'string' ? "6.0.0-alpha.62" : 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/hooks/useMetricPolling.js

@@ -62,20 +62,26 @@ function useMetricPolling(_ref) {
     return item;
   }).sort().join(',');
   (0, _react.useEffect)(function () {
-    _rlog["default"].info('链路拓扑指标轮询 切换', {
-      linkCi: linkCi,
-      linkMetricCodes: linkMetricCodes
-    });
+    if (linkId) {
+      _rlog["default"].info('链路拓扑指标轮询 切换', {
+        linkCi: linkCi,
+        linkMetricCodes: linkMetricCodes
+      });
+
+      queryLinkMetricsRequest.run(linkCi, linkMetricCodes);
+    }
 
-    queryLinkMetricsRequest.run(linkCi, linkMetricCodes);
     return function () {};
   }, [linkId, linkMetricCodesStr]);
   (0, _react.useEffect)(function () {
-    _rlog["default"].info('链路拓扑指标轮询 queryInterfaceMetricsRequest 开始', {
-      linkCi: linkCi
-    });
+    if (linkId) {
+      _rlog["default"].info('链路拓扑指标轮询 queryInterfaceMetricsRequest 开始', {
+        linkCi: linkCi
+      });
+
+      queryInterfaceMetricsRequest.run(linkCi);
+    }
 
-    queryInterfaceMetricsRequest.run(linkCi);
     return function () {};
   }, [linkId]);
   return data;

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