lisang
/
d2-admin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into develop 

Former-commit-id: 0511d0c528488baa93d1f0751ecbd2e0268adcd3 [formerly eecc1a2bd2664f9f12a9a99d748ef72f388ab1fe] [formerly 0511d0c528488baa93d1f0751ecbd2e0268adcd3 [formerly eecc1a2bd2664f9f12a9a99d748ef72f388ab1fe] [formerly 0511d0c528488baa93d1f0751ecbd2e0268adcd3 [formerly eecc1a2bd2664f9f12a9a99d748ef72f388ab1fe] [formerly eecc1a2bd2664f9f12a9a99d748ef72f388ab1fe [formerly 12e9d737fd679b424990bd934ce8f2da3290d66e [formerly 5ec1b6d2013ba9d29b87093a1b577616f962365e]]]]]
Former-commit-id: c2d4e2349d7e38a5f30104d8197504263ccb0890
Former-commit-id: 4de92ea16c5af3634b086bc65157838d020b0416
Former-commit-id: 08b526ecae91ffee0d1c274d6c83a19900a7e443 [formerly e9dc7bfd6c04dac8c3f6efc3e38af59f4c7050d7]
Former-commit-id: 93d9d38ceb2c57510b8b4c9ecb6b5131f33f7a7d
Former-commit-id: 83799c03e05ea3ccc45c3e7b1c2644f67e772af0
Former-commit-id: 0a61203ad2e2f062b20b59cdd1747ec120ad2d3e
Former-commit-id: 03fbd4290f7805d4fcbcb3c03dbc89b3b7fc983b
Former-commit-id: e854b45fe01b9c942997c0d4b7c35d849552e1b8
This commit is contained in:
liyang 2019-06-13 11:00:51 +08:00
parent 366696e21f 3cb5d1132b
commit b794c1462b
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/layout/header-aside/components/components/menu-sub/index.vue
View File

@ -4,7 +4,7 @@
<i v-if="menu.icon" :class="`fa fa-${menu.icon}`"></i>
<i v-if="menu.icon === undefined & !menu.iconSvg" class="fa fa-folder-o"></i>
<d2-icon-svg v-if="menu.iconSvg" :name="menu.iconSvg"/>
<span slot="title">{{menu.title}}</span>
<span>{{menu.title}}</span>
</template>
<template v-for="(child, childIndex) in menu.children">
<d2-layout-header-aside-menu-item v-if="child.children === undefined" :menu="child" :key="childIndex"/>