Merge branch 'main' into next

This commit is contained in:
nocobase[bot] 2024-10-14 09:01:20 +00:00
commit 45f7a9bc7c

View File

@ -325,7 +325,7 @@ const usePaginationProps = (pagination1, pagination2) => {
}, },
}; };
} }
}, [pagination, t, showTotal]); }, [pagination, t, showTotal, field.value?.length]);
if (pagination2 === false) { if (pagination2 === false) {
return false; return false;
@ -333,7 +333,6 @@ const usePaginationProps = (pagination1, pagination2) => {
if (!pagination2 && pagination1 === false) { if (!pagination2 && pagination1 === false) {
return false; return false;
} }
return result.total <= result.pageSize ? false : result; return result.total <= result.pageSize ? false : result;
}; };