Merge branch 'bugfix-0516client' into 'dev'

Bugfix 0516client See merge request !34

Merge branch 'bugfix-0516client' into 'dev'
Bugfix 0516client See merge request !34
boyang
2 parents 66e38ec1 ddc5a9a0
Showing 2 changed files with 42 additions and 7 deletions
src/pages/Client/Client/index.tsx
src/pages/Client/FollowRecord/index.tsx
@@ -432,14 +432,31 @@ export default () =&gt; {
           actionRef={actionRef}
           cardBordered
           request={async (params) => {
+            // 获取分页参数
+            const { current, pageSize, ...restParams } = params;
+
             const res = await postAdminClientQueryClientPage({
               data: {
-                ...params,
+                ...restParams,
                 groupFilter: groupFilter,
+                // 明确传递分页参数
+                current: current,
+                pageSize: pageSize,
               },
             });
-            const data = res.data;
-            return data;
+
+            // 处理后端返回的实际数据格式
+            // 根据提供的JSON，格式已经是 {records, total, current, pages, size, count}
+            const result = {
+              data: res.data?.records || [], // 数据源是 records 数组
+              success: true,
+              total: res.data?.total || 0, // 总记录数
+              // 返回服务器端的分页信息，让ProTable使用
+              current: res.data?.current || 1,
+              pageSize: res.data?.size || 10,
+            };
+
+            return result;
           }}
           search={{
             labelWidth: 'auto',
@@ -504,8 +521,12 @@ export default () =&gt; {
             },
           }}
           pagination={{
-            pageSize: 5,
-            onChange: (page) => console.log(page),
+            defaultPageSize: 10,
+            pageSizeOptions: ['5', '20', '50', '100'],
+            showSizeChanger: true,
+            showQuickJumper: true,
+            // 使用服务端返回的分页信息
+            responsive: true,
           }}
           dateFormatter="string"
           headerTitle="高级表格"
@@ -334,13 +334,18 @@ export default () =&gt; {
           actionRef={actionRef}
           cardBordered
           request={async (params) => {
+            // 获取分页参数
+            const { current, pageSize } = params;
+
             const res = await postAdminClientQueryClientComunicationInfo({
               data: {
                 ...params,
+                // 明确传递分页参数
+                current: current,
+                pageSize: pageSize,
               },
             });
             if (res.result === RESPONSE_CODE.SUCCESS) {
-              console.log(JSON.stringify(res.data));
               return {
                 ...res.data,
                 data: res.data.data.map((item) => {
@@ -349,9 +354,13 @@ export default () =&gt; {
                     tid: (Math.random() * 1000000).toFixed(0),
                   };
                 }),
+                // 返回服务器端的分页信息，让ProTable使用
+                current: res.data.current || 1,
+                pageSize: res.data.pageSize || 10,
               };
             } else {
               message.error('获取失败');
+              return { data: [], success: false };
             }
           }}
           search={{
@@ -392,7 +401,12 @@ export default () =&gt; {
             },
           }}
           pagination={{
-            pageSize: 5,
+            defaultPageSize: 10,
+            pageSizeOptions: ['5', '20', '50', '100'],
+            showSizeChanger: true,
+            showQuickJumper: true,
+            // 使用服务端返回的分页信息
+            responsive: true,
             onChange: (page) => console.log(page),
           }}
           dateFormatter="string"