From d7ad0cc64d464cdc177725acdb31b95f5fea2f60 Mon Sep 17 00:00:00 2001
From: patrick <980141374@qq.com>
Date: Tue, 2 Jun 2026 20:13:39 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E7=BC=A9=E7=9F=AD=E5=85=A8=E5=B1=80?=
 =?UTF-8?q?=E5=BF=AB=E6=8D=B7=E9=94=AE=E5=8F=96=E8=AF=8D=E7=AD=89=E5=BE=85?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E8=87=B3180ms?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

将键盘释放等待和剪贴板复制等待的超时时间从1000ms/1500ms统一缩短至180ms，提升快捷键触发时获取选中文本的响应速度。
---
 src/main/api/renderer/settings.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/api/renderer/settings.ts b/src/main/api/renderer/settings.ts
index cd3e6e5e..9f85e9ca 100644
--- a/src/main/api/renderer/settings.ts
+++ b/src/main/api/renderer/settings.ts
@@ -14,8 +14,8 @@ import api from '../index'
 import databaseAPI from '../shared/database'
 
 const GLOBAL_SHORTCUT_COOLDOWN_MS = 180
-const KEY_RELEASE_WAIT_TIMEOUT_MS = 1000
-const CLIPBOARD_COPY_WAIT_TIMEOUT_MS = 1500
+const KEY_RELEASE_WAIT_TIMEOUT_MS = 180
+const CLIPBOARD_COPY_WAIT_TIMEOUT_MS = 180
 
 /**
  * 快捷键触发时携带的文件输入

From 0d1c96f1999a6fbe236dd712cbd24acee753eb2c Mon Sep 17 00:00:00 2001
From: patrick <980141374@qq.com>
Date: Tue, 2 Jun 2026 21:14:46 +0800
Subject: [PATCH 2/2] =?UTF-8?q?feat(setting):=20=E5=85=A8=E5=B1=80?=
 =?UTF-8?q?=E5=BF=AB=E6=8D=B7=E9=94=AE=E6=94=AF=E6=8C=81=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E5=A4=8D=E5=88=B6=E5=BC=80=E5=85=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 新增 autoCopy 配置项，默认禁用（避免无关快捷键产生副作用）
- UI 添加开关控件，支持单独配置每个快捷键
- 双重判断机制：指令类型需要文本 AND 用户启用自动复制
- 新增 updateGlobalShortcutConfig API 支持配置热更新
- 迁移部分 internal: 通道至普通通道（快捷键相关 API）
---
 internal-plugins/setting/src/env.d.ts         |   7 +-
 .../ShortcutsSetting/ShortcutsSetting.vue     | 107 +++++++++++++++++-
 resources/preload.js                          |  13 ++-
 src/main/api/renderer/settings.ts             |  96 ++++++++++++++--
 src/renderer/src/env.d.ts                     |   7 +-
 5 files changed, 206 insertions(+), 24 deletions(-)

diff --git a/internal-plugins/setting/src/env.d.ts b/internal-plugins/setting/src/env.d.ts
index 25e568dd..81e05d43 100644
--- a/internal-plugins/setting/src/env.d.ts
+++ b/internal-plugins/setting/src/env.d.ts
@@ -224,12 +224,17 @@ declare global {
         getCurrentShortcut: () => Promise<string>
         registerGlobalShortcut: (
           shortcut: string,
-          target: string
+          target: string,
+          autoCopy?: boolean
         ) => Promise<{ success: boolean; error?: string }>
         unregisterGlobalShortcut: (shortcut: string) => Promise<{
           success: boolean
           error?: string
         }>
+        updateGlobalShortcutConfig: (
+          shortcut: string,
+          config: { autoCopy: boolean }
+        ) => Promise<{ success: boolean; error?: string }>
         registerAppShortcut: (
           shortcut: string,
           target: string
diff --git a/internal-plugins/setting/src/views/ShortcutsSetting/ShortcutsSetting.vue b/internal-plugins/setting/src/views/ShortcutsSetting/ShortcutsSetting.vue
index 70b8a4f0..2acf4505 100644
--- a/internal-plugins/setting/src/views/ShortcutsSetting/ShortcutsSetting.vue
+++ b/internal-plugins/setting/src/views/ShortcutsSetting/ShortcutsSetting.vue
@@ -29,6 +29,7 @@ interface GlobalShortcut {
   enabled: boolean
   configurable?: boolean
   configKey?: BuiltInShortcutKey
+  autoCopy?: boolean
 }
 
 type BuiltInShortcutKey = 'search' | 'closePlugin' | 'killPlugin'
@@ -324,7 +325,10 @@ async function saveAliasMappings(nextStore: CommandAliasStore): Promise<boolean>
 async function loadGlobalShortcuts(): Promise<void> {
   try {
     const data = await window.ztools.internal.dbGet('global-shortcuts')
-    globalShortcuts.value = data || []
+    globalShortcuts.value = (data || []).map((shortcut: any) => ({
+      ...shortcut,
+      autoCopy: shortcut.autoCopy ?? false // 默认禁用
+    }))
   } catch (err) {
     console.error('加载全局快捷键失败:', err)
   }
@@ -670,6 +674,7 @@ async function handleSaveGlobalShortcut(
     }
 
     const oldShortcut = editingShortcut.value.shortcut
+    const autoCopy = editingShortcut.value.autoCopy ?? false // 保留原有 autoCopy 配置
 
     try {
       if (oldShortcut !== recordedShortcut) {
@@ -678,7 +683,8 @@ async function handleSaveGlobalShortcut(
 
       const result = await window.ztools.internal.registerGlobalShortcut(
         recordedShortcut,
-        targetCommand
+        targetCommand,
+        autoCopy
       )
 
       if (result.success) {
@@ -686,6 +692,7 @@ async function handleSaveGlobalShortcut(
         if (index >= 0) {
           globalShortcuts.value[index].shortcut = recordedShortcut
           globalShortcuts.value[index].target = targetCommand
+          // autoCopy 保持不变
         }
 
         await saveGlobalShortcuts()
@@ -695,7 +702,8 @@ async function handleSaveGlobalShortcut(
         if (oldShortcut !== recordedShortcut) {
           await window.ztools.internal.registerGlobalShortcut(
             oldShortcut,
-            editingShortcut.value.target
+            editingShortcut.value.target,
+            autoCopy
           )
         }
         error(`快捷键注册失败: ${result.error}`)
@@ -704,7 +712,8 @@ async function handleSaveGlobalShortcut(
       if (oldShortcut !== recordedShortcut) {
         await window.ztools.internal.registerGlobalShortcut(
           oldShortcut,
-          editingShortcut.value.target
+          editingShortcut.value.target,
+          autoCopy
         )
       }
       console.error('更新快捷键失败:', err)
@@ -723,7 +732,8 @@ async function handleSaveGlobalShortcut(
     id: Date.now().toString(),
     shortcut: recordedShortcut,
     target: targetCommand,
-    enabled: true
+    enabled: true,
+    autoCopy: false // 新建快捷键默认禁用自动复制
   }
 
   globalShortcuts.value.push(newShortcut)
@@ -732,7 +742,8 @@ async function handleSaveGlobalShortcut(
   try {
     const result = await window.ztools.internal.registerGlobalShortcut(
       recordedShortcut,
-      targetCommand
+      targetCommand,
+      false // 新建快捷键默认禁用自动复制
     )
     if (result.success) {
       success('快捷键添加成功!')
@@ -880,6 +891,70 @@ async function handleDelete(id: string): Promise<void> {
   }
 }
 
+// 处理自动复制开关切换
+async function handleAutoCopyToggle(shortcut: any, event: Event): Promise<void> {
+  console.log('[AutoCopy] 开关切换触发', { shortcut, event })
+
+  const target = event.target as HTMLInputElement | null
+  if (!target) {
+    console.error('[AutoCopy] 无法获取 target 元素')
+    return
+  }
+
+  const newAutoCopy = target.checked
+  console.log('[AutoCopy] 新状态:', newAutoCopy, '旧状态:', shortcut.autoCopy)
+
+  try {
+    // 1. 更新本地数据
+    const index = globalShortcuts.value.findIndex((s) => s.id === shortcut.id)
+    console.log('[AutoCopy] 找到快捷键索引:', index)
+
+    if (index >= 0) {
+      globalShortcuts.value[index].autoCopy = newAutoCopy
+      console.log('[AutoCopy] 本地数据已更新:', globalShortcuts.value[index])
+    }
+
+    // 2. 保存到数据库（清理数据，只保留可序列化的字段）
+    console.log('[AutoCopy] 开始保存到数据库...')
+    const dataToSave = globalShortcuts.value.map((s) => ({
+      id: s.id,
+      shortcut: s.shortcut,
+      target: s.target,
+      enabled: s.enabled,
+      autoCopy: s.autoCopy,
+      ...(s.configurable !== undefined && { configurable: s.configurable }),
+      ...(s.configKey !== undefined && { configKey: s.configKey })
+    }))
+    await window.ztools.internal.dbPut('global-shortcuts', dataToSave)
+    console.log('[AutoCopy] 数据库保存成功')
+
+    // 3. 通知主进程更新配置
+    console.log('[AutoCopy] 通知主进程更新配置:', {
+      shortcut: shortcut.shortcut,
+      autoCopy: newAutoCopy
+    })
+    const result = await window.ztools.internal.updateGlobalShortcutConfig(shortcut.shortcut, {
+      autoCopy: newAutoCopy
+    })
+    console.log('[AutoCopy] 主进程配置更新结果:', result)
+
+    if (!result.success) {
+      throw new Error(result.error || '更新配置失败')
+    }
+
+    console.log('[AutoCopy] 自动复制开关切换完成')
+  } catch (err: any) {
+    console.error('[AutoCopy] 更新自动复制开关失败:', err)
+    // 回滚
+    target.checked = !newAutoCopy
+    const index = globalShortcuts.value.findIndex((s) => s.id === shortcut.id)
+    if (index >= 0) {
+      globalShortcuts.value[index].autoCopy = !newAutoCopy
+      console.log('[AutoCopy] 已回滚本地数据')
+    }
+  }
+}
+
 onMounted(() => {
   const userAgent = navigator.userAgent.toLowerCase()
   const platform = navigator.platform.toLowerCase()
@@ -1152,6 +1227,20 @@ useJumpFunction<ShortcutsSettingJumpFunction>(async (state) => {
               </div>
 
               <div class="shortcut-meta">
+                <!-- 自动复制开关（仅全局快捷键） -->
+                <label
+                  v-if="activeTab === 'global'"
+                  class="toggle auto-copy-toggle"
+                  :title="(shortcut.autoCopy ?? false) ? '已启用自动复制' : '已禁用自动复制'"
+                >
+                  <input
+                    type="checkbox"
+                    :checked="shortcut.autoCopy ?? false"
+                    @change="handleAutoCopyToggle(shortcut, $event)"
+                  />
+                  <span class="toggle-slider"></span>
+                </label>
+
                 <button
                   class="icon-btn edit-btn"
                   title="编辑"
@@ -1633,6 +1722,12 @@ useJumpFunction<ShortcutsSettingJumpFunction>(async (state) => {
   justify-content: center;
 }
 
+.auto-copy-toggle {
+  margin-right: 8px;
+  transform: scale(0.85);
+  transform-origin: center;
+}
+
 .edit-btn {
   color: var(--primary-color);
 }
diff --git a/resources/preload.js b/resources/preload.js
index 3e2f7fcf..38fba653 100644
--- a/resources/preload.js
+++ b/resources/preload.js
@@ -914,14 +914,15 @@ window.ztools = {
       await electron.ipcRenderer.invoke('internal:get-plugin-memory-info', pluginPath),
 
     // ==================== 全局快捷键 API ====================
-    registerGlobalShortcut: async (shortcut, target) =>
-      await electron.ipcRenderer.invoke('internal:register-global-shortcut', shortcut, target),
+    registerGlobalShortcut: async (shortcut, target, autoCopy) =>
+      await electron.ipcRenderer.invoke('register-global-shortcut', shortcut, target, autoCopy),
     unregisterGlobalShortcut: async (shortcut) =>
-      await electron.ipcRenderer.invoke('internal:unregister-global-shortcut', shortcut),
-    startHotkeyRecording: async () =>
-      await electron.ipcRenderer.invoke('internal:start-hotkey-recording'),
+      await electron.ipcRenderer.invoke('unregister-global-shortcut', shortcut),
+    updateGlobalShortcutConfig: async (shortcut, config) =>
+      await electron.ipcRenderer.invoke('update-global-shortcut-config', shortcut, config),
+    startHotkeyRecording: async () => await electron.ipcRenderer.invoke('start-hotkey-recording'),
     updateShortcut: async (shortcut) =>
-      await electron.ipcRenderer.invoke('internal:update-shortcut', shortcut),
+      await electron.ipcRenderer.invoke('update-shortcut', shortcut),
     getCurrentShortcut: async () => await electron.ipcRenderer.invoke('get-current-shortcut'),
     onHotkeyRecorded: (callback) => {
       if (callback && typeof callback === 'function') {
diff --git a/src/main/api/renderer/settings.ts b/src/main/api/renderer/settings.ts
index 9f85e9ca..0bfe794c 100644
--- a/src/main/api/renderer/settings.ts
+++ b/src/main/api/renderer/settings.ts
@@ -56,6 +56,8 @@ export class SettingsAPI {
   private recordingShortcuts: string[] = []
   private lastGlobalShortcutTriggeredAt = new Map<string, number>()
   private globalShortcutKeyboardStateReleasers = new Map<string, () => void>()
+  // 全局快捷键配置映射（存储每个快捷键的 autoCopy 等配置）
+  private globalShortcutConfigs: Map<string, { autoCopy: boolean }> = new Map()
 
   private setupIPC(): void {
     // 主题
@@ -70,12 +72,19 @@ export class SettingsAPI {
     // 快捷键
     ipcMain.handle('update-shortcut', (_event, shortcut: string) => this.updateShortcut(shortcut))
     ipcMain.handle('get-current-shortcut', () => this.getCurrentShortcut())
-    ipcMain.handle('register-global-shortcut', (_event, shortcut: string, target: string) =>
-      this.registerGlobalShortcut(shortcut, target)
+    ipcMain.handle(
+      'register-global-shortcut',
+      (_event, shortcut: string, target: string, autoCopy?: boolean) =>
+        this.registerGlobalShortcut(shortcut, target, autoCopy ?? false)
     )
     ipcMain.handle('unregister-global-shortcut', (_event, shortcut: string) =>
       this.unregisterGlobalShortcut(shortcut)
     )
+    ipcMain.handle(
+      'update-global-shortcut-config',
+      (_event, shortcut: string, config: { autoCopy: boolean }) =>
+        this.updateGlobalShortcutConfig(shortcut, config)
+    )
 
     // 应用快捷键
     ipcMain.handle('register-app-shortcut', (_event, shortcut: string, target: string) =>
@@ -160,7 +169,11 @@ export class SettingsAPI {
         for (const shortcut of shortcuts) {
           if (shortcut.enabled && shortcut.shortcut && shortcut.target) {
             try {
-              await this.registerGlobalShortcut(shortcut.shortcut, shortcut.target)
+              await this.registerGlobalShortcut(
+                shortcut.shortcut,
+                shortcut.target,
+                shortcut.autoCopy ?? false
+              )
             } catch (error) {
               console.error(`注册全局快捷键失败: ${shortcut.shortcut}`, error)
             }
@@ -252,8 +265,18 @@ export class SettingsAPI {
    * 注册全局快捷键。
    * 触发时会按需采集当前外部应用中的选中文本，再把上下文交给上层统一处理。
    */
-  public async registerGlobalShortcut(shortcut: string, target: string): Promise<any> {
+  public async registerGlobalShortcut(
+    shortcut: string,
+    target: string,
+    autoCopy: boolean = false
+  ): Promise<any> {
+    console.log(`[Settings] 注册全局快捷键: ${shortcut} -> ${target}, autoCopy: ${autoCopy}`)
+
     try {
+      // 存储快捷键配置
+      this.globalShortcutConfigs.set(shortcut, { autoCopy })
+      console.log('[Settings] 快捷键配置已存储到 Map')
+
       this.ensureGlobalShortcutKeyboardState(shortcut)
       const preparation = await api.prepareGlobalShortcut(target)
 
@@ -262,7 +285,7 @@ export class SettingsAPI {
         doubleTapManager.unregister(modifier)
         doubleTapManager.register(modifier, () => {
           console.log(`双击修饰键触发: ${shortcut} -> ${target}`)
-          void this.triggerGlobalShortcut(preparation)
+          void this.triggerGlobalShortcut(shortcut, preparation)
         })
         console.log(`成功注册双击修饰键快捷键: ${shortcut} -> ${target}`)
         return { success: true }
@@ -273,11 +296,12 @@ export class SettingsAPI {
 
       const success = globalShortcut.register(shortcut, () => {
         console.log(`全局快捷键触发: ${shortcut} -> ${target}`)
-        void this.triggerGlobalShortcut(preparation)
+        void this.triggerGlobalShortcut(shortcut, preparation)
       })
 
       if (!success) {
         this.releaseGlobalShortcutKeyboardState(shortcut)
+        this.globalShortcutConfigs.delete(shortcut)
         return { success: false, error: '快捷键注册失败，可能已被其他应用占用' }
       }
 
@@ -285,6 +309,7 @@ export class SettingsAPI {
       return { success: true }
     } catch (error: unknown) {
       this.releaseGlobalShortcutKeyboardState(shortcut)
+      this.globalShortcutConfigs.delete(shortcut)
       console.error('[Settings] 注册全局快捷键失败:', error)
       return { success: false, error: error instanceof Error ? error.message : '未知错误' }
     }
@@ -294,6 +319,7 @@ export class SettingsAPI {
   public unregisterGlobalShortcut(shortcut: string): any {
     try {
       this.releaseGlobalShortcutKeyboardState(shortcut)
+      this.globalShortcutConfigs.delete(shortcut)
 
       if (this.isDoubleTapShortcut(shortcut)) {
         const modifier = this.getDoubleTapModifier(shortcut)
@@ -311,6 +337,22 @@ export class SettingsAPI {
     }
   }
 
+  /**
+   * 更新全局快捷键的配置（如 autoCopy）
+   * 仅更新配置，不重新注册快捷键
+   */
+  public updateGlobalShortcutConfig(shortcut: string, config: { autoCopy: boolean }): any {
+    try {
+      console.log(`[Settings] 更新全局快捷键配置: ${shortcut}, autoCopy: ${config.autoCopy}`)
+      this.globalShortcutConfigs.set(shortcut, config)
+      console.log('[Settings] 配置更新成功')
+      return { success: true }
+    } catch (error: unknown) {
+      console.error('[Settings] 更新全局快捷键配置失败:', error)
+      return { success: false, error: error instanceof Error ? error.message : '未知错误' }
+    }
+  }
+
   /**
    * 为已注册的全局快捷键持有键盘状态监听。
    * 这样触发时可以直接读取完整的按键释放状态，不必临时启动监听。
@@ -337,14 +379,28 @@ export class SettingsAPI {
    * 处理全局快捷键的统一触发入口。
    * 仅在目标命令需要文本上下文时才会执行复制取词，避免无关快捷键产生副作用。
    */
-  private async triggerGlobalShortcut(preparation: GlobalShortcutPreparation): Promise<void> {
+  private async triggerGlobalShortcut(
+    shortcut: string,
+    preparation: GlobalShortcutPreparation
+  ): Promise<void> {
     if (!this.shouldTriggerGlobalShortcut(preparation.target)) {
       return
     }
 
-    const context = preparation.shouldCaptureSelectedText
-      ? await this.captureSelectedTextContext()
-      : undefined
+    // 读取该快捷键的 autoCopy 配置，默认 false
+    const config = this.globalShortcutConfigs.get(shortcut)
+    const autoCopy = config?.autoCopy ?? false
+
+    console.log(`[Settings] 快捷键触发: ${shortcut}`)
+    console.log(`[Settings] 指令类型需要文本: ${preparation.shouldCaptureSelectedText}`)
+    console.log(`[Settings] 用户启用自动复制: ${autoCopy}`)
+
+    // 双重判断：指令类型需要文本 AND 用户启用自动复制
+    const shouldCapture = preparation.shouldCaptureSelectedText && autoCopy
+
+    console.log(`[Settings] 最终是否执行取词: ${shouldCapture}`)
+
+    const context = shouldCapture ? await this.captureSelectedTextContext() : undefined
     await this.handleGlobalShortcut(preparation.target, context)
   }
 
@@ -373,31 +429,51 @@ export class SettingsAPI {
    * 会等待触发快捷键的按键全部弹起后再执行复制，避免修饰键残留改变复制组合键。
    */
   private async captureSelectedTextContext(): Promise<ShortcutLaunchContext> {
+    console.log('[Settings] 开始捕获选中文本...')
     try {
+      console.log('[Settings] 等待按键释放...')
       await doubleTapManager.waitForAllKeysReleased(KEY_RELEASE_WAIT_TIMEOUT_MS)
+      console.log('[Settings] 按键已释放')
 
       const lastSequence = clipboardManager.getLastCopiedSequence()
+      console.log('[Settings] 上次剪贴板序列号:', lastSequence)
+
       const modifier = process.platform === 'darwin' ? 'meta' : 'ctrl'
+      console.log('[Settings] 模拟按键: Ctrl/Cmd+C')
       NativeWindowManager.simulateKeyboardTap('c', modifier)
 
+      console.log('[Settings] 等待剪贴板更新，超时时间:', CLIPBOARD_COPY_WAIT_TIMEOUT_MS, 'ms')
       const lastCopiedContent = await clipboardManager.waitForNextCopiedContent(
         lastSequence,
         CLIPBOARD_COPY_WAIT_TIMEOUT_MS
       )
 
+      console.log('[Settings] 剪贴板内容:', lastCopiedContent)
+
       if (lastCopiedContent?.type === 'text' && typeof lastCopiedContent.data === 'string') {
         const text = lastCopiedContent.data
+        console.log('[Settings] 捕获到文本，长度:', text.length)
         if (text.trim()) {
+          console.log('[Settings] 文本捕获成功')
           return {
             searchQuery: text,
             pastedImage: null,
             pastedFiles: null,
             pastedText: text
           }
+        } else {
+          console.log('[Settings] 文本为空')
         }
+      } else {
+        console.log('[Settings] 未捕获到文本内容')
       }
     } catch (error) {
       console.error('[Settings] 获取选中文本失败:', error)
+      if (error instanceof Error && error.message.includes('timeout')) {
+        console.error(
+          '[Settings] 等待复制超时！可能原因：1) 没有选中文本 2) 应用不支持复制 3) 网络延迟'
+        )
+      }
     }
 
     return {
diff --git a/src/renderer/src/env.d.ts b/src/renderer/src/env.d.ts
index 322e0336..271f7345 100644
--- a/src/renderer/src/env.d.ts
+++ b/src/renderer/src/env.d.ts
@@ -207,9 +207,14 @@ declare global {
       getCurrentShortcut: () => Promise<string>
       registerGlobalShortcut: (
         shortcut: string,
-        target: string
+        target: string,
+        autoCopy?: boolean
       ) => Promise<{ success: boolean; error?: string }>
       unregisterGlobalShortcut: (shortcut: string) => Promise<{ success: boolean; error?: string }>
+      updateGlobalShortcutConfig: (
+        shortcut: string,
+        config: { autoCopy: boolean }
+      ) => Promise<{ success: boolean; error?: string }>
       // 快捷键录制（临时注册，触发后自动注销）
       startHotkeyRecording: () => Promise<{ success: boolean; error?: string }>
       onHotkeyRecorded: (callback: (shortcut: string) => void) => void