From 86a9c4bbf4801ba8b72b88df2ee871e0d7bd53bb Mon Sep 17 00:00:00 2001
From: owen <owen@evolsun.com>
Date: Sun, 17 Dec 2023 11:16:29 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9F=BA=E7=A1=80=E8=AE=BE=E6=96=BD=EF=BC=9A?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96vue3=E6=A0=87=E5=87=86=E7=89=88API=E7=94=9F?=
 =?UTF-8?q?=E6=88=90=EF=BC=88=E5=AF=BC=E5=87=BAxxAPI=EF=BC=8C=E6=96=B9?=
 =?UTF-8?q?=E4=BE=BFIDE=E8=AF=86=E5=88=AB=E6=8E=A5=E5=8F=A3=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/codegen/vue3/api/api.ts.vm | 121 +++++++++---------
 .../vue3/views/components/form_sub_erp.vue.vm |   2 +-
 .../views/components/form_sub_normal.vue.vm   |   2 +-
 .../vue3/views/components/list_sub_erp.vue.vm |   2 +-
 .../resources/codegen/vue3/views/form.vue.vm  |   5 +-
 .../resources/codegen/vue3/views/index.vue.vm |  24 ++--
 6 files changed, 86 insertions(+), 70 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 c4b0b4332..7c2ab277b 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
@@ -1,12 +1,14 @@
 import request from '@/config/axios'
 #set ($baseURL = "/${table.moduleName}/${simpleClassName_strikeCase}")
 
+// ${table.classComment} VO
 export interface ${simpleClassName}VO {
 #foreach ($column in $columns)
 #if ($column.createOperation || $column.updateOperation)
+  // ${column.columnComment}
 #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")
+#elseif(${column.javaType.toLowerCase()} == "date" || ${column.javaType.toLowerCase()} == "localdate" || ${column.javaType.toLowerCase()} == "localdatetime")
   ${column.javaField}: Date
 #else
   ${column.javaField}: ${column.javaType.toLowerCase()}
@@ -15,42 +17,44 @@ export interface ${simpleClassName}VO {
 #end
 }
 
+// ${table.classComment} API
+export const ${simpleClassName}Api = {
 #if ( $table.templateType != 2 )
-// 查询${table.classComment}分页
-export const get${simpleClassName}Page = async (params) => {
-  return await request.get({ url: `${baseURL}/page`, params })
-}
+  // 查询${table.classComment}分页
+  get${simpleClassName}Page: async (params: any) => {
+    return await request.get({ url: `${baseURL}/page`, params })
+  },
 #else
-// 查询${table.classComment}列表
-export const get${simpleClassName}List = async (params) => {
-  return await request.get({ url: `${baseURL}/list`, params })
-}
+  // 查询${table.classComment}列表
+  get${simpleClassName}List: async (params) => {
+    return await request.get({ url: `${baseURL}/list`, params })
+  },
 #end
 
-// 查询${table.classComment}详情
-export const get${simpleClassName} = async (id: number) => {
-  return await request.get({ url: `${baseURL}/get?id=` + id })
-}
+  // 查询${table.classComment}详情
+  get${simpleClassName}: async (id: number) => {
+    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 })
-}
+  // 新增${table.classComment}
+  create${simpleClassName}: async (data: ${simpleClassName}VO) => {
+    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 })
-}
+  // 修改${table.classComment}
+  update${simpleClassName}: async (data: ${simpleClassName}VO) => {
+    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 })
-}
+  // 删除${table.classComment}
+  delete${simpleClassName}: async (id: number) => {
+    return await request.delete({ url: `${baseURL}/delete?id=` + id })
+  },
 
-// 导出${table.classComment} Excel
-export const export${simpleClassName} = async (params) => {
-  return await request.download({ url: `${baseURL}/export-excel`, params })
-}
+  // 导出${table.classComment} Excel
+  export${simpleClassName}: async (params) => {
+    return await request.download({ url: `${baseURL}/export-excel`, params })
+  },
 ## 特殊：主子表专属逻辑
 #foreach ($subTable in $subTables)
 #set ($index = $foreach.count - 1)
@@ -66,46 +70,47 @@ export const export${simpleClassName} = async (params) => {
 ## 情况一：MASTER_ERP 时，需要分查询页子表
 #if ( $table.templateType == 11 )
 
-// 获得${subTable.classComment}分页
-export const get${subSimpleClassName}Page = async (params) => {
-  return await request.get({ url: `${baseURL}/${subSimpleClassName_strikeCase}/page`, params })
-}
+  // 获得${subTable.classComment}分页
+  get${subSimpleClassName}Page: async (params) => {
+    return await request.get({ url: `${baseURL}/${subSimpleClassName_strikeCase}/page`, params })
+  },
 ## 情况二：非 MASTER_ERP 时，需要列表查询子表
 #else
   #if ( $subTable.subJoinMany )
 
-// 获得${subTable.classComment}列表
-export const get${subSimpleClassName}ListBy${SubJoinColumnName} = async (${subJoinColumn.javaField}) => {
-  return await request.get({ url: `${baseURL}/${subSimpleClassName_strikeCase}/list-by-${subJoinColumn_strikeCase}?${subJoinColumn.javaField}=` + ${subJoinColumn.javaField} })
-}
+  // 获得${subTable.classComment}列表
+  get${subSimpleClassName}ListBy${SubJoinColumnName}: async (${subJoinColumn.javaField}) => {
+    return await request.get({ url: `${baseURL}/${subSimpleClassName_strikeCase}/list-by-${subJoinColumn_strikeCase}?${subJoinColumn.javaField}=` + ${subJoinColumn.javaField} })
+  },
   #else
 
-// 获得${subTable.classComment}
-export const get${subSimpleClassName}By${SubJoinColumnName} = async (${subJoinColumn.javaField}) => {
-  return await request.get({ url: `${baseURL}/${subSimpleClassName_strikeCase}/get-by-${subJoinColumn_strikeCase}?${subJoinColumn.javaField}=` + ${subJoinColumn.javaField} })
-}
+  // 获得${subTable.classComment}
+  get${subSimpleClassName}By${SubJoinColumnName}: async (${subJoinColumn.javaField}) => {
+    return await request.get({ url: `${baseURL}/${subSimpleClassName_strikeCase}/get-by-${subJoinColumn_strikeCase}?${subJoinColumn.javaField}=` + ${subJoinColumn.javaField} })
+  },
   #end
 #end
 ## 特殊：MASTER_ERP 时，支持单个的新增、修改、删除操作
 #if ( $table.templateType == 11 )
-// 新增${subTable.classComment}
-export const create${subSimpleClassName} = async (data) => {
-  return await request.post({ url: `${baseURL}/${subSimpleClassName_strikeCase}/create`, data })
-}
+  // 新增${subTable.classComment}
+  create${subSimpleClassName}: async (data) => {
+    return await request.post({ url: `${baseURL}/${subSimpleClassName_strikeCase}/create`, data })
+  },
 
-// 修改${subTable.classComment}
-export const update${subSimpleClassName} = async (data) => {
-  return await request.put({ url: `${baseURL}/${subSimpleClassName_strikeCase}/update`, data })
-}
+  // 修改${subTable.classComment}
+  update${subSimpleClassName}: async (data) => {
+    return await request.put({ url: `${baseURL}/${subSimpleClassName_strikeCase}/update`, data })
+  },
 
-// 删除${subTable.classComment}
-export const delete${subSimpleClassName} = async (id: number) => {
-  return await request.delete({ url: `${baseURL}/${subSimpleClassName_strikeCase}/delete?id=` + id })
-}
+  // 删除${subTable.classComment}
+  delete${subSimpleClassName}: async (id: number) => {
+    return await request.delete({ url: `${baseURL}/${subSimpleClassName_strikeCase}/delete?id=` + id })
+  },
 
-// 获得${subTable.classComment}
-export const get${subSimpleClassName} = async (id: number) => {
-  return await request.get({ url: `${baseURL}/${subSimpleClassName_strikeCase}/get?id=` + id })
-}
+  // 获得${subTable.classComment}
+  get${subSimpleClassName}: async (id: number) => {
+    return await request.get({ url: `${baseURL}/${subSimpleClassName_strikeCase}/get?id=` + id })
+  },
 #end
-#end
\ No newline at end of file
+#end
+}
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/views/components/form_sub_erp.vue.vm b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/views/components/form_sub_erp.vue.vm
index ed318875e..3996a9caa 100644
--- a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/views/components/form_sub_erp.vue.vm
+++ b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/views/components/form_sub_erp.vue.vm
@@ -114,7 +114,7 @@
 </template>
 <script setup lang="ts">
 import { getIntDictOptions, getStrDictOptions, getBoolDictOptions, DICT_TYPE } from '@/utils/dict'
-import * as ${simpleClassName}Api from '@/api/${table.moduleName}/${table.businessName}'
+import { ${simpleClassName}Api } from '@/api/${table.moduleName}/${table.businessName}'
 
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/views/components/form_sub_normal.vue.vm b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/views/components/form_sub_normal.vue.vm
index 90df79812..dbd03569e 100644
--- a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/views/components/form_sub_normal.vue.vm
+++ b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/views/components/form_sub_normal.vue.vm
@@ -265,7 +265,7 @@
 </template>
 <script setup lang="ts">
 import { getIntDictOptions, getStrDictOptions, getBoolDictOptions, DICT_TYPE } from '@/utils/dict'
-import * as ${simpleClassName}Api from '@/api/${table.moduleName}/${table.businessName}'
+import { ${simpleClassName}Api } from '@/api/${table.moduleName}/${table.businessName}'
 
 const props = defineProps<{
   ${subJoinColumn.javaField}: undefined // ${subJoinColumn.columnComment}（主表的关联字段）
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/views/components/list_sub_erp.vue.vm b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/views/components/list_sub_erp.vue.vm
index 5ad208b3b..71a7511be 100644
--- a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/views/components/list_sub_erp.vue.vm
+++ b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/views/components/list_sub_erp.vue.vm
@@ -85,7 +85,7 @@
 <script setup lang="ts">
 import { getIntDictOptions, getStrDictOptions, getBoolDictOptions, DICT_TYPE } from '@/utils/dict'
 import { dateFormatter } from '@/utils/formatTime'
-import * as ${simpleClassName}Api from '@/api/${table.moduleName}/${table.businessName}'
+import { ${simpleClassName}Api } from '@/api/${table.moduleName}/${table.businessName}'
 #if ($table.templateType == 11)
 import ${subSimpleClassName}Form from './${subSimpleClassName}Form.vue'
 #end
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 1c1553622..14a72d264 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
@@ -140,7 +140,7 @@
 </template>
 <script setup lang="ts">
 import { getIntDictOptions, getStrDictOptions, getBoolDictOptions, DICT_TYPE } from '@/utils/dict'
-import * as ${simpleClassName}Api from '@/api/${table.moduleName}/${table.businessName}'
+import { ${simpleClassName}Api, ${simpleClassName}VO } from '@/api/${table.moduleName}/${table.businessName}'
 ## 特殊：树表专属逻辑
 #if ( $table.templateType == 2 )
 import { defaultProps, handleTree } from '@/utils/tree'
@@ -152,6 +152,9 @@ import ${subSimpleClassName}Form from './components/${subSimpleClassName}Form.vu
 #end
 #end
 
+/** ${table.classComment} 表单 */
+defineOptions({ name: '${simpleClassName}Form' })
+
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
 
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 092b54ce4..112d0dbb6 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
@@ -240,7 +240,7 @@ import { dateFormatter } from '@/utils/formatTime'
 import { handleTree } from '@/utils/tree'
 #end
 import download from '@/utils/download'
-import * as ${simpleClassName}Api from '@/api/${table.moduleName}/${table.businessName}'
+import { ${simpleClassName}Api, ${simpleClassName}VO } from '@/api/${table.moduleName}/${table.businessName}'
 import ${simpleClassName}Form from './${simpleClassName}Form.vue'
 ## 特殊：主子表专属逻辑
 #if ( $table.templateType != 10 )
@@ -249,16 +249,22 @@ import ${subSimpleClassName}List from './components/${subSimpleClassName}List.vu
 #end
 #end
 
+/** ${table.classComment} 列表 */
 defineOptions({ name: '${table.className}' })
 
-const message = useMessage() // 消息弹窗
-const { t } = useI18n() // 国际化
+// 消息弹窗
+const message = useMessage()
+// 国际化
+const { t } = useI18n()
 
-const loading = ref(true) // 列表的加载中
-const list = ref([]) // 列表的数据
+// 列表的加载中
+const loading = ref(true)
+// 列表的数据
+const list = ref<${simpleClassName}VO[]>([])
 ## 特殊：树表专属逻辑（树不需要分页接口）
 #if ( $table.templateType != 2 )
-const total = ref(0) // 列表的总页数
+// 列表的总页数
+const total = ref(0)
 #end
 const queryParams = reactive({
 ## 特殊：树表专属逻辑（树不需要分页接口）
@@ -277,8 +283,10 @@ const queryParams = reactive({
     #end
   #end
 })
-const queryFormRef = ref() // 搜索的表单
-const exportLoading = ref(false) // 导出的加载中
+// 搜索的表单
+const queryFormRef = ref()
+// 导出的加载中
+const exportLoading = ref(false)
 
 /** 查询列表 */
 const getList = async () => {