From 23719d6b918519bd4bea0a84d66dc668bea8e875 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 13:29:50 +0800
Subject: [PATCH] no message

Former-commit-id: 0f4dec9260afd64158506873442954bdf58d20c4
Former-commit-id: 160dbe94357a4fa21765c1671d1783bab4282fd9
Former-commit-id: 2dbe3d4c8e3c7e25ef5be1739a11c0b51c131155
---
 src/pages/demo/chart/demo/areaBase.vue        | 39 +++++++++++++++++-
 .../demo/components/ChartDemoControl.vue      | 41 +++++++++++++++++++
 src/pages/demo/chart/demo/mixins/public.js    | 41 +++++++++++++++++++
 src/router/menu/_chart.js                     |  3 --
 4 files changed, 120 insertions(+), 4 deletions(-)
 create mode 100644 src/pages/demo/chart/demo/components/ChartDemoControl.vue
 create mode 100644 src/pages/demo/chart/demo/mixins/public.js

diff --git a/src/pages/demo/chart/demo/areaBase.vue b/src/pages/demo/chart/demo/areaBase.vue
index 98a2b178..4a7fa911 100644
--- a/src/pages/demo/chart/demo/areaBase.vue
+++ b/src/pages/demo/chart/demo/areaBase.vue
@@ -1,5 +1,42 @@
 <template>
   <Container type="ghost" :responsive="true">
-    demo
+    <el-row :gutter="20">
+      <el-col :span="6">
+        <ChartDemoControl
+          @sync="syncData"
+          :height.sync="height">
+        </ChartDemoControl>
+      </el-col>
+      <el-col :span="18">
+        <el-card>
+          <div :style="style">
+            <G2AreaBase ref="chart" v-bind="chart"></G2AreaBase>
+          </div>
+        </el-card>
+      </el-col>
+    </el-row>
   </Container>
 </template>
+
+<script>
+import publicMixin from './mixins/public'
+export default {
+  mixins: [
+    publicMixin
+  ],
+  data () {
+    return {
+      api: {
+        url: '/api/chart/G2Area',
+        data: {
+          type: 'base'
+        }
+      },
+      chart: {
+        data: []
+      }
+    }
+  }
+}
+</script>
+
diff --git a/src/pages/demo/chart/demo/components/ChartDemoControl.vue b/src/pages/demo/chart/demo/components/ChartDemoControl.vue
new file mode 100644
index 00000000..e4b977a4
--- /dev/null
+++ b/src/pages/demo/chart/demo/components/ChartDemoControl.vue
@@ -0,0 +1,41 @@
+<template>
+  <el-card>
+    <el-button @click="$emit('sync')">
+      <Icon name="refresh"></Icon>
+      重新载入数据
+    </el-button>
+    <p>改变容器高度</p>
+    <el-radio-group v-model="currentHeight" size="small">
+      <el-radio-button v-for="(item, index) in heightOptions" :key="index" :label="item">{{item}}</el-radio-button>
+    </el-radio-group>
+  </el-card>
+</template>
+
+<script>
+export default {
+  props: {
+    height: {
+      type: Number,
+      required: false,
+      default: 0
+    }
+  },
+  data () {
+    return {
+      heightOptions: [300, 400, 500, 600],
+      currentHeight: 0
+    }
+  },
+  created () {
+    this.currentHeight = this.height
+  },
+  watch: {
+    currentHeight (value) {
+      if (value !== this.height) {
+        this.$emit('update:height', value)
+      }
+    }
+  }
+}
+</script>
+
diff --git a/src/pages/demo/chart/demo/mixins/public.js b/src/pages/demo/chart/demo/mixins/public.js
new file mode 100644
index 00000000..45c0b2ba
--- /dev/null
+++ b/src/pages/demo/chart/demo/mixins/public.js
@@ -0,0 +1,41 @@
+import ChartDemoControl from '../components/ChartDemoControl.vue'
+export default {
+  components: {
+    ChartDemoControl
+  },
+  data () {
+    return {
+      height: 300
+    }
+  },
+  mounted () {
+    this.syncData()
+  },
+  computed: {
+    style () {
+      return {
+        height: this.height + 'px'
+      }
+    }
+  },
+  watch: {
+    style () {
+      this.$nextTick(() => {
+        this.resize()
+      })
+    }
+  },
+  methods: {
+    // 请求数据
+    syncData () {
+      this.$axios.post(this.api.url, this.api.data)
+        .then(res => {
+          this.chart.data = res
+        })
+    },
+    // 重新适应大小
+    resize () {
+      this.$refs.chart.resize()
+    }
+  }
+}
diff --git a/src/router/menu/_chart.js b/src/router/menu/_chart.js
index 517693f9..59909a0d 100644
--- a/src/router/menu/_chart.js
+++ b/src/router/menu/_chart.js
@@ -7,9 +7,6 @@ export const menu = {
     requiresAuth: true
   },
   component: resolve => { require(['@/components/core/MainLayout/index.vue'], resolve) },
-  redirect: {
-    name: 'demo-chart-index'
-  },
   children: [
     // 所有
     {