From 90d677e863181f9ce0484016706c2f90d83dc41c Mon Sep 17 00:00:00 2001 From: "459816669@qq.com" <459816669@qq.com> Date: Tue, 23 Nov 2021 21:08:27 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E8=A1=A8=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../snow/common/enums/FormFieldTypeEnums.java | 97 ++++++++++++++----- .../snow/from/controller/FormController.java | 32 ++++++ .../domain/{Field => field}/BaseField.java | 2 +- .../{Field => field}/CarouselField.java | 2 +- .../{Field => field}/CheckboxField.java | 2 +- .../from/domain/{Field => field}/Columns.java | 4 +- .../domain/{Field => field}/CronField.java | 2 +- .../domain/{Field => field}/DateField.java | 2 +- .../{Field => field}/DateRangeField.java | 2 +- .../domain/{Field => field}/FileField.java | 2 +- .../domain/{Field => field}/GridField.java | 2 +- .../domain/{Field => field}/ImageField.java | 2 +- .../domain/{Field => field}/InputField.java | 2 +- .../{Field => field}/NumberInputField.java | 2 +- .../from/domain/{Field => field}/Options.java | 2 +- .../{Field => field}/PassWordField.java | 2 +- .../domain/{Field => field}/RadioField.java | 2 +- .../domain/{Field => field}/RateField.java | 2 +- .../domain/{Field => field}/SelectField.java | 2 +- .../domain/{Field => field}/SignField.java | 2 +- .../domain/{Field => field}/SliderField.java | 2 +- .../domain/{Field => field}/SwitchField.java | 2 +- .../{Field => field}/TextareaField.java | 2 +- 23 files changed, 125 insertions(+), 48 deletions(-) rename snow-from/src/main/java/com/snow/from/domain/{Field => field}/BaseField.java (91%) rename snow-from/src/main/java/com/snow/from/domain/{Field => field}/CarouselField.java (96%) rename snow-from/src/main/java/com/snow/from/domain/{Field => field}/CheckboxField.java (96%) rename snow-from/src/main/java/com/snow/from/domain/{Field => field}/Columns.java (81%) rename snow-from/src/main/java/com/snow/from/domain/{Field => field}/CronField.java (95%) rename snow-from/src/main/java/com/snow/from/domain/{Field => field}/DateField.java (96%) rename snow-from/src/main/java/com/snow/from/domain/{Field => field}/DateRangeField.java (96%) rename snow-from/src/main/java/com/snow/from/domain/{Field => field}/FileField.java (93%) rename snow-from/src/main/java/com/snow/from/domain/{Field => field}/GridField.java (92%) rename snow-from/src/main/java/com/snow/from/domain/{Field => field}/ImageField.java (94%) rename snow-from/src/main/java/com/snow/from/domain/{Field => field}/InputField.java (94%) rename snow-from/src/main/java/com/snow/from/domain/{Field => field}/NumberInputField.java (95%) rename snow-from/src/main/java/com/snow/from/domain/{Field => field}/Options.java (92%) rename snow-from/src/main/java/com/snow/from/domain/{Field => field}/PassWordField.java (94%) rename snow-from/src/main/java/com/snow/from/domain/{Field => field}/RadioField.java (96%) rename snow-from/src/main/java/com/snow/from/domain/{Field => field}/RateField.java (94%) rename snow-from/src/main/java/com/snow/from/domain/{Field => field}/SelectField.java (97%) rename snow-from/src/main/java/com/snow/from/domain/{Field => field}/SignField.java (94%) rename snow-from/src/main/java/com/snow/from/domain/{Field => field}/SliderField.java (96%) rename snow-from/src/main/java/com/snow/from/domain/{Field => field}/SwitchField.java (94%) rename snow-from/src/main/java/com/snow/from/domain/{Field => field}/TextareaField.java (93%) diff --git a/snow-common/src/main/java/com/snow/common/enums/FormFieldTypeEnums.java b/snow-common/src/main/java/com/snow/common/enums/FormFieldTypeEnums.java index cf825f1..3a2d647 100644 --- a/snow-common/src/main/java/com/snow/common/enums/FormFieldTypeEnums.java +++ b/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; + } } diff --git a/snow-from/src/main/java/com/snow/from/controller/FormController.java b/snow-from/src/main/java/com/snow/from/controller/FormController.java index a6a53f5..7f00356 100644 --- a/snow-from/src/main/java/com/snow/from/controller/FormController.java +++ b/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 columnsList=gridField.getColumns(); + if(CollUtil.isNotEmpty(columnsList)){ + columnsList.forEach(t->{ + List list = t.getList(); + for(int j=0;j list; } diff --git a/snow-from/src/main/java/com/snow/from/domain/Field/CronField.java b/snow-from/src/main/java/com/snow/from/domain/field/CronField.java similarity index 95% rename from snow-from/src/main/java/com/snow/from/domain/Field/CronField.java rename to snow-from/src/main/java/com/snow/from/domain/field/CronField.java index da5b9ee..9731b1a 100644 --- a/snow-from/src/main/java/com/snow/from/domain/Field/CronField.java +++ b/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; diff --git a/snow-from/src/main/java/com/snow/from/domain/Field/DateField.java b/snow-from/src/main/java/com/snow/from/domain/field/DateField.java similarity index 96% rename from snow-from/src/main/java/com/snow/from/domain/Field/DateField.java rename to snow-from/src/main/java/com/snow/from/domain/field/DateField.java index c1036a4..d253276 100644 --- a/snow-from/src/main/java/com/snow/from/domain/Field/DateField.java +++ b/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; diff --git a/snow-from/src/main/java/com/snow/from/domain/Field/DateRangeField.java b/snow-from/src/main/java/com/snow/from/domain/field/DateRangeField.java similarity index 96% rename from snow-from/src/main/java/com/snow/from/domain/Field/DateRangeField.java rename to snow-from/src/main/java/com/snow/from/domain/field/DateRangeField.java index ce8bb47..d033f7d 100644 --- a/snow-from/src/main/java/com/snow/from/domain/Field/DateRangeField.java +++ b/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; diff --git a/snow-from/src/main/java/com/snow/from/domain/Field/FileField.java b/snow-from/src/main/java/com/snow/from/domain/field/FileField.java similarity index 93% rename from snow-from/src/main/java/com/snow/from/domain/Field/FileField.java rename to snow-from/src/main/java/com/snow/from/domain/field/FileField.java index 8e57501..2c3636d 100644 --- a/snow-from/src/main/java/com/snow/from/domain/Field/FileField.java +++ b/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; diff --git a/snow-from/src/main/java/com/snow/from/domain/Field/GridField.java b/snow-from/src/main/java/com/snow/from/domain/field/GridField.java similarity index 92% rename from snow-from/src/main/java/com/snow/from/domain/Field/GridField.java rename to snow-from/src/main/java/com/snow/from/domain/field/GridField.java index 1765d77..8999f01 100644 --- a/snow-from/src/main/java/com/snow/from/domain/Field/GridField.java +++ b/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; diff --git a/snow-from/src/main/java/com/snow/from/domain/Field/ImageField.java b/snow-from/src/main/java/com/snow/from/domain/field/ImageField.java similarity index 94% rename from snow-from/src/main/java/com/snow/from/domain/Field/ImageField.java rename to snow-from/src/main/java/com/snow/from/domain/field/ImageField.java index 2b4f17d..d85be90 100644 --- a/snow-from/src/main/java/com/snow/from/domain/Field/ImageField.java +++ b/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; diff --git a/snow-from/src/main/java/com/snow/from/domain/Field/InputField.java b/snow-from/src/main/java/com/snow/from/domain/field/InputField.java similarity index 94% rename from snow-from/src/main/java/com/snow/from/domain/Field/InputField.java rename to snow-from/src/main/java/com/snow/from/domain/field/InputField.java index 7e73d30..2b62a9c 100644 --- a/snow-from/src/main/java/com/snow/from/domain/Field/InputField.java +++ b/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; diff --git a/snow-from/src/main/java/com/snow/from/domain/Field/NumberInputField.java b/snow-from/src/main/java/com/snow/from/domain/field/NumberInputField.java similarity index 95% rename from snow-from/src/main/java/com/snow/from/domain/Field/NumberInputField.java rename to snow-from/src/main/java/com/snow/from/domain/field/NumberInputField.java index bacc779..1bd7c7f 100644 --- a/snow-from/src/main/java/com/snow/from/domain/Field/NumberInputField.java +++ b/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; diff --git a/snow-from/src/main/java/com/snow/from/domain/Field/Options.java b/snow-from/src/main/java/com/snow/from/domain/field/Options.java similarity index 92% rename from snow-from/src/main/java/com/snow/from/domain/Field/Options.java rename to snow-from/src/main/java/com/snow/from/domain/field/Options.java index 0bf32a1..cd93ae2 100644 --- a/snow-from/src/main/java/com/snow/from/domain/Field/Options.java +++ b/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; diff --git a/snow-from/src/main/java/com/snow/from/domain/Field/PassWordField.java b/snow-from/src/main/java/com/snow/from/domain/field/PassWordField.java similarity index 94% rename from snow-from/src/main/java/com/snow/from/domain/Field/PassWordField.java rename to snow-from/src/main/java/com/snow/from/domain/field/PassWordField.java index b6bb264..402c586 100644 --- a/snow-from/src/main/java/com/snow/from/domain/Field/PassWordField.java +++ b/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; diff --git a/snow-from/src/main/java/com/snow/from/domain/Field/RadioField.java b/snow-from/src/main/java/com/snow/from/domain/field/RadioField.java similarity index 96% rename from snow-from/src/main/java/com/snow/from/domain/Field/RadioField.java rename to snow-from/src/main/java/com/snow/from/domain/field/RadioField.java index 9bc207b..7ad147b 100644 --- a/snow-from/src/main/java/com/snow/from/domain/Field/RadioField.java +++ b/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; diff --git a/snow-from/src/main/java/com/snow/from/domain/Field/RateField.java b/snow-from/src/main/java/com/snow/from/domain/field/RateField.java similarity index 94% rename from snow-from/src/main/java/com/snow/from/domain/Field/RateField.java rename to snow-from/src/main/java/com/snow/from/domain/field/RateField.java index 3cc9051..a73c5d2 100644 --- a/snow-from/src/main/java/com/snow/from/domain/Field/RateField.java +++ b/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; diff --git a/snow-from/src/main/java/com/snow/from/domain/Field/SelectField.java b/snow-from/src/main/java/com/snow/from/domain/field/SelectField.java similarity index 97% rename from snow-from/src/main/java/com/snow/from/domain/Field/SelectField.java rename to snow-from/src/main/java/com/snow/from/domain/field/SelectField.java index 2c4a389..68d1251 100644 --- a/snow-from/src/main/java/com/snow/from/domain/Field/SelectField.java +++ b/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; diff --git a/snow-from/src/main/java/com/snow/from/domain/Field/SignField.java b/snow-from/src/main/java/com/snow/from/domain/field/SignField.java similarity index 94% rename from snow-from/src/main/java/com/snow/from/domain/Field/SignField.java rename to snow-from/src/main/java/com/snow/from/domain/field/SignField.java index cdfd5f4..4a0e885 100644 --- a/snow-from/src/main/java/com/snow/from/domain/Field/SignField.java +++ b/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; diff --git a/snow-from/src/main/java/com/snow/from/domain/Field/SliderField.java b/snow-from/src/main/java/com/snow/from/domain/field/SliderField.java similarity index 96% rename from snow-from/src/main/java/com/snow/from/domain/Field/SliderField.java rename to snow-from/src/main/java/com/snow/from/domain/field/SliderField.java index 216ab1c..01ea066 100644 --- a/snow-from/src/main/java/com/snow/from/domain/Field/SliderField.java +++ b/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; diff --git a/snow-from/src/main/java/com/snow/from/domain/Field/SwitchField.java b/snow-from/src/main/java/com/snow/from/domain/field/SwitchField.java similarity index 94% rename from snow-from/src/main/java/com/snow/from/domain/Field/SwitchField.java rename to snow-from/src/main/java/com/snow/from/domain/field/SwitchField.java index d372599..8ae383e 100644 --- a/snow-from/src/main/java/com/snow/from/domain/Field/SwitchField.java +++ b/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; diff --git a/snow-from/src/main/java/com/snow/from/domain/Field/TextareaField.java b/snow-from/src/main/java/com/snow/from/domain/field/TextareaField.java similarity index 93% rename from snow-from/src/main/java/com/snow/from/domain/Field/TextareaField.java rename to snow-from/src/main/java/com/snow/from/domain/field/TextareaField.java index 3223ac6..052c322 100644 --- a/snow-from/src/main/java/com/snow/from/domain/Field/TextareaField.java +++ b/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;