From 288bb315d42c807321170e24fdb3c4c3790815f5 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Tue, 17 Jul 2018 16:14:19 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=9B=AE=E5=BD=95=E7=BB=93?=
 =?UTF-8?q?=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Former-commit-id: db1e1be0b4aad32212d97e5143fa9879cedf4632 [formerly a66101b80d77d10c27f32bdd2122319aebfa4c45] [formerly db1e1be0b4aad32212d97e5143fa9879cedf4632 [formerly a66101b80d77d10c27f32bdd2122319aebfa4c45] [formerly db1e1be0b4aad32212d97e5143fa9879cedf4632 [formerly a66101b80d77d10c27f32bdd2122319aebfa4c45] [formerly a66101b80d77d10c27f32bdd2122319aebfa4c45 [formerly 5782e3eafefbc1fe3100cdc53e57d96fd4694d71 [formerly 1c71d57cae5f0cf28ddd4068fecf2b04a5f5f916]]]]]
Former-commit-id: 5af82926fdcab09d38be4be15592ddf3c1458ecf
Former-commit-id: 8d29f5394facf69538ad738e8c8bb0a2189ae3e1
Former-commit-id: 97534e51f651110986cfdd29a5a459c2f5ea5901 [formerly decab1d0c9a721015ecdfc220652c75947d8c8d1]
Former-commit-id: 5bafd335b5d04ff4945a02377f9f1c1782968724
Former-commit-id: 97acb02928ef441830547c100b69d968fd664c09
Former-commit-id: 18fadf284749682851f064b3317bf2c727c2e30a
Former-commit-id: 7ea8dd882a8956cbe091378dca68415d218c3659
Former-commit-id: 13d9ef1a64463790951744ac66f033bc52247142
---
 {src/assets/md => public/markdown}/demo.md         | 0
 src/assets/{icons/svg => svg-icons/icons}/信息.svg | 0
 src/assets/{icons/svg => svg-icons/icons}/分享.svg | 0
 src/assets/{icons/svg => svg-icons/icons}/历史.svg | 0
 src/assets/{icons/svg => svg-icons/icons}/喜欢.svg | 0
 src/assets/{icons/svg => svg-icons/icons}/提醒.svg | 0
 src/assets/{icons/svg => svg-icons/icons}/搜索.svg | 0
 src/assets/{icons/svg => svg-icons/icons}/星标.svg | 0
 src/assets/{icons/svg => svg-icons/icons}/添加.svg | 0
 src/assets/{icons/svg => svg-icons/icons}/点赞.svg | 0
 src/assets/{icons/svg => svg-icons/icons}/用户.svg | 0
 src/assets/{icons/svg => svg-icons/icons}/相机.svg | 0
 src/assets/{icons/svg => svg-icons/icons}/闹钟.svg | 0
 src/assets/{icons => svg-icons}/index.js           | 2 +-
 src/components/core/d2-markdown/index.vue          | 5 +++--
 src/views/demo/components/markdown/url.vue         | 2 +-
 vue.config.js                                      | 4 ++--
 17 files changed, 7 insertions(+), 6 deletions(-)
 rename {src/assets/md => public/markdown}/demo.md (100%)
 rename src/assets/{icons/svg => svg-icons/icons}/信息.svg (100%)
 rename src/assets/{icons/svg => svg-icons/icons}/分享.svg (100%)
 rename src/assets/{icons/svg => svg-icons/icons}/历史.svg (100%)
 rename src/assets/{icons/svg => svg-icons/icons}/喜欢.svg (100%)
 rename src/assets/{icons/svg => svg-icons/icons}/提醒.svg (100%)
 rename src/assets/{icons/svg => svg-icons/icons}/搜索.svg (100%)
 rename src/assets/{icons/svg => svg-icons/icons}/星标.svg (100%)
 rename src/assets/{icons/svg => svg-icons/icons}/添加.svg (100%)
 rename src/assets/{icons/svg => svg-icons/icons}/点赞.svg (100%)
 rename src/assets/{icons/svg => svg-icons/icons}/用户.svg (100%)
 rename src/assets/{icons/svg => svg-icons/icons}/相机.svg (100%)
 rename src/assets/{icons/svg => svg-icons/icons}/闹钟.svg (100%)
 rename src/assets/{icons => svg-icons}/index.js (78%)

diff --git a/src/assets/md/demo.md b/public/markdown/demo.md
similarity index 100%
rename from src/assets/md/demo.md
rename to public/markdown/demo.md
diff --git a/src/assets/icons/svg/信息.svg b/src/assets/svg-icons/icons/信息.svg
similarity index 100%
rename from src/assets/icons/svg/信息.svg
rename to src/assets/svg-icons/icons/信息.svg
diff --git a/src/assets/icons/svg/分享.svg b/src/assets/svg-icons/icons/分享.svg
similarity index 100%
rename from src/assets/icons/svg/分享.svg
rename to src/assets/svg-icons/icons/分享.svg
diff --git a/src/assets/icons/svg/历史.svg b/src/assets/svg-icons/icons/历史.svg
similarity index 100%
rename from src/assets/icons/svg/历史.svg
rename to src/assets/svg-icons/icons/历史.svg
diff --git a/src/assets/icons/svg/喜欢.svg b/src/assets/svg-icons/icons/喜欢.svg
similarity index 100%
rename from src/assets/icons/svg/喜欢.svg
rename to src/assets/svg-icons/icons/喜欢.svg
diff --git a/src/assets/icons/svg/提醒.svg b/src/assets/svg-icons/icons/提醒.svg
similarity index 100%
rename from src/assets/icons/svg/提醒.svg
rename to src/assets/svg-icons/icons/提醒.svg
diff --git a/src/assets/icons/svg/搜索.svg b/src/assets/svg-icons/icons/搜索.svg
similarity index 100%
rename from src/assets/icons/svg/搜索.svg
rename to src/assets/svg-icons/icons/搜索.svg
diff --git a/src/assets/icons/svg/星标.svg b/src/assets/svg-icons/icons/星标.svg
similarity index 100%
rename from src/assets/icons/svg/星标.svg
rename to src/assets/svg-icons/icons/星标.svg
diff --git a/src/assets/icons/svg/添加.svg b/src/assets/svg-icons/icons/添加.svg
similarity index 100%
rename from src/assets/icons/svg/添加.svg
rename to src/assets/svg-icons/icons/添加.svg
diff --git a/src/assets/icons/svg/点赞.svg b/src/assets/svg-icons/icons/点赞.svg
similarity index 100%
rename from src/assets/icons/svg/点赞.svg
rename to src/assets/svg-icons/icons/点赞.svg
diff --git a/src/assets/icons/svg/用户.svg b/src/assets/svg-icons/icons/用户.svg
similarity index 100%
rename from src/assets/icons/svg/用户.svg
rename to src/assets/svg-icons/icons/用户.svg
diff --git a/src/assets/icons/svg/相机.svg b/src/assets/svg-icons/icons/相机.svg
similarity index 100%
rename from src/assets/icons/svg/相机.svg
rename to src/assets/svg-icons/icons/相机.svg
diff --git a/src/assets/icons/svg/闹钟.svg b/src/assets/svg-icons/icons/闹钟.svg
similarity index 100%
rename from src/assets/icons/svg/闹钟.svg
rename to src/assets/svg-icons/icons/闹钟.svg
diff --git a/src/assets/icons/index.js b/src/assets/svg-icons/index.js
similarity index 78%
rename from src/assets/icons/index.js
rename to src/assets/svg-icons/index.js
index 34a43be4..718a68b7 100644
--- a/src/assets/icons/index.js
+++ b/src/assets/svg-icons/index.js
@@ -1,7 +1,7 @@
 import Vue from 'vue'
 
 const requireAll = requireContext => requireContext.keys().map(requireContext)
-const req = require.context('./svg', false, /\.svg$/)
+const req = require.context('./icons', false, /\.svg$/)
 const iconMap = requireAll(req)
 
 Vue.prototype.$IconSvg = iconMap.map(e => e.default.id.slice(3))
diff --git a/src/components/core/d2-markdown/index.vue b/src/components/core/d2-markdown/index.vue
index 67c83121..e3e02e68 100644
--- a/src/components/core/d2-markdown/index.vue
+++ b/src/components/core/d2-markdown/index.vue
@@ -9,6 +9,7 @@
 
 <script>
 import marked from 'marked'
+import axios from 'axios'
 import highlight from 'highlight.js'
 import bandupan from './plugin/baidupan'
 export default {
@@ -61,8 +62,8 @@ export default {
       this.markedHTML = await this.getReadme(this.url)
     },
     // 从 url 加载原始数据
-    async getReadme (name) {
-      const data = await this.$axios.get(name)
+    async getReadme (url) {
+      const { data } = await axios.get(url)
       return this.marked(data)
     },
     marked (data) {
diff --git a/src/views/demo/components/markdown/url.vue b/src/views/demo/components/markdown/url.vue
index 70e9a77c..94d080be 100644
--- a/src/views/demo/components/markdown/url.vue
+++ b/src/views/demo/components/markdown/url.vue
@@ -1,6 +1,6 @@
 <template>
   <d2-container>
     <template slot="header">异步加载文件</template>
-    <d2-markdown :url="`${$baseUrl}static/md/demo.md`"/>
+    <d2-markdown :url="`${$baseUrl}markdown/demo.md`"/>
   </d2-container>
 </template>
diff --git a/vue.config.js b/vue.config.js
index 2d74548c..9a2b262d 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -32,7 +32,7 @@ module.exports = {
     svgRule.uses.clear()
     svgRule
       .include
-      .add(resolve('src/assets/icons/svg'))
+      .add(resolve('src/assets/svg-icons/icons'))
       .end()
       .use('svg-sprite-loader')
       .loader('svg-sprite-loader')
@@ -45,7 +45,7 @@ module.exports = {
     imagesRule
       .test(/\.(png|jpe?g|gif|webp|svg)(\?.*)?$/)
       .exclude
-      .add(resolve('src/assets/icons/svg'))
+      .add(resolve('src/assets/svg-icons/icons'))
       .end()
   }
 }