feat: 偏好设置的快捷键列表追加ESC快捷键的控制(关闭当前窗口) (#7947)
* feat: 快捷键追加ESC控制,关闭当前窗口 * feat: 偏好设置中,页面切换动画的颜色看不清的问题(使用当前主题色) * feat: 三种弹出框支持快捷键ESC动作 * feat: 代码自动格式化(3个框架改动) * feat: 代码自动格式化(3个框架改动) * fix: 修正locale数据获取方式 * 单元测试问题修改 * 单元测试问题修改 * fix: 解决代码评论的问题 * fix: 解决代码评论的问题 * fix: 解决代码评论的问题 * fix: 解决代码评论的问题 * 单元测试问题修改 * fix: 解决评论问题 * fix: 解决代码格式导致pnpm run lint报错的问题 --------- Co-authored-by: PanFu <panfu@zhihuaai.com>
This commit is contained in:
@@ -45,7 +45,10 @@ function handleClick(value: string) {
|
||||
class="outline-box p-2"
|
||||
@click="handleClick(item)"
|
||||
>
|
||||
<div :class="`${item}-slow`" class="h-10 w-12 rounded-md bg-accent"></div>
|
||||
<div
|
||||
:class="`${item}-slow`"
|
||||
class="h-10 w-12 rounded-md bg-primary"
|
||||
></div>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
@@ -17,6 +17,7 @@ const shortcutKeysGlobalSearch = defineModel<boolean>(
|
||||
const shortcutKeysLogout = defineModel<boolean>('shortcutKeysLogout');
|
||||
// const shortcutKeysPreferences = defineModel<boolean>('shortcutKeysPreferences');
|
||||
const shortcutKeysLockScreen = defineModel<boolean>('shortcutKeysLockScreen');
|
||||
const shortcutKeysEscape = defineModel<boolean>('shortcutKeysEscape');
|
||||
|
||||
const altView = computed(() => (isWindowsOs() ? 'Alt' : '⌥'));
|
||||
</script>
|
||||
@@ -47,4 +48,8 @@ const altView = computed(() => (isWindowsOs() ? 'Alt' : '⌥'));
|
||||
{{ $t('ui.widgets.lockScreen.title') }}
|
||||
<template #shortcut> {{ altView }} L </template>
|
||||
</SwitchItem>
|
||||
<SwitchItem v-model="shortcutKeysEscape" :disabled="!shortcutKeysEnable">
|
||||
{{ $t('preferences.shortcutKeys.escape') }}
|
||||
<template #shortcut> Esc </template>
|
||||
</SwitchItem>
|
||||
</template>
|
||||
|
||||
@@ -166,6 +166,9 @@ const shortcutKeysGlobalSearch = defineModel<boolean>(
|
||||
const shortcutKeysGlobalLogout = defineModel<boolean>(
|
||||
'shortcutKeysGlobalLogout',
|
||||
);
|
||||
const shortcutKeysGlobalEscape = defineModel<boolean>(
|
||||
'shortcutKeysGlobalEscape',
|
||||
);
|
||||
|
||||
const shortcutKeysGlobalLockScreen = defineModel<boolean>(
|
||||
'shortcutKeysGlobalLockScreen',
|
||||
@@ -520,6 +523,7 @@ function handleCustomPreferencesUpdate(updates: CustomPreferencesRecord) {
|
||||
v-model:shortcut-keys-global-search="shortcutKeysGlobalSearch"
|
||||
v-model:shortcut-keys-lock-screen="shortcutKeysGlobalLockScreen"
|
||||
v-model:shortcut-keys-logout="shortcutKeysGlobalLogout"
|
||||
v-model:shortcut-keys-escape="shortcutKeysGlobalEscape"
|
||||
/>
|
||||
</Block>
|
||||
</template>
|
||||
|
||||
Reference in New Issue
Block a user