Merge pull request #2365 from dataease/dev

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

 package io.dataease.dto.chart;
 
+import com.google.gson.annotations.SerializedName;
 import io.dataease.plugins.common.base.domain.ChartViewWithBLOBs;
 import io.dataease.plugins.common.request.chart.ChartExtFilterRequest;
 import io.swagger.annotations.ApiModelProperty;
@@ -32,4 +33,12 @@ public class ChartViewDTO extends ChartViewWithBLOBs {
     private List<ChartExtFilterRequest> drillFilters;
     @ApiModelProperty("视图存放位置")
     private String position;
+    @SerializedName("xaxis")
+    private String xAxis;
+    @SerializedName("xaxisExt")
+    private String xAxisExt;
+    @SerializedName("yaxis")
+    private String yAxis;
+    @SerializedName("yaxisExt")
+    private String yAxisExt;
 }

frontend/src/views/chart/chart/table/table-info.js

@@ -412,6 +412,7 @@ function getCurrentField(valueFieldList, field) {
   } catch (err) {
     list = JSON.parse(JSON.stringify(valueFieldList))
   }
+  if (list) {
     for (let i = 0; i < list.length; i++) {
       const f = list[i]
       if (field.dataeaseName === f.dataeaseName) {
@@ -419,5 +420,7 @@ function getCurrentField(valueFieldList, field) {
         break
       }
     }
+  }
+
   return res
 }

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

@@ -2396,6 +2396,7 @@ export function getColors(chart, colors, reset) {
     } else {
       series = JSON.parse(chart.yaxis)
     }
+    if (series) {
       for (let i = 0; i < series.length; i++) {
         const s = series[i]
         seriesColors.push({
@@ -2404,6 +2405,7 @@ export function getColors(chart, colors, reset) {
           isCustom: false
         })
       }
+    }
   } else {
     if (chart.data) {
       const data = chart.data.datas