diff --git a/ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen/constant/GenConstants.java b/ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen/constant/GenConstants.java index 7cf2f2cad..848bf99d0 100644 --- a/ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen/constant/GenConstants.java +++ b/ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen/constant/GenConstants.java @@ -85,6 +85,11 @@ public interface GenConstants { */ String FRONTEND_TYPE_VUE = "vue"; + /** + * React 前端模板类型,对应模板根目录下的 react 目录。 + */ + String FRONTEND_TYPE_REACT = "react"; + /** * 树根节点值 */ diff --git a/ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen/service/GenTableServiceImpl.java b/ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen/service/GenTableServiceImpl.java index 35f03c2f1..bfd5ff909 100644 --- a/ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen/service/GenTableServiceImpl.java +++ b/ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen/service/GenTableServiceImpl.java @@ -55,7 +55,7 @@ public class GenTableServiceImpl implements IGenTableService { private final GenTableMapper tableMapper; private final GenTableColumnMapper genTableColumnMapper; - private static final String[] TABLE_IGNORE = new String[]{"sj_", "flow_", "gen_"}; + private static final String[] TABLE_IGNORE = new String[]{"sai_", "sj_", "flow_", "gen_"}; /** * 查询业务字段列表 diff --git a/ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen/util/TemplateEngineUtils.java b/ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen/util/TemplateEngineUtils.java index 08f74397d..b0c149da1 100644 --- a/ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen/util/TemplateEngineUtils.java +++ b/ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen/util/TemplateEngineUtils.java @@ -358,6 +358,7 @@ public class TemplateEngineUtils { String javaPath = PROJECT_PATH + "/" + StringUtils.replace(packageName, ".", "/"); String mybatisPath = MYBATIS_PATH + "/" + moduleName; String frontendPath = getFrontendPath(genTable.getFrontendType()); + String frontendPagePath = getFrontendPagePath(genTable.getFrontendType()); // templatePath // genFilePathFormat if (template.contains("domain.java.")) { @@ -383,10 +384,10 @@ public class TemplateEngineUtils { } else if (template.contains("types.ts.")) { fileName = StringUtils.format("{}/api/{}/{}/types.ts", frontendPath, moduleName, businessName); } else if (isFrontendPageTemplate(template, GenConstants.FRONTEND_INDEX_TEMPLATE_PREFIX)) { - fileName = StringUtils.format("{}/views/{}/{}/index.{}", frontendPath, moduleName, businessName, + fileName = StringUtils.format("{}/{}/{}/{}/index.{}", frontendPath, frontendPagePath, moduleName, businessName, getFrontendPageExtension(template, GenConstants.FRONTEND_INDEX_TEMPLATE_PREFIX)); } else if (isFrontendPageTemplate(template, GenConstants.FRONTEND_INDEX_TREE_TEMPLATE_PREFIX)) { - fileName = StringUtils.format("{}/views/{}/{}/index.{}", frontendPath, moduleName, businessName, + fileName = StringUtils.format("{}/{}/{}/{}/index.{}", frontendPath, frontendPagePath, moduleName, businessName, getFrontendPageExtension(template, GenConstants.FRONTEND_INDEX_TREE_TEMPLATE_PREFIX)); } return fileName; @@ -402,6 +403,16 @@ public class TemplateEngineUtils { return resolveFrontendType(frontendType); } + /** + * 获取前端页面输出目录。 + * + * @param frontendType 前端模板类型 + * @return 页面输出目录 + */ + private static String getFrontendPagePath(String frontendType) { + return GenConstants.FRONTEND_TYPE_REACT.equals(resolveFrontendType(frontendType)) ? "pages" : "views"; + } + /** * 获取前端页面文件扩展名。 *