From 815a97a002100b3b9fcd3a896ef7bb4221c95fff 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 11:26:36 +0800
Subject: [PATCH] no message

Former-commit-id: e42b1ce57f595759636bc8e4e42b1eab6bc4e70f
Former-commit-id: 91009871838e2c143836c0baec9c6eeda84ad145
Former-commit-id: 471c0f984124c70409b7ad73e105999fa9e04b8d
---
 .../{G2 => _G2}/charts/Column/1.vue           |  0
 src/components/{G2 => _G2}/charts/Line/1.vue  |  0
 src/components/{G2 => _G2}/charts/Pie/1.vue   |  0
 src/components/{G2 => _G2}/index.js           |  0
 src/components/{G2 => _G2}/mixins/G2.js       |  0
 src/components/charts/G2/index.js             |  3 ++
 src/components/index.js                       |  4 +-
 .../demo/chart/{index2 => _index}/index.vue   |  7 ++--
 .../chart/{index2 => _index}/mixins/chart.js  |  0
 .../chart/{index2 => _index}/mixins/layout.js | 14 +++----
 .../demo/chart/{index2 => _index}/style.scss  |  0
 src/pages/demo/chart/index/index.vue          | 20 +++-------
 src/pages/demo/chart/index/mixins/chart.js    | 37 ++++++++-----------
 src/pages/demo/chart/index/mixins/layout.js   | 14 ++++---
 src/router/menu/_chart.js                     | 10 -----
 15 files changed, 43 insertions(+), 66 deletions(-)
 rename src/components/{G2 => _G2}/charts/Column/1.vue (100%)
 rename src/components/{G2 => _G2}/charts/Line/1.vue (100%)
 rename src/components/{G2 => _G2}/charts/Pie/1.vue (100%)
 rename src/components/{G2 => _G2}/index.js (100%)
 rename src/components/{G2 => _G2}/mixins/G2.js (100%)
 create mode 100644 src/components/charts/G2/index.js
 rename src/pages/demo/chart/{index2 => _index}/index.vue (83%)
 rename src/pages/demo/chart/{index2 => _index}/mixins/chart.js (100%)
 rename src/pages/demo/chart/{index2 => _index}/mixins/layout.js (77%)
 rename src/pages/demo/chart/{index2 => _index}/style.scss (100%)

diff --git a/src/components/G2/charts/Column/1.vue b/src/components/_G2/charts/Column/1.vue
similarity index 100%
rename from src/components/G2/charts/Column/1.vue
rename to src/components/_G2/charts/Column/1.vue
diff --git a/src/components/G2/charts/Line/1.vue b/src/components/_G2/charts/Line/1.vue
similarity index 100%
rename from src/components/G2/charts/Line/1.vue
rename to src/components/_G2/charts/Line/1.vue
diff --git a/src/components/G2/charts/Pie/1.vue b/src/components/_G2/charts/Pie/1.vue
similarity index 100%
rename from src/components/G2/charts/Pie/1.vue
rename to src/components/_G2/charts/Pie/1.vue
diff --git a/src/components/G2/index.js b/src/components/_G2/index.js
similarity index 100%
rename from src/components/G2/index.js
rename to src/components/_G2/index.js
diff --git a/src/components/G2/mixins/G2.js b/src/components/_G2/mixins/G2.js
similarity index 100%
rename from src/components/G2/mixins/G2.js
rename to src/components/_G2/mixins/G2.js
diff --git a/src/components/charts/G2/index.js b/src/components/charts/G2/index.js
new file mode 100644
index 00000000..5c53fd7f
--- /dev/null
+++ b/src/components/charts/G2/index.js
@@ -0,0 +1,3 @@
+// import Vue from 'vue'
+
+// Vue.component('G2Line1', resolve => { require(['@/components/G2/charts/Line/1.vue'], resolve) })
diff --git a/src/components/index.js b/src/components/index.js
index f7ce81b2..e800037c 100644
--- a/src/components/index.js
+++ b/src/components/index.js
@@ -2,5 +2,5 @@
 import './core'
 // 非核心组件 只是在很多演示页面中用到的组件
 import './demo'
-// 图表组件
-import './G2'
+// 图表组件 G2
+import './charts/G2'
diff --git a/src/pages/demo/chart/index2/index.vue b/src/pages/demo/chart/_index/index.vue
similarity index 83%
rename from src/pages/demo/chart/index2/index.vue
rename to src/pages/demo/chart/_index/index.vue
index 944de3b8..8526efe3 100644
--- a/src/pages/demo/chart/index2/index.vue
+++ b/src/pages/demo/chart/_index/index.vue
@@ -4,19 +4,19 @@
       <GridItem v-bind="layout.layout[0]" @resize="resizeHandler('G2Line1')" @resized="resizedHandler('G2Line1')">
         <el-card class="header-in">
           <div slot="header">近年趋势</div>
-          1
+          <G2Line1 ref="G2Line1" :data="chartData.G2Line1"></G2Line1>
         </el-card>
       </GridItem>
       <GridItem v-bind="layout.layout[1]" @resize="resizeHandler('G2Pie1')" @resized="resizedHandler('G2Pie1')">
         <el-card class="header-in">
           <div slot="header">人员分布</div>
-          2
+          <G2Pie1 ref="G2Pie1" :data="chartData.G2Pie1"></G2Pie1>
         </el-card>
       </GridItem>
       <GridItem v-bind="layout.layout[2]" @resize="resizeHandler('G2Column1')" @resized="resizedHandler('G2Column1')">
         <el-card class="header-in">
           <div slot="header">人员分布</div>
-          3
+          <G2Column1 ref="G2Column1" :data="chartData.G2Column1"></G2Column1>
         </el-card>
       </GridItem>
     </GridLayout>
@@ -37,3 +37,4 @@ export default {
 <style lang="scss">
 @import './style.scss';
 </style>
+
diff --git a/src/pages/demo/chart/index2/mixins/chart.js b/src/pages/demo/chart/_index/mixins/chart.js
similarity index 100%
rename from src/pages/demo/chart/index2/mixins/chart.js
rename to src/pages/demo/chart/_index/mixins/chart.js
diff --git a/src/pages/demo/chart/index2/mixins/layout.js b/src/pages/demo/chart/_index/mixins/layout.js
similarity index 77%
rename from src/pages/demo/chart/index2/mixins/layout.js
rename to src/pages/demo/chart/_index/mixins/layout.js
index d65f8ded..12d5e68c 100644
--- a/src/pages/demo/chart/index2/mixins/layout.js
+++ b/src/pages/demo/chart/_index/mixins/layout.js
@@ -2,7 +2,6 @@ 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'},
@@ -20,11 +19,6 @@ export default {
     }
   },
   methods: {
-    // 更新指定的图表
-    chartResize () {
-      this.$log('chartResize')
-    },
-    // 布局组件发生变化
     layoutUpdatedHandler (newLayout) {
       console.group('layoutUpdatedHandler')
       newLayout.forEach(e => {
@@ -34,11 +28,15 @@ export default {
     },
     // 改变尺寸
     resizeHandler (name) {
-      this.chartResize()
+      this.$nextTick(() => {
+        this.$refs[name].resize()
+      })
     },
     // 改变尺寸完成
     resizedHandler (name) {
-      this.chartResize()
+      this.$nextTick(() => {
+        this.$refs[name].resize()
+      })
     }
   }
 }
diff --git a/src/pages/demo/chart/index2/style.scss b/src/pages/demo/chart/_index/style.scss
similarity index 100%
rename from src/pages/demo/chart/index2/style.scss
rename to src/pages/demo/chart/_index/style.scss
diff --git a/src/pages/demo/chart/index/index.vue b/src/pages/demo/chart/index/index.vue
index 8526efe3..3d701ab0 100644
--- a/src/pages/demo/chart/index/index.vue
+++ b/src/pages/demo/chart/index/index.vue
@@ -1,22 +1,13 @@
 <template>
   <Container type="ghost" :responsive="true" class="demo-chart-index">
     <GridLayout v-bind="layout" @layout-updated="layoutUpdatedHandler">
-      <GridItem v-bind="layout.layout[0]" @resize="resizeHandler('G2Line1')" @resized="resizedHandler('G2Line1')">
+      <GridItem
+        v-bind="layout.layout[0]"
+        @resize="resizeHandler('G2Line1')"
+        @resized="resizedHandler('G2Line1')">
         <el-card class="header-in">
           <div slot="header">近年趋势</div>
-          <G2Line1 ref="G2Line1" :data="chartData.G2Line1"></G2Line1>
-        </el-card>
-      </GridItem>
-      <GridItem v-bind="layout.layout[1]" @resize="resizeHandler('G2Pie1')" @resized="resizedHandler('G2Pie1')">
-        <el-card class="header-in">
-          <div slot="header">人员分布</div>
-          <G2Pie1 ref="G2Pie1" :data="chartData.G2Pie1"></G2Pie1>
-        </el-card>
-      </GridItem>
-      <GridItem v-bind="layout.layout[2]" @resize="resizeHandler('G2Column1')" @resized="resizedHandler('G2Column1')">
-        <el-card class="header-in">
-          <div slot="header">人员分布</div>
-          <G2Column1 ref="G2Column1" :data="chartData.G2Column1"></G2Column1>
+          1
         </el-card>
       </GridItem>
     </GridLayout>
@@ -37,4 +28,3 @@ export default {
 <style lang="scss">
 @import './style.scss';
 </style>
-
diff --git a/src/pages/demo/chart/index/mixins/chart.js b/src/pages/demo/chart/index/mixins/chart.js
index 5ec7f3f2..5797ec01 100644
--- a/src/pages/demo/chart/index/mixins/chart.js
+++ b/src/pages/demo/chart/index/mixins/chart.js
@@ -1,34 +1,27 @@
 export default {
   data () {
-    return {
-      // 数据
-      chartData: {
-        G2Line1: [],
-        G2Pie1: [],
-        G2Column1: []
-      }
-    }
+    return {}
   },
   mounted () {
     // 请求图表数据
-    this.syncData()
+    // this.syncData()
   },
   methods: {
     // 请求图表数据
     syncData () {
-      const api = [
-        {url: '/api/chart/G2Line', data: {code: 1}},
-        {url: '/api/chart/G2Pie', data: {code: 1}},
-        {url: '/api/chart/G2Column', data: {code: 1}}
-      ]
-      this.$axios.all(api.map(e => this.$axios.post(e.url, e.data)))
-        .then(this.$axios.spread((G2Line1, G2Pie1, G2Column1) => {
-          this.chartData = {
-            G2Line1,
-            G2Pie1,
-            G2Column1
-          }
-        }))
+      // const api = [
+      //   {url: '/api/chart/G2Line', data: {code: 1}},
+      //   {url: '/api/chart/G2Pie', data: {code: 1}},
+      //   {url: '/api/chart/G2Column', data: {code: 1}}
+      // ]
+      // this.$axios.all(api.map(e => this.$axios.post(e.url, e.data)))
+      //   .then(this.$axios.spread((G2Line1, G2Pie1, G2Column1) => {
+      //     this.chartData = {
+      //       G2Line1,
+      //       G2Pie1,
+      //       G2Column1
+      //     }
+      //   }))
     }
   }
 }
diff --git a/src/pages/demo/chart/index/mixins/layout.js b/src/pages/demo/chart/index/mixins/layout.js
index 12d5e68c..d65f8ded 100644
--- a/src/pages/demo/chart/index/mixins/layout.js
+++ b/src/pages/demo/chart/index/mixins/layout.js
@@ -2,6 +2,7 @@ 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'},
@@ -19,6 +20,11 @@ export default {
     }
   },
   methods: {
+    // 更新指定的图表
+    chartResize () {
+      this.$log('chartResize')
+    },
+    // 布局组件发生变化
     layoutUpdatedHandler (newLayout) {
       console.group('layoutUpdatedHandler')
       newLayout.forEach(e => {
@@ -28,15 +34,11 @@ export default {
     },
     // 改变尺寸
     resizeHandler (name) {
-      this.$nextTick(() => {
-        this.$refs[name].resize()
-      })
+      this.chartResize()
     },
     // 改变尺寸完成
     resizedHandler (name) {
-      this.$nextTick(() => {
-        this.$refs[name].resize()
-      })
+      this.chartResize()
     }
   }
 }
diff --git a/src/router/menu/_chart.js b/src/router/menu/_chart.js
index 4addee98..7975be79 100644
--- a/src/router/menu/_chart.js
+++ b/src/router/menu/_chart.js
@@ -21,16 +21,6 @@ export const menu = {
         requiresAuth: true
       },
       component: resolve => { require(['@/pages/demo/chart/index/index.vue'], resolve) }
-    },
-    {
-      title: '图表演示2',
-      icon: 'file-o',
-      path: 'index2',
-      name: 'demo-chart-index2',
-      meta: {
-        requiresAuth: true
-      },
-      component: resolve => { require(['@/pages/demo/chart/index2/index.vue'], resolve) }
     }
   ]
 }