From 7b45ab3d4b1f61e9e137a51e61dd008f551cd7fa Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Sat, 21 Jul 2018 14:20:17 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Former-commit-id: 121e921de0a048fcf821596db7e7c516d6d44cc2 [formerly aa2ab1d34fe46d32f45649ff71b0054b76991aa8] [formerly 121e921de0a048fcf821596db7e7c516d6d44cc2 [formerly aa2ab1d34fe46d32f45649ff71b0054b76991aa8] [formerly 121e921de0a048fcf821596db7e7c516d6d44cc2 [formerly aa2ab1d34fe46d32f45649ff71b0054b76991aa8] [formerly aa2ab1d34fe46d32f45649ff71b0054b76991aa8 [formerly 11bcd39d25f8787a3962d16a166e2a702d5d0578 [formerly 5dac86d77cb507e2b89068cc2700b3d9f4fa54dc]]]]]
Former-commit-id: 61150ade70f19af15008156cee552c8f35e07e85
Former-commit-id: 854b3e9fe29503fdfeba5e0995da44975600f506
Former-commit-id: 8cc189c6b6eeee8ee876a67f17592c482513fdfa [formerly 030bd35325db27ffd3f933587c77ce9ba0544594]
Former-commit-id: 596ab4016d4a89806716d52e187d0a1f52f86294
Former-commit-id: 27a828385cab47d43d12a9dcea16a7866e3a563d
Former-commit-id: eaa1089257ce81ff31b7d02587e6c79076f8f7fe
Former-commit-id: 26641624bc3a4bb4d36490b5435b8aa109ccaeb8
Former-commit-id: 3bfa59554d13342ea6b1962aa8dfa8e7c0f51e71
---
 .../demo/components/container/card-slot.vue      | 10 ++++------
 src/pages/demo/components/container/card.vue     | 10 ++++------
 .../container/components/d2-demo-article.vue     | 16 ++++++++++++++++
 src/pages/demo/components/container/full-bs.vue  | 10 ++++------
 .../demo/components/container/full-slot.vue      | 10 ++++------
 src/pages/demo/components/container/full.vue     | 10 ++++------
 src/pages/demo/components/container/ghost-bs.vue | 12 ++++--------
 .../demo/components/container/ghost-slot.vue     | 12 ++++--------
 src/pages/demo/components/container/ghost.vue    | 12 ++++--------
 9 files changed, 48 insertions(+), 54 deletions(-)
 create mode 100644 src/pages/demo/components/container/components/d2-demo-article.vue

diff --git a/src/pages/demo/components/container/card-slot.vue b/src/pages/demo/components/container/card-slot.vue
index 2be299ec..5eab829a 100644
--- a/src/pages/demo/components/container/card-slot.vue
+++ b/src/pages/demo/components/container/card-slot.vue
@@ -1,18 +1,16 @@
 <template>
   <d2-container type="card">
     <template slot="header">header</template>
-    <d2-markdown :source="long"/>
+    <d2-demo-article/>
     <template slot="footer">footer</template>
   </d2-container>
 </template>
 
 <script>
-import long from './md/long.md'
+import d2DemoArticle from './components/d2-demo-article'
 export default {
-  data () {
-    return {
-      long
-    }
+  components: {
+    'd2-demo-article': d2DemoArticle
   }
 }
 </script>
diff --git a/src/pages/demo/components/container/card.vue b/src/pages/demo/components/container/card.vue
index a5f5e1cf..ec121617 100644
--- a/src/pages/demo/components/container/card.vue
+++ b/src/pages/demo/components/container/card.vue
@@ -1,16 +1,14 @@
 <template>
   <d2-container type="card">
-    <d2-markdown :source="long"/>
+    <d2-demo-article/>
   </d2-container>
 </template>
 
 <script>
-import long from './md/long.md'
+import d2DemoArticle from './components/d2-demo-article'
 export default {
-  data () {
-    return {
-      long
-    }
+  components: {
+    'd2-demo-article': d2DemoArticle
   }
 }
 </script>
diff --git a/src/pages/demo/components/container/components/d2-demo-article.vue b/src/pages/demo/components/container/components/d2-demo-article.vue
new file mode 100644
index 00000000..ab96b27d
--- /dev/null
+++ b/src/pages/demo/components/container/components/d2-demo-article.vue
@@ -0,0 +1,16 @@
+<template>
+  <div>
+    <d2-markdown :source="long"/>
+  </div>
+</template>
+
+<script>
+import long from '../md/long'
+export default {
+  data () {
+    return {
+      long
+    }
+  }
+}
+</script>
diff --git a/src/pages/demo/components/container/full-bs.vue b/src/pages/demo/components/container/full-bs.vue
index 409d3cb9..ba002053 100644
--- a/src/pages/demo/components/container/full-bs.vue
+++ b/src/pages/demo/components/container/full-bs.vue
@@ -1,18 +1,16 @@
 <template>
   <d2-container scroll>
     <template slot="header">header</template>
-    <d2-markdown :source="long"/>
+    <d2-demo-article/>
     <template slot="footer">header</template>
   </d2-container>
 </template>
 
 <script>
-import long from './md/long.md'
+import d2DemoArticle from './components/d2-demo-article'
 export default {
-  data () {
-    return {
-      long
-    }
+  components: {
+    'd2-demo-article': d2DemoArticle
   }
 }
 </script>
diff --git a/src/pages/demo/components/container/full-slot.vue b/src/pages/demo/components/container/full-slot.vue
index dbe4c9f7..29897b85 100644
--- a/src/pages/demo/components/container/full-slot.vue
+++ b/src/pages/demo/components/container/full-slot.vue
@@ -1,18 +1,16 @@
 <template>
   <d2-container>
     <template slot="header">header</template>
-    <d2-markdown :source="long"/>
+    <d2-demo-article/>
     <template slot="footer">footer</template>
   </d2-container>
 </template>
 
 <script>
-import long from './md/long.md'
+import d2DemoArticle from './components/d2-demo-article'
 export default {
-  data () {
-    return {
-      long
-    }
+  components: {
+    'd2-demo-article': d2DemoArticle
   }
 }
 </script>
diff --git a/src/pages/demo/components/container/full.vue b/src/pages/demo/components/container/full.vue
index ec4b3915..9d99c936 100644
--- a/src/pages/demo/components/container/full.vue
+++ b/src/pages/demo/components/container/full.vue
@@ -1,16 +1,14 @@
 <template>
   <d2-container>
-    <d2-markdown :source="long"/>
+    <d2-demo-article/>
   </d2-container>
 </template>
 
 <script>
-import long from './md/long.md'
+import d2DemoArticle from './components/d2-demo-article'
 export default {
-  data () {
-    return {
-      long
-    }
+  components: {
+    'd2-demo-article': d2DemoArticle
   }
 }
 </script>
diff --git a/src/pages/demo/components/container/ghost-bs.vue b/src/pages/demo/components/container/ghost-bs.vue
index 52584aed..3ca9a643 100644
--- a/src/pages/demo/components/container/ghost-bs.vue
+++ b/src/pages/demo/components/container/ghost-bs.vue
@@ -2,21 +2,17 @@
   <d2-container type="ghost" scroll>
     <template slot="header">header</template>
     <div class="d2-pt d2-pb">
-      <el-card shadow="never" style="width: 600px;">
-        <d2-markdown :source="long"/>
-      </el-card>
+      <d2-demo-article/>
     </div>
     <template slot="footer">footer</template>
   </d2-container>
 </template>
 
 <script>
-import long from './md/long.md'
+import d2DemoArticle from './components/d2-demo-article'
 export default {
-  data () {
-    return {
-      long
-    }
+  components: {
+    'd2-demo-article': d2DemoArticle
   }
 }
 </script>
diff --git a/src/pages/demo/components/container/ghost-slot.vue b/src/pages/demo/components/container/ghost-slot.vue
index a941bdae..50615cee 100644
--- a/src/pages/demo/components/container/ghost-slot.vue
+++ b/src/pages/demo/components/container/ghost-slot.vue
@@ -2,21 +2,17 @@
   <d2-container type="ghost">
     <template slot="header">header</template>
     <div class="d2-pt d2-pb">
-      <el-card shadow="never" style="width: 600px;">
-        <d2-markdown :source="long"/>
-      </el-card>
+      <d2-demo-article/>
     </div>
     <template slot="footer">footer</template>
   </d2-container>
 </template>
 
 <script>
-import long from './md/long.md'
+import d2DemoArticle from './components/d2-demo-article'
 export default {
-  data () {
-    return {
-      long
-    }
+  components: {
+    'd2-demo-article': d2DemoArticle
   }
 }
 </script>
diff --git a/src/pages/demo/components/container/ghost.vue b/src/pages/demo/components/container/ghost.vue
index cb1ea2f8..a5bdac92 100644
--- a/src/pages/demo/components/container/ghost.vue
+++ b/src/pages/demo/components/container/ghost.vue
@@ -1,20 +1,16 @@
 <template>
   <d2-container type="ghost">
     <div class="d2-pt d2-pb">
-      <el-card shadow="never" style="width: 600px;">
-        <d2-markdown :source="long"/>
-      </el-card>
+      <d2-demo-article/>
     </div>
   </d2-container>
 </template>
 
 <script>
-import long from './md/long.md'
+import d2DemoArticle from './components/d2-demo-article'
 export default {
-  data () {
-    return {
-      long
-    }
+  components: {
+    'd2-demo-article': d2DemoArticle
   }
 }
 </script>