Commit 38462fbcf82f9435bd5647b49e4494b334e37bbf
Committed by
Gitee
!462 fix: 代码生成:Vue3标准模板问题修复。
Merge pull request !462 from baayso/master
Showing
3 changed files
with
13 additions
and
11 deletions
yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/api/api.ts.vm
| @@ -3,7 +3,7 @@ import request from '@/config/axios' | @@ -3,7 +3,7 @@ import request from '@/config/axios' | ||
| 3 | export interface ${simpleClassName}VO { | 3 | export interface ${simpleClassName}VO { |
| 4 | #foreach ($column in $columns) | 4 | #foreach ($column in $columns) |
| 5 | #if ($column.createOperation || $column.updateOperation) | 5 | #if ($column.createOperation || $column.updateOperation) |
| 6 | -#if(${column.javaType.toLowerCase()} == "long" || ${column.javaType.toLowerCase()} == "integer" || ${column.javaType.toLowerCase()} == "double" || ${column.javaType.toLowerCase()} == "bigdecimal") | 6 | +#if(${column.javaType.toLowerCase()} == "long" || ${column.javaType.toLowerCase()} == "integer" || ${column.javaType.toLowerCase()} == "short" || ${column.javaType.toLowerCase()} == "double" || ${column.javaType.toLowerCase()} == "bigdecimal") |
| 7 | ${column.javaField}: number | 7 | ${column.javaField}: number |
| 8 | #elseif(${column.javaType.toLowerCase()} == "date" || ${column.javaType.toLowerCase()} == "localdatetime") | 8 | #elseif(${column.javaType.toLowerCase()} == "date" || ${column.javaType.toLowerCase()} == "localdatetime") |
| 9 | ${column.javaField}: Date | 9 | ${column.javaField}: Date |
| @@ -14,32 +14,34 @@ export interface ${simpleClassName}VO { | @@ -14,32 +14,34 @@ export interface ${simpleClassName}VO { | ||
| 14 | #end | 14 | #end |
| 15 | } | 15 | } |
| 16 | 16 | ||
| 17 | +const baseURL = '/${table.moduleName}/${simpleClassName_strikeCase}' | ||
| 18 | + | ||
| 17 | // 查询${table.classComment}列表 | 19 | // 查询${table.classComment}列表 |
| 18 | export const get${simpleClassName}Page = async (params: ${simpleClassName}PageReqVO) => { | 20 | export const get${simpleClassName}Page = async (params: ${simpleClassName}PageReqVO) => { |
| 19 | - return await request.get({ url: '${baseURL}/page', params }) | 21 | + return await request.get({ url: `${baseURL}/page`, params }) |
| 20 | } | 22 | } |
| 21 | 23 | ||
| 22 | // 查询${table.classComment}详情 | 24 | // 查询${table.classComment}详情 |
| 23 | export const get${simpleClassName} = async (id: number) => { | 25 | export const get${simpleClassName} = async (id: number) => { |
| 24 | - return await request.get({ url: '${baseURL}/get?id=' + id }) | 26 | + return await request.get({ url: `${baseURL}/get?id=` + id }) |
| 25 | } | 27 | } |
| 26 | 28 | ||
| 27 | // 新增${table.classComment} | 29 | // 新增${table.classComment} |
| 28 | export const create${simpleClassName} = async (data: ${simpleClassName}VO) => { | 30 | export const create${simpleClassName} = async (data: ${simpleClassName}VO) => { |
| 29 | - return await request.post({ url: '${baseURL}/create', data }) | 31 | + return await request.post({ url: `${baseURL}/create`, data }) |
| 30 | } | 32 | } |
| 31 | 33 | ||
| 32 | // 修改${table.classComment} | 34 | // 修改${table.classComment} |
| 33 | export const update${simpleClassName} = async (data: ${simpleClassName}VO) => { | 35 | export const update${simpleClassName} = async (data: ${simpleClassName}VO) => { |
| 34 | - return await request.put({ url: '${baseURL}/update', data }) | 36 | + return await request.put({ url: `${baseURL}/update`, data }) |
| 35 | } | 37 | } |
| 36 | 38 | ||
| 37 | // 删除${table.classComment} | 39 | // 删除${table.classComment} |
| 38 | export const delete${simpleClassName} = async (id: number) => { | 40 | export const delete${simpleClassName} = async (id: number) => { |
| 39 | - return await request.delete({ url: '${baseURL}/delete?id=' + id }) | 41 | + return await request.delete({ url: `${baseURL}/delete?id=` + id }) |
| 40 | } | 42 | } |
| 41 | 43 | ||
| 42 | // 导出${table.classComment} Excel | 44 | // 导出${table.classComment} Excel |
| 43 | -export const export${simpleClassName}Api = async (params) => { | ||
| 44 | - return await request.download({ url: '${baseURL}/export-excel', params }) | 45 | +export const export${simpleClassName} = async (params) => { |
| 46 | + return await request.download({ url: `${baseURL}/export-excel`, params }) | ||
| 45 | } | 47 | } |
yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/views/form.vue.vm
| @@ -102,7 +102,7 @@ | @@ -102,7 +102,7 @@ | ||
| 102 | <el-date-picker | 102 | <el-date-picker |
| 103 | v-model="formData.${javaField}" | 103 | v-model="formData.${javaField}" |
| 104 | type="date" | 104 | type="date" |
| 105 | - value-format="timestamp" | 105 | + value-format="x" |
| 106 | placeholder="选择${comment}" | 106 | placeholder="选择${comment}" |
| 107 | /> | 107 | /> |
| 108 | </el-form-item> | 108 | </el-form-item> |
yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/views/index.vue.vm
| @@ -66,7 +66,7 @@ | @@ -66,7 +66,7 @@ | ||
| 66 | <el-form-item label="${comment}" prop="${javaField}"> | 66 | <el-form-item label="${comment}" prop="${javaField}"> |
| 67 | <el-date-picker | 67 | <el-date-picker |
| 68 | v-model="queryParams.${javaField}" | 68 | v-model="queryParams.${javaField}" |
| 69 | - value-format="yyyy-MM-dd" | 69 | + value-format="YYYY-MM-DD" |
| 70 | type="date" | 70 | type="date" |
| 71 | placeholder="选择${comment}" | 71 | placeholder="选择${comment}" |
| 72 | clearable | 72 | clearable |
| @@ -77,7 +77,7 @@ | @@ -77,7 +77,7 @@ | ||
| 77 | <el-form-item label="${comment}" prop="${javaField}"> | 77 | <el-form-item label="${comment}" prop="${javaField}"> |
| 78 | <el-date-picker | 78 | <el-date-picker |
| 79 | v-model="queryParams.${javaField}" | 79 | v-model="queryParams.${javaField}" |
| 80 | - value-format="yyyy-MM-dd HH:mm:ss" | 80 | + value-format="YYYY-MM-DD HH:mm:ss" |
| 81 | type="daterange" | 81 | type="daterange" |
| 82 | start-placeholder="开始日期" | 82 | start-placeholder="开始日期" |
| 83 | end-placeholder="结束日期" | 83 | end-placeholder="结束日期" |