修改控件初始值

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

@@ -10,6 +10,7 @@ import com.mortals.xhx.common.formdesign.ListItem;
 import com.mortals.xhx.common.formdesign.OptionsItem;
 import com.mortals.xhx.common.pdu.gen.component.ComponentCons;
 import com.mortals.xhx.common.utils.StringUtils;
+import org.springframework.util.ObjectUtils;
 
 import java.util.List;
 import java.util.stream.Collectors;
@@ -57,14 +58,15 @@ public class DesignRadioComponent extends DesignComponent {
         columnsItem.setLayout("colItem");
         columnsItem.setRuleError("该字段不能为空");
         columnsItem.setRulesType("default");
-        initDefaultCheckBoxValue(cons, columnsItem);
+        initDefaultRadioValue(cons, columnsItem);
         return columnsItem;
     }
 
-    private void initDefaultCheckBoxValue(ComponentCons cons, ListItem columnsItem) {
-        if (cons.getLabel().indexOf("[") != -1) {
-            String cks = StringUtils.substringBetween(cons.getLabel(), "[", "]");
-            List<OptionsItem> optionsItemList = StrUtil.splitTrim(cks, "-", -1).stream().map(option -> {
+    private void initDefaultRadioValue(ComponentCons cons, ListItem columnsItem) {
+        if (cons.getVal().indexOf("v") != -1) {
+            String cks = StringUtils.substringBetween(cons.getVal(), "v", "v");
+            if(ObjectUtils.isEmpty(cks))return;
+            List<OptionsItem> optionsItemList = StrUtil.splitTrim(cks, "_", -1).stream().map(option -> {
                 OptionsItem options = new OptionsItem();
                 options.setLabel(option);
                 options.setValue(option);
@@ -72,8 +74,8 @@ public class DesignRadioComponent extends DesignComponent {
             }).collect(Collectors.toList());
             columnsItem.setOptions(optionsItemList);
 
-            cons.setVal(cons.getVal().substring(0, cons.getVal().indexOf("[")));
-            cons.setLabel(cons.getLabel().substring(0, cons.getLabel().indexOf("[")));
+            // cons.setVal(cons.getVal().substring(0, cons.getVal().indexOf("[")));
+            // cons.setLabel(cons.getLabel().substring(0, cons.getLabel().indexOf("[")));
 
         }
     }

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

 package com.mortals.xhx.common.formdesign.component;
 
 import cn.hutool.core.util.IdUtil;
+import cn.hutool.core.util.StrUtil;
 import com.google.common.collect.Lists;
 import com.mortals.xhx.common.code.ComponentEnum;
 import com.mortals.xhx.common.formdesign.ColumnsItem;
@@ -8,9 +9,12 @@ import com.mortals.xhx.common.formdesign.DesignComponent;
 import com.mortals.xhx.common.formdesign.ListItem;
 import com.mortals.xhx.common.formdesign.OptionsItem;
 import com.mortals.xhx.common.pdu.gen.component.ComponentCons;
+import com.mortals.xhx.common.utils.StringUtils;
+import org.springframework.util.ObjectUtils;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * 下拉框组件
@@ -72,12 +76,22 @@ public class DesignSelectComponent extends DesignComponent {
             columnsItem.setOptions(optionsItems);
         }
 
-        if (cons.getLabel().indexOf("[") != -1) {
-            //todo 初始选项框
-        }
-    }
+        if (cons.getVal().indexOf("v") != -1) {
+            String cks = StringUtils.substringBetween(cons.getVal(), "v", "v");
+            if(ObjectUtils.isEmpty(cks))return;
+            List<OptionsItem> optionsItemList = StrUtil.splitTrim(cks, "_", -1).stream().map(option -> {
+                OptionsItem options = new OptionsItem();
+                options.setLabel(option);
+                options.setValue(option);
+                return options;
+            }).collect(Collectors.toList());
+            columnsItem.setOptions(optionsItemList);
 
+            // cons.setVal(cons.getVal().substring(0, cons.getVal().indexOf("[")));
+            // cons.setLabel(cons.getLabel().substring(0, cons.getLabel().indexOf("[")));
 
+        }
+    }
     public List<OptionsItem> initYears() {
         List<OptionsItem> list = new ArrayList<>();
         for (int i = 2020; i < 2030; i++) {