From e6a23479ee93027dc284972a0430fe3a4fed07de Mon Sep 17 00:00:00 2001
From: hiss <zhb410181@163.com>
Date: Thu, 23 Jul 2026 14:44:32 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E9=94=81=E5=AE=9A?=
 =?UTF-8?q?=E5=B1=8F=E5=B9=95=E5=92=8C=E9=80=80=E5=87=BA=E7=99=BB=E5=BD=95?=
 =?UTF-8?q?=E5=B0=8F=E9=83=A8=E4=BB=B6=EF=BC=8C=E4=BD=8D=E7=BD=AE=E5=9C=A8?=
 =?UTF-8?q?=20user-dropdown=20=E6=97=B6=EF=BC=8C=E4=BD=BF=E7=94=A8?=
 =?UTF-8?q?=E5=BF=AB=E6=8D=B7=E9=94=AE=E5=94=A4=E5=87=BA=E4=B8=A4=E4=B8=AA?=
 =?UTF-8?q?=E6=A8=A1=E6=80=81=E7=AA=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../layouts/src/basic/header/header.vue       | 25 ++++++++++++++++---
 .../widgets/user-dropdown/user-dropdown.vue   |  9 +------
 2 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/packages/effects/layouts/src/basic/header/header.vue b/packages/effects/layouts/src/basic/header/header.vue
index 9df8acb9..fac2ff95 100644
--- a/packages/effects/layouts/src/basic/header/header.vue
+++ b/packages/effects/layouts/src/basic/header/header.vue
@@ -69,6 +69,24 @@ const {
 const slots = useSlots();
 const { refresh } = useRefresh();
 
+const showLockInHeader = computed(
+  () =>
+    preferences.widget.lockScreen &&
+    preferences.widget.lockScreenButtonPosition === 'header',
+);
+
+const showLogoutInHeader = computed(
+  () => preferences.widget.logoutButtonPosition === 'header',
+);
+
+const enableLockScreenShortcutKey = computed(() => {
+  return showLockInHeader.value && globalLockScreenShortcutKey.value;
+});
+
+const enableLogoutShortcutKey = computed(() => {
+  return showLogoutInHeader.value && globalLogoutShortcutKey.value;
+});
+
 const [LockModal, lockModalApi] = useVbenModal({
   connectedComponent: LockScreenModal,
 });
@@ -104,7 +122,7 @@ if (preferences.shortcutKeys.enable) {
 
   if (lockKey) {
     whenever(lockKey, () => {
-      if (globalLockScreenShortcutKey?.value) {
+      if (enableLockScreenShortcutKey.value) {
         handleOpenLock();
       }
     });
@@ -112,7 +130,7 @@ if (preferences.shortcutKeys.enable) {
 
   if (logoutKey) {
     whenever(logoutKey, () => {
-      if (globalLogoutShortcutKey?.value) {
+      if (enableLogoutShortcutKey.value) {
         handleLogout();
       }
     });
@@ -242,13 +260,14 @@ function clearPreferencesAndLogout() {
 
 <template>
   <LockModal
-    v-if="preferences.widget.lockScreen"
+    v-if="showLockInHeader"
     :avatar="avatar"
     :text="text"
     @submit="handleSubmitLock"
   />
 
   <LogoutModal
+    v-if="showLogoutInHeader"
     :cancel-text="$t('common.cancel')"
     :confirm-text="$t('common.confirm')"
     :fullscreen-button="false"
diff --git a/packages/effects/layouts/src/widgets/user-dropdown/user-dropdown.vue b/packages/effects/layouts/src/widgets/user-dropdown/user-dropdown.vue
index 3e297b3e..7274c4d0 100644
--- a/packages/effects/layouts/src/widgets/user-dropdown/user-dropdown.vue
+++ b/packages/effects/layouts/src/widgets/user-dropdown/user-dropdown.vue
@@ -212,13 +212,6 @@ const enableLockScreenShortcutKey = computed(() => {
   return showLockInDropdown.value && globalLockScreenShortcutKey.value;
 });
 
-const enableShortcutKey = computed(() => {
-  return (
-    (showLockInDropdown.value || showLogoutInDropdown.value) &&
-    preferences.shortcutKeys.enable
-  );
-});
-
 function handleOpenLock() {
   lockModalApi.open();
 }
@@ -269,7 +262,7 @@ async function handleLocaleChange(event: Event, value: 'en-US' | 'zh-CN') {
   openPopover.value = false;
 }
 
-if (enableShortcutKey.value) {
+if (preferences.shortcutKeys.enable) {
   const keys = useMagicKeys();
   const logoutKey = keys['Alt+KeyQ'];
   const lockKey = keys['Alt+KeyL'];