From 453839099b881dcdc09603308f522c6919b81144 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E6=9D=A8?= <1711467488@qq.com>
Date: Mon, 19 Feb 2018 14:53:26 +0800
Subject: [PATCH] no message

Former-commit-id: d3af31231001a5d4d3313a84bcce19d6e3909990
Former-commit-id: e1815df054e24bc3a5ccb0423e1e49dcd15eb080
Former-commit-id: 71084fb3c455afc0a0868cc4edc46793ef4181e0
---
 src/pages/demo/chart/demo/areaBase.vue        | 15 +++++++++++--
 .../chart/demo/components/ChartDemoCard.vue   | 22 ++++++++++++++++++-
 2 files changed, 34 insertions(+), 3 deletions(-)

diff --git a/src/pages/demo/chart/demo/areaBase.vue b/src/pages/demo/chart/demo/areaBase.vue
index 71425f03..c0752004 100644
--- a/src/pages/demo/chart/demo/areaBase.vue
+++ b/src/pages/demo/chart/demo/areaBase.vue
@@ -1,6 +1,10 @@
 <template>
   <Container type="ghost" :responsive="true">
-    <ChartDemoCard></ChartDemoCard>
+    <ChartDemoCard>
+      <template slot-scope="props">
+        <G2AreaBase :data="props.data" v-bind="chart"></G2AreaBase>
+      </template>
+    </ChartDemoCard>
   </Container>
 </template>
 
@@ -9,6 +13,13 @@ import publicMixin from './mixins/public'
 export default {
   mixins: [
     publicMixin
-  ]
+  ],
+  data () {
+    return {
+      chart: {
+        // 图表设置
+      }
+    }
+  }
 }
 </script>
diff --git a/src/pages/demo/chart/demo/components/ChartDemoCard.vue b/src/pages/demo/chart/demo/components/ChartDemoCard.vue
index d37c1028..2205cb6a 100644
--- a/src/pages/demo/chart/demo/components/ChartDemoCard.vue
+++ b/src/pages/demo/chart/demo/components/ChartDemoCard.vue
@@ -1,5 +1,25 @@
 <template>
   <el-card>
-    Hello
+    <div :style="style">
+      <slot :data="data"></slot>
+    </div>
   </el-card>
 </template>
+
+<script>
+export default {
+  data () {
+    return {
+      data: [],
+      height: 300
+    }
+  },
+  computed: {
+    style () {
+      return {
+        height: this.height + 'px'
+      }
+    }
+  }
+}
+</script>