dongjunchuan/de
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(X-Pack): 修复数据填报批量上传单选框没有校验问题

Browse Source
This commit is contained in:
ulleo 2024-04-29 15:32:07 +08:00
parent 1f05f46a0e
commit 15a0bc8b24
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/backend/src/main/java/io/dataease/service/datafill/CommentWriteHandler.java
View File

@ -59,7 +59,7 @@ public class CommentWriteHandler implements RowWriteHandler {
} else if (StringUtils.equalsIgnoreCase("phone", field.getSettings().getInputType())) { } else if (StringUtils.equalsIgnoreCase("phone", field.getSettings().getInputType())) {
example = "\n(手机号格式)"; example = "\n(手机号格式)";
} }
if (StringUtils.equalsIgnoreCase("select", field.getType()) || StringUtils.equalsIgnoreCase("checkbox", field.getType())) { if (StringUtils.equalsIgnoreCase("select", field.getType()) || StringUtils.equalsIgnoreCase("checkbox", field.getType()) || StringUtils.equalsIgnoreCase("radio", field.getType())) {
options = new StringBuilder("\n选项值为:\n"); options = new StringBuilder("\n选项值为:\n");
for (ExtTableField.Option option : field.getSettings().getOptions()) { for (ExtTableField.Option option : field.getSettings().getOptions()) {
options.append(option.getName()).append("\n"); options.append(option.getName()).append("\n");

2
core/backend/src/main/java/io/dataease/service/datafill/DataFillDataService.java
View File

@ -721,7 +721,7 @@ public class DataFillDataService {
rowData.put(field.getSettings().getMapping().getColumnName(), time); rowData.put(field.getSettings().getMapping().getColumnName(), time);
break; break;
default: default:
if (StringUtils.equalsIgnoreCase(field.getType(), "select") && !field.getSettings().isMultiple()) { if (StringUtils.equalsIgnoreCase(field.getType(), "select") && !field.getSettings().isMultiple() || StringUtils.equalsIgnoreCase(field.getType(), "radio")) {
boolean has = false; boolean has = false;
for (ExtTableField.Option option : field.getSettings().getOptions()) { for (ExtTableField.Option option : field.getSettings().getOptions()) {
if (StringUtils.equals((String) option.getValue(), excelRowData)) { if (StringUtils.equals((String) option.getValue(), excelRowData)) {