mirror of
https://github.com/nocobase/nocobase
synced 2024-11-15 07:15:36 +00:00
Merge branch 'main' into next
This commit is contained in:
commit
45f7a9bc7c
@ -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;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user