mirage
/
edu
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改代码生成器

This commit is contained in:
TinyAnts 2022-08-16 16:08:54 +08:00
parent 92b1d7945a
commit 5ffd61f25c
4 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/like-generator/src/main/java/com/hxkj/generator/service/impl/GenerateServiceImpl.java
View File

@ -372,7 +372,7 @@ public class GenerateServiceImpl implements IGenerateService {
Template tpl = Velocity.getTemplate(template, GenConstants.UTF8); Template tpl = Velocity.getTemplate(template, GenConstants.UTF8);
tpl.merge(context, sw); tpl.merge(context, sw);
map.put(template.replace(".vm", ""), sw.toString()); map.put(template.replace(".vm", ""), sw.toString());
System.out.println(sw); // System.out.println(sw);
} }
return map; return map;

4
server/like-generator/src/main/java/com/hxkj/generator/util/VelocityUtil.java
View File

@ -61,7 +61,7 @@ public class VelocityUtil {
if (column.getIsPk() == 1) { if (column.getIsPk() == 1) {
primaryKey = column.getJavaField(); primaryKey = column.getJavaField();
} }
if (StringUtil.isNotEmpty(column.getDictType())) { if (StringUtil.isNotEmpty(column.getDictType()) && !dictFields.contains(column.getDictType())) {
dictFields.add(column.getDictType()); dictFields.add(column.getDictType());
} }
} }
@ -83,7 +83,7 @@ public class VelocityUtil {
velocityContext.put("allFields", allFields); velocityContext.put("allFields", allFields);
velocityContext.put("listFields", listFields); velocityContext.put("listFields", listFields);
velocityContext.put("detailFields", detailFields); velocityContext.put("detailFields", detailFields);
velocityContext.put("dictFields", ArrayUtil.listToStringByStr(dictFields,",")); velocityContext.put("dictFields", dictFields);
velocityContext.put("isSearch", isSearch); velocityContext.put("isSearch", isSearch);
return velocityContext; return velocityContext;
} }

10
server/like-generator/src/main/resources/vue/index-tree.vue.vm
View File

@ -159,15 +159,13 @@
loading.value = false loading.value = false
} }
} }
#if($dictFields.size()>=1)
#if($dictFields!="")
const { dictData } = useDictData<{ const { dictData } = useDictData<{
#foreach ($column in $columns) #foreach ($dict in $dictFields)
#if($column.dictType!="") ${dict}: any[]
${column.dictType}: any[]
#end #end
#end }>([#foreach ($dict in $dictFields)'${dict}'#if($dictFields.size()>1),#end#end])
}>([${dictFields}])
#end #end
const handleAdd = async (${table.treePrimary}?: number) => { const handleAdd = async (${table.treePrimary}?: number) => {

10
server/like-generator/src/main/resources/vue/index.vue.vm
View File

@ -151,15 +151,13 @@
fetchFun: ${moduleName}Lists, fetchFun: ${moduleName}Lists,
params: queryParams params: queryParams
}) })
#if($dictFields.size()>=1)
#if($dictFields!="")
const { dictData } = useDictData<{ const { dictData } = useDictData<{
#foreach ($column in $columns) #foreach ($dict in $dictFields)
#if($column.dictType!="") ${dict}: any[]
${column.dictType}: any[]
#end #end
#end }>([#foreach ($dict in $dictFields)'${dict}'#if($dictFields.size()>1),#end#end])
}>([${dictFields}])
#end #end
const selectData = ref<any[]>([]) const selectData = ref<any[]>([])