Merge branch 'dev' into pr@dev@sqlserver

backend/src/main/java/io/dataease/dto/chart/AxisChartDataDTO.java

+package io.dataease.dto.chart;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * @Author gin
+ * @Date 2021/8/9 10:14 上午
+ */
+@Data
+public class AxisChartDataDTO {
+    private BigDecimal value;
+    private List<ChartDimensionDTO> dimensionList;
+    private List<ChartQuotaDTO> quotaList;
+}

backend/src/main/java/io/dataease/dto/chart/ChartDimensionDTO.java

+package io.dataease.dto.chart;
+
+import lombok.Data;
+
+/**
+ * @Author gin
+ * @Date 2021/8/9 10:15 上午
+ */
+@Data
+public class ChartDimensionDTO {
+    private String id;
+    private String value;
+}

backend/src/main/java/io/dataease/dto/chart/ChartQuotaDTO.java

+package io.dataease.dto.chart;
+
+import lombok.Data;
+
+/**
+ * @Author gin
+ * @Date 2021/8/9 10:16 上午
+ */
+@Data
+public class ChartQuotaDTO {
+    private String id;
+}

backend/src/main/java/io/dataease/dto/chart/ScatterChartDataDTO.java

+package io.dataease.dto.chart;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * @Author gin
+ * @Date 2021/8/9 10:14 上午
+ */
+@Data
+public class ScatterChartDataDTO {
+    private Object[] value;
+    private List<ChartDimensionDTO> dimensionList;
+    private List<ChartQuotaDTO> quotaList;
+}

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

@@ -34,10 +34,12 @@ export function baseFunnelOption(chart_option, chart) {
       // max value
       chart_option.series[0].max = Math.max.apply(Math, valueArr)
       for (let i = 0; i < valueArr.length; i++) {
-        const y = {
-          name: chart.data.x[i],
-          value: valueArr[i]
-        }
+        // const y = {
+        //   name: chart.data.x[i],
+        //   value: valueArr[i]
+        // }
+        const y = valueArr[i]
+        y.name = chart.data.x[i]
         // color
         y.itemStyle = {
           color: hexColorToRGBA(customAttr.color.colors[i % 9], customAttr.color.alpha)

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

@@ -33,10 +33,12 @@ export function basePieOption(chart_option, chart) {
       }
       const valueArr = chart.data.series[0].data
       for (let i = 0; i < valueArr.length; i++) {
-        const y = {
-          name: chart.data.x[i],
-          value: valueArr[i]
-        }
+        // const y = {
+        //   name: chart.data.x[i],
+        //   value: valueArr[i]
+        // }
+        const y = valueArr[i]
+        y.name = chart.data.x[i]
         // color
         y.itemStyle = {
           color: hexColorToRGBA(customAttr.color.colors[i % 9], customAttr.color.alpha),
@@ -84,10 +86,12 @@ export function rosePieOption(chart_option, chart) {
       }
       const valueArr = chart.data.series[0].data
       for (let i = 0; i < valueArr.length; i++) {
-        const y = {
-          name: chart.data.x[i],
-          value: valueArr[i]
-        }
+        // const y = {
+        //   name: chart.data.x[i],
+        //   value: valueArr[i]
+        // }
+        const y = valueArr[i]
+        y.name = chart.data.x[i]
         // color
         y.itemStyle = {
           color: hexColorToRGBA(customAttr.color.colors[i % 9], customAttr.color.alpha),