From 445174703773cd41e57001e01d150379dd292f25 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期五, 13 九月 2024 15:43:12 +0800
Subject: [PATCH] #
---
zy-acs-framework/src/main/java/com/zy/acs/framework/generators/ReactGenerator.java | 32 ++++++++++++++++++--------------
1 files changed, 18 insertions(+), 14 deletions(-)
diff --git a/zy-acs-framework/src/main/java/com/zy/acs/framework/generators/ReactGenerator.java b/zy-acs-framework/src/main/java/com/zy/acs/framework/generators/ReactGenerator.java
index 8a1fcbb..f99a2fd 100644
--- a/zy-acs-framework/src/main/java/com/zy/acs/framework/generators/ReactGenerator.java
+++ b/zy-acs-framework/src/main/java/com/zy/acs/framework/generators/ReactGenerator.java
@@ -499,22 +499,24 @@
.append(" }\n\n");
// 鏋氫妇瀛楁澧炲姞$鏍煎紡鍖�
} else if (!Cools.isEmpty(column.getEnums())){
- sb.append(" public String get")
- .append(column.getHumpName().substring(0, 1).toUpperCase()).append(column.getHumpName().substring(1))
- .append("\\$")
- .append("(){\n")
- .append(" if (null == this.").append(column.getHumpName()).append("){ return null; }\n")
- .append(" switch (this.").append(column.getHumpName()).append("){\n");
- for (Map<String, Object> map : column.getEnums()){
- for (Map.Entry<String, Object> entry : map.entrySet()){
- sb.append(" case ").append(entry.getKey()).append(":\n")
- .append(" return \"").append(entry.getValue()).append("\";\n");
+ if (!column.getHumpName().equals("deleted")) {
+ sb.append(" public String get")
+ .append(column.getHumpName().substring(0, 1).toUpperCase()).append(column.getHumpName().substring(1))
+ .append("\\$")
+ .append("(){\n")
+ .append(" if (null == this.").append(column.getHumpName()).append("){ return null; }\n")
+ .append(" switch (this.").append(column.getHumpName()).append("){\n");
+ for (Map<String, Object> map : column.getEnums()){
+ for (Map.Entry<String, Object> entry : map.entrySet()){
+ sb.append(" case ").append(entry.getKey()).append(":\n")
+ .append(" return \"").append(entry.getValue()).append("\";\n");
+ }
}
+ sb.append(" default:\n")
+ .append(" return String.valueOf(this.").append(column.getHumpName()).append(");\n")
+ .append(" }\n")
+ .append(" }\n\n");
}
- sb.append(" default:\n")
- .append(" return String.valueOf(this.").append(column.getHumpName()).append(");\n")
- .append(" }\n")
- .append(" }\n\n");
}
// 澶栭敭淇グ
@@ -621,6 +623,7 @@
sb.append(" <AutocompleteInput\n");
sb.append(" label=\"table.field.").append(simpleEntityName).append(".").append(column.getHumpName()).append("\"\n");
sb.append(" optionText=\"").append(GeneratorUtils.firstCharConvert(column.getForeignKeyMajor())).append("\"\n");
+ sb.append(" filterToQuery={(val) => ({ ").append(GeneratorUtils.firstCharConvert(column.getForeignKeyMajor())).append(": val })}\n");
if (column.isNotNull()) {
sb.append(" validate={required()}\n");
}
@@ -740,6 +743,7 @@
sb.append(" <AutocompleteInput\n");
sb.append(" label=\"table.field.").append(simpleEntityName).append(".").append(column.getHumpName()).append("\"\n");
sb.append(" optionText=\"").append(GeneratorUtils.firstCharConvert(column.getForeignKeyMajor())).append("\"\n");
+ sb.append(" filterToQuery={(val) => ({ ").append(GeneratorUtils.firstCharConvert(column.getForeignKeyMajor())).append(": val })}\n");
if (column.isNotNull()) {
sb.append(" validate={required()}\n");
}
--
Gitblit v1.9.1