Merge pull request #39 from qianmoQ/dev-25.0.2

qianmoQ · web-flow · commit aa001ebd4600 · 2025-08-23T00:34:33.000+08:00
feat (core): 增加多个 UI 组件
diff --git a/README.md b/README.md
@@ -38,7 +38,7 @@ CodeForge 是一款轻量级、高性能的桌面代码执行器，专为开发
 
 **系统要求：**
 - Node.js 18+
-- Rust 1.70+
+- Rust 1.8+
 
 **构建步骤：**
 
diff --git a/src-tauri/src/config.rs b/src-tauri/src/config.rs
@@ -15,6 +15,7 @@ pub struct EditorConfig {
     pub indent_with_tab: Option<bool>, // 是否使用 tab 缩进
     pub tab_size: Option<u32>,         // tab 缩进, 空格数，默认为 2
     pub theme: Option<String>,         // 编辑器主题
+    pub font_size: Option<u32>,        // 编辑器字体大小
 }
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
@@ -39,6 +40,7 @@ impl Default for AppConfig {
                 indent_with_tab: Some(true),
                 tab_size: Some(2),
                 theme: Some("githubLight".to_string()),
+                font_size: Some(14),
             }),
         }
     }
@@ -94,6 +96,7 @@ impl ConfigManager {
                                 indent_with_tab: Some(true),
                                 tab_size: Some(2),
                                 theme: Some("githubLight".to_string()),
+                                font_size: Some(14),
                             });
                             println!("读取配置 -> 添加默认 editor 配置");
                         }
@@ -197,6 +200,7 @@ impl ConfigManager {
                 indent_with_tab: Some(true),
                 tab_size: Some(2),
                 theme: Some("githubLight".to_string()),
+                font_size: Some(14),
             }),
         }
     }
diff --git a/src-tauri/src/setup/menus/app.rs b/src-tauri/src/setup/menus/app.rs
@@ -1,4 +1,6 @@
 use log::info;
+#[allow(unused_imports)]
+use tauri::Manager;
 use tauri::{
     AppHandle, Emitter,
     menu::{MenuItemBuilder, Submenu, SubmenuBuilder},
@@ -16,6 +18,18 @@ pub fn create_app_submenu(app: &AppHandle) -> tauri::Result<Submenu<tauri::Wry>>
         .accelerator("CmdOrCtrl+,")
         .build(app)?;
 
+    #[cfg(target_os = "macos")]
+    let hide_item = MenuItemBuilder::new("隐藏 CodeForge")
+        .id("hide")
+        .accelerator("CmdOrCtrl+H")
+        .build(app)?;
+
+    #[cfg(not(target_os = "macos"))]
+    let hide_item = MenuItemBuilder::new("最小化 CodeForge")
+        .id("hide")
+        .accelerator("CmdOrCtrl+M")
+        .build(app)?;
+
     let restart_item = MenuItemBuilder::new("重启 CodeForge")
         .id("restart")
         .accelerator("CmdOrCtrl+R")
@@ -33,6 +47,8 @@ pub fn create_app_submenu(app: &AppHandle) -> tauri::Result<Submenu<tauri::Wry>>
         .separator()
         .item(&settings_item)
         .separator()
+        .item(&hide_item)
+        .separator()
         .item(&restart_item)
         .item(&quit_item)
         .build()?;
@@ -51,6 +67,28 @@ pub fn handle_app_menu_event(app: &AppHandle, event_id: &str) {
         "settings" => {
             let _event = app.emit("show-settings", ());
         }
+        "hide" => {
+            #[cfg(target_os = "macos")]
+            {
+                info!("隐藏应用 CodeForge");
+                let _ = app.hide();
+            }
+
+            #[cfg(not(target_os = "macos"))]
+            {
+                info!("最小化应用 CodeForge");
+                // 获取主窗口并最小化
+                if let Some(window) = app.get_webview_window("main") {
+                    let _ = window.minimize();
+                } else {
+                    // 如果找不到 main 窗口，尝试获取第一个可用窗口
+                    let windows = app.webview_windows();
+                    if let Some((_, window)) = windows.iter().next() {
+                        let _ = window.minimize();
+                    }
+                }
+            }
+        }
         "restart" => {
             info!("CodeForge 应用重启");
             app.restart();
diff --git a/src/components/AppHeader.vue b/src/components/AppHeader.vue
@@ -3,6 +3,7 @@
     <div class="flex items-center space-x-3">
       <Select v-model="selectedLanguage"
               class="w-48"
+              searchable
               :options="supportedLanguages as any"
               :disabled="isRunning"
               placeholder="选择语言"
diff --git a/src/components/CodeEditor.vue b/src/components/CodeEditor.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="flex bg-white h-full relative">
     <Codemirror v-if="isReady"
-                style="width: 100%; height: 100%"
+                :style="{ width: '100%', height: '100%', fontSize: editorConfig?.font_size ? `${editorConfig.font_size}px` : undefined }"
                 :model-value="modelValue"
                 :extensions="extensions"
                 :indent-with-tab="editorConfig?.indent_with_tab"
diff --git a/src/components/setting/Editor.vue b/src/components/setting/Editor.vue
@@ -5,9 +5,7 @@
         是否使用 tab 缩进
       </label>
       <div class="flex gap-2">
-        <input v-model="editorConfig.indent_with_tab"
-               type="checkbox"
-               class="px-3 py-2 border border-gray-300 dark:border-gray-600 rounded-md bg-white dark:bg-gray-700 text-gray-900 dark:text-white focus:outline-none focus:ring-1 focus:ring-blue-500 focus:border-transparent text-sm"/>
+        <Switch v-model="editorConfig.indent_with_tab"/>
       </div>
     </div>
 
@@ -16,12 +14,16 @@
         缩进空格数
       </label>
       <div class="flex gap-2">
-        <input v-model.number="editorConfig.tab_size"
-               type="number"
-               min="1"
-               max="8"
-               placeholder="缩进空格数，默认 2"
-               class="flex-1 px-3 py-2 border border-gray-300 dark:border-gray-600 rounded-md bg-white dark:bg-gray-700 text-gray-900 dark:text-white focus:outline-none focus:ring-1 focus:ring-blue-500 focus:border-transparent text-sm"/>
+        <Number v-model="editorConfig.tab_size" :min="1" :max="8" placeholder="缩进空格数"/>
+      </div>
+    </div>
+
+    <div>
+      <label class="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-2">
+        字体大小
+      </label>
+      <div class="flex gap-2">
+        <Number v-model="editorConfig.font_size" :min="1" :max="30" placeholder="字体大小"/>
       </div>
     </div>
 
@@ -38,8 +40,10 @@
 
 <script setup lang="ts">
 import { onMounted } from 'vue'
-import Select from '../../ui/Select.vue'
 import { useEditorConfig } from '../../composables/useEditorConfig'
+import Select from '../../ui/Select.vue'
+import Switch from '../../ui/Switch.vue'
+import Number from '../../ui/Number.vue'
 
 const emit = defineEmits<{
   'settings-changed': [config: any]
diff --git a/src/components/setting/Language.vue b/src/components/setting/Language.vue
@@ -118,10 +118,7 @@
                 超时时间(秒)
               </label>
               <div class="flex gap-2">
-                <input v-model="pluginConfig.timeout"
-                       type="number"
-                       placeholder="超时时间(秒)，默认 30 秒"
-                       class="flex-1 px-3 py-2 border border-gray-300 dark:border-gray-600 rounded-md bg-white dark:bg-gray-700 text-gray-900 dark:text-white focus:outline-none focus:ring-1 focus:ring-blue-500 focus:border-transparent text-sm"/>
+                <Number v-model="pluginConfig.timeout" class="w-1/5" placeholder="超时时间(秒)，默认 30 秒"/>
               </div>
             </div>
           </template>
@@ -137,6 +134,7 @@ import { ContainerIcon, FileIcon, Folder, PickaxeIcon, Settings2 } from 'lucide-
 import { Codemirror } from 'vue-codemirror'
 import Button from '../../ui/Button.vue'
 import Tabs from '../../ui/Tabs.vue'
+import Number from '../../ui/Number.vue'
 import { usePluginConfig } from '../../composables/usePluginConfig'
 import type PluginConfig from '../../types/plugin'
 import { useCodeMirrorEditor } from '../../composables/useCodeMirrorEditor.ts'
diff --git a/src/composables/useCodeMirrorEditor.ts b/src/composables/useCodeMirrorEditor.ts
@@ -66,6 +66,7 @@ interface EditorConfig
     theme?: string
     indent_with_tab?: boolean
     tab_size?: number
+    font_size?: number
 }
 
 interface Props
@@ -221,7 +222,8 @@ export function useCodeMirrorEditor(props: Props)
                 editorConfig.value = {
                     theme: 'githubLight',
                     indent_with_tab: true,
-                    tab_size: 2
+                    tab_size: 2,
+                    font_size: 14
                 }
                 await updateExtensions()
             }
@@ -234,7 +236,8 @@ export function useCodeMirrorEditor(props: Props)
             editorConfig.value = {
                 theme: 'githubLight',
                 indent_with_tab: true,
-                tab_size: 2
+                tab_size: 2,
+                font_size: 14
             }
             await updateExtensions()
         }
diff --git a/src/composables/useEditorConfig.ts b/src/composables/useEditorConfig.ts
@@ -8,6 +8,7 @@ interface EditorConfig
     tab_size?: number
     theme?: string
     indent_with_tab?: boolean
+    font_size?: number
 }
 
 interface ThemeOption
@@ -149,7 +150,8 @@ export function useEditorConfig(emit?: any)
         editorConfig.value = {
             indent_with_tab: true,
             tab_size: 2,
-            theme: 'githubLight'
+            theme: 'githubLight',
+            font_size: 14
         }
     }
 
diff --git a/src/ui/Number.vue b/src/ui/Number.vue
diff --git a/src/ui/Select.vue b/src/ui/Select.vue
diff --git a/src/ui/Switch.vue b/src/ui/Switch.vue

Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,7 @@ pub struct EditorConfig {`
`15`	`15`	`pub indent_with_tab: Option<bool>, // 是否使用 tab 缩进`
`16`	`16`	`pub tab_size: Option<u32>, // tab 缩进, 空格数，默认为 2`
`17`	`17`	`pub theme: Option<String>, // 编辑器主题`
	`18`	`+ pub font_size: Option<u32>, // 编辑器字体大小`
`18`	`19`	`}`
`19`	`20`
`20`	`21`	`#[derive(Debug, Clone, Serialize, Deserialize)]`
`@@ -39,6 +40,7 @@ impl Default for AppConfig {`
`39`	`40`	`indent_with_tab: Some(true),`
`40`	`41`	`tab_size: Some(2),`
`41`	`42`	`theme: Some("githubLight".to_string()),`
	`43`	`+ font_size: Some(14),`
`42`	`44`	`}),`
`43`	`45`	`}`
`44`	`46`	`}`
`@@ -94,6 +96,7 @@ impl ConfigManager {`
`94`	`96`	`indent_with_tab: Some(true),`
`95`	`97`	`tab_size: Some(2),`
`96`	`98`	`theme: Some("githubLight".to_string()),`
	`99`	`+ font_size: Some(14),`
`97`	`100`	`});`
`98`	`101`	`println!("读取配置 -> 添加默认 editor 配置");`
`99`	`102`	`}`
`@@ -197,6 +200,7 @@ impl ConfigManager {`
`197`	`200`	`indent_with_tab: Some(true),`
`198`	`201`	`tab_size: Some(2),`
`199`	`202`	`theme: Some("githubLight".to_string()),`
	`203`	`+ font_size: Some(14),`
`200`	`204`	`}),`
`201`	`205`	`}`
`202`	`206`	`}`
Original file line number	Diff line number	Diff line change
`@@ -66,6 +66,7 @@ interface EditorConfig`
`66`	`66`	`theme?: string`
`67`	`67`	`indent_with_tab?: boolean`
`68`	`68`	`tab_size?: number`
	`69`	`+ font_size?: number`
`69`	`70`	`}`
`70`	`71`
`71`	`72`	`interface Props`
`@@ -221,7 +222,8 @@ export function useCodeMirrorEditor(props: Props)`
`221`	`222`	`editorConfig.value = {`
`222`	`223`	`theme: 'githubLight',`
`223`	`224`	`indent_with_tab: true,`
`224`		`- tab_size: 2`
	`225`	`+ tab_size: 2,`
	`226`	`+ font_size: 14`
`225`	`227`	`}`
`226`	`228`	`await updateExtensions()`
`227`	`229`	`}`
`@@ -234,7 +236,8 @@ export function useCodeMirrorEditor(props: Props)`
`234`	`236`	`editorConfig.value = {`
`235`	`237`	`theme: 'githubLight',`
`236`	`238`	`indent_with_tab: true,`
`237`		`- tab_size: 2`
	`239`	`+ tab_size: 2,`
	`240`	`+ font_size: 14`
`238`	`241`	`}`
`239`	`242`	`await updateExtensions()`
`240`	`243`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@ interface EditorConfig`
`8`	`8`	`tab_size?: number`
`9`	`9`	`theme?: string`
`10`	`10`	`indent_with_tab?: boolean`
	`11`	`+ font_size?: number`
`11`	`12`	`}`
`12`	`13`
`13`	`14`	`interface ThemeOption`
`@@ -149,7 +150,8 @@ export function useEditorConfig(emit?: any)`
`149`	`150`	`editorConfig.value = {`
`150`	`151`	`indent_with_tab: true,`
`151`	`152`	`tab_size: 2,`
`152`		`- theme: 'githubLight'`
	`153`	`+ theme: 'githubLight',`
	`154`	`+ font_size: 14`
`153`	`155`	`}`
`154`	`156`	`}`
`155`	`157`