From d6373ffafe74bc547773fec10abd32a4e1f9394b Mon Sep 17 00:00:00 2001
From: thzxx <thzxx@gitee.com>
Date: Wed, 15 Apr 2026 10:17:04 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=B7=A5=E4=BD=9C=E7=A9=BA=E9=97=B4?=
 =?UTF-8?q?=E9=9D=A2=E6=9D=BF=E6=94=B9=E4=B8=BA=20flex=20=E5=AD=90?=
 =?UTF-8?q?=E5=85=83=E7=B4=A0=EF=BC=8C=E4=BF=AE=E5=A4=8D=E4=B8=8E=E4=B8=BB?=
 =?UTF-8?q?=E5=86=85=E5=AE=B9=E5=8C=BA=E9=94=99=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- workspace-panel 从 position:fixed 改为 flex 子元素，与日志面板布局模式一致
- 移除 margin-right:480px hack，工作空间自然占据宽度
- 移除 updateNavHeight() 和 --nav-height CSS 变量（不再需要）
- 移除 border-top（flex 布局下顶部自动对齐）
---
 src/renderer/index.html       |  2 +-
 src/renderer/main.ts          | 17 +----------------
 src/renderer/styles/style.css | 16 ++++++----------
 3 files changed, 8 insertions(+), 27 deletions(-)

diff --git a/src/renderer/index.html b/src/renderer/index.html
index 7b752be..6171d01 100644
--- a/src/renderer/index.html
+++ b/src/renderer/index.html
@@ -167,7 +167,7 @@
     </div>
 </div><!-- /.main-wrap -->
 
-<!-- ═══════════════ 工作空间面板（右侧，常驻显示）═══════════════ -->
+<!-- ═══════════════ 工作空间面板（右侧，常驻显示，flex 子元素）═══════════════ -->
 <aside class="workspace-panel" id="workspacePanel">
     <div class="ws-header">
         <span class="ws-title">🖥️ 工作空间</span>
diff --git a/src/renderer/main.ts b/src/renderer/main.ts
index 795157b..68babca 100644
--- a/src/renderer/main.ts
+++ b/src/renderer/main.ts
@@ -212,8 +212,6 @@ async function init(): Promise<void> {
     setupDesktopIntegration();
 
     bindGlobalEvents();
-    updateNavHeight();
-    window.addEventListener('resize', updateNavHeight);
 
     await checkConnection();
     await loadModels();
@@ -285,24 +283,11 @@ async function init(): Promise<void> {
     initSettingsModal();
     initHistoryModal();
     setupDesktopIntegration();
-    updateNavHeight();
-    window.addEventListener('resize', updateNavHeight);
     checkConnection().then(loadModels);
   }
 }
 
-/**
- * 动态计算顶部导航高度（header + model-bar），
- * 设为 CSS 变量 --nav-height，供 workspace-panel 引用
- */
-function updateNavHeight(): void {
-  const header = document.querySelector<HTMLElement>('.app-header');
-  const modelBar = document.querySelector<HTMLElement>('.model-bar');
-  const headerH = header?.getBoundingClientRect().height ?? 0;
-  const modelBarH = modelBar?.getBoundingClientRect().height ?? 0;
-  const total = Math.ceil(headerH + modelBarH);
-  document.documentElement.style.setProperty('--nav-height', `${total}px`);
-}
+
 
 function bindGlobalEvents(): void {
   document.querySelector('#btnNewChat')?.addEventListener('click', startNewSession);
diff --git a/src/renderer/styles/style.css b/src/renderer/styles/style.css
index 20f69ef..3271b7d 100644
--- a/src/renderer/styles/style.css
+++ b/src/renderer/styles/style.css
@@ -2673,17 +2673,14 @@ html, body {
 /* ═══════════════ 工作空间面板 ═══════════════ */
 
 .workspace-panel {
-    position: fixed;
-    top: var(--nav-height, 92px); /* JS 动态计算 header + model-bar 实际高度 */
-    right: 0;
-    bottom: 0;
     width: 480px;
-    background: var(--bg-solid, #202020);
-    border-left: 1px solid var(--border-default, rgba(255,255,255,0.08));
-    border-top: 1px solid var(--border-default, rgba(255,255,255,0.08));
+    min-width: 480px;
     display: flex;
     flex-direction: column;
+    background: var(--bg-solid, #202020);
+    border-left: 1px solid var(--border-default, rgba(255,255,255,0.08));
     z-index: 10;
+    flex-shrink: 0;
     font-family: 'Cascadia Code', 'Consolas', 'Courier New', monospace;
 }
 
@@ -3083,6 +3080,5 @@ html, body {
 
 /* ── 主内容区自适应 ── */
 
-.main-wrap.with-workspace {
-    margin-right: 480px;
-}
+/* main-wrap.with-workspace 不再需要 margin-right，
+   工作空间面板已改为 flex 子元素，自然占据宽度 */