@riil-frontend/component-topology 6.0.0-alpha.55 → 6.0.0-alpha.56

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

@@ -1,18 +1,32 @@
 import _extends from "@babel/runtime/helpers/extends";
 import fontStyleUtil from "../../../../../../settings/common/text/fontStyleUtil";
 import { formatBackgroundRgbaColor, parseBackground, parseColor } from "../colorUtil";
-var defaultStyle = {};
+var defaultStyle = {
+  color: '#4D6277',
+  font: '10px 微软雅黑',
+  background: '#E4E9EE'
+};
 
 function getLabelStyle(element) {
-  return _extends({}, defaultStyle, element.a('labelStyle') || {});
-}
+  var background = element.s('layer.label.background');
 
-function setLabelStyle(element, style) {
-  element.a('labelStyle', _extends({}, element.a('labelStyle'), style)); // eslint-disable-next-line no-underscore-dangle
+  if (background === undefined) {
+    background = defaultStyle.background;
+  }
 
-  element.__labelNode.a(style);
+  return {
+    color: element.s('layer.label.color') || defaultStyle.color,
+    font: element.s('layer.label.font') || defaultStyle.font,
+    background: background
+  };
+}
 
-  console.error(element.__labelNode.getAttrObject());
+function setLabelStyle(element, style) {
+  var map = {};
+  Object.keys(style).forEach(function (name) {
+    map["layer.label." + name] = style[name];
+  });
+  element.s(map);
 } // 分层标题文字样式
 
 
@@ -20,7 +34,7 @@ export function getTextStyle(element) {
   var style = getLabelStyle(element);
   var underline = null;
   return _extends({
-    color: parseColor(style.fontColor),
+    color: parseColor(style.color),
     underline: underline
   }, fontStyleUtil.toMap(style.font), parseBackground(style.background));
 }
@@ -30,7 +44,7 @@ export function setTextStyle(element, style) {
   var labelStyle = {};
 
   if ('color' in style) {
-    labelStyle.fontColor = style.color.hex;
+    labelStyle.color = style.color.hex;
   } // 背景颜色
 
 

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

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

@@ -13,18 +13,32 @@ var _fontStyleUtil = _interopRequireDefault(require("../../../../../../settings/
 
 var _colorUtil = require("../colorUtil");
 
-var defaultStyle = {};
+var defaultStyle = {
+  color: '#4D6277',
+  font: '10px 微软雅黑',
+  background: '#E4E9EE'
+};
 
 function getLabelStyle(element) {
-  return (0, _extends2["default"])({}, defaultStyle, element.a('labelStyle') || {});
-}
+  var background = element.s('layer.label.background');
 
-function setLabelStyle(element, style) {
-  element.a('labelStyle', (0, _extends2["default"])({}, element.a('labelStyle'), style)); // eslint-disable-next-line no-underscore-dangle
+  if (background === undefined) {
+    background = defaultStyle.background;
+  }
 
-  element.__labelNode.a(style);
+  return {
+    color: element.s('layer.label.color') || defaultStyle.color,
+    font: element.s('layer.label.font') || defaultStyle.font,
+    background: background
+  };
+}
 
-  console.error(element.__labelNode.getAttrObject());
+function setLabelStyle(element, style) {
+  var map = {};
+  Object.keys(style).forEach(function (name) {
+    map["layer.label." + name] = style[name];
+  });
+  element.s(map);
 } // 分层标题文字样式
 
 
@@ -32,7 +46,7 @@ function getTextStyle(element) {
   var style = getLabelStyle(element);
   var underline = null;
   return (0, _extends2["default"])({
-    color: (0, _colorUtil.parseColor)(style.fontColor),
+    color: (0, _colorUtil.parseColor)(style.color),
     underline: underline
   }, _fontStyleUtil["default"].toMap(style.font), (0, _colorUtil.parseBackground)(style.background));
 }
@@ -43,7 +57,7 @@ function setTextStyle(element, style) {
   var labelStyle = {};
 
   if ('color' in style) {
-    labelStyle.fontColor = style.color.hex;
+    labelStyle.color = style.color.hex;
   } // 背景颜色
 
 

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