diff --git a/backend/src/main/java/io/dataease/base/domain/ChartView.java b/backend/src/main/java/io/dataease/base/domain/ChartView.java index 2bb2de365e..f8e662c1d5 100644 --- a/backend/src/main/java/io/dataease/base/domain/ChartView.java +++ b/backend/src/main/java/io/dataease/base/domain/ChartView.java @@ -1,31 +1,28 @@ package io.dataease.base.domain; import java.io.Serializable; - -import io.swagger.annotations.ApiModelProperty; import lombok.Data; @Data public class ChartView implements Serializable { - @ApiModelProperty("ID") private String id; - @ApiModelProperty("名称") + private String name; - @ApiModelProperty("场景ID") + private String sceneId; - @ApiModelProperty("表ID") + private String tableId; - @ApiModelProperty("类型") + private String type; - @ApiModelProperty("标题") + private String title; - @ApiModelProperty("创建者") + private String createBy; - @ApiModelProperty("创建时间") + private Long createTime; - @ApiModelProperty("更新时间") + private Long updateTime; - @ApiModelProperty("样式优先级") + private String stylePriority; private static final long serialVersionUID = 1L; diff --git a/backend/src/main/java/io/dataease/base/domain/ChartViewWithBLOBs.java b/backend/src/main/java/io/dataease/base/domain/ChartViewWithBLOBs.java index 5ac886681d..61779e0cdd 100644 --- a/backend/src/main/java/io/dataease/base/domain/ChartViewWithBLOBs.java +++ b/backend/src/main/java/io/dataease/base/domain/ChartViewWithBLOBs.java @@ -15,15 +15,17 @@ public class ChartViewWithBLOBs extends ChartView implements Serializable { private String xAxis; @ApiModelProperty("y轴") private String yAxis; + @ApiModelProperty("副y轴") + private String yAxisExt; @ApiModelProperty("堆叠") private String extStack; @ApiModelProperty("气泡") private String extBubble; - @ApiModelProperty("客户端属性") + @ApiModelProperty("图形属性") private String customAttr; - @ApiModelProperty("客户端样式") + @ApiModelProperty("组件样式") private String customStyle; - @ApiModelProperty("客户端过滤条件") + @ApiModelProperty("过滤条件") private String customFilter; @ApiModelProperty("下钻字段") private String drillFields; diff --git a/backend/src/main/java/io/dataease/base/mapper/ChartViewMapper.xml b/backend/src/main/java/io/dataease/base/mapper/ChartViewMapper.xml index 10137408e3..72b2eaaca0 100644 --- a/backend/src/main/java/io/dataease/base/mapper/ChartViewMapper.xml +++ b/backend/src/main/java/io/dataease/base/mapper/ChartViewMapper.xml @@ -16,6 +16,7 @@ + @@ -87,7 +88,7 @@ style_priority - x_axis, y_axis, ext_stack, ext_bubble, custom_attr, custom_style, custom_filter, + x_axis, y_axis, y_axis_ext, ext_stack, ext_bubble, custom_attr, custom_style, custom_filter, drill_fields, snapshot