From 18bdd3e3d5537c43624b07696a74af9175073d0e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E6=9D=A8?= <1711467488@qq.com>
Date: Sat, 24 Feb 2018 20:42:48 +0800
Subject: [PATCH] no message

Former-commit-id: c40a8d4ea80fe352af99aae2d9a045254be06c54
Former-commit-id: 7251decaa91e7bd42378bc84171f4e6401d9b055
Former-commit-id: de97575e04564693eadc09393d74c4ac6ae6fd58
---
 src/components/core/Markdown/index.vue        |  2 +-
 src/router/menu/_components.js                | 10 ++++++
 .../article/组件 - markdown - 文档.md         | 36 +++++++++++++++++--
 .../article/组件 - markdown - 演示.md         |  8 ++---
 4 files changed, 49 insertions(+), 7 deletions(-)

diff --git a/src/components/core/Markdown/index.vue b/src/components/core/Markdown/index.vue
index bf74201a..1e76aa43 100644
--- a/src/components/core/Markdown/index.vue
+++ b/src/components/core/Markdown/index.vue
@@ -68,7 +68,7 @@ export default {
       const renderer = new marked.Renderer()
       renderer.blockquote = (quote) => {
         // 百度网盘
-        return bandupan(quote) || `<blockquote>${quote}</blockquote>`
+        return (this.baidupan && bandupan(quote)) || `<blockquote>${quote}</blockquote>`
       }
       return marked(data, {
         ...this.highlight ? {highlight: (code) => highlight.highlightAuto(code).value} : {},
diff --git a/src/router/menu/_components.js b/src/router/menu/_components.js
index d8118a08..19bf3e34 100644
--- a/src/router/menu/_components.js
+++ b/src/router/menu/_components.js
@@ -99,6 +99,16 @@ export const menu = {
             requiresAuth: true
           },
           component: resolve => { require(['@/pages/demo/components/markdown/demo.vue'], resolve) }
+        },
+        {
+          title: '文档',
+          icon: 'file-o',
+          path: 'marked/doc',
+          name: 'demo-components-markdown-doc',
+          meta: {
+            requiresAuth: true
+          },
+          component: resolve => { require(['@/pages/demo/components/markdown/doc.vue'], resolve) }
         }
       ]
     },
diff --git a/static/markdownFiles/article/组件 - markdown - 文档.md b/static/markdownFiles/article/组件 - markdown - 文档.md
index b9d2f12b..28a9d3e1 100644
--- a/static/markdownFiles/article/组件 - markdown - 文档.md	
+++ b/static/markdownFiles/article/组件 - markdown - 文档.md	
@@ -12,5 +12,37 @@
 加载一个.md文件
 
 ```
-<markdown url="/static/markdownFiles/article/组件 - markdown - 演示.md"></markdown>
-```
\ No newline at end of file
+<markdown url="/static/markdownFiles/article/xxxx.md"></markdown>
+```
+
+加载资源
+
+```
+const md = `# Header
+
+## title
+
+text`
+
+<markdown :md="md"></markdown>
+```
+
+## 百度网盘分享链接优化
+
+当书写类似下面的分享链接时
+
+> 需要 `baidupan = true`
+
+```
+普通分享链接
+
+> https://pan.baidu.com/s/1kW6uUwB
+
+私密分享链接
+
+> 链接: https://pan.baidu.com/s/1ggFW21l 密码: 877y
+```
+
+markdown 中引用部分的文本由于被识别为百度云的分享链接，所以不会被当做 `blockquote` 渲染，会以一种特别的块来显示
+
+> 了解 D2Admin 是如何匹配百度云链接的？ [查看源码](https://github.com/FairyEver/d2admin-vue-element/blob/master/src/components/core/Markdown/plugin/baidupan.js)
\ No newline at end of file
diff --git a/static/markdownFiles/article/组件 - markdown - 演示.md b/static/markdownFiles/article/组件 - markdown - 演示.md
index 63284391..74575f26 100644
--- a/static/markdownFiles/article/组件 - markdown - 演示.md	
+++ b/static/markdownFiles/article/组件 - markdown - 演示.md	
@@ -12,13 +12,13 @@ alert('Hello World')
 
 > 引用文字
 
-百度云分享链接
+分享一个我很早前的一副设计作品 [in Lofter](http://fairyever.lofter.com/post/16ff00_6796fe8)
 
-> https://pan.baidu.com/s/1c3gQGxE
+> https://pan.baidu.com/s/1kW6uUwB
 
-百度云私密分享链接
+设计源文件
 
-> 链接: https://pan.baidu.com/s/1pMNNDZP 密码: vc95
+> 链接: https://pan.baidu.com/s/1ggFW21l 密码: 877y
 
 [https://github.com/FairyEver](https://github.com/FairyEver)