Sfoglia il codice sorgente

🐞 fix(列表页面): 修复分页排序bug

dodo hold 1 anno fa
parent
commit
761b8b6e6e

+ 8 - 4
src/views/jd/list.vue

@@ -490,7 +490,7 @@ const changeStatus = async (id: number, val: any) => {
                 const msg = data.msg || '更新成功!';
                 if (data.success) {
                     Message.success(msg);
-                    fetchData();
+                    search();
                 } else {
                     Message.error(data.msg);
                 }
@@ -522,7 +522,7 @@ const changeAttr = async (id: number, name: string, val: any) => {
                 const msg = data.msg || '更新成功!';
                 if (data.success) {
                     Message.success(msg);
-                    fetchData();
+                    search();
                 } else {
                     Message.error(data.msg);
                 }
@@ -543,7 +543,11 @@ const search = () => {
     } as unknown as JdPoolParams);
 };
 const onPageChange = (current: number) => {
-    fetchData({ ...basePagination, current });
+    fetchData({ 
+        ...basePagination, 
+        ...formModel.value,
+        current 
+    } as unknown as JdPoolParams);
 };
 
 const onPageSizeChange = (current: number) => {
@@ -553,7 +557,7 @@ const onPageSizeChange = (current: number) => {
         ...basePagination,
         ...formModel.value,
         current: 1,
-    });
+    } as unknown as JdPoolParams);
 };
 
 fetchData();

+ 9 - 5
src/views/pdd/list.vue

@@ -523,7 +523,7 @@ const changeStatus = async (id: number, val: any) => {
                 const msg = data.msg || '更新成功!';
                 if (data.success) {
                     Message.success(msg);
-                    fetchData();
+                    search();
                 } else {
                     Message.error(data.msg);
                 }
@@ -555,7 +555,7 @@ const changeAttr = async (id: number, name: string, val: any) => {
                 const msg = data.msg || '更新成功!';
                 if (data.success) {
                     Message.success(msg);
-                    fetchData();
+                    search();
                 } else {
                     Message.error(data.msg);
                 }
@@ -574,7 +574,11 @@ const search = () => {
     } as unknown as PddPoolParams);
 };
 const onPageChange = (current: number) => {
-    fetchData({ ...basePagination, current });
+    fetchData({ 
+        ...basePagination, 
+        ...formModel.value,
+        current 
+    } as unknown as PddPoolParams);
 };
 
 
@@ -585,7 +589,7 @@ const onPageSizeChange = (current: number) => {
         ...basePagination,
         ...formModel.value,
         current: 1,
-    });
+    } as unknown as PddPoolParams);
 };
 
 fetchData();
@@ -669,7 +673,7 @@ const handleCookieUpdate = async () => {
             if (data.success) {
                 Message.success(msg);
                 cookieModalVisible.value = false;
-                fetchData(); // 刷新列表
+                search(); // 刷新列表
             } else {
                 Message.error(data.msg);
             }

+ 16 - 2
src/views/settings/apiAccount.vue

@@ -103,7 +103,7 @@
 
             <a-table row-key="id" :loading="loading" :pagination="pagination"
                 :columns="(cloneColumns as TableColumnData[])" :data="renderData" :bordered="{ headerCell: true }"
-                :size="size" @page-change="onPageChange">
+                :size="size" @page-change="onPageChange" @page-size-change="onPageSizeChange">
                 <template #index="{ record }">
                     {{ record.id }}
                 </template>
@@ -383,7 +383,21 @@ const search = () => {
     } as unknown as ApiAccountParams);
 };
 const onPageChange = (current: number) => {
-    fetchData({ ...basePagination, current });
+    fetchData({ 
+        ...basePagination, 
+        ...formModel.value,
+        current 
+    } as unknown as ApiAccountParams);
+};
+
+const onPageSizeChange = (pageSize: number) => {
+    basePagination.pageSize = pageSize;
+    pagination.pageSize = pageSize;
+    fetchData({
+        ...basePagination,
+        ...formModel.value,
+        current: 1,
+    } as unknown as ApiAccountParams);
 };
 
 const visible = ref(false);

+ 9 - 5
src/views/taobao/list.vue

@@ -533,7 +533,7 @@ const changeStatus = async (data: TkPoolRecord, val: any) => {
                 const msg = data.msg || '更新成功!';
                 if (data.success) {
                     Message.success(msg);
-                    fetchData();
+                    search();
                 } else {
                     Message.error(data.msg);
                 }
@@ -568,7 +568,7 @@ const changeAttr = async (id: number, name: string, val: any) => {
                 const msg = data.msg || '更新成功!';
                 if (data.success) {
                     Message.success(msg);
-                    fetchData();
+                    search();
                 } else {
                     Message.error(data.msg);
                 }
@@ -594,7 +594,7 @@ const changePublicIp = async (nodeName: string) => {
                 const msg = data.msg || '更新IP成功!';
                 if (data.success) {
                     Message.success(msg);
-                    fetchData();
+                    search();
                 } else {
                     Message.error(data.msg);
                 }
@@ -617,7 +617,11 @@ const search = () => {
     } as unknown as TkPoolParams);
 };
 const onPageChange = (current: number) => {
-    fetchData({ ...basePagination, current });
+    fetchData({ 
+        ...basePagination, 
+        ...formModel.value,
+        current 
+    } as unknown as TkPoolParams);
 };
 
 const onPageSizeChange = (current: number) => {
@@ -627,7 +631,7 @@ const onPageSizeChange = (current: number) => {
         ...basePagination,
         ...formModel.value,
         current: 1,
-    });
+    } as unknown as TkPoolParams);
 };
 
 fetchData();