diff --git a/core/core-backend/src/main/java/io/dataease/chart/manage/ChartDataManage.java b/core/core-backend/src/main/java/io/dataease/chart/manage/ChartDataManage.java index 0acde3d49a..0422dfa81c 100644 --- a/core/core-backend/src/main/java/io/dataease/chart/manage/ChartDataManage.java +++ b/core/core-backend/src/main/java/io/dataease/chart/manage/ChartDataManage.java @@ -865,7 +865,7 @@ public class ChartDataManage { return list; } - var assistLineCfg = JsonUtil.parseObject((String) JsonUtil.toJSONString(senior.get("assistLineCfg")), ChartSeniorAssistCfgDTO.class); + ChartSeniorAssistCfgDTO assistLineCfg = JsonUtil.parseObject((String) JsonUtil.toJSONString(senior.get("assistLineCfg")), ChartSeniorAssistCfgDTO.class); if (null == assistLineCfg || !assistLineCfg.isEnable()) { return list; } diff --git a/core/core-frontend/src/views/chart/components/editor/editor-senior/components/dialog/AssistLineEdit.vue b/core/core-frontend/src/views/chart/components/editor/editor-senior/components/dialog/AssistLineEdit.vue index 55e2f6df10..7e0a101243 100644 --- a/core/core-frontend/src/views/chart/components/editor/editor-senior/components/dialog/AssistLineEdit.vue +++ b/core/core-frontend/src/views/chart/components/editor/editor-senior/components/dialog/AssistLineEdit.vue @@ -76,8 +76,23 @@ const init = () => { state.lineArr = JSON.parse(JSON.stringify(props.line)) state.lineArr.forEach(line => { - if (find(props.quotaFields, d => d.id === line.fieldId) == undefined) { - line.fieldId = undefined + if (props.useQuotaExt) { + if ( + line.yAxisType === 'left' && + find(props.quotaFields, d => d.id === line.fieldId) == undefined + ) { + line.fieldId = undefined + } + if ( + line.yAxisType === 'right' && + find(props.quotaExtFields, d => d.id === line.fieldId) == undefined + ) { + line.fieldId = undefined + } + } else { + if (find(props.quotaFields, d => d.id === line.fieldId) == undefined) { + line.fieldId = undefined + } } }) diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/chart/dto/ChartSeniorAssistDTO.java b/sdk/api/api-base/src/main/java/io/dataease/api/chart/dto/ChartSeniorAssistDTO.java index be366da8df..5c05f1987f 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/chart/dto/ChartSeniorAssistDTO.java +++ b/sdk/api/api-base/src/main/java/io/dataease/api/chart/dto/ChartSeniorAssistDTO.java @@ -1,5 +1,6 @@ package io.dataease.api.chart.dto; +import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import lombok.Data; @@ -15,6 +16,7 @@ public class ChartSeniorAssistDTO { private Long fieldId; private String summary; private String axis; + @JsonProperty("yAxisType") private String yAxisType; private String value; private String lineType;