@riil-frontend/component-topology 6.0.0-alpha.3 → 6.0.0-alpha.31

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,37 @@ 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 _topo$store$useModelS = topo.store.useModelState('topoMod'),
+      graphLoaded = _topo$store$useModelS.graphLoaded;
+
+  (0, _react.useEffect)(function () {
+    return function () {
+      // 退出编辑模式，关闭资源面板状态
+      topoEditDispatchers.update({
+        resourceTabActiveKey: null
+      });
+    };
+  }, []); // 通过url参数打开对应面板
+
+  (0, _react.useEffect)(function () {
+    var _topo$viewProps$urlPa;
+
+    if (graphLoaded && (_topo$viewProps$urlPa = topo.viewProps.urlParams) !== null && _topo$viewProps$urlPa !== void 0 && _topo$viewProps$urlPa.resourceTabActiveKey) {
+      setTimeout(function () {
+        var _topo$viewProps$urlPa2;
+
+        topoEditDispatchers.update({
+          resourceTabActiveKey: ((_topo$viewProps$urlPa2 = topo.viewProps.urlParams) === null || _topo$viewProps$urlPa2 === void 0 ? void 0 : _topo$viewProps$urlPa2.resourceTabActiveKey) || null
+        });
+      }, 2000);
+    }
+  }, [graphLoaded]);
 
   var renderTabItem = function renderTabItem(pane) {
     var View = pane.content;
@@ -91,8 +74,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/CanvasPanel.js

@@ -0,0 +1,108 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+exports.__esModule = true;
+exports["default"] = CanvasPanel;
+
+var _tag = _interopRequireDefault(require("@alifd/next/lib/tag"));
+
+var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
+
+var _react = _interopRequireWildcard(require("react"));
+
+var _CanvasPanelModule = _interopRequireDefault(require("./CanvasPanel.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; }
+
+var CANVAS_TOGGLE = [{
+  value: 'white',
+  label: '白色',
+  color: '#FFFFFF',
+  globalNodeLabelColor: '#4d6277',
+  globalEdgeTagColor: '#4d6277'
+}, {
+  value: 'lightblue',
+  label: '蓝色',
+  color: '#F9FBFF',
+  globalNodeLabelColor: '#4d6277',
+  globalEdgeTagColor: '#4d6277'
+}, // {
+//   value: 'yellow',
+//   label: '黄色',
+//   color: '#FFFDE6',
+// },
+// {
+//   value: 'green',
+//   label: '绿色',
+//   color: '#EAFFE8',
+// },
+{
+  value: 'dark',
+  label: '深色',
+  color: '#031425',
+  globalNodeLabelColor: '#ffffff',
+  globalEdgeTagColor: '#ffffff'
+}];
+
+function CanvasPanel(props) {
+  var topo = props.topo;
+
+  var _topo$store$useModel = topo.store.useModel('displayConfig'),
+      canvasTheme = _topo$store$useModel[0].canvasTheme,
+      displayConfigDispatchers = _topo$store$useModel[1];
+
+  var value = canvasTheme || 'white';
+
+  var setCanvasTheme = function setCanvasTheme(themeItem) {
+    var theme = themeItem.value;
+    topo.historyManager.beginTransaction();
+    displayConfigDispatchers.update({
+      canvasTheme: theme
+    }); // 设置资源/链路标注样式
+
+    var _topo$store$getModelS = topo.store.getModelState('displayConfig'),
+        nodeLabelStyle = _topo$store$getModelS.nodeLabelStyle,
+        defaultEdgeLabelStyle = _topo$store$getModelS.defaultEdgeLabelStyle;
+
+    var globalNodeLabelStyle = (0, _extends2["default"])({}, nodeLabelStyle, {
+      color: themeItem.globalNodeLabelColor
+    });
+    topo.getHtTopo().setGlobalNodeLabelStyle(globalNodeLabelStyle);
+    var globalEdgeTagStyle = (0, _extends2["default"])({}, defaultEdgeLabelStyle, {
+      color: themeItem.globalEdgeTagColor
+    });
+    topo.getHtTopo().setGlobalEdgeTagStyle(globalEdgeTagStyle);
+    displayConfigDispatchers.update({
+      nodeLabelStyle: globalNodeLabelStyle,
+      defaultEdgeLabelStyle: globalEdgeTagStyle
+    });
+    topo.historyManager.endTransaction();
+  };
+
+  return /*#__PURE__*/_react["default"].createElement("div", {
+    className: _CanvasPanelModule["default"].canvasToggle
+  }, CANVAS_TOGGLE.map(function (item, index) {
+    return /*#__PURE__*/_react["default"].createElement("div", {
+      className: _CanvasPanelModule["default"].canvas,
+      key: index
+    }, /*#__PURE__*/_react["default"].createElement(_tag["default"].Selectable, {
+      className: _CanvasPanelModule["default"].tag,
+      style: {
+        background: item.color
+      },
+      checked: value === item.value,
+      onChange: function onChange(checked) {
+        setCanvasTheme(item);
+      }
+    }, /*#__PURE__*/_react["default"].createElement("div", {
+      className: _CanvasPanelModule["default"].box
+    }, /*#__PURE__*/_react["default"].createElement("div", {
+      className: _CanvasPanelModule["default"].bgColor
+    }))), /*#__PURE__*/_react["default"].createElement("div", {
+      className: _CanvasPanelModule["default"].canvasText
+    }, item.label));
+  }));
+}

package/lib/core/editor/components/Sidebar/views/CanvasPanel/CanvasPanel.module.scss

@@ -0,0 +1,74 @@
+@import "~@alifd/next/variables.scss";
+
+  .canvasToggle {
+    display: flex;
+    flex-wrap: wrap;
+    .canvas {
+      .tag {
+        border: 1px solid #E4E9EE;
+        width: 110px;
+        height: 62px;
+        border-radius: 2px;
+        margin: 16px 0 0 16px;
+      :global {
+        .#{$css-prefix}tag-body {
+          width: 100%;
+          padding: 0;
+          cursor: pointer;
+        }
+      }
+      .box {
+        position: relative;
+        height: 100%;
+        user-select: none;
+        .bgColor {
+          max-width: 100%;
+          max-height: 100%;
+          display: block;
+          margin: auto;
+          position: absolute;
+          left: 0;
+          top: 0;
+          bottom: 0;
+          right: 0;
+        }
+      }
+      &::before,
+      &::after {
+        z-index: 1;
+      }
+      &:hover {
+        .operation {
+          display: block;
+        }
+      }
+      .operation {
+        display: none;
+        // z-index: -1;
+        position: absolute;
+        right: 0;
+        bottom: 0;
+        left: 0;
+        height: 22px;
+        text-align: center;
+        background: rgba(0, 0, 0, 0.4);
+        button {
+          height: 100%;
+          color: #fff;
+          vertical-align: text-bottom;
+        }
+      }
+     }
+      .canvasText{
+        width: 49px;
+        height: 12px;
+        margin: 8px 0 0 46px;
+        text-align: center;
+      }
+    }
+    .canvas:nth-child(2n){
+      margin-left: -7px;
+    }
+  }
+
+

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/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

@@ -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; }
@@ -34,6 +36,7 @@ function HtImagePalette(props) {
       viewRef.current = htTopo.createImagePalette(container, {
         icons: icons
       });
+      console.error(viewRef.current);
     } catch (error) {
       _rlog["default"].error('初始化资源面板失败', error);
     } // 注销组件
@@ -48,9 +51,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: auto;
+}

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,24 @@ 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, // 框背景
+  // Divider,
+  _EdgeColorButton["default"], // 线条颜色
+  _EdgeTypeButton["default"], // 线形
+  _Divider["default"], _NodeImageButton["default"], // 替换图片
+  _NodeSizeButton["default"], // 图片尺寸
+  _Divider["default"], _Layout["default"], // 布局方式
+  _NodeAlignWidget["default"] // 对齐方式
+  // SearchWidget, // 搜索
+  ]);
+}