diff --git a/server/like-generator/src/main/java/com/hxkj/generator/util/VelocityUtil.java b/server/like-generator/src/main/java/com/hxkj/generator/util/VelocityUtil.java index 64f000cf..9f28599a 100644 --- a/server/like-generator/src/main/java/com/hxkj/generator/util/VelocityUtil.java +++ b/server/like-generator/src/main/java/com/hxkj/generator/util/VelocityUtil.java @@ -52,7 +52,7 @@ public class VelocityUtil { if (column.getIsList() == 1) { listFields.add(column.getColumnName()); } - if (column.getIsDetail() == 1) { + if (column.getIsEdit() == 1) { detailFields.add(column.getColumnName()); } if (column.getIsQuery() == 1) { diff --git a/server/like-generator/src/main/resources/java/voDetail.java.vm b/server/like-generator/src/main/resources/java/voDetail.java.vm index a8ff435c..1cf85a3c 100644 --- a/server/like-generator/src/main/resources/java/voDetail.java.vm +++ b/server/like-generator/src/main/resources/java/voDetail.java.vm @@ -13,7 +13,7 @@ public class ${EntityName}DetailVo implements Serializable { private static final long serialVersionUID = 1L; #foreach ($column in $columns) -#if($column.isDetail==1) +#if($column.isEdit==1) #if($dateFields.contains($column.columnName)) private String ${column.javaField}; // ${column.columnComment} #else diff --git a/server/like-generator/src/main/resources/vue/index.vue.vm b/server/like-generator/src/main/resources/vue/index.vue.vm index ddf24315..e8df59e6 100644 --- a/server/like-generator/src/main/resources/vue/index.vue.vm +++ b/server/like-generator/src/main/resources/vue/index.vue.vm @@ -46,7 +46,7 @@
- + @@ -62,8 +62,20 @@ - #elseif ($column.htmlType=="datetime") + #elseif($column.htmlType=="datetime") + #elseif($column.htmlType=="imageUpload") + + + + #elseif($column.htmlType=="select" || $column.htmlType=="radio") + + + #else #end @@ -123,8 +135,8 @@ fetchFun: ${moduleName}Lists, params: queryParams }) - #if($dictFields!="") + #if($dictFields!="") const { dictData } = useDictData<{ #foreach ($column in $columns) #if($column.dictType!="") @@ -132,8 +144,8 @@ #end #end }>([${dictFields}]) - #end + #end const handleAdd = async () => { showEdit.value = true await nextTick()