From 552e9969ccf5fa33dadcce388a98e30defd5b3da Mon Sep 17 00:00:00 2001
From: baayso <baayso@outlook.com>
Date: Fri, 21 Apr 2023 18:07:28 +0800
Subject: [PATCH] fix: 代码生成：Vue3标准模板问题修复。

---
 yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/api/api.ts.vm      | 18 ++++++++++--------
 yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/views/form.vue.vm  |  2 +-
 yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/views/index.vue.vm |  4 ++--
 3 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/api/api.ts.vm b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/api/api.ts.vm
index eaab407..175a6eb 100644
--- a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/api/api.ts.vm
+++ b/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'
 export interface ${simpleClassName}VO {
 #foreach ($column in $columns)
 #if ($column.createOperation || $column.updateOperation)
-#if(${column.javaType.toLowerCase()} == "long" || ${column.javaType.toLowerCase()} == "integer" || ${column.javaType.toLowerCase()} == "double" || ${column.javaType.toLowerCase()} == "bigdecimal")
+#if(${column.javaType.toLowerCase()} == "long" || ${column.javaType.toLowerCase()} == "integer" || ${column.javaType.toLowerCase()} == "short" || ${column.javaType.toLowerCase()} == "double" || ${column.javaType.toLowerCase()} == "bigdecimal")
   ${column.javaField}: number
 #elseif(${column.javaType.toLowerCase()} == "date" || ${column.javaType.toLowerCase()} == "localdatetime")
   ${column.javaField}: Date
@@ -14,32 +14,34 @@ export interface ${simpleClassName}VO {
 #end
 }
 
+const baseURL = '/${table.moduleName}/${simpleClassName_strikeCase}'
+
 // 查询${table.classComment}列表
 export const get${simpleClassName}Page = async (params: ${simpleClassName}PageReqVO) => {
-  return await request.get({ url: '${baseURL}/page', params })
+  return await request.get({ url: `${baseURL}/page`, params })
 }
 
 // 查询${table.classComment}详情
 export const get${simpleClassName} = async (id: number) => {
-  return await request.get({ url: '${baseURL}/get?id=' + id })
+  return await request.get({ url: `${baseURL}/get?id=` + id })
 }
 
 // 新增${table.classComment}
 export const create${simpleClassName} = async (data: ${simpleClassName}VO) => {
-  return await request.post({ url: '${baseURL}/create', data })
+  return await request.post({ url: `${baseURL}/create`, data })
 }
 
 // 修改${table.classComment}
 export const update${simpleClassName} = async (data: ${simpleClassName}VO) => {
-  return await request.put({ url: '${baseURL}/update', data })
+  return await request.put({ url: `${baseURL}/update`, data })
 }
 
 // 删除${table.classComment}
 export const delete${simpleClassName} = async (id: number) => {
-  return await request.delete({ url: '${baseURL}/delete?id=' + id })
+  return await request.delete({ url: `${baseURL}/delete?id=` + id })
 }
 
 // 导出${table.classComment} Excel
-export const export${simpleClassName}Api = async (params) => {
-  return await request.download({ url: '${baseURL}/export-excel', params })
+export const export${simpleClassName} = async (params) => {
+  return await request.download({ url: `${baseURL}/export-excel`, params })
 }
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/views/form.vue.vm b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/views/form.vue.vm
index 99cce39..6604263 100644
--- a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/views/form.vue.vm
+++ b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/views/form.vue.vm
@@ -102,7 +102,7 @@
         <el-date-picker
           v-model="formData.${javaField}"
           type="date"
-          value-format="timestamp"
+          value-format="x"
           placeholder="选择${comment}"
         />
       </el-form-item>
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/views/index.vue.vm b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/views/index.vue.vm
index f396dde..58bc69b 100644
--- a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/views/index.vue.vm
+++ b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/views/index.vue.vm
@@ -66,7 +66,7 @@
       <el-form-item label="${comment}" prop="${javaField}">
         <el-date-picker
           v-model="queryParams.${javaField}"
-          value-format="yyyy-MM-dd"
+          value-format="YYYY-MM-DD"
           type="date"
           placeholder="选择${comment}"
           clearable
@@ -77,7 +77,7 @@
       <el-form-item label="${comment}" prop="${javaField}">
         <el-date-picker
           v-model="queryParams.${javaField}"
-          value-format="yyyy-MM-dd HH:mm:ss"
+          value-format="YYYY-MM-DD HH:mm:ss"
           type="daterange"
           start-placeholder="开始日期"
           end-placeholder="结束日期"
--
libgit2 0.21.4