From 1002b36c0a698c794320d1544c464c13b303e53c Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Thu, 16 Apr 2026 13:44:02 +0800
Subject: [PATCH] 优化白名单支持对通配符路径匹配
---
ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/util/VelocityUtils.java | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 57 insertions(+), 2 deletions(-)
diff --git a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/util/VelocityUtils.java b/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/util/VelocityUtils.java
index 5741227..5704b07 100644
--- a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/util/VelocityUtils.java
+++ b/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/util/VelocityUtils.java
@@ -14,7 +14,7 @@
import com.ruoyi.gen.domain.GenTableColumn;
/**
- * 模板工具类
+ * 模板处理工具类
*
* @author ruoyi
*/
@@ -60,6 +60,7 @@
velocityContext.put("basePackage", getPackagePrefix(packageName));
velocityContext.put("packageName", packageName);
velocityContext.put("author", genTable.getFunctionAuthor());
+ velocityContext.put("colSpan", getColSpan(genTable.getFormColNum()));
velocityContext.put("datetime", DateUtils.getDate());
velocityContext.put("pkColumn", genTable.getPkColumn());
velocityContext.put("importList", getImportList(genTable));
@@ -67,6 +68,7 @@
velocityContext.put("columns", genTable.getColumns());
velocityContext.put("table", genTable);
velocityContext.put("dicts", getDicts(genTable));
+ setExtensionsContext(velocityContext, genTable.getOptions());
setMenuVelocityContext(velocityContext, genTable);
if (GenConstants.TPL_TREE.equals(tplCategory))
{
@@ -77,6 +79,13 @@
setSubVelocityContext(velocityContext, genTable);
}
return velocityContext;
+ }
+
+ public static void setExtensionsContext(VelocityContext context, String options)
+ {
+ JSONObject paramsObj = JSONObject.parseObject(options);
+ boolean genView = genView(paramsObj);
+ context.put("genView", genView);
}
public static void setMenuVelocityContext(VelocityContext context, GenTable genTable)
@@ -133,8 +142,12 @@
* @param tplWebType 前端类型
* @return 模板列表
*/
- public static List<String> getTemplateList(String tplCategory, String tplWebType)
+ public static List<String> getTemplateList(GenTable table)
{
+ String tplWebType = table.getTplWebType();
+ String tplCategory = table.getTplCategory();
+ JSONObject paramsObj = JSONObject.parseObject(table.getOptions());
+ boolean isView = genView(paramsObj);
String useWebType = "vm/vue";
String apiTemplate = "vm/js/api.js.vm";
if (StringUtils.equals(ELEMENT_PLUS, tplWebType))
@@ -172,6 +185,10 @@
{
templates.add(useWebType + "/index.vue.vm");
templates.add("vm/java/sub-domain.java.vm");
+ }
+ if (isView)
+ {
+ templates.add(useWebType + "/view.vue.vm");
}
return templates;
}
@@ -251,6 +268,10 @@
else if (template.contains("index-tree.vue.vm"))
{
fileName = StringUtils.format("{}/views/{}/{}/index.vue", vuePath, moduleName, businessName);
+ }
+ else if (template.contains("view.vue.vm"))
+ {
+ fileName = StringUtils.format("{}/views/{}/{}/view.vue", vuePath, moduleName, businessName);
}
return fileName;
}
@@ -394,6 +415,21 @@
}
/**
+ * 扩展功能/生成详情页
+ *
+ * @param paramsObj 生成其他选项
+ * @return 是否生成详细页
+ */
+ public static boolean genView(JSONObject paramsObj)
+ {
+ if (StringUtils.isNotNull(paramsObj) && paramsObj.containsKey(GenConstants.GEN_VIEW))
+ {
+ return paramsObj.getBoolean(GenConstants.GEN_VIEW);
+ }
+ return false;
+ }
+
+ /**
* 获取树名称
*
* @param paramsObj 生成其他选项
@@ -434,4 +470,23 @@
}
return num;
}
+
+ /**
+ * 获取表单 el-col span
+ *
+ * @param formColNum 表单布局方式（1单列 2双列 3三列）
+ * @return span 数值字符串
+ */
+ public static String getColSpan(int formColNum)
+ {
+ if (formColNum == 2)
+ {
+ return "12";
+ }
+ else if (formColNum == 3)
+ {
+ return "8";
+ }
+ return "24";
+ }
}
--
Gitblit v1.9.3