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

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.getFieldDisabled = getFieldDisabled;
 exports.getTextStyle = getTextStyle;
 exports.setTextStyle = setTextStyle;
 
@@ -22,10 +23,16 @@ function getTextStyle(element) {
   }
 
   var underline = element.s('text.decoration') === 'underline';
+
+  var font = _fontStyleUtil["default"].toMap(element.s('group.title.font'));
+
   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')));
+  }, _fontStyleUtil["default"].toMap(element.s('group.title.font')), {
+    fontSize: font.fontSize || 12,
+    fontFamily: font.fontFamily || '微软雅黑'
+  }, (0, _colorUtil.parseBackground)(element.s('group.title.background')));
 }
 
 function setTextStyle(element, style, topo) {
@@ -45,13 +52,24 @@ function setTextStyle(element, style, topo) {
   element.s('group.title.background', (0, _colorUtil.formatBackgroundRgbaColor)(prevStyle, style));
   var fontStyle = (0, _extends2["default"])({}, getTextStyle(element), style);
 
-  var fontStr = _fontStyleUtil["default"].build(fontStyle);
+  var fontStr = _fontStyleUtil["default"].build(_fontStyleUtil["default"].removeBoldItalic(fontStyle));
 
   element.s('group.title.font', fontStr);
 }
 
+function getFieldDisabled(element) {
+  if (!element.isExpanded()) {
+    return {
+      fontSize: true
+    };
+  }
+
+  return {};
+}
+
 var _default = {
   getTextStyle: getTextStyle,
-  setTextStyle: setTextStyle
+  setTextStyle: setTextStyle,
+  getFieldDisabled: getFieldDisabled
 };
 exports["default"] = _default;

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/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.getFieldDisabled = getFieldDisabled;
 exports.getTextStyle = getTextStyle;
 exports.setTextStyle = setTextStyle;
 
@@ -15,7 +16,7 @@ var _fontStyleUtil = _interopRequireDefault(require("../../../../../../settings/
 
 var _colorUtil = require("../colorUtil");
 
-var _excluded = ["color", "background", "opacity"];
+var _excluded = ["color", "background", "opacity", "bold", "italic"];
 
 function getTextStyle(element) {
   var underline = null;
@@ -26,27 +27,48 @@ 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 _fontStyleUtil$remove = _fontStyleUtil["default"].removeBoldItalic(style),
+      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, _excluded);
+
   var tagStyle = (0, _extends2["default"])({}, otherStyle);
 
   if ('color' in style) {
     tagStyle.color = color.hex;
   }
 
+  if ('bold' in style) {
+    tagStyle.fontBold = bold;
+  }
+
+  if ('italic' in style) {
+    tagStyle.fontItalic = italic;
+  }
+
   if ('background' in style || 'opacity' in style) {
     // 背景颜色
     var prevStyle = getTextStyle(element);
     tagStyle.background = (0, _colorUtil.formatBackgroundRgbaColor)(prevStyle, style);
   }
 
-  topo.getHtTopo().setNodeLabelStyle(element, tagStyle);
+  if (Object.keys(tagStyle).length) {
+    topo.getHtTopo().setNodeLabelStyle(element, tagStyle);
+  }
+}
+
+function getFieldDisabled(element) {
+  return {
+    fontSize: true
+  };
 }
 
 var _default = {
   getTextStyle: getTextStyle,
-  setTextStyle: setTextStyle
+  setTextStyle: setTextStyle,
+  getFieldDisabled: getFieldDisabled
 };
 exports["default"] = _default;

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

@@ -4,9 +4,12 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 
 exports.__esModule = true;
 exports.getElementTextStyle = getElementTextStyle;
+exports.getElementTextStyleFieldDisabled = getElementTextStyleFieldDisabled;
 exports.getTextStyle = getTextStyle;
 exports.setTextStyle = setTextStyle;
 
+var _extends3 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
+
 var _htElementUtils = require("../../../../../../../../utils/htElementUtils");
 
 var _elements = _interopRequireDefault(require("./elements"));
@@ -40,23 +43,31 @@ function getElementTextStyle(element) {
   return null;
 }
 
-function getTextStyle(htSelection, styleNames) {
-  if (htSelection.length === 1) {
-    var element = htSelection[0];
-    return getElementTextStyle(element);
-  } else if (htSelection.length) {
-    // 多选时值相同返回？
-    var values = htSelection.map(function (element) {
-      return getElementTextStyle(element);
-    }).filter(function (item) {
-      return !!item;
-    });
+function getElementTextStyleFieldDisabled(element) {
+  var type = getElementType(element);
+  var handler = _elements["default"][type];
 
-    if (!values.length) {
-      return null;
+  if (handler) {
+    if (handler.getFieldDisabled) {
+      return handler.getFieldDisabled(element) || {};
     }
 
-    var value = {};
+    return {};
+  }
+
+  return null;
+}
+
+function getTextStyle(htSelection, styleNames) {
+  // 多选时值相同返回？
+  var values = htSelection.map(function (element) {
+    return getElementTextStyle(element);
+  }).filter(function (item) {
+    return !!item;
+  });
+  var value = {};
+
+  if (values.length) {
     styleNames.forEach(function (styleName) {
       var val = values[0][styleName];
       var different = values.filter(function (obj) {
@@ -67,10 +78,30 @@ function getTextStyle(htSelection, styleNames) {
         value[styleName] = val;
       }
     });
-    return Object.keys(value).length ? value : null;
-  }
-
-  return null;
+  } // 多选时元素都不支持字段时禁用
+
+
+  var fieldDisableds = htSelection.map(function (element) {
+    return getElementTextStyleFieldDisabled(element);
+  }).filter(function (item) {
+    return !!item;
+  });
+  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));
+  }, {});
+  return {
+    style: value,
+    fieldDisabled: fieldDisabled,
+    debugData: {
+      values: values,
+      fieldDisableds: fieldDisableds
+    }
+  };
 }
 
 function setTextStyle(element, style, topo) {

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

@@ -19,6 +19,10 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
+var fieldDisabled = {
+  fontSize: true
+};
+
 function GlobalTagStyleSetting(props) {
   var topo = props.topo;
   var Component = props.Component,
@@ -31,7 +35,8 @@ function GlobalTagStyleSetting(props) {
   }, []);
   return /*#__PURE__*/_react["default"].createElement(Component, (0, _extends2["default"])({
     style: values,
-    setStyle: setStyle
+    setStyle: setStyle,
+    fieldDisabled: fieldDisabled
   }, widgetProps));
 }
 

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

@@ -1,7 +1,13 @@
 "use strict";
 
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
 exports.__esModule = true;
 exports["default"] = void 0;
+
+var _objectWithoutPropertiesLoose2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutPropertiesLoose"));
+
+var _excluded = ["bold", "italic"];
 var fontStyleUtil = {
   // 字体样式格式: bold italic 12px 黑体 或 12px 黑体
   toMap: function toMap(font) {
@@ -43,6 +49,13 @@ var fontStyleUtil = {
       }
     });
     return map;
+  },
+  // TODO 临时方法
+  removeBoldItalic: function removeBoldItalic(obj) {
+    var bold = obj.bold,
+        italic = obj.italic,
+        ohter = (0, _objectWithoutPropertiesLoose2["default"])(obj, _excluded);
+    return ohter;
   }
 };
 var _default = fontStyleUtil;

package/lib/core/editor/components/settings/propertyViews/layer/BasicSetting.js

@@ -37,8 +37,6 @@ function BasicSetting(props) {
         return;
       }
 
-      _rlog["default"].debug(values[name], value);
-
       var newValues = field.getValues();
 
       _onChange(name, value, newValues);

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.57" === 'string' ? "6.0.0-alpha.57" : 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.57",
   "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.57/build/index.html",
   "gitHead": "2da19ffccbb7ca60a8acf396e39f542c68bb33f5"
 }