center/dataease-dm
center/dataease-dm
13
0
Fork 0
forked from github/dataease
Code Pull Requests Activity

Merge pull request #9976 from ulleo/dev

Browse Source 
feat(X-Pack): 数据填报批量上传Excel模版增加unique字段提示
This commit is contained in:
ulleo 2024-05-30 16:22:25 +08:00 committed by GitHub
commit 5e020803e7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -37,7 +37,8 @@ public class CommentWriteHandler implements RowWriteHandler {
Drawing<?> drawingPatriarch = writeSheetHolder.getSheet().createDrawingPatriarch();
for (int i = 0; i < fields.size(); i++) {
ExtTableField field = fields.get(i);
String required = field.getSettings().isRequired() ? "必填" : "";
String required = field.getSettings().isRequired() ? "必填 " : "";
String unique = field.getSettings().isUnique() && StringUtils.equalsIgnoreCase("input", field.getType()) ? "不允许重复值" : "";
String example = "";
StringBuilder options = new StringBuilder();
switch (field.getSettings().getMapping().getType()) {
@ -90,7 +91,7 @@ public class CommentWriteHandler implements RowWriteHandler {
break;
}
if (StringUtils.isBlank(required) && StringUtils.isBlank(example) && StringUtils.isBlank(options.toString())) {
if (StringUtils.isBlank(required) && StringUtils.isBlank(unique) && StringUtils.isBlank(example) && StringUtils.isBlank(options.toString())) {
continue;
}