Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
N
najiu-admin-template
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
najiu-frontend
najiu-admin-template
Commits
3bb6d11e
Commit
3bb6d11e
authored
May 18, 2021
by
Vben
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix(layout): fix useLockPage not work, fix #611
parent
d7d60398
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
8 deletions
+5
-8
index.vue
...layouts/default/header/components/user-dropdown/index.vue
+3
-1
index.vue
src/layouts/default/header/index.vue
+2
-7
No files found.
src/layouts/default/header/components/user-dropdown/index.vue
View file @
3bb6d11e
...
@@ -19,6 +19,7 @@
...
@@ -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 @@
...
@@ -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 @@
...
@@ -116,6 +117,7 @@
getShowDoc
,
getShowDoc
,
headerImg
,
headerImg
,
register
,
register
,
getUseLockPage
,
};
};
},
},
});
});
...
...
src/layouts/default/header/index.vue
View file @
3bb6d11e
...
@@ -112,15 +112,11 @@
...
@@ -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 @@
...
@@ -189,7 +185,6 @@
getShowLocalePicker
,
getShowLocalePicker
,
getShowFullScreen
,
getShowFullScreen
,
getShowNotice
,
getShowNotice
,
getUseLockPage
,
getUseErrorHandle
,
getUseErrorHandle
,
getLogoWidth
,
getLogoWidth
,
getIsMixSidebar
,
getIsMixSidebar
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment