Commit 6360d43274def02bb1d363ef28a2cf7d03ae01b3
1 parent
47f3c560
fix: codegen
Showing
2 changed files
with
18 additions
and
20 deletions
yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/api/api.ts.vm
| @@ -4,11 +4,11 @@ export interface ${simpleClassName}VO { | @@ -4,11 +4,11 @@ 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") | 6 | #if(${column.javaType.toLowerCase()} == "long" || ${column.javaType.toLowerCase()} == "integer") |
| 7 | - ${column.javaField}?: number | 7 | + ${column.javaField}: number |
| 8 | #elseif(${column.javaType.toLowerCase()} == "date") | 8 | #elseif(${column.javaType.toLowerCase()} == "date") |
| 9 | - ${column.javaField}?: string | 9 | + ${column.javaField}: string |
| 10 | #else | 10 | #else |
| 11 | - ${column.javaField}?: ${column.javaType.toLowerCase()} | 11 | + ${column.javaField}: ${column.javaType.toLowerCase()} |
| 12 | #end | 12 | #end |
| 13 | #end | 13 | #end |
| 14 | #end | 14 | #end |
| @@ -18,28 +18,28 @@ export interface ${simpleClassName}PageReqVO extends PageParam { | @@ -18,28 +18,28 @@ export interface ${simpleClassName}PageReqVO extends PageParam { | ||
| 18 | #foreach ($column in $columns) | 18 | #foreach ($column in $columns) |
| 19 | #if (${column.listOperation})##查询操作 | 19 | #if (${column.listOperation})##查询操作 |
| 20 | #if(${column.javaType.toLowerCase()} == "long" || ${column.javaType.toLowerCase()} == "integer") | 20 | #if(${column.javaType.toLowerCase()} == "long" || ${column.javaType.toLowerCase()} == "integer") |
| 21 | - ${column.javaField}?: number | 21 | + ${column.javaField}?: number |
| 22 | #elseif(${column.javaType.toLowerCase()} == "date") | 22 | #elseif(${column.javaType.toLowerCase()} == "date") |
| 23 | - ${column.javaField}?: string | 23 | + ${column.javaField}?: string[] |
| 24 | #else | 24 | #else |
| 25 | - ${column.javaField}?: ${column.javaType.toLowerCase()} | 25 | + ${column.javaField}?: ${column.javaType.toLowerCase()} |
| 26 | #end | 26 | #end |
| 27 | #end | 27 | #end |
| 28 | #end | 28 | #end |
| 29 | } | 29 | } |
| 30 | 30 | ||
| 31 | export interface ${simpleClassName}ExcelReqVO { | 31 | export interface ${simpleClassName}ExcelReqVO { |
| 32 | - #foreach ($column in $columns) | ||
| 33 | - #if (${column.listOperation})##查询操作 | ||
| 34 | - #if(${column.javaType.toLowerCase()} == "long" || ${column.javaType.toLowerCase()} == "integer") | ||
| 35 | - ${column.javaField}: number | ||
| 36 | - #elseif(${column.javaType.toLowerCase()} == "date") | ||
| 37 | - ${column.javaField}: string | ||
| 38 | - #else | ||
| 39 | - ${column.javaField}: ${column.javaType.toLowerCase()} | ||
| 40 | - #end | ||
| 41 | - #end | ||
| 42 | - #end | 32 | +#foreach ($column in $columns) |
| 33 | +#if (${column.listOperation})##查询操作 | ||
| 34 | +#if(${column.javaType.toLowerCase()} == "long" || ${column.javaType.toLowerCase()} == "integer") | ||
| 35 | + ${column.javaField}?: number | ||
| 36 | +#elseif(${column.javaType.toLowerCase()} == "date") | ||
| 37 | + ${column.javaField}?: string[] | ||
| 38 | +#else | ||
| 39 | + ${column.javaField}?: ${column.javaType.toLowerCase()} | ||
| 40 | +#end | ||
| 41 | +#end | ||
| 42 | +#end | ||
| 43 | } | 43 | } |
| 44 | #set ($baseURL = "/${table.moduleName}/${simpleClassName_strikeCase}") | 44 | #set ($baseURL = "/${table.moduleName}/${simpleClassName_strikeCase}") |
| 45 | 45 |
yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/views/index.vue.vm
| @@ -165,7 +165,7 @@ const submitForm = async () => { | @@ -165,7 +165,7 @@ const submitForm = async () => { | ||
| 165 | await ${simpleClassName}Api.update${simpleClassName}Api(data) | 165 | await ${simpleClassName}Api.update${simpleClassName}Api(data) |
| 166 | message.success(t('common.updateSuccess')) | 166 | message.success(t('common.updateSuccess')) |
| 167 | } | 167 | } |
| 168 | - dialogVisible.value = false | 168 | + modelVisible.value = false |
| 169 | } finally { | 169 | } finally { |
| 170 | actionLoading.value = false | 170 | actionLoading.value = false |
| 171 | // 刷新列表 | 171 | // 刷新列表 |
| @@ -174,6 +174,4 @@ const submitForm = async () => { | @@ -174,6 +174,4 @@ const submitForm = async () => { | ||
| 174 | } | 174 | } |
| 175 | }) | 175 | }) |
| 176 | } | 176 | } |
| 177 | - | ||
| 178 | </script> | 177 | </script> |
| 179 | - |