From 0654f850421cfd94b1460c9898d86f3aa8b8637f Mon Sep 17 00:00:00 2001 From: Cypress Date: Sat, 5 Jul 2025 15:20:15 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E6=9B=B4=E6=96=B0=E5=A2=9E=E5=BC=BA?= =?UTF-8?q?=E5=BF=AB=E6=8D=B7=E9=94=AE=E7=9A=84=E9=BB=98=E8=AE=A4=E5=80=BC?= =?UTF-8?q?=E5=B9=B6=E4=BC=98=E5=8C=96=E6=97=A5=E5=BF=97=E8=BE=93=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 修改增强快捷键的默认值，从 Shift+回车 更改为 Ctrl+Shift+回车 - 将配置保存和更新过程中的 println! 替换为 log::debug!，以提高日志记录的可读性和一致性 - 确保在合并默认快捷键时正确处理新的默认值逻辑 --- src/frontend/composables/useShortcuts.ts | 2 +- src/rust/config/settings.rs | 2 +- src/rust/config/storage.rs | 10 +++++----- src/rust/ui/commands.rs | 16 ++++++++-------- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/frontend/composables/useShortcuts.ts b/src/frontend/composables/useShortcuts.ts index 0d0f659..0c29a37 100644 --- a/src/frontend/composables/useShortcuts.ts +++ b/src/frontend/composables/useShortcuts.ts @@ -145,7 +145,7 @@ export function useShortcuts() { const enhanceShortcutText = computed(() => { const binding = getShortcutByAction('enhance') if (!binding) { - return isMac.value ? '⇧+回车 增强' : 'Shift+回车 增强' + return isMac.value ? '⌘+⇧+回车 增强' : 'Ctrl+Shift+回车 增强' } return `${shortcutKeyToString(binding.key_combination)} ${binding.name}` }) diff --git a/src/rust/config/settings.rs b/src/rust/config/settings.rs index dd95e8e..5f0d6f2 100644 --- a/src/rust/config/settings.rs +++ b/src/rust/config/settings.rs @@ -636,7 +636,7 @@ pub fn default_shortcuts() -> HashMap { action: "enhance".to_string(), key_combination: ShortcutKey { key: "Enter".to_string(), - ctrl: false, + ctrl: true, alt: false, shift: true, meta: false, diff --git a/src/rust/config/storage.rs b/src/rust/config/storage.rs index 0f01063..ff92346 100644 --- a/src/rust/config/storage.rs +++ b/src/rust/config/storage.rs @@ -32,7 +32,7 @@ pub async fn save_config(state: &State<'_, AppState>, app: &AppHandle) -> Result let _ = file.sync_all(); } - println!("配置已保存到: {:?}", config_path); + log::debug!("配置已保存到: {:?}", config_path); Ok(()) } @@ -166,16 +166,16 @@ fn merge_default_shortcuts(config: &mut AppConfig) { // 如果用户配置中不存在，则添加 config.shortcut_config.shortcuts.insert(key, default_binding); } else if key == "enhance" { - // 特殊处理：更新增强快捷键的默认值从 Ctrl+Shift+Enter 到 Shift+Enter + // 特殊处理：更新增强快捷键的默认值从 Shift+Enter 到 Ctrl+Shift+Enter let existing_binding = config.shortcut_config.shortcuts.get(&key).unwrap(); - // 检查是否是旧的默认值 (Ctrl+Shift+Enter) + // 检查是否是旧的默认值 (Shift+Enter) if existing_binding.key_combination.key == "Enter" - && existing_binding.key_combination.ctrl + && !existing_binding.key_combination.ctrl && existing_binding.key_combination.shift && !existing_binding.key_combination.alt && !existing_binding.key_combination.meta { - // 更新为新的默认值 (Shift+Enter) + // 更新为新的默认值 (Ctrl+Shift+Enter) config.shortcut_config.shortcuts.insert(key, default_binding); } } diff --git a/src/rust/ui/commands.rs b/src/rust/ui/commands.rs index dd4d415..2ef02e1 100644 --- a/src/rust/ui/commands.rs +++ b/src/rust/ui/commands.rs @@ -657,7 +657,7 @@ pub async fn update_custom_prompt_order( state: State<'_, AppState>, app: AppHandle, ) -> Result<(), String> { - println!("开始更新prompt排序，接收到的IDs: {:?}", prompt_ids); + log::debug!("开始更新prompt排序，接收到的IDs: {:?}", prompt_ids); { let mut config = state @@ -665,9 +665,9 @@ pub async fn update_custom_prompt_order( .lock() .map_err(|e| format!("获取配置失败: {}", e))?; - println!("更新前的prompt顺序:"); + log::debug!("更新前的prompt顺序:"); for prompt in &config.custom_prompt_config.prompts { - println!(" {} (sort_order: {})", prompt.name, prompt.sort_order); + log::debug!(" {} (sort_order: {})", prompt.name, prompt.sort_order); } // 根据新的顺序更新sort_order @@ -676,20 +676,20 @@ pub async fn update_custom_prompt_order( let old_order = prompt.sort_order; prompt.sort_order = (index + 1) as i32; prompt.updated_at = chrono::Utc::now().to_rfc3339(); - println!("更新prompt '{}': {} -> {}", prompt.name, old_order, prompt.sort_order); + log::debug!("更新prompt '{}': {} -> {}", prompt.name, old_order, prompt.sort_order); } } // 按sort_order排序 config.custom_prompt_config.prompts.sort_by_key(|p| p.sort_order); - println!("更新后的prompt顺序:"); + log::debug!("更新后的prompt顺序:"); for prompt in &config.custom_prompt_config.prompts { - println!(" {} (sort_order: {})", prompt.name, prompt.sort_order); + log::debug!(" {} (sort_order: {})", prompt.name, prompt.sort_order); } } - println!("开始保存配置文件..."); + log::debug!("开始保存配置文件..."); let save_start = std::time::Instant::now(); // 保存配置到文件 @@ -698,7 +698,7 @@ pub async fn update_custom_prompt_order( .map_err(|e| format!("保存配置失败: {}", e))?; let save_duration = save_start.elapsed(); - println!("配置保存完成，耗时: {:?}", save_duration); + log::debug!("配置保存完成，耗时: {:?}", save_duration); Ok(()) } From 4a5ba9613007ad6f12fd38b03f7a93065548d23b Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Sat, 5 Jul 2025 07:23:37 +0000 Subject: [PATCH 2/2] release: Release 0.3.6 --- Cargo.toml | 2 +- package.json | 2 +- tauri.conf.json | 2 +- version.json | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 7e7f28f..6579261 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "cunzhi" -version = "0.3.5" +version = "0.3.6" edition = "2021" default-run = "等一下" diff --git a/package.json b/package.json index 0dac138..c72ba01 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "cunzhi", "type": "module", - "version": "0.3.5", + "version": "0.3.6", "packageManager": "pnpm@10.12.1", "scripts": { "dev": "vite", diff --git a/tauri.conf.json b/tauri.conf.json index cb3dff8..82bf6d5 100644 --- a/tauri.conf.json +++ b/tauri.conf.json @@ -1,7 +1,7 @@ { "$schema": "https://schema.tauri.app/config/2.0.0", "productName": "寸止", - "version": "0.3.5", + "version": "0.3.6", "identifier": "com.imhuso.cunzhi", "build": { "beforeDevCommand": "pnpm dev", diff --git a/version.json b/version.json index 9b1f164..57aad27 100644 --- a/version.json +++ b/version.json @@ -1,5 +1,5 @@ { - "version": "0.3.5", + "version": "0.3.6", "name": "寸止", "description": "告别AI提前终止烦恼，助力AI更加持久", "build_date": "2025-07-05"