Commit ba6a2957fcad0742d2eb0c0f9d53d4ba7cd2318a
1 parent
57bfef8d
fix: vue3 代码生成 bugs
Showing
3 changed files
with
8 additions
and
8 deletions
yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/api/api.ts.vm
| ... | ... | @@ -5,7 +5,7 @@ export interface ${simpleClassName}VO { |
| 5 | 5 | #if ($column.createOperation || $column.updateOperation) |
| 6 | 6 | #if(${column.javaType.toLowerCase()} == "long" || ${column.javaType.toLowerCase()} == "integer" || ${column.javaType.toLowerCase()} == "double") |
| 7 | 7 | ${column.javaField}: number |
| 8 | -#elseif(${column.javaType.toLowerCase()} == "date") | |
| 8 | +#elseif(${column.javaType.toLowerCase()} == "date" || ${column.javaType.toLowerCase()} == "localdatetime") | |
| 9 | 9 | ${column.javaField}: Date |
| 10 | 10 | #else |
| 11 | 11 | ${column.javaField}: ${column.javaType.toLowerCase()} |
| ... | ... | @@ -19,7 +19,7 @@ export interface ${simpleClassName}PageReqVO extends PageParam { |
| 19 | 19 | #if (${column.listOperation})##查询操作 |
| 20 | 20 | #if(${column.javaType.toLowerCase()} == "long" || ${column.javaType.toLowerCase()} == "integer" || ${column.javaType.toLowerCase()} == "double") |
| 21 | 21 | ${column.javaField}?: number |
| 22 | -#elseif(${column.javaType.toLowerCase()} == "date") | |
| 22 | +#elseif(${column.javaType.toLowerCase()} == "date" || ${column.javaType.toLowerCase()} == "localdatetime") | |
| 23 | 23 | ${column.javaField}?: Date[] |
| 24 | 24 | #else |
| 25 | 25 | ${column.javaField}?: ${column.javaType.toLowerCase()} |
| ... | ... | @@ -33,8 +33,8 @@ export interface ${simpleClassName}ExcelReqVO { |
| 33 | 33 | #if (${column.listOperation})##查询操作 |
| 34 | 34 | #if(${column.javaType.toLowerCase()} == "long" || ${column.javaType.toLowerCase()} == "integer" || ${column.javaType.toLowerCase()} == "double") |
| 35 | 35 | ${column.javaField}?: number |
| 36 | -#elseif(${column.javaType.toLowerCase()} == "date") | |
| 37 | - ${column.javaField}?: string[] | |
| 36 | +#elseif(${column.javaType.toLowerCase()} == "date" || ${column.javaType.toLowerCase()} == "localdatetime") | |
| 37 | + ${column.javaField}?: Date[] | |
| 38 | 38 | #else |
| 39 | 39 | ${column.javaField}?: ${column.javaType.toLowerCase()} |
| 40 | 40 | #end | ... | ... |
yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/views/data.ts.vm
| ... | ... | @@ -42,7 +42,7 @@ const crudSchemas = reactive<VxeCrudSchema>({ |
| 42 | 42 | #if (!$column.createOperation && !$column.updateOperation) |
| 43 | 43 | isForm: false, |
| 44 | 44 | #elseif(!("" != $column.dictType)) |
| 45 | - #if ($column.htmlType == "datetime")## 时间框 | |
| 45 | + #if (${column.javaType.toLowerCase()} == "date" || ${column.javaType.toLowerCase()} == "localdatetime") | |
| 46 | 46 | formatter: 'formatDate', |
| 47 | 47 | form: { |
| 48 | 48 | component: 'DatePicker', | ... | ... |
yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/views/index.vue.vm
| ... | ... | @@ -74,7 +74,7 @@ |
| 74 | 74 | </template> |
| 75 | 75 | </XModal> |
| 76 | 76 | </template> |
| 77 | -<script setup lang="ts" name="${table.moduleName}"> | |
| 77 | +<script setup lang="ts" name="${simpleClassName}"> | |
| 78 | 78 | // 全局相关的 import |
| 79 | 79 | import { ref, unref } from 'vue' |
| 80 | 80 | import { useI18n } from '@/hooks/web/useI18n' |
| ... | ... | @@ -91,7 +91,7 @@ const message = useMessage() // 消息弹窗 |
| 91 | 91 | |
| 92 | 92 | // 列表相关的变量 |
| 93 | 93 | const xGrid = ref<VxeGridInstance>() // 列表 Grid Ref |
| 94 | -const { gridOptions, reloadList, deleteData, exportList } = useVxeGrid<${simpleClassName}Api.${simpleClassName}VO>({ | |
| 94 | +const { gridOptions, getList, deleteData, exportList } = useVxeGrid<${simpleClassName}Api.${simpleClassName}VO>({ | |
| 95 | 95 | allSchemas: allSchemas, |
| 96 | 96 | getListApi: ${simpleClassName}Api.get${simpleClassName}PageApi, |
| 97 | 97 | deleteApi: ${simpleClassName}Api.delete${simpleClassName}Api, |
| ... | ... | @@ -169,7 +169,7 @@ const submitForm = async () => { |
| 169 | 169 | } finally { |
| 170 | 170 | actionLoading.value = false |
| 171 | 171 | // 刷新列表 |
| 172 | - await reloadList(xGrid) | |
| 172 | + await getList(xGrid) | |
| 173 | 173 | } |
| 174 | 174 | } |
| 175 | 175 | }) | ... | ... |