diff --git a/src-tauri/src/commands.rs b/src-tauri/src/commands.rs index 758a501..687b29c 100644 --- a/src-tauri/src/commands.rs +++ b/src-tauri/src/commands.rs @@ -567,9 +567,9 @@ pub async fn open_app_config_folder(handle: tauri::AppHandle) -> Result) -> Result { - // 暂时返回默认设置 + // 暂时返回默认设置:系统托盘(菜单栏)显示开关 Ok(serde_json::json!({ - "showInDock": true + "showInTray": true })) } @@ -579,7 +579,7 @@ pub async fn save_settings( _state: State<'_, AppState>, settings: serde_json::Value, ) -> Result { - // TODO: 实现设置保存逻辑 + // TODO: 实现系统托盘显示开关的保存与应用(显示/隐藏菜单栏托盘图标) log::info!("保存设置: {:?}", settings); Ok(true) } diff --git a/src/components/SettingsModal.tsx b/src/components/SettingsModal.tsx index 3a2a6dc..3e74e78 100644 --- a/src/components/SettingsModal.tsx +++ b/src/components/SettingsModal.tsx @@ -19,7 +19,7 @@ interface SettingsModalProps { export default function SettingsModal({ onClose }: SettingsModalProps) { const [settings, setSettings] = useState({ - showInDock: true, + showInTray: true, }); const [configPath, setConfigPath] = useState(""); const [version, setVersion] = useState(""); @@ -49,8 +49,11 @@ export default function SettingsModal({ onClose }: SettingsModalProps) { const loadSettings = async () => { try { const loadedSettings = await window.api.getSettings(); - if (loadedSettings?.showInDock !== undefined) { - setSettings({ showInDock: loadedSettings.showInDock }); + if ((loadedSettings as any)?.showInTray !== undefined) { + setSettings({ showInTray: (loadedSettings as any).showInTray }); + } else if ((loadedSettings as any)?.showInDock !== undefined) { + // 向后兼容:若历史上有 showInDock,则映射为 showInTray + setSettings({ showInTray: (loadedSettings as any).showInDock }); } } catch (error) { console.error("加载设置失败:", error); @@ -171,20 +174,21 @@ export default function SettingsModal({ onClose }: SettingsModalProps) { {/* 设置内容 */}
- {/* 显示设置 - 功能还未实现 */} + {/* 系统托盘设置(未实现) + 说明:此开关用于控制是否在系统托盘/菜单栏显示应用图标。 */} {/*

- 显示设置 + 显示设置(系统托盘)