完善表单

snow-common/src/main/java/com/snow/common/enums/FormFieldTypeEnums.java

@@ -7,33 +7,78 @@ package com.snow.common.enums;
  * @date 2021/11/19 15:34
  */
 public enum FormFieldTypeEnums {
-    input,
-    password,
-    textarea,
-    select,
-    radio,
-    CHECKBOX,
-    /**
-     * 开关
-     */
-    SWITCH,
-    //滑块
-    SLIDER,
-    //日期
-    DATE,
-    //日期范围
-    dateRange,
-    //评分
-    rate,
-    //轮播图
-    carousel,
-    //颜色选择器
-    colorpicker,
-    //图片
-    image,
+    INPUT("input","文本输入框"),
 
-    //文件
-    file;
+    PASSWORD("password","密码输入框"),
 
+    TEXTAREA("textarea","文本域"),
+
+    NUMBER_INPUT("numberInput","排序文本框"),
+
+    SELECT("select","下拉框"),
+
+    RADIO("radio","单选框"),
+
+    CHECKBOX("CHECKBOX","复选框"),
+
+    SWITCH("SWITCH","开关"),
+
+    SLIDER("SLIDER","滑块"),
+
+    DATE("DATE","日期"),
+
+    DATE_RANGE("dateRange","日期范围"),
+
+    RATE("rate","评分"),
+
+    CAROUSEL("carousel","轮播图"),
+
+    COLOR_PICKER("colorpicker","颜色选择器"),
+
+    CRON("cron","Cron表达式"),
+
+    SIGN("sign","签名组件"),
+
+    GRID("grid","grid"),
+
+    IMAGE("image","图片"),
+
+    FILE("file","文件");
+    private final String code;
+    private final String info;
+
+    FormFieldTypeEnums(String code, String info)
+    {
+        this.code = code;
+        this.info = info;
+    }
+
+    public String getCode()
+    {
+        return code;
+    }
+
+    public String getInfo()
+    {
+        return info;
+    }
+
+    public static FormFieldTypeEnums getInfo(String info) {
+        for (FormFieldTypeEnums formFieldTypeEnums:FormFieldTypeEnums.values()){
+            if(formFieldTypeEnums.getInfo().equals(info)){
+                return formFieldTypeEnums;
+            }
+        }
+        return null;
+    }
+
+    public static FormFieldTypeEnums getCode(String code) {
+        for (FormFieldTypeEnums formFieldTypeEnum:FormFieldTypeEnums.values()){
+            if(formFieldTypeEnum.getCode().equals(code)){
+                return formFieldTypeEnum;
+            }
+        }
+        return null;
+    }
 
 }

snow-from/src/main/java/com/snow/from/controller/FormController.java

@@ -1,16 +1,23 @@
 package com.snow.from.controller;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.date.DatePattern;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
 import com.snow.common.core.domain.AjaxResult;
+import com.snow.common.enums.FormFieldTypeEnums;
 import com.snow.common.utils.StringUtils;
 import com.snow.framework.util.ShiroUtils;
 import com.snow.from.domain.SysFormDataRecord;
 import com.snow.from.domain.SysFormField;
 import com.snow.from.domain.SysFormInstance;
+import com.snow.from.domain.field.BaseField;
+import com.snow.from.domain.field.Columns;
+import com.snow.from.domain.field.GridField;
+import com.snow.from.domain.field.InputField;
 import com.snow.from.domain.request.FormFieldRequest;
 import com.snow.from.domain.request.FormRequest;
 import com.snow.from.service.impl.SysFormDataRecordServiceImpl;
@@ -133,6 +140,31 @@ public class FormController {
     public AjaxResult saveFormRecord(@RequestParam String formId ,
                                      @RequestParam String formData,
                                      @RequestParam String formField){
+
+
+        //解析前端传过来的数据
+        JSONArray formDataArray = JSON.parseArray(formData);
+        for(int i=0;i<formDataArray.size();i++){
+            BaseField baseField=formDataArray.getObject(i,BaseField.class);
+          //一行多列布局
+          if(baseField.getTag().equals(FormFieldTypeEnums.GRID.getCode())){
+              GridField gridField=formDataArray.getObject(i, GridField.class);
+              List<Columns> columnsList=gridField.getColumns();
+              if(CollUtil.isNotEmpty(columnsList)){
+                  columnsList.forEach(t->{
+                      List<BaseField> list = t.getList();
+                      for(int j=0;j<list.size();j++){
+                          if(list.get(j).getTag().equals(FormFieldTypeEnums.INPUT.getCode())){
+
+                          }
+                      }
+                  });
+              }
+          }
+        }
+       
+
+
         Long userId = ShiroUtils.getUserId();
         SysFormDataRecord sysFormDataRecord=new SysFormDataRecord();
         sysFormDataRecord.setBelongUserId(String.valueOf(userId));

snow-from/src/main/java/com/snow/from/domain/field/BaseField.java

@@ -1,4 +1,4 @@
-package com.snow.from.domain.Field;
+package com.snow.from.domain.field;
 
 import lombok.Data;
 

snow-from/src/main/java/com/snow/from/domain/field/CarouselField.java

@@ -1,4 +1,4 @@
-package com.snow.from.domain.Field;
+package com.snow.from.domain.field;
 
 import lombok.Data;
 

snow-from/src/main/java/com/snow/from/domain/field/CheckboxField.java

@@ -1,4 +1,4 @@
-package com.snow.from.domain.Field;
+package com.snow.from.domain.field;
 
 import lombok.Data;
 

snow-from/src/main/java/com/snow/from/domain/field/Columns.java

@@ -1,4 +1,4 @@
-package com.snow.from.domain.Field;
+package com.snow.from.domain.field;
 
 import lombok.Data;
 
@@ -17,5 +17,5 @@ public class Columns implements Serializable {
 
     private int span;
 
-    private List list;
+    private List<BaseField> list;
 }

snow-from/src/main/java/com/snow/from/domain/field/CronField.java

@@ -1,4 +1,4 @@
-package com.snow.from.domain.Field;
+package com.snow.from.domain.field;
 
 import lombok.Data;
 

snow-from/src/main/java/com/snow/from/domain/field/DateField.java

@@ -1,4 +1,4 @@
-package com.snow.from.domain.Field;
+package com.snow.from.domain.field;
 
 import lombok.Data;
 

snow-from/src/main/java/com/snow/from/domain/field/DateRangeField.java

@@ -1,4 +1,4 @@
-package com.snow.from.domain.Field;
+package com.snow.from.domain.field;
 
 import lombok.Data;
 

snow-from/src/main/java/com/snow/from/domain/field/FileField.java

@@ -1,4 +1,4 @@
-package com.snow.from.domain.Field;
+package com.snow.from.domain.field;
 
 import lombok.Data;
 

snow-from/src/main/java/com/snow/from/domain/field/GridField.java

@@ -1,4 +1,4 @@
-package com.snow.from.domain.Field;
+package com.snow.from.domain.field;
 
 import lombok.Data;
 

snow-from/src/main/java/com/snow/from/domain/field/ImageField.java

@@ -1,4 +1,4 @@
-package com.snow.from.domain.Field;
+package com.snow.from.domain.field;
 
 import lombok.Data;
 

snow-from/src/main/java/com/snow/from/domain/field/InputField.java

@@ -1,4 +1,4 @@
-package com.snow.from.domain.Field;
+package com.snow.from.domain.field;
 
 import lombok.Data;
 

snow-from/src/main/java/com/snow/from/domain/field/NumberInputField.java

@@ -1,4 +1,4 @@
-package com.snow.from.domain.Field;
+package com.snow.from.domain.field;
 
 import lombok.Data;
 

snow-from/src/main/java/com/snow/from/domain/field/Options.java

@@ -1,4 +1,4 @@
-package com.snow.from.domain.Field;
+package com.snow.from.domain.field;
 
 import lombok.Data;
 

snow-from/src/main/java/com/snow/from/domain/field/PassWordField.java

@@ -1,4 +1,4 @@
-package com.snow.from.domain.Field;
+package com.snow.from.domain.field;
 
 import lombok.Data;
 

snow-from/src/main/java/com/snow/from/domain/field/RadioField.java

@@ -1,4 +1,4 @@
-package com.snow.from.domain.Field;
+package com.snow.from.domain.field;
 
 import lombok.Data;
 

snow-from/src/main/java/com/snow/from/domain/field/RateField.java

@@ -1,4 +1,4 @@
-package com.snow.from.domain.Field;
+package com.snow.from.domain.field;
 
 import lombok.Data;
 

snow-from/src/main/java/com/snow/from/domain/field/SelectField.java

@@ -1,4 +1,4 @@
-package com.snow.from.domain.Field;
+package com.snow.from.domain.field;
 
 import lombok.Data;
 

snow-from/src/main/java/com/snow/from/domain/field/SignField.java

@@ -1,4 +1,4 @@
-package com.snow.from.domain.Field;
+package com.snow.from.domain.field;
 
 import lombok.Data;
 

snow-from/src/main/java/com/snow/from/domain/field/SliderField.java

@@ -1,4 +1,4 @@
-package com.snow.from.domain.Field;
+package com.snow.from.domain.field;
 
 import lombok.Data;
 

snow-from/src/main/java/com/snow/from/domain/field/SwitchField.java

@@ -1,4 +1,4 @@
-package com.snow.from.domain.Field;
+package com.snow.from.domain.field;
 
 import lombok.Data;
 

snow-from/src/main/java/com/snow/from/domain/field/TextareaField.java

@@ -1,4 +1,4 @@
-package com.snow.from.domain.Field;
+package com.snow.from.domain.field;
 
 import lombok.Data;