From 92356e56583db0daab08204b70bf627364c82ae3 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 18:08:09 +0800
Subject: [PATCH] no message

Former-commit-id: d2d1ab6c1a8cfa893e0f01f7469ed97c91d5b5d6
Former-commit-id: cc8d8320f324bbeab0fb88d3e0a51a780e08a1e0
Former-commit-id: d59a0c303631d5f9c788e38d08328dd6311ffffa
---
 .../charts/G2/components/NightingaleRose/base.vue        | 7 +++++++
 src/components/charts/G2/components/Pie/base.vue         | 7 +++++++
 src/components/charts/G2/components/Radar/base.vue       | 7 +++++++
 src/pages/demo/chart/demo/components/ChartDemoCard.vue   | 3 ++-
 src/pages/demo/chart/index/index.vue                     | 9 +++------
 src/router/menu/_chart.js                                | 4 ++--
 6 files changed, 28 insertions(+), 9 deletions(-)

diff --git a/src/components/charts/G2/components/NightingaleRose/base.vue b/src/components/charts/G2/components/NightingaleRose/base.vue
index 6926f82f..60f2a822 100644
--- a/src/components/charts/G2/components/NightingaleRose/base.vue
+++ b/src/components/charts/G2/components/NightingaleRose/base.vue
@@ -9,6 +9,13 @@ export default {
   mixins: [
     G2
   ],
+  // 新加参数 或者覆盖 mixin 中的默认参数
+  props: {
+    padding: {
+      required: false,
+      default: () => [40, 40, 40, 40]
+    }
+  },
   methods: {
     // 初始化图表
     init () {
diff --git a/src/components/charts/G2/components/Pie/base.vue b/src/components/charts/G2/components/Pie/base.vue
index b9ee8e52..992bbc42 100644
--- a/src/components/charts/G2/components/Pie/base.vue
+++ b/src/components/charts/G2/components/Pie/base.vue
@@ -9,6 +9,13 @@ export default {
   mixins: [
     G2
   ],
+  // 新加参数 或者覆盖 mixin 中的默认参数
+  props: {
+    padding: {
+      required: false,
+      default: () => [30, 30, 30, 30]
+    }
+  },
   data () {
     return {
       // DataView数据转换设置
diff --git a/src/components/charts/G2/components/Radar/base.vue b/src/components/charts/G2/components/Radar/base.vue
index cb8094a6..ab0c10f5 100644
--- a/src/components/charts/G2/components/Radar/base.vue
+++ b/src/components/charts/G2/components/Radar/base.vue
@@ -9,6 +9,13 @@ export default {
   mixins: [
     G2
   ],
+  // 新加参数 或者覆盖 mixin 中的默认参数
+  props: {
+    padding: {
+      required: false,
+      default: () => [30, 30, 30, 30]
+    }
+  },
   data () {
     return {
       // DataView数据转换设置
diff --git a/src/pages/demo/chart/demo/components/ChartDemoCard.vue b/src/pages/demo/chart/demo/components/ChartDemoCard.vue
index 0bd7323d..c8780ee6 100644
--- a/src/pages/demo/chart/demo/components/ChartDemoCard.vue
+++ b/src/pages/demo/chart/demo/components/ChartDemoCard.vue
@@ -34,7 +34,8 @@ export default {
   computed: {
     style () {
       return {
-        height: this.height + 'px'
+        height: this.height + 'px',
+        margin: '-20px'
       }
     }
   },
diff --git a/src/pages/demo/chart/index/index.vue b/src/pages/demo/chart/index/index.vue
index 210d6f3b..353ba193 100644
--- a/src/pages/demo/chart/index/index.vue
+++ b/src/pages/demo/chart/index/index.vue
@@ -93,20 +93,17 @@ export default {
         {
           api: {url: '/api/chart/G2Pie', data: {type: 'base'}},
           refName: 'G2PieBase',
-          data: [],
-          padding: [30, 30, 30, 30]
+          data: []
         },
         {
           api: {url: '/api/chart/G2NightingaleRose', data: {type: 'base'}},
           refName: 'G2NightingaleRoseBase',
-          data: [],
-          padding: [40, 40, 40, 40]
+          data: []
         },
         {
           api: {url: '/api/chart/G2Radar', data: {type: 'base'}},
           refName: 'G2RadarBase',
-          data: [],
-          padding: [30, 30, 30, 30]
+          data: []
         },
         {
           api: {url: '/api/chart/G2Area', data: {type: 'base'}},
diff --git a/src/router/menu/_chart.js b/src/router/menu/_chart.js
index 65e949ab..d607b6b3 100644
--- a/src/router/menu/_chart.js
+++ b/src/router/menu/_chart.js
@@ -25,7 +25,7 @@ export const menu = {
     // 所有
     {
       title: '所有',
-      icon: 'file-o',
+      icon: 'th',
       path: 'index',
       name: 'demo-chart-index',
       meta: {
@@ -36,7 +36,7 @@ export const menu = {
     // 单独演示
     {
       title: '单独演示',
-      icon: 'file-o',
+      icon: 'bar-chart',
       children: [
         maker('面积图', 'areaBase'),
         maker('条形图', 'barBase'),