@riil-frontend/component-topology 6.0.20 → 7.0.0-dev.1

package/es/core/editor/components/Toolbar/widgets/FontStyleButton.js

@@ -52,16 +52,8 @@ function FontStyleButton(props) {
     underline: underline
   })),
       value = _useState2[0],
-      setValue = _useState2[1]; // 选中的元素
+      setValue = _useState2[1];
 
-
-  var selection = topo.selectionModel.useHtSelection();
-  useEffect(function () {
-    var containText = selection.filter(function (ele) {
-      return isText(ele);
-    }).length;
-    setDisabled(!containText);
-  }, [selection]);
   useEffect(function () {
     setValue(buildValue({
       bold: bold,

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

@@ -4,21 +4,20 @@ var _excluded = ["color", "background", "opacity", "bold", "italic"];
 import fontStyleUtil from "../../../../../../settings/common/text/fontStyleUtil";
 import { formatBackgroundRgbaColor, parseBackground, parseColor } from "../colorUtil";
 export function getTextStyle(element) {
-  var underline = null;
   return _extends({
     color: parseColor(element.a('edge.tag.color')),
     fontFamily: element.a('edge.tag.fontFamily') || '微软雅黑',
-    underline: underline
+    bold: !!element.a('edge.tag.fontBold'),
+    itatic: !!element.a('edge.tag.fontItalic')
   }, parseBackground(element.a('edge.tag.background')));
 }
 export function setTextStyle(element, style, topo) {
-  var _fontStyleUtil$remove = fontStyleUtil.removeBoldItalic(style),
-      color = _fontStyleUtil$remove.color,
-      background = _fontStyleUtil$remove.background,
-      opacity = _fontStyleUtil$remove.opacity,
-      bold = _fontStyleUtil$remove.bold,
-      italic = _fontStyleUtil$remove.italic,
-      otherStyle = _objectWithoutPropertiesLoose(_fontStyleUtil$remove, _excluded);
+  var color = style.color,
+      background = style.background,
+      opacity = style.opacity,
+      bold = style.bold,
+      italic = style.italic,
+      otherStyle = _objectWithoutPropertiesLoose(style, _excluded);
 
   var tagStyle = _extends({}, otherStyle);
 
@@ -55,11 +54,11 @@ export function setTextStyle(element, style, topo) {
  */
 
 export function getEnabledFields(element) {
-  return ['fontFamily', 'color', 'background', 'opacity'];
+  return ['fontFamily', 'color', 'background', 'opacity', 'fontSize', 'bold', 'italic'];
 }
 export function getFieldDisabled(element) {
   return {
-    fontSize: true
+    fontSize: false
   };
 }
 export default {

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

@@ -4,20 +4,19 @@ var _excluded = ["color", "background", "opacity", "bold", "italic"];
 import fontStyleUtil from "../../../../../../settings/common/text/fontStyleUtil";
 import { formatBackgroundRgbaColor, parseBackground, parseColor } from "../colorUtil";
 export function getTextStyle(element) {
-  var underline = null;
+  var underline = !!element.a('node.tag.fontUnderline');
   return _extends({
     color: parseColor(element.a('ht.color')),
     underline: underline
   }, fontStyleUtil.toMap(element.a('ht.font')), parseBackground(element.a('ht.background')));
 }
 export function setTextStyle(element, style, topo) {
-  var _fontStyleUtil$remove = fontStyleUtil.removeBoldItalic(style),
-      color = _fontStyleUtil$remove.color,
-      background = _fontStyleUtil$remove.background,
-      opacity = _fontStyleUtil$remove.opacity,
-      bold = _fontStyleUtil$remove.bold,
-      italic = _fontStyleUtil$remove.italic,
-      otherStyle = _objectWithoutPropertiesLoose(_fontStyleUtil$remove, _excluded);
+  var color = style.color,
+      background = style.background,
+      opacity = style.opacity,
+      bold = style.bold,
+      italic = style.italic,
+      otherStyle = _objectWithoutPropertiesLoose(style, _excluded);
 
   var tagStyle = _extends({}, otherStyle);
 
@@ -48,7 +47,7 @@ export function setTextStyle(element, style, topo) {
   }
 }
 export function getEnabledFields(element) {
-  return ['fontFamily', 'color', 'background', 'opacity'];
+  return ['fontFamily', 'color', 'background', 'opacity', 'fontSize', 'bold', 'italic', 'underline'];
 }
 /**
  * 获得字段是否禁用
@@ -59,10 +58,10 @@ export function getEnabledFields(element) {
 
 export function getFieldDisabled(element) {
   return {
-    fontSize: true,
-    bold: true,
-    italic: true,
-    underline: true
+    fontSize: false,
+    bold: false,
+    italic: false,
+    underline: false
   };
 }
 export default {

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

@@ -4,10 +4,10 @@ var _excluded = ["Component"];
 import React, { useMemo } from 'react';
 import { setGlobalTagStyle, useValues } from "./globalTag";
 var fieldDisabled = {
-  fontSize: true,
-  bold: true,
-  italic: true,
-  underline: true
+  fontSize: false,
+  bold: false,
+  italic: false,
+  underline: false
 };
 
 function GlobalTagStyleSetting(props) {

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

@@ -1,7 +1,7 @@
 import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/objectWithoutPropertiesLoose";
 import _extends from "@babel/runtime/helpers/extends";
 var _excluded = ["color", "background", "opacity"],
-    _excluded2 = ["color", "background", "opacity", "bold", "italic"];
+    _excluded2 = ["color", "background", "opacity", "bold", "italic", "underline"];
 import fontStyleUtil from "../../../../../settings/common/text/fontStyleUtil";
 import { formatBackgroundRgbaColor, parseBackground, formatRgbaColor } from "../ElementTextStyleSetting/colorUtil";
 var defaultStyle = {
@@ -15,7 +15,10 @@ export function useValues(topo) {
   return _extends({
     color: (nodeLabelStyle === null || nodeLabelStyle === void 0 ? void 0 : nodeLabelStyle.color) || defaultStyle.color,
     fontFamily: (nodeLabelStyle === null || nodeLabelStyle === void 0 ? void 0 : nodeLabelStyle.fontFamily) || defaultStyle.fontFamily,
-    fontSize: nodeLabelStyle === null || nodeLabelStyle === void 0 ? void 0 : nodeLabelStyle.fontSize
+    fontSize: nodeLabelStyle === null || nodeLabelStyle === void 0 ? void 0 : nodeLabelStyle.fontSize,
+    bold: nodeLabelStyle === null || nodeLabelStyle === void 0 ? void 0 : nodeLabelStyle.bold,
+    italic: nodeLabelStyle === null || nodeLabelStyle === void 0 ? void 0 : nodeLabelStyle.italic,
+    underline: nodeLabelStyle === null || nodeLabelStyle === void 0 ? void 0 : nodeLabelStyle.underline
   }, parseBackground(nodeLabelStyle === null || nodeLabelStyle === void 0 ? void 0 : nodeLabelStyle.background));
 }
 export var setGlobalTagStyle = function setGlobalTagStyle(topo, styleData) {
@@ -61,13 +64,13 @@ function buildStyle(styleData, prevTagStyle) {
 }
 
 function buildGlobalStyle(styleData) {
-  var _fontStyleUtil$remove = fontStyleUtil.removeBoldItalic(styleData),
-      color = _fontStyleUtil$remove.color,
-      background = _fontStyleUtil$remove.background,
-      opacity = _fontStyleUtil$remove.opacity,
-      bold = _fontStyleUtil$remove.bold,
-      italic = _fontStyleUtil$remove.italic,
-      otherStyle = _objectWithoutPropertiesLoose(_fontStyleUtil$remove, _excluded2);
+  var color = styleData.color,
+      background = styleData.background,
+      opacity = styleData.opacity,
+      bold = styleData.bold,
+      italic = styleData.italic,
+      underline = styleData.underline,
+      otherStyle = _objectWithoutPropertiesLoose(styleData, _excluded2);
 
   var tagStyle = _extends({}, otherStyle);
 
@@ -83,6 +86,10 @@ function buildGlobalStyle(styleData) {
     tagStyle.fontItalic = italic;
   }
 
+  if ('underline' in styleData) {
+    tagStyle.fontUnderline = underline;
+  }
+
   if ('background' in styleData) {
     // 背景颜色
     tagStyle.background = formatRgbaColor(background);

package/es/core/editor/hooks/useUpdateHtTopoDefaultTagStyle.js

@@ -13,12 +13,12 @@ function useUpdateHtTopoDefaultTagStyle(props) {
   var nodeLabelStyle = displayConfig.nodeLabelStyle,
       defaultEdgeLabelStyle = displayConfig.defaultEdgeLabelStyle;
   useEffect(function () {
-    if (nodeLabelStyle) {
+    if (nodeLabelStyle && topo.getHtTopo().setDefaultNodeLabelStyle) {
       topo.getHtTopo().setDefaultNodeLabelStyle(nodeLabelStyle);
     }
   }, [nodeLabelStyle]);
   useEffect(function () {
-    if (defaultEdgeLabelStyle) {
+    if (defaultEdgeLabelStyle && topo.getHtTopo().setDefaultEdgeTagStyle) {
       topo.getHtTopo().setDefaultEdgeTagStyle(defaultEdgeLabelStyle);
     }
   }, [defaultEdgeLabelStyle]);

package/es/core/models/TopoApp.js

@@ -23,7 +23,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.20" === 'string' ? "6.0.20" : null;
+var version = typeof "7.0.0-dev.1" === 'string' ? "7.0.0-dev.1" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 /**
  * 拓扑显示和编辑

package/lib/core/editor/components/Toolbar/widgets/FontStyleButton.js

@@ -68,16 +68,8 @@ function FontStyleButton(props) {
     underline: underline
   })),
       value = _useState2[0],
-      setValue = _useState2[1]; // 选中的元素
+      setValue = _useState2[1];
 
-
-  var selection = topo.selectionModel.useHtSelection();
-  (0, _react.useEffect)(function () {
-    var containText = selection.filter(function (ele) {
-      return (0, _htElementUtils.isText)(ele);
-    }).length;
-    setDisabled(!containText);
-  }, [selection]);
   (0, _react.useEffect)(function () {
     setValue(buildValue({
       bold: bold,

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

@@ -20,23 +20,21 @@ var _colorUtil = require("../colorUtil");
 var _excluded = ["color", "background", "opacity", "bold", "italic"];
 
 function getTextStyle(element) {
-  var underline = null;
   return (0, _extends2["default"])({
     color: (0, _colorUtil.parseColor)(element.a('edge.tag.color')),
     fontFamily: element.a('edge.tag.fontFamily') || '微软雅黑',
-    underline: underline
+    bold: !!element.a('edge.tag.fontBold'),
+    itatic: !!element.a('edge.tag.fontItalic')
   }, (0, _colorUtil.parseBackground)(element.a('edge.tag.background')));
 }
 
 function setTextStyle(element, style, topo) {
-  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 color = style.color,
+      background = style.background,
+      opacity = style.opacity,
+      bold = style.bold,
+      italic = style.italic,
+      otherStyle = (0, _objectWithoutPropertiesLoose2["default"])(style, _excluded);
   var tagStyle = (0, _extends2["default"])({}, otherStyle);
 
   if ('color' in style) {
@@ -73,12 +71,12 @@ function setTextStyle(element, style, topo) {
 
 
 function getEnabledFields(element) {
-  return ['fontFamily', 'color', 'background', 'opacity'];
+  return ['fontFamily', 'color', 'background', 'opacity', 'fontSize', 'bold', 'italic'];
 }
 
 function getFieldDisabled(element) {
   return {
-    fontSize: true
+    fontSize: false
   };
 }
 

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

@@ -20,7 +20,7 @@ var _colorUtil = require("../colorUtil");
 var _excluded = ["color", "background", "opacity", "bold", "italic"];
 
 function getTextStyle(element) {
-  var underline = null;
+  var underline = !!element.a('node.tag.fontUnderline');
   return (0, _extends2["default"])({
     color: (0, _colorUtil.parseColor)(element.a('ht.color')),
     underline: underline
@@ -28,14 +28,12 @@ function getTextStyle(element) {
 }
 
 function setTextStyle(element, style, topo) {
-  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 color = style.color,
+      background = style.background,
+      opacity = style.opacity,
+      bold = style.bold,
+      italic = style.italic,
+      otherStyle = (0, _objectWithoutPropertiesLoose2["default"])(style, _excluded);
   var tagStyle = (0, _extends2["default"])({}, otherStyle);
 
   if ('color' in style) {
@@ -66,7 +64,7 @@ function setTextStyle(element, style, topo) {
 }
 
 function getEnabledFields(element) {
-  return ['fontFamily', 'color', 'background', 'opacity'];
+  return ['fontFamily', 'color', 'background', 'opacity', 'fontSize', 'bold', 'italic', 'underline'];
 }
 /**
  * 获得字段是否禁用
@@ -78,10 +76,10 @@ function getEnabledFields(element) {
 
 function getFieldDisabled(element) {
   return {
-    fontSize: true,
-    bold: true,
-    italic: true,
-    underline: true
+    fontSize: false,
+    bold: false,
+    italic: false,
+    underline: false
   };
 }
 

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

@@ -20,10 +20,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,
-  bold: true,
-  italic: true,
-  underline: true
+  fontSize: false,
+  bold: false,
+  italic: false,
+  underline: false
 };
 
 function GlobalTagStyleSetting(props) {

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

@@ -16,7 +16,7 @@ var _fontStyleUtil = _interopRequireDefault(require("../../../../../settings/com
 var _colorUtil = require("../ElementTextStyleSetting/colorUtil");
 
 var _excluded = ["color", "background", "opacity"],
-    _excluded2 = ["color", "background", "opacity", "bold", "italic"];
+    _excluded2 = ["color", "background", "opacity", "bold", "italic", "underline"];
 var defaultStyle = {
   color: '#AFB9C2',
   fontFamily: '微软雅黑'
@@ -29,7 +29,10 @@ function useValues(topo) {
   return (0, _extends2["default"])({
     color: (nodeLabelStyle === null || nodeLabelStyle === void 0 ? void 0 : nodeLabelStyle.color) || defaultStyle.color,
     fontFamily: (nodeLabelStyle === null || nodeLabelStyle === void 0 ? void 0 : nodeLabelStyle.fontFamily) || defaultStyle.fontFamily,
-    fontSize: nodeLabelStyle === null || nodeLabelStyle === void 0 ? void 0 : nodeLabelStyle.fontSize
+    fontSize: nodeLabelStyle === null || nodeLabelStyle === void 0 ? void 0 : nodeLabelStyle.fontSize,
+    bold: nodeLabelStyle === null || nodeLabelStyle === void 0 ? void 0 : nodeLabelStyle.bold,
+    italic: nodeLabelStyle === null || nodeLabelStyle === void 0 ? void 0 : nodeLabelStyle.italic,
+    underline: nodeLabelStyle === null || nodeLabelStyle === void 0 ? void 0 : nodeLabelStyle.underline
   }, (0, _colorUtil.parseBackground)(nodeLabelStyle === null || nodeLabelStyle === void 0 ? void 0 : nodeLabelStyle.background));
 }
 
@@ -74,14 +77,13 @@ function buildStyle(styleData, prevTagStyle) {
 }
 
 function buildGlobalStyle(styleData) {
-  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 color = styleData.color,
+      background = styleData.background,
+      opacity = styleData.opacity,
+      bold = styleData.bold,
+      italic = styleData.italic,
+      underline = styleData.underline,
+      otherStyle = (0, _objectWithoutPropertiesLoose2["default"])(styleData, _excluded2);
   var tagStyle = (0, _extends2["default"])({}, otherStyle);
 
   if ('color' in styleData) {
@@ -96,6 +98,10 @@ function buildGlobalStyle(styleData) {
     tagStyle.fontItalic = italic;
   }
 
+  if ('underline' in styleData) {
+    tagStyle.fontUnderline = underline;
+  }
+
   if ('background' in styleData) {
     // 背景颜色
     tagStyle.background = (0, _colorUtil.formatRgbaColor)(background);

package/lib/core/editor/hooks/useUpdateHtTopoDefaultTagStyle.js

@@ -22,12 +22,12 @@ function useUpdateHtTopoDefaultTagStyle(props) {
   var nodeLabelStyle = displayConfig.nodeLabelStyle,
       defaultEdgeLabelStyle = displayConfig.defaultEdgeLabelStyle;
   (0, _react.useEffect)(function () {
-    if (nodeLabelStyle) {
+    if (nodeLabelStyle && topo.getHtTopo().setDefaultNodeLabelStyle) {
       topo.getHtTopo().setDefaultNodeLabelStyle(nodeLabelStyle);
     }
   }, [nodeLabelStyle]);
   (0, _react.useEffect)(function () {
-    if (defaultEdgeLabelStyle) {
+    if (defaultEdgeLabelStyle && topo.getHtTopo().setDefaultEdgeTagStyle) {
       topo.getHtTopo().setDefaultEdgeTagStyle(defaultEdgeLabelStyle);
     }
   }, [defaultEdgeLabelStyle]);

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@riil-frontend/component-topology",
-  "version": "6.0.20",
+  "version": "7.0.0-dev.1",
   "description": "拓扑",
   "scripts": {
     "start": "build-scripts start",
@@ -116,6 +116,6 @@
     "access": "public"
   },
   "license": "MIT",
-  "homepage": "https://unpkg.com/@riil-frontend/component-topology@6.0.20/build/index.html",
+  "homepage": "https://unpkg.com/@riil-frontend/component-topology@7.0.0-dev.1/build/index.html",
   "gitHead": "2da19ffccbb7ca60a8acf396e39f542c68bb33f5"
 }