mirage
/
edu
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

This commit is contained in:
TinyAnts 2022-08-16 17:37:07 +08:00
parent e0baf0412b b4a9cc07c4
commit 7823d9dd34
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
admin/src/views/setting/dict/data/edit.vue
View File

@ -76,14 +76,14 @@ const rules = {
name: [ name: [
{ {
required: true, required: true,
message: '请输入字典名称', message: '请输入数据名称',
trigger: ['blur'] trigger: ['blur']
} }
], ],
value: [ value: [
{ {
required: true, required: true,
message: '请输入字典类型', message: '请输入数据值',
trigger: ['blur'] trigger: ['blur']
} }
] ]

2
server/like-generator/src/main/resources/vue/api.ts.vm
View File

@ -7,7 +7,7 @@ export function ${moduleName}Lists(params?: Record<string, any>) {
// ${functionName}详情 // ${functionName}详情
export function ${moduleName}Detail(params: Record<string, any>) { export function ${moduleName}Detail(params: Record<string, any>) {
return request.post({ url: '/${moduleName}/detail', params }) return request.get({ url: '/${moduleName}/detail', params })
} }
// ${functionName}新增 // ${functionName}新增

9
server/like-generator/src/main/resources/vue/edit.vue.vm
View File

@ -62,7 +62,7 @@
</el-form-item> </el-form-item>
#elseif($column.htmlType=="select") #elseif($column.htmlType=="select")
<el-form-item label="${column.columnComment}" prop="${column.javaField}"> <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!="") #if($column.dictType!="")
<el-option <el-option
v-for="(item, index) in dictData.${column.dictType}" v-for="(item, index) in dictData.${column.dictType}"
@ -164,6 +164,9 @@ const formData = reactive({
#if($column.htmlType=="checkbox") #if($column.htmlType=="checkbox")
${column.javaField}: [], ${column.javaField}: [],
#else #else
#if($column.htmlType=="number")
${column.javaField}: 0,
#else
${column.javaField}: '', ${column.javaField}: '',
#end #end
#end #end
@ -190,7 +193,7 @@ const formRules = {
const handleSubmit = async () => { const handleSubmit = async () => {
await formRef.value?.validate() await formRef.value?.validate()
const data = {...formData} const data: any = { ...formData }
#foreach ($column in $columns) #foreach ($column in $columns)
#if($column.htmlType == "checkbox") #if($column.htmlType == "checkbox")
data.${column.javaField} = data.${column.javaField}.join(","); data.${column.javaField} = data.${column.javaField}.join(",");
@ -207,7 +210,7 @@ const open = (type = 'add') => {
popupRef.value?.open() popupRef.value?.open()
} }
const setFormData = (row: Record<string, any>) => { const setFormData = async (row: Record<string, any>) => {
const data = await ${moduleName}Detail({ const data = await ${moduleName}Detail({
${primaryKey}: row.${primaryKey} ${primaryKey}: row.${primaryKey}
}) })