Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev

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

@@ -335,7 +335,7 @@ public class BlockFormEnumUtil {
         }
     }
     /**
-     * 元素显示状态信息
+     * 元素属性显示状态信息
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum ELEMENT_SHOW_STATUS {
@@ -2036,4 +2036,85 @@ public class BlockFormEnumUtil {
         }
     }
 
+    /**
+     * 元素树方向
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum ELEMENT_TREE_DIRECTION {
+        horizontal(1, "horizontal", "横向"),
+        vertical(2, "vertical", "竖向");
+
+        private int value;
+        private String code;
+        private String description;
+
+        private ELEMENT_TREE_DIRECTION (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_TREE_DIRECTION  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-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java

@@ -113,6 +113,7 @@ public class CommonEnumUtil {
     /**
      * 处理标识
      */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum TRUE_OR_FALSE {
         TRUE(1, "是"), FALSE(2, "否");
 

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

@@ -45,11 +45,11 @@ public class BfElementPropertyVirtual extends BaseBean {
     private Long dataObjectId;
 
     @Column(name="PROPERTY_CODE")
-    @ApiParam(value ="类属性代码")
+    @ApiParam(value ="虚拟属性代码")
     private String propertyCode;
 
     @Column(name="PROPERTY_NAME")
-    @ApiParam(value ="元素名称")
+    @ApiParam(value ="虚拟属性名称")
     private String propertyName;
 
     @Column(name="PROPERTY_TYPE")