From 9b50dca2a601d1cf231821e248d3b9fbedd8febe Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期五, 13 九月 2024 13:05:50 +0800
Subject: [PATCH] #

---
 zy-acs-framework/src/main/java/com/zy/acs/framework/generators/ReactGenerator.java |   32 +++++++++++++++++---------------
 1 files changed, 17 insertions(+), 15 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 a01f9aa..644cdce 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");
             }
 
             // 澶栭敭淇グ
@@ -892,7 +894,7 @@
                 case "Long":
                 case "Double":
                     if (!Cools.isEmpty(column.getForeignKeyMajor())) {
-                        sb.append("    <ReferenceInput source=\"").append(column.getHumpName()).append("\" reference=\"").append(GeneratorUtils.firstCharConvert(column.getForeignKey())).append("\">\n");
+                        sb.append("    <ReferenceInput source=\"").append(column.getHumpName()).append("\" label=\"table.field.").append(simpleEntityName).append(".").append(column.getHumpName()).append("\" reference=\"").append(GeneratorUtils.firstCharConvert(column.getForeignKey())).append("\">\n");
                         sb.append("        <AutocompleteInput label=\"table.field.").append(simpleEntityName).append(".").append(column.getHumpName()).append("\" optionText=\"").append(GeneratorUtils.firstCharConvert(column.getForeignKeyMajor())).append("\" />\n");
                         sb.append("    </ReferenceInput>,\n");
                     } else {

--
Gitblit v1.9.1