From 897c42f0f2177e687585ec516ecfef44f8ad8634 Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Thu, 2 Jan 2025 08:09:19 +0800
Subject: [PATCH] =?UTF-8?q?refactor(codegen):=20=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E7=94=9F=E6=88=90=E4=BC=98=E5=8C=96=E5=AD=97=E5=85=B8=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E5=92=8C=E5=8D=95/=E5=A4=8D=E9=80=89=E6=A1=86?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/templates/codegen/index.vue.vm  | 52 ++++++++++++-------
 1 file changed, 34 insertions(+), 18 deletions(-)

diff --git a/src/main/resources/templates/codegen/index.vue.vm b/src/main/resources/templates/codegen/index.vue.vm
index 4c21b77e..c7bdad55 100644
--- a/src/main/resources/templates/codegen/index.vue.vm
+++ b/src/main/resources/templates/codegen/index.vue.vm
@@ -13,7 +13,7 @@
                           @keyup.enter="handleQuery()"
                       />
                     #elseif($fieldConfig.formType == "SELECT")
-                        #if($fieldConfig.dictType != "")
+                        #if($fieldConfig.dictType && $fieldConfig.dictType.trim() != "")
                           <dict v-model="queryParams.$fieldConfig.fieldName" code="$fieldConfig.dictType" />
                         #else
                           <el-select v-model="queryParams.$fieldConfig.fieldName" placeholder="请选择$fieldConfig.fieldComment">
@@ -22,15 +22,23 @@
                           </el-select>
                         #end
                     #elseif($fieldConfig.formType == "RADIO")
-                      <el-radio-group v-model="queryParams.$fieldConfig.fieldName">
-                        <el-radio :key="1" :label="1">选项一</el-radio>
-                        <el-radio :key="2" :label="2">选项二</el-radio>
-                      </el-radio-group>
+                        #if($fieldConfig.dictType && $fieldConfig.dictType.trim() != "")
+                          <dict v-model="queryParams.$fieldConfig.fieldName" type="radio" code="$fieldConfig.dictType" />
+                        #else
+                          <el-radio-group v-model="queryParams.$fieldConfig.fieldName">
+                            <el-radio :key="1" :label="1">选项一</el-radio>
+                            <el-radio :key="2" :label="2">选项二</el-radio>
+                          </el-radio-group>
+                        #end
                     #elseif($fieldConfig.formType == "CHECK_BOX")
-                      <el-checkbox-group v-model="queryParams.$fieldConfig.fieldName">
-                        <el-checkbox :key="1" :label="1">选项一</el-checkbox>
-                        <el-checkbox :key="2" :label="2">选项二</el-checkbox>
-                      </el-checkbox-group>
+                        #if($fieldConfig.dictType && $fieldConfig.dictType.trim() != "")
+                          <dict v-model="queryParams.$fieldConfig.fieldName" type="checkbox" code="$fieldConfig.dictType" />
+                        #else
+                          <el-checkbox-group v-model="queryParams.$fieldConfig.fieldName">
+                            <el-checkbox :key="1" :label="1">选项一</el-checkbox>
+                            <el-checkbox :key="2" :label="2">选项二</el-checkbox>
+                          </el-checkbox-group>
+                        #end
                     #elseif($fieldConfig.formType == "INPUT_NUMBER")
                       <el-input-number
                           v-model="queryParams.$fieldConfig.fieldName"
@@ -194,7 +202,7 @@
                           placeholder="$fieldConfig.fieldComment"
                       />
                     #elseif($fieldConfig.formType == "SELECT")
-                        #if($fieldConfig.dictType != "")
+                        #if($fieldConfig.dictType && $fieldConfig.dictType.trim() != "")
                           <dict v-model="formData.$fieldConfig.fieldName" code="$fieldConfig.dictType" />
                         #else
                           <el-select v-model="formData.$fieldConfig.fieldName" placeholder="请选择$fieldConfig.fieldComment">
@@ -203,15 +211,23 @@
                           </el-select>
                         #end
                     #elseif($fieldConfig.formType == "RADIO")
-                      <el-radio-group v-model="formData.$fieldConfig.fieldName">
-                        <el-radio :value="0">选项一</el-radio>
-                        <el-radio :value="1">选项二</el-radio>
-                      </el-radio-group>
+                        #if($fieldConfig.dictType && $fieldConfig.dictType.trim() != "")
+                          <dict v-model="queryParams.$fieldConfig.fieldName" type="radio" code="$fieldConfig.dictType" />
+                        #else
+                          <el-radio-group v-model="formData.$fieldConfig.fieldName">
+                            <el-radio :value="0">选项一</el-radio>
+                            <el-radio :value="1">选项二</el-radio>
+                          </el-radio-group>
+                        #end
                     #elseif($fieldConfig.formType == "CHECK_BOX")
-                      <el-checkbox-group v-model="formData.$fieldConfig.fieldName">
-                        <el-checkbox :value="0">选项一</el-checkbox>
-                        <el-checkbox :value="1">选项二</el-checkbox>
-                      </el-checkbox-group>
+                        #if($fieldConfig.dictType && $fieldConfig.dictType.trim() != "")
+                          <dict v-model="queryParams.$fieldConfig.fieldName" type="checkbox" code="$fieldConfig.dictType" />
+                        #else
+                          <el-checkbox-group v-model="formData.$fieldConfig.fieldName">
+                            <el-checkbox :value="0">选项一</el-checkbox>
+                            <el-checkbox :value="1">选项二</el-checkbox>
+                          </el-checkbox-group>
+                        #end
                     #elseif($fieldConfig.formType == "INPUT_NUMBER")
                       <el-input-number
                           v-model="formData.$fieldConfig.fieldName"