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
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/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
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 @@
-
+
+
+
+
+
{{menu.title || '未命名菜单'}}
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 @@
-
+
+
+
+
+
{{menu.title}}
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' }
+ ]
}
]
},