Commit 3bb6d11ed1b33adbfd6c76a0e06442cd62356ab7
1 parent
d7d60398
fix(layout): fix useLockPage not work, fix #611
Showing
2 changed files
with
5 additions
and
8 deletions
src/layouts/default/header/components/user-dropdown/index.vue
| @@ -19,6 +19,7 @@ | @@ -19,6 +19,7 @@ | ||
| 19 | /> | 19 | /> |
| 20 | <MenuDivider v-if="getShowDoc" /> | 20 | <MenuDivider v-if="getShowDoc" /> |
| 21 | <MenuItem | 21 | <MenuItem |
| 22 | + v-if="getUseLockPage" | ||
| 22 | key="lock" | 23 | key="lock" |
| 23 | :text="t('layout.header.tooltipLock')" | 24 | :text="t('layout.header.tooltipLock')" |
| 24 | icon="ion:lock-closed-outline" | 25 | icon="ion:lock-closed-outline" |
| @@ -70,7 +71,7 @@ | @@ -70,7 +71,7 @@ | ||
| 70 | setup() { | 71 | setup() { |
| 71 | const { prefixCls } = useDesign('header-user-dropdown'); | 72 | const { prefixCls } = useDesign('header-user-dropdown'); |
| 72 | const { t } = useI18n(); | 73 | const { t } = useI18n(); |
| 73 | - const { getShowDoc } = useHeaderSetting(); | 74 | + const { getShowDoc, getUseLockPage } = useHeaderSetting(); |
| 74 | const userStore = useUserStore(); | 75 | const userStore = useUserStore(); |
| 75 | 76 | ||
| 76 | const getUserInfo = computed(() => { | 77 | const getUserInfo = computed(() => { |
| @@ -116,6 +117,7 @@ | @@ -116,6 +117,7 @@ | ||
| 116 | getShowDoc, | 117 | getShowDoc, |
| 117 | headerImg, | 118 | headerImg, |
| 118 | register, | 119 | register, |
| 120 | + getUseLockPage, | ||
| 119 | }; | 121 | }; |
| 120 | }, | 122 | }, |
| 121 | }); | 123 | }); |
src/layouts/default/header/index.vue
| @@ -112,15 +112,11 @@ | @@ -112,15 +112,11 @@ | ||
| 112 | getMenuWidth, | 112 | getMenuWidth, |
| 113 | getIsMixSidebar, | 113 | getIsMixSidebar, |
| 114 | } = useMenuSetting(); | 114 | } = useMenuSetting(); |
| 115 | - const { | ||
| 116 | - getUseErrorHandle, | ||
| 117 | - getShowSettingButton, | ||
| 118 | - getSettingButtonPosition, | ||
| 119 | - } = useRootSetting(); | 115 | + const { getUseErrorHandle, getShowSettingButton, getSettingButtonPosition } = |
| 116 | + useRootSetting(); | ||
| 120 | 117 | ||
| 121 | const { | 118 | const { |
| 122 | getHeaderTheme, | 119 | getHeaderTheme, |
| 123 | - getUseLockPage, | ||
| 124 | getShowFullScreen, | 120 | getShowFullScreen, |
| 125 | getShowNotice, | 121 | getShowNotice, |
| 126 | getShowContent, | 122 | getShowContent, |
| @@ -189,7 +185,6 @@ | @@ -189,7 +185,6 @@ | ||
| 189 | getShowLocalePicker, | 185 | getShowLocalePicker, |
| 190 | getShowFullScreen, | 186 | getShowFullScreen, |
| 191 | getShowNotice, | 187 | getShowNotice, |
| 192 | - getUseLockPage, | ||
| 193 | getUseErrorHandle, | 188 | getUseErrorHandle, |
| 194 | getLogoWidth, | 189 | getLogoWidth, |
| 195 | getIsMixSidebar, | 190 | getIsMixSidebar, |