@riil-frontend/component-topology 6.0.0-alpha.50 → 6.0.0-alpha.51

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

@@ -1,4 +1,6 @@
+import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/objectWithoutPropertiesLoose";
 import _extends from "@babel/runtime/helpers/extends";
+var _excluded = ["color", "background", "opacity"];
 import fontStyleUtil from "../../../../../../settings/common/text/fontStyleUtil";
 import { formatBackgroundRgbaColor, parseBackground, parseColor } from "../colorUtil";
 export function getTextStyle(element) {
@@ -9,15 +11,24 @@ export function getTextStyle(element) {
   }, fontStyleUtil.toMap(element.a('link_ind_left_font')), parseBackground(element.a('link_ind_background')));
 }
 export function setTextStyle(element, style, topo) {
+  var color = style.color,
+      background = style.background,
+      opacity = style.opacity,
+      otherStyle = _objectWithoutPropertiesLoose(style, _excluded);
+
+  var tagStyle = _extends({}, otherStyle);
+
+  if ('color' in style) {
+    tagStyle.color = color.hex;
+  }
+
   if ('background' in style || 'opacity' in style) {
     // 背景颜色
     var prevStyle = getTextStyle(element);
-    topo.getHtTopo().setEdgeLabelStyle(element, {
-      background: formatBackgroundRgbaColor(prevStyle, style)
-    });
-  } else {
-    topo.getHtTopo().setEdgeLabelStyle(element, style);
+    tagStyle.background = formatBackgroundRgbaColor(prevStyle, style);
   }
+
+  topo.getHtTopo().setEdgeLabelStyle(element, tagStyle);
 }
 export default {
   getTextStyle: getTextStyle,

package/es/core/models/TopoApp.js

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

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

@@ -7,12 +7,16 @@ exports["default"] = void 0;
 exports.getTextStyle = getTextStyle;
 exports.setTextStyle = setTextStyle;
 
+var _objectWithoutPropertiesLoose2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutPropertiesLoose"));
+
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 
 var _fontStyleUtil = _interopRequireDefault(require("../../../../../../settings/common/text/fontStyleUtil"));
 
 var _colorUtil = require("../colorUtil");
 
+var _excluded = ["color", "background", "opacity"];
+
 function getTextStyle(element) {
   var underline = null;
   return (0, _extends2["default"])({
@@ -22,15 +26,23 @@ function getTextStyle(element) {
 }
 
 function setTextStyle(element, style, topo) {
+  var color = style.color,
+      background = style.background,
+      opacity = style.opacity,
+      otherStyle = (0, _objectWithoutPropertiesLoose2["default"])(style, _excluded);
+  var tagStyle = (0, _extends2["default"])({}, otherStyle);
+
+  if ('color' in style) {
+    tagStyle.color = color.hex;
+  }
+
   if ('background' in style || 'opacity' in style) {
     // 背景颜色
     var prevStyle = getTextStyle(element);
-    topo.getHtTopo().setEdgeLabelStyle(element, {
-      background: (0, _colorUtil.formatBackgroundRgbaColor)(prevStyle, style)
-    });
-  } else {
-    topo.getHtTopo().setEdgeLabelStyle(element, style);
+    tagStyle.background = (0, _colorUtil.formatBackgroundRgbaColor)(prevStyle, style);
   }
+
+  topo.getHtTopo().setEdgeLabelStyle(element, tagStyle);
 }
 
 var _default = {

package/lib/core/models/TopoApp.js

@@ -52,7 +52,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.50" === 'string' ? "6.0.0-alpha.50" : null;
+var version = typeof "6.0.0-alpha.51" === 'string' ? "6.0.0-alpha.51" : 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.50",
+  "version": "6.0.0-alpha.51",
   "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.50/build/index.html",
+  "homepage": "https://unpkg.com/@riil-frontend/component-topology@6.0.0-alpha.51/build/index.html",
   "gitHead": "2da19ffccbb7ca60a8acf396e39f542c68bb33f5"
 }