From 23d221b88e1270d590a82762740e259e0581a394 Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Mon, 28 Feb 2022 22:11:14 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BC=BA=E5=8C=96=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/templates/modules/gen/crud/vueApi.xml    | 6 +++++-
 .../main/resources/templates/modules/gen/crud/vueForm.xml   | 6 +++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/modules/core/src/main/resources/templates/modules/gen/crud/vueApi.xml b/modules/core/src/main/resources/templates/modules/gen/crud/vueApi.xml
index ca375b29..f2370ad7 100644
--- a/modules/core/src/main/resources/templates/modules/gen/crud/vueApi.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/crud/vueApi.xml
@@ -16,7 +16,7 @@ import { useGlobSetting } from '/@/hooks/setting';
 <% if(table.isTreeEntity){ %>
 import { TreeDataModel, TreeModel } from '../model/baseModel';
 <% }else{ %>
-import { BasicModel } from '../model/baseModel';
+import { BasicModel, Page } from '../model/baseModel';
 <% } %>
 
 const { adminPath } = useGlobSetting();
@@ -71,7 +71,11 @@ export const ${className}List = (params?: ${ClassName} | any) =>
   defHttp.get<${ClassName}>({ url: adminPath + '/${urlPrefix}/list', params });
 
 export const ${className}ListData = (params?: ${ClassName} | any) =>
+<% if(table.isTreeEntity){ %>
   defHttp.post<${ClassName}[]>({ url: adminPath + '/${urlPrefix}/listData', params });
+<% }else{ %>
+  defHttp.post<Page<${ClassName}>>({ url: adminPath + '/${urlPrefix}/listData', params });
+<% } %>
 
 export const ${className}Form = (params?: ${ClassName} | any) =>
   defHttp.get<${ClassName}>({ url: adminPath + '/${urlPrefix}/form', params });
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 160cc6e9..fed930ae 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
@@ -61,7 +61,7 @@
   import { BasicTable, useTable } from '/@/components/Table';
 <% } %>
   import { BasicDrawer, useDrawerInner } from '/@/components/Drawer';
-  import { ${className}Save, ${className}Form<% if(table.isTreeEntity){ %>, ${className}TreeData<% } %> } from '/@/api/${moduleName}${isNotEmpty(subModuleName)?'/'+subModuleName:''}/${className}';
+  import { ${ClassName}, ${className}Save, ${className}Form<% if(table.isTreeEntity){ %>, ${className}TreeData<% } %> } from '/@/api/${moduleName}${isNotEmpty(subModuleName)?'/'+subModuleName:''}/${className}';
 <%
 var userselectExists = false;
 var officeselectExists = false;
@@ -89,7 +89,7 @@ for(c in table.columnList){
 
   const { t } = useI18n('${moduleName}${isNotEmpty(subModuleName)?'.'+subModuleName:''}.${className}');
   const { showMessage } = useMessage();
-  const record = ref<Recordable>({});
+  const record = ref<${ClassName}>({} as ${ClassName});
   const getTitle = computed(() => ({
     icon: router.currentRoute.value.meta.icon || 'ant-design:book-outlined',
     value: record.value.isNewRecord ? t('新增${functionNameSimple}') : t('编辑${functionNameSimple}'),
@@ -533,7 +533,7 @@ for (c in table.columnList){
     resetFields();
     setDrawerProps({ loading: true });
     const res = await ${className}Form(data);
-    record.value = (res.${className} || {}) as Recordable;
+    record.value = (res.${className} || {}) as ${ClassName};
     record.value.__t = new Date().getTime();
   <% if(table.isTreeEntity){ %>
     if (data.parentCode && data.parentName) {