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

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

@@ -1,9 +1,6 @@
-import _extends from "@babel/runtime/helpers/extends";
-import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/objectWithoutPropertiesLoose";
 import _Balloon from "@alifd/next/es/balloon";
-var _excluded = ["active", "disabled", "children"];
-import classNames from 'classnames';
 import React from 'react';
+import ButtonBox from "./components/ButtonBox";
 import styles from "./WidgetBox.module.scss";
 
 function WidgetBox(props) {
@@ -12,9 +9,8 @@ function WidgetBox(props) {
       tooltip = props.tooltip,
       disabled = props.disabled,
       children = props.children;
-  var button = /*#__PURE__*/React.createElement("button", {
+  var button = /*#__PURE__*/React.createElement("div", {
     disabled: disabled,
-    type: "button",
     className: styles.container
   }, /*#__PURE__*/React.createElement("div", {
     className: styles.content
@@ -32,18 +28,5 @@ function WidgetBox(props) {
   }, tooltip);
 }
 
-function ButtonBox(props) {
-  var _classNames;
-
-  var active = props.active,
-      disabled = props.disabled,
-      children = props.children,
-      otherProps = _objectWithoutPropertiesLoose(props, _excluded);
-
-  return /*#__PURE__*/React.createElement("div", _extends({
-    className: classNames(styles.ButtonBox, (_classNames = {}, _classNames[styles.ButtonBoxActive] = active, _classNames[styles.ButtonBoxDisabled] = disabled, _classNames))
-  }, otherProps), children);
-}
-
 WidgetBox.ButtonBox = ButtonBox;
 export default WidgetBox;

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

@@ -1,7 +1,7 @@
 import _extends from "@babel/runtime/helpers/extends";
 import _Icon from "@alifd/next/es/icon";
 import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/objectWithoutPropertiesLoose";
-var _excluded = ["active", "disabled", "showArrow", "children"];
+var _excluded = ["active", "disabled", "showArrow", "children", "onClick"];
 import React from 'react';
 import PropTypes from 'prop-types';
 import classNames from 'classnames';
@@ -14,10 +14,12 @@ function ButtonBox(props) {
       disabled = props.disabled,
       showArrow = props.showArrow,
       children = props.children,
+      onClick = props.onClick,
       otherProps = _objectWithoutPropertiesLoose(props, _excluded);
 
   return /*#__PURE__*/React.createElement("div", _extends({
-    className: classNames(styles.ButtonBox, (_classNames = {}, _classNames[styles.ButtonBoxActive] = active, _classNames[styles.ButtonBoxDisabled] = disabled, _classNames))
+    className: classNames(styles.ButtonBox, (_classNames = {}, _classNames[styles.ButtonBoxActive] = active, _classNames[styles.ButtonBoxDisabled] = disabled, _classNames)),
+    onClick: disabled ? undefined : onClick
   }, otherProps), children, showArrow && /*#__PURE__*/React.createElement(React.Fragment, null, "\xA0", /*#__PURE__*/React.createElement(_Icon, {
     type: "tree_fold_arrow",
     size: "xxs",

package/es/core/{store/models → editor/store}/topoEdit.js

@@ -10,7 +10,11 @@ import topoService from '@riil-frontend/component-topology-common/es/services/to
 export default {
   // 定义 model 的初始 state
   state: {
-    saving: false
+    saving: false,
+    // 选择/拖动模式模式。默认选择模式 select|move
+    viewMouseMode: 'select',
+    // 资源面板展开项
+    resourceTabactiveKey: null
   },
   // 定义改变该模型状态的纯函数
   reducers: {

package/es/core/hooks/useTopoEdit.js

@@ -43,8 +43,6 @@ var useTopoEdit = function useTopoEdit(params) {
       editDispatchers = _store$useModel[1];
 
   var topoDispatchers = store.useModelDispatchers("topoMod");
-  var _editState$groups = editState.groups,
-      groups = _editState$groups === void 0 ? [] : _editState$groups;
 
   var _useState = useState(false),
       showComboResDrawer = _useState[0],
@@ -288,55 +286,6 @@ var useTopoEdit = function useTopoEdit(params) {
   var deleteNode = function deleteNode(node) {
     emitEvent(TopoEvent.EVENT_TRIGGER_DELETE, node);
   };
-  /**
-   * 删除视图内的资源
-   */
-
-
-  var deleteViewNode = function deleteViewNode(node) {
-    var nodeId = node.id;
-    var viewResources = resourceConfig.getViewResources();
-    var index = viewResources["static"].indexOf(nodeId);
-
-    if (index > -1) {
-      editDispatchers.updateResources({
-        "static": viewResources["static"].filter(function (item) {
-          return item !== nodeId;
-        })
-      });
-    }
-  };
-  /**
-   * 删除容器内的单个资源
-   *
-   * @param allGroups
-   * @param node 资源
-   */
-
-
-  var deleteGroupNode = function deleteGroupNode(allGroups, node) {
-    var nodeId = node.id; // 更新容器内的资源
-
-    var newGroups = allGroups.map(function (g) {
-      var newGroup = g;
-
-      if (resourceConfig.isGroupContainsNode(g, node)) {
-        newGroup = _extends({}, g, {
-          resources: resourceConfig.removeStaticResource(g.resources, nodeId)
-        });
-      }
-
-      return newGroup;
-    });
-    rlog.info("删除容器内的单个资源", {
-      groups: groups,
-      node: node,
-      newGroups: newGroups
-    });
-    editDispatchers.update({
-      groups: newGroups
-    });
-  };
 
   var handleDeleteNode = function handleDeleteNode(element) {
     var _topo$options$editor;
@@ -643,9 +592,13 @@ var useTopoEdit = function useTopoEdit(params) {
                 topo.linkDynamicStyleExecutor.execute();
               }
 
-              topo.historyManager.endTransaction();
+              topo.historyManager.endTransaction(); // 添加资源后隐藏资源面板
 
-            case 12:
+              topoEditDispatchers.update({
+                resourceTabactiveKey: null
+              });
+
+            case 13:
             case "end":
               return _context15.stop();
           }
@@ -727,8 +680,11 @@ var useTopoEdit = function useTopoEdit(params) {
 
             case 9:
               topo.historyManager.endTransaction();
+              topoEditDispatchers.update({
+                resourceTabactiveKey: null
+              });
 
-            case 10:
+            case 11:
             case "end":
               return _context7.stop();
           }
@@ -1113,6 +1069,16 @@ var useTopoEdit = function useTopoEdit(params) {
 
   var effectsState = store.useModelEffectsState("topoConfig");
   var topoLoading = effectsState.getTopoByConditions.isLoading;
+  /**
+   * 设置视图鼠标模式
+   */
+
+  var setViewMouseMode = useCallback(function (mode) {
+    topo.getHtTopo().setViewMouseMode(mode);
+    topoEditDispatchers.update({
+      viewMouseMode: mode
+    });
+  }, []);
   return {
     resourceConfig: resourceConfig,
 
@@ -1120,6 +1086,7 @@ var useTopoEdit = function useTopoEdit(params) {
      * 拓扑结构加载中状态
      */
     topoLoading: topoLoading,
+    setViewMouseMode: setViewMouseMode,
 
     /**
      * 资源绑定（多选）抽屉显示状态

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

package/es/core/store/coreModels.js

@@ -2,12 +2,12 @@ import topoMod from "./models/topoMod";
 import customIcon from "./models/customIcon";
 import ciModel from "./models/ciModel";
 import topoBizMod from "./models/topoBizMod";
-import topoConfig from "./models/topoConfig";
-import topoEdit from "./models/topoEdit";
-import background from "./models/background";
-import selection from "./models/selection";
-import historyManager from "./models/historyManager";
-import topoGraphView from "./models/topoGraphView"; // 显示模式
+import topoConfig from "./models/topoConfig"; // 编辑模式
+
+import topoEdit from "../editor/store/topoEdit";
+import background from "../editor/store/background";
+import historyManager from "../editor/store/historyManager";
+import selection from "./models/selection"; // 显示模式
 
 import topoAlarm from "./models/topoAlarm";
 import displayConfig from "./models/displayConfig";
@@ -21,7 +21,6 @@ export default {
   topoConfig: topoConfig,
   historyManager: historyManager,
   background: background,
-  topoGraphView: topoGraphView,
   ciModel: ciModel,
   topoEdit: topoEdit,
   // 显示模式

package/lib/components/VerticalIconTab/VerticalIconTab.module.scss

@@ -45,9 +45,9 @@
 .content {
   width: 260px;
   height: 100%;
-  transition: all .1s linear;
   border-left: none !important;
   border-right: 1px solid var(--tab-wrapped-border-line-color);
+  transition: width .1s linear;
 
   :global {
     .#{$css-prefix}tabs-tabpane {

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

@@ -9,22 +9,14 @@ var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends")
 
 var _react = _interopRequireWildcard(require("react"));
 
-var _VerticalIconTab = _interopRequireDefault(require("../../../../components/VerticalIconTab"));
-
-var _LinkPanel = _interopRequireDefault(require("./views/LinkPanel"));
-
-var _ComponentPanel = _interopRequireDefault(require("./views/ComponentPanel"));
-
-var _ImagePanel = _interopRequireDefault(require("./views/ImagePanel"));
+var _classnames = _interopRequireDefault(require("classnames"));
 
-var _BackgroundPanel = _interopRequireDefault(require("./views/BackgroundPanel"));
+var _VerticalIconTab = _interopRequireDefault(require("../../../../components/VerticalIconTab"));
 
-var _CanvasPanel = _interopRequireDefault(require("./views/CanvasPanel"));
+var _panes = _interopRequireDefault(require("./panes"));
 
 var _SidebarModule = _interopRequireDefault(require("./Sidebar.module.scss"));
 
-var _classnames = _interopRequireDefault(require("classnames"));
-
 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; }
@@ -34,46 +26,11 @@ function Sidebar(props) {
 
   var topo = props.topo;
 
-  var _useState = (0, _react.useState)(null),
-      activeKey = _useState[0],
-      setActivekey = _useState[1];
-
-  var panes = [{
-    title: '链路',
-    key: '1',
-    icon: '/img/topo/editor/sidebar/icon/链路.svg',
-    content: _LinkPanel["default"]
-  }, {
-    title: '组件',
-    key: '2',
-    icon: '/img/topo/editor/sidebar/icon/组件.svg',
-    content: _ComponentPanel["default"]
-  }, {
-    title: '图片',
-    key: '3',
-    icon: '/img/topo/editor/sidebar/icon/图片.svg',
-    content: _ImagePanel["default"]
-  }, {
-    title: '背景',
-    key: '4',
-    icon: '/img/topo/editor/sidebar/icon/背景.svg',
-    content: _BackgroundPanel["default"]
-  }, {
-    title: '画布',
-    key: '5',
-    icon: '/img/topo/editor/sidebar/icon/画布.svg',
-    content: _CanvasPanel["default"]
-  }].map(function (item) {
-    var View = item.content;
-    return (0, _extends2["default"])({}, item, {
-      content: function content() {
-        return /*#__PURE__*/_react["default"].createElement(View, (0, _extends2["default"])({}, props, {
-          topo: topo,
-          active: activeKey === item.key
-        }));
-      }
-    });
-  });
+  var _topo$store$useModel = topo.store.useModel('topoEdit'),
+      topoEditState = _topo$store$useModel[0],
+      topoEditDispatchers = _topo$store$useModel[1];
+
+  var activeKey = topoEditState.resourceTabactiveKey;
 
   var renderTabItem = function renderTabItem(pane) {
     var View = pane.content;
@@ -91,8 +48,12 @@ function Sidebar(props) {
     className: (0, _classnames["default"])(_SidebarModule["default"].tabsContainer, (_classNames = {}, _classNames[_SidebarModule["default"].expanded] = !!activeKey, _classNames))
   }, /*#__PURE__*/_react["default"].createElement(_VerticalIconTab["default"], {
     activeKey: activeKey,
-    onChange: setActivekey
-  }, panes.map(renderTabItem))));
+    onChange: function onChange(key) {
+      return topoEditDispatchers.update({
+        resourceTabactiveKey: key
+      });
+    }
+  }, _panes["default"].map(renderTabItem))));
 }
 
 var _default = Sidebar;

package/lib/core/editor/components/Sidebar/panes.js

@@ -0,0 +1,45 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+exports.__esModule = true;
+exports["default"] = void 0;
+
+var _BackgroundPanel = _interopRequireDefault(require("./views/BackgroundPanel"));
+
+var _CanvasPanel = _interopRequireDefault(require("./views/CanvasPanel"));
+
+var _ComponentPanel = _interopRequireDefault(require("./views/ComponentPanel"));
+
+var _ImagePanel = _interopRequireDefault(require("./views/ImagePanel"));
+
+var _LinkPanel = _interopRequireDefault(require("./views/LinkPanel"));
+
+var panes = [{
+  title: '链路',
+  key: '1',
+  icon: '/img/topo/editor/sidebar/icon/链路.svg',
+  content: _LinkPanel["default"]
+}, {
+  title: '组件',
+  key: '2',
+  icon: '/img/topo/editor/sidebar/icon/组件.svg',
+  content: _ComponentPanel["default"]
+}, {
+  title: '图片',
+  key: '3',
+  icon: '/img/topo/editor/sidebar/icon/图片.svg',
+  content: _ImagePanel["default"]
+}, {
+  title: '背景',
+  key: '4',
+  icon: '/img/topo/editor/sidebar/icon/背景.svg',
+  content: _BackgroundPanel["default"]
+}, {
+  title: '画布',
+  key: '5',
+  icon: '/img/topo/editor/sidebar/icon/画布.svg',
+  content: _CanvasPanel["default"]
+}];
+var _default = panes;
+exports["default"] = _default;

package/lib/core/editor/components/Sidebar/views/CanvasPanel/{ImagePanel.js → CanvasPanel.js}

@@ -3,10 +3,10 @@
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 
 exports.__esModule = true;
-exports["default"] = ImagePanel;
+exports["default"] = CanvasPanel;
 
 var _react = _interopRequireDefault(require("react"));
 
-function ImagePanel(props) {
+function CanvasPanel(props) {
   return /*#__PURE__*/_react["default"].createElement("div", null, "ImagePanel");
 }

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

@@ -5,7 +5,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 exports.__esModule = true;
 exports["default"] = void 0;
 
-var _ImagePanel = _interopRequireDefault(require("./ImagePanel"));
+var _CanvasPanel = _interopRequireDefault(require("./CanvasPanel"));
 
-var _default = _ImagePanel["default"];
+var _default = _CanvasPanel["default"];
 exports["default"] = _default;

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

@@ -9,7 +9,7 @@ var _react = _interopRequireWildcard(require("react"));
 
 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); }
 
@@ -50,9 +50,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,8 @@ var _react = _interopRequireWildcard(require("react"));
 
 var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
 
+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; }
@@ -48,9 +50,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%';
+  max-height: 400px;
+  overflow: auto;
+}

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,19 +24,21 @@ 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 _classNames;
+
   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
+    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, _buttons["default"].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", {
     className: _ToolbarModule["default"].right
@@ -42,10 +46,10 @@ function EditorToolbar(props) {
     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/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,7 +64,8 @@ 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);
     }
   };
 

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: ""