From 148db692d582a390387059714c4aedcc02f477a3 Mon Sep 17 00:00:00 2001
From: Jason <5340635+wen-jason@user.noreply.gitee.com>
Date: Tue, 16 Aug 2022 17:33:17 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=B0=83=E6=95=B4=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

---
 server/like-generator/src/main/resources/vue/api.ts.vm   | 2 +-
 server/like-generator/src/main/resources/vue/edit.vue.vm | 9 ++++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/server/like-generator/src/main/resources/vue/api.ts.vm b/server/like-generator/src/main/resources/vue/api.ts.vm
index 97ac7d1a..79297b86 100644
--- a/server/like-generator/src/main/resources/vue/api.ts.vm
+++ b/server/like-generator/src/main/resources/vue/api.ts.vm
@@ -7,7 +7,7 @@ export function ${moduleName}Lists(params?: Record<string, any>) {
 
 // ${functionName}详情
 export function ${moduleName}Detail(params: Record<string, any>) {
-    return request.post({ url: '/${moduleName}/detail', params })
+    return request.get({ url: '/${moduleName}/detail', params })
 }
 
 // ${functionName}新增
diff --git a/server/like-generator/src/main/resources/vue/edit.vue.vm b/server/like-generator/src/main/resources/vue/edit.vue.vm
index 70f173e1..984e647c 100644
--- a/server/like-generator/src/main/resources/vue/edit.vue.vm
+++ b/server/like-generator/src/main/resources/vue/edit.vue.vm
@@ -62,7 +62,7 @@
                 </el-form-item>
             #elseif($column.htmlType=="select")
                 <el-form-item label="${column.columnComment}" prop="${column.javaField}">
-                    <el-select v-model="formData.${column.javaField}" placeholder="请选择${column.columnComment}">
+                    <el-select class="flex-1" v-model="formData.${column.javaField}" placeholder="请选择${column.columnComment}">
                         #if($column.dictType!="")
                         <el-option
                             v-for="(item, index) in dictData.${column.dictType}"
@@ -164,6 +164,9 @@ const formData = reactive({
     #if($column.htmlType=="checkbox")
     ${column.javaField}: [],
     #else
+    #if($column.htmlType=="number")
+    ${column.javaField}: 0,
+    #else
     ${column.javaField}: '',
     #end
     #end
@@ -190,7 +193,7 @@ const formRules = {
 
 const handleSubmit = async () => {
     await formRef.value?.validate()
-    const data = {...formData}
+    const data: any = { ...formData }
     #foreach ($column in $columns)
     #if($column.htmlType == "checkbox")
     data.${column.javaField} = data.${column.javaField}.join(",");
@@ -207,7 +210,7 @@ const open = (type = 'add') => {
     popupRef.value?.open()
 }
 
-const setFormData = (row: Record<string, any>) => {
+const setFormData = async (row: Record<string, any>) => {
     const data = await ${moduleName}Detail({
         ${primaryKey}: row.${primaryKey}
     })

From b4a9cc07c4139491d7a6e0bb5c9f573c014525ca Mon Sep 17 00:00:00 2001
From: Jason <5340635+wen-jason@user.noreply.gitee.com>
Date: Tue, 16 Aug 2022 17:33:53 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=AD=97=E5=85=B8?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E9=AA=8C=E8=AF=81=E6=96=87=E6=A1=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 admin/src/views/setting/dict/data/edit.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/admin/src/views/setting/dict/data/edit.vue b/admin/src/views/setting/dict/data/edit.vue
index 751e2c6a..5d954c05 100644
--- a/admin/src/views/setting/dict/data/edit.vue
+++ b/admin/src/views/setting/dict/data/edit.vue
@@ -76,14 +76,14 @@ const rules = {
     name: [
         {
             required: true,
-            message: '请输入字典名称',
+            message: '请输入数据名称',
             trigger: ['blur']
         }
     ],
     value: [
         {
             required: true,
-            message: '请输入字典类型',
+            message: '请输入数据值',
             trigger: ['blur']
         }
     ]