From cde7d42c81ad649cb29ba8e50be3cfa70756fa40 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Sun, 10 Jun 2018 09:14:10 +0800
Subject: [PATCH] no message

Former-commit-id: af99cadc88fd1d348c40f7716b5416ed33d34e8c
Former-commit-id: c9972d03b542403ee8e7335374c38c9a18775b52
Former-commit-id: 7b3bac9855134b411d7f668a2e90c719538425f5
---
 docs/zh/components/markdown.md                                | 4 ++--
 src/components/core/{Markdown => d2-markdown}/index.vue       | 0
 .../core/{Markdown => d2-markdown}/plugin/baidupan.js         | 0
 src/components/core/register.js                               | 2 +-
 src/pages/demo/chart/demo/PieBase.vue                         | 2 +-
 src/pages/demo/chart/demo/areaBase.vue                        | 2 +-
 src/pages/demo/chart/demo/barBase.vue                         | 2 +-
 src/pages/demo/chart/demo/columnBase.vue                      | 2 +-
 src/pages/demo/chart/demo/lineBase.vue                        | 2 +-
 src/pages/demo/chart/demo/lineStep.vue                        | 2 +-
 src/pages/demo/chart/demo/nightingaleRoseBase.vue             | 2 +-
 src/pages/demo/chart/demo/radarBase.vue                       | 2 +-
 src/pages/demo/components/container/full.vue                  | 2 +-
 src/pages/demo/components/container/ghost.vue                 | 2 +-
 src/pages/demo/components/container/normal.vue                | 2 +-
 src/pages/demo/components/countup/index.vue                   | 2 +-
 src/pages/demo/components/highlight/index.vue                 | 2 +-
 src/pages/demo/components/icon/icon.vue                       | 2 +-
 src/pages/demo/components/icon/select.vue                     | 2 +-
 src/pages/demo/components/icon/svg.vue                        | 2 +-
 src/pages/demo/components/markdown/index.vue                  | 2 +-
 src/pages/demo/plugins/export/table.vue                       | 2 +-
 src/pages/demo/plugins/export/txt.vue                         | 2 +-
 src/pages/demo/plugins/import/csv.vue                         | 2 +-
 src/pages/demo/plugins/import/xlsx.vue                        | 2 +-
 src/pages/demo/plugins/mock/ajax.vue                          | 2 +-
 src/pages/demo/plugins/mock/dpd.vue                           | 2 +-
 src/pages/demo/plugins/mock/dtd.vue                           | 2 +-
 src/pages/demo/plugins/timeago/index.vue                      | 2 +-
 static/md/组件 - markdown - 文档.md                           | 4 ++--
 30 files changed, 30 insertions(+), 30 deletions(-)
 rename src/components/core/{Markdown => d2-markdown}/index.vue (100%)
 rename src/components/core/{Markdown => d2-markdown}/plugin/baidupan.js (100%)

diff --git a/docs/zh/components/markdown.md b/docs/zh/components/markdown.md
index eb2cdb86..ce9132ef 100644
--- a/docs/zh/components/markdown.md
+++ b/docs/zh/components/markdown.md
@@ -14,7 +14,7 @@
 加载一个.md文件
 
 ``` vue
-<markdown url="/static/md/xxxx.md"></markdown>
+<d2-markdown url="/static/md/xxxx.md"/>
 ```
 
 加载资源
@@ -26,7 +26,7 @@ const md = `# Header
 
 text`
 
-<markdown :md="md"></markdown>
+<d2-markdown :md="md"/>
 ```
 
 ## 百度网盘分享链接优化
diff --git a/src/components/core/Markdown/index.vue b/src/components/core/d2-markdown/index.vue
similarity index 100%
rename from src/components/core/Markdown/index.vue
rename to src/components/core/d2-markdown/index.vue
diff --git a/src/components/core/Markdown/plugin/baidupan.js b/src/components/core/d2-markdown/plugin/baidupan.js
similarity index 100%
rename from src/components/core/Markdown/plugin/baidupan.js
rename to src/components/core/d2-markdown/plugin/baidupan.js
diff --git a/src/components/core/register.js b/src/components/core/register.js
index 7af3e1b9..405b07da 100644
--- a/src/components/core/register.js
+++ b/src/components/core/register.js
@@ -6,6 +6,6 @@ Vue.component('d2-highlight', resolve => { require(['@/components/core/d2-highli
 Vue.component('d2-icon', resolve => { require(['@/components/core/d2-icon'], resolve) })
 Vue.component('d2-icon-select', resolve => { require(['@/components/core/d2-icon-select/index.vue'], resolve) })
 Vue.component('d2-icon-svg', resolve => { require(['@/components/core/d2-icon-svg/index.vue'], resolve) })
-Vue.component('Markdown', resolve => { require(['@/components/core/Markdown'], resolve) })
+Vue.component('d2-markdown', resolve => { require(['@/components/core/d2-markdown'], resolve) })
 Vue.component('QuillEditor', resolve => { require(['@/components/core/QuillEditor'], resolve) })
 Vue.component('SimpleMDE', resolve => { require(['@/components/core/SimpleMDE'], resolve) })
diff --git a/src/pages/demo/chart/demo/PieBase.vue b/src/pages/demo/chart/demo/PieBase.vue
index 5d6b435e..069afdec 100644
--- a/src/pages/demo/chart/demo/PieBase.vue
+++ b/src/pages/demo/chart/demo/PieBase.vue
@@ -4,7 +4,7 @@
       <G2PieBase slot-scope="{data}" ref="chart" :data="data" v-bind="chart"></G2PieBase>
     </ChartDemoCard>
     <el-card>
-      <Markdown url="/static/md/组件 - 图表.md"></Markdown>
+      <d2-markdown url="/static/md/组件 - 图表.md"/>
     </el-card>
   </d2-container>
 </template>
diff --git a/src/pages/demo/chart/demo/areaBase.vue b/src/pages/demo/chart/demo/areaBase.vue
index db053702..37993242 100644
--- a/src/pages/demo/chart/demo/areaBase.vue
+++ b/src/pages/demo/chart/demo/areaBase.vue
@@ -4,7 +4,7 @@
       <G2AreaBase slot-scope="{data}" ref="chart" :data="data" v-bind="chart"></G2AreaBase>
     </ChartDemoCard>
     <el-card>
-      <Markdown url="/static/md/组件 - 图表.md"></Markdown>
+      <d2-markdown url="/static/md/组件 - 图表.md"/>
     </el-card>
   </d2-container>
 </template>
diff --git a/src/pages/demo/chart/demo/barBase.vue b/src/pages/demo/chart/demo/barBase.vue
index f2bf92e1..9d7162a1 100644
--- a/src/pages/demo/chart/demo/barBase.vue
+++ b/src/pages/demo/chart/demo/barBase.vue
@@ -4,7 +4,7 @@
       <G2BarBase slot-scope="{data}" ref="chart" :data="data" v-bind="chart"></G2BarBase>
     </ChartDemoCard>
     <el-card>
-      <Markdown url="/static/md/组件 - 图表.md"></Markdown>
+      <d2-markdown url="/static/md/组件 - 图表.md"/>
     </el-card>
   </d2-container>
 </template>
diff --git a/src/pages/demo/chart/demo/columnBase.vue b/src/pages/demo/chart/demo/columnBase.vue
index 81c03687..fe1c7ca5 100644
--- a/src/pages/demo/chart/demo/columnBase.vue
+++ b/src/pages/demo/chart/demo/columnBase.vue
@@ -4,7 +4,7 @@
       <G2ColumnBase slot-scope="{data}" ref="chart" :data="data" v-bind="chart"></G2ColumnBase>
     </ChartDemoCard>
     <el-card>
-      <Markdown url="/static/md/组件 - 图表.md"></Markdown>
+      <d2-markdown url="/static/md/组件 - 图表.md"/>
     </el-card>
   </d2-container>
 </template>
diff --git a/src/pages/demo/chart/demo/lineBase.vue b/src/pages/demo/chart/demo/lineBase.vue
index 2bdf00bf..7517609b 100644
--- a/src/pages/demo/chart/demo/lineBase.vue
+++ b/src/pages/demo/chart/demo/lineBase.vue
@@ -4,7 +4,7 @@
       <G2LineBase slot-scope="{data}" ref="chart" :data="data" v-bind="chart"></G2LineBase>
     </ChartDemoCard>
     <el-card>
-      <Markdown url="/static/md/组件 - 图表.md"></Markdown>
+      <d2-markdown url="/static/md/组件 - 图表.md"/>
     </el-card>
   </d2-container>
 </template>
diff --git a/src/pages/demo/chart/demo/lineStep.vue b/src/pages/demo/chart/demo/lineStep.vue
index 7de1f5d5..bb832b78 100644
--- a/src/pages/demo/chart/demo/lineStep.vue
+++ b/src/pages/demo/chart/demo/lineStep.vue
@@ -4,7 +4,7 @@
       <G2LineStep slot-scope="{data}" ref="chart" :data="data" v-bind="chart"></G2LineStep>
     </ChartDemoCard>
     <el-card>
-      <Markdown url="/static/md/组件 - 图表.md"></Markdown>
+      <d2-markdown url="/static/md/组件 - 图表.md"/>
     </el-card>
   </d2-container>
 </template>
diff --git a/src/pages/demo/chart/demo/nightingaleRoseBase.vue b/src/pages/demo/chart/demo/nightingaleRoseBase.vue
index de2b2cb2..91211dff 100644
--- a/src/pages/demo/chart/demo/nightingaleRoseBase.vue
+++ b/src/pages/demo/chart/demo/nightingaleRoseBase.vue
@@ -4,7 +4,7 @@
       <G2NightingaleRoseBase slot-scope="{data}" ref="chart" :data="data" v-bind="chart"></G2NightingaleRoseBase>
     </ChartDemoCard>
     <el-card>
-      <Markdown url="/static/md/组件 - 图表.md"></Markdown>
+      <d2-markdown url="/static/md/组件 - 图表.md"/>
     </el-card>
   </d2-container>
 </template>
diff --git a/src/pages/demo/chart/demo/radarBase.vue b/src/pages/demo/chart/demo/radarBase.vue
index 5b94b597..9e25897d 100644
--- a/src/pages/demo/chart/demo/radarBase.vue
+++ b/src/pages/demo/chart/demo/radarBase.vue
@@ -4,7 +4,7 @@
       <G2RadarBase slot-scope="{data}" ref="chart" :data="data" v-bind="chart"></G2RadarBase>
     </ChartDemoCard>
     <el-card>
-      <Markdown url="/static/md/组件 - 图表.md"></Markdown>
+      <d2-markdown url="/static/md/组件 - 图表.md"/>
     </el-card>
   </d2-container>
 </template>
diff --git a/src/pages/demo/components/container/full.vue b/src/pages/demo/components/container/full.vue
index 0dc62ee3..9d31cbb9 100644
--- a/src/pages/demo/components/container/full.vue
+++ b/src/pages/demo/components/container/full.vue
@@ -3,7 +3,7 @@
     <template slot="header">
       我是插入到 header 中的内容
     </template>
-    <Markdown url="/static/md/组件 - 页面容器 - 撑满.md"></Markdown>
+    <d2-markdown url="/static/md/组件 - 页面容器 - 撑满.md"/>
     <template slot="footer">
       我是插入到 footer 中的内容
     </template>
diff --git a/src/pages/demo/components/container/ghost.vue b/src/pages/demo/components/container/ghost.vue
index 5511534e..788779e6 100644
--- a/src/pages/demo/components/container/ghost.vue
+++ b/src/pages/demo/components/container/ghost.vue
@@ -1,7 +1,7 @@
 <template>
   <d2-container type="ghost">
     <el-card style="width: 50%;">
-      <Markdown url="/static/md/组件 - 页面容器 - 隐形.md"></Markdown>
+      <d2-markdown url="/static/md/组件 - 页面容器 - 隐形.md"/>
     </el-card>
   </d2-container>
 </template>
diff --git a/src/pages/demo/components/container/normal.vue b/src/pages/demo/components/container/normal.vue
index 301506e6..2bea1196 100644
--- a/src/pages/demo/components/container/normal.vue
+++ b/src/pages/demo/components/container/normal.vue
@@ -1,6 +1,6 @@
 <template>
   <d2-container>
     <template slot="header">我是插入到 header 中的内容</template>
-    <Markdown url="/static/md/组件 - 页面容器 - 基础.md"></Markdown>
+    <d2-markdown url="/static/md/组件 - 页面容器 - 基础.md"/>
   </d2-container>
 </template>
diff --git a/src/pages/demo/components/countup/index.vue b/src/pages/demo/components/countup/index.vue
index 5158f5c8..89537a14 100644
--- a/src/pages/demo/components/countup/index.vue
+++ b/src/pages/demo/components/countup/index.vue
@@ -57,7 +57,7 @@
       </el-col>
     </el-row>
     <el-card>
-      <Markdown url="/static/md/组件 - 数字动画.md"></Markdown>
+      <d2-markdown url="/static/md/组件 - 数字动画.md"/>
     </el-card>
   </d2-container>
 </template>
diff --git a/src/pages/demo/components/highlight/index.vue b/src/pages/demo/components/highlight/index.vue
index 354e72a7..e998f258 100644
--- a/src/pages/demo/components/highlight/index.vue
+++ b/src/pages/demo/components/highlight/index.vue
@@ -31,7 +31,7 @@
       </el-col>
     </el-row>
     <el-card>
-      <Markdown url="/static/md/组件 - 代码高亮.md"></Markdown>
+      <d2-markdown url="/static/md/组件 - 代码高亮.md"/>
     </el-card>
   </d2-container>
 </template>
diff --git a/src/pages/demo/components/icon/icon.vue b/src/pages/demo/components/icon/icon.vue
index 6ac1dbba..0ad219b4 100644
--- a/src/pages/demo/components/icon/icon.vue
+++ b/src/pages/demo/components/icon/icon.vue
@@ -12,7 +12,7 @@
       <d2-icon name="github" class="icon-class-demo"></d2-icon>
     </el-card>
     <el-card>
-      <Markdown url="/static/md/组件 - 图标组件.md"></Markdown>
+      <d2-markdown url="/static/md/组件 - 图标组件.md"/>
     </el-card>
   </d2-container>
 </template>
diff --git a/src/pages/demo/components/icon/select.vue b/src/pages/demo/components/icon/select.vue
index ef644025..061873ec 100644
--- a/src/pages/demo/components/icon/select.vue
+++ b/src/pages/demo/components/icon/select.vue
@@ -30,7 +30,7 @@
       <d2-icon-select v-model="icon2" :user-input="true"></d2-icon-select>
     </el-card>
     <el-card>
-      <Markdown url="/static/md/组件 - 图标选择器.md"></Markdown>
+      <d2-markdown url="/static/md/组件 - 图标选择器.md"/>
     </el-card>
   </d2-container>
 </template>
diff --git a/src/pages/demo/components/icon/svg.vue b/src/pages/demo/components/icon/svg.vue
index e74cb83f..f4f8d4b2 100644
--- a/src/pages/demo/components/icon/svg.vue
+++ b/src/pages/demo/components/icon/svg.vue
@@ -15,7 +15,7 @@
       </el-row>
     </el-card>
     <el-card>
-      <Markdown url="/static/md/组件 - 图标组件 - svg.md"></Markdown>
+      <d2-markdown url="/static/md/组件 - 图标组件 - svg.md"/>
     </el-card>
   </d2-container>
 </template>
diff --git a/src/pages/demo/components/markdown/index.vue b/src/pages/demo/components/markdown/index.vue
index fb43e7b2..4b8bbfdd 100644
--- a/src/pages/demo/components/markdown/index.vue
+++ b/src/pages/demo/components/markdown/index.vue
@@ -5,6 +5,6 @@
       title="效果演示"
       url="https://github.com/FairyEver/d2admin-vue-element/blob/master/src/components/core/Markdown/index.vue">
     </PageHeader>
-    <markdown url="/static/md/组件 - markdown - 演示.md"></markdown>
+    <d2-markdown url="/static/md/组件 - markdown - 演示.md"/>
   </d2-container>
 </template>
\ No newline at end of file
diff --git a/src/pages/demo/plugins/export/table.vue b/src/pages/demo/plugins/export/table.vue
index 098e119d..e6345463 100644
--- a/src/pages/demo/plugins/export/table.vue
+++ b/src/pages/demo/plugins/export/table.vue
@@ -22,7 +22,7 @@
         :label="item.label">
       </el-table-column>
     </el-table>
-    <Markdown url="/static/md/插件 - 导出.md"></Markdown>
+    <d2-markdown url="/static/md/插件 - 导出.md"/>
   </d2-container>
 </template>
 
diff --git a/src/pages/demo/plugins/export/txt.vue b/src/pages/demo/plugins/export/txt.vue
index 41bce6a0..7acffb07 100644
--- a/src/pages/demo/plugins/export/txt.vue
+++ b/src/pages/demo/plugins/export/txt.vue
@@ -16,7 +16,7 @@
         保存为 txt
       </el-button>
     </div>
-    <Markdown url="/static/md/插件 - 导出.md"></Markdown>
+    <d2-markdown url="/static/md/插件 - 导出.md"/>
   </d2-container>
 </template>
 
diff --git a/src/pages/demo/plugins/import/csv.vue b/src/pages/demo/plugins/import/csv.vue
index 66d78b1b..0356de94 100644
--- a/src/pages/demo/plugins/import/csv.vue
+++ b/src/pages/demo/plugins/import/csv.vue
@@ -27,7 +27,7 @@
         :label="item.label">
       </el-table-column>
     </el-table>
-    <Markdown url="/static/md/插件 - 导入.md"></Markdown>
+    <d2-markdown url="/static/md/插件 - 导入.md"/>
   </d2-container>
 </template>
 
diff --git a/src/pages/demo/plugins/import/xlsx.vue b/src/pages/demo/plugins/import/xlsx.vue
index 4e9714e9..1a555a0e 100644
--- a/src/pages/demo/plugins/import/xlsx.vue
+++ b/src/pages/demo/plugins/import/xlsx.vue
@@ -27,7 +27,7 @@
         :label="item.label">
       </el-table-column>
     </el-table>
-    <Markdown url="/static/md/插件 - 导入.md"></Markdown>
+    <d2-markdown url="/static/md/插件 - 导入.md"/>
   </d2-container>
 </template>
 
diff --git a/src/pages/demo/plugins/mock/ajax.vue b/src/pages/demo/plugins/mock/ajax.vue
index ab325790..c1837864 100644
--- a/src/pages/demo/plugins/mock/ajax.vue
+++ b/src/pages/demo/plugins/mock/ajax.vue
@@ -12,7 +12,7 @@
           :label="item.label">
         </el-table-column>
       </el-table>
-      <Markdown url="/static/md/插件 - mock拦截ajax.md"></Markdown>
+      <d2-markdown url="/static/md/插件 - mock拦截ajax.md"/>
     </el-card>
   </d2-container>
 </template>
diff --git a/src/pages/demo/plugins/mock/dpd.vue b/src/pages/demo/plugins/mock/dpd.vue
index 70bc791a..1ae43896 100644
--- a/src/pages/demo/plugins/mock/dpd.vue
+++ b/src/pages/demo/plugins/mock/dpd.vue
@@ -6,7 +6,7 @@
         title="数据占位符"
         url="https://github.com/nuysoft/Mock">
       </PageHeader>
-      <Markdown url="/static/md/插件 - mock演示页面介绍.md"></Markdown>
+      <d2-markdown url="/static/md/插件 - mock演示页面介绍.md"/>
     </el-card>
     <MockDemoCard
       v-for="(item, index) in settingDPD"
diff --git a/src/pages/demo/plugins/mock/dtd.vue b/src/pages/demo/plugins/mock/dtd.vue
index 1fd8428f..aa120de0 100644
--- a/src/pages/demo/plugins/mock/dtd.vue
+++ b/src/pages/demo/plugins/mock/dtd.vue
@@ -6,7 +6,7 @@
         title="数据模板"
         url="https://github.com/nuysoft/Mock">
       </PageHeader>
-      <Markdown url="/static/md/插件 - mock演示页面介绍.md"></Markdown>
+      <d2-markdown url="/static/md/插件 - mock演示页面介绍.md"/>
     </el-card>
     <MockDemoCard
       v-for="(item, index) in settingDTD"
diff --git a/src/pages/demo/plugins/timeago/index.vue b/src/pages/demo/plugins/timeago/index.vue
index 3e22dd35..fbe4f1ee 100644
--- a/src/pages/demo/plugins/timeago/index.vue
+++ b/src/pages/demo/plugins/timeago/index.vue
@@ -25,7 +25,7 @@
       </div>
     </el-card>
     <el-card>
-      <Markdown url="/static/md/插件 - timeago.md"></Markdown>
+      <d2-markdown url="/static/md/插件 - timeago.md"/>
     </el-card>
   </d2-container>
 </template>
diff --git a/static/md/组件 - markdown - 文档.md b/static/md/组件 - markdown - 文档.md
index 5f0439e3..31a9a711 100644
--- a/static/md/组件 - markdown - 文档.md	
+++ b/static/md/组件 - markdown - 文档.md	
@@ -12,7 +12,7 @@
 加载一个.md文件
 
 ```
-<markdown url="/static/md/xxxx.md"></markdown>
+<d2-markdown url="/static/md/xxxx.md"/>
 ```
 
 加载资源
@@ -24,7 +24,7 @@ const md = `# Header
 
 text`
 
-<markdown :md="md"></markdown>
+<d2-markdown :md="md"/>
 ```
 
 ## 百度网盘分享链接优化