From 7e14d6bdd03bc569556d2d741d1dfb716c7256b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E6=9D=A8?= <1711467488@qq.com>
Date: Sat, 17 Feb 2018 20:35:27 +0800
Subject: [PATCH] no message

Former-commit-id: 2141d329b4b149fdcae5797f361956279e5871ab
Former-commit-id: df9e876dab3508675d75c2bb9a83f093b304ade4
Former-commit-id: 600e36c32aee8d60bd9ee21aa686f815c73e1f12
---
 .../index/components/ChartCardHeader.vue      | 13 ++-
 src/pages/demo/chart/index/index.vue          | 79 +++++++++++++++++--
 src/pages/demo/chart/index/mixins/chart.js    | 30 -------
 src/pages/demo/chart/index/mixins/layout.js   | 46 -----------
 4 files changed, 82 insertions(+), 86 deletions(-)
 delete mode 100644 src/pages/demo/chart/index/mixins/chart.js
 delete mode 100644 src/pages/demo/chart/index/mixins/layout.js

diff --git a/src/pages/demo/chart/index/components/ChartCardHeader.vue b/src/pages/demo/chart/index/components/ChartCardHeader.vue
index 9b13f8df..ac631360 100644
--- a/src/pages/demo/chart/index/components/ChartCardHeader.vue
+++ b/src/pages/demo/chart/index/components/ChartCardHeader.vue
@@ -2,9 +2,11 @@
   <div>
     {{title}}
     <span class="dd-fr">
-      <el-tooltip effect="dark" content="刷新数据" placement="top">
-        <Icon class="chart-card-header-icon" name="refresh"></Icon>
-      </el-tooltip>
+      <Icon
+        class="chart-card-header-icon"
+        name="refresh"
+        @click="handleRefresh">
+      </Icon>
     </span>
   </div>
 </template>
@@ -17,6 +19,11 @@ export default {
       required: false,
       default: ''
     }
+  },
+  methods: {
+    handleRefresh () {
+      this.$emit('refresh')
+    }
   }
 }
 </script>
diff --git a/src/pages/demo/chart/index/index.vue b/src/pages/demo/chart/index/index.vue
index f8834c31..cb333758 100644
--- a/src/pages/demo/chart/index/index.vue
+++ b/src/pages/demo/chart/index/index.vue
@@ -8,7 +8,8 @@
         <el-card class="header-in">
           <ChartCardHeader
             slot="header"
-            title="近年行情">
+            title="近年行情"
+            @refresh="handleRefreshData('G2LineBase1')">
           </ChartCardHeader>
           <G2LineBase ref="G2LineBase1" v-bind="chart[0]"></G2LineBase>
         </el-card>
@@ -18,16 +19,80 @@
 </template>
 
 <script>
-import layout from './mixins/layout'
-import chart from './mixins/chart'
 import ChartCardHeader from './components/ChartCardHeader'
 export default {
-  mixins: [
-    layout,
-    chart
-  ],
   components: {
     ChartCardHeader
+  },
+  data () {
+    return {
+      chart: [
+        {
+          data: [],
+          padding: [30, 40, 50, 50]
+        }
+      ],
+      layout: {
+        // 调整布局时 复制 layoutUpdatedHandler() 输出的日志到这里
+        layout: [
+          {'x': 0, 'y': 0, 'w': 8, 'h': 9, 'i': '0'},
+          {'x': 8, 'y': 0, 'w': 4, 'h': 9, 'i': '1'},
+          {'x': 0, 'y': 9, 'w': 4, 'h': 7, 'i': '2'}
+        ],
+        colNum: 12,
+        rowHeight: 30,
+        isDraggable: true,
+        isResizable: true,
+        isMirrored: false,
+        verticalCompact: true,
+        margin: [10, 10],
+        useCssTransforms: true
+      }
+    }
+  },
+  mounted () {
+    // 请求图表数据
+    this.syncData()
+  },
+  methods: {
+    // 请求图表数据
+    syncData () {
+      const api = [
+        {url: '/api/chart/G2Line', data: {code: 1}}
+      ]
+      this.$axios.all(api.map(e => this.$axios.post(e.url, e.data)))
+        .then(this.$axios.spread((...res) => {
+          res.forEach((e, index) => {
+            this.chart[index].data = e
+          })
+        }))
+    },
+    // 更新指定的图表
+    chartResize (name) {
+      this.$nextTick(() => {
+        this.$refs[name].resize()
+      })
+    },
+    // 布局组件发生变化
+    layoutUpdatedHandler (newLayout) {
+      console.group('layoutUpdatedHandler')
+      newLayout.forEach(e => {
+        console.log(`{'x': ${e.x}, 'y': ${e.y}, 'w': ${e.w}, 'h': ${e.h}, 'i': '${e.i}'},`)
+      })
+      console.groupEnd()
+    },
+    // 改变尺寸
+    handleResize (name) {
+      // this.chartResize(name)
+    },
+    // 改变尺寸完成
+    handleResized (name) {
+      this.chartResize(name)
+    },
+    // 用户触发了卡片右上角的刷新按钮
+    handleRefreshData (name) {
+      //
+    }
   }
 }
 </script>
diff --git a/src/pages/demo/chart/index/mixins/chart.js b/src/pages/demo/chart/index/mixins/chart.js
deleted file mode 100644
index c24e23c5..00000000
--- a/src/pages/demo/chart/index/mixins/chart.js
+++ /dev/null
@@ -1,30 +0,0 @@
-export default {
-  data () {
-    return {
-      chart: [
-        {
-          data: [],
-          padding: [30, 40, 50, 50]
-        }
-      ]
-    }
-  },
-  mounted () {
-    // 请求图表数据
-    this.syncData()
-  },
-  methods: {
-    // 请求图表数据
-    syncData () {
-      const api = [
-        {url: '/api/chart/G2Line', data: {code: 1}}
-      ]
-      this.$axios.all(api.map(e => this.$axios.post(e.url, e.data)))
-        .then(this.$axios.spread((...res) => {
-          res.forEach((e, index) => {
-            this.chart[index].data = e
-          })
-        }))
-    }
-  }
-}
diff --git a/src/pages/demo/chart/index/mixins/layout.js b/src/pages/demo/chart/index/mixins/layout.js
deleted file mode 100644
index c68a03dc..00000000
--- a/src/pages/demo/chart/index/mixins/layout.js
+++ /dev/null
@@ -1,46 +0,0 @@
-export default {
-  data () {
-    return {
-      layout: {
-        // 调整布局时 复制 layoutUpdatedHandler() 输出的日志到这里
-        layout: [
-          {'x': 0, 'y': 0, 'w': 8, 'h': 9, 'i': '0'},
-          {'x': 8, 'y': 0, 'w': 4, 'h': 9, 'i': '1'},
-          {'x': 0, 'y': 9, 'w': 4, 'h': 7, 'i': '2'}
-        ],
-        colNum: 12,
-        rowHeight: 30,
-        isDraggable: true,
-        isResizable: true,
-        isMirrored: false,
-        verticalCompact: true,
-        margin: [10, 10],
-        useCssTransforms: true
-      }
-    }
-  },
-  methods: {
-    // 更新指定的图表
-    chartResize (name) {
-      this.$nextTick(() => {
-        this.$refs[name].resize()
-      })
-    },
-    // 布局组件发生变化
-    layoutUpdatedHandler (newLayout) {
-      console.group('layoutUpdatedHandler')
-      newLayout.forEach(e => {
-        console.log(`{'x': ${e.x}, 'y': ${e.y}, 'w': ${e.w}, 'h': ${e.h}, 'i': '${e.i}'},`)
-      })
-      console.groupEnd()
-    },
-    // 改变尺寸
-    handleResize (name) {
-      // this.chartResize(name)
-    },
-    // 改变尺寸完成
-    handleResized (name) {
-      this.chartResize(name)
-    }
-  }
-}