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

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

@@ -17,10 +17,10 @@ var _fontStyleUtil = _interopRequireDefault(require("../../../../../../settings/
 
 var _colorUtil = require("../colorUtil");
 
-var _excluded = ["color", "background", "opacity", "bold", "italic"];
+var _excluded = ["color", "background", "opacity", "bold", "italic", "underline"];
 
 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,13 @@ 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,
+      underline = style.underline,
+      otherStyle = (0, _objectWithoutPropertiesLoose2["default"])(style, _excluded);
   var tagStyle = (0, _extends2["default"])({}, otherStyle);
 
   if ('color' in style) {
@@ -50,6 +49,10 @@ function setTextStyle(element, style, topo) {
     tagStyle.fontItalic = italic;
   }
 
+  if ('underline' in style) {
+    tagStyle.fontUnderline = underline;
+  }
+
   if ('background' in style) {
     // 背景颜色
     var prevStyle = getTextStyle(element);
@@ -66,7 +69,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 +81,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/components/settings/propertyViews/node/data/Data.js

@@ -164,7 +164,8 @@ function Data(props) {
     nodeElement: node,
     node: values,
     topo: topo,
-    topoEditApi: topoEditApi
+    topoEditApi: topoEditApi,
+    nodeBindResourceDrawerComponent: editorProps.nodeBindResourceDrawerComponent
   }))), bindType === "topo" && RelateTopoTree && /*#__PURE__*/_react["default"].createElement(_form["default"].Item, {
     label: "\u5173\u8054\u62D3\u6251"
   }, /*#__PURE__*/_react["default"].createElement(RelateTopoTree, {

package/lib/core/editor/components/settings/propertyViews/node/data/NodeRelateResourceButton.js

@@ -28,7 +28,8 @@ function NodeRelateResourceButton(props) {
   var nodeElement = props.nodeElement,
       topo = props.topo,
       topoEditApi = props.topoEditApi,
-      node = props.node;
+      node = props.node,
+      nodeBindResourceDrawerComponent = props.nodeBindResourceDrawerComponent;
   var hide = (0, _clusterUtil.isClusterMemberHtElement)(nodeElement) || ((_node$attrObject$data = node.attrObject.data) === null || _node$attrObject$data === void 0 ? void 0 : _node$attrObject$data.relateResource) === false;
   var currentResId = node.tag;
 
@@ -36,6 +37,7 @@ function NodeRelateResourceButton(props) {
       visible = _useState[0],
       setVisible = _useState[1];
 
+  var BindResourceDrawer = nodeBindResourceDrawerComponent || _BindResourceDrawer["default"];
   return !hide ? /*#__PURE__*/_react["default"].createElement(_button["default"], {
     type: "primary",
     text: true,
@@ -43,7 +45,7 @@ function NodeRelateResourceButton(props) {
     onClick: function onClick() {
       setVisible(true);
     }
-  }, node.tag ? '切换资源' : '选择资源', /*#__PURE__*/_react["default"].createElement(_BindResourceDrawer["default"], (0, _extends2["default"])({
+  }, node.tag ? '切换资源' : '选择资源', /*#__PURE__*/_react["default"].createElement(BindResourceDrawer, (0, _extends2["default"])({
     visible: visible,
     currentResId: currentResId
   }, props, {

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

@@ -32,7 +32,7 @@ function useKeyboardShortcut(props) {
 
       }
 
-      if (e.keyCode === 32) {
+      if (e.keyCode === 32 && e.target.nodeName !== 'TEXTAREA') {
         // 空格
         var _topo$store$getModelS = topo.store.getModelState('topoEdit'),
             viewMouseMode = _topo$store$getModelS.viewMouseMode;

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]);