@riil-frontend/component-topology 6.0.0-alpha.65 → 6.0.0-alpha.67

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

@@ -11,9 +11,12 @@ var _objectWithoutPropertiesLoose2 = _interopRequireDefault(require("@babel/runt
 
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 
+var _fontStyleUtil = _interopRequireDefault(require("../../../../../settings/common/text/fontStyleUtil"));
+
 var _colorUtil = require("../ElementTextStyleSetting/colorUtil");
 
-var _excluded = ["color", "background", "opacity"];
+var _excluded = ["color", "background", "opacity"],
+    _excluded2 = ["color", "background", "opacity", "bold", "italic"];
 var defaultStyle = {
   color: '#AFB9C2',
   fontFamily: '微软雅黑'
@@ -40,12 +43,13 @@ var setGlobalTagStyle = function setGlobalTagStyle(topo, styleData) {
   var style = buildStyle(styleData, nodeLabelStyle);
   var globalNodeLabelStyle = (0, _extends2["default"])({}, nodeLabelStyle, style);
   var globalEdgeTagStyle = (0, _extends2["default"])({}, nodeLabelStyle, defaultEdgeLabelStyle, style);
-  topo.getHtTopo().setGlobalNodeLabelStyle(globalNodeLabelStyle);
-  topo.getHtTopo().setGlobalEdgeTagStyle(globalEdgeTagStyle);
   displayConfigDispatchers.update({
     nodeLabelStyle: globalNodeLabelStyle,
     defaultEdgeLabelStyle: globalEdgeTagStyle
   });
+  var styles = setTextStyle(styleData, nodeLabelStyle);
+  topo.getHtTopo().setGlobalNodeLabelStyle(styles);
+  topo.getHtTopo().setGlobalEdgeTagStyle(styles);
 };
 
 exports.setGlobalTagStyle = setGlobalTagStyle;
@@ -69,4 +73,40 @@ function buildStyle(styleData, prevTagStyle) {
   return style;
 }
 
+function setTextStyle(styleData, nodeLabelStyle) {
+  var _fontStyleUtil$remove = _fontStyleUtil["default"].removeBoldItalic(styleData),
+      color = _fontStyleUtil$remove.color,
+      background = _fontStyleUtil$remove.background,
+      opacity = _fontStyleUtil$remove.opacity,
+      bold = _fontStyleUtil$remove.bold,
+      italic = _fontStyleUtil$remove.italic,
+      otherStyle = (0, _objectWithoutPropertiesLoose2["default"])(_fontStyleUtil$remove, _excluded2);
+
+  var tagStyle = (0, _extends2["default"])({}, otherStyle);
+
+  if ('color' in styleData) {
+    tagStyle.color = color.hex;
+  }
+
+  if ('bold' in styleData) {
+    tagStyle.fontBold = bold;
+  }
+
+  if ('italic' in styleData) {
+    tagStyle.fontItalic = italic;
+  }
+
+  if ('background' in styleData) {
+    // 背景颜色
+    var prevBackgroundStyle = (0, _colorUtil.parseBackground)(nodeLabelStyle === null || nodeLabelStyle === void 0 ? void 0 : nodeLabelStyle.background);
+    tagStyle.background = (0, _colorUtil.formatBackgroundRgbaColor)(prevBackgroundStyle, styleData);
+  }
+
+  if ('opacity' in styleData) {
+    tagStyle.opacity = opacity;
+  }
+
+  return tagStyle;
+}
+
 function setStyle() {}

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@riil-frontend/component-topology",
-  "version": "6.0.0-alpha.65",
+  "version": "6.0.0-alpha.67",
   "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.65/build/index.html",
+  "homepage": "https://unpkg.com/@riil-frontend/component-topology@6.0.0-alpha.67/build/index.html",
   "gitHead": "2da19ffccbb7ca60a8acf396e39f542c68bb33f5"
 }