@riil-frontend/component-topology 6.0.0-alpha.37 → 6.0.0-alpha.39

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

@@ -1,20 +1,54 @@
 "use strict";
 
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
 exports.__esModule = true;
 exports["default"] = void 0;
 exports.getTextStyle = getTextStyle;
 exports.setTextStyle = setTextStyle;
 
+var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
+
+var _fontStyleUtil = _interopRequireDefault(require("../../../../../../settings/common/text/fontStyleUtil"));
+
+var _colorUtil = require("../colorUtil");
+
+var _nodeTag = _interopRequireDefault(require("./nodeTag"));
+
 function getTextStyle(element) {
-  return {
-    color: null,
-    fontFamily: null,
-    fontSize: null,
-    fontStyle: []
-  };
+  if (!element.isExpanded()) {
+    // eslint-disable-next-line import/no-named-as-default-member
+    return _nodeTag["default"].getTextStyle(element);
+  }
+
+  var underline = element.s('text.decoration') === 'underline';
+  return (0, _extends2["default"])({
+    color: (0, _colorUtil.parseColor)(element.s('group.title.color')),
+    underline: underline
+  }, _fontStyleUtil["default"].toMap(element.s('group.title.font')), (0, _colorUtil.parseBackground)(element.s('group.title.background')));
 }
 
-function setTextStyle(element, style) {}
+function setTextStyle(element, style, topo) {
+  if (!element.isExpanded()) {
+    // eslint-disable-next-line import/no-named-as-default-member
+    return _nodeTag["default"].setTextStyle(element, style, topo);
+  } // if ('underline' in style) {
+  // }
+
+
+  if ('color' in style) {
+    element.s('group.title.color', style.color.hex);
+  } // 背景颜色
+
+
+  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(fontStyle);
+
+  element.s('group.title.font', fontStr);
+}
 
 var _default = {
   getTextStyle: getTextStyle,

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

@@ -15,11 +15,14 @@ var _groupTitle = _interopRequireDefault(require("./groupTitle"));
 
 var _layerTitle = _interopRequireDefault(require("./layerTitle"));
 
+var _box = _interopRequireDefault(require("./box"));
+
 var _default = {
   nodeTag: _nodeTag["default"],
   edgeTag: _edgeTag["default"],
   text: _text["default"],
   groupTitle: _groupTitle["default"],
-  layerTitle: _layerTitle["default"]
+  layerTitle: _layerTitle["default"],
+  box: _box["default"]
 };
 exports["default"] = _default;

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

@@ -1,20 +1,59 @@
 "use strict";
 
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
 exports.__esModule = true;
 exports["default"] = void 0;
 exports.getTextStyle = getTextStyle;
 exports.setTextStyle = setTextStyle;
 
+var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
+
+var _fontStyleUtil = _interopRequireDefault(require("../../../../../../settings/common/text/fontStyleUtil"));
+
+var _colorUtil = require("../colorUtil");
+
+var defaultStyle = {};
+
+function getLabelStyle(element) {
+  return (0, _extends2["default"])({}, defaultStyle, element.a('labelStyle') || {});
+}
+
+function setLabelStyle(element, style) {
+  element.a('labelStyle', (0, _extends2["default"])({}, element.a('labelStyle'), style)); // eslint-disable-next-line no-underscore-dangle
+
+  element.__labelNode.a(style);
+} // 分层标题文字样式
+
+
 function getTextStyle(element) {
-  return {
-    color: null,
-    fontFamily: null,
-    fontSize: null,
-    fontStyle: []
-  };
+  var style = getLabelStyle(element);
+  var underline = null;
+  return (0, _extends2["default"])({
+    color: (0, _colorUtil.parseColor)(style.fontColor),
+    underline: underline
+  }, _fontStyleUtil["default"].toMap(style.font), (0, _colorUtil.parseBackground)(style.background));
 }
 
-function setTextStyle(element, style) {}
+function setTextStyle(element, style) {
+  // if ('underline' in style) {
+  // }
+  var labelStyle = {};
+
+  if ('color' in style) {
+    labelStyle.fontColor = style.color.hex;
+  } // 背景颜色
+
+
+  var prevStyle = getTextStyle(element);
+  labelStyle.background = (0, _colorUtil.formatBackgroundRgbaColor)(prevStyle, style);
+  var fontStyle = (0, _extends2["default"])({}, getTextStyle(element), style);
+
+  var fontStr = _fontStyleUtil["default"].build(fontStyle);
+
+  labelStyle.font = fontStr;
+  setLabelStyle(element, labelStyle);
+}
 
 var _default = {
   getTextStyle: getTextStyle,

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

@@ -1,20 +1,37 @@
 "use strict";
 
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
 exports.__esModule = true;
 exports["default"] = void 0;
 exports.getTextStyle = getTextStyle;
 exports.setTextStyle = setTextStyle;
 
+var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
+
+var _fontStyleUtil = _interopRequireDefault(require("../../../../../../settings/common/text/fontStyleUtil"));
+
+var _colorUtil = require("../colorUtil");
+
 function getTextStyle(element) {
-  return {
-    color: null,
-    fontFamily: null,
-    fontSize: null,
-    fontStyle: []
-  };
+  var underline = null;
+  return (0, _extends2["default"])({
+    color: (0, _colorUtil.parseColor)(element.a('ht.color')),
+    underline: underline
+  }, _fontStyleUtil["default"].toMap(element.a('ht.font')), (0, _colorUtil.parseBackground)(element.a('ht.background')));
 }
 
-function setTextStyle(element, style) {}
+function setTextStyle(element, style, topo) {
+  if ('background' in style || 'opacity' in style) {
+    // 背景颜色
+    var prevStyle = getTextStyle(element);
+    topo.setNodeLabelStyle(element, {
+      background: (0, _colorUtil.formatBackgroundRgbaColor)(prevStyle, style)
+    });
+  } else {
+    topo.getHtTopo().setNodeLabelStyle(element, style);
+  }
+}
 
 var _default = {
   getTextStyle: getTextStyle,

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

@@ -14,19 +14,11 @@ var _fontStyleUtil = _interopRequireDefault(require("../../../../../../settings/
 var _colorUtil = require("../colorUtil");
 
 function getTextStyle(element) {
-  var _background$rgb;
-
   var underline = element.s('text.decoration') === 'underline';
-  var background = (0, _colorUtil.parseColor)(element.s('textBackground'));
   return (0, _extends2["default"])({
     color: (0, _colorUtil.parseColor)(element.s('text.color')),
     underline: underline
-  }, _fontStyleUtil["default"].toMap(element.s('text.font')), {
-    background: background,
-    // 背景颜色，格式: {rgba: {}, hex: ''} | null
-    opacity: background === null || background === void 0 ? void 0 : (_background$rgb = background.rgb) === null || _background$rgb === void 0 ? void 0 : _background$rgb.a // 背景透明度。值范围 0-1, null，null表示无
-
-  });
+  }, _fontStyleUtil["default"].toMap(element.s('text.font')), (0, _colorUtil.parseBackground)(element.s('textBackground')));
 }
 
 function setTextStyle(element, style) {

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

@@ -14,6 +14,8 @@ var _elements = _interopRequireDefault(require("./elements"));
 function getElementType(element) {
   if ((0, _htElementUtils.isText)(element)) {
     return 'text';
+  } else if (element.a('type') === 'box') {
+    return 'box';
   } else if ((0, _htElementUtils.isGroup)(element)) {
     return 'groupTitle';
   } else if ((0, _htElementUtils.isNode)(element)) {
@@ -71,11 +73,11 @@ function getTextStyle(htSelection, styleNames) {
   return null;
 }
 
-function setTextStyle(element, style) {
+function setTextStyle(element, style, topo) {
   var type = getElementType(element);
   var handler = _elements["default"][type];
 
   if (handler) {
-    handler.setTextStyle(element, style);
+    handler.setTextStyle(element, style, topo);
   }
 }

package/lib/core/editor/components/settings/common/text/fontStyleUtil.js

@@ -9,18 +9,17 @@ var fontStyleUtil = {
       font = '';
     }
 
-    var arr = font.trim().split(' ');
+    var str = font.trim();
     var bold = font.indexOf('bold') > -1;
     var italic = font.indexOf('italic') > -1;
-    var fontFamily;
-    var fontSize;
-
-    if (arr.length) {
-      fontFamily = arr[arr.length - 1];
-    }
-
-    if (arr.length >= 2) {
-      fontSize = parseInt(arr[arr.length - 2].replace('px', ''), 10);
+    str = str.trim().replace('bold ', '').trim().replace('italic ', '').trim();
+    var arr = str.split(' ');
+    var fontSizeStr = arr[0];
+    var fontFamily = str.replace(fontSizeStr, '').trim() || null;
+    var fontSize = null;
+
+    if (fontSizeStr) {
+      fontSize = parseInt(fontSizeStr.replace('px', ''), 10);
     }
 
     return {
@@ -32,17 +31,9 @@ var fontStyleUtil = {
   },
   // 字体样式格式: bold italic 12px 黑体 或 12px 黑体
   build: function build(style) {
-    var font = '';
-
-    if (style.bold) {
-      font += 'bold ';
-    }
-
-    if (style.italic) {
-      font += 'italic ';
-    }
-
-    return "" + font + style.fontSize + "px " + style.fontFamily;
+    return [style.bold ? 'bold' : null, style.italic ? 'italic' : null, style.fontSize ? style.fontSize + "px" : null, style.fontFamily].filter(function (item) {
+      return item !== null;
+    }).join(' ');
   },
   getFontStyleMap: function getFontStyleMap(obj, prefix) {
     var map = {};

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