canrd-outside / order-erp-front · Commits

Commit 3bb6d11ed1b33adbfd6c76a0e06442cd62356ab7

Authored by Vben
1 parent d7d60398

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

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