Browse Source

fix(layout): fix useLockPage not work, fix #611

pull/620/head
Vben 5 years ago
parent
commit
3bb6d11ed1
  1. 4
      src/layouts/default/header/components/user-dropdown/index.vue
  2. 9
      src/layouts/default/header/index.vue

4
src/layouts/default/header/components/user-dropdown/index.vue

@ -19,6 +19,7 @@
/> />
<MenuDivider v-if="getShowDoc" /> <MenuDivider v-if="getShowDoc" />
<MenuItem <MenuItem
v-if="getUseLockPage"
key="lock" key="lock"
:text="t('layout.header.tooltipLock')" :text="t('layout.header.tooltipLock')"
icon="ion:lock-closed-outline" icon="ion:lock-closed-outline"
@ -70,7 +71,7 @@
setup() { setup() {
const { prefixCls } = useDesign('header-user-dropdown'); const { prefixCls } = useDesign('header-user-dropdown');
const { t } = useI18n(); const { t } = useI18n();
const { getShowDoc } = useHeaderSetting(); const { getShowDoc, getUseLockPage } = useHeaderSetting();
const userStore = useUserStore(); const userStore = useUserStore();
const getUserInfo = computed(() => { const getUserInfo = computed(() => {
@ -116,6 +117,7 @@
getShowDoc, getShowDoc,
headerImg, headerImg,
register, register,
getUseLockPage,
}; };
}, },
}); });

9
src/layouts/default/header/index.vue

@ -112,15 +112,11 @@
getMenuWidth, getMenuWidth,
getIsMixSidebar, getIsMixSidebar,
} = useMenuSetting(); } = useMenuSetting();
const { const { getUseErrorHandle, getShowSettingButton, getSettingButtonPosition } =
getUseErrorHandle, useRootSetting();
getShowSettingButton,
getSettingButtonPosition,
} = useRootSetting();
const { const {
getHeaderTheme, getHeaderTheme,
getUseLockPage,
getShowFullScreen, getShowFullScreen,
getShowNotice, getShowNotice,
getShowContent, getShowContent,
@ -189,7 +185,6 @@
getShowLocalePicker, getShowLocalePicker,
getShowFullScreen, getShowFullScreen,
getShowNotice, getShowNotice,
getUseLockPage,
getUseErrorHandle, getUseErrorHandle,
getLogoWidth, getLogoWidth,
getIsMixSidebar, getIsMixSidebar,

Loading…
Cancel
Save