fix: 修改课题组列表选择器bug

柏杨
1 parent a6607384
Showing 1 changed file with 29 additions and 6 deletions
src/pages/ResearchGroup/ResearchGroup/index.tsx
@@ -531,17 +531,29 @@ const ResearchGroupListPage = () =&gt; {
           columns={researchGroupColumnsInit()}
           actionRef={researchGroupActionRef}
           cardBordered
+          manualRequest={false}
+          dataSource={undefined} // Use undefined to force server fetch
           pagination={{
-            pageSize: 10,
+            showSizeChanger: true,
+            pageSizeOptions: ['10', '20', '50', '100'],
+            defaultCurrent: 1,
+            defaultPageSize: 10,
           }}
+          scroll={{ x: 1400 }}
           request={async (params) => {
+            const { current, pageSize, ...rest } = params;
             const res = await postResearchGroupsList({
-              data: { ...params },
+              data: {
+                current: current,
+                pageSize: pageSize,
+                ...rest,
+              },
             });
             setPerms(res.data.specialPath);
             return {
               data: res?.data?.data || [],
               total: res?.data?.total || 0,
+              success: res && res.result === RESPONSE_CODE.SUCCESS,
             };
           }}
           columnsState={{
@@ -566,7 +578,6 @@ const ResearchGroupListPage = () =&gt; {
           form={{}}
           dateFormatter="string"
           headerTitle="课题组列表"
-          scroll={{ x: 1400 }}
           toolBarRender={() => {
             let btns = [];
             if (perms?.includes('add')) {
@@ -640,17 +651,29 @@ const ResearchGroupListPage = () =&gt; {
           columns={memberApplyColumnsInit()}
           actionRef={memberApplyActionRef}
           cardBordered
+          manualRequest={false}
+          dataSource={undefined} // Use undefined to force server fetch
           pagination={{
-            pageSize: 10,
+            showSizeChanger: true,
+            pageSizeOptions: ['10', '20', '50', '100'],
+            defaultCurrent: 1,
+            defaultPageSize: 10,
           }}
+          scroll={{ x: 1400 }}
           request={async (params) => {
+            const { current, pageSize, ...rest } = params;
             const res = await postResearchGroupMemberRequestsList({
-              data: { ...params },
+              data: {
+                current: current,
+                pageSize: pageSize,
+                ...rest,
+              },
             });
             setPerms(res.data.specialPath);
             return {
               data: res?.data?.data || [],
               total: res?.data?.total || 0,
+              success: res && res.result === RESPONSE_CODE.SUCCESS,
             };
           }}
           columnsState={{
@@ -666,6 +689,7 @@ const ResearchGroupListPage = () =&gt; {
           rowKey="id"
           search={{
             labelWidth: 'auto',
+            defaultCollapsed: false,
           }}
           options={{
             setting: {
@@ -675,7 +699,6 @@ const ResearchGroupListPage = () =&gt; {
           form={{}}
           dateFormatter="string"
           headerTitle="申请列表"
-          scroll={{ x: 1400 }}
           toolBarRender={() => {
             let btns = [];
             btns.push(