From 14054a964f779b9cf9886bfee803323152e43063 Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Tue, 23 Jan 2024 17:53:07 +0800
Subject: [PATCH] ts type check

---
 .../resources/templates/modules/gen/crud/vueForm.xml   |  2 +-
 .../resources/templates/modules/gen/crud/vueImport.xml | 10 ++++++----
 .../resources/templates/modules/gen/crud/vueList.xml   |  2 +-
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/modules/core/src/main/resources/templates/modules/gen/crud/vueForm.xml b/modules/core/src/main/resources/templates/modules/gen/crud/vueForm.xml
index c9e6ae2b..cc751e7d 100644
--- a/modules/core/src/main/resources/templates/modules/gen/crud/vueForm.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/crud/vueForm.xml
@@ -22,7 +22,7 @@
     width="60%"
   >
     <template #title>
-      <Icon :icon="getTitle.icon" class="pr-1 m-1" />
+      <Icon :icon="getTitle.icon" class="m-1 pr-1" />
       <span> {{ getTitle.value }} </span>
     </template>
     <% if (table.childList.~size > 0){ %>
diff --git a/modules/core/src/main/resources/templates/modules/gen/crud/vueImport.xml b/modules/core/src/main/resources/templates/modules/gen/crud/vueImport.xml
index 7e9ad132..93ffe022 100644
--- a/modules/core/src/main/resources/templates/modules/gen/crud/vueImport.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/crud/vueImport.xml
@@ -52,16 +52,18 @@
   import { Icon } from '/@/components/Icon';
   import { BasicModal, useModalInner } from '/@/components/Modal';
   import { ${className}ImportData } from '/@/api/${moduleName}${isNotEmpty(subModuleName)?'/'+subModuleName:''}/${className}';
+  import { FileType } from 'ant-design-vue/es/upload/interface';
+  import { AxiosProgressEvent } from 'axios';
 
   const emit = defineEmits(['success', 'register']);
 
   const { t } = useI18n('${moduleName}${isNotEmpty(subModuleName)?'.'+subModuleName:''}.${className}');
   const { showMessage, showMessageModal } = useMessage();
 
-  const fileList = ref([]);
+  const fileList = ref(FileType[]);
   const uploadInfo = ref('');
 
-  const beforeUpload = (file: never) => {
+  const beforeUpload = (file: FileType) => {
     fileList.value = [file];
     return false;
   };
@@ -80,8 +82,8 @@
     downloadByUrl({ url: ctxAdminPath + '/${urlPrefix}/importTemplate' });
   }
 
-  function onUploadProgress(progressEvent: ProgressEvent) {
-    const complete = ((progressEvent.loaded / progressEvent.total) * 100) | 0;
+  function onUploadProgress(progressEvent: AxiosProgressEvent) {
+    const complete = ((progressEvent.loaded / (progressEvent.total || 1)) * 100) | 0;
     if (complete != 100) {
       uploadInfo.value = t('正在导入，请稍后') + ' ' + complete + '%...';
     } else {
diff --git a/modules/core/src/main/resources/templates/modules/gen/crud/vueList.xml b/modules/core/src/main/resources/templates/modules/gen/crud/vueList.xml
index 8ccf1bf3..a1720547 100644
--- a/modules/core/src/main/resources/templates/modules/gen/crud/vueList.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/crud/vueList.xml
@@ -14,7 +14,7 @@
 -->
 <template>
   <div>
-    <BasicTable @register="registerTable"<% if(table.isTreeEntity){ %> @fetchSuccess="fetchSuccess"<% } %>>
+    <BasicTable @register="registerTable"<% if(table.isTreeEntity){ %> @fetch-success="fetchSuccess"<% } %>>
       <template #tableTitle>
         <Icon :icon="getTitle.icon" class="m-1 pr-1" />
         <span> {{ getTitle.value }} </span>