@riil-frontend/component-topology 6.0.0-alpha.6 → 6.0.0-alpha.60

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

@@ -5,7 +5,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 exports.__esModule = true;
 exports["default"] = void 0;
 
-var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
+var _numberPicker = _interopRequireDefault(require("@alifd/next/lib/number-picker"));
 
 var _objectWithoutPropertiesLoose2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutPropertiesLoose"));
 
@@ -15,27 +15,18 @@ var _WidgetBox = _interopRequireDefault(require("./WidgetBox"));
 
 var _DropdownButton = _interopRequireDefault(require("./components/DropdownButton"));
 
+var _AlignSetting = _interopRequireDefault(require("../../settings/common/AlignSetting"));
+
+var _htElementUtils = require("../../../../../utils/htElementUtils");
+
+var _NodeAlignWidgetModule = _interopRequireDefault(require("./NodeAlignWidget.module.scss"));
+
 var _excluded = ["topo", "showLabel"];
 
 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; }
 
-function NodeAlignPopup(props) {
-  var topo = props.topo,
-      disabled = props.disabled;
-  var icon = disabled ? /*#__PURE__*/_react["default"].createElement("img", {
-    src: "/img/topo/editor/toolbar/\u5BF9\u9F50/Disable.svg",
-    alt: ""
-  }) : /*#__PURE__*/_react["default"].createElement("img", {
-    src: "/img/topo/editor/toolbar/\u5BF9\u9F50/Normal.svg",
-    alt: ""
-  });
-  return /*#__PURE__*/_react["default"].createElement(_DropdownButton["default"], {
-    trigger: icon
-  }, "\u5BF9\u9F50\u65B9\u5F0F");
-}
-
 function NodeAlignWidget(props) {
   var topo = props.topo,
       showLabel = props.showLabel,
@@ -43,21 +34,117 @@ function NodeAlignWidget(props) {
 
   var _useState = (0, _react.useState)(true),
       disabled = _useState[0],
-      setDisabled = _useState[1]; // 选中的元素
+      setDisabled = _useState[1];
+
+  var _useState2 = (0, _react.useState)(),
+      leftInputVal = _useState2[0],
+      setLeftInputVal = _useState2[1];
+
+  var _useState3 = (0, _react.useState)(),
+      rightInputVal = _useState3[0],
+      setRightInputVal = _useState3[1];
+
+  var _useState4 = (0, _react.useState)(true),
+      distributionDisabled = _useState4[0],
+      setDistributionDisabled = _useState4[1]; // 拓扑图是否加载
+
 
+  var _topo$store$useModelS = topo.store.useModelState('topoMod'),
+      graphLoaded = _topo$store$useModelS.graphLoaded; // 选中的元素
+
+
+  var selection = topo.selectionModel.useHtSelection();
+
+  var setSpace = function setSpace(type, num) {
+    topo.historyManager.beginTransaction(); // eslint-disable-next-line no-shadow
+
+    var selection = topo.getHtTopo().getGraphView().getSelectionModel().getSelection().toArray();
+    var nodes = selection.filter(function (ele) {
+      return !(0, _htElementUtils.isLayer)(ele) && !(0, _htElementUtils.isEdge)(ele);
+    });
+    topo.view.topoClient.htTopoClient.setElementsSpace(nodes, type, num);
+    topo.historyManager.endTransaction();
+  };
+
+  var leftInputChange = function leftInputChange(val) {
+    setLeftInputVal(val);
+    setSpace('h', val);
+  };
+
+  var rightInputChange = function rightInputChange(val) {
+    setRightInputVal(val);
+    setSpace('v', val);
+  };
+
+  var parseValue = function parseValue(v) {
+    return v * 1 > 0 ? Math.round(v) : '';
+  };
 
-  var selection = topo.selectionManager.useSelection();
   (0, _react.useEffect)(function () {
-    setDisabled(false);
-  }, [selection]);
+    if (graphLoaded) {
+      var selectionEle = topo.getHtTopo().getGraphView().getSelectionModel().getSelection().toArray();
+      var nodes = selectionEle.filter(function (ele) {
+        return !(0, _htElementUtils.isLayer)(ele) && !(0, _htElementUtils.isEdge)(ele);
+      });
+      setDisabled(nodes.length <= 1); // eslint-disable-next-line no-use-before-define
+
+      setLeftInputVal();
+      setRightInputVal();
+      setDistributionDisabled(nodes.length <= 2);
+
+      if (nodes.length === 2) {
+        var h = topo.view.topoClient.htTopoClient.getElementsSpace(nodes, 'h')[0];
+        var v = topo.view.topoClient.htTopoClient.getElementsSpace(nodes, 'v')[0];
+        setLeftInputVal(parseValue(h));
+        setRightInputVal(parseValue(v));
+      }
+    } // eslint-disable-next-line react-hooks/exhaustive-deps
+
+  }, [graphLoaded, selection]);
+  var icon = disabled ? /*#__PURE__*/_react["default"].createElement("img", {
+    src: "/img/topo/editor/toolbar/\u5BF9\u9F50/Disable.svg",
+    alt: ""
+  }) : /*#__PURE__*/_react["default"].createElement("img", {
+    src: "/img/topo/editor/toolbar/\u5BF9\u9F50/Normal.svg",
+    alt: ""
+  });
   return /*#__PURE__*/_react["default"].createElement(_WidgetBox["default"], {
     showLabel: showLabel,
+    disabled: disabled,
     label: "\u5BF9\u9F50\u65B9\u5F0F",
     tooltip: "\u5BF9\u9F50\u65B9\u5F0F"
-  }, /*#__PURE__*/_react["default"].createElement(NodeAlignPopup, (0, _extends2["default"])({
+  }, /*#__PURE__*/_react["default"].createElement(_DropdownButton["default"], {
+    disabled: disabled,
+    trigger: icon
+  }, /*#__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"], {
+    disabled: disabled,
+    size: "small",
+    hasTrigger: false,
+    placeholder: distributionDisabled ? '' : '多个值',
+    className: _NodeAlignWidgetModule["default"].leftInput,
+    value: leftInputVal,
+    min: 0,
+    max: 10000,
+    onChange: leftInputChange
+  }), /*#__PURE__*/_react["default"].createElement(_numberPicker["default"], {
     disabled: disabled,
-    selection: selection
-  }, otherProps)));
+    size: "small",
+    hasTrigger: false // eslint-disable-next-line no-nested-ternary
+    ,
+    placeholder: distributionDisabled ? '' : '多个值',
+    className: _NodeAlignWidgetModule["default"].rightInput,
+    value: rightInputVal,
+    min: 0,
+    max: 10000,
+    onChange: rightInputChange
+  }))));
 }
 
 var _default = NodeAlignWidget;

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

@@ -0,0 +1,33 @@
+.leftInput{
+  width: 106px !important;
+  margin: 0px 9px 10px 9px;
+  :global{
+    input{
+      background: url('/img/topo/editor/toolbar/对齐/水平间距_normal.svg')no-repeat 5px center !important;
+      background-position: 81px center !important;
+    }
+    .next-disabled input{
+      background: url('/img/topo/editor/toolbar/对齐/水平间距_disable.svg')no-repeat 5px center !important;
+      background-position: 81px center !important;
+    }
+    .next-input.next-small input{
+      height: calc(30px - 1px * 2);
+    }
+  }
+}
+.rightInput{
+  width: 106px !important;
+  :global{
+    input{
+      background: url('/img/topo/editor/toolbar/对齐/垂直间距 _normal.svg')no-repeat 5px center !important;
+      background-position: 82px center !important;
+    }
+    .next-disabled input{
+      background: url('/img/topo/editor/toolbar/对齐/垂直间距_disable.svg')no-repeat 5px center !important;
+      background-position: 82px center !important;
+    }
+    .next-input.next-small input{
+      height: calc(30px - 1px * 2);
+    }
+  }
+}

package/lib/core/editor/components/Toolbar/widgets/NodeImageButton/BoxBackgroundSetting.js

@@ -5,12 +5,28 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 exports.__esModule = true;
 exports["default"] = void 0;
 
-var _react = _interopRequireDefault(require("react"));
+var _react = _interopRequireWildcard(require("react"));
 
-function BoxBackgroundSetting(props) {
-  // const {  } = props
-  return /*#__PURE__*/_react["default"].createElement("div", null, "xxx");
+var _IconSelect = _interopRequireDefault(require("../IconSelect"));
+
+var _useIcons = require("../../../../../common/icons/useIcons");
+
+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; }
+
+function NodeImageList(props, ref) {
+  var value = props.value,
+      onChange = props.onChange,
+      topo = props.topo;
+  (0, _react.useEffect)(function () {}, []);
+  var icons = (0, _useIcons.useNodeIcons)(topo);
+  return /*#__PURE__*/_react["default"].createElement("div", null, /*#__PURE__*/_react["default"].createElement(_IconSelect["default"], {
+    value: value,
+    iconList: icons,
+    onChange: onChange
+  }));
 }
 
-var _default = BoxBackgroundSetting;
+var _default = NodeImageList;
 exports["default"] = _default;

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

@@ -9,6 +9,8 @@ var _objectWithoutPropertiesLoose2 = _interopRequireDefault(require("@babel/runt
 
 var _react = _interopRequireWildcard(require("react"));
 
+var _htElementUtils = require("../../../../../../utils/htElementUtils");
+
 var _DropdownButton = _interopRequireDefault(require("../components/DropdownButton"));
 
 var _WidgetBox = _interopRequireDefault(require("../WidgetBox"));
@@ -21,11 +23,20 @@ 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; }
 
+function isElementSetImageEnabled(element) {
+  if ((0, _htElementUtils.isGroup)(element)) {
+    return !element.isExpanded();
+  }
+
+  return (0, _htElementUtils.isNode)(element) && !(0, _htElementUtils.isText)(element) && element.a('type') !== 'box';
+}
 /**
  * 替换图片设置
- * @param {*} props 
- * @returns 
+ * @param {*} props
+ * @returns
  */
+
+
 function NodeImageButton(props) {
   var topo = props.topo,
       showLabel = props.showLabel,
@@ -33,13 +44,43 @@ function NodeImageButton(props) {
 
   var _useState = (0, _react.useState)(true),
       disabled = _useState[0],
-      setDisabled = _useState[1]; // 选中的元素
+      setDisabled = _useState[1];
+
+  var _useState2 = (0, _react.useState)(),
+      imgVal = _useState2[0],
+      setImgVal = _useState2[1]; // 选中的元素
 
 
-  var selection = topo.selectionManager.useSelection();
+  var selection = topo.selectionModel.useHtSelection();
   (0, _react.useEffect)(function () {
-    setDisabled(false);
+    var nodes = selection.filter(isElementSetImageEnabled);
+
+    if (nodes.length > 0) {
+      setDisabled(false);
+      setImgVal(nodes[0].getImage());
+    } else {
+      setDisabled(true);
+    }
   }, [selection]);
+
+  var onChange = function onChange(prop) {
+    console.log("onChange-prop", prop, selection); //const { name, value } = prop;
+    // const gv = topo.view.topoClient.getGraphView();
+    //const element = topo.getSelectionModel().getFirstData();
+
+    var elements = selection;
+    console.log("onChange-elements", elements);
+    elements.forEach(function (element) {
+      if (isElementSetImageEnabled(element)) {
+        element.setImage(prop);
+      }
+    }); // selection.map((element) => {
+    //   element.setImage(prop);
+    // });
+    // if (name === "image") {
+    // }
+  };
+
   var icon = disabled ? /*#__PURE__*/_react["default"].createElement("img", {
     src: "/img/topo/editor/toolbar/\u66FF\u6362\u56FE\u7247/Disable.svg",
     alt: ""
@@ -50,12 +91,15 @@ function NodeImageButton(props) {
   return /*#__PURE__*/_react["default"].createElement(_WidgetBox["default"], {
     label: "\u66FF\u6362\u56FE\u7247",
     tooltip: "\u66FF\u6362\u56FE\u7247",
+    disabled: disabled,
     showLabel: showLabel
   }, /*#__PURE__*/_react["default"].createElement(_DropdownButton["default"], {
     disabled: disabled,
     trigger: icon
   }, /*#__PURE__*/_react["default"].createElement(_BoxBackgroundSetting["default"], {
-    topo: topo
+    topo: topo,
+    onChange: onChange,
+    value: imgVal
   })));
 }
 

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

@@ -9,11 +9,17 @@ var _objectWithoutPropertiesLoose2 = _interopRequireDefault(require("@babel/runt
 
 var _react = _interopRequireWildcard(require("react"));
 
-var _BatchSetNodeSize = _interopRequireDefault(require("../../../settings/propertyViews/view/BatchSetNodeSize"));
+var _BatchSetNodeSize = _interopRequireDefault(require("../../../settings/propertyViews/multipleElements/BatchSetNodeSize/BatchSetNodeSize"));
+
+var _NodeSizeInput = _interopRequireDefault(require("../../../settings/common/NodeSizeInput/NodeSizeInput"));
+
+var _useSettingRuntimeState = _interopRequireDefault(require("../../../settings/useSettingRuntimeState"));
 
 var _WidgetBox = _interopRequireDefault(require("../WidgetBox"));
 
-var _BoxBackgroundSetting = _interopRequireDefault(require("./BoxBackgroundSetting"));
+var _NodeSizeButtonModule = _interopRequireDefault(require("./NodeSizeButton.module.scss"));
+
+var _htElementUtils = require("../../../../../../utils/htElementUtils");
 
 var _excluded = ["topo", "showLabel"];
 
@@ -23,8 +29,8 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
 
 /**
  * 图片尺寸设置
- * @param {*} props 
- * @returns 
+ * @param {*} props
+ * @returns
  */
 function NodeSizeButton(props) {
   var topo = props.topo,
@@ -33,26 +39,106 @@ function NodeSizeButton(props) {
 
   var _useState = (0, _react.useState)(true),
       disabled = _useState[0],
-      setDisabled = _useState[1]; // 选中的元素
+      setDisabled = _useState[1];
 
+  var _useState2 = (0, _react.useState)(),
+      size = _useState2[0],
+      setSize = _useState2[1]; // 选中的元素
 
-  var selection = topo.selectionManager.useSelection();
+
+  var selection = topo.selectionModel.useSelection();
+  var settingRuntimeState = (0, _useSettingRuntimeState["default"])();
   (0, _react.useEffect)(function () {
-    setDisabled(false);
+    var elements = selection.map(function (item) {
+      return item.id;
+    }).map(function (id) {
+      return topo.getDataModel().getDataById(id);
+    });
+    var nodes = elements.filter(function (ele) {
+      return (0, _htElementUtils.isGroup)(ele) || (0, _htElementUtils.isNode)(ele);
+    });
+
+    if (nodes.length > 0) {
+      setDisabled(false);
+
+      if (selection.length === 1) {
+        var element = nodes[0];
+        setSize({
+          width: element.getWidth(),
+          height: element.getHeight()
+        });
+      }
+    } else {
+      setDisabled(true);
+      setSize({
+        width: null,
+        height: null
+      });
+    }
   }, [selection]);
+
+  var _onChange = function onChange(prop) {
+    var name = prop.name,
+        value = prop.value;
+    var element = topo.getSelectionModel().getFirstData();
+
+    if (name === 'width') {
+      element.setWidth(value);
+    } else if (name === 'height') {
+      element.setHeight(value);
+    }
+  };
+
   return /*#__PURE__*/_react["default"].createElement(_WidgetBox["default"], {
     label: "\u56FE\u7247\u5C3A\u5BF8",
+    disabled: disabled,
     tooltip: "\u56FE\u7247\u5C3A\u5BF8",
     showLabel: showLabel
   }, /*#__PURE__*/_react["default"].createElement("div", {
-    style: {
-      width: 136
-    }
-  }, /*#__PURE__*/_react["default"].createElement(_BatchSetNodeSize["default"], {
-    topo: topo,
-    size: "small",
+    className: _NodeSizeButtonModule["default"].toolbarNodeSizeSetting
+  }, selection.length > 1 ? /*#__PURE__*/_react["default"].createElement(_BatchSetNodeSize["default"], {
+    topo: topo // size="small"
+    ,
+    value: size,
+    disabled: disabled,
+    showLabel: false,
+    numberPickerProps: {
+      hasTrigger: false,
+      placeholder: '-'
+    } // onChange={(size) => {
+    //   topo.historyManager.beginTransaction();
+    //   onChange({ name: "width", value: size.width });
+    //   onChange({ name: "height", value: size.height });
+    //   topo.historyManager.endTransaction();
+    // }}
+
+  }) : /*#__PURE__*/_react["default"].createElement(_NodeSizeInput["default"], {
+    topo: topo // size="small"
+    ,
+    value: size,
+    disabled: disabled,
     showLabel: false,
-    hasTrigger: false
+    hasTrigger: false,
+    numberPickerProps: {
+      hasTrigger: false,
+      placeholder: '-'
+    },
+    settingRuntimeState: settingRuntimeState,
+    onChange: function onChange(size) {
+      topo.historyManager.beginTransaction();
+
+      _onChange({
+        name: 'width',
+        value: size.width
+      });
+
+      _onChange({
+        name: 'height',
+        value: size.height
+      });
+
+      topo.historyManager.endTransaction();
+    }
   })));
 }
 

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

@@ -0,0 +1,28 @@
+@import '~@alifd/next/variables.scss';
+
+.toolbarNodeSizeSetting {
+  width: 144px;
+
+  // 图片尺寸输入框
+  :global {
+    .#{$css-prefix}input-inner {
+      padding-right: 8px;
+    }
+
+    .#{$css-prefix}input.#{$css-prefix}medium {
+      height: 24px;
+    }
+
+    .#{$css-prefix}input {
+      border: none;
+
+      &:hover:not(.#{$css-prefix}disabled) {
+        background: #F2F7FD;
+      }
+    }
+
+    .#{$css-prefix}input.#{$css-prefix}medium input {
+      height: 24px;
+    }
+  }
+}

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

@@ -7,26 +7,35 @@ exports["default"] = void 0;
 
 var _balloon = _interopRequireDefault(require("@alifd/next/lib/balloon"));
 
+var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
+
+var _objectWithoutPropertiesLoose2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutPropertiesLoose"));
+
 var _react = _interopRequireDefault(require("react"));
 
+var _classnames = _interopRequireDefault(require("classnames"));
+
 var _ButtonBox = _interopRequireDefault(require("./components/ButtonBox"));
 
 var _WidgetBoxModule = _interopRequireDefault(require("./WidgetBox.module.scss"));
 
+var _excluded = ["label", "showLabel", "tooltip", "disabled", "children"];
+
 function WidgetBox(props) {
   var label = props.label,
       showLabel = props.showLabel,
       tooltip = props.tooltip,
       disabled = props.disabled,
-      children = props.children;
+      children = props.children,
+      otherProps = (0, _objectWithoutPropertiesLoose2["default"])(props, _excluded);
 
-  var button = /*#__PURE__*/_react["default"].createElement("div", {
+  var button = /*#__PURE__*/_react["default"].createElement("div", (0, _extends2["default"])({
     disabled: disabled,
     className: _WidgetBoxModule["default"].container
-  }, /*#__PURE__*/_react["default"].createElement("div", {
+  }, otherProps), /*#__PURE__*/_react["default"].createElement("div", {
     className: _WidgetBoxModule["default"].content
   }, children), showLabel !== false && /*#__PURE__*/_react["default"].createElement("div", {
-    className: _WidgetBoxModule["default"].label
+    className: (0, _classnames["default"])(_WidgetBoxModule["default"].label, disabled ? _WidgetBoxModule["default"].disabledLabel : _WidgetBoxModule["default"].normalLabel)
   }, label));
 
   if (!tooltip) {

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

@@ -44,6 +44,14 @@
   text-align: center;
 }
 
+.disabledLabel {
+  color: #C9CED2;
+}
+
+.normalLabel {
+  color: #78849C;
+}
+
 .ButtonBox {
   height: 24px;
   display: flex;
@@ -57,9 +65,10 @@
     background: rgba(76, 137, 255, 0.1);
     border-radius: 4px;
   }
+
   &.ButtonBoxDisabled:hover {
     background: transparent;
     cursor: not-allowed;
   }
-  
+
 }

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

@@ -31,12 +31,12 @@ function ButtonBox(props) {
       onClick = props.onClick,
       otherProps = (0, _objectWithoutPropertiesLoose2["default"])(props, _excluded);
   return /*#__PURE__*/_react["default"].createElement("div", (0, _extends2["default"])({
-    className: (0, _classnames["default"])(_ButtonBoxModule["default"].ButtonBox, (_classNames = {}, _classNames[_ButtonBoxModule["default"].ButtonBoxActive] = active, _classNames[_ButtonBoxModule["default"].ButtonBoxDisabled] = disabled, _classNames)),
+    className: (0, _classnames["default"])(_ButtonBoxModule["default"].ButtonBox, (_classNames = {}, _classNames[_ButtonBoxModule["default"].ButtonBoxActive] = active, _classNames[_ButtonBoxModule["default"].ButtonBoxDisabled] = disabled, _classNames[_ButtonBoxModule["default"].disabled] = disabled, _classNames)),
     onClick: disabled ? undefined : onClick
   }, otherProps), children, showArrow && /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, "\xA0", /*#__PURE__*/_react["default"].createElement(_icon["default"], {
     type: "tree_fold_arrow",
     size: "xxs",
-    className: (0, _classnames["default"])(_ButtonBoxModule["default"].icon, (_classNames2 = {}, _classNames2[_ButtonBoxModule["default"].active] = active, _classNames2))
+    className: (0, _classnames["default"])(_ButtonBoxModule["default"].icon, (_classNames2 = {}, _classNames2[_ButtonBoxModule["default"].active] = active, _classNames2[_ButtonBoxModule["default"].disabled] = disabled, _classNames2))
   })));
 }
 

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

@@ -19,6 +19,10 @@
 
 }
 
+.disabled {
+  color: #C9CED2;
+}
+
 // 箭头图标
 .icon {
   color: #909090;

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

@@ -7,6 +7,8 @@ exports["default"] = void 0;
 
 var _dropdown = _interopRequireDefault(require("@alifd/next/lib/dropdown"));
 
+var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
+
 var _react = _interopRequireWildcard(require("react"));
 
 var _propTypes = _interopRequireDefault(require("prop-types"));
@@ -26,25 +28,38 @@ function DropdownButton(props) {
       showArrow = _props$showArrow === void 0 ? true : _props$showArrow,
       _props$showContainer = props.showContainer,
       showContainer = _props$showContainer === void 0 ? true : _props$showContainer,
+      buttonBoxProps = props.buttonBoxProps,
       children = props.children;
 
   var _useState = (0, _react.useState)(false),
-      active = _useState[0],
-      setActive = _useState[1];
+      visible = _useState[0],
+      setVisible = _useState[1];
 
-  var button = /*#__PURE__*/_react["default"].createElement(_ButtonBox["default"], {
-    active: active,
+  var button = /*#__PURE__*/_react["default"].createElement(_ButtonBox["default"], (0, _extends2["default"])({
+    active: visible,
     disabled: disabled,
     showArrow: showArrow
-  }, trigger);
+  }, buttonBoxProps), trigger);
+
+  var renderContent = function renderContent() {
+    if (!visible) {
+      return /*#__PURE__*/_react["default"].createElement("div", null);
+    }
+
+    if (showContainer) {
+      return /*#__PURE__*/_react["default"].createElement(PopupCard, null, children);
+    }
+
+    return children;
+  };
 
   return /*#__PURE__*/_react["default"].createElement(_dropdown["default"], {
-    visible: active,
+    visible: visible,
     disabled: disabled,
     trigger: button,
     triggerType: "click",
-    onVisibleChange: setActive
-  }, !showContainer ? children : /*#__PURE__*/_react["default"].createElement(PopupCard, null, children));
+    onVisibleChange: setVisible
+  }, renderContent());
 }
 
 DropdownButton.propTypes = {