From fa54b927f7cce4a6d2aa21746e3b78d7c9bfc28a Mon Sep 17 00:00:00 2001
From: Pan <panfree23@gmail.com>
Date: Wed, 5 Sep 2018 15:22:16 +0800
Subject: [PATCH] tweak require icons

---
 src/icons/index.js                       |  7 ++-----
 src/views/svg-icons/generateIconsView.js | 10 ----------
 src/views/svg-icons/index.vue            | 10 ++--------
 src/views/svg-icons/requireIcons.js      | 11 +++++++++++
 4 files changed, 15 insertions(+), 23 deletions(-)
 delete mode 100644 src/views/svg-icons/generateIconsView.js
 create mode 100644 src/views/svg-icons/requireIcons.js

diff --git a/src/icons/index.js b/src/icons/index.js
index 2d689240..c1c2e792 100644
--- a/src/icons/index.js
+++ b/src/icons/index.js
@@ -1,12 +1,9 @@
 import Vue from 'vue'
 import SvgIcon from '@/components/SvgIcon'// svg组件
-import generateIconsView from '@/views/svg-icons/generateIconsView.js'// just for @/views/icons , you can delete it
 
 // register globally
 Vue.component('svg-icon', SvgIcon)
 
-const requireAll = requireContext => requireContext.keys().map(requireContext)
 const req = require.context('./svg', false, /\.svg$/)
-const iconMap = requireAll(req)
-
-generateIconsView.generate(iconMap) // just for @/views/icons , you can delete it
+const requireAll = requireContext => requireContext.keys().map(requireContext)
+requireAll(req)
diff --git a/src/views/svg-icons/generateIconsView.js b/src/views/svg-icons/generateIconsView.js
deleted file mode 100644
index a3458b2e..00000000
--- a/src/views/svg-icons/generateIconsView.js
+++ /dev/null
@@ -1,10 +0,0 @@
-const data = {
-  state: {
-    iconsMap: []
-  },
-  generate(iconsMap) {
-    this.state.iconsMap = iconsMap
-  }
-}
-
-export default data
diff --git a/src/views/svg-icons/index.vue b/src/views/svg-icons/index.vue
index e2dc8e18..89037e13 100644
--- a/src/views/svg-icons/index.vue
+++ b/src/views/svg-icons/index.vue
@@ -21,22 +21,16 @@
 </template>
 
 <script>
-import icons from './generateIconsView'
+import icons from './requireIcons'
 import clipboard from '@/utils/clipboard'
 
 export default {
   name: 'Icons',
   data() {
     return {
-      iconsMap: []
+      iconsMap: icons
     }
   },
-  mounted() {
-    const iconsMap = icons.state.iconsMap.map((i) => {
-      return i.default.id.split('-')[1]
-    })
-    this.iconsMap = iconsMap
-  },
   methods: {
     generateIconCode(symbol) {
       return `<svg-icon icon-class="${symbol}" />`
diff --git a/src/views/svg-icons/requireIcons.js b/src/views/svg-icons/requireIcons.js
new file mode 100644
index 00000000..83a33955
--- /dev/null
+++ b/src/views/svg-icons/requireIcons.js
@@ -0,0 +1,11 @@
+
+const req = require.context('../../icons/svg', false, /\.svg$/)
+const requireAll = requireContext => requireContext.keys()
+
+const re = /\.\/(.*)\.svg/
+
+const icons = requireAll(req).map(i => {
+  return i.match(re)[1]
+})
+
+export default icons