From efe4bcf3f6ab06cc0a8a0a1cfdb4be71ee6a02c5 Mon Sep 17 00:00:00 2001
From: ray <1490493387@qq.com>
Date: Tue, 30 Jul 2024 00:22:38 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81=E5=AD=97=E5=85=B8=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../youlai/system/controller/SysDictController.java |  7 +++++++
 .../youlai/system/model/entity/GenFieldConfig.java  |  6 ++++++
 .../com/youlai/system/model/form/GenConfigForm.java |  3 +++
 .../com/youlai/system/service/SysDictService.java   |  6 ++++++
 .../system/service/impl/SysDictServiceImpl.java     | 13 ++++++++++++-
 src/main/resources/templates/generator/index.vue.vm | 13 +++++++++----
 6 files changed, 43 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/youlai/system/controller/SysDictController.java b/src/main/java/com/youlai/system/controller/SysDictController.java
index d1137cf4..811ea999 100644
--- a/src/main/java/com/youlai/system/controller/SysDictController.java
+++ b/src/main/java/com/youlai/system/controller/SysDictController.java
@@ -44,6 +44,13 @@ public class SysDictController {
         return PageResult.success(result);
     }
 
+    @Operation(summary = "字典列表")
+    @GetMapping("/list")
+    public Result<List<Option>> getDictList() {
+        List<Option> list = dictService.getDictList();
+        return Result.success(list);
+    }
+
     @Operation(summary = "字典数据项列表")
     @GetMapping("/{code}/options")
     public Result<List<Option>> getDictOptions(
diff --git a/src/main/java/com/youlai/system/model/entity/GenFieldConfig.java b/src/main/java/com/youlai/system/model/entity/GenFieldConfig.java
index bb8b0d07..93e1b2e1 100644
--- a/src/main/java/com/youlai/system/model/entity/GenFieldConfig.java
+++ b/src/main/java/com/youlai/system/model/entity/GenFieldConfig.java
@@ -96,4 +96,10 @@ public class GenFieldConfig extends BaseEntity {
     private String tsType;
 
 
+    /**
+     * 字典类型
+     */
+    private String dictType;
+
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/youlai/system/model/form/GenConfigForm.java b/src/main/java/com/youlai/system/model/form/GenConfigForm.java
index 3f03aec1..b761005d 100644
--- a/src/main/java/com/youlai/system/model/form/GenConfigForm.java
+++ b/src/main/java/com/youlai/system/model/form/GenConfigForm.java
@@ -81,5 +81,8 @@ public class GenConfigForm {
         @Schema(description = "查询类型")
         private QueryTypeEnum queryType;
 
+        @Schema(description = "字典类型")
+        private String dictType;
+
     }
 }
diff --git a/src/main/java/com/youlai/system/service/SysDictService.java b/src/main/java/com/youlai/system/service/SysDictService.java
index a1ffad2d..b02316e2 100644
--- a/src/main/java/com/youlai/system/service/SysDictService.java
+++ b/src/main/java/com/youlai/system/service/SysDictService.java
@@ -72,4 +72,10 @@ public interface SysDictService extends IService<SysDict> {
     List<Option> listDictItemsByCode(String code);
 
 
+    /**
+     * 获取字典列表
+     *
+     * @return
+     */
+    List<Option> getDictList();
 }
diff --git a/src/main/java/com/youlai/system/service/impl/SysDictServiceImpl.java b/src/main/java/com/youlai/system/service/impl/SysDictServiceImpl.java
index a90532a1..d2dee48c 100644
--- a/src/main/java/com/youlai/system/service/impl/SysDictServiceImpl.java
+++ b/src/main/java/com/youlai/system/service/impl/SysDictServiceImpl.java
@@ -222,7 +222,18 @@ public class SysDictServiceImpl extends ServiceImpl<SysDictMapper, SysDict> impl
         return dictItemConverter.convertToOption(dictItems);
     }
 
-
+    /**
+     * 获取字典列表
+     */
+    @Override
+    public List<Option> getDictList() {
+        return this.list(new LambdaQueryWrapper<SysDict>()
+                        .eq(SysDict::getStatus, 1)
+                        .select(SysDict::getName, SysDict::getCode)
+                ).stream()
+                .map(dict -> new Option(dict.getCode(), dict.getName()))
+                .toList();
+    }
 }
 
 
diff --git a/src/main/resources/templates/generator/index.vue.vm b/src/main/resources/templates/generator/index.vue.vm
index 1d023ac5..5fa4acdc 100644
--- a/src/main/resources/templates/generator/index.vue.vm
+++ b/src/main/resources/templates/generator/index.vue.vm
@@ -4,7 +4,7 @@
       <el-form ref="queryFormRef" :model="queryParams" :inline="true">
         #foreach($fieldConfig in $fieldConfigs)
           #if($fieldConfig.isShowInQuery == 1)
-            <el-form-item :label="$fieldConfig.fieldComment" :key="$fieldConfig.fieldName">
+            <el-form-item label="$fieldConfig.fieldComment" prop="$fieldConfig.fieldName">
               #if($fieldConfig.formType == "INPUT")
                 <el-input v-model="queryParams.$fieldConfig.fieldName" :placeholder="$fieldConfig.fieldComment" clearable @keyup.enter="handleQuery" />
               #elseif($fieldConfig.formType == "SELECT")
@@ -88,14 +88,19 @@
       <el-form ref="dataFormRef" :model="formData" :rules="rules" label-width="100px">
         #foreach($fieldConfig in $fieldConfigs)
           #if($fieldConfig.isShowInForm == 1)
-          <el-form-item :label="$fieldConfig.fieldComment" :key="$fieldConfig.fieldName">
+          <el-form-item abel="$fieldConfig.fieldComment" prop="$fieldConfig.fieldName">
             #if($fieldConfig.formType == "INPUT")
               <el-input v-model="formData.$fieldConfig.fieldName" :placeholder="'请输入$fieldConfig.fieldComment" />
             #elseif($fieldConfig.formType == "SELECT")
+              #if($fieldConfig.dictType != "")
+              <dictionary v-model="formData.$fieldConfig.fieldName" code="$fieldConfig.dictType" />
+              #else
               <el-select v-model="formData.$fieldConfig.fieldName" :placeholder="'请选择$fieldConfig.fieldComment">
-                <!-- 这里可以根据具体需求生成select options -->
-                <el-option v-for="option in $fieldConfig.options" :key="option.value" :label="option.label" :value="option.value"></el-option>
+                  <el-option :key="1" :value="1" :label="下拉项1"/>
+                  <el-option :key="2" :value="2" :label="下拉项2"/>
+                  <el-option :key="3" :value="3" :label="下拉项3"/>
               </el-select>
+              #end
             #elseif($fieldConfig.formType == "RADIO")
               <el-radio-group v-model="formData.$fieldConfig.fieldName">
                 <el-radio v-for="option in $fieldConfig.options" :key="option.value" :label="option.value">{{ option.label }}</el-radio>