Merge branch 'develop' of https://gitee.com/likeadmin/likeadmin_java into develop

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']
         }
     ]

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}新增

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