From 499a55af77b8bf63267a575278a6a2b31f04d3d1 Mon Sep 17 00:00:00 2001
From: brianling <brianling@qq.com>
Date: Thu, 16 Jul 2026 09:35:11 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=B7=A5=E5=85=B7=E6=A0=8F=E5=8A=A8?=
 =?UTF-8?q?=E6=80=81=E5=AE=BD=E5=BA=A6=20-=20=E6=A0=B9=E6=8D=AE=E5=86=85?=
 =?UTF-8?q?=E5=AE=B9=E8=87=AA=E5=8A=A8=E8=B0=83=E6=95=B4=E7=AA=97=E5=8F=A3?=
 =?UTF-8?q?=E5=AE=BD=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 electron/main/ipc.ts               |  5 +++
 electron/preload/preload.ts        |  3 +-
 src/components/FloatingToolbar.vue | 55 ++++++++++++++++++++++--------
 src/types/index.ts                 |  1 +
 4 files changed, 48 insertions(+), 16 deletions(-)

diff --git a/electron/main/ipc.ts b/electron/main/ipc.ts
index 928a56d..aa5e5e9 100644
--- a/electron/main/ipc.ts
+++ b/electron/main/ipc.ts
@@ -81,6 +81,11 @@ export function setupIpc(win: BrowserWindow): void {
     win.setPosition(x, y)
   })
 
+  ipcMain.handle('window:resizeMain', (_event, width: number) => {
+    const [wx, wy] = win.getPosition()
+    win.setBounds({ x: wx, y: wy, width: Math.max(200, Math.min(width, 1200)), height: 64 })
+  })
+
   ipcMain.handle('screenshot:start', () => {
     log.info('IPC: screenshot:start')
     startScreenshot(win)
diff --git a/electron/preload/preload.ts b/electron/preload/preload.ts
index d199853..1911387 100644
--- a/electron/preload/preload.ts
+++ b/electron/preload/preload.ts
@@ -3,7 +3,8 @@ import { contextBridge, ipcRenderer } from 'electron'
 contextBridge.exposeInMainWorld('electronAPI', {
   window: {
     dragMove: (deltaX: number, deltaY: number) => ipcRenderer.invoke('window:dragMove', { deltaX, deltaY }),
-    dragEnd: (x: number, y: number) => ipcRenderer.invoke('window:dragEnd', { x, y })
+    dragEnd: (x: number, y: number) => ipcRenderer.invoke('window:dragEnd', { x, y }),
+    resizeMain: (width: number) => ipcRenderer.invoke('window:resizeMain', width)
   },
 
   screenshot: {
diff --git a/src/components/FloatingToolbar.vue b/src/components/FloatingToolbar.vue
index e948064..8cc5a2e 100644
--- a/src/components/FloatingToolbar.vue
+++ b/src/components/FloatingToolbar.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="floating-toolbar" :class="{ 'is-hidden': !appStore.isToolbarVisible }">
+  <div ref="toolbarRef" class="floating-toolbar" :class="{ 'is-hidden': !appStore.isToolbarVisible }">
     <div class="toolbar-buttons">
       <el-button class="toolbar-btn" @click="startScreenshot" :loading="appStore.isGrading">
         <span class="btn-icon">📷</span>
@@ -11,19 +11,26 @@
         <span class="btn-label">评分标准</span>
       </el-button>
 
-      <el-dropdown trigger="click" @command="handleMenu">
-        <el-button class="toolbar-btn">
+      <template v-if="!showMenu">
+        <el-button class="toolbar-btn" @click="showMenu = true">
           <span class="btn-icon">📎</span>
           <span class="btn-label">其它</span>
         </el-button>
-        <template #dropdown>
-          <el-dropdown-menu>
-            <el-dropdown-item command="image">📁 图片阅卷</el-dropdown-item>
-            <el-dropdown-item command="templates">📚 模板</el-dropdown-item>
-            <el-dropdown-item command="history">📜 历史</el-dropdown-item>
-          </el-dropdown-menu>
-        </template>
-      </el-dropdown>
+      </template>
+      <template v-else>
+        <el-button class="toolbar-btn sub-btn" @click="showMenu = false; selectImage()">
+          <span class="btn-icon">📁</span>
+          <span class="btn-label">图片阅卷</span>
+        </el-button>
+        <el-button class="toolbar-btn sub-btn" @click="showMenu = false; openTemplates()">
+          <span class="btn-icon">📚</span>
+          <span class="btn-label">模板</span>
+        </el-button>
+        <el-button class="toolbar-btn sub-btn" @click="showMenu = false; openHistory()">
+          <span class="btn-icon">📜</span>
+          <span class="btn-label">历史</span>
+        </el-button>
+      </template>
 
       <el-button class="toolbar-btn" @click="openSettings">
         <span class="btn-icon">⚙</span>
@@ -34,7 +41,7 @@
 </template>
 
 <script setup lang="ts">
-import { onMounted, onUnmounted } from 'vue'
+import { ref, nextTick, watch, onMounted, onUnmounted } from 'vue'
 import { ElMessage } from 'element-plus'
 import { useAppStore } from '@/stores/app'
 import { useGradingStore } from '@/stores/grading'
@@ -44,9 +51,23 @@ const appStore = useAppStore()
 const gradingStore = useGradingStore()
 const settingsStore = useSettingsStore()
 
+const showMenu = ref(false)
+const toolbarRef = ref<HTMLElement | null>(null)
+
+async function resizeWindow() {
+  await nextTick()
+  if (toolbarRef.value && window.electronAPI) {
+    const w = toolbarRef.value.scrollWidth + 2
+    window.electronAPI.window.resizeMain(w)
+  }
+}
+
+watch(showMenu, resizeWindow)
+
 let cleanupScreenshotListener: (() => void) | null = null
 
 onMounted(() => {
+  resizeWindow()
   if (window.electronAPI) {
     cleanupScreenshotListener = window.electronAPI.screenshot.onCompleted((base64: string) => {
       if (!appStore.isGrading) {
@@ -157,7 +178,11 @@ function openSettings() { window.electronAPI?.dialog.open('settings') }
 <style scoped>
 .floating-toolbar {
   position: fixed;
-  inset: 0;
+  top: 0;
+  left: 0;
+  width: fit-content;
+  min-width: 200px;
+  height: 64px;
   z-index: 99999;
   user-select: none;
   -webkit-app-region: drag;
@@ -177,8 +202,8 @@ function openSettings() { window.electronAPI?.dialog.open('settings') }
   height: 100%;
 }
 
-.toolbar-buttons :deep(.el-dropdown) {
-  -webkit-app-region: no-drag;
+.sub-btn {
+  padding: 4px 8px !important;
 }
 
 .toolbar-btn {
diff --git a/src/types/index.ts b/src/types/index.ts
index 6995bcc..e375f89 100644
--- a/src/types/index.ts
+++ b/src/types/index.ts
@@ -46,6 +46,7 @@ export interface ElectronAPI {
   window: {
     dragMove: (deltaX: number, deltaY: number) => Promise<void>
     dragEnd: (x: number, y: number) => Promise<void>
+    resizeMain: (width: number) => Promise<void>
   }
   screenshot: {
     start: () => Promise<void>