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
1ef49e54
Commit
1ef49e54
authored
Dec 12, 2020
by
vben
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix(menu): fix menu split mode problem
parent
6b3195b4
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
7 additions
and
8 deletions
+7
-8
CHANGELOG.zh_CN.md
CHANGELOG.zh_CN.md
+1
-0
BasicMenu.tsx
src/components/Menu/src/BasicMenu.tsx
+3
-4
LayoutMultipleHeader.tsx
src/layouts/default/header/LayoutMultipleHeader.tsx
+2
-3
dashboard.ts
src/router/routes/modules/dashboard.ts
+1
-1
No files found.
CHANGELOG.zh_CN.md
View file @
1ef49e54
...
...
@@ -21,6 +21,7 @@
-
修改
`VirtualScroll`
和
`ImportExcel`
组件名为
`VScroll`
与
`ImpExcel`
,暂时解决含有关键字的组件在 vue 模版内使用内存溢出
-
修复 axios 大小写问题
-
修复按钮样式问题
-
修复菜单分割模式问题
## 2.0.0-rc.13 (2020-12-10)
...
...
src/components/Menu/src/BasicMenu.tsx
View file @
1ef49e54
...
...
@@ -100,11 +100,10 @@ export default defineComponent({
const
getWrapperStyle
=
computed
(
():
CSSProperties
=>
{
const
isHorizontal
=
unref
(
getIsHorizontal
);
const
isHorizontal
=
unref
(
getIsHorizontal
)
||
getSplit
.
value
;
return
{
height
:
isHorizontal
?
`calc(100% + 1px)`
:
`calc(100% -
${
props
.
showLogo
?
'
48px
'
:
'
0px
'
}
)`
,
height
:
isHorizontal
?
`calc(100%)`
:
`calc(100% -
${
props
.
showLogo
?
'
48px
'
:
'
0px
'
}
)`
,
overflowY
:
isHorizontal
?
'
hidden
'
:
'
auto
'
,
};
}
...
...
src/layouts/default/header/LayoutMultipleHeader.tsx
View file @
1ef49e54
...
...
@@ -21,7 +21,7 @@ export default defineComponent({
const
injectValue
=
useLayoutContext
();
const
{
getCalcContentWidth
,
getSplit
}
=
useMenuSetting
();
const
{
getCalcContentWidth
}
=
useMenuSetting
();
const
{
getFixed
,
...
...
@@ -56,8 +56,7 @@ export default defineComponent({
():
CSSProperties
=>
{
const
style
:
CSSProperties
=
{};
if
(
unref
(
getFixed
))
{
style
.
width
=
unref
(
injectValue
.
isMobile
)
||
unref
(
getSplit
)
?
'
100%
'
:
unref
(
getCalcContentWidth
);
style
.
width
=
unref
(
injectValue
.
isMobile
)
?
'
100%
'
:
unref
(
getCalcContentWidth
);
}
if
(
unref
(
getShowFullHeaderRef
))
{
style
.
top
=
`
${
unref
(
fullHeaderHeightRef
)}
px`
;
...
...
src/router/routes/modules/dashboard.ts
View file @
1ef49e54
...
...
@@ -7,7 +7,7 @@ const dashboard: AppRouteModule = {
path
:
'
/dashboard
'
,
name
:
'
Dashboard
'
,
component
:
LAYOUT
,
redirect
:
'
/dashboard/w
elcome
'
,
redirect
:
'
/dashboard/w
orkbench
'
,
meta
:
{
icon
:
'
bx:bx-home
'
,
title
:
t
(
'
routes.dashboard.dashboard
'
),
...
...
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