Skip to content

feat[Menu]: menu icon support el-icon #3048

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jun 11, 2020
Merged

feat[Menu]: menu icon support el-icon #3048

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
69bd4da
:sparkles: 菜单上支持使用 el-icon 了
Cat7373 Mar 10, 2020
1943758
Merge branch 'master' into pr/3048
PanJiaChen Jun 11, 2020
cd1229b
refacor: change
PanJiaChen Jun 11, 2020
19d2f8e
perf: refine style
PanJiaChen Jun 11, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 13 additions & 1 deletion src/layout/components/Sidebar/Item.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,11 @@ export default {
const vnodes = []

if (icon) {
vnodes.push(<svg-icon icon-class={icon}/>)
if (icon.includes('el-icon')) {
vnodes.push(<i class={[icon, 'sub-el-icon']} />)
} else {
vnodes.push(<svg-icon icon-class={icon}/>)
}
}

if (title) {
Expand All @@ -27,3 +31,11 @@ export default {
}
}
</script>

<style scoped>
.sub-el-icon {
color: currentColor;
width: 1em;
height: 1em;
}
</style>
6 changes: 3 additions & 3 deletions src/router/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import nestedRouter from './modules/nested'
* meta : {
roles: ['admin','editor'] control the page roles (you can set multiple roles)
title: 'title' the name show in sidebar and breadcrumb (recommend set)
icon: 'svg-name' the icon show in the sidebar
icon: 'svg-name'/'el-icon-x' the icon show in the sidebar
noCache: true if set true, the page will no be cached(default is false)
affix: true if set true, the tag will affix in the tags-view
breadcrumb: false if set false, the item will hidden in breadcrumb(default is true)
Expand Down Expand Up @@ -197,14 +197,14 @@ export const asyncRoutes = [
name: 'Example',
meta: {
title: 'Example',
icon: 'example'
icon: 'el-icon-s-help'
},
children: [
{
path: 'create',
component: () => import('@/views/example/create'),
name: 'CreateArticle',
meta: { title: 'Create Article', icon: 'edit' }
meta: { title: 'Create Article', icon: 'el-icon-s-help' }
},
{
path: 'edit/:id(\\d+)',
Expand Down
17 changes: 17 additions & 0 deletions src/styles/sidebar.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,11 @@
margin-right: 16px;
}

.sub-el-icon {
margin-right: 12px;
margin-left: -2px;
}

.el-menu {
border: none;
height: 100%;
Expand Down Expand Up @@ -105,6 +110,10 @@
.svg-icon {
margin-left: 20px;
}

.sub-el-icon {
margin-left: 19px;
}
}
}

Expand All @@ -118,6 +127,10 @@
margin-left: 20px;
}

.sub-el-icon {
margin-left: 19px;
}

.el-submenu__icon-arrow {
display: none;
}
Expand Down Expand Up @@ -178,6 +191,10 @@
.svg-icon {
margin-right: 16px;
}
.sub-el-icon {
margin-right: 12px;
margin-left: -2px;
}
}

.nest-menu .el-submenu>.el-submenu__title,
Expand Down