From ba6a2957fcad0742d2eb0c0f9d53d4ba7cd2318a Mon Sep 17 00:00:00 2001
From: xingyu <xingyu4j@vip.qq.com>
Date: Tue, 6 Dec 2022 23:04:37 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20vue3=20=E4=BB=A3=E7=A0=81=E7=94=9F?=
 =?UTF-8?q?=E6=88=90=20bugs?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/codegen/vue3/api/api.ts.vm         | 8 ++++----
 .../src/main/resources/codegen/vue3/views/data.ts.vm      | 2 +-
 .../src/main/resources/codegen/vue3/views/index.vue.vm    | 6 +++---
 3 files changed, 8 insertions(+), 8 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 2c288f163..560fb58c2 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
@@ -5,7 +5,7 @@ export interface ${simpleClassName}VO {
 #if ($column.createOperation || $column.updateOperation)
 #if(${column.javaType.toLowerCase()} == "long" || ${column.javaType.toLowerCase()} == "integer" || ${column.javaType.toLowerCase()} == "double")
   ${column.javaField}: number
-#elseif(${column.javaType.toLowerCase()} == "date")
+#elseif(${column.javaType.toLowerCase()} == "date" || ${column.javaType.toLowerCase()} == "localdatetime")
   ${column.javaField}: Date
 #else
   ${column.javaField}: ${column.javaType.toLowerCase()}
@@ -19,7 +19,7 @@ export interface ${simpleClassName}PageReqVO extends PageParam {
 #if (${column.listOperation})##查询操作
 #if(${column.javaType.toLowerCase()} == "long" || ${column.javaType.toLowerCase()} == "integer" || ${column.javaType.toLowerCase()} == "double")
   ${column.javaField}?: number
-#elseif(${column.javaType.toLowerCase()} == "date")
+#elseif(${column.javaType.toLowerCase()} == "date" || ${column.javaType.toLowerCase()} == "localdatetime")
   ${column.javaField}?: Date[]
 #else
   ${column.javaField}?: ${column.javaType.toLowerCase()}
@@ -33,8 +33,8 @@ export interface ${simpleClassName}ExcelReqVO {
 #if (${column.listOperation})##查询操作
 #if(${column.javaType.toLowerCase()} == "long" || ${column.javaType.toLowerCase()} == "integer" || ${column.javaType.toLowerCase()} == "double")
   ${column.javaField}?: number
-#elseif(${column.javaType.toLowerCase()} == "date")
-  ${column.javaField}?: string[]
+#elseif(${column.javaType.toLowerCase()} == "date" || ${column.javaType.toLowerCase()} == "localdatetime")
+  ${column.javaField}?: Date[]
 #else
   ${column.javaField}?: ${column.javaType.toLowerCase()}
 #end
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/views/data.ts.vm b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/views/data.ts.vm
index 6e1e723b8..f01f73d74 100644
--- a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/views/data.ts.vm
+++ b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/views/data.ts.vm
@@ -42,7 +42,7 @@ const crudSchemas = reactive<VxeCrudSchema>({
       #if (!$column.createOperation && !$column.updateOperation)
       isForm: false,
       #elseif(!("" != $column.dictType))
-      #if ($column.htmlType == "datetime")## 时间框
+      #if (${column.javaType.toLowerCase()} == "date" || ${column.javaType.toLowerCase()} == "localdatetime")
       formatter: 'formatDate',
       form: {
         component: 'DatePicker',
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 1c5a88ee6..06fe3002a 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
@@ -74,7 +74,7 @@
     </template>
   </XModal>
 </template>
-<script setup lang="ts" name="${table.moduleName}">
+<script setup lang="ts" name="${simpleClassName}">
 // 全局相关的 import
 import { ref, unref } from 'vue'
 import { useI18n } from '@/hooks/web/useI18n'
@@ -91,7 +91,7 @@ const message = useMessage() // 消息弹窗
 
 // 列表相关的变量
 const xGrid = ref<VxeGridInstance>() // 列表 Grid Ref
-const { gridOptions, reloadList, deleteData, exportList } = useVxeGrid<${simpleClassName}Api.${simpleClassName}VO>({
+const { gridOptions, getList, deleteData, exportList } = useVxeGrid<${simpleClassName}Api.${simpleClassName}VO>({
   allSchemas: allSchemas,
   getListApi: ${simpleClassName}Api.get${simpleClassName}PageApi,
   deleteApi: ${simpleClassName}Api.delete${simpleClassName}Api,
@@ -169,7 +169,7 @@ const submitForm = async () => {
       } finally {
         actionLoading.value = false
         // 刷新列表
-        await reloadList(xGrid)
+        await getList(xGrid)
       }
     }
   })