From fe4999f0711bc323b40a3fc22c115ee770842c0a 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 16:43:48 +0800
Subject: [PATCH] no message

Former-commit-id: 2307a927de9d95108586522b33bcab9a8941d30e
Former-commit-id: e0d45eab6717de74eb4ba3516f106340a881cf5a
Former-commit-id: 63f175e2c381710a8e53c338f7cfad56c06a37e0
---
 src/components/core/Markdown/index.vue        |  8 ++-
 .../core/Markdown/plugin/baidupan.js          |  5 ++
 src/pages/demo/components/markdown/demo.vue   | 45 +------------
 .../components/markdown/demoHighlight.vue     | 49 --------------
 .../demo/components/markdown/demoRender.vue   | 67 -------------------
 src/router/menu/_components.js                | 20 ------
 .../组件 - markdown.md}                       |  2 +-
 static/markdownFiles/demo/base.md             | 26 -------
 8 files changed, 14 insertions(+), 208 deletions(-)
 create mode 100644 src/components/core/Markdown/plugin/baidupan.js
 delete mode 100644 src/pages/demo/components/markdown/demoHighlight.vue
 delete mode 100644 src/pages/demo/components/markdown/demoRender.vue
 rename static/markdownFiles/{demo/baiduyun.md => article/组件 - markdown.md} (76%)
 delete mode 100644 static/markdownFiles/demo/base.md

diff --git a/src/components/core/Markdown/index.vue b/src/components/core/Markdown/index.vue
index b35534cb..20fe32bc 100644
--- a/src/components/core/Markdown/index.vue
+++ b/src/components/core/Markdown/index.vue
@@ -10,6 +10,7 @@
 <script>
 import marked from 'marked'
 import highlight from 'highlight.js'
+import bandupan from './plugin/baidupan'
 export default {
   props: {
     url: {
@@ -66,18 +67,19 @@ export default {
     marked (data) {
       const renderer = new marked.Renderer()
       renderer.blockquote = (quote) => {
+        bandupan().then(() => {
+          console.log('----')
+        })
         const _quote = quote.replace(/<[^<>]+>/g, '').trim()
         const bdShareUrl = /^https:\/\/pan\.baidu\.com\/s\/[a-z0-9]+$/i
         const bdShareUrlPwd = /^链接: https:\/\/pan\.baidu\.com\/s\/[a-z0-9]+ 密码: [a-z0-9]{4}$/i
         if (bdShareUrl.test(_quote)) {
           return `<div style="color: red;">${_quote}</div>`
-        }
-        if (bdShareUrlPwd.test(_quote)) {
+        } else if (bdShareUrlPwd.test(_quote)) {
           const url = _quote.match(/https:\/\/pan\.baidu\.com\/s\/[a-z0-9]+/i)
           const pwd = _quote.match(/[a-z0-9]{4}$/i)
           return `<div style="color: blue;">${url[0]} - ${pwd[0]}</div>`
         }
-        // 一般的
         return `<blockquote>${quote}</blockquote>`
       }
       return marked(data, {
diff --git a/src/components/core/Markdown/plugin/baidupan.js b/src/components/core/Markdown/plugin/baidupan.js
new file mode 100644
index 00000000..fb450bc3
--- /dev/null
+++ b/src/components/core/Markdown/plugin/baidupan.js
@@ -0,0 +1,5 @@
+export default (quote) => {
+  return new Promise((resolve, reject) => {
+    resolve()
+  })
+}
diff --git a/src/pages/demo/components/markdown/demo.vue b/src/pages/demo/components/markdown/demo.vue
index 7cc3e54c..d4870d87 100644
--- a/src/pages/demo/components/markdown/demo.vue
+++ b/src/pages/demo/components/markdown/demo.vue
@@ -1,44 +1,5 @@
 <template>
-  <Container type="ghost">
-    <el-row :gutter="10">
-      <el-col :span="12">
-        <el-card>
-          <PageHeader
-            slot="header"
-            title="基本示例"
-            url="https://github.com/chjj/marked">
-          </PageHeader>
-          <pre>{{mdSource}}</pre>
-        </el-card>
-      </el-col>
-      <el-col :span="12">
-        <el-card>
-          <template slot="header">解析结果</template>
-          <div class="markdown-body" v-html="markedHTML"></div>
-        </el-card>
-      </el-col>
-    </el-row>
+  <Container>
+    <markdown url="/static/markdownFiles/article/组件 - markdown.md"></markdown>
   </Container>
-</template>
-
-<script>
-import marked from 'marked'
-export default {
-  data () {
-    return {
-      mdSource: '',
-      markedHTML: ''
-    }
-  },
-  async mounted () {
-    this.mdSource = await this.getReadme(this.url)
-    this.markedHTML = marked(this.mdSource)
-  },
-  methods: {
-    async getReadme () {
-      const data = await this.$axios.get('/static/markdownFiles/demo/base.md')
-      return data
-    }
-  }
-}
-</script>
\ No newline at end of file
+</template>
\ No newline at end of file
diff --git a/src/pages/demo/components/markdown/demoHighlight.vue b/src/pages/demo/components/markdown/demoHighlight.vue
deleted file mode 100644
index 251945bc..00000000
--- a/src/pages/demo/components/markdown/demoHighlight.vue
+++ /dev/null
@@ -1,49 +0,0 @@
-<template>
-  <Container type="ghost">
-    <el-row :gutter="10">
-      <el-col :span="12">
-        <el-card>
-          <PageHeader
-            slot="header"
-            title="代码高亮"
-            url="https://github.com/chjj/marked">
-          </PageHeader>
-          <pre>{{mdSource}}</pre>
-        </el-card>
-      </el-col>
-      <el-col :span="12">
-        <el-card>
-          <template slot="header">解析结果</template>
-          <div class="markdown-body" v-html="markedHTML"></div>
-        </el-card>
-      </el-col>
-    </el-row>
-  </Container>
-</template>
-
-<script>
-import marked from 'marked'
-import highlight from 'highlight.js'
-export default {
-  data () {
-    return {
-      mdSource: '',
-      markedHTML: ''
-    }
-  },
-  async mounted () {
-    this.mdSource = await this.getReadme(this.url)
-    this.markedHTML = marked(this.mdSource, {
-      highlight: (code) => {
-        return highlight.highlightAuto(code).value
-      }
-    })
-  },
-  methods: {
-    async getReadme () {
-      const data = await this.$axios.get('/static/markdownFiles/demo/base.md')
-      return data
-    }
-  }
-}
-</script>
\ No newline at end of file
diff --git a/src/pages/demo/components/markdown/demoRender.vue b/src/pages/demo/components/markdown/demoRender.vue
deleted file mode 100644
index 19d31958..00000000
--- a/src/pages/demo/components/markdown/demoRender.vue
+++ /dev/null
@@ -1,67 +0,0 @@
-<template>
-  <Container type="ghost">
-    <el-row :gutter="10">
-      <el-col :span="12">
-        <el-card>
-          <PageHeader
-            slot="header"
-            title="代码高亮"
-            url="https://github.com/chjj/marked">
-          </PageHeader>
-          <pre>{{mdSource}}</pre>
-        </el-card>
-      </el-col>
-      <el-col :span="12">
-        <el-card>
-          <template slot="header">解析结果</template>
-          <div class="markdown-body" v-html="markedHTML"></div>
-        </el-card>
-      </el-col>
-    </el-row>
-  </Container>
-</template>
-
-<script>
-import marked from 'marked'
-export default {
-  data () {
-    return {
-      mdSource: '',
-      markedHTML: ''
-    }
-  },
-  async mounted () {
-    this.mdSource = await this.getReadme(this.url)
-    const renderer = new marked.Renderer()
-    renderer.blockquote = (quote) => {
-      // 获取去掉HTML标签的内容
-      const _quote = quote.replace(/<[^<>]+>/g, '').trim()
-      // 分享链接地址
-      const bdShareUrl = /^https:\/\/pan\.baidu\.com\/s\/[a-z0-9]+$/i
-      // 带密码的分享链接
-      const bdShareUrlPwd = /^链接: https:\/\/pan\.baidu\.com\/s\/[a-z0-9]+ 密码: [a-z0-9]{4}$/i
-      // 如果是一般的分享链接
-      if (bdShareUrl.test(_quote)) {
-        return `<div style="color: red;">${_quote}</div>`
-      }
-      // 如果是带有密码的分享链接
-      if (bdShareUrlPwd.test(_quote)) {
-        const url = _quote.match(/https:\/\/pan\.baidu\.com\/s\/[a-z0-9]+/i)
-        const pwd = _quote.match(/[a-z0-9]{4}$/i)
-        return `<div style="color: blue;">${url[0]} - ${pwd[0]}</div>`
-      }
-      // 一般的
-      return `<blockquote>${quote}</blockquote>`
-    }
-    this.markedHTML = marked(this.mdSource, {
-      renderer
-    })
-  },
-  methods: {
-    async getReadme () {
-      const data = await this.$axios.get('/static/markdownFiles/demo/baiduyun.md')
-      return data
-    }
-  }
-}
-</script>
\ No newline at end of file
diff --git a/src/router/menu/_components.js b/src/router/menu/_components.js
index 48a39ce6..ba80eae2 100644
--- a/src/router/menu/_components.js
+++ b/src/router/menu/_components.js
@@ -99,26 +99,6 @@ export const menu = {
             requiresAuth: true
           },
           component: resolve => { require(['@/pages/demo/components/markdown/demo.vue'], resolve) }
-        },
-        {
-          title: '代码高亮',
-          icon: 'file-o',
-          path: 'marked/demoHighlight',
-          name: 'demo-components-markdown-demoHighlight',
-          meta: {
-            requiresAuth: true
-          },
-          component: resolve => { require(['@/pages/demo/components/markdown/demoHighlight.vue'], resolve) }
-        },
-        {
-          title: '自定义渲染',
-          icon: 'file-o',
-          path: 'marked/demoRender',
-          name: 'demo-components-markdown-demoRender',
-          meta: {
-            requiresAuth: true
-          },
-          component: resolve => { require(['@/pages/demo/components/markdown/demoRender.vue'], resolve) }
         }
       ]
     },
diff --git a/static/markdownFiles/demo/baiduyun.md b/static/markdownFiles/article/组件 - markdown.md
similarity index 76%
rename from static/markdownFiles/demo/baiduyun.md
rename to static/markdownFiles/article/组件 - markdown.md
index 8007fe78..2fc809c4 100644
--- a/static/markdownFiles/demo/baiduyun.md
+++ b/static/markdownFiles/article/组件 - markdown.md	
@@ -10,4 +10,4 @@
 
 百度云私密分享链接
 
-> 链接: https://pan.baidu.com/s/1pMNNDZP 密码: vc95
+> 链接: https://pan.baidu.com/s/1pMNNDZP 密码: vc95
\ No newline at end of file
diff --git a/static/markdownFiles/demo/base.md b/static/markdownFiles/demo/base.md
deleted file mode 100644
index 9ae720d5..00000000
--- a/static/markdownFiles/demo/base.md
+++ /dev/null
@@ -1,26 +0,0 @@
-[https://github.com/FairyEver](https://github.com/FairyEver)
-
-> 引用文字
-
-`JavaScript` 代码
-
-```
-const demo = (name = 'vue') => {
-  console.log(name)
-}
-demo(
-```
-
-`CSS` 代码
-
-```
-body {
-  background-color: #333;
-  height: 100%;
-}
-```
-
-| name | age | sex | delFlag |
-| --- | --- | --- | --- |
-| ban | 24 | 0 | 0 |
-| FairyEver | 24 | 1 | 0 |
\ No newline at end of file