From 6a49189db5f3be2042352656fa789b980f48143e Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Wed, 22 Aug 2018 11:40:41 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E5=9B=BE=E6=A0=87?=
 =?UTF-8?q?=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Former-commit-id: 311e0ce11f674a4c965351588a2dca7064559cbd [formerly 311e0ce11f674a4c965351588a2dca7064559cbd [formerly 311e0ce11f674a4c965351588a2dca7064559cbd [formerly 311e0ce11f674a4c965351588a2dca7064559cbd [formerly d4869ce64d8c8b56e2fd9ec5310367fe42dbe8d4 [formerly e50fdbb459a90a790feeb0aaac3781cc852239a7]]]]]
Former-commit-id: 3ce88a78957ad0707be6f007b3c42dd4475c3d53
Former-commit-id: 4f51402f43676d80434d0fde86218a0caacedfca
Former-commit-id: 00a87dd29d7ef858a2c4a378aeb13a5f09c56a23 [formerly 66bba13e22cf084bfe490b9876f809c96754291a]
Former-commit-id: 9407c5d2a2f8b90c89929e097a3a3b7ca311c85b
Former-commit-id: 119b581be98072b93e13a5addc5ec93757031b83
Former-commit-id: 273b05ef6cefd95d6a8dca707053a7062d0dab05
Former-commit-id: 75a8452c3c04af7987cd4c5055ce84c7e629dda2
Former-commit-id: 700dd4adc148308ebebe8edc82fbb5799a4b90a2
---
 src/assets/svg-icons/icons/{添加.svg => add.svg}     | 0
 src/assets/svg-icons/icons/{闹钟.svg => alarm.svg}   | 0
 src/assets/svg-icons/icons/{相机.svg => camera.svg}  | 0
 src/assets/svg-icons/icons/{历史.svg => history.svg} | 0
 src/assets/svg-icons/icons/{点赞.svg => like.svg}    | 0
 src/assets/svg-icons/icons/{喜欢.svg => love.svg}    | 0
 src/assets/svg-icons/icons/{信息.svg => message.svg} | 0
 src/assets/svg-icons/icons/{提醒.svg => notice.svg}  | 0
 src/assets/svg-icons/icons/{搜索.svg => search.svg}  | 0
 src/assets/svg-icons/icons/{分享.svg => share.svg}   | 0
 src/assets/svg-icons/icons/{星标.svg => star.svg}    | 0
 src/assets/svg-icons/icons/{用户.svg => user.svg}    | 0
 12 files changed, 0 insertions(+), 0 deletions(-)
 rename src/assets/svg-icons/icons/{添加.svg => add.svg} (100%)
 rename src/assets/svg-icons/icons/{闹钟.svg => alarm.svg} (100%)
 rename src/assets/svg-icons/icons/{相机.svg => camera.svg} (100%)
 rename src/assets/svg-icons/icons/{历史.svg => history.svg} (100%)
 rename src/assets/svg-icons/icons/{点赞.svg => like.svg} (100%)
 rename src/assets/svg-icons/icons/{喜欢.svg => love.svg} (100%)
 rename src/assets/svg-icons/icons/{信息.svg => message.svg} (100%)
 rename src/assets/svg-icons/icons/{提醒.svg => notice.svg} (100%)
 rename src/assets/svg-icons/icons/{搜索.svg => search.svg} (100%)
 rename src/assets/svg-icons/icons/{分享.svg => share.svg} (100%)
 rename src/assets/svg-icons/icons/{星标.svg => star.svg} (100%)
 rename src/assets/svg-icons/icons/{用户.svg => user.svg} (100%)

diff --git a/src/assets/svg-icons/icons/添加.svg b/src/assets/svg-icons/icons/add.svg
similarity index 100%
rename from src/assets/svg-icons/icons/添加.svg
rename to src/assets/svg-icons/icons/add.svg
diff --git a/src/assets/svg-icons/icons/闹钟.svg b/src/assets/svg-icons/icons/alarm.svg
similarity index 100%
rename from src/assets/svg-icons/icons/闹钟.svg
rename to src/assets/svg-icons/icons/alarm.svg
diff --git a/src/assets/svg-icons/icons/相机.svg b/src/assets/svg-icons/icons/camera.svg
similarity index 100%
rename from src/assets/svg-icons/icons/相机.svg
rename to src/assets/svg-icons/icons/camera.svg
diff --git a/src/assets/svg-icons/icons/历史.svg b/src/assets/svg-icons/icons/history.svg
similarity index 100%
rename from src/assets/svg-icons/icons/历史.svg
rename to src/assets/svg-icons/icons/history.svg
diff --git a/src/assets/svg-icons/icons/点赞.svg b/src/assets/svg-icons/icons/like.svg
similarity index 100%
rename from src/assets/svg-icons/icons/点赞.svg
rename to src/assets/svg-icons/icons/like.svg
diff --git a/src/assets/svg-icons/icons/喜欢.svg b/src/assets/svg-icons/icons/love.svg
similarity index 100%
rename from src/assets/svg-icons/icons/喜欢.svg
rename to src/assets/svg-icons/icons/love.svg
diff --git a/src/assets/svg-icons/icons/信息.svg b/src/assets/svg-icons/icons/message.svg
similarity index 100%
rename from src/assets/svg-icons/icons/信息.svg
rename to src/assets/svg-icons/icons/message.svg
diff --git a/src/assets/svg-icons/icons/提醒.svg b/src/assets/svg-icons/icons/notice.svg
similarity index 100%
rename from src/assets/svg-icons/icons/提醒.svg
rename to src/assets/svg-icons/icons/notice.svg
diff --git a/src/assets/svg-icons/icons/搜索.svg b/src/assets/svg-icons/icons/search.svg
similarity index 100%
rename from src/assets/svg-icons/icons/搜索.svg
rename to src/assets/svg-icons/icons/search.svg
diff --git a/src/assets/svg-icons/icons/分享.svg b/src/assets/svg-icons/icons/share.svg
similarity index 100%
rename from src/assets/svg-icons/icons/分享.svg
rename to src/assets/svg-icons/icons/share.svg
diff --git a/src/assets/svg-icons/icons/星标.svg b/src/assets/svg-icons/icons/star.svg
similarity index 100%
rename from src/assets/svg-icons/icons/星标.svg
rename to src/assets/svg-icons/icons/star.svg
diff --git a/src/assets/svg-icons/icons/用户.svg b/src/assets/svg-icons/icons/user.svg
similarity index 100%
rename from src/assets/svg-icons/icons/用户.svg
rename to src/assets/svg-icons/icons/user.svg

From f382007a9c93dde8ce7a0e10de1c353572e05fe3 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Wed, 22 Aug 2018 14:03:33 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E8=8F=9C=E5=8D=95=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81=20svg=20=E5=9B=BE=E6=A0=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Former-commit-id: b3702e427c3b2d234cbdbb7f77464dfe208f20fb [formerly b3702e427c3b2d234cbdbb7f77464dfe208f20fb [formerly b3702e427c3b2d234cbdbb7f77464dfe208f20fb [formerly b3702e427c3b2d234cbdbb7f77464dfe208f20fb [formerly f9b19e9cdf0ec9d5c42aee32575adc01db8ab09e [formerly 4cf6aea5284279fdfb0502f5b0c7c5bb854827e6]]]]]
Former-commit-id: d0d179e1590a38e5d5d375e6c37377b3b631e100
Former-commit-id: 2f0d716b8d8b712e722caa106af55eecacd13789
Former-commit-id: 4e12f33311ea1c7d9fe1561206e6617c11911703 [formerly 875af1eb6cdbbe7023bb19d0badec4c0e3a7e9f5]
Former-commit-id: 496ddd4334d5496b8562cd94dd63b359852b9ffd
Former-commit-id: 469b1d7d4ab423d6308e6b7208d8c2cfc9872224
Former-commit-id: 2761c79dbaab3c873afcde8e093e0b9b32d54a68
Former-commit-id: 0986feb8b02ed0c87a370f8925f8c0d111620c81
Former-commit-id: 30d6e70ee15350b3745df49b58161f700822511b
---
 .../style/theme/theme.scss.REMOVED.git-id      |  2 +-
 .../components/components/menu-item/index.vue  |  6 +++++-
 .../components/components/menu-sub/index.vue   |  6 +++++-
 src/menu/index.js                              | 18 ++++++++++++++++++
 4 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/src/assets/style/theme/theme.scss.REMOVED.git-id b/src/assets/style/theme/theme.scss.REMOVED.git-id
index b420a2a5..8b5ae210 100644
--- a/src/assets/style/theme/theme.scss.REMOVED.git-id
+++ b/src/assets/style/theme/theme.scss.REMOVED.git-id
@@ -1 +1 @@
-d08a658f8695d60d5eab3a4e0afa4e9e5f728c38
\ No newline at end of file
+87fff7214e7b64123842f1f52b649a8af614eb46
\ No newline at end of file
diff --git a/src/layout/header-aside/components/components/menu-item/index.vue b/src/layout/header-aside/components/components/menu-item/index.vue
index 390e3028..f1608892 100644
--- a/src/layout/header-aside/components/components/menu-item/index.vue
+++ b/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>
diff --git a/src/layout/header-aside/components/components/menu-sub/index.vue b/src/layout/header-aside/components/components/menu-sub/index.vue
index af6dbe74..ca46841d 100644
--- a/src/layout/header-aside/components/components/menu-sub/index.vue
+++ b/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">
diff --git a/src/menu/index.js b/src/menu/index.js
index b8bb5e32..3a45ed1f 100644
--- a/src/menu/index.js
+++ b/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' }
+        ]
       }
     ]
   },

From 9b832e04c3d5981d16025cf545d436efca7b3c3d Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Wed, 22 Aug 2018 14:09:55 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=96=87=E6=A1=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Former-commit-id: 93233103cbfba5a5a4791cfb4613d8e1a04918d8 [formerly 93233103cbfba5a5a4791cfb4613d8e1a04918d8 [formerly 93233103cbfba5a5a4791cfb4613d8e1a04918d8 [formerly 93233103cbfba5a5a4791cfb4613d8e1a04918d8 [formerly e2d0edf6cbbae0b8c6df466e169fc07c2115f16f [formerly 1f111fb9bcaa130bea1e3307832fbeaf93d93d76]]]]]
Former-commit-id: 25f816ca7fed18c5c19cd865092ee4f4fda3689d
Former-commit-id: c082440f69beaf17b1f4a83a4e8c109c69e91241
Former-commit-id: 6b8ee78a4114a70c7c57a4e9227e41c947c8966e [formerly 2b3282b5cbb921c16177cc26a7b811e60f852cb2]
Former-commit-id: d4a97ed7346ccc5224bd764f388ddf83d1964d06
Former-commit-id: 7279232df2faaf0dd05545d71b7a9e9e35a3a9a7
Former-commit-id: 2ae588e94f3e98a40556a28ee0345fbda7558b9c
Former-commit-id: 3e3b6f53240cfc31380bf92dbbbb2648365dc79f
Former-commit-id: b9a36d5b5a890fd8395df17b9c1832554f1be6ed
---
 docs/zh/change-log/README.md              | 1 +
 docs/zh/sys-vuex/README.md.REMOVED.git-id | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/zh/change-log/README.md b/docs/zh/change-log/README.md
index 06303008..3294f1ae 100644
--- a/docs/zh/change-log/README.md
+++ b/docs/zh/change-log/README.md
@@ -16,6 +16,7 @@ sidebar: auto
 * [ 修改 ] bug 修复
 * [ 新增 ] 页面过渡动画设置加入全局状态管理并支持用户私有持久化
 * [ 新增 ] $logAdd 和 $log 快速记录日志和打印日志，并提供演示页面
+* [ 新增 ] 顶栏和侧边栏菜单支持 svg 图标
 
 ## v1.1.11
 
diff --git a/docs/zh/sys-vuex/README.md.REMOVED.git-id b/docs/zh/sys-vuex/README.md.REMOVED.git-id
index 1978343a..a901b125 100644
--- a/docs/zh/sys-vuex/README.md.REMOVED.git-id
+++ b/docs/zh/sys-vuex/README.md.REMOVED.git-id
@@ -1 +1 @@
-61429e35e64304689a24f88ca46e588631985168
\ No newline at end of file
+33948f39bdcc1391fd42429bd95b3b98c167fb23
\ No newline at end of file