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

package/es/core/components/DisplaySettingDrawer/DisplaySettingDrawer.js

@@ -40,7 +40,9 @@ export default function DisplaySettingDrawer(props) {
               setLoading(false);
               onClose();
 
-              _Message.success('保存成功');
+              if (!isEditor) {
+                _Message.success('保存成功');
+              }
 
               _context.next = 14;
               break;

package/es/core/editor/components/Toolbar/widgets/EdgeColorButton/Content.js

@@ -15,7 +15,8 @@ function Content(props) {
   return /*#__PURE__*/React.createElement("div", {
     style: {
       marginTop: '6px',
-      marginLeft: '12px'
+      marginLeft: '12px',
+      marginBottom: '6px'
     }
   }, /*#__PURE__*/React.createElement("div", null, "\u7EBF"), /*#__PURE__*/React.createElement("div", {
     style: {

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

@@ -5,20 +5,41 @@ import WidgetBox from "./WidgetBox";
 import ColorPanel from "../../../../../components/ColorPanel";
 import FontColorRange from "../../../../../components/ColorPanel/components/FontColorRange";
 import styles from "./FontColorButton.module.scss";
+import textStyleSettingRouter from "./components/textStyleSetting/textStyleSettingRouter.js";
 
 function FontFamilySelect(props) {
-  var value = props.value,
-      onChange = props.onChange,
-      topo = props.topo;
+  var onChange = props.onChange,
+      topo = props.topo,
+      color = props.color,
+      background = props.background,
+      opacity = props.opacity;
 
   var _useState = useState(false),
       disabled = _useState[0],
       setDisabled = _useState[1];
 
-  console.log(topo, 'topo这里需要处理颜色改变的事情');
-
   var backOpacityChange = function backOpacityChange(value) {
-    console.log(value);
+    onChange({
+      color: color,
+      background: background,
+      opacity: value / 100
+    });
+  };
+
+  var colorChang = function colorChang(value) {
+    onChange({
+      color: value.hex,
+      background: background,
+      opacity: opacity
+    });
+  };
+
+  var backgroundChang = function backgroundChang(value) {
+    onChange({
+      color: color,
+      background: value.hex,
+      opacity: opacity
+    });
   };
 
   var icon = disabled ? /*#__PURE__*/React.createElement("img", {
@@ -30,13 +51,14 @@ function FontFamilySelect(props) {
   });
   return /*#__PURE__*/React.createElement(DropdownButton, {
     disabled: disabled,
-    trigger: icon,
-    onChange: onChange
+    trigger: icon
   }, /*#__PURE__*/React.createElement("div", {
     className: styles.content
   }, /*#__PURE__*/React.createElement("div", {
     className: styles.fontColor
-  }, /*#__PURE__*/React.createElement("span", null, "\u5B57\u4F53\u989C\u8272"), /*#__PURE__*/React.createElement(ColorPanel, null)), /*#__PURE__*/React.createElement("div", {
+  }, /*#__PURE__*/React.createElement("span", null, "\u5B57\u4F53\u989C\u8272"), /*#__PURE__*/React.createElement(ColorPanel, {
+    onChange: colorChang
+  })), /*#__PURE__*/React.createElement("div", {
     className: styles.backgroundColor
   }, /*#__PURE__*/React.createElement("span", null, "\u80CC\u666F\u586B\u5145"), /*#__PURE__*/React.createElement("div", {
     className: styles.backOpacity
@@ -48,29 +70,39 @@ function FontFamilySelect(props) {
     unit: "%",
     list: [0, 10, 20, 30, 40, 50, 60, 70, 80, 90, 100],
     onChange: backOpacityChange,
-    defaultValue: 0
+    defaultValue: opacity
   })), /*#__PURE__*/React.createElement(ColorPanel, {
-    showClear: true
+    showClear: true,
+    onChange: backgroundChang
   }))));
 }
 
 function FontColorButton(props) {
   var showLabel = props.showLabel,
-      topo = props.topo;
-
-  var _useState2 = useState('微软雅黑'),
-      value = _useState2[0],
-      setValue = _useState2[1];
-
+      topo = props.topo,
+      style = props.style,
+      setStyle = props.setStyle;
   return /*#__PURE__*/React.createElement(WidgetBox, {
     label: "\u6587\u5B57\u989C\u8272",
     tooltip: "\u6587\u5B57\u989C\u8272",
     showLabel: showLabel
   }, /*#__PURE__*/React.createElement(FontFamilySelect, {
-    value: value,
-    onChange: setValue,
+    color: style.color,
+    background: style.background,
+    opacity: style.opacity,
+    onChange: function onChange(val) {
+      topo.historyManager.beginTransaction();
+      setStyle({
+        color: val.color,
+        background: val.background,
+        opacity: val.opacity
+      });
+      topo.historyManager.endTransaction();
+    },
     topo: topo
   }));
 }
 
-export default FontColorButton;
+export default textStyleSettingRouter(FontColorButton, {
+  names: ['color', 'background', 'opacity']
+});

package/es/core/editor/components/Toolbar/widgets/FontColorButton.module.scss

@@ -3,6 +3,10 @@
  .fontColor{
   width: 100%;
   height: 143px;//159px
+  .colorPanelBox{
+    padding: 9px;
+    padding-top: 8px;
+  }
   &>span{
     font-size: 12px;
     color: black;
@@ -15,6 +19,10 @@
  .backgroundColor{
   width: 100%;
   height: 159px;
+  .colorPanelBox{
+    padding: 9px;
+    padding-top: 0px;
+  }
   &>span{
     font-size: 12px;
     color: black;

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

@@ -1,5 +1,6 @@
 import _extends from "@babel/runtime/helpers/extends";
 import React, { useState, useEffect } from 'react';
+import { isText } from "../../../../../utils/htElementUtils";
 import DropdownMenu from "./components/DropdownMenu";
 import textStyleSettingRouter from "./components/textStyleSetting/textStyleSettingRouter.js";
 import WidgetBox from "./WidgetBox";
@@ -39,7 +40,7 @@ function FontStyleButton(props) {
       style = props.style,
       setStyle = props.setStyle;
 
-  var _useState = useState(false),
+  var _useState = useState(true),
       disabled = _useState[0],
       setDisabled = _useState[1];
 
@@ -58,7 +59,15 @@ function FontStyleButton(props) {
 
   var selection = topo.selectionManager.useHtSelection();
   useEffect(function () {
-    setDisabled(false);
+    var isAllText = !selection.filter(function (ele) {
+      return !isText(ele);
+    }).length;
+
+    if (selection.length && isAllText) {
+      setDisabled(false);
+    } else {
+      setDisabled(true);
+    }
   }, [selection]);
   useEffect(function () {
     setValue(buildValue({
@@ -81,6 +90,7 @@ function FontStyleButton(props) {
   return /*#__PURE__*/React.createElement(WidgetBox, {
     label: "\u6587\u5B57\u6837\u5F0F",
     tooltip: "\u6587\u5B57\u6837\u5F0F",
+    disabled: disabled,
     showLabel: showLabel
   }, /*#__PURE__*/React.createElement(DropdownMenu, {
     value: value,
@@ -91,6 +101,7 @@ function FontStyleButton(props) {
       });
     },
     multiple: true,
+    disabled: disabled,
     onChange: handleChange
   }, items.map(function (item) {
     return /*#__PURE__*/React.createElement(DropdownMenu.Item, {

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

@@ -34,7 +34,7 @@ function NodeAlignWidget(props) {
       graphLoaded = _topo$store$useModelS.graphLoaded; // 选中的元素
 
 
-  var selection = topo.selectionManager.useSelection();
+  var selection = topo.selectionManager.useHtSelection();
 
   var setSpace = function setSpace(type, num) {
     topo.historyManager.beginTransaction(); // eslint-disable-next-line no-shadow
@@ -86,10 +86,14 @@ function NodeAlignWidget(props) {
   }, /*#__PURE__*/React.createElement(DropdownButton, {
     disabled: disabled,
     trigger: icon
-  }, /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(AlignSetting, {
+  }, /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("div", {
+    style: {
+      margin: '10px 7px 17px 7px'
+    }
+  }, /*#__PURE__*/React.createElement(AlignSetting, {
     topo: topo,
     distributionDisabled: distributionDisabled
-  }), /*#__PURE__*/React.createElement(_NumberPicker, {
+  })), /*#__PURE__*/React.createElement(_NumberPicker, {
     disabled: disabled,
     size: "small",
     hasTrigger: false,

package/es/core/editor/components/Toolbar/widgets/NodeAlignWidget.module.scss

@@ -1,6 +1,6 @@
 .leftInput{
   width: 100px !important;
-  margin: 0px 10px 18px 9px;
+  margin: 0px 10px 10px 9px;
   :global{
     input{
       background: url('/img/topo/editor/toolbar/对齐/水平间距_normal.svg')no-repeat 5px center !important;

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

@@ -8,7 +8,8 @@ function DropdownMenu(props) {
       children = props.children,
       multiple = props.multiple,
       onChange = props.onChange,
-      valueRender = props.valueRender;
+      valueRender = props.valueRender,
+      disabled = props.disabled;
   var selectedKeys = Array.isArray(value) ? value : [value];
   var valueDisplay = valueRender ? valueRender(value) : value;
   var selectMode = multiple ? 'multiple' : 'single';
@@ -24,6 +25,7 @@ function DropdownMenu(props) {
   }, children);
   return /*#__PURE__*/React.createElement(DropdownButton, {
     trigger: valueDisplay,
+    disabled: disabled,
     showContainer: false
   }, multiple ? /*#__PURE__*/React.createElement("div", null, menu) : menu);
 }

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

@@ -12,7 +12,7 @@ export function setTextStyle(element, style, topo) {
   if ('background' in style || 'opacity' in style) {
     // 背景颜色
     var prevStyle = getTextStyle(element);
-    topo.setNodeLabelStyle(element, {
+    topo.getHtTopo().setNodeLabelStyle(element, {
       background: formatBackgroundRgbaColor(prevStyle, style)
     });
   } else {

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

@@ -10,7 +10,9 @@ export function useValues(topo) {
   return {
     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,
+    background: nodeLabelStyle === null || nodeLabelStyle === void 0 ? void 0 : nodeLabelStyle.background,
+    opacity: nodeLabelStyle === null || nodeLabelStyle === void 0 ? void 0 : nodeLabelStyle.opacity
   };
 }
 export var setGlobalTagStyle = function setGlobalTagStyle(topo, styleData) {

package/es/core/editor/components/settings/common/AlignSetting/AlignSetting.module.scss

@@ -1,7 +1,6 @@
 @import "@alifd/next/variables";
 
 .AlignSetting {
-  margin: 11px 7px 17px 7px;
   :global {
     .#{$css-prefix}divider-ver {
       background: #EBECF0;

package/es/core/models/TopoApp.js

@@ -22,7 +22,7 @@ import topoFactory from "./topoFactory";
 import ElementTagTipConfig from "./tagstips/ElementTagTipConfig";
 import SelectionManager from "./SelectionManager"; // eslint-disable-next-line no-undef
 
-var version = typeof "6.0.0-alpha.39" === 'string' ? "6.0.0-alpha.39" : null;
+var version = typeof "6.0.0-alpha.40" === 'string' ? "6.0.0-alpha.40" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 /**
  * 拓扑显示和编辑

package/lib/core/components/DisplaySettingDrawer/DisplaySettingDrawer.js

@@ -61,7 +61,9 @@ function DisplaySettingDrawer(props) {
               setLoading(false);
               onClose();
 
-              _message["default"].success('保存成功');
+              if (!isEditor) {
+                _message["default"].success('保存成功');
+              }
 
               _context.next = 14;
               break;

package/lib/core/editor/components/Toolbar/widgets/EdgeColorButton/Content.js

@@ -24,7 +24,8 @@ function Content(props) {
   return /*#__PURE__*/_react["default"].createElement("div", {
     style: {
       marginTop: '6px',
-      marginLeft: '12px'
+      marginLeft: '12px',
+      marginBottom: '6px'
     }
   }, /*#__PURE__*/_react["default"].createElement("div", null, "\u7EBF"), /*#__PURE__*/_react["default"].createElement("div", {
     style: {

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

@@ -17,24 +17,46 @@ var _FontColorRange = _interopRequireDefault(require("../../../../../components/
 
 var _FontColorButtonModule = _interopRequireDefault(require("./FontColorButton.module.scss"));
 
+var _textStyleSettingRouter = _interopRequireDefault(require("./components/textStyleSetting/textStyleSettingRouter.js"));
+
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
 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; }
 
 /* eslint-disable jsx-a11y/alt-text */
 function FontFamilySelect(props) {
-  var value = props.value,
-      onChange = props.onChange,
-      topo = props.topo;
+  var onChange = props.onChange,
+      topo = props.topo,
+      color = props.color,
+      background = props.background,
+      opacity = props.opacity;
 
   var _useState = (0, _react.useState)(false),
       disabled = _useState[0],
       setDisabled = _useState[1];
 
-  console.log(topo, 'topo这里需要处理颜色改变的事情');
-
   var backOpacityChange = function backOpacityChange(value) {
-    console.log(value);
+    onChange({
+      color: color,
+      background: background,
+      opacity: value / 100
+    });
+  };
+
+  var colorChang = function colorChang(value) {
+    onChange({
+      color: value.hex,
+      background: background,
+      opacity: opacity
+    });
+  };
+
+  var backgroundChang = function backgroundChang(value) {
+    onChange({
+      color: color,
+      background: value.hex,
+      opacity: opacity
+    });
   };
 
   var icon = disabled ? /*#__PURE__*/_react["default"].createElement("img", {
@@ -46,13 +68,14 @@ function FontFamilySelect(props) {
   });
   return /*#__PURE__*/_react["default"].createElement(_DropdownButton["default"], {
     disabled: disabled,
-    trigger: icon,
-    onChange: onChange
+    trigger: icon
   }, /*#__PURE__*/_react["default"].createElement("div", {
     className: _FontColorButtonModule["default"].content
   }, /*#__PURE__*/_react["default"].createElement("div", {
     className: _FontColorButtonModule["default"].fontColor
-  }, /*#__PURE__*/_react["default"].createElement("span", null, "\u5B57\u4F53\u989C\u8272"), /*#__PURE__*/_react["default"].createElement(_ColorPanel["default"], null)), /*#__PURE__*/_react["default"].createElement("div", {
+  }, /*#__PURE__*/_react["default"].createElement("span", null, "\u5B57\u4F53\u989C\u8272"), /*#__PURE__*/_react["default"].createElement(_ColorPanel["default"], {
+    onChange: colorChang
+  })), /*#__PURE__*/_react["default"].createElement("div", {
     className: _FontColorButtonModule["default"].backgroundColor
   }, /*#__PURE__*/_react["default"].createElement("span", null, "\u80CC\u666F\u586B\u5145"), /*#__PURE__*/_react["default"].createElement("div", {
     className: _FontColorButtonModule["default"].backOpacity
@@ -64,30 +87,41 @@ function FontFamilySelect(props) {
     unit: "%",
     list: [0, 10, 20, 30, 40, 50, 60, 70, 80, 90, 100],
     onChange: backOpacityChange,
-    defaultValue: 0
+    defaultValue: opacity
   })), /*#__PURE__*/_react["default"].createElement(_ColorPanel["default"], {
-    showClear: true
+    showClear: true,
+    onChange: backgroundChang
   }))));
 }
 
 function FontColorButton(props) {
   var showLabel = props.showLabel,
-      topo = props.topo;
-
-  var _useState2 = (0, _react.useState)('微软雅黑'),
-      value = _useState2[0],
-      setValue = _useState2[1];
-
+      topo = props.topo,
+      style = props.style,
+      setStyle = props.setStyle;
   return /*#__PURE__*/_react["default"].createElement(_WidgetBox["default"], {
     label: "\u6587\u5B57\u989C\u8272",
     tooltip: "\u6587\u5B57\u989C\u8272",
     showLabel: showLabel
   }, /*#__PURE__*/_react["default"].createElement(FontFamilySelect, {
-    value: value,
-    onChange: setValue,
+    color: style.color,
+    background: style.background,
+    opacity: style.opacity,
+    onChange: function onChange(val) {
+      topo.historyManager.beginTransaction();
+      setStyle({
+        color: val.color,
+        background: val.background,
+        opacity: val.opacity
+      });
+      topo.historyManager.endTransaction();
+    },
     topo: topo
   }));
 }
 
-var _default = FontColorButton;
+var _default = (0, _textStyleSettingRouter["default"])(FontColorButton, {
+  names: ['color', 'background', 'opacity']
+});
+
 exports["default"] = _default;

package/lib/core/editor/components/Toolbar/widgets/FontColorButton.module.scss

@@ -3,6 +3,10 @@
  .fontColor{
   width: 100%;
   height: 143px;//159px
+  .colorPanelBox{
+    padding: 9px;
+    padding-top: 8px;
+  }
   &>span{
     font-size: 12px;
     color: black;
@@ -15,6 +19,10 @@
  .backgroundColor{
   width: 100%;
   height: 159px;
+  .colorPanelBox{
+    padding: 9px;
+    padding-top: 0px;
+  }
   &>span{
     font-size: 12px;
     color: black;

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

@@ -9,6 +9,8 @@ var _extends3 = _interopRequireDefault(require("@babel/runtime/helpers/extends")
 
 var _react = _interopRequireWildcard(require("react"));
 
+var _htElementUtils = require("../../../../../utils/htElementUtils");
+
 var _DropdownMenu = _interopRequireDefault(require("./components/DropdownMenu"));
 
 var _textStyleSettingRouter = _interopRequireDefault(require("./components/textStyleSetting/textStyleSettingRouter.js"));
@@ -55,7 +57,7 @@ function FontStyleButton(props) {
       style = props.style,
       setStyle = props.setStyle;
 
-  var _useState = (0, _react.useState)(false),
+  var _useState = (0, _react.useState)(true),
       disabled = _useState[0],
       setDisabled = _useState[1];
 
@@ -74,7 +76,15 @@ function FontStyleButton(props) {
 
   var selection = topo.selectionManager.useHtSelection();
   (0, _react.useEffect)(function () {
-    setDisabled(false);
+    var isAllText = !selection.filter(function (ele) {
+      return !(0, _htElementUtils.isText)(ele);
+    }).length;
+
+    if (selection.length && isAllText) {
+      setDisabled(false);
+    } else {
+      setDisabled(true);
+    }
   }, [selection]);
   (0, _react.useEffect)(function () {
     setValue(buildValue({
@@ -97,6 +107,7 @@ function FontStyleButton(props) {
   return /*#__PURE__*/_react["default"].createElement(_WidgetBox["default"], {
     label: "\u6587\u5B57\u6837\u5F0F",
     tooltip: "\u6587\u5B57\u6837\u5F0F",
+    disabled: disabled,
     showLabel: showLabel
   }, /*#__PURE__*/_react["default"].createElement(_DropdownMenu["default"], {
     value: value,
@@ -107,6 +118,7 @@ function FontStyleButton(props) {
       });
     },
     multiple: true,
+    disabled: disabled,
     onChange: handleChange
   }, items.map(function (item) {
     return /*#__PURE__*/_react["default"].createElement(_DropdownMenu["default"].Item, {

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

@@ -53,7 +53,7 @@ function NodeAlignWidget(props) {
       graphLoaded = _topo$store$useModelS.graphLoaded; // 选中的元素
 
 
-  var selection = topo.selectionManager.useSelection();
+  var selection = topo.selectionManager.useHtSelection();
 
   var setSpace = function setSpace(type, num) {
     topo.historyManager.beginTransaction(); // eslint-disable-next-line no-shadow
@@ -105,10 +105,14 @@ function NodeAlignWidget(props) {
   }, /*#__PURE__*/_react["default"].createElement(_DropdownButton["default"], {
     disabled: disabled,
     trigger: icon
-  }, /*#__PURE__*/_react["default"].createElement("div", null, /*#__PURE__*/_react["default"].createElement(_AlignSetting["default"], {
+  }, /*#__PURE__*/_react["default"].createElement("div", null, /*#__PURE__*/_react["default"].createElement("div", {
+    style: {
+      margin: '10px 7px 17px 7px'
+    }
+  }, /*#__PURE__*/_react["default"].createElement(_AlignSetting["default"], {
     topo: topo,
     distributionDisabled: distributionDisabled
-  }), /*#__PURE__*/_react["default"].createElement(_numberPicker["default"], {
+  })), /*#__PURE__*/_react["default"].createElement(_numberPicker["default"], {
     disabled: disabled,
     size: "small",
     hasTrigger: false,

package/lib/core/editor/components/Toolbar/widgets/NodeAlignWidget.module.scss

@@ -1,6 +1,6 @@
 .leftInput{
   width: 100px !important;
-  margin: 0px 10px 18px 9px;
+  margin: 0px 10px 10px 9px;
   :global{
     input{
       background: url('/img/topo/editor/toolbar/对齐/水平间距_normal.svg')no-repeat 5px center !important;

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

@@ -18,7 +18,8 @@ function DropdownMenu(props) {
       children = props.children,
       multiple = props.multiple,
       onChange = props.onChange,
-      valueRender = props.valueRender;
+      valueRender = props.valueRender,
+      disabled = props.disabled;
   var selectedKeys = Array.isArray(value) ? value : [value];
   var valueDisplay = valueRender ? valueRender(value) : value;
   var selectMode = multiple ? 'multiple' : 'single';
@@ -35,6 +36,7 @@ function DropdownMenu(props) {
 
   return /*#__PURE__*/_react["default"].createElement(_DropdownButton["default"], {
     trigger: valueDisplay,
+    disabled: disabled,
     showContainer: false
   }, multiple ? /*#__PURE__*/_react["default"].createElement("div", null, menu) : menu);
 }

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

@@ -25,7 +25,7 @@ function setTextStyle(element, style, topo) {
   if ('background' in style || 'opacity' in style) {
     // 背景颜色
     var prevStyle = getTextStyle(element);
-    topo.setNodeLabelStyle(element, {
+    topo.getHtTopo().setNodeLabelStyle(element, {
       background: (0, _colorUtil.formatBackgroundRgbaColor)(prevStyle, style)
     });
   } else {

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

@@ -21,7 +21,9 @@ function useValues(topo) {
   return {
     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,
+    background: nodeLabelStyle === null || nodeLabelStyle === void 0 ? void 0 : nodeLabelStyle.background,
+    opacity: nodeLabelStyle === null || nodeLabelStyle === void 0 ? void 0 : nodeLabelStyle.opacity
   };
 }
 

package/lib/core/editor/components/settings/common/AlignSetting/AlignSetting.module.scss

@@ -1,7 +1,6 @@
 @import "@alifd/next/variables";
 
 .AlignSetting {
-  margin: 11px 7px 17px 7px;
   :global {
     .#{$css-prefix}divider-ver {
       background: #EBECF0;

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