From 15a0bc8b246999434ded3a4ca8f19c8ff20b60fb Mon Sep 17 00:00:00 2001 From: ulleo Date: Mon, 29 Apr 2024 15:32:07 +0800 Subject: [PATCH] =?UTF-8?q?fix(X-Pack):=20=E4=BF=AE=E5=A4=8D=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=A1=AB=E6=8A=A5=E6=89=B9=E9=87=8F=E4=B8=8A=E4=BC=A0?= =?UTF-8?q?=E5=8D=95=E9=80=89=E6=A1=86=E6=B2=A1=E6=9C=89=E6=A0=A1=E9=AA=8C?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/io/dataease/service/datafill/CommentWriteHandler.java | 2 +- .../java/io/dataease/service/datafill/DataFillDataService.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/backend/src/main/java/io/dataease/service/datafill/CommentWriteHandler.java b/core/backend/src/main/java/io/dataease/service/datafill/CommentWriteHandler.java index 5a82022062..3d8d35ea4f 100644 --- a/core/backend/src/main/java/io/dataease/service/datafill/CommentWriteHandler.java +++ b/core/backend/src/main/java/io/dataease/service/datafill/CommentWriteHandler.java @@ -59,7 +59,7 @@ public class CommentWriteHandler implements RowWriteHandler { } else if (StringUtils.equalsIgnoreCase("phone", field.getSettings().getInputType())) { 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"); for (ExtTableField.Option option : field.getSettings().getOptions()) { options.append(option.getName()).append("\n"); diff --git a/core/backend/src/main/java/io/dataease/service/datafill/DataFillDataService.java b/core/backend/src/main/java/io/dataease/service/datafill/DataFillDataService.java index cf5c36d068..9429ad018f 100644 --- a/core/backend/src/main/java/io/dataease/service/datafill/DataFillDataService.java +++ b/core/backend/src/main/java/io/dataease/service/datafill/DataFillDataService.java @@ -721,7 +721,7 @@ public class DataFillDataService { rowData.put(field.getSettings().getMapping().getColumnName(), time); break; 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; for (ExtTableField.Option option : field.getSettings().getOptions()) { if (StringUtils.equals((String) option.getValue(), excelRowData)) {