refactor: 模板导入适配新的视图逻辑

This commit is contained in:
wangjiahao 2022-05-31 16:54:19 +08:00
parent 772530a4dd
commit d69ebb8ea7
3 changed files with 26 additions and 12 deletions

View File

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

View File

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

View File

@ -2355,13 +2355,15 @@ export function getColors(chart, colors, reset) {
} else { } else {
series = JSON.parse(chart.yaxis) series = JSON.parse(chart.yaxis)
} }
for (let i = 0; i < series.length; i++) { if (series) {
const s = series[i] for (let i = 0; i < series.length; i++) {
seriesColors.push({ const s = series[i]
name: s.name, seriesColors.push({
color: colors[i % colors.length], name: s.name,
isCustom: false color: colors[i % colors.length],
}) isCustom: false
})
}
} }
} else { } else {
if (chart.data) { if (chart.data) {