Skip to content

Commit 44ea21e

Browse files
committed
refactor: 修改sitebar配置,以支持兼容使用element-plus-icon
1 parent 26014d2 commit 44ea21e

File tree

10 files changed

+166
-79
lines changed

10 files changed

+166
-79
lines changed

package-lock.json

+121-70
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

+4-2
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,12 @@
1414
},
1515
"dependencies": {
1616
"@babel/polyfill": "^7.4.4",
17+
"@element-plus/icons-vue": "^2.1.0",
1718
"@tinymce/tinymce-vue": "^4.0.0",
1819
"axios": "^0.24.0",
1920
"core-js": "^3.23.5",
2021
"dayjs": "^1.10.4",
21-
"element-plus": "^2.1.4",
22+
"element-plus": "^2.3.8",
2223
"event-source-polyfill": "^1.0.7",
2324
"fastscan": "^1.0.4",
2425
"good-storage": "^1.1.0",
@@ -33,7 +34,8 @@
3334
"vue-picture-cropper": "^0.1.9",
3435
"vue-router": "^4.0.10",
3536
"vuex": "^4.0.2",
36-
"vuex-persist": "^2.0.1"
37+
"vuex-persist": "^2.0.1",
38+
"yarn": "^1.22.19"
3739
},
3840
"devDependencies": {
3941
"@babel/core": "^7.11.4",

src/app.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
<script>
1010
import { ElConfigProvider } from 'element-plus'
11-
import zhCn from 'element-plus/lib/locale/lang/zh-cn'
11+
import zhCn from 'element-plus/dist/locale/zh-cn.mjs'
1212
1313
export default {
1414
components: {

src/component/layout/sidebar/menu-tree.vue

+14-4
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,26 @@
22
<!--el-submenu改名为el-sub-menu-->
33
<el-sub-menu v-if="item.children?.length > 0" :index="item.path" popper-append-to-body>
44
<template #title>
5-
<i v-if="!filterIcon(item.icon)" :class="item.icon"></i>
6-
<img v-else :src="item.icon" class="img-icon" />
5+
<el-icon v-if="item.isElementIcon" size="16">
6+
<component :is="item.icon"></component>
7+
</el-icon>
8+
<div v-else>
9+
<i v-if="!filterIcon(item.icon)" :class="item.icon"></i>
10+
<img v-else :src="item.icon" alt="icon" class="img-icon" />
11+
</div>
712
<span>{{ item.title }}</span>
813
</template>
914
<menu-tree v-for="child in item.children" :key="child.path" :item="child" />
1015
</el-sub-menu>
1116

1217
<el-menu-item v-else :index="item.path" @click="navigateTo(item.path)">
13-
<i v-if="!filterIcon(item.icon)" :class="item.icon"></i>
14-
<img v-else :src="item.icon" class="img-icon" />
18+
<el-icon v-if="item.isElementIcon" size="16">
19+
<component :is="item.icon"></component>
20+
</el-icon>
21+
<div v-else>
22+
<i v-if="!filterIcon(item.icon)" :class="item.icon"></i>
23+
<img v-else :src="item.icon" alt="icon" class="img-icon" />
24+
</div>
1525
<template #title
1626
><span class="title">{{ item.title }}</span></template
1727
>

0 commit comments

Comments
 (0)