diff --git a/src/hooks/useTableSelectionWithPagination.ts b/src/hooks/useTableSelectionWithPagination.ts index b13574b..10bef01 100644 --- a/src/hooks/useTableSelectionWithPagination.ts +++ b/src/hooks/useTableSelectionWithPagination.ts @@ -63,14 +63,17 @@ export function useTableSelectionWithPagination(options: UseTableSelectionWithPa options.onSelectChange?.(); }; - const onPageChange = (page: number) => { + const onPageChange = (page: number, pageSize:number) => { + // console.log('onPageChange', page, pageSize); pageInfo.value.page = page; + pageInfo.value.page_size = pageSize; options.onPageChange?.(page); }; - const onPageSizeChange = (size: number) => { - pageInfo.value.page_size = size; - pageInfo.value.page = 1; - options.onPageSizeChange?.(size); + const onPageSizeChange = (current: number, size: number) => { + // console.log('onPageSizeChange', current, size); + // pageInfo.value.page_size = size; + // pageInfo.value.page = 1; + // options.onPageSizeChange?.(size); }; const resetPageInfo = () => { pageInfo.value = cloneDeep(DEFAULT_PAGE_INFO) diff --git a/src/views/material-center/components/finished-products/manuscript/check-list/components/manuscript-check-table/index.vue b/src/views/material-center/components/finished-products/manuscript/check-list/components/manuscript-check-table/index.vue index 62c8854..84410ef 100644 --- a/src/views/material-center/components/finished-products/manuscript/check-list/components/manuscript-check-table/index.vue +++ b/src/views/material-center/components/finished-products/manuscript/check-list/components/manuscript-check-table/index.vue @@ -151,7 +151,7 @@ const props = defineProps({ default: () => [], }, rowSelection: { - type: Array, + type: Object, default: () => {}, }, selectedRowKeys: { diff --git a/src/views/material-center/components/finished-products/manuscript/check-list/index.vue b/src/views/material-center/components/finished-products/manuscript/check-list/index.vue index 76a751b..640932e 100644 --- a/src/views/material-center/components/finished-products/manuscript/check-list/index.vue +++ b/src/views/material-center/components/finished-products/manuscript/check-list/index.vue @@ -46,16 +46,15 @@ @selectAll="handleSelectAll" />
-
@@ -64,7 +63,7 @@