diff --git a/src/App.vue b/src/App.vue index e3fd8a8..c5f130d 100644 --- a/src/App.vue +++ b/src/App.vue @@ -3,6 +3,7 @@ import TopBar from "./components/TopBar.vue"; import LayersPanel from "./components/LayersPanel.vue"; import Workspace from "./components/Workspace.vue"; import Inspector from "./components/Inspector.vue"; +import ToolPanels from "./components/ToolPanels.vue"; import BottomDock from "./components/BottomDock.vue"; import SelectionMenu from "./components/SelectionMenu.vue"; import ContextMenu from "./components/ContextMenu.vue"; @@ -32,7 +33,12 @@ useShortcuts(); - + +
+ + +
@@ -56,6 +62,22 @@ useShortcuts(); } .area-right { grid-area: right; + display: flex; + flex-direction: column; + min-height: 0; + border-left: 1px solid var(--line); + background: var(--bg2); +} + +/* 属性区按内容高度,工具面板吃掉剩下的并自己滚动。 */ +.right-top { + flex: 0 0 auto; +} +.right-bottom { + flex: 1 1 auto; + min-height: 0; + overflow-y: auto; + border-top: 1px solid var(--line); } /* 画布区是浮层的定位上下文:选中菜单、底部胶囊、右键菜单都绝对定位在它里面。 */ diff --git a/src/components/Inspector.vue b/src/components/Inspector.vue index 14434ff..9b4bc3c 100644 --- a/src/components/Inspector.vue +++ b/src/components/Inspector.vue @@ -25,9 +25,6 @@