Merge pull request #738 from dataease/pr@dev@feat_chart_mix

frontend/src/views/chart/chart/chart.js

@@ -736,3 +736,60 @@ export const BASE_TREEMAP = {
     }
   ]
 }
+
+export const BASE_MIX = {
+  title: {
+    text: '',
+    textStyle: {
+      fontWeight: 'normal'
+    }
+  },
+  grid: {
+    containLabel: true
+  },
+  tooltip: {},
+  legend: {
+    show: true,
+    type: 'scroll',
+    itemWidth: 10,
+    itemHeight: 10,
+    icon: 'rect',
+    data: []
+  },
+  xAxis: {
+    data: []
+  },
+  yAxis: {
+    type: 'value'
+  },
+  series: [],
+  dataZoom: [
+    {
+      type: 'slider',
+      show: false,
+      xAxisIndex: [0],
+      start: 0,
+      end: 100
+    },
+    {
+      type: 'slider',
+      show: false,
+      yAxisIndex: [0],
+      left: '93%',
+      start: 0,
+      end: 100
+    },
+    {
+      type: 'inside',
+      xAxisIndex: [0],
+      start: 0,
+      end: 100
+    },
+    {
+      type: 'inside',
+      yAxisIndex: [0],
+      start: 0,
+      end: 100
+    }
+  ]
+}

frontend/src/views/chart/chart/line/line.js

@@ -36,8 +36,12 @@ export function baseLineOption(chart_option, chart) {
           type: customAttr.size.lineType
         }
         y.smooth = customAttr.size.lineSmooth
-        y.areaStyle = {
-          opacity: customAttr.size.lineArea ? 0.6 : 0
+        if (customAttr.size.lineArea) {
+          y.areaStyle = {
+            opacity: 0.6
+          }
+        } else {
+          delete y.areaStyle
         }
       }
       // label

frontend/src/views/chart/chart/mix/mix.js

@@ -49,8 +49,12 @@ export function baseMixOption(chart_option, chart) {
             type: customAttr.size.lineType
           }
           y.smooth = customAttr.size.lineSmooth
-          y.areaStyle = {
-            opacity: customAttr.size.lineArea ? 0.6 : 0
+          if (customAttr.size.lineArea) {
+            y.areaStyle = {
+              opacity: 0.6
+            }
+          } else {
+            delete y.areaStyle
           }
         }
         // scatter

frontend/src/views/chart/components/ChartComponent.vue

@@ -16,7 +16,8 @@ import {
   BASE_GAUGE,
   BASE_MAP,
   BASE_SCATTER,
-  BASE_TREEMAP
+  BASE_TREEMAP,
+  BASE_MIX
 } from '../chart/chart'
 import { baseBarOption, stackBarOption, horizontalBarOption, horizontalStackBarOption } from '../chart/bar/bar'
 import { baseLineOption, stackLineOption } from '../chart/line/line'
@@ -152,8 +153,9 @@ export default {
       } else if (chart.type === 'treemap') {
         chart_option = baseTreemapOption(JSON.parse(JSON.stringify(BASE_TREEMAP)), chart)
       } else if (chart.type === 'chart-mix') {
-        chart_option = baseMixOption(JSON.parse(JSON.stringify(BASE_BAR)), chart)
+        chart_option = baseMixOption(JSON.parse(JSON.stringify(BASE_MIX)), chart)
       }
+      console.log(JSON.stringify(chart_option))
 
       if (chart.type === 'map') {
         const customAttr = JSON.parse(chart.customAttr)