|
@@ -331,7 +331,7 @@ public class GenTableServiceImpl implements IGenTableService {
|
|
|
VelocityContext context = VelocityUtils.prepareContext(table);
|
|
VelocityContext context = VelocityUtils.prepareContext(table);
|
|
|
|
|
|
|
|
// 获取模板列表
|
|
// 获取模板列表
|
|
|
- List<String> templates = VelocityUtils.getTemplateList(table.getTplCategory());
|
|
|
|
|
|
|
+ List<String> templates = VelocityUtils.getTemplateList(table.getTplCategory(), table.getDataName());
|
|
|
for (String template : templates) {
|
|
for (String template : templates) {
|
|
|
// 渲染模板
|
|
// 渲染模板
|
|
|
StringWriter sw = new StringWriter();
|
|
StringWriter sw = new StringWriter();
|
|
@@ -374,7 +374,7 @@ public class GenTableServiceImpl implements IGenTableService {
|
|
|
VelocityContext context = VelocityUtils.prepareContext(table);
|
|
VelocityContext context = VelocityUtils.prepareContext(table);
|
|
|
|
|
|
|
|
// 获取模板列表
|
|
// 获取模板列表
|
|
|
- List<String> templates = VelocityUtils.getTemplateList(table.getTplCategory());
|
|
|
|
|
|
|
+ List<String> templates = VelocityUtils.getTemplateList(table.getTplCategory(), table.getDataName());
|
|
|
for (String template : templates) {
|
|
for (String template : templates) {
|
|
|
if (!StringUtils.containsAny(template, "sql.vm", "api.ts.vm", "types.ts.vm", "index.vue.vm", "index-tree.vue.vm")) {
|
|
if (!StringUtils.containsAny(template, "sql.vm", "api.ts.vm", "types.ts.vm", "index.vue.vm", "index-tree.vue.vm")) {
|
|
|
// 渲染模板
|
|
// 渲染模板
|
|
@@ -478,7 +478,7 @@ public class GenTableServiceImpl implements IGenTableService {
|
|
|
VelocityContext context = VelocityUtils.prepareContext(table);
|
|
VelocityContext context = VelocityUtils.prepareContext(table);
|
|
|
|
|
|
|
|
// 获取模板列表
|
|
// 获取模板列表
|
|
|
- List<String> templates = VelocityUtils.getTemplateList(table.getTplCategory());
|
|
|
|
|
|
|
+ List<String> templates = VelocityUtils.getTemplateList(table.getTplCategory(), table.getDataName());
|
|
|
for (String template : templates) {
|
|
for (String template : templates) {
|
|
|
// 渲染模板
|
|
// 渲染模板
|
|
|
StringWriter sw = new StringWriter();
|
|
StringWriter sw = new StringWriter();
|