From 3f5d2bee5332725dc59a93ef54aa696b99648c8a Mon Sep 17 00:00:00 2001
From: junjie <junjie.xia@fit2cloud.com>
Date: Thu, 18 Mar 2021 11:05:14 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E8=A7=86=E5=9B=BE):=20=E8=A7=86=E5=9B=BE?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6=E4=B8=B4=E6=97=B6=E5=B0=81=E8=A3=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/views/chart/chart/bar/baseBar.js | 21 +++++++++++++++++
 .../src/views/chart/chart/line/baseLine.js    | 21 +++++++++++++++++
 .../views/chart/components/ChartComponent.vue | 23 ++++---------------
 3 files changed, 46 insertions(+), 19 deletions(-)
 create mode 100644 frontend/src/views/chart/chart/bar/baseBar.js
 create mode 100644 frontend/src/views/chart/chart/line/baseLine.js

diff --git a/frontend/src/views/chart/chart/bar/baseBar.js b/frontend/src/views/chart/chart/bar/baseBar.js
new file mode 100644
index 0000000000..69788002e1
--- /dev/null
+++ b/frontend/src/views/chart/chart/bar/baseBar.js
@@ -0,0 +1,21 @@
+export function baseBarOption(chart_option, chart) {
+// 处理data
+  if (chart.data) {
+    chart_option.title.text = chart.title
+    chart_option.xAxis.data = chart.data.x
+    chart.data.series.forEach(function(y) {
+      chart_option.legend.data.push(y.name)
+      chart_option.series.push(y)
+    })
+  }
+  // console.log(chart_option);
+  // 处理shape attr
+  if (chart.customAttr) {
+    const customAttr = JSON.parse(chart.customAttr)
+    if (customAttr.color) {
+      chart_option.color = customAttr.color.colors
+    }
+  }
+  return chart_option
+}
+
diff --git a/frontend/src/views/chart/chart/line/baseLine.js b/frontend/src/views/chart/chart/line/baseLine.js
new file mode 100644
index 0000000000..d431f2758d
--- /dev/null
+++ b/frontend/src/views/chart/chart/line/baseLine.js
@@ -0,0 +1,21 @@
+export function baseLineOption(chart_option, chart) {
+// 处理data
+  if (chart.data) {
+    chart_option.title.text = chart.title
+    chart_option.xAxis.data = chart.data.x
+    chart.data.series.forEach(function(y) {
+      chart_option.legend.data.push(y.name)
+      chart_option.series.push(y)
+    })
+  }
+  // console.log(chart_option);
+  // 处理shape attr
+  if (chart.customAttr) {
+    const customAttr = JSON.parse(chart.customAttr)
+    if (customAttr.color) {
+      chart_option.color = customAttr.color.colors
+    }
+  }
+  return chart_option
+}
+
diff --git a/frontend/src/views/chart/components/ChartComponent.vue b/frontend/src/views/chart/components/ChartComponent.vue
index 2e065d2594..4aac1f97ab 100644
--- a/frontend/src/views/chart/components/ChartComponent.vue
+++ b/frontend/src/views/chart/components/ChartComponent.vue
@@ -6,6 +6,8 @@
 
 <script>
 import { BASE_BAR, BASE_LINE } from '../chart/chart'
+import { baseBarOption } from '../chart/bar/baseBar'
+import { baseLineOption } from '../chart/line/baseLine'
 
 export default {
   name: 'ChartComponent',
@@ -35,28 +37,11 @@ export default {
       let chart_option = {}
       // todo type
       if (chart.type === 'bar') {
-        chart_option = JSON.parse(JSON.stringify(BASE_BAR))
+        chart_option = baseBarOption(JSON.parse(JSON.stringify(BASE_BAR)), chart)
       } else if (chart.type === 'line') {
-        chart_option = JSON.parse(JSON.stringify(BASE_LINE))
+        chart_option = baseLineOption(JSON.parse(JSON.stringify(BASE_LINE)), chart)
       }
       // console.log(chart_option);
-      // 处理data
-      if (chart.data) {
-        chart_option.title.text = chart.title
-        chart_option.xAxis.data = chart.data.x
-        chart.data.series.forEach(function(y) {
-          chart_option.legend.data.push(y.name)
-          chart_option.series.push(y)
-        })
-      }
-      // console.log(chart_option);
-      // 处理shape attr
-      if (chart.customAttr) {
-        const customAttr = JSON.parse(chart.customAttr)
-        if (customAttr.color) {
-          chart_option.color = customAttr.color.colors
-        }
-      }
       this.myEcharts(chart_option)
     },
     myEcharts(option) {