From c56dc6b8e939733839d3e7ce4d5eff4107bfc174 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?= <15040126243@163.com> Date: Mon, 29 Jun 2026 16:42:40 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E4=BC=98=E5=8C=96=20=E5=A6=82?= =?UTF-8?q?=E6=9E=9C=E6=98=AFreact=E5=89=8D=E7=AB=AF=E7=94=9F=E6=88=90?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=20=E7=9B=AE=E5=BD=95=E4=BD=BF=E7=94=A8pages?= =?UTF-8?q?=E5=91=BD=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/dromara/gen/constant/GenConstants.java | 5 +++++ .../dromara/gen/service/GenTableServiceImpl.java | 2 +- .../org/dromara/gen/util/TemplateEngineUtils.java | 15 +++++++++++++-- 3 files changed, 19 insertions(+), 3 deletions(-) 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"; + } + /** * 获取前端页面文件扩展名。 *