From e1b6a61d8049207acb90db095ca9e81f5753e5e6 Mon Sep 17 00:00:00 2001
From: qianmoQ <shicheng@devlive.org>
Date: Tue, 26 Aug 2025 22:00:50 +0800
Subject: [PATCH 1/2] =?UTF-8?q?feat=20(core):=20=E6=94=AF=E6=8C=81?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91=E5=99=A8=E6=98=BE=E7=A4=BA=E7=A9=BA=E6=A0=BC?=
 =?UTF-8?q?=E7=9C=81=E7=95=A5=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src-tauri/src/config.rs                       |   4 +
 src/components/setting/Editor.vue             |   8 +-
 src/composables/useCodeMirrorEditor.ts        |  13 ++
 src/composables/useCodeMirrorSpaceOmission.ts | 111 ++++++++++++++++++
 src/types/app.ts                              |   1 +
 5 files changed, 135 insertions(+), 2 deletions(-)
 create mode 100644 src/composables/useCodeMirrorSpaceOmission.ts

diff --git a/src-tauri/src/config.rs b/src-tauri/src/config.rs
index 5f2759d..970b0cc 100644
--- a/src-tauri/src/config.rs
+++ b/src-tauri/src/config.rs
@@ -18,6 +18,7 @@ pub struct EditorConfig {
     pub font_size: Option<u32>,           // 编辑器字体大小
     pub show_line_numbers: Option<bool>,  // 是否显示行号
     pub show_function_help: Option<bool>, // 是否显示函数帮助
+    pub space_dot_omission: Option<bool>, // 是否显示空格省略
 }
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
@@ -45,6 +46,7 @@ impl Default for AppConfig {
                 font_size: Some(14),
                 show_line_numbers: Some(true),
                 show_function_help: Some(false),
+                space_dot_omission: Some(false),
             }),
         }
     }
@@ -103,6 +105,7 @@ impl ConfigManager {
                                 font_size: Some(14),
                                 show_line_numbers: Some(true),
                                 show_function_help: Some(false),
+                                space_dot_omission: Some(false),
                             });
                             println!("读取配置 -> 添加默认 editor 配置");
                         }
@@ -209,6 +212,7 @@ impl ConfigManager {
                 font_size: Some(14),
                 show_line_numbers: Some(true),
                 show_function_help: Some(false),
+                space_dot_omission: Some(false),
             }),
         }
     }
diff --git a/src/components/setting/Editor.vue b/src/components/setting/Editor.vue
index fc59740..a751266 100644
--- a/src/components/setting/Editor.vue
+++ b/src/components/setting/Editor.vue
@@ -12,6 +12,10 @@
       <Switch v-model="editorConfig.show_function_help"/>
     </Label>
 
+    <Label label="是否显示空格省略">
+      <Switch v-model="editorConfig.space_dot_omission"/>
+    </Label>
+
     <Label label="缩进空格数">
       <Number v-model="editorConfig.tab_size" :min="1" :max="8" placeholder="缩进空格数"/>
     </Label>
@@ -27,8 +31,8 @@
 </template>
 
 <script setup lang="ts">
-import { onMounted } from 'vue'
-import { useEditorConfig } from '../../composables/useEditorConfig'
+import {onMounted} from 'vue'
+import {useEditorConfig} from '../../composables/useEditorConfig'
 import Select from '../../ui/Select.vue'
 import Switch from '../../ui/Switch.vue'
 import Number from '../../ui/Number.vue'
diff --git a/src/composables/useCodeMirrorEditor.ts b/src/composables/useCodeMirrorEditor.ts
index dceabc0..306f02d 100644
--- a/src/composables/useCodeMirrorEditor.ts
+++ b/src/composables/useCodeMirrorEditor.ts
@@ -64,6 +64,7 @@ import {StreamLanguage} from '@codemirror/language'
 import {EditorConfig} from '../types/app.ts'
 import {EditorView} from '@codemirror/view'
 import {useCodeMirrorFunctionHelp} from './useCodeMirrorFunctionHelp'
+import {useCodeMirrorSpaceOmission} from './useCodeMirrorSpaceOmission.ts'
 
 interface Props
 {
@@ -234,6 +235,13 @@ export function useCodeMirrorEditor(props: Props)
             result.push(showFunctionHelpHover)
         }
 
+        const shouldShowSpaceOmission = editorConfig.value?.space_dot_omission ?? false
+        if (shouldShowSpaceOmission) {
+            const {spaceOmissionPlugin, spaceOmissionTheme} = useCodeMirrorSpaceOmission()
+            result.push(spaceOmissionPlugin)
+            result.push(spaceOmissionTheme)
+        }
+
         extensions.value = result
 
         // 如果组件还没准备好，等待下一个 tick 后设置为准备好
@@ -334,6 +342,11 @@ export function useCodeMirrorEditor(props: Props)
         await reRenderEditor()
     })
 
+    watch(() => editorConfig.value?.space_dot_omission, async () => {
+        console.log('是否显示空格省略:', editorConfig.value?.space_dot_omission)
+        await reRenderEditor()
+    })
+
     return {
         // 状态
         isReady,
diff --git a/src/composables/useCodeMirrorSpaceOmission.ts b/src/composables/useCodeMirrorSpaceOmission.ts
new file mode 100644
index 0000000..9ebc8c7
--- /dev/null
+++ b/src/composables/useCodeMirrorSpaceOmission.ts
@@ -0,0 +1,111 @@
+import {EditorView, ViewPlugin, ViewUpdate} from '@codemirror/view'
+
+export function useCodeMirrorSpaceOmission()
+{
+    const spaceOmissionPlugin = ViewPlugin.fromClass(class
+    {
+        private styleElement: HTMLStyleElement | null = null
+
+        constructor(private view: EditorView)
+        {
+            this.updateCSS()
+        }
+
+        update(update: ViewUpdate)
+        {
+            if (update.selectionSet) {
+                this.updateCSS()
+            }
+        }
+
+        updateCSS()
+        {
+            const selection = this.view.state.selection.main
+
+            // 移除之前的样式
+            if (this.styleElement) {
+                this.styleElement.remove()
+                this.styleElement = null
+            }
+
+            if (selection.empty) {
+                return
+            }
+
+            const doc = this.view.state.doc
+            const fromLine = doc.lineAt(selection.from)
+            const toLine = doc.lineAt(selection.to)
+
+            const cssRules: string[] = []
+
+            // 为每个有缩进的选中行生成CSS规则
+            for (let lineNum = fromLine.number; lineNum <= toLine.number; lineNum++) {
+                const line = doc.line(lineNum)
+                const text = line.text
+
+                // 计算空格数
+                let spaceCount = 0
+                for (let i = 0; i < text.length; i++) {
+                    if (text[i] === ' ') {
+                        spaceCount++
+                    }
+                    else {
+                        break
+                    }
+                }
+
+                if (spaceCount > 0) {
+                    // 使用行号作为选择器，添加伪元素
+                    const arrowText = '·'.repeat(spaceCount)
+                    cssRules.push(`
+                        .cm-editor .cm-line:nth-child(${lineNum}) {
+                            position: relative;
+                        }
+                        .cm-editor .cm-line:nth-child(${lineNum})::before {
+                            content: "${arrowText}";
+                            position: absolute;
+                            left: 0.4em;
+                            top: 0;
+                            color: #9ca3af;
+                            font-weight: 500;
+                            pointer-events: none;
+                            z-index: 2;
+                            font-family: monospace;
+                            font-size: inherit;
+                            line-height: inherit;
+                        }
+                        .cm-editor .cm-selectionBackground .cm-line:nth-child(${lineNum})::before,
+                        .cm-editor .cm-line:nth-child(${lineNum}).cm-selectionBackground::before {
+                            background-color: var(--cm-selectionBackground, #b3d4fc);
+                        }
+                    `)
+                }
+            }
+
+            // 插入动态样式
+            if (cssRules.length > 0) {
+                this.styleElement = document.createElement('style')
+                this.styleElement.textContent = cssRules.join('\n')
+                document.head.appendChild(this.styleElement)
+            }
+        }
+
+        destroy()
+        {
+            if (this.styleElement) {
+                this.styleElement.remove()
+            }
+        }
+    })
+
+    const spaceOmissionTheme = EditorView.theme({
+        '.cm-line': {
+            position: 'relative'
+        }
+    })
+
+    return {
+        spaceOmissionPlugin,
+        spaceOmissionTheme
+    }
+}
diff --git a/src/types/app.ts b/src/types/app.ts
index d805950..aa38fc6 100644
--- a/src/types/app.ts
+++ b/src/types/app.ts
@@ -53,4 +53,5 @@ export interface EditorConfig
     font_size?: number
     show_line_numbers?: boolean
     show_function_help?: boolean
+    space_dot_omission?: boolean
 }

From f5ac53ed8937b15d779e92410c3eccf3d68d67e3 Mon Sep 17 00:00:00 2001
From: qianmoQ <shicheng@devlive.org>
Date: Tue, 26 Aug 2025 23:54:48 +0800
Subject: [PATCH 2/2] =?UTF-8?q?feat=20(core):=20=E6=94=AF=E6=8C=81?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91=E5=99=A8=E5=AD=97=E4=BD=93=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                                     |   2 +
 src-tauri/Cargo.lock                          |  39 ++++++
 src-tauri/Cargo.toml                          |   1 +
 src-tauri/src/config.rs                       |   4 +
 src-tauri/src/font.rs                         |  30 +++++
 src-tauri/src/main.rs                         |   3 +
 src/components/setting/Editor.vue             |  13 +-
 src/composables/useCodeMirrorEditor.ts        |  12 +-
 src/composables/useCodeMirrorFontFamily.ts    |  22 ++++
 src/composables/useCodeMirrorSpaceOmission.ts |   8 +-
 src/composables/useEditorConfig.ts            | 124 ++++++++++--------
 src/types/app.ts                              |   1 +
 12 files changed, 199 insertions(+), 60 deletions(-)
 create mode 100644 src-tauri/src/font.rs
 create mode 100644 src/composables/useCodeMirrorFontFamily.ts

diff --git a/README.md b/README.md
index 5585b22..5f3b369 100644
--- a/README.md
+++ b/README.md
@@ -43,8 +43,10 @@ CodeForge 是一款轻量级、高性能的桌面代码执行器，专为开发
 ## 安装
 
 **系统要求：**
+
 - Node.js 18+
 - Rust 1.8+
+- Tauri 2.x
 
 **构建步骤：**
 
diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock
index 0f63556..993e9e4 100644
--- a/src-tauri/Cargo.lock
+++ b/src-tauri/Cargo.lock
@@ -13,6 +13,7 @@ dependencies = [
  "log",
  "regex",
  "reqwest 0.11.27",
+ "rfd",
  "serde",
  "serde_json",
  "tauri",
@@ -91,6 +92,8 @@ version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6cbdf310d77fd3aaee6ea2093db7011dc2d35d2eb3481e5607f1f8d942ed99df"
 dependencies = [
+ "async-fs",
+ "async-net",
  "enumflags2",
  "futures-channel",
  "futures-util",
@@ -144,6 +147,17 @@ dependencies = [
  "slab",
 ]
 
+[[package]]
+name = "async-fs"
+version = "2.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "09f7e37c0ed80b2a977691c47dae8625cfb21e205827106c64f7c588766b2e50"
+dependencies = [
+ "async-lock",
+ "blocking",
+ "futures-lite",
+]
+
 [[package]]
 name = "async-io"
 version = "2.5.0"
@@ -173,6 +187,17 @@ dependencies = [
  "pin-project-lite",
 ]
 
+[[package]]
+name = "async-net"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b948000fad4873c1c9339d60f2623323a0cfd3816e5181033c6a5cb68b2accf7"
+dependencies = [
+ "async-io",
+ "blocking",
+ "futures-lite",
+]
+
 [[package]]
 name = "async-process"
 version = "2.4.0"
@@ -2912,6 +2937,12 @@ dependencies = [
  "windows-sys 0.60.2",
 ]
 
+[[package]]
+name = "pollster"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2f3a9f18d041e6d0e102a0a46750538147e5e8992d3b4873aaafee2520b00ce3"
+
 [[package]]
 name = "potential_utf"
 version = "0.1.2"
@@ -3322,7 +3353,9 @@ dependencies = [
  "objc2-app-kit",
  "objc2-core-foundation",
  "objc2-foundation 0.3.1",
+ "pollster",
  "raw-window-handle",
+ "urlencoding",
  "wasm-bindgen",
  "wasm-bindgen-futures",
  "web-sys",
@@ -4767,6 +4800,12 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "urlencoding"
+version = "2.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da"
+
 [[package]]
 name = "urlpattern"
 version = "0.3.0"
diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml
index bf766e0..cab5fce 100644
--- a/src-tauri/Cargo.toml
+++ b/src-tauri/Cargo.toml
@@ -30,3 +30,4 @@ dirs = "6.0.0"
 regex = "1.11.1"
 reqwest = { version = "0.11", features = ["json", "stream"] }
 futures-util = "0.3"
+rfd = "0.15"
diff --git a/src-tauri/src/config.rs b/src-tauri/src/config.rs
index 970b0cc..e4b54db 100644
--- a/src-tauri/src/config.rs
+++ b/src-tauri/src/config.rs
@@ -16,6 +16,7 @@ pub struct EditorConfig {
     pub tab_size: Option<u32>,            // tab 缩进, 空格数，默认为 2
     pub theme: Option<String>,            // 编辑器主题
     pub font_size: Option<u32>,           // 编辑器字体大小
+    pub font_family: Option<String>,      // 编辑器字体
     pub show_line_numbers: Option<bool>,  // 是否显示行号
     pub show_function_help: Option<bool>, // 是否显示函数帮助
     pub space_dot_omission: Option<bool>, // 是否显示空格省略
@@ -44,6 +45,7 @@ impl Default for AppConfig {
                 tab_size: Some(2),
                 theme: Some("githubLight".to_string()),
                 font_size: Some(14),
+                font_family: Some("monospace".to_string()),
                 show_line_numbers: Some(true),
                 show_function_help: Some(false),
                 space_dot_omission: Some(false),
@@ -103,6 +105,7 @@ impl ConfigManager {
                                 tab_size: Some(2),
                                 theme: Some("githubLight".to_string()),
                                 font_size: Some(14),
+                                font_family: Some("monospace".to_string()),
                                 show_line_numbers: Some(true),
                                 show_function_help: Some(false),
                                 space_dot_omission: Some(false),
@@ -210,6 +213,7 @@ impl ConfigManager {
                 tab_size: Some(2),
                 theme: Some("githubLight".to_string()),
                 font_size: Some(14),
+                font_family: Some("monospace".to_string()),
                 show_line_numbers: Some(true),
                 show_function_help: Some(false),
                 space_dot_omission: Some(false),
diff --git a/src-tauri/src/font.rs b/src-tauri/src/font.rs
new file mode 100644
index 0000000..0cc4b41
--- /dev/null
+++ b/src-tauri/src/font.rs
@@ -0,0 +1,30 @@
+use log::info;
+use tauri::AppHandle;
+
+#[tauri::command]
+pub async fn open_font_picker(_app_handle: AppHandle) -> Result<Option<String>, String> {
+    info!("编辑器设置 -> 打开字体选择器");
+
+    let file_handle = rfd::FileDialog::new()
+        .add_filter("字体文件", &["ttf", "otf", "woff", "woff2"])
+        .set_title("选择字体文件")
+        .pick_file();
+
+    match file_handle {
+        Some(path) => {
+            let font_name = path
+                .file_stem() // 只取不带扩展名的文件名
+                .ok_or_else(|| "无法获取字体名".to_string())?
+                .to_str()
+                .ok_or_else(|| "字体名包含无效字符".to_string())?
+                .to_string();
+
+            info!("编辑器设置 -> 用户选择了字体: {}", font_name);
+            Ok(Some(font_name))
+        }
+        None => {
+            info!("编辑器设置 -> 用户取消了字体选择");
+            Ok(None)
+        }
+    }
+}
diff --git a/src-tauri/src/main.rs b/src-tauri/src/main.rs
index ef8ada0..10bfbe5 100644
--- a/src-tauri/src/main.rs
+++ b/src-tauri/src/main.rs
@@ -6,6 +6,7 @@
 mod config;
 mod example;
 mod execution;
+mod font;
 mod logger;
 mod plugin;
 mod plugins;
@@ -24,6 +25,7 @@ use crate::utils::logger::{
 };
 use config::{get_app_config, get_config_path, init_config, update_app_config};
 use example::load_example;
+use font::open_font_picker;
 use log::info;
 use plugins::PluginManager;
 use update::{check_for_updates, start_update};
@@ -79,6 +81,7 @@ fn main() {
             check_for_updates,
             start_update,
             load_example,
+            open_font_picker
         ])
         .run(tauri::generate_context!())
         .expect("error while running tauri application");
diff --git a/src/components/setting/Editor.vue b/src/components/setting/Editor.vue
index a751266..ea15370 100644
--- a/src/components/setting/Editor.vue
+++ b/src/components/setting/Editor.vue
@@ -20,6 +20,13 @@
       <Number v-model="editorConfig.tab_size" :min="1" :max="8" placeholder="缩进空格数"/>
     </Label>
 
+    <Label label="编辑器字体">
+      <div class="flex items-center space-x-2">
+        <Input v-model="editorConfig.font_family" class="w-1/3" disabled placeholder="编辑器字体"/>
+        <Button :icon="ALargeSmall" icon-only @click="selectFont"></Button>
+      </div>
+    </Label>
+
     <Label label="字体大小">
       <Number v-model="editorConfig.font_size" :min="1" :max="30" placeholder="字体大小"/>
     </Label>
@@ -37,6 +44,9 @@ import Select from '../../ui/Select.vue'
 import Switch from '../../ui/Switch.vue'
 import Number from '../../ui/Number.vue'
 import Label from '../../ui/Label.vue'
+import Input from "../../ui/Input.vue";
+import Button from "../../ui/Button.vue";
+import {ALargeSmall} from "lucide-vue-next";
 
 const emit = defineEmits<{
   'settings-changed': [config: any]
@@ -46,7 +56,8 @@ const emit = defineEmits<{
 const {
   editorConfig,
   themeOptions,
-  loadConfig
+  loadConfig,
+  selectFont
 } = useEditorConfig(emit)
 
 onMounted(async () => {
diff --git a/src/composables/useCodeMirrorEditor.ts b/src/composables/useCodeMirrorEditor.ts
index 306f02d..71b7262 100644
--- a/src/composables/useCodeMirrorEditor.ts
+++ b/src/composables/useCodeMirrorEditor.ts
@@ -62,9 +62,10 @@ import {invoke} from '@tauri-apps/api/core'
 import {useToast} from '../plugins/toast'
 import {StreamLanguage} from '@codemirror/language'
 import {EditorConfig} from '../types/app.ts'
-import {EditorView} from '@codemirror/view'
 import {useCodeMirrorFunctionHelp} from './useCodeMirrorFunctionHelp'
 import {useCodeMirrorSpaceOmission} from './useCodeMirrorSpaceOmission.ts'
+import {EditorView} from "@codemirror/view";
+import {useCodeMirrorFontFamily} from "./useCodeMirrorFontFamily.ts";
 
 interface Props
 {
@@ -86,6 +87,7 @@ export function useCodeMirrorEditor(props: Props)
         indent_with_tab: true,
         tab_size: 2,
         font_size: 14,
+        font_family: 'monospace',
         show_line_numbers: false,
         show_function_help: false
     }
@@ -215,6 +217,12 @@ export function useCodeMirrorEditor(props: Props)
         // 添加函数帮助主题
         result.push(functionHelpTheme)
 
+        // 设置字体
+        const {fontFamilyTheme} = useCodeMirrorFontFamily(
+            editorConfig.value?.font_family
+        )
+        result.push(fontFamilyTheme)
+
         // 添加语言扩展
         if (props.language) {
             const langExtension = getLanguageExtension(props.language)
@@ -237,7 +245,7 @@ export function useCodeMirrorEditor(props: Props)
 
         const shouldShowSpaceOmission = editorConfig.value?.space_dot_omission ?? false
         if (shouldShowSpaceOmission) {
-            const {spaceOmissionPlugin, spaceOmissionTheme} = useCodeMirrorSpaceOmission()
+            const {spaceOmissionPlugin, spaceOmissionTheme} = useCodeMirrorSpaceOmission(editorConfig.value?.font_family)
             result.push(spaceOmissionPlugin)
             result.push(spaceOmissionTheme)
         }
diff --git a/src/composables/useCodeMirrorFontFamily.ts b/src/composables/useCodeMirrorFontFamily.ts
new file mode 100644
index 0000000..7607a5e
--- /dev/null
+++ b/src/composables/useCodeMirrorFontFamily.ts
@@ -0,0 +1,22 @@
+import {EditorView} from '@codemirror/view'
+
+export function useCodeMirrorFontFamily(fontFamily?: string)
+{
+    const defaultFont = "monospace"
+
+    const fontFamilyTheme = EditorView.theme({
+        '&': {
+            fontFamily: fontFamily || defaultFont
+        },
+        '.cm-content': {
+            fontFamily: fontFamily || defaultFont
+        },
+        '.cm-scroller': {
+            fontFamily: fontFamily || defaultFont
+        }
+    })
+
+    return {
+        fontFamilyTheme
+    }
+}
diff --git a/src/composables/useCodeMirrorSpaceOmission.ts b/src/composables/useCodeMirrorSpaceOmission.ts
index 9ebc8c7..79ffba5 100644
--- a/src/composables/useCodeMirrorSpaceOmission.ts
+++ b/src/composables/useCodeMirrorSpaceOmission.ts
@@ -1,7 +1,11 @@
 import {EditorView, ViewPlugin, ViewUpdate} from '@codemirror/view'
 
-export function useCodeMirrorSpaceOmission()
+export function useCodeMirrorSpaceOmission(fontFamily?: string)
 {
+    // 设置默认字体
+    const defaultFont = "monospace"
+    const actualFont = fontFamily || defaultFont
+
     const spaceOmissionPlugin = ViewPlugin.fromClass(class
     {
         private styleElement: HTMLStyleElement | null = null
@@ -70,7 +74,7 @@ export function useCodeMirrorSpaceOmission()
                             font-weight: 500;
                             pointer-events: none;
                             z-index: 2;
-                            font-family: monospace;
+                            font-family: ${actualFont};
                             font-size: inherit;
                             line-height: inherit;
                         }
diff --git a/src/composables/useEditorConfig.ts b/src/composables/useEditorConfig.ts
index 638d735..bd40dbf 100644
--- a/src/composables/useEditorConfig.ts
+++ b/src/composables/useEditorConfig.ts
@@ -1,8 +1,8 @@
-import { ref, watch } from 'vue'
-import { debounce } from 'lodash-es'
-import { invoke } from '@tauri-apps/api/core'
-import { useToast } from '../plugins/toast'
-import { EditorConfig } from '../types/app.ts'
+import {ref, watch} from 'vue'
+import {debounce} from 'lodash-es'
+import {invoke} from '@tauri-apps/api/core'
+import {useToast} from '../plugins/toast'
+import {EditorConfig} from '../types/app.ts'
 
 interface ThemeOption
 {
@@ -20,52 +20,52 @@ export function useEditorConfig(emit?: any)
 
     // 主题选项
     const themeOptions = ref<ThemeOption[]>([
-        { label: 'abcdef', value: 'abcdef' },
-        { label: 'abyss', value: 'abyss' },
-        { label: 'androidstudio', value: 'androidstudio' },
-        { label: 'andromeda', value: 'andromeda' },
-        { label: 'atomone', value: 'atomone' },
-        { label: 'aura', value: 'aura' },
-        { label: 'basicDark', value: 'basicDark' },
-        { label: 'basicLight', value: 'basicLight' },
-        { label: 'bbedit', value: 'bbedit' },
-        { label: 'bespin', value: 'bespin' },
-        { label: 'consoleDark', value: 'consoleDark' },
-        { label: 'consoleLight', value: 'consoleLight' },
-        { label: 'copilot', value: 'copilot' },
-        { label: 'darcula', value: 'darcula' },
-        { label: 'dracula', value: 'dracula' },
-        { label: 'duotoneDark', value: 'duotoneDark' },
-        { label: 'duotoneLight', value: 'duotoneLight' },
-        { label: 'eclipse', value: 'eclipse' },
-        { label: 'githubDark', value: 'githubDark' },
-        { label: 'githubLight', value: 'githubLight' },
-        { label: 'gruvboxDark', value: 'gruvboxDark' },
-        { label: 'gruvboxLight', value: 'gruvboxLight' },
-        { label: 'kimbie', value: 'kimbie' },
-        { label: 'material', value: 'material' },
-        { label: 'materialDark', value: 'materialDark' },
-        { label: 'materialLight', value: 'materialLight' },
-        { label: 'monokai', value: 'monokai' },
-        { label: 'monokaiDimmed', value: 'monokaiDimmed' },
-        { label: 'noctisLilac', value: 'noctisLilac' },
-        { label: 'nord', value: 'nord' },
-        { label: 'okaidia', value: 'okaidia' },
-        { label: 'quietlight', value: 'quietlight' },
-        { label: 'red', value: 'red' },
-        { label: 'solarizedDark', value: 'solarizedDark' },
-        { label: 'solarizedLight', value: 'solarizedLight' },
-        { label: 'sublime', value: 'sublime' },
-        { label: 'tokyoNight', value: 'tokyoNight' },
-        { label: 'tokyoNightDay', value: 'tokyoNightDay' },
-        { label: 'tokyoNightStorm', value: 'tokyoNightStorm' },
-        { label: 'tomorrowNightBlue', value: 'tomorrowNightBlue' },
-        { label: 'vscodeDark', value: 'vscodeDark' },
-        { label: 'vscodeLight', value: 'vscodeLight' },
-        { label: 'whiteDark', value: 'whiteDark' },
-        { label: 'whiteLight', value: 'whiteLight' },
-        { label: 'xcodeDark', value: 'xcodeDark' },
-        { label: 'xcodeLight', value: 'xcodeLight' }
+        {label: 'abcdef', value: 'abcdef'},
+        {label: 'abyss', value: 'abyss'},
+        {label: 'androidstudio', value: 'androidstudio'},
+        {label: 'andromeda', value: 'andromeda'},
+        {label: 'atomone', value: 'atomone'},
+        {label: 'aura', value: 'aura'},
+        {label: 'basicDark', value: 'basicDark'},
+        {label: 'basicLight', value: 'basicLight'},
+        {label: 'bbedit', value: 'bbedit'},
+        {label: 'bespin', value: 'bespin'},
+        {label: 'consoleDark', value: 'consoleDark'},
+        {label: 'consoleLight', value: 'consoleLight'},
+        {label: 'copilot', value: 'copilot'},
+        {label: 'darcula', value: 'darcula'},
+        {label: 'dracula', value: 'dracula'},
+        {label: 'duotoneDark', value: 'duotoneDark'},
+        {label: 'duotoneLight', value: 'duotoneLight'},
+        {label: 'eclipse', value: 'eclipse'},
+        {label: 'githubDark', value: 'githubDark'},
+        {label: 'githubLight', value: 'githubLight'},
+        {label: 'gruvboxDark', value: 'gruvboxDark'},
+        {label: 'gruvboxLight', value: 'gruvboxLight'},
+        {label: 'kimbie', value: 'kimbie'},
+        {label: 'material', value: 'material'},
+        {label: 'materialDark', value: 'materialDark'},
+        {label: 'materialLight', value: 'materialLight'},
+        {label: 'monokai', value: 'monokai'},
+        {label: 'monokaiDimmed', value: 'monokaiDimmed'},
+        {label: 'noctisLilac', value: 'noctisLilac'},
+        {label: 'nord', value: 'nord'},
+        {label: 'okaidia', value: 'okaidia'},
+        {label: 'quietlight', value: 'quietlight'},
+        {label: 'red', value: 'red'},
+        {label: 'solarizedDark', value: 'solarizedDark'},
+        {label: 'solarizedLight', value: 'solarizedLight'},
+        {label: 'sublime', value: 'sublime'},
+        {label: 'tokyoNight', value: 'tokyoNight'},
+        {label: 'tokyoNightDay', value: 'tokyoNightDay'},
+        {label: 'tokyoNightStorm', value: 'tokyoNightStorm'},
+        {label: 'tomorrowNightBlue', value: 'tomorrowNightBlue'},
+        {label: 'vscodeDark', value: 'vscodeDark'},
+        {label: 'vscodeLight', value: 'vscodeLight'},
+        {label: 'whiteDark', value: 'whiteDark'},
+        {label: 'whiteLight', value: 'whiteLight'},
+        {label: 'xcodeDark', value: 'xcodeDark'},
+        {label: 'xcodeLight', value: 'xcodeLight'}
     ])
 
     // 加载配置
@@ -90,8 +90,8 @@ export function useEditorConfig(emit?: any)
                 throw new Error('全局配置未加载')
             }
 
-            globalConfig.value.editor = { ...updatedEditor }
-            await invoke('update_app_config', { config: globalConfig.value })
+            globalConfig.value.editor = {...updatedEditor}
+            await invoke('update_app_config', {config: globalConfig.value})
 
             toast.success('编辑器配置已保存')
 
@@ -119,6 +119,18 @@ export function useEditorConfig(emit?: any)
         updateConfig(config)
     }, 1000)
 
+    const selectFont = async () => {
+        try {
+            const fontName = await invoke<string | null>('open_font_picker')
+            if (fontName && editorConfig.value) {
+                editorConfig.value.font_family = fontName
+            }
+        }
+        catch (error) {
+            console.error('选择字体失败:', error)
+        }
+    }
+
     // 监听配置变化
     watch(editorConfig, (newConfig, oldConfig) => {
         // 只有在非初始加载时才触发更新
@@ -144,7 +156,8 @@ export function useEditorConfig(emit?: any)
             indent_with_tab: true,
             tab_size: 2,
             theme: 'githubLight',
-            font_size: 14
+            font_size: 14,
+            font_family: 'Roboto',
         }
     }
 
@@ -180,6 +193,7 @@ export function useEditorConfig(emit?: any)
         saveConfig,
         resetToDefault,
         getThemeByValue,
-        validateConfig
+        validateConfig,
+        selectFont
     }
 }
diff --git a/src/types/app.ts b/src/types/app.ts
index aa38fc6..a2d2221 100644
--- a/src/types/app.ts
+++ b/src/types/app.ts
@@ -51,6 +51,7 @@ export interface EditorConfig
     indent_with_tab?: boolean
     tab_size?: number
     font_size?: number
+    font_family?: string
     show_line_numbers?: boolean
     show_function_help?: boolean
     space_dot_omission?: boolean