From 2e76caa35ed39dc5bb7aec242557af67ce98337b Mon Sep 17 00:00:00 2001
From: Charles7c <charles7c@126.com>
Date: Wed, 12 Mar 2025 19:58:34 +0800
Subject: [PATCH] =?UTF-8?q?fix(generator):=20=E4=BF=AE=E5=A4=8D=E5=89=8D?=
 =?UTF-8?q?=E7=AB=AF=E6=A8=A1=E6=9D=BF=E5=AD=97=E5=85=B8=E7=A0=81=E4=BD=BF?=
 =?UTF-8?q?=E7=94=A8=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/templates/frontend/AddModal.ftl    | 8 ++++----
 .../src/main/resources/templates/frontend/index.ftl       | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/continew-plugin/continew-plugin-generator/src/main/resources/templates/frontend/AddModal.ftl b/continew-plugin/continew-plugin-generator/src/main/resources/templates/frontend/AddModal.ftl
index 5f74f144..662c4638 100644
--- a/continew-plugin/continew-plugin-generator/src/main/resources/templates/frontend/AddModal.ftl
+++ b/continew-plugin/continew-plugin-generator/src/main/resources/templates/frontend/AddModal.ftl
@@ -80,15 +80,15 @@ const columns: ColumnItem[] = reactive([
     <#elseif fieldConfig.formType = 'RADIO'>
     type: 'radio-group',
     </#if>
+    span: 24,
+    <#if fieldConfig.isRequired>
+    required: true,
+    </#if>
     <#if fieldConfig.dictCode?? && fieldConfig.dictCode != ''>
     props: {
       options: ${fieldConfig.dictCode},
     },
     </#if>
-    span: 24,
-    <#if fieldConfig.isRequired>
-    rules: [{ required: true, message: '请输入${fieldConfig.comment}' }]
-    </#if>
   },
   </#if>
 </#list>
diff --git a/continew-plugin/continew-plugin-generator/src/main/resources/templates/frontend/index.ftl b/continew-plugin/continew-plugin-generator/src/main/resources/templates/frontend/index.ftl
index f5b5b9f0..a05031af 100644
--- a/continew-plugin/continew-plugin-generator/src/main/resources/templates/frontend/index.ftl
+++ b/continew-plugin/continew-plugin-generator/src/main/resources/templates/frontend/index.ftl
@@ -19,7 +19,7 @@
 	  <#if fieldConfig.formType == "SELECT"><#-- 下拉框 -->
         <a-select
           v-model="queryForm.${fieldConfig.fieldName}"
-          :options="${fieldConfig.columnName}_enum"
+          :options="${fieldConfig.dictCode}"
           placeholder="请选择${fieldConfig.comment}"
           allow-clear
           style="width: 150px"