生成表单json数据样式调整

fill-manager/src/main/java/com/mortals/xhx/common/formdesign/FormDesignConfig.java

@@ -44,7 +44,7 @@ public class FormDesignConfig {
 		this.formModel="form";
 		this.rules="rules";
 		this.size = "medium";
-		this.labelPosition = "right";
+		this.labelPosition = "top";
 		this.labelWidth = 120;
 		this.formRules="rules";
 		this.gutter=15;

fill-manager/src/main/java/com/mortals/xhx/common/formdesign/ListItem.java

@@ -375,4 +375,6 @@ public class ListItem{
 	@JSONField(name="append")
 	private String append;
 
+	@JSONField(name="rowCount")
+	private Integer rowCount;
 }
\ No newline at end of file

fill-manager/src/main/java/com/mortals/xhx/common/formdesign/component/DesignCheckboxComponent.java

@@ -50,7 +50,7 @@ public class DesignCheckboxComponent extends DesignComponent {
         columnsItem.setBorder(false);
         columnsItem.setSize("medium");
         columnsItem.setGutter(15);
-        columnsItem.setSpan(12);
+        columnsItem.setSpan(24);
         columnsItem.setOptionType("default");
         columnsItem.setDataType("static");
         columnsItem.setAction("https://www.fastmock.site/mock/51715c0157535b99010bde55f2df33c8/formDesigner/api/options");

fill-manager/src/main/java/com/mortals/xhx/common/formdesign/component/DesignDateComponent.java

@@ -45,7 +45,7 @@ public class DesignDateComponent extends DesignComponent {
         columnsItem.setRequired(false);
         columnsItem.setMaxLength(50);
         columnsItem.setGutter(15);
-        columnsItem.setSpan(12);
+        columnsItem.setSpan(24);
 
         columnsItem.setFormat("yyyy 年 MM 月 dd 日");
         columnsItem.setValueFormat("yyyy 年 MM 月 dd 日");

fill-manager/src/main/java/com/mortals/xhx/common/formdesign/component/DesignDynamicTableComponent.java

@@ -11,6 +11,8 @@ import com.mortals.xhx.common.pdu.gen.component.ComponentCons;
 import org.springframework.util.ObjectUtils;
 
 import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -48,6 +50,7 @@ public class DesignDynamicTableComponent extends DesignComponent {
         listItem.setShowSummary(false);
         listItem.setSumText("合计");
         listItem.setSummaryText("元");
+        listItem.setRowCount(3);
 
         if (!ObjectUtils.isEmpty(cons.getColList())) {
             //动态生成列元素
@@ -130,11 +133,12 @@ public class DesignDynamicTableComponent extends DesignComponent {
                     columnsItem.setRequired(false);
                     columnsItem.setMaxLength(50);
                     columnsItem.setGutter(15);
-                    columnsItem.setSpan(12);
+                    columnsItem.setSpan(24);
                     columnsItem.setValue("");
                     columnsItem.setClearable(true);
                     columnsItem.setDisabled(false);
                     columnsItem.setReadonly(false);
+                    columnsItem.setRules(Collections.emptyList());
 //                    columnsItem.setRangeSeparator("-");
 //                    columnsItem.setFormat("yyyy-MM-dd");
 //                    columnsItem.setValueFormat("yyyy-MM-dd");

fill-manager/src/main/java/com/mortals/xhx/common/formdesign/component/DesignInputComponent.java

@@ -42,7 +42,7 @@ public class DesignInputComponent extends DesignComponent {
         columnsItem.setRequired(false);
         columnsItem.setMaxLength(50);
         columnsItem.setGutter(15);
-        columnsItem.setSpan(12);
+        columnsItem.setSpan(24);
         columnsItem.setWidth("100%");
         columnsItem.setClearable(true);
         columnsItem.setDisabled(false);

fill-manager/src/main/java/com/mortals/xhx/common/formdesign/component/DesignRadioComponent.java

@@ -49,7 +49,7 @@ public class DesignRadioComponent extends DesignComponent {
         columnsItem.setBorder(false);
         columnsItem.setSize("medium");
         columnsItem.setGutter(15);
-        columnsItem.setSpan(12);
+        columnsItem.setSpan(24);
         columnsItem.setOptionType("default");
         columnsItem.setDataType("static");
         columnsItem.setAction("https://www.fastmock.site/mock/51715c0157535b99010bde55f2df33c8/formDesigner/api/options");

fill-manager/src/main/java/com/mortals/xhx/common/formdesign/component/DesignSelectComponent.java

@@ -50,7 +50,7 @@ public class DesignSelectComponent extends DesignComponent {
         columnsItem.setCollapseTags(false);
         columnsItem.setDisabled(false);
         columnsItem.setGutter(15);
-        columnsItem.setSpan(12);
+        columnsItem.setSpan(24);
         columnsItem.setDataType("static");
         columnsItem.setAction("https://www.fastmock.site/mock/51715c0157535b99010bde55f2df33c8/formDesigner/api/options");
         columnsItem.setClearable(false);

fill-manager/src/main/java/com/mortals/xhx/module/matter/service/impl/MatterDatumServiceImpl.java

@@ -205,7 +205,7 @@ public class MatterDatumServiceImpl extends AbstractCRUDServiceImpl<MatterDatumD
 
 
 //    public static void main(String[] arg){
-//        String filepath = "D:\\mortals\\app\\data\\file\\uploadfile\\1663917302157.docx";
+//        String filepath = "D:\\mortals\\app\\data\\file\\uploadfile\\1665472289712.docx";
 //        ConfigureBuilder builder = Configure.builder();
 //        builder.setValidErrorHandler(new Configure.DiscardHandler());
 //        builder.useDefaultEL(false);