Merge branch 'feature/菜单图标增加svg支持' into develop

Former-commit-id: 8950fc28d8e89b97b99491d8a21c99816b3ed0e0 [formerly 8950fc28d8e89b97b99491d8a21c99816b3ed0e0 [formerly 8950fc28d8e89b97b99491d8a21c99816b3ed0e0 [formerly 8950fc28d8e89b97b99491d8a21c99816b3ed0e0 [formerly c54b7d4f97b4875aa96acb1e6a13f34828267a4e [formerly 3a41d697006c4084178c73d96f6ca944922041d8]]]]]
Former-commit-id: 9a26037bc3c3b00d7e592859f56fe4959cf1b363
Former-commit-id: 6e81c8c7bfa6798be733637e8f433148ab7ab849
Former-commit-id: 05f48b7b17731944d6ff049067be03be2d056903 [formerly 9ebba098e3836608f2551cb63cd0b055191d4522]
Former-commit-id: 94033eee67685682225fa41cb7596886f4244538
Former-commit-id: c9dad57bfe34b8e7d90ff338e204d6277c8906a3
Former-commit-id: 75159715247cb084e2c938907a968c892dfe7604
Former-commit-id: 09bb7384021149a35002f2892b5e8946a0f1ecec
Former-commit-id: cb5233fbbd4f5aec7dd2d6bbd38ed23d6cca6fa2

docs/zh/change-log/README.md

@@ -16,6 +16,7 @@ sidebar: auto
 * [ 修改 ] bug 修复
 * [ 新增 ] 页面过渡动画设置加入全局状态管理并支持用户私有持久化
 * [ 新增 ] $logAdd 和 $log 快速记录日志和打印日志，并提供演示页面
+* [ 新增 ] 顶栏和侧边栏菜单支持 svg 图标
 
 ## v1.1.11
 

docs/zh/sys-vuex/README.md.REMOVED.git-id

@@ -1 +1 @@
-61429e35e64304689a24f88ca46e588631985168
+33948f39bdcc1391fd42429bd95b3b98c167fb23

src/assets/style/theme/theme.scss.REMOVED.git-id

@@ -1 +1 @@
-d08a658f8695d60d5eab3a4e0afa4e9e5f728c38
+87fff7214e7b64123842f1f52b649a8af614eb46

src/layout/header-aside/components/components/menu-item/index.vue

@@ -1,6 +1,10 @@
 <template>
   <el-menu-item :index="menu.path || uniqueId">
-    <i :class="`fa fa-${menu.icon || 'file-o'}`"></i>
+    <i v-if="menu.icon" :class="`fa fa-${menu.icon}`"></i>
+    <i v-else-if="menu.iconSvg">
+      <d2-icon-svg :name="menu.iconSvg"/>
+    </i>
+    <i v-else class="fa fa-file-o"></i>
     <span slot="title">{{menu.title || '未命名菜单'}}</span>
   </el-menu-item>
 </template>

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

@@ -1,7 +1,11 @@
 <template>
   <el-submenu :index="menu.path || uniqueId">
     <template slot="title">
-      <i :class="`fa fa-${menu.icon || 'folder-o'}`"></i>
+      <i v-if="menu.icon" :class="`fa fa-${menu.icon}`"></i>
+      <i v-else-if="menu.iconSvg">
+        <d2-icon-svg :name="menu.iconSvg"/>
+      </i>
+      <i v-else class="fa fa-folder-o"></i>
       <span slot="title">{{menu.title}}</span>
     </template>
     <template v-for="(child, childIndex) in menu.children">

src/menu/index.js

@@ -62,6 +62,24 @@ export const menuHeader = [
           { title: '正在开发 2' },
           { title: '正在开发 3' }
         ]
+      },
+      {
+        title: 'svg 菜单图标',
+        iconSvg: 'd2admin',
+        children: [
+          { title: 'add', iconSvg: 'add' },
+          { title: 'alarm', iconSvg: 'alarm' },
+          { title: 'camera', iconSvg: 'camera' },
+          { title: 'history', iconSvg: 'history' },
+          { title: 'like', iconSvg: 'like' },
+          { title: 'love', iconSvg: 'love' },
+          { title: 'message', iconSvg: 'message' },
+          { title: 'notice', iconSvg: 'notice' },
+          { title: 'search', iconSvg: 'search' },
+          { title: 'share', iconSvg: 'share' },
+          { title: 'star', iconSvg: 'star' },
+          { title: 'user', iconSvg: 'user' }
+        ]
       }
     ]
   },