diff --git a/src/icons/index.js b/src/icons/index.js index 2d689240573229098a59c8209d9938c1375fca27..c1c2e792359faf0229e829e70c0698a98bf83ebd 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 a3458b2eadd85c9f2407d4b38cf91241cb04dba5..0000000000000000000000000000000000000000 --- 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 e2dc8e18ee1bd59c630c445bbff4f589a6b698e2..89037e1318afd5a9db211bbd9873f29b3da2506f 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 0000000000000000000000000000000000000000..83a339550e2dd74fb33942e00f520079cf274088 --- /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