From b32b84cdb1b0fd789a80c787f5d4ca3d92c32919 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Tue, 12 Jun 2018 11:26:12 +0800
Subject: [PATCH] no message

Former-commit-id: 1c069d76278e418a4025d9507b64394b78d6c1dc
Former-commit-id: 196c50502c7c5dd567997000db8007406f2c7866
Former-commit-id: ce840c9b082c237c18e93ca38dc704000e355341
Former-commit-id: 81026579f627bbcbafce3aebbe444b9678cc4530
---
 docs/zh/components/markdown.md                | 4 ++--
 docs/zh/guide/change-log.md                   | 3 ++-
 src/components/core/d2-markdown/index.vue     | 6 +++---
 src/pages/demo/components/container/card.vue  | 2 +-
 src/pages/demo/components/container/full.vue  | 2 +-
 src/pages/demo/components/container/ghost.vue | 2 +-
 src/pages/demo/components/markdown/source.vue | 2 +-
 src/pages/demo/plugins/mock/dpd.vue           | 2 +-
 src/pages/demo/plugins/mock/dtd.vue           | 2 +-
 9 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/docs/zh/components/markdown.md b/docs/zh/components/markdown.md
index ce9132ef..1a0f8235 100644
--- a/docs/zh/components/markdown.md
+++ b/docs/zh/components/markdown.md
@@ -5,7 +5,7 @@
 | 参数名 | 介绍 | 必选 | 值类型 | 可选值 | 默认值 |
 | --- | --- | --- | --- | --- | --- |
 | url | markdown文件地址 | 非 | String |  | 无 |
-| md | markdown内容 | 非 | String |  | 无 |
+| source | markdown内容 | 非 | String |  | 无 |
 | highlight | 代码高亮 | 非 | Boolean |  | false |
 | baidupan | 百度网盘分享链接显示优化 | 非 | Boolean |  | true |
 
@@ -26,7 +26,7 @@ const md = `# Header
 
 text`
 
-<d2-markdown :md="md"/>
+<d2-markdown :source="md"/>
 ```
 
 ## 百度网盘分享链接优化
diff --git a/docs/zh/guide/change-log.md b/docs/zh/guide/change-log.md
index 3b623983..96c4f3c6 100644
--- a/docs/zh/guide/change-log.md
+++ b/docs/zh/guide/change-log.md
@@ -10,11 +10,12 @@
 * [ 修改 ] 路由注册回归最简单的写法
 * [ 修复 ] 首次加载 loading 样式类名和程序内类名冲突，新的加载类名使用 `d2-app-loading` 前缀
 * [ 修改 ] 所有类似 `dd-` 的样式前缀(包括自动注册图标的id前缀)统一改为 `d2-`
-* [ 修复 ] 修复 `highlight` 组件和 `markdown` 组件的样式冲突
+* [ 修复 ] 修复 `d2-highlight` 组件和 `d2-markdown` 组件的样式冲突
 * [ 修改 ] 内置组件名称统一改为 `d2-` 前缀，统一使用横线连接 (kebab-case) 风格
 * [ 修改 ] 顶栏 logo 阴影删除
 * [ 新增 ] 主题系统
 * [ 新增 ] 三个主题，分别为 `d2admin 经典`，`简约线条`，`流星`
+* [ 修改 ] `d2-markdown` 组件 `md` 参数改名为 `source`
 
 ## v1.0.0
 
diff --git a/src/components/core/d2-markdown/index.vue b/src/components/core/d2-markdown/index.vue
index 512f3acd..d4f21c87 100644
--- a/src/components/core/d2-markdown/index.vue
+++ b/src/components/core/d2-markdown/index.vue
@@ -19,7 +19,7 @@ export default {
       required: false,
       default: ''
     },
-    md: {
+    source: {
       type: String,
       required: false,
       default: ''
@@ -45,7 +45,7 @@ export default {
   mounted () {
     if (this.url) {
       this.initWithUrl()
-    } else if (this.md) {
+    } else if (this.source) {
       this.initWithMd()
     } else {
       console.log('not mounted init')
@@ -54,7 +54,7 @@ export default {
   methods: {
     // 使用 md 初始化
     initWithMd () {
-      this.markedHTML = this.marked(this.md)
+      this.markedHTML = this.marked(this.source)
     },
     // 使用 url 初始化
     async initWithUrl () {
diff --git a/src/pages/demo/components/container/card.vue b/src/pages/demo/components/container/card.vue
index 49ccca78..a0b7ba8c 100644
--- a/src/pages/demo/components/container/card.vue
+++ b/src/pages/demo/components/container/card.vue
@@ -1,7 +1,7 @@
 <template>
   <d2-container>
     <template slot="header">我是插入到 header 中的内容</template>
-    <d2-markdown :md="doc"/>
+    <d2-markdown :source="doc"/>
   </d2-container>
 </template>
 
diff --git a/src/pages/demo/components/container/full.vue b/src/pages/demo/components/container/full.vue
index 0783ea0e..8b87b365 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>
-    <d2-markdown :md="doc"/>
+    <d2-markdown :source="doc"/>
     <template slot="footer">
       我是插入到 footer 中的内容
     </template>
diff --git a/src/pages/demo/components/container/ghost.vue b/src/pages/demo/components/container/ghost.vue
index 6250aea8..cb58c0cb 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 shadow="never" style="width: 50%;">
-      <d2-markdown :md="doc"/>
+      <d2-markdown :source="doc"/>
     </el-card>
   </d2-container>
 </template>
diff --git a/src/pages/demo/components/markdown/source.vue b/src/pages/demo/components/markdown/source.vue
index 5f4037ff..92d04893 100644
--- a/src/pages/demo/components/markdown/source.vue
+++ b/src/pages/demo/components/markdown/source.vue
@@ -1,7 +1,7 @@
 <template>
   <d2-container>
     <template slot="header">指定资源</template>
-    <d2-markdown :md="doc"/>
+    <d2-markdown :source="doc"/>
   </d2-container>
 </template>
 
diff --git a/src/pages/demo/plugins/mock/dpd.vue b/src/pages/demo/plugins/mock/dpd.vue
index c51f9585..47a8c488 100644
--- a/src/pages/demo/plugins/mock/dpd.vue
+++ b/src/pages/demo/plugins/mock/dpd.vue
@@ -2,7 +2,7 @@
   <d2-container type="ghost">
     <el-card shadow="never" class="d2-mb">
       <d2-demo-page-header slot="header" title="数据占位符"/>
-      <d2-markdown :md="doc"/>
+      <d2-markdown :source="doc"/>
     </el-card>
     <d2-demo-mock-card
       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 5ff55ec3..3eb7a3d9 100644
--- a/src/pages/demo/plugins/mock/dtd.vue
+++ b/src/pages/demo/plugins/mock/dtd.vue
@@ -2,7 +2,7 @@
   <d2-container type="ghost">
     <el-card shadow="never" class="d2-mb">
       <d2-demo-page-header slot="header" title="数据模板"/>
-      <d2-markdown :md="doc"/>
+      <d2-markdown :source="doc"/>
     </el-card>
     <d2-demo-mock-card
       v-for="(item, index) in settingDTD"