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

package/lib/core/components/TopoView/topoView.js

@@ -33,8 +33,6 @@ var _template = require("../../../utils/template");
 
 var _PropertyView = _interopRequireDefault(require("../../editor/components/settings/PropertyView"));
 
-var _BackgroundView = _interopRequireDefault(require("../../editor/components/BackgroundView"));
-
 var _edgeUtil = require("../../utils/edgeUtil");
 
 var _useManageStatus = _interopRequireDefault(require("../../hooks/useManageStatus"));
@@ -53,10 +51,14 @@ var _Sidebar = _interopRequireDefault(require("../../editor/components/Sidebar/S
 
 var _HistoryManager = _interopRequireDefault(require("../../models/HistoryManager"));
 
+var _GraphViewPanel = _interopRequireDefault(require("./GraphViewPanel"));
+
 var _TopoViewModule = _interopRequireDefault(require("./TopoView.module.scss"));
 
 var _editorModule = _interopRequireDefault(require("./editor.module.scss"));
 
+var _useKeyboardShortcut = _interopRequireDefault(require("../../editor/hooks/useKeyboardShortcut"));
+
 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; }
@@ -92,7 +94,6 @@ var Topology = function Topology(props) {
       topoState = _store$useModel[0],
       topoDispatchers = _store$useModel[1];
 
-  var bizDispatchers = store.useModelDispatchers('topoBizMod');
   var topoId = topoState.topoId,
       viewState = topoState.viewState,
       topoData = topoState.topoData,
@@ -103,11 +104,16 @@ var Topology = function Topology(props) {
 
   var _useState = (0, _react.useState)(buildLoadOptions ? buildLoadOptions(topoData) : topoData),
       tData = _useState[0],
-      setTData = _useState[1]; // TODO 临时放这里，当前监听内容较多
-
+      setTData = _useState[1];
 
-  var selectionManager = topo.selectionManager;
   (0, _useRouterAdapter["default"])(props);
+  (0, _useAlarm["default"])({
+    topo: topo
+  });
+  (0, _useManageStatus["default"])({
+    topo: topo
+  }); // 编辑模式----
+
   var topoEdit = (0, _useTopoEdit["default"])({
     topo: topo,
     topoId: topoId,
@@ -120,25 +126,16 @@ var Topology = function Topology(props) {
     isLayerTopo: isLayerTopo
   });
   topo.topoEdit = topoEdit;
-  var onExitEdit = topoEdit.onExitEdit,
-      onBindData = topoEdit.onBindData,
-      onDeleteElement = topoEdit.onDeleteElement,
-      onSaveTopo = topoEdit.onSaveTopo;
-  var titleBarRef = (0, _react.useRef)();
-  (0, _useAlarm["default"])({
-    topo: topo
-  });
-  (0, _useManageStatus["default"])({
-    topo: topo
+  (0, _useKeyboardShortcut["default"])({
+    topo: topo,
+    topoEdit: topoEdit,
+    isEditMode: isEditMode
   });
   (0, _react.useEffect)(function () {
     if (viewState === 'view' && topoId) {
       // TODO 移到模型中
       // rlog.debug('useEffect-viewState', topoId, viewState);
       setTData(null);
-      bizDispatchers.update({
-        setConfig: null
-      });
     }
   }, [topoId, viewState]);
   (0, _react.useEffect)(function () {
@@ -148,7 +145,9 @@ var Topology = function Topology(props) {
   (0, _react.useEffect)(function () {
     // 拓扑退出注销
     return function () {
-      selectionManager.destroy();
+      _rlog["default"].info('TopoView 退出');
+
+      topo.selectionManager.destroy();
       topoDispatchers.reset();
     };
   }, []);
@@ -178,7 +177,7 @@ var Topology = function Topology(props) {
       topo.historyManager = new _HistoryManager["default"](topo, htHistoryManager);
     }
 
-    selectionManager.init();
+    topo.selectionManager.init();
     topoDispatchers.update({
       graphLoaded2: true
     });
@@ -198,7 +197,7 @@ var Topology = function Topology(props) {
     (0, _graphLinkUtil.fixLink)(topo);
     (0, _clusterUtil.handleClusterNoPermission)(topo);
     (0, _edgeUtil.updateEdgeExpanded)(topo);
-    selectionManager.init();
+    topo.selectionManager.init();
     topoDispatchers.update({
       graphLoaded: true
     });
@@ -210,7 +209,7 @@ var Topology = function Topology(props) {
     if (onLoad) {
       onLoad();
     }
-  }, [topoData]); // TODO 之后把事件方法都转移出去
+  }, [topoData]);
 
   var rightEventHandle = function rightEventHandle(event) {
     _rlog["default"].debug('右键事件', event);
@@ -249,16 +248,16 @@ var Topology = function Topology(props) {
         break;
 
       case _componentTopologyGraph.TopoEvent.EVENT_DATA_PICK:
-        onBindData(event.data);
+        topoEdit.onBindData(event.data);
         break;
 
       case _componentTopologyGraph.TopoEvent.EVENT_DATA_DELETE:
-        onDeleteElement(event.data);
+        topoEdit.onDeleteElement(event.data);
         break;
       // FIXME 保存逻辑优化
 
       case _componentTopologyGraph.TopoEvent.EVENT_SAVE_TOPO:
-        onSaveTopo(event.data);
+        topoEdit.onSaveTopo(event.data);
         break;
 
       case _componentTopologyGraph.TopoEvent.EVENT_REFRESH:
@@ -266,7 +265,7 @@ var Topology = function Topology(props) {
         break;
 
       case _componentTopologyGraph.TopoEvent.EVENT_EDIT_EXIT:
-        onExitEdit(event.data);
+        topoEdit.onExitEdit(event.data);
         break;
 
       case _componentTopologyGraph.TopoEvent.EVENT_CONTEXT_TOOL:
@@ -279,36 +278,17 @@ var Topology = function Topology(props) {
     }
   };
 
-  var renderPropertyView = function renderPropertyView() {
-    return isEditMode && /*#__PURE__*/_react["default"].createElement(_PropertyView["default"], {
-      topo: topo,
-      editorProps: editorProps
-    });
-  };
-
-  var renderBackgroundView = function renderBackgroundView() {
-    return isEditMode && /*#__PURE__*/_react["default"].createElement(_BackgroundView["default"], {
-      topo: topo,
-      editorProps: editorProps
-    });
-  };
-
   var renderCanvas = function renderCanvas() {
     var _graphViewProps$creat;
 
-    return /*#__PURE__*/_react["default"].createElement("div", {
-      className: _TopoViewModule["default"].viewPanel,
-      onKeyDown: function onKeyDown(e) {
-        topo.historyManager && topo.historyManager.handleKeyDown(e);
-      }
+    return /*#__PURE__*/_react["default"].createElement(_GraphViewPanel["default"], {
+      topo: topo
     }, /*#__PURE__*/_react["default"].createElement(_componentTopologyGraph["default"], (0, _extends2["default"])({}, graphViewProps, {
       createHtTopoProps: (0, _extends2["default"])({}, graphViewProps.createHtTopoProps, {
         editor: (0, _extends2["default"])({}, ((_graphViewProps$creat = graphViewProps.createHtTopoProps) === null || _graphViewProps$creat === void 0 ? void 0 : _graphViewProps$creat.editor) || {})
       }),
       data: tData,
       defaultEnterEditMode: defaultEnterEditMode,
-      renderPropertyView: renderPropertyView,
-      renderBackgroundView: renderBackgroundView,
       onCreate: onGraphCreated,
       onLoaded: handleGraphLoaded,
       onDataLoaded: handleGraphDataLoaded,
@@ -350,14 +330,16 @@ var Topology = function Topology(props) {
       urlParams: urlParams
     },
     editorProps: editorProps
-  }), renderCanvas()), !isEditMode && /*#__PURE__*/_react["default"].createElement(_ViewerPlugin["default"], {
+  }), renderCanvas(), isEditMode && /*#__PURE__*/_react["default"].createElement(_PropertyView["default"], {
+    topo: topo,
+    editorProps: editorProps
+  })), !isEditMode && /*#__PURE__*/_react["default"].createElement(_ViewerPlugin["default"], {
     topo: topo,
     viewerProps: viewerProps,
     topoContext: topoContext
   }), isEditMode && /*#__PURE__*/_react["default"].createElement(_EditorPlugin["default"], {
     topo: topo,
     topoEdit: topoEdit,
-    titleBarRef: titleBarRef,
     topoContext: {
       urlParams: urlParams
     },

package/lib/core/components/titlebar/TitleBar.module.scss

@@ -12,7 +12,7 @@
   }
 
   &.titlebarViewMode {
-    padding: 16px 16px 0 16px;
+    padding: 16px;
   }
 
   &.titlebarEditMode {

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,36 @@ 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
+      });
+    };
+  }, []);
+  (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 +73,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,109 @@
+"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; }
@@ -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%;
+  height: 100%;
+  overflow: auto;
+}