Merge branch 'develop' of https://gitee.com/likeshop_gitee/likeadmin-java into develop

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;

server/like-generator/src/main/java/com/hxkj/generator/util/GenUtil.java

@@ -89,6 +89,11 @@ public class GenUtil {
             }
         }
 
+        // 非必填字段
+        if (GenUtil.isArraysContains(SqlConstants.COLUMN_NAME_NOT_EDIT, columnName)) {
+            column.setIsRequired(0);
+        }
+
         // 需插入字段
         if (!GenUtil.isArraysContains(SqlConstants.COLUMN_NAME_NOT_ADD, columnName)) {
             column.setIsInsert(GenConstants.REQUIRE);
@@ -105,11 +110,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);

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) {

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<String, String> params);
 #elseif($table.genTpl=="tree")

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

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

@@ -83,8 +83,8 @@
                 ></el-table-column>
                 #else
                 <el-table-column
-                    label="菜单名称"
+                    label="${column.columnComment}"
-                    prop="menuName"
+                    prop="${column.javaField}"
                     min-width="150"
                     show-overflow-tooltip
                 />
@@ -125,9 +125,7 @@
     </div>
 </template>
 <script lang="ts" setup>
-    import { ${moduleName}Delete, ${moduleName}Lists } from '@/api/${moduleName}'
+    import { ${moduleName}Edit, ${moduleName}Delete, ${moduleName}Lists } from '@/api/${moduleName}'
-    import type { ElTable } from 'element-plus'
-    import { MenuEnum } from '@/enums/appEnums'
     import EditPopup from './edit.vue'
     import feedback from '@/utils/feedback'
     const tableRef = shallowRef<InstanceType<typeof ElTable>>()

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

@@ -46,7 +46,7 @@
         </el-card>
         <el-card class="!border-none mt-4" shadow="never">
             <div>
-                <el-button v-perms="['dept.jobs/add']" type="primary" @click="handleAdd()">
+                <el-button v-perms="['${moduleName}/add']" type="primary" @click="handleAdd()">
                     <template #icon>
                         <icon name="el-icon-Plus" />
                     </template>
@@ -64,6 +64,18 @@
                 </el-table-column>
                 #elseif($column.htmlType=="datetime")
                 <el-table-column label="${column.columnComment}" prop="${column.javaField}" min-width="180" />
+                #elseif($column.htmlType=="imageUpload")
+                <el-table-column label="${column.columnComment}" prop="${column.javaField}" min-width="60">
+                    <template #default="{ row }">
+                        <image-contain width="50px" height="50px" :src="row.${column.javaField}" />
+                    </template>
+                </el-table-column>
+                #elseif($column.htmlType=="select" || $column.htmlType=="radio")
+                <el-table-column label="${column.columnComment}" prop="${column.javaField}">
+                    <template #default="{ row }">
+                        <dict-value :options="dictData.${column.dictType}" :value="row.${column.javaField}" />
+                    </template>
+                </el-table-column>
                 #else
                 <el-table-column label="${column.columnComment}" prop="${column.javaField}" min-width="100" />
                 #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()