@riil-frontend/component-topology 6.0.0-alpha.4 → 6.0.0-alpha.41

package/lib/core/editor/components/Sidebar/views/CanvasPanel/useCanvasThemeConfig.js

@@ -0,0 +1,128 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+exports.__esModule = true;
+exports["default"] = void 0;
+
+var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
+
+var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
+
+var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
+
+var _clusterUtil = require("../../../../../../utils/clusterUtil");
+
+var _htElementUtils = require("../../../../../../utils/htElementUtils");
+
+var _themes = _interopRequireDefault(require("./themes"));
+
+function useCanvasThemeConfig(props) {
+  var topo = props.topo;
+
+  var _topo$store$useModel = topo.store.useModel('displayConfig'),
+      displayConfig = _topo$store$useModel[0],
+      displayConfigDispatchers = _topo$store$useModel[1];
+
+  var canvasThemeName = displayConfig.canvasTheme || 'white';
+
+  var setCanvasTheme = /*#__PURE__*/function () {
+    var _ref = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(themeName) {
+      var themeConfig;
+      return _regenerator["default"].wrap(function _callee$(_context) {
+        while (1) {
+          switch (_context.prev = _context.next) {
+            case 0:
+              themeConfig = _themes["default"].find(function (item) {
+                return item.name === themeName;
+              });
+              topo.historyManager.beginTransaction();
+              _context.next = 4;
+              return displayConfigDispatchers.update({
+                canvasTheme: themeName
+              });
+
+            case 4:
+              _context.next = 6;
+              return setGlobalTagTheme(themeConfig);
+
+            case 6:
+              setElementsTheme(themeConfig);
+              topo.historyManager.endTransaction();
+
+            case 8:
+            case "end":
+              return _context.stop();
+          }
+        }
+      }, _callee);
+    }));
+
+    return function setCanvasTheme(_x) {
+      return _ref.apply(this, arguments);
+    };
+  }();
+
+  function setGlobalTagTheme(_x2) {
+    return _setGlobalTagTheme.apply(this, arguments);
+  }
+
+  function _setGlobalTagTheme() {
+    _setGlobalTagTheme = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2(themeConfig) {
+      var _topo$store$getModelS, nodeLabelStyle, defaultEdgeLabelStyle, globalNodeLabelStyle, globalEdgeTagStyle;
+
+      return _regenerator["default"].wrap(function _callee2$(_context2) {
+        while (1) {
+          switch (_context2.prev = _context2.next) {
+            case 0:
+              // 设置资源/链路标注样式
+              _topo$store$getModelS = topo.store.getModelState('displayConfig'), nodeLabelStyle = _topo$store$getModelS.nodeLabelStyle, defaultEdgeLabelStyle = _topo$store$getModelS.defaultEdgeLabelStyle;
+              globalNodeLabelStyle = (0, _extends2["default"])({}, nodeLabelStyle, {
+                color: themeConfig.globalNodeLabelColor
+              });
+              topo.getHtTopo().setGlobalNodeLabelStyle(globalNodeLabelStyle);
+              globalEdgeTagStyle = (0, _extends2["default"])({}, defaultEdgeLabelStyle, {
+                color: themeConfig.globalEdgeTagColor
+              });
+              topo.getHtTopo().setGlobalEdgeTagStyle(globalEdgeTagStyle);
+              _context2.next = 7;
+              return displayConfigDispatchers.update({
+                nodeLabelStyle: globalNodeLabelStyle,
+                defaultEdgeLabelStyle: globalEdgeTagStyle
+              });
+
+            case 7:
+            case "end":
+              return _context2.stop();
+          }
+        }
+      }, _callee2);
+    }));
+    return _setGlobalTagTheme.apply(this, arguments);
+  }
+
+  function setElementsTheme(themeConfig) {
+    var dm = topo.getHtTopo().getGraphView().dm();
+    var elements = (0, _htElementUtils.getElements)(dm);
+    elements.forEach(function (element) {
+      if ((0, _htElementUtils.isText)(element)) {
+        element.s('text.color', themeConfig.text.color);
+      } else if ((0, _htElementUtils.isGroup)(element)) {
+        if ((0, _clusterUtil.isClusterHtElement)(element)) {// 集群
+        } else {
+          // 区域（非集群）
+          element.s(themeConfig.group.style);
+        }
+      } else if ((0, _htElementUtils.isEdge)(element)) {}
+    });
+  }
+
+  return {
+    themes: _themes["default"],
+    canvasThemeName: canvasThemeName,
+    setCanvasTheme: setCanvasTheme
+  };
+}
+
+var _default = useCanvasThemeConfig;
+exports["default"] = _default;

package/lib/core/editor/components/Sidebar/views/ImagePanel/CiTypeImagePanel.js

@@ -25,7 +25,7 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
 function CiTypeImagePanel(props) {
   var topo = props.topo;
   var icons = (0, _react.useMemo)(function () {
-    return (0, _icon.getNodeDefaultIcons)(topo);
+    return (0, _icon.getResourceIcons)(topo);
   }, []);
   return /*#__PURE__*/_react["default"].createElement(_HtImagePalette["default"], {
     icons: icons,

package/lib/core/editor/components/Sidebar/views/ImagePanel/HtCustomImagePanel.js

@@ -7,9 +7,11 @@ exports["default"] = HtCustomImagePanel;
 
 var _react = _interopRequireWildcard(require("react"));
 
+var _resizeObserverPolyfill = _interopRequireDefault(require("resize-observer-polyfill"));
+
 var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
 
-var _icon = require("../../../../../common/icons/icon");
+var _HtImagePaletteModule = _interopRequireDefault(require("./HtImagePalette.module.scss"));
 
 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); }
 
@@ -38,10 +40,20 @@ function HtCustomImagePanel(props) {
       });
     } catch (error) {
       _rlog["default"].error('初始化资源面板失败', error);
-    } // 注销组件
+    }
 
+    var hanleResize = function hanleResize() {
+      if (viewRef.current) {
+        topo.getHtTopo().invalideComponents();
+      }
+    };
+
+    var resizeObserver = new _resizeObserverPolyfill["default"](hanleResize);
+    resizeObserver.observe(container); // 注销组件
 
     return function () {
+      resizeObserver.disconnect();
+
       if (viewRef.current) {
         viewRef.current.destroy();
         viewRef.current = null;
@@ -50,9 +62,6 @@ function HtCustomImagePanel(props) {
   }, []);
   return /*#__PURE__*/_react["default"].createElement("div", {
     ref: divRef,
-    style: {
-      width: '100%' // height: '100%',
-
-    }
+    className: _HtImagePaletteModule["default"].container
   });
 }

package/lib/core/editor/components/Sidebar/views/ImagePanel/HtImagePalette.js

@@ -9,6 +9,10 @@ var _react = _interopRequireWildcard(require("react"));
 
 var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
 
+var _resizeObserverPolyfill = _interopRequireDefault(require("resize-observer-polyfill"));
+
+var _HtImagePaletteModule = _interopRequireDefault(require("./HtImagePalette.module.scss"));
+
 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; }
@@ -36,10 +40,20 @@ function HtImagePalette(props) {
       });
     } catch (error) {
       _rlog["default"].error('初始化资源面板失败', error);
-    } // 注销组件
+    }
+
+    var hanleResize = function hanleResize() {
+      if (viewRef.current) {
+        topo.getHtTopo().invalideComponents();
+      }
+    };
 
+    var resizeObserver = new _resizeObserverPolyfill["default"](hanleResize);
+    resizeObserver.observe(container); // 注销组件
 
     return function () {
+      resizeObserver.disconnect();
+
       if (viewRef.current) {
         viewRef.current.destroy();
         viewRef.current = null;
@@ -48,9 +62,6 @@ function HtImagePalette(props) {
   }, []);
   return /*#__PURE__*/_react["default"].createElement("div", {
     ref: divRef,
-    style: {
-      width: '100%' // height: '100%',
-
-    }
+    className: _HtImagePaletteModule["default"].container
   });
 }

package/lib/core/editor/components/Sidebar/views/ImagePanel/HtImagePalette.module.scss

@@ -0,0 +1,5 @@
+.container {
+  width: 100%;
+  height: 100%;
+  overflow: hidden;
+}

package/lib/core/editor/components/Sidebar/views/ImagePanel/ImagePanel.js

@@ -5,35 +5,53 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 exports.__esModule = true;
 exports["default"] = ImagePanel;
 
-var _collapse = _interopRequireDefault(require("@alifd/next/lib/collapse"));
-
 var _button = _interopRequireDefault(require("@alifd/next/lib/button"));
 
 var _icon = _interopRequireDefault(require("@alifd/next/lib/icon"));
 
-var _react = _interopRequireDefault(require("react"));
+var _react = _interopRequireWildcard(require("react"));
 
 var _classnames = _interopRequireDefault(require("classnames"));
 
-var _Panel = _interopRequireDefault(require("../../../../../../components/collapse/Panel"));
-
-var _CollapseModule = _interopRequireDefault(require("../../../../../../components/collapse/Collapse.module.scss"));
+var _Collapse = _interopRequireDefault(require("../../../../../../components/collapse/Collapse"));
 
 var _CiTypeImagePanel = _interopRequireDefault(require("./CiTypeImagePanel"));
 
 var _CustomImagePanel = _interopRequireDefault(require("./CustomImagePanel"));
 
+var _icon2 = require("../../../../../common/icons/icon");
+
+var _HtImagePalette = _interopRequireDefault(require("./HtImagePalette"));
+
+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; }
+
+var CollapsePanel = _Collapse["default"].Panel;
+
 function ImagePanel(props) {
-  return /*#__PURE__*/_react["default"].createElement(_collapse["default"], {
-    defaultExpandedKeys: ['资源图片', '自定义图片'],
+  var topo = props.topo;
+  var basicIcons = (0, _react.useMemo)(function () {
+    return (0, _icon2.getBasicIcons)(topo, false);
+  }, []);
+  return /*#__PURE__*/_react["default"].createElement(_Collapse["default"], {
+    accordion: true,
+    defaultExpandedKeys: ['资源图片'],
     style: {
       border: 'none'
     },
-    className: (0, _classnames["default"])(_CollapseModule["default"].collapse, _CollapseModule["default"].contentNoPadding)
-  }, /*#__PURE__*/_react["default"].createElement(_Panel["default"], {
+    fullheight: true,
+    noContentPadding: true
+  }, /*#__PURE__*/_react["default"].createElement(CollapsePanel, {
     key: "\u8D44\u6E90\u56FE\u7247",
     title: "\u8D44\u6E90\u56FE\u7247"
-  }, /*#__PURE__*/_react["default"].createElement(_CiTypeImagePanel["default"], props)), /*#__PURE__*/_react["default"].createElement(_Panel["default"], {
+  }, /*#__PURE__*/_react["default"].createElement(_CiTypeImagePanel["default"], props)), /*#__PURE__*/_react["default"].createElement(CollapsePanel, {
+    key: "\u57FA\u7840\u56FE\u7247",
+    title: "\u57FA\u7840\u56FE\u7247"
+  }, /*#__PURE__*/_react["default"].createElement(_HtImagePalette["default"], {
+    icons: basicIcons,
+    topo: topo
+  })), /*#__PURE__*/_react["default"].createElement(CollapsePanel, {
     key: "\u81EA\u5B9A\u4E49\u56FE\u7247",
     title: "\u81EA\u5B9A\u4E49\u56FE\u7247",
     extra: /*#__PURE__*/_react["default"].createElement(_button["default"], {

package/lib/core/editor/components/Toolbar/EditorToolbar.js

@@ -9,6 +9,8 @@ var _button = _interopRequireDefault(require("@alifd/next/lib/button"));
 
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 
+var _classnames = _interopRequireDefault(require("classnames"));
+
 var _react = _interopRequireWildcard(require("react"));
 
 var _buttons = _interopRequireDefault(require("./buttons"));
@@ -22,30 +24,39 @@ 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 EditorToolbar(props) {
+  var _topo$viewProps, _topo$viewProps$topoC, _classNames;
+
+  var topo = props.topo;
+
   var _useState = (0, _react.useState)(true),
-      showLabel = _useState[0],
-      setShowLabel = _useState[1];
+      expanded = _useState[0],
+      setExpanded = _useState[1];
 
-  return /*#__PURE__*/_react["default"].createElement("div", {
-    className: _ToolbarModule["default"].toolbarContainer
-  }, /*#__PURE__*/_react["default"].createElement("div", {
-    className: _ToolbarModule["default"].content
-  }, /*#__PURE__*/_react["default"].createElement(_Toolbar["default"], null, _buttons["default"].map(function (ToolbarButton, index) {
+  var isNetworkTopo = (_topo$viewProps = topo.viewProps) === null || _topo$viewProps === void 0 ? void 0 : (_topo$viewProps$topoC = _topo$viewProps.topoContext) === null || _topo$viewProps$topoC === void 0 ? void 0 : _topo$viewProps$topoC.isNetworkTopo;
+  var buttons = (0, _react.useMemo)(function () {
+    return (0, _buttons["default"])(isNetworkTopo);
+  }, [isNetworkTopo]);
+  var buttonInstances = buttons.map(function (ToolbarButton, index) {
     return /*#__PURE__*/_react["default"].createElement(ToolbarButton, (0, _extends2["default"])({
       key: index
     }, props, {
-      showLabel: showLabel
+      showLabel: expanded
     }));
-  }))), /*#__PURE__*/_react["default"].createElement("div", {
+  });
+  return /*#__PURE__*/_react["default"].createElement("div", {
+    className: (0, _classnames["default"])(_ToolbarModule["default"].toolbarWrap, (_classNames = {}, _classNames[_ToolbarModule["default"].normal] = expanded, _classNames[_ToolbarModule["default"].expanded] = !expanded, _classNames))
+  }, /*#__PURE__*/_react["default"].createElement("div", {
+    className: _ToolbarModule["default"].content
+  }, /*#__PURE__*/_react["default"].createElement(_Toolbar["default"], null, buttonInstances)), /*#__PURE__*/_react["default"].createElement("div", {
     className: _ToolbarModule["default"].right
   }, /*#__PURE__*/_react["default"].createElement(_button["default"], {
     type: "normal",
     text: true,
     onClick: function onClick() {
-      setShowLabel(!showLabel);
+      setExpanded(!expanded);
     }
   }, /*#__PURE__*/_react["default"].createElement("img", {
-    src: showLabel ? '/img/topo/editor/toolbar/ToolbarNarrowed/Normal.svg' : '/img/topo/editor/toolbar/ToolbbbarExpand/Normal.svg',
+    src: expanded ? '/img/topo/editor/toolbar/ToolbarNarrowed/Normal.svg' : '/img/topo/editor/toolbar/ToolbbbarExpand/Normal.svg',
     alt: "",
     style: {
       verticalAlign: 'middle'

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

@@ -11,7 +11,7 @@ var _ToolbarModule = _interopRequireDefault(require("./Toolbar.module.scss"));
 
 function Toolbar(props) {
   return /*#__PURE__*/_react["default"].createElement("div", {
-    className: _ToolbarModule["default"].widgets
+    className: _ToolbarModule["default"].toolbarContainer
   }, props.children);
 }
 

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

@@ -1,19 +1,30 @@
-.toolbarContainer {
-  height: 54px;
+.toolbarWrap {
   display: flex;
   align-items: center;
   justify-content: center;
+  transition: all .1s linear;
+
+  &.normal {
+    height: 54px;
+  }
+
+  &.expanded {
+    height: 40px;
+  }
 }
 
 .content {
+  height: 100%;
   flex: 1;
   display: flex;
   align-items: center;
   justify-content: center;
+  overflow-x: auto;
 }
 
-.widgets {
+.toolbarContainer {
   display: flex;
+  min-width: 1060px;
 }
 
 .right {

package/lib/core/editor/components/Toolbar/buttons.js

@@ -3,7 +3,7 @@
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 
 exports.__esModule = true;
-exports["default"] = void 0;
+exports["default"] = getButtons;
 
 var _AddResourceButton = _interopRequireDefault(require("./widgets/AddResourceButton"));
 
@@ -41,22 +41,23 @@ var _NodeImageButton = _interopRequireDefault(require("./widgets/NodeImageButton
 
 var _NodeSizeButton = _interopRequireDefault(require("./widgets/NodeSizeButton"));
 
-var _default = [_AddResourceButton["default"], // 添加资源
-_Divider["default"], _CanvasSelectWidget["default"], // 选择
-_CanvasMoveWidget["default"], // 移动
-_Divider["default"], _HistoryUndoButton["default"], // 撤销
-_HistoryRedoButton["default"], // 恢复
-_Divider["default"], _FontFamilyWidget["default"], // 字体
-_FontSizeWidget["default"], // 字号
-_FontStyleButton["default"], // 文字样式
-_FontColorButton["default"], // 文字颜色
-_Divider["default"], _BoxBackgroundButton["default"], // 框背景
-_Divider["default"], _EdgeColorButton["default"], // 线条颜色
-_EdgeTypeButton["default"], // 线形
-_Divider["default"], _NodeImageButton["default"], // 替换图片
-_NodeSizeButton["default"], // 图片尺寸
-_Divider["default"], _Layout["default"], // 布局方式
-_NodeAlignWidget["default"], // 对齐方式
-_SearchWidget["default"] // 搜索
-];
-exports["default"] = _default;
+function getButtons(isNetworkTopo) {
+  return [].concat(isNetworkTopo ? [_AddResourceButton["default"], // 添加资源
+  _Divider["default"]] : [], [_CanvasSelectWidget["default"], // 选择
+  _CanvasMoveWidget["default"], // 移动
+  _Divider["default"]], isNetworkTopo ? [_HistoryUndoButton["default"], // 撤销
+  // HistoryRedoButton, // 恢复
+  _Divider["default"]] : [], [_FontFamilyWidget["default"], // 字体
+  _FontSizeWidget["default"], // 字号
+  _FontStyleButton["default"], // 文字样式
+  _FontColorButton["default"], // 文字颜色
+  _Divider["default"], _BoxBackgroundButton["default"], // 框背景
+  _Divider["default"], _EdgeColorButton["default"], // 线条颜色
+  _EdgeTypeButton["default"], // 线形
+  _Divider["default"], _NodeImageButton["default"], // 替换图片
+  _NodeSizeButton["default"], // 图片尺寸
+  _Divider["default"], _Layout["default"], // 布局方式
+  _NodeAlignWidget["default"] // 对齐方式
+  // SearchWidget, // 搜索
+  ]);
+}

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

@@ -43,16 +43,16 @@ function AddResourceButton(props) {
 
   var _useState = (0, _react.useState)(getAddType(selection)),
       addType = _useState[0],
-      setAddType = _useState[1]; // 选中分层添加
+      setAddType = _useState[1];
 
+  (0, _react.useEffect)(function () {
+    setAddType(getAddType(selection));
+  }, [selection]); // 选中分层添加
 
   var layerAddResource = (0, _useLayerAddResource["default"])({
     topo: topo,
     topoEdit: topoEdit
   });
-  (0, _react.useEffect)(function () {
-    setAddType(getAddType(selection));
-  }, [selection]);
 
   var handleClick = function handleClick() {
     if (!addType) {
@@ -64,11 +64,12 @@ function AddResourceButton(props) {
     } else if (addType === 'group') {
       // 选中区域添加资源
       var group = selection[0];
-      topoEdit.groupAddResource.open(group);
+      var htGroup = topo.getHtTopo().getGraphView().getDataModel().getDataById(group.id);
+      topoEdit.groupAddResource.open(htGroup);
     }
   };
 
-  return /*#__PURE__*/_react["default"].createElement(_WidgetBox["default"], {
+  return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement(_WidgetBox["default"], {
     label: "\u6DFB\u52A0\u8D44\u6E90",
     tooltip: "\u6DFB\u52A0\u8D44\u6E90",
     showLabel: showLabel
@@ -77,7 +78,7 @@ function AddResourceButton(props) {
   }, /*#__PURE__*/_react["default"].createElement("img", {
     src: "/img/topo/editor/toolbar/add/Normal.svg",
     alt: ""
-  })), addType === 'layer' && /*#__PURE__*/_react["default"].createElement(_LayerAddResourceDrawer["default"], {
+  }))), addType === 'layer' && /*#__PURE__*/_react["default"].createElement(_LayerAddResourceDrawer["default"], {
     layer: selection[0],
     editorProps: editorProps,
     layerAddResource: layerAddResource

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

@@ -37,8 +37,7 @@ function BoxBackgroundButton(props) {
 
 
   var selection = topo.selectionManager.useSelection();
-  (0, _react.useEffect)(function () {
-    setDisabled(false);
+  (0, _react.useEffect)(function () {// setDisabled(false)
   }, [selection]);
   var icon = disabled ? /*#__PURE__*/_react["default"].createElement("img", {
     src: "/img/topo/editor/toolbar/\u80CC\u666F\u586B\u5145\u53CA\u8FB9\u6846/Disable.svg",
@@ -50,6 +49,7 @@ function BoxBackgroundButton(props) {
   return /*#__PURE__*/_react["default"].createElement(_WidgetBox["default"], {
     label: "\u6846\u80CC\u666F",
     tooltip: "\u6846\u80CC\u666F",
+    disabled: disabled,
     showLabel: showLabel
   }, /*#__PURE__*/_react["default"].createElement(_DropdownButton["default"], {
     disabled: disabled,

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

@@ -12,12 +12,23 @@ var _WidgetBox = _interopRequireDefault(require("./WidgetBox"));
 var _ButtonBox = _interopRequireDefault(require("./components/ButtonBox"));
 
 function CanvasMoveWidget(props) {
-  var showLabel = props.showLabel;
+  var topo = props.topo,
+      showLabel = props.showLabel,
+      topoEdit = props.topoEdit;
+
+  var _topo$store$useModelS = topo.store.useModelState('topoEdit'),
+      viewMouseMode = _topo$store$useModelS.viewMouseMode;
+
   return /*#__PURE__*/_react["default"].createElement(_WidgetBox["default"], {
     label: "\u79FB\u52A8",
     tooltip: "\u79FB\u52A8",
     showLabel: showLabel
-  }, /*#__PURE__*/_react["default"].createElement(_ButtonBox["default"], null, /*#__PURE__*/_react["default"].createElement("img", {
+  }, /*#__PURE__*/_react["default"].createElement(_ButtonBox["default"], {
+    active: viewMouseMode === 'move',
+    onClick: function onClick() {
+      topoEdit.setViewMouseMode('move');
+    }
+  }, /*#__PURE__*/_react["default"].createElement("img", {
     src: "/img/topo/editor/toolbar/drag/Normal.svg",
     alt: ""
   })));

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

@@ -12,13 +12,22 @@ var _WidgetBox = _interopRequireDefault(require("./WidgetBox"));
 var _ButtonBox = _interopRequireDefault(require("./components/ButtonBox"));
 
 function CanvasSelectWidget(props) {
-  var showLabel = props.showLabel;
+  var topo = props.topo,
+      showLabel = props.showLabel,
+      topoEdit = props.topoEdit;
+
+  var _topo$store$useModelS = topo.store.useModelState('topoEdit'),
+      viewMouseMode = _topo$store$useModelS.viewMouseMode;
+
   return /*#__PURE__*/_react["default"].createElement(_WidgetBox["default"], {
     label: "\u9009\u62E9",
     tooltip: "\u9009\u62E9",
     showLabel: showLabel
   }, /*#__PURE__*/_react["default"].createElement(_ButtonBox["default"], {
-    active: true
+    active: viewMouseMode === 'select',
+    onClick: function onClick() {
+      topoEdit.setViewMouseMode('select');
+    }
   }, /*#__PURE__*/_react["default"].createElement("img", {
     src: "/img/topo/editor/toolbar/select/Normal.svg",
     alt: ""

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

@@ -7,9 +7,55 @@ exports["default"] = void 0;
 
 var _react = _interopRequireDefault(require("react"));
 
+var _ColorPanel = _interopRequireDefault(require("../../../../../../components/ColorPanel"));
+
+var _FontColorRange = _interopRequireDefault(require("../../../../../../components/ColorPanel/components/FontColorRange"));
+
+/* eslint-disable no-undef */
+
+/* eslint-disable jsx-a11y/alt-text */
 function Content(props) {
-  // const {  } = props
-  return /*#__PURE__*/_react["default"].createElement("div", null, "xxx");
+  var topo = props.topo,
+      onChange = props.onChange,
+      onPickerFocus = props.onPickerFocus,
+      onPickerBlur = props.onPickerBlur,
+      lineSizeChange = props.lineSizeChange,
+      lineWidth = props.lineWidth;
+  return /*#__PURE__*/_react["default"].createElement("div", {
+    style: {
+      marginTop: '6px',
+      marginLeft: '12px',
+      marginBottom: '6px'
+    }
+  }, /*#__PURE__*/_react["default"].createElement("div", null, "\u7EBF"), /*#__PURE__*/_react["default"].createElement("div", {
+    style: {
+      width: 183,
+      display: 'flex',
+      marginTop: '8px'
+    }
+  }, /*#__PURE__*/_react["default"].createElement("img", {
+    style: {
+      width: 14,
+      height: 14
+    },
+    src: "/img/topo/editor/toolbar/\u7EBF\u6761\u586B\u5145/\u8FB9\u6846.svg",
+    title: "\u7EBF\u6761\u5BBD\u5EA6"
+  }), /*#__PURE__*/_react["default"].createElement(_FontColorRange["default"], {
+    defaultValue: lineWidth,
+    min: 1,
+    max: 10,
+    list: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10],
+    onChange: lineSizeChange
+  })), /*#__PURE__*/_react["default"].createElement("div", {
+    style: {
+      marginTop: '5px',
+      marginLeft: '-5px'
+    }
+  }, /*#__PURE__*/_react["default"].createElement(_ColorPanel["default"], {
+    onChange: onChange,
+    onPickerFocus: onPickerFocus,
+    onPickerBlur: onPickerBlur
+  })));
 }
 
 var _default = Content;