Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
P
pro-layout
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
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
packages
pro-layout
Commits
30d1ccba
Commit
30d1ccba
authored
Jul 31, 2020
by
Sendya
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: menuRender
parent
6e461390
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
3 deletions
+13
-3
BasicLayout.jsx
src/BasicLayout.jsx
+3
-1
SiderMenu.jsx
src/components/SiderMenu/SiderMenu.jsx
+10
-2
No files found.
src/BasicLayout.jsx
View file @
30d1ccba
...
...
@@ -93,6 +93,7 @@ const BasicLayout = {
const
menuHeaderRender
=
getComponentFromProp
(
content
,
'menuHeaderRender'
)
const
breadcrumbRender
=
getComponentFromProp
(
content
,
'breadcrumbRender'
)
const
headerContentRender
=
getComponentFromProp
(
content
,
'headerContentRender'
)
const
menuRender
=
getComponentFromProp
(
content
,
'menuRender'
)
const
isTopMenu
=
layout
===
'topmenu'
const
hasSiderMenu
=
!
isTopMenu
...
...
@@ -107,7 +108,8 @@ const BasicLayout = {
rightContentRender
,
collapsedButtonRender
,
breadcrumbRender
,
headerContentRender
headerContentRender
,
menuRender
}
return
(
...
...
src/components/SiderMenu/SiderMenu.jsx
View file @
30d1ccba
...
...
@@ -24,6 +24,7 @@ export const SiderMenuProps = {
title
:
PropTypes
.
string
.
def
(
''
),
// render function or vnode
menuHeaderRender
:
PropTypes
.
oneOfType
([
PropTypes
.
func
,
PropTypes
.
array
,
PropTypes
.
object
,
PropTypes
.
bool
]),
menuRender
:
PropTypes
.
oneOfType
([
PropTypes
.
func
,
PropTypes
.
array
,
PropTypes
.
object
,
PropTypes
.
bool
]),
}
export
const
defaultRenderLogo
=
(
h
,
logo
)
=>
{
...
...
@@ -83,7 +84,8 @@ const SiderMenu = {
handleCollapse
,
onMenuHeaderClick
=
()
=>
null
,
i18nRender
,
menuHeaderRender
menuHeaderRender
,
menuRender
}
=
this
const
siderCls
=
[
'ant-pro-sider-menu-sider'
]
if
(
fixSiderbar
)
siderCls
.
push
(
'fix-sider-bar'
)
...
...
@@ -118,7 +120,13 @@ const SiderMenu = {
</
router
-
link
>
</
div
>
)
}
<
BaseMenu
collapsed=
{
collapsed
}
menus=
{
menus
}
mode=
{
mode
}
theme=
{
theme
}
i18nRender=
{
i18nRender
}
/>
{
menuRender
&&
(
isFun
(
menuRender
)
&&
menuRender
(
h
,
this
.
$props
)
||
menuRender
)
||
(
<
BaseMenu
collapsed=
{
collapsed
}
menus=
{
menus
}
mode=
{
mode
}
theme=
{
theme
}
i18nRender=
{
i18nRender
}
/>
)
}
</
Sider
>)
}
}
...
...
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