From 73b59a7f6050d745833cc33081f877b46c923a4a 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 13:54:33 +0800 Subject: [PATCH] no message Former-commit-id: 5a22a82c51e48f3840c5259fcda64a817103838d Former-commit-id: 6f2c87cf9cab82f481e3672964fbd58fded178c7 Former-commit-id: 5e9d226a20a71c4203beb5874765e14332fedbe8 --- build/webpack.base.conf.js | 1 + package.json | 2 +- src/assets/icons/index.js | 4 ++++ src/components/core/IconSvg/index.vue | 2 +- src/pages/demo/components/icon/svg.vue | 2 +- 5 files changed, 8 insertions(+), 3 deletions(-) diff --git a/build/webpack.base.conf.js b/build/webpack.base.conf.js index 06e07b12..2d0323c0 100755 --- a/build/webpack.base.conf.js +++ b/build/webpack.base.conf.js @@ -63,6 +63,7 @@ module.exports = { { test: /\.(png|jpe?g|gif|svg)(\?.*)?$/, loader: 'url-loader', + exclude: [resolve('src/assets/icons/svg')], options: { limit: 10000, name: utils.assetsPath('img/[name].[hash:7].[ext]') diff --git a/package.json b/package.json index afed42ca..a8b2d1d1 100755 --- a/package.json +++ b/package.json @@ -27,7 +27,6 @@ "particles.js": "^2.0.0", "quill": "^1.3.4", "simplemde": "^1.11.2", - "svg-sprite-loader": "^3.6.2", "timeago.js": "^3.0.2", "vue": "^2.5.2", "vue-grid-layout": "^2.1.11", @@ -74,6 +73,7 @@ "postcss-loader": "^2.0.8", "rimraf": "^2.6.0", "sass-loader": "^6.0.6", + "svg-sprite-loader": "^3.6.2", "semver": "^5.3.0", "shelljs": "^0.7.6", "uglifyjs-webpack-plugin": "^1.1.1", diff --git a/src/assets/icons/index.js b/src/assets/icons/index.js index 066fddb3..6aa3dace 100644 --- a/src/assets/icons/index.js +++ b/src/assets/icons/index.js @@ -1,3 +1,7 @@ +import alarm from './svg/alarm.svg' + +console.log(alarm) + const requireAll = requireContext => requireContext.keys().map(requireContext) const req = require.context('./svg', false, /\.svg$/) const iconMap = requireAll(req) diff --git a/src/components/core/IconSvg/index.vue b/src/components/core/IconSvg/index.vue index fc2589e8..5ecc7731 100644 --- a/src/components/core/IconSvg/index.vue +++ b/src/components/core/IconSvg/index.vue @@ -13,7 +13,7 @@ export default { } }, computed: { - iconName() { + iconName () { return `#icon-${this.name}` } } diff --git a/src/pages/demo/components/icon/svg.vue b/src/pages/demo/components/icon/svg.vue index ee8f1b15..cfdf040a 100644 --- a/src/pages/demo/components/icon/svg.vue +++ b/src/pages/demo/components/icon/svg.vue @@ -1,5 +1,5 @@