Merge branch 'master' of https://gitee.com/yuanzbz/vue-admin-perfect into vue-i18n

# Conflicts:
#	yarn.lock
This commit is contained in:
yuanzbz 2023-10-14 20:18:13 +08:00
commit bcecbd5052
2 changed files with 1 additions and 1 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 140 KiB

After

Width:  |  Height:  |  Size: 146 KiB

View File

@ -10,7 +10,7 @@
</el-menu-item> </el-menu-item>
</app-link> </app-link>
</template> </template>
<el-sub-menu :index="item.path" v-else popper-append-to-body> <el-sub-menu :index="item.path" v-else teleported >
<template #title> <template #title>
<el-icon :size="20"> <component :is="item.meta?.icon"></component></el-icon> <el-icon :size="20"> <component :is="item.meta?.icon"></component></el-icon>
<span>{{ item.meta && item.meta.title }}</span> <span>{{ item.meta && item.meta.title }}</span>