From 74e89fa54e5c8f54b3d6e6691ba0044b8fb21eb4 Mon Sep 17 00:00:00 2001 From: "wei.peng" Date: Mon, 8 Apr 2019 16:26:05 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=83=E7=B4=A0=E5=A2=9E=E5=88=A0=E6=94=B9?= =?UTF-8?q?=E6=9F=A5=20=20DAO=E5=B1=82=E6=8E=A5=E5=8F=A3=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/form/bean/BfElement.java | 12 +++++++++--- .../java/cn/estsh/i3plus/pojo/form/bean/BfElementGrid.java | 4 ++++ .../cn/estsh/i3plus/pojo/form/bean/BfElementProperty.java | 4 ++-- 3 files changed, 15 insertions(+), 5 deletions(-) diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElement.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElement.java index 7bfc237..f787cff 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElement.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElement.java @@ -15,6 +15,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; import javax.persistence.Transient; +import java.util.List; /** * @Description : @@ -74,16 +75,21 @@ public class BfElement extends BaseBean { @Transient @ApiParam(value = "数据对象") - @AnnoOutputColumn(hidden = true) private BfDataObject dataObject; @Transient @ApiParam(value = "元素表单") - @AnnoOutputColumn(hidden = true) private BfElementGrid elementGrid; @Transient @ApiParam(value = "元素树") - @AnnoOutputColumn(hidden = true) private BfElementTree elementTree; + + @Transient + @ApiParam(value = "元素属性信息") + private List propertyList; + + @Transient + @ApiParam(value = "元素虚拟属性信息") + private List propertyVirtualList; } diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementGrid.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementGrid.java index a979a2c..d0eb771 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementGrid.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementGrid.java @@ -40,6 +40,10 @@ public class BfElementGrid extends BaseBean { @ApiParam(value = "显示行号") private Integer isLineShowNumber; + @Column(name = "IS_LINE_MULTIPLE") + @ApiParam(value = "是否单选") + private Integer isLineMultiple; + @Column(name = "IS_OBJECT_ADD") @ApiParam(value = "是否新增") private Integer isObjectAdd; diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementProperty.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementProperty.java index 1b33377..e5d40c5 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementProperty.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementProperty.java @@ -56,11 +56,11 @@ public class BfElementProperty extends BaseBean { private String propertyTypeNameRdd; @Column(name="PROPERTY_NAME") - @ApiParam(value ="元素描述") + @ApiParam(value ="元素提示") private String propertyName; @Column(name="PROPERTY_DEFAULT_VALUE") - @ApiParam(value ="元素描述") + @ApiParam(value ="元素默认值") private String propertyDefaultValue; @Column(name = "PROPERTY_VALUE_NOT_NULL")