From fcea577333ae91b970c694b1426f0397c2a235ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E6=9D=A8?= <1711467488@qq.com>
Date: Thu, 22 Feb 2018 17:47:43 +0800
Subject: [PATCH] no message
Former-commit-id: 6e2da30069374313cdd36aa5ecce2c2a1a40337c
Former-commit-id: bea805f47f96d0adc46f3472120f37ec6f70ab75
Former-commit-id: b344d3e4105a6abf991dda43e5e2e1ae4a6a8f14
---
src/assets/icons/index.js | 6 ++--
.../icons/svg/MacBookPro.svg.REMOVED.git-id | 1 +
src/assets/icons/svg/alarm.svg | 1 -
src/assets/icons/svg/chart-col.svg | 1 -
src/assets/icons/svg/iPhone-x.svg | 1 -
src/assets/icons/svg/iPhoneX.svg | 1 +
.../icons/svg/macbook-pro.svg.REMOVED.git-id | 1 -
src/assets/icons/svg/pic.svg | 1 -
src/assets/icons/svg/ppt.svg | 1 +
src/assets/icons/svg/信息.svg | 1 +
src/assets/icons/svg/报告.svg | 1 +
src/assets/icons/svg/文档.svg | 1 +
src/assets/icons/svg/柱状图.svg | 1 +
src/assets/icons/svg/照片.svg | 1 +
src/assets/icons/svg/电脑.svg | 1 +
.../icons/svg/笔记本.svg.REMOVED.git-id | 1 +
src/assets/icons/svg/网页.svg | 1 +
src/assets/icons/svg/荣誉.svg | 1 +
src/assets/icons/svg/表格.svg | 1 +
.../icons/svg/计算器.svg.REMOVED.git-id | 1 +
src/assets/icons/svg/邮件.svg | 1 +
src/assets/icons/svg/键盘.svg.REMOVED.git-id | 1 +
src/assets/icons/svg/闹钟.svg | 1 +
src/assets/icons/svg/饼状图.svg | 1 +
src/pages/demo/components/icon/svg.vue | 30 ++++++++++++++++++-
25 files changed, 49 insertions(+), 10 deletions(-)
create mode 100644 src/assets/icons/svg/MacBookPro.svg.REMOVED.git-id
delete mode 100644 src/assets/icons/svg/alarm.svg
delete mode 100644 src/assets/icons/svg/chart-col.svg
delete mode 100644 src/assets/icons/svg/iPhone-x.svg
create mode 100644 src/assets/icons/svg/iPhoneX.svg
delete mode 100644 src/assets/icons/svg/macbook-pro.svg.REMOVED.git-id
delete mode 100644 src/assets/icons/svg/pic.svg
create mode 100644 src/assets/icons/svg/ppt.svg
create mode 100644 src/assets/icons/svg/信息.svg
create mode 100644 src/assets/icons/svg/报告.svg
create mode 100644 src/assets/icons/svg/文档.svg
create mode 100644 src/assets/icons/svg/柱状图.svg
create mode 100644 src/assets/icons/svg/照片.svg
create mode 100644 src/assets/icons/svg/电脑.svg
create mode 100644 src/assets/icons/svg/笔记本.svg.REMOVED.git-id
create mode 100644 src/assets/icons/svg/网页.svg
create mode 100644 src/assets/icons/svg/荣誉.svg
create mode 100644 src/assets/icons/svg/表格.svg
create mode 100644 src/assets/icons/svg/计算器.svg.REMOVED.git-id
create mode 100644 src/assets/icons/svg/邮件.svg
create mode 100644 src/assets/icons/svg/键盘.svg.REMOVED.git-id
create mode 100644 src/assets/icons/svg/闹钟.svg
create mode 100644 src/assets/icons/svg/饼状图.svg
diff --git a/src/assets/icons/index.js b/src/assets/icons/index.js
index b88f0972..34a43be4 100644
--- a/src/assets/icons/index.js
+++ b/src/assets/icons/index.js
@@ -1,9 +1,7 @@
-import alarm from './svg/alarm.svg'
-
-console.log(alarm)
+import Vue from 'vue'
const requireAll = requireContext => requireContext.keys().map(requireContext)
const req = require.context('./svg', false, /\.svg$/)
const iconMap = requireAll(req)
-console.log(iconMap.map(e => e.default.id))
+Vue.prototype.$IconSvg = iconMap.map(e => e.default.id.slice(3))
diff --git a/src/assets/icons/svg/MacBookPro.svg.REMOVED.git-id b/src/assets/icons/svg/MacBookPro.svg.REMOVED.git-id
new file mode 100644
index 00000000..c4ed3a0f
--- /dev/null
+++ b/src/assets/icons/svg/MacBookPro.svg.REMOVED.git-id
@@ -0,0 +1 @@
+d39f424095b5c77f858d772876303d2d5c1ddc83
\ No newline at end of file
diff --git a/src/assets/icons/svg/alarm.svg b/src/assets/icons/svg/alarm.svg
deleted file mode 100644
index 928608e7..00000000
--- a/src/assets/icons/svg/alarm.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/src/assets/icons/svg/chart-col.svg b/src/assets/icons/svg/chart-col.svg
deleted file mode 100644
index 436a6a32..00000000
--- a/src/assets/icons/svg/chart-col.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/src/assets/icons/svg/iPhone-x.svg b/src/assets/icons/svg/iPhone-x.svg
deleted file mode 100644
index f27ac104..00000000
--- a/src/assets/icons/svg/iPhone-x.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/src/assets/icons/svg/iPhoneX.svg b/src/assets/icons/svg/iPhoneX.svg
new file mode 100644
index 00000000..e72a759a
--- /dev/null
+++ b/src/assets/icons/svg/iPhoneX.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/assets/icons/svg/macbook-pro.svg.REMOVED.git-id b/src/assets/icons/svg/macbook-pro.svg.REMOVED.git-id
deleted file mode 100644
index dbc22ea6..00000000
--- a/src/assets/icons/svg/macbook-pro.svg.REMOVED.git-id
+++ /dev/null
@@ -1 +0,0 @@
-1962b720afe2ca44a866a26506b4dbd07f09b74f
\ No newline at end of file
diff --git a/src/assets/icons/svg/pic.svg b/src/assets/icons/svg/pic.svg
deleted file mode 100644
index 928aec25..00000000
--- a/src/assets/icons/svg/pic.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/src/assets/icons/svg/ppt.svg b/src/assets/icons/svg/ppt.svg
new file mode 100644
index 00000000..2fc7f8ba
--- /dev/null
+++ b/src/assets/icons/svg/ppt.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/assets/icons/svg/信息.svg b/src/assets/icons/svg/信息.svg
new file mode 100644
index 00000000..dcddfa1d
--- /dev/null
+++ b/src/assets/icons/svg/信息.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/assets/icons/svg/报告.svg b/src/assets/icons/svg/报告.svg
new file mode 100644
index 00000000..c78b902d
--- /dev/null
+++ b/src/assets/icons/svg/报告.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/assets/icons/svg/文档.svg b/src/assets/icons/svg/文档.svg
new file mode 100644
index 00000000..31569d18
--- /dev/null
+++ b/src/assets/icons/svg/文档.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/assets/icons/svg/柱状图.svg b/src/assets/icons/svg/柱状图.svg
new file mode 100644
index 00000000..e8cbf1d2
--- /dev/null
+++ b/src/assets/icons/svg/柱状图.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/assets/icons/svg/照片.svg b/src/assets/icons/svg/照片.svg
new file mode 100644
index 00000000..2b41f0dc
--- /dev/null
+++ b/src/assets/icons/svg/照片.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/assets/icons/svg/电脑.svg b/src/assets/icons/svg/电脑.svg
new file mode 100644
index 00000000..da20aa0a
--- /dev/null
+++ b/src/assets/icons/svg/电脑.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/assets/icons/svg/笔记本.svg.REMOVED.git-id b/src/assets/icons/svg/笔记本.svg.REMOVED.git-id
new file mode 100644
index 00000000..f34cbfa2
--- /dev/null
+++ b/src/assets/icons/svg/笔记本.svg.REMOVED.git-id
@@ -0,0 +1 @@
+94e6bb9942f2afd39cb1c6568daa614af2a13ae8
\ No newline at end of file
diff --git a/src/assets/icons/svg/网页.svg b/src/assets/icons/svg/网页.svg
new file mode 100644
index 00000000..909718b9
--- /dev/null
+++ b/src/assets/icons/svg/网页.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/assets/icons/svg/荣誉.svg b/src/assets/icons/svg/荣誉.svg
new file mode 100644
index 00000000..ddf27d76
--- /dev/null
+++ b/src/assets/icons/svg/荣誉.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/assets/icons/svg/表格.svg b/src/assets/icons/svg/表格.svg
new file mode 100644
index 00000000..262971c4
--- /dev/null
+++ b/src/assets/icons/svg/表格.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/assets/icons/svg/计算器.svg.REMOVED.git-id b/src/assets/icons/svg/计算器.svg.REMOVED.git-id
new file mode 100644
index 00000000..ec246564
--- /dev/null
+++ b/src/assets/icons/svg/计算器.svg.REMOVED.git-id
@@ -0,0 +1 @@
+e39ef32aa81454dd224ff2f42e96b60589cfcbd7
\ No newline at end of file
diff --git a/src/assets/icons/svg/邮件.svg b/src/assets/icons/svg/邮件.svg
new file mode 100644
index 00000000..7ec8d129
--- /dev/null
+++ b/src/assets/icons/svg/邮件.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/assets/icons/svg/键盘.svg.REMOVED.git-id b/src/assets/icons/svg/键盘.svg.REMOVED.git-id
new file mode 100644
index 00000000..168dd1ad
--- /dev/null
+++ b/src/assets/icons/svg/键盘.svg.REMOVED.git-id
@@ -0,0 +1 @@
+99ab5c446a609194a7df7c33817b6b12ca39ea02
\ No newline at end of file
diff --git a/src/assets/icons/svg/闹钟.svg b/src/assets/icons/svg/闹钟.svg
new file mode 100644
index 00000000..83d678ed
--- /dev/null
+++ b/src/assets/icons/svg/闹钟.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/assets/icons/svg/饼状图.svg b/src/assets/icons/svg/饼状图.svg
new file mode 100644
index 00000000..23a17223
--- /dev/null
+++ b/src/assets/icons/svg/饼状图.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/pages/demo/components/icon/svg.vue b/src/pages/demo/components/icon/svg.vue
index cfdf040a..98d0b92f 100644
--- a/src/pages/demo/components/icon/svg.vue
+++ b/src/pages/demo/components/icon/svg.vue
@@ -1,5 +1,33 @@
-
+
+
+
+
+
+
+ {{icon}}
+
+
+
+
+