表单-自定义按钮-添加是否需要选中数据校验及实现Http方式扩展

表单-拦截器-实现Http方式扩展
表单-元素-工厂数据隔离功能
表单-动态表单-查询数据默认条件优先级优化
sonar代码优化

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java

@@ -985,6 +985,89 @@ public class BlockFormEnumUtil {
     }
 
 
+
+    /**
+     * 元素组织隔离
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum ELEMENT_ORGANIZE_ISOLATION_STATUS {
+        ON(1, "ON", "开启"),
+        OFF(2, "OFF", "关闭");
+
+        private int value;
+        private String code;
+        private String description;
+
+        private ELEMENT_ORGANIZE_ISOLATION_STATUS(int value, String code, String description) {
+            this.value = value;
+            this.code = code;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfCode(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].code;
+                }
+            }
+            return tmp;
+        }
+
+        public static int codeOfValue(String code) {
+            int tmp = 1;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].code.equals(code)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+
+        public static ELEMENT_ORGANIZE_ISOLATION_STATUS valueOf(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    return values()[i];
+                }
+            }
+            return null;
+        }
+
+        public static String codeOfDescription(String code) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].code.equals(code)) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
+
     /**
      * 属性字段排序规则
      */

modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfButton.java

@@ -46,9 +46,14 @@ public class BfButton extends BaseBean {
         }
     }
 
-    @Column(name = "IS_REQUIRED_DATA")
-    @ApiParam(value = "是必填数据")
-    private Integer isRequiredData;
+    @Column(name = "IS_NEED_SELECT_DATA")
+    @ApiParam(value = "是否需要选中数据")
+    private Integer isNeedSelectData;
+
+    @Column(name = "IS_REFRESH")
+    @ApiParam(value = "是否刷新")
+    private Integer isRefresh;
+
 
     // 关联表单功能表id
     @Column(name = "METHOD_ID")

modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfDataObjectProperty.java

@@ -1,6 +1,7 @@
 package cn.estsh.i3plus.pojo.form.bean;
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.Api;
@@ -66,6 +67,10 @@ public class BfDataObjectProperty extends BaseBean {
     @ApiParam(value = "是否允许为空")
     private Integer isNullable;
 
+    public Integer getIsNullableVal(){
+        return isNullable == null ? CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue() : isNullable.intValue();
+    }
+
     // 字段长度
     @ApiParam(value = "字段长度")
     @Column(name="OBJECT_COLUMN_PRECISION")

modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElement.java

@@ -1,6 +1,7 @@
 package cn.estsh.i3plus.pojo.form.bean;
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.BlockFormEnumUtil;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.Api;
@@ -82,6 +83,10 @@ public class BfElement extends BaseBean {
     @ApiParam(value = "是否弱删除")
     private Integer isObjectDelWeak;
 
+    public Integer getIsObjectDelWeakVal(){
+        return isObjectDelWeak == null ? BlockFormEnumUtil.ELEMENT_DELETE_WEAK_STATUS.OFF.getValue() : isObjectDelWeak.intValue();
+    }
+
     @Column(name = "ELEMENT_DEL_WEAK_ATTR_ID")
     @ApiParam(value = "元素弱删除属性id")
     private Long elementDelWeakAttrId;
@@ -90,10 +95,22 @@ public class BfElement extends BaseBean {
     @ApiParam(value = "是否有效")
     private Integer isObjectValid;
 
+    public Integer getIsObjectValidVal(){
+        return isObjectValid == null ? BlockFormEnumUtil.ELEMENT_VALID_STATUS.OFF.getValue() : isObjectValid.intValue();
+    }
+
     @Column(name = "ELEMENT_VALID_ATTR_ID")
     @ApiParam(value = "元素有效属性id")
     private Long elementValidAttrId;
 
+    @Column(name = "IS_ORGANIZE_ISOLATION")
+    @ApiParam(value = "是否组织隔离")
+    private Integer isOrganizeIsolation;
+
+    public Integer getIsOrganizeIsolationVal(){
+        return isOrganizeIsolation == null ? BlockFormEnumUtil.ELEMENT_ORGANIZE_ISOLATION_STATUS.OFF.getValue() : isOrganizeIsolation.intValue();
+    }
+
     @Column(name = "IS_OBJECT_EXPORT")
     @ApiParam(value = "是否导出")
     private Integer isObjectExport;