Merge pull request #118 from codingapi/dev

update version

Author: xlorne

flow-engine-example/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.codingapi.flow</groupId>
         <artifactId>flow-engine-parent</artifactId>
-        <version>0.0.18</version>
+        <version>0.0.22</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

flow-engine-framework/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.codingapi.flow</groupId>
         <artifactId>flow-engine-parent</artifactId>
-        <version>0.0.18</version>
+        <version>0.0.22</version>
     </parent>
 
     <name>flow-engine-framework</name>

flow-engine-framework/src/main/java/com/codingapi/flow/form/FieldAttribute.java

@@ -12,5 +12,5 @@ public class FieldAttribute {
     // 属性名称
     private String label;
     // 属性值
-    private String value;
+    private Object value;
 }

flow-engine-framework/src/main/java/com/codingapi/flow/form/FlowForm.java

@@ -74,14 +74,14 @@ public static FlowForm fromMap(Map<String, Object> map) {
                 fieldMeta.setPlaceholder((String) field.get("placeholder"));
                 fieldMeta.setTooltip((String) field.get("tooltip"));
                 fieldMeta.setHelp((String) field.get("help"));
-                List<Map<String, Object>> attributes = (List<Map<String, Object>>)field.get("attributes");
-                if(attributes!=null) {
+                List<Map<String, Object>> attributes = (List<Map<String, Object>>) field.get("attributes");
+                if (attributes != null) {
                     List<FieldAttribute> attributeList = new ArrayList<>();
-                    for (Map<String, Object> attribute : attributes){
+                    for (Map<String, Object> attribute : attributes) {
                         FieldAttribute fieldAttribute = new FieldAttribute();
                         fieldAttribute.setKey((String) attribute.get("key"));
                         fieldAttribute.setLabel((String) attribute.get("label"));
-                        fieldAttribute.setValue((String) attribute.get("value"));
+                        fieldAttribute.setValue(attribute.get("value"));
                         attributeList.add(fieldAttribute);
                     }
                     fieldMeta.setAttributes(attributeList);
@@ -124,15 +124,16 @@ public FormField getField(String fieldCode) {
 
     /**
      * 获取表单字段
-     * @param formCode 表单code
+     *
+     * @param formCode  表单code
      * @param fieldCode 字段code
      */
-    public FormField getField(String formCode,String fieldCode){
-        if(this.code.equals(formCode)){
+    public FormField getField(String formCode, String fieldCode) {
+        if (this.code.equals(formCode)) {
             return this.getField(fieldCode);
-        }else {
-            for (FlowForm subForm:subForms){
-                if(subForm.getCode().equals(formCode)){
+        } else {
+            for (FlowForm subForm : subForms) {
+                if (subForm.getCode().equals(formCode)) {
                     return subForm.getField(fieldCode);
                 }
             }
@@ -156,9 +157,9 @@ private void initFormFieldDataTypes(FlowForm form, Map<String, DataType> types)
     public Map<String, DataType> loadAllFieldDataTypeMaps() {
         Map<String, DataType> types = new HashMap<>();
         List<FlowForm> forms;
-        if(this.subForms==null || this.subForms.isEmpty()){
+        if (this.subForms == null || this.subForms.isEmpty()) {
             forms = new ArrayList<>();
-        }else {
+        } else {
             forms = new ArrayList<>(this.getSubForms());
         }
         forms.add(this);

flow-engine-framework/src/test/java/com/codingapi/flow/form/FieldAttributeTest.java

@@ -0,0 +1,46 @@
+package com.codingapi.flow.form;
+
+import com.alibaba.fastjson.JSONObject;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+class FieldAttributeTest {
+
+
+    @Test
+    void convert(){
+
+        String attribute1 = """
+                {
+                   "key":"123",
+                   "label":"123",
+                   "value":{
+                      "data":"123"
+                   }
+                }
+                """;
+
+        String attribute2 = """
+                {
+                   "key":"123",
+                   "label":"123",
+                   "value":[
+                      {
+                        "data":"123"
+                      },
+                      {
+                        "data":"123"
+                      }
+                   ]
+                }
+                """;
+
+        FieldAttribute attributeObj1 =  JSONObject.parseObject(attribute1,FieldAttribute.class);
+        FieldAttribute attributeObj2 =  JSONObject.parseObject(attribute2,FieldAttribute.class);
+
+        assertEquals("{\"data\":\"123\"}", attributeObj1.getValue().toString());
+        assertEquals("[{\"data\":\"123\"},{\"data\":\"123\"}]", attributeObj2.getValue().toString());
+
+    }
+}

flow-engine-starter-api/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.codingapi.flow</groupId>
         <artifactId>flow-engine-parent</artifactId>
-        <version>0.0.18</version>
+        <version>0.0.22</version>
     </parent>
 
     <name>flow-engine-starter-api</name>

flow-engine-starter-infra/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.codingapi.flow</groupId>
         <artifactId>flow-engine-parent</artifactId>
-        <version>0.0.18</version>
+        <version>0.0.22</version>
     </parent>
 
     <name>flow-engine-starter-infra</name>

flow-engine-starter-query/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.codingapi.flow</groupId>
         <artifactId>flow-engine-parent</artifactId>
-        <version>0.0.18</version>
+        <version>0.0.22</version>
     </parent>
 
     <name>flow-engine-starter-query</name>

flow-engine-starter/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.codingapi.flow</groupId>
         <artifactId>flow-engine-parent</artifactId>
-        <version>0.0.18</version>
+        <version>0.0.22</version>
     </parent>
 
     <name>flow-engine-starter</name>