From ebd2f4397a92c6a5096de1b86d59154363344720 Mon Sep 17 00:00:00 2001 From: vincentlu <t1341870251@gmail.com> Date: 星期二, 13 五月 2025 08:48:15 +0800 Subject: [PATCH] # --- zy-acs-framework/src/main/java/com/zy/acs/framework/generators/ReactGenerator.java | 35 ++++++++++++++++++++--------------- 1 files changed, 20 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 8a1fcbb..d3a3b5a 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"); } @@ -733,6 +736,7 @@ sb.append(" <ReferenceInput\n"); sb.append(" source=\"").append(column.getHumpName()).append("\"\n"); sb.append(" reference=\"").append(GeneratorUtils.firstCharConvert(column.getForeignKey())).append("\"\n"); + sb.append(" perPage={REFERENCE_INPUT_PAGESIZE}\n"); if (count == 0) { sb.append(" autoFocus\n"); } @@ -740,6 +744,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"); } @@ -893,7 +898,7 @@ case "Double": if (!Cools.isEmpty(column.getForeignKeyMajor())) { 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(" <AutocompleteInput label=\"table.field.").append(simpleEntityName).append(".").append(column.getHumpName()).append("\" optionText=\"").append(GeneratorUtils.firstCharConvert(column.getForeignKeyMajor())).append("\" filterToQuery={(val) => ({ ").append(GeneratorUtils.firstCharConvert(column.getForeignKeyMajor())).append(": val })} />\n"); sb.append(" </ReferenceInput>,\n"); } else { if (Cools.isEmpty(column.getEnums())) { -- Gitblit v1.9.1