From d8e946bbd995553a9c26c4eaf3c28ad98503e5f7 Mon Sep 17 00:00:00 2001 From: TinyAnts Date: Mon, 15 Aug 2022 16:39:48 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E7=94=9F=E6=88=90=E5=99=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/hxkj/generator/util/VelocityUtil.java | 2 +- .../src/main/resources/java/voDetail.java.vm | 2 +- .../src/main/resources/vue/index.vue.vm | 20 +++++++++++++++---- 3 files changed, 18 insertions(+), 6 deletions(-) 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() From 0a9496ee86f5b5a69917d8030b35b71dd5dbb4ec Mon Sep 17 00:00:00 2001 From: TinyAnts Date: Mon, 15 Aug 2022 16:53:31 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E7=94=9F=E6=88=90=E5=99=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/hxkj/generator/entity/GenTableColumn.java | 1 - .../src/main/java/com/hxkj/generator/util/GenUtil.java | 5 ----- .../like-generator/src/main/resources/java/service.java.vm | 4 ++-- 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/server/like-generator/src/main/java/com/hxkj/generator/entity/GenTableColumn.java b/server/like-generator/src/main/java/com/hxkj/generator/entity/GenTableColumn.java index 0d80c28e..0db9edf6 100644 --- a/server/like-generator/src/main/java/com/hxkj/generator/entity/GenTableColumn.java +++ b/server/like-generator/src/main/java/com/hxkj/generator/entity/GenTableColumn.java @@ -29,7 +29,6 @@ public class GenTableColumn implements Serializable { private Integer isInsert; private Integer isEdit; private Integer isList; - private Integer isDetail; private Integer isQuery; private String queryType; private String htmlType; diff --git a/server/like-generator/src/main/java/com/hxkj/generator/util/GenUtil.java b/server/like-generator/src/main/java/com/hxkj/generator/util/GenUtil.java index 3b43b4a1..11e2893e 100644 --- a/server/like-generator/src/main/java/com/hxkj/generator/util/GenUtil.java +++ b/server/like-generator/src/main/java/com/hxkj/generator/util/GenUtil.java @@ -105,11 +105,6 @@ public class GenUtil { column.setIsList(GenConstants.REQUIRE); } - // 需详情的字段 - if (!GenUtil.isArraysContains(new String[]{"is_delete", "delete_time"}, columnName)) { - column.setIsDetail(GenConstants.REQUIRE); - } - // 需查询字段 if (!GenUtil.isArraysContains(SqlConstants.COLUMN_NAME_NOT_QUERY, columnName) && column.getIsPk() == 0) { column.setIsQuery(GenConstants.REQUIRE); diff --git a/server/like-generator/src/main/resources/java/service.java.vm b/server/like-generator/src/main/resources/java/service.java.vm index 38763fc5..eb8e39af 100644 --- a/server/like-generator/src/main/resources/java/service.java.vm +++ b/server/like-generator/src/main/resources/java/service.java.vm @@ -14,7 +14,7 @@ import java.util.Map; public interface I${EntityName}Service { #if($table.genTpl=="curd") - /**、 + /** * ${functionName}列表 * #if(!$authorName.equals("")) @@ -22,7 +22,7 @@ public interface I${EntityName}Service { #end * @param pageParam 分页参数 * @param params 搜索参数 - * @return PageResult<${EntityName}Vo}> + * @return PageResult<${EntityName}Vo> */ PageResult<${EntityName}ListVo> list(PageParam pageParam, Map params); #elseif($table.genTpl=="tree") From f5118208dd17db81e667ffb95c4dfd79e89943ba Mon Sep 17 00:00:00 2001 From: TinyAnts Date: Mon, 15 Aug 2022 17:03:57 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E7=94=9F=E6=88=90=E5=99=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/vue/index-tree.vue.vm | 52 +++++++++---------- 1 file changed, 25 insertions(+), 27 deletions(-) diff --git a/server/like-generator/src/main/resources/vue/index-tree.vue.vm b/server/like-generator/src/main/resources/vue/index-tree.vue.vm index 5387e5da..65a3a2c0 100644 --- a/server/like-generator/src/main/resources/vue/index-tree.vue.vm +++ b/server/like-generator/src/main/resources/vue/index-tree.vue.vm @@ -12,29 +12,29 @@ /> #elseif($column.htmlType=="select") - - - #if($column.dictType=="") - - #else - - - #end - - + + + #if($column.dictType=="") + + #else + + + #end + + #elseif($column.htmlType=="input") - - - + + + #end #end #end @@ -83,8 +83,8 @@ > #else @@ -125,9 +125,7 @@