Commit 39c13241 authored by 赵啸非's avatar 赵啸非

修改控件初始值

parent b5af828c
This diff is collapsed.
This diff is collapsed.
package com.mortals.xhx.common.formdesign;
import com.alibaba.fastjson.annotation.JSONField;
import lombok.Data;
import java.util.List;
@Data
public class CheckboxListItem extends ListItem {
@JSONField(name="value")
private List<String> value;
}
\ No newline at end of file
...@@ -91,8 +91,7 @@ public class ListItem{ ...@@ -91,8 +91,7 @@ public class ListItem{
@JSONField(name="fontSize") @JSONField(name="fontSize")
private Integer fontSize; private Integer fontSize;
@JSONField(name="value")
private String value;
@JSONField(name="span") @JSONField(name="span")
private Integer span; private Integer span;
......
...@@ -4,10 +4,7 @@ import cn.hutool.core.util.IdUtil; ...@@ -4,10 +4,7 @@ import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import com.mortals.xhx.common.code.ComponentEnum; import com.mortals.xhx.common.code.ComponentEnum;
import com.mortals.xhx.common.formdesign.ColumnsItem; import com.mortals.xhx.common.formdesign.*;
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.pdu.gen.component.ComponentCons;
import com.mortals.xhx.common.utils.ExportDocUtil; import com.mortals.xhx.common.utils.ExportDocUtil;
import com.mortals.xhx.common.utils.StringUtils; import com.mortals.xhx.common.utils.StringUtils;
...@@ -32,7 +29,7 @@ public class DesignCheckboxComponent extends DesignComponent { ...@@ -32,7 +29,7 @@ public class DesignCheckboxComponent extends DesignComponent {
@Override @Override
public ListItem buildDefaultComponent(ComponentCons cons) { public ListItem buildDefaultComponent(ComponentCons cons) {
ListItem columnsItem = new ListItem(); CheckboxListItem columnsItem = new CheckboxListItem();
columnsItem.setId(cons.getVal()); columnsItem.setId(cons.getVal());
columnsItem.set_id(cons.getVal()); columnsItem.set_id(cons.getVal());
columnsItem.setCompType("checkbox"); columnsItem.setCompType("checkbox");
...@@ -58,7 +55,7 @@ public class DesignCheckboxComponent extends DesignComponent { ...@@ -58,7 +55,7 @@ public class DesignCheckboxComponent extends DesignComponent {
columnsItem.setDataType("static"); columnsItem.setDataType("static");
columnsItem.setAction("https://www.fastmock.site/mock/51715c0157535b99010bde55f2df33c8/formDesigner/api/options"); columnsItem.setAction("https://www.fastmock.site/mock/51715c0157535b99010bde55f2df33c8/formDesigner/api/options");
columnsItem.setClearable(false); columnsItem.setClearable(false);
columnsItem.setValue(""); columnsItem.setValue(Lists.newArrayList());
columnsItem.setRules(Lists.newArrayList()); columnsItem.setRules(Lists.newArrayList());
columnsItem.setLayout("colItem"); columnsItem.setLayout("colItem");
columnsItem.setRuleError("该字段不能为空"); columnsItem.setRuleError("该字段不能为空");
...@@ -74,10 +71,10 @@ public class DesignCheckboxComponent extends DesignComponent { ...@@ -74,10 +71,10 @@ public class DesignCheckboxComponent extends DesignComponent {
* @param columnsItem * @param columnsItem
*/ */
private void initDefaultCheckBoxValue(ComponentCons cons, ListItem columnsItem) { private void initDefaultCheckBoxValue(ComponentCons cons, ListItem columnsItem) {
if (cons.getLabel().indexOf("*") != -1) { if (cons.getVal().indexOf("v") != -1) {
String cks = StringUtils.substringBetween(cons.getLabel(), "*", "*"); String cks = StringUtils.substringBetween(cons.getVal(), "v", "v");
if(ObjectUtils.isEmpty(cks))return; if(ObjectUtils.isEmpty(cks))return;
List<OptionsItem> optionsItemList = StrUtil.splitTrim(cks, "-", -1).stream().map(option -> { List<OptionsItem> optionsItemList = StrUtil.splitTrim(cks, "_", -1).stream().map(option -> {
OptionsItem options = new OptionsItem(); OptionsItem options = new OptionsItem();
options.setLabel(option); options.setLabel(option);
options.setValue(option); options.setValue(option);
......
...@@ -49,7 +49,6 @@ public class DesignInputComponent extends DesignComponent { ...@@ -49,7 +49,6 @@ public class DesignInputComponent extends DesignComponent {
columnsItem.setReadonly(false); columnsItem.setReadonly(false);
columnsItem.setStatus("normal"); columnsItem.setStatus("normal");
columnsItem.setPrefixIcon(""); columnsItem.setPrefixIcon("");
columnsItem.setValue("");
columnsItem.setRules(Lists.newArrayList()); columnsItem.setRules(Lists.newArrayList());
columnsItem.setRulesType("default"); columnsItem.setRulesType("default");
columnsItem.setAppend(""); columnsItem.setAppend("");
......
...@@ -53,7 +53,6 @@ public class DesignRadioComponent extends DesignComponent { ...@@ -53,7 +53,6 @@ public class DesignRadioComponent extends DesignComponent {
columnsItem.setDataType("static"); columnsItem.setDataType("static");
columnsItem.setAction("https://www.fastmock.site/mock/51715c0157535b99010bde55f2df33c8/formDesigner/api/options"); columnsItem.setAction("https://www.fastmock.site/mock/51715c0157535b99010bde55f2df33c8/formDesigner/api/options");
columnsItem.setClearable(false); columnsItem.setClearable(false);
columnsItem.setValue("");
columnsItem.setRules(Lists.newArrayList()); columnsItem.setRules(Lists.newArrayList());
columnsItem.setLayout("colItem"); columnsItem.setLayout("colItem");
columnsItem.setRuleError("该字段不能为空"); columnsItem.setRuleError("该字段不能为空");
......
...@@ -50,7 +50,6 @@ public class DesignSelectComponent extends DesignComponent { ...@@ -50,7 +50,6 @@ public class DesignSelectComponent extends DesignComponent {
columnsItem.setDataType("static"); columnsItem.setDataType("static");
columnsItem.setAction("https://www.fastmock.site/mock/51715c0157535b99010bde55f2df33c8/formDesigner/api/options"); columnsItem.setAction("https://www.fastmock.site/mock/51715c0157535b99010bde55f2df33c8/formDesigner/api/options");
columnsItem.setClearable(false); columnsItem.setClearable(false);
columnsItem.setValue("");
columnsItem.setRules(Lists.newArrayList()); columnsItem.setRules(Lists.newArrayList());
columnsItem.setLayout("colItem"); columnsItem.setLayout("colItem");
columnsItem.setRuleError("该字段不能为空"); columnsItem.setRuleError("该字段不能为空");
......
...@@ -50,7 +50,7 @@ public class DesignTextAreaComponent extends DesignComponent { ...@@ -50,7 +50,7 @@ public class DesignTextAreaComponent extends DesignComponent {
columnsItem.setReadonly(false); columnsItem.setReadonly(false);
columnsItem.setRows(4); columnsItem.setRows(4);
columnsItem.setStatus("normal"); columnsItem.setStatus("normal");
columnsItem.setValue(""); //设置默认值 //设置默认值
columnsItem.setRules(Lists.newArrayList()); columnsItem.setRules(Lists.newArrayList());
columnsItem.setRuleError("该字段不能为空"); columnsItem.setRuleError("该字段不能为空");
columnsItem.setRulesType("default"); columnsItem.setRulesType("default");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment