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 dd6a16307b..6a6689cfd4 100644 --- a/backend/src/main/java/io/dataease/base/domain/ChartView.java +++ b/backend/src/main/java/io/dataease/base/domain/ChartView.java @@ -1,42 +1,41 @@ 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 tableId; - @ApiModelProperty("图表类型") - private String type; - @ApiModelProperty("渲染方式") - private String render; - @ApiModelProperty("展示结果数量") - private Integer resultCount; - @ApiModelProperty("展示结果") - private String resultMode; - @ApiModelProperty("标题") + private String title; - @ApiModelProperty("场景ID") + private String sceneId; - @ApiModelProperty("创建人") + + private String tableId; + + private String type; + + private String render; + + private Integer resultCount; + + private String resultMode; + private String createBy; - @ApiModelProperty("创建时间") + private Long createTime; - @ApiModelProperty("更新时间") + private Long updateTime; - @ApiModelProperty("样式优先级") + private String stylePriority; - @ApiModelProperty("public or private") + private String chartType; - @ApiModelProperty("是否插件") + private Boolean isPlugin; + private String dataFrom; + private static final long serialVersionUID = 1L; -} +} \ No newline at end of file diff --git a/backend/src/main/java/io/dataease/base/domain/ChartViewCache.java b/backend/src/main/java/io/dataease/base/domain/ChartViewCache.java index 1cb34116b3..c093554800 100644 --- a/backend/src/main/java/io/dataease/base/domain/ChartViewCache.java +++ b/backend/src/main/java/io/dataease/base/domain/ChartViewCache.java @@ -35,5 +35,7 @@ public class ChartViewCache implements Serializable { private Boolean isPlugin; + private String dataFrom; + private static final long serialVersionUID = 1L; } \ No newline at end of file diff --git a/backend/src/main/java/io/dataease/base/domain/ChartViewCacheExample.java b/backend/src/main/java/io/dataease/base/domain/ChartViewCacheExample.java index aa5bb02aef..37effd1476 100644 --- a/backend/src/main/java/io/dataease/base/domain/ChartViewCacheExample.java +++ b/backend/src/main/java/io/dataease/base/domain/ChartViewCacheExample.java @@ -1113,6 +1113,76 @@ public class ChartViewCacheExample { addCriterion("is_plugin not between", value1, value2, "isPlugin"); return (Criteria) this; } + + public Criteria andDataFromIsNull() { + addCriterion("data_from is null"); + return (Criteria) this; + } + + public Criteria andDataFromIsNotNull() { + addCriterion("data_from is not null"); + return (Criteria) this; + } + + public Criteria andDataFromEqualTo(String value) { + addCriterion("data_from =", value, "dataFrom"); + return (Criteria) this; + } + + public Criteria andDataFromNotEqualTo(String value) { + addCriterion("data_from <>", value, "dataFrom"); + return (Criteria) this; + } + + public Criteria andDataFromGreaterThan(String value) { + addCriterion("data_from >", value, "dataFrom"); + return (Criteria) this; + } + + public Criteria andDataFromGreaterThanOrEqualTo(String value) { + addCriterion("data_from >=", value, "dataFrom"); + return (Criteria) this; + } + + public Criteria andDataFromLessThan(String value) { + addCriterion("data_from <", value, "dataFrom"); + return (Criteria) this; + } + + public Criteria andDataFromLessThanOrEqualTo(String value) { + addCriterion("data_from <=", value, "dataFrom"); + return (Criteria) this; + } + + public Criteria andDataFromLike(String value) { + addCriterion("data_from like", value, "dataFrom"); + return (Criteria) this; + } + + public Criteria andDataFromNotLike(String value) { + addCriterion("data_from not like", value, "dataFrom"); + return (Criteria) this; + } + + public Criteria andDataFromIn(List values) { + addCriterion("data_from in", values, "dataFrom"); + return (Criteria) this; + } + + public Criteria andDataFromNotIn(List values) { + addCriterion("data_from not in", values, "dataFrom"); + return (Criteria) this; + } + + public Criteria andDataFromBetween(String value1, String value2) { + addCriterion("data_from between", value1, value2, "dataFrom"); + return (Criteria) this; + } + + public Criteria andDataFromNotBetween(String value1, String value2) { + addCriterion("data_from not between", value1, value2, "dataFrom"); + return (Criteria) this; + } } public static class Criteria extends GeneratedCriteria { diff --git a/backend/src/main/java/io/dataease/base/domain/ChartViewExample.java b/backend/src/main/java/io/dataease/base/domain/ChartViewExample.java index f4d44ca52a..374dac1772 100644 --- a/backend/src/main/java/io/dataease/base/domain/ChartViewExample.java +++ b/backend/src/main/java/io/dataease/base/domain/ChartViewExample.java @@ -244,6 +244,146 @@ public class ChartViewExample { return (Criteria) this; } + public Criteria andTitleIsNull() { + addCriterion("title is null"); + return (Criteria) this; + } + + public Criteria andTitleIsNotNull() { + addCriterion("title is not null"); + return (Criteria) this; + } + + public Criteria andTitleEqualTo(String value) { + addCriterion("title =", value, "title"); + return (Criteria) this; + } + + public Criteria andTitleNotEqualTo(String value) { + addCriterion("title <>", value, "title"); + return (Criteria) this; + } + + public Criteria andTitleGreaterThan(String value) { + addCriterion("title >", value, "title"); + return (Criteria) this; + } + + public Criteria andTitleGreaterThanOrEqualTo(String value) { + addCriterion("title >=", value, "title"); + return (Criteria) this; + } + + public Criteria andTitleLessThan(String value) { + addCriterion("title <", value, "title"); + return (Criteria) this; + } + + public Criteria andTitleLessThanOrEqualTo(String value) { + addCriterion("title <=", value, "title"); + return (Criteria) this; + } + + public Criteria andTitleLike(String value) { + addCriterion("title like", value, "title"); + return (Criteria) this; + } + + public Criteria andTitleNotLike(String value) { + addCriterion("title not like", value, "title"); + return (Criteria) this; + } + + public Criteria andTitleIn(List values) { + addCriterion("title in", values, "title"); + return (Criteria) this; + } + + public Criteria andTitleNotIn(List values) { + addCriterion("title not in", values, "title"); + return (Criteria) this; + } + + public Criteria andTitleBetween(String value1, String value2) { + addCriterion("title between", value1, value2, "title"); + return (Criteria) this; + } + + public Criteria andTitleNotBetween(String value1, String value2) { + addCriterion("title not between", value1, value2, "title"); + return (Criteria) this; + } + + public Criteria andSceneIdIsNull() { + addCriterion("scene_id is null"); + return (Criteria) this; + } + + public Criteria andSceneIdIsNotNull() { + addCriterion("scene_id is not null"); + return (Criteria) this; + } + + public Criteria andSceneIdEqualTo(String value) { + addCriterion("scene_id =", value, "sceneId"); + return (Criteria) this; + } + + public Criteria andSceneIdNotEqualTo(String value) { + addCriterion("scene_id <>", value, "sceneId"); + return (Criteria) this; + } + + public Criteria andSceneIdGreaterThan(String value) { + addCriterion("scene_id >", value, "sceneId"); + return (Criteria) this; + } + + public Criteria andSceneIdGreaterThanOrEqualTo(String value) { + addCriterion("scene_id >=", value, "sceneId"); + return (Criteria) this; + } + + public Criteria andSceneIdLessThan(String value) { + addCriterion("scene_id <", value, "sceneId"); + return (Criteria) this; + } + + public Criteria andSceneIdLessThanOrEqualTo(String value) { + addCriterion("scene_id <=", value, "sceneId"); + return (Criteria) this; + } + + public Criteria andSceneIdLike(String value) { + addCriterion("scene_id like", value, "sceneId"); + return (Criteria) this; + } + + public Criteria andSceneIdNotLike(String value) { + addCriterion("scene_id not like", value, "sceneId"); + return (Criteria) this; + } + + public Criteria andSceneIdIn(List values) { + addCriterion("scene_id in", values, "sceneId"); + return (Criteria) this; + } + + public Criteria andSceneIdNotIn(List values) { + addCriterion("scene_id not in", values, "sceneId"); + return (Criteria) this; + } + + public Criteria andSceneIdBetween(String value1, String value2) { + addCriterion("scene_id between", value1, value2, "sceneId"); + return (Criteria) this; + } + + public Criteria andSceneIdNotBetween(String value1, String value2) { + addCriterion("scene_id not between", value1, value2, "sceneId"); + return (Criteria) this; + } + public Criteria andTableIdIsNull() { addCriterion("table_id is null"); return (Criteria) this; @@ -584,146 +724,6 @@ public class ChartViewExample { return (Criteria) this; } - public Criteria andTitleIsNull() { - addCriterion("title is null"); - return (Criteria) this; - } - - public Criteria andTitleIsNotNull() { - addCriterion("title is not null"); - return (Criteria) this; - } - - public Criteria andTitleEqualTo(String value) { - addCriterion("title =", value, "title"); - return (Criteria) this; - } - - public Criteria andTitleNotEqualTo(String value) { - addCriterion("title <>", value, "title"); - return (Criteria) this; - } - - public Criteria andTitleGreaterThan(String value) { - addCriterion("title >", value, "title"); - return (Criteria) this; - } - - public Criteria andTitleGreaterThanOrEqualTo(String value) { - addCriterion("title >=", value, "title"); - return (Criteria) this; - } - - public Criteria andTitleLessThan(String value) { - addCriterion("title <", value, "title"); - return (Criteria) this; - } - - public Criteria andTitleLessThanOrEqualTo(String value) { - addCriterion("title <=", value, "title"); - return (Criteria) this; - } - - public Criteria andTitleLike(String value) { - addCriterion("title like", value, "title"); - return (Criteria) this; - } - - public Criteria andTitleNotLike(String value) { - addCriterion("title not like", value, "title"); - return (Criteria) this; - } - - public Criteria andTitleIn(List values) { - addCriterion("title in", values, "title"); - return (Criteria) this; - } - - public Criteria andTitleNotIn(List values) { - addCriterion("title not in", values, "title"); - return (Criteria) this; - } - - public Criteria andTitleBetween(String value1, String value2) { - addCriterion("title between", value1, value2, "title"); - return (Criteria) this; - } - - public Criteria andTitleNotBetween(String value1, String value2) { - addCriterion("title not between", value1, value2, "title"); - return (Criteria) this; - } - - public Criteria andSceneIdIsNull() { - addCriterion("scene_id is null"); - return (Criteria) this; - } - - public Criteria andSceneIdIsNotNull() { - addCriterion("scene_id is not null"); - return (Criteria) this; - } - - public Criteria andSceneIdEqualTo(String value) { - addCriterion("scene_id =", value, "sceneId"); - return (Criteria) this; - } - - public Criteria andSceneIdNotEqualTo(String value) { - addCriterion("scene_id <>", value, "sceneId"); - return (Criteria) this; - } - - public Criteria andSceneIdGreaterThan(String value) { - addCriterion("scene_id >", value, "sceneId"); - return (Criteria) this; - } - - public Criteria andSceneIdGreaterThanOrEqualTo(String value) { - addCriterion("scene_id >=", value, "sceneId"); - return (Criteria) this; - } - - public Criteria andSceneIdLessThan(String value) { - addCriterion("scene_id <", value, "sceneId"); - return (Criteria) this; - } - - public Criteria andSceneIdLessThanOrEqualTo(String value) { - addCriterion("scene_id <=", value, "sceneId"); - return (Criteria) this; - } - - public Criteria andSceneIdLike(String value) { - addCriterion("scene_id like", value, "sceneId"); - return (Criteria) this; - } - - public Criteria andSceneIdNotLike(String value) { - addCriterion("scene_id not like", value, "sceneId"); - return (Criteria) this; - } - - public Criteria andSceneIdIn(List values) { - addCriterion("scene_id in", values, "sceneId"); - return (Criteria) this; - } - - public Criteria andSceneIdNotIn(List values) { - addCriterion("scene_id not in", values, "sceneId"); - return (Criteria) this; - } - - public Criteria andSceneIdBetween(String value1, String value2) { - addCriterion("scene_id between", value1, value2, "sceneId"); - return (Criteria) this; - } - - public Criteria andSceneIdNotBetween(String value1, String value2) { - addCriterion("scene_id not between", value1, value2, "sceneId"); - return (Criteria) this; - } - public Criteria andCreateByIsNull() { addCriterion("create_by is null"); return (Criteria) this; @@ -1113,6 +1113,76 @@ public class ChartViewExample { addCriterion("is_plugin not between", value1, value2, "isPlugin"); return (Criteria) this; } + + public Criteria andDataFromIsNull() { + addCriterion("data_from is null"); + return (Criteria) this; + } + + public Criteria andDataFromIsNotNull() { + addCriterion("data_from is not null"); + return (Criteria) this; + } + + public Criteria andDataFromEqualTo(String value) { + addCriterion("data_from =", value, "dataFrom"); + return (Criteria) this; + } + + public Criteria andDataFromNotEqualTo(String value) { + addCriterion("data_from <>", value, "dataFrom"); + return (Criteria) this; + } + + public Criteria andDataFromGreaterThan(String value) { + addCriterion("data_from >", value, "dataFrom"); + return (Criteria) this; + } + + public Criteria andDataFromGreaterThanOrEqualTo(String value) { + addCriterion("data_from >=", value, "dataFrom"); + return (Criteria) this; + } + + public Criteria andDataFromLessThan(String value) { + addCriterion("data_from <", value, "dataFrom"); + return (Criteria) this; + } + + public Criteria andDataFromLessThanOrEqualTo(String value) { + addCriterion("data_from <=", value, "dataFrom"); + return (Criteria) this; + } + + public Criteria andDataFromLike(String value) { + addCriterion("data_from like", value, "dataFrom"); + return (Criteria) this; + } + + public Criteria andDataFromNotLike(String value) { + addCriterion("data_from not like", value, "dataFrom"); + return (Criteria) this; + } + + public Criteria andDataFromIn(List values) { + addCriterion("data_from in", values, "dataFrom"); + return (Criteria) this; + } + + public Criteria andDataFromNotIn(List values) { + addCriterion("data_from not in", values, "dataFrom"); + return (Criteria) this; + } + + public Criteria andDataFromBetween(String value1, String value2) { + addCriterion("data_from between", value1, value2, "dataFrom"); + return (Criteria) this; + } + + public Criteria andDataFromNotBetween(String value1, String value2) { + addCriterion("data_from not between", value1, value2, "dataFrom"); + return (Criteria) this; + } } public static class Criteria extends GeneratedCriteria { @@ -1207,4 +1277,4 @@ public class ChartViewExample { this(condition, value, secondValue, null); } } -} +} \ No newline at end of file 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 f0492a42d3..af2c9ee4b5 100644 --- a/backend/src/main/java/io/dataease/base/domain/ChartViewWithBLOBs.java +++ b/backend/src/main/java/io/dataease/base/domain/ChartViewWithBLOBs.java @@ -1,8 +1,6 @@ package io.dataease.base.domain; import java.io.Serializable; - -import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -11,30 +9,29 @@ import lombok.ToString; @EqualsAndHashCode(callSuper = true) @ToString(callSuper = true) public class ChartViewWithBLOBs extends ChartView implements Serializable { - @ApiModelProperty("x轴") private String xAxis; - @ApiModelProperty("x副轴") + private String xAxisExt; - @ApiModelProperty("y轴") + private String yAxis; - @ApiModelProperty("y副轴") + private String yAxisExt; - @ApiModelProperty("堆叠字段") + private String extStack; - @ApiModelProperty("气泡大小字段") + private String extBubble; - @ApiModelProperty("图形属性") + private String customAttr; - @ApiModelProperty("组件样式") + private String customStyle; - @ApiModelProperty("过滤器字段") + private String customFilter; - @ApiModelProperty("下钻字段") + private String drillFields; - @ApiModelProperty("高级设置") + private String senior; - @ApiModelProperty("视图截图快照") + private String snapshot; private static final long serialVersionUID = 1L; -} +} \ No newline at end of file diff --git a/backend/src/main/java/io/dataease/base/domain/PanelView.java b/backend/src/main/java/io/dataease/base/domain/PanelView.java index d9c240f3d8..b04880b4d3 100644 --- a/backend/src/main/java/io/dataease/base/domain/PanelView.java +++ b/backend/src/main/java/io/dataease/base/domain/PanelView.java @@ -29,8 +29,6 @@ public class PanelView implements Serializable { private String copyId; - private String dataFrom; - private byte[] content; private static final long serialVersionUID = 1L; diff --git a/backend/src/main/java/io/dataease/base/domain/PanelViewExample.java b/backend/src/main/java/io/dataease/base/domain/PanelViewExample.java index 66109efa0a..dbaaff8cec 100644 --- a/backend/src/main/java/io/dataease/base/domain/PanelViewExample.java +++ b/backend/src/main/java/io/dataease/base/domain/PanelViewExample.java @@ -923,76 +923,6 @@ public class PanelViewExample { addCriterion("copy_id not between", value1, value2, "copyId"); return (Criteria) this; } - - public Criteria andDataFromIsNull() { - addCriterion("data_from is null"); - return (Criteria) this; - } - - public Criteria andDataFromIsNotNull() { - addCriterion("data_from is not null"); - return (Criteria) this; - } - - public Criteria andDataFromEqualTo(String value) { - addCriterion("data_from =", value, "dataFrom"); - return (Criteria) this; - } - - public Criteria andDataFromNotEqualTo(String value) { - addCriterion("data_from <>", value, "dataFrom"); - return (Criteria) this; - } - - public Criteria andDataFromGreaterThan(String value) { - addCriterion("data_from >", value, "dataFrom"); - return (Criteria) this; - } - - public Criteria andDataFromGreaterThanOrEqualTo(String value) { - addCriterion("data_from >=", value, "dataFrom"); - return (Criteria) this; - } - - public Criteria andDataFromLessThan(String value) { - addCriterion("data_from <", value, "dataFrom"); - return (Criteria) this; - } - - public Criteria andDataFromLessThanOrEqualTo(String value) { - addCriterion("data_from <=", value, "dataFrom"); - return (Criteria) this; - } - - public Criteria andDataFromLike(String value) { - addCriterion("data_from like", value, "dataFrom"); - return (Criteria) this; - } - - public Criteria andDataFromNotLike(String value) { - addCriterion("data_from not like", value, "dataFrom"); - return (Criteria) this; - } - - public Criteria andDataFromIn(List values) { - addCriterion("data_from in", values, "dataFrom"); - return (Criteria) this; - } - - public Criteria andDataFromNotIn(List values) { - addCriterion("data_from not in", values, "dataFrom"); - return (Criteria) this; - } - - public Criteria andDataFromBetween(String value1, String value2) { - addCriterion("data_from between", value1, value2, "dataFrom"); - return (Criteria) this; - } - - public Criteria andDataFromNotBetween(String value1, String value2) { - addCriterion("data_from not between", value1, value2, "dataFrom"); - return (Criteria) this; - } } public static class Criteria extends GeneratedCriteria { diff --git a/backend/src/main/java/io/dataease/base/mapper/ChartViewCacheMapper.xml b/backend/src/main/java/io/dataease/base/mapper/ChartViewCacheMapper.xml index caa9ebfbb4..349c5b862a 100644 --- a/backend/src/main/java/io/dataease/base/mapper/ChartViewCacheMapper.xml +++ b/backend/src/main/java/io/dataease/base/mapper/ChartViewCacheMapper.xml @@ -17,6 +17,7 @@ + @@ -92,7 +93,7 @@ id, `name`, title, scene_id, table_id, `type`, render, result_count, result_mode, - create_by, create_time, update_time, style_priority, chart_type, is_plugin + create_by, create_time, update_time, style_priority, chart_type, is_plugin, data_from x_axis, x_axis_ext, y_axis, y_axis_ext, ext_stack, ext_bubble, custom_attr, custom_style, @@ -152,21 +153,21 @@ render, result_count, result_mode, create_by, create_time, update_time, style_priority, chart_type, is_plugin, - x_axis, x_axis_ext, y_axis, - y_axis_ext, ext_stack, ext_bubble, - custom_attr, custom_style, custom_filter, - drill_fields, senior, snapshot - ) + data_from, x_axis, x_axis_ext, + y_axis, y_axis_ext, ext_stack, + ext_bubble, custom_attr, custom_style, + custom_filter, drill_fields, senior, + snapshot) values (#{id,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, #{title,jdbcType=VARCHAR}, #{sceneId,jdbcType=VARCHAR}, #{tableId,jdbcType=VARCHAR}, #{type,jdbcType=VARCHAR}, #{render,jdbcType=VARCHAR}, #{resultCount,jdbcType=INTEGER}, #{resultMode,jdbcType=VARCHAR}, #{createBy,jdbcType=VARCHAR}, #{createTime,jdbcType=BIGINT}, #{updateTime,jdbcType=BIGINT}, #{stylePriority,jdbcType=VARCHAR}, #{chartType,jdbcType=VARCHAR}, #{isPlugin,jdbcType=BIT}, - #{xAxis,jdbcType=LONGVARCHAR}, #{xAxisExt,jdbcType=LONGVARCHAR}, #{yAxis,jdbcType=LONGVARCHAR}, - #{yAxisExt,jdbcType=LONGVARCHAR}, #{extStack,jdbcType=LONGVARCHAR}, #{extBubble,jdbcType=LONGVARCHAR}, - #{customAttr,jdbcType=LONGVARCHAR}, #{customStyle,jdbcType=LONGVARCHAR}, #{customFilter,jdbcType=LONGVARCHAR}, - #{drillFields,jdbcType=LONGVARCHAR}, #{senior,jdbcType=LONGVARCHAR}, #{snapshot,jdbcType=LONGVARCHAR} - ) + #{dataFrom,jdbcType=VARCHAR}, #{xAxis,jdbcType=LONGVARCHAR}, #{xAxisExt,jdbcType=LONGVARCHAR}, + #{yAxis,jdbcType=LONGVARCHAR}, #{yAxisExt,jdbcType=LONGVARCHAR}, #{extStack,jdbcType=LONGVARCHAR}, + #{extBubble,jdbcType=LONGVARCHAR}, #{customAttr,jdbcType=LONGVARCHAR}, #{customStyle,jdbcType=LONGVARCHAR}, + #{customFilter,jdbcType=LONGVARCHAR}, #{drillFields,jdbcType=LONGVARCHAR}, #{senior,jdbcType=LONGVARCHAR}, + #{snapshot,jdbcType=LONGVARCHAR}) insert into chart_view_cache @@ -216,6 +217,9 @@ is_plugin, + + data_from, + x_axis, @@ -299,6 +303,9 @@ #{isPlugin,jdbcType=BIT}, + + #{dataFrom,jdbcType=VARCHAR}, + #{xAxis,jdbcType=LONGVARCHAR}, @@ -391,6 +398,9 @@ is_plugin = #{record.isPlugin,jdbcType=BIT}, + + data_from = #{record.dataFrom,jdbcType=VARCHAR}, + x_axis = #{record.xAxis,jdbcType=LONGVARCHAR}, @@ -449,6 +459,7 @@ style_priority = #{record.stylePriority,jdbcType=VARCHAR}, chart_type = #{record.chartType,jdbcType=VARCHAR}, is_plugin = #{record.isPlugin,jdbcType=BIT}, + data_from = #{record.dataFrom,jdbcType=VARCHAR}, x_axis = #{record.xAxis,jdbcType=LONGVARCHAR}, x_axis_ext = #{record.xAxisExt,jdbcType=LONGVARCHAR}, y_axis = #{record.yAxis,jdbcType=LONGVARCHAR}, @@ -481,7 +492,8 @@ update_time = #{record.updateTime,jdbcType=BIGINT}, style_priority = #{record.stylePriority,jdbcType=VARCHAR}, chart_type = #{record.chartType,jdbcType=VARCHAR}, - is_plugin = #{record.isPlugin,jdbcType=BIT} + is_plugin = #{record.isPlugin,jdbcType=BIT}, + data_from = #{record.dataFrom,jdbcType=VARCHAR} @@ -531,6 +543,9 @@ is_plugin = #{isPlugin,jdbcType=BIT}, + + data_from = #{dataFrom,jdbcType=VARCHAR}, + x_axis = #{xAxis,jdbcType=LONGVARCHAR}, @@ -586,6 +601,7 @@ style_priority = #{stylePriority,jdbcType=VARCHAR}, chart_type = #{chartType,jdbcType=VARCHAR}, is_plugin = #{isPlugin,jdbcType=BIT}, + data_from = #{dataFrom,jdbcType=VARCHAR}, x_axis = #{xAxis,jdbcType=LONGVARCHAR}, x_axis_ext = #{xAxisExt,jdbcType=LONGVARCHAR}, y_axis = #{yAxis,jdbcType=LONGVARCHAR}, @@ -615,7 +631,8 @@ update_time = #{updateTime,jdbcType=BIGINT}, style_priority = #{stylePriority,jdbcType=VARCHAR}, chart_type = #{chartType,jdbcType=VARCHAR}, - is_plugin = #{isPlugin,jdbcType=BIT} + is_plugin = #{isPlugin,jdbcType=BIT}, + data_from = #{dataFrom,jdbcType=VARCHAR} where id = #{id,jdbcType=VARCHAR} \ No newline at end of file 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 c8d1f5c55f..284cedebc4 100644 --- a/backend/src/main/java/io/dataease/base/mapper/ChartViewMapper.xml +++ b/backend/src/main/java/io/dataease/base/mapper/ChartViewMapper.xml @@ -4,19 +4,20 @@ + + - - + @@ -91,11 +92,11 @@ - id, `name`, table_id, `type`, render, result_count, result_mode, title, scene_id, - create_by, create_time, update_time, style_priority, chart_type, is_plugin + id, `name`, title, scene_id, table_id, `type`, render, result_count, result_mode, + create_by, create_time, update_time, style_priority, chart_type, is_plugin, data_from - x_axis, x_axis_ext, y_axis, y_axis_ext, ext_stack, ext_bubble, custom_attr, custom_style, + x_axis, x_axis_ext, y_axis, y_axis_ext, ext_stack, ext_bubble, custom_attr, custom_style, custom_filter, drill_fields, senior, snapshot