From 513f56e2b311538489a85fa5da627e8389eff8b6 Mon Sep 17 00:00:00 2001 From: cutestnekoaqua Date: Sun, 15 Jan 2023 16:49:23 +0100 Subject: [PATCH] =?UTF-8?q?=F0=9F=8E=A8=20Improve=20structure=20/=20format?= =?UTF-8?q?=20of=20MkPagination.vue?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/client/src/components/MkPagination.vue | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/client/src/components/MkPagination.vue b/packages/client/src/components/MkPagination.vue index 95ea9f8f3..3327a6796 100644 --- a/packages/client/src/components/MkPagination.vue +++ b/packages/client/src/components/MkPagination.vue @@ -93,7 +93,7 @@ const init = async (): Promise => { fetching.value = true; const params = props.pagination.params ? isRef(props.pagination.params) ? props.pagination.params.value : props.pagination.params : {}; await os.api(props.pagination.endpoint, { - ...params, + ...(params as object), limit: props.pagination.noPaging ? (props.pagination.limit || 10) : (props.pagination.limit || 10) + 1, }).then(res => { for (let i = 0; i < res.length; i++) { @@ -132,10 +132,10 @@ const reload = (): void => { init(); }; -const refresh = async (): void => { +const refresh = async (): Promise => { const params = props.pagination.params ? isRef(props.pagination.params) ? props.pagination.params.value : props.pagination.params : {}; await os.api(props.pagination.endpoint, { - ...params, + ...(params as object), limit: items.value.length + 1, offset: 0, }).then(res => { @@ -167,7 +167,7 @@ const fetchMore = async (): Promise => { backed.value = true; const params = props.pagination.params ? isRef(props.pagination.params) ? props.pagination.params.value : props.pagination.params : {}; await os.api(props.pagination.endpoint, { - ...params, + ...(params as object), limit: SECOND_FETCH_LIMIT + 1, ...(props.pagination.offsetMode ? { offset: offset.value, @@ -208,7 +208,7 @@ const fetchMoreAhead = async (): Promise => { moreFetching.value = true; const params = props.pagination.params ? isRef(props.pagination.params) ? props.pagination.params.value : props.pagination.params : {}; await os.api(props.pagination.endpoint, { - ...params, + ...(params as object), limit: SECOND_FETCH_LIMIT + 1, ...(props.pagination.offsetMode ? { offset: offset.value,