fix: fetch memo with filter (#346)

This commit is contained in:
boojack 2022-10-27 07:53:40 +08:00 committed by GitHub
parent 9705406b82
commit cb2e1ae355
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 1 deletions

View File

@ -103,6 +103,15 @@ const MemoList = () => {
}
}, [query]);
useEffect(() => {
if (isFetching || isComplete) {
return;
}
if (sortedMemos.length < DEFAULT_MEMO_LIMIT) {
handleFetchMoreClick();
}
}, [isFetching, isComplete, query, sortedMemos.length]);
const handleFetchMoreClick = async () => {
try {
const fetchedMemos = await memoService.fetchMemos(DEFAULT_MEMO_LIMIT, memos.length);

View File

@ -42,7 +42,8 @@ const getStateFromLocation = () => {
state.query.tag = urlParams.get("tag") ?? undefined;
state.query.type = (urlParams.get("type") as MemoSpecType) ?? undefined;
state.query.text = urlParams.get("text") ?? undefined;
state.query.shortcutId = Number(urlParams.get("shortcutId")) ?? undefined;
const shortcutIdStr = urlParams.get("shortcutId");
state.query.shortcutId = shortcutIdStr ? Number(shortcutIdStr) : undefined;
const from = parseInt(urlParams.get("from") ?? "0");
const to = parseInt(urlParams.get("to") ?? "0");
if (to > from && to !== 0) {