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

Former-commit-id: 84650508814baf1791d8b29472b88eddecfc3660
Former-commit-id: c03e89464e3d3c3cde9a42db8e7447744bcb7e90
Former-commit-id: 9e4184577b6ad94dfaa909bd08fd28aac21371e5
---
 src/components/G2/Line/1.vue          | 18 ++++++------------
 src/components/G2/mixins/G2.js        | 16 +++-------------
 src/pages/demo/chart/index/index.vue  |  1 +
 src/pages/demo/chart/index/style.scss |  2 +-
 4 files changed, 11 insertions(+), 26 deletions(-)

diff --git a/src/components/G2/Line/1.vue b/src/components/G2/Line/1.vue
index 1265f613..79a7360a 100644
--- a/src/components/G2/Line/1.vue
+++ b/src/components/G2/Line/1.vue
@@ -8,6 +8,12 @@ export default {
   mixins: [
     G2Mixin
   ],
+  data () {
+    return {
+      // [图表设置项] padding
+      padding: [30, 40, 50, 50]
+    }
+  },
   methods: {
     // 初始化图表
     initHandler () {
@@ -17,18 +23,6 @@ export default {
         height: this.G2.DomUtil.getHeight(this.$refs.chart),
         padding: this.padding
       })
-      this.chart.guide().text({
-        top: true,
-        position: ['min', 'max'],
-        content: this.title,
-        style: {
-          fill: '#666', // 文本颜色
-          fontSize: '16', // 文本大小
-          fontWeight: 'bold' // 文本粗细
-        },
-        offsetX: 0,
-        offsetY: 0
-      })
       this.chart.source(this.data)
       this.chart.scale('value', {
         min: 0
diff --git a/src/components/G2/mixins/G2.js b/src/components/G2/mixins/G2.js
index 5f79dade..739d7cc5 100644
--- a/src/components/G2/mixins/G2.js
+++ b/src/components/G2/mixins/G2.js
@@ -17,24 +17,12 @@ export default {
       required: false,
       default: true
     },
-    // [图表设置项] 标题
-    title: {
-      type: String,
-      required: false,
-      default: ''
-    },
     // [图表设置项] 高度
     height: {
       type: Number,
       required: false,
       default: 300
     },
-    // [图表设置项] padding
-    padding: {
-      type: Array,
-      required: false,
-      default: () => [50, 50, 50, 50]
-    },
     // [图表设置项] 开启自动填充父元素高度
     autoHeight: {
       type: Boolean,
@@ -55,7 +43,9 @@ export default {
       // 数据处理模块
       dataSet,
       // 图表实例
-      chart: null
+      chart: null,
+      // [图表设置项] padding
+      padding: [40, 40, 40, 40]
     }
   },
   mounted () {
diff --git a/src/pages/demo/chart/index/index.vue b/src/pages/demo/chart/index/index.vue
index 4df4f8e9..86cb183d 100644
--- a/src/pages/demo/chart/index/index.vue
+++ b/src/pages/demo/chart/index/index.vue
@@ -3,6 +3,7 @@
     <GridLayout v-bind="layout">
       <GridItem v-bind="layout.layout[0]" @resize="resizeHandler('G2Line1')" @resized="resizedHandler('G2Line1')">
         <el-card>
+          <div slot="header">近年趋势</div>
           <G2Line1
             ref="G2Line1"
             :data="G2Line1"
diff --git a/src/pages/demo/chart/index/style.scss b/src/pages/demo/chart/index/style.scss
index 3651a2bf..717b922e 100644
--- a/src/pages/demo/chart/index/style.scss
+++ b/src/pages/demo/chart/index/style.scss
@@ -6,7 +6,7 @@
       @extend %unable-select;
       height: 100%;
       .el-card__body {
-        height: 100%;
+        height: calc(100% - 59px);
         padding: 0px;
       }
     }