From f3d6877e716e95d2282e73daa15d4e30e243f7e9 Mon Sep 17 00:00:00 2001 From: arkohut <39525455+arkohut@users.noreply.github.com> Date: Mon, 14 Oct 2024 17:52:50 +0800 Subject: [PATCH] fix: do not show entity list when open page --- memos/crud.py | 4 ++-- web/src/routes/+page.svelte | 26 ++++++++++++-------------- 2 files changed, 14 insertions(+), 16 deletions(-) diff --git a/memos/crud.py b/memos/crud.py index 9006807..6fb11fd 100644 --- a/memos/crud.py +++ b/memos/crud.py @@ -497,7 +497,7 @@ async def vec_search( if start is not None and end is not None: sql_query += ( - " AND strftime('%s', entities.file_created_at) BETWEEN :start AND :end" + " AND strftime('%s', entities.file_created_at, 'utc') BETWEEN :start AND :end" ) params["start"] = str(start) params["end"] = str(end) @@ -588,7 +588,7 @@ async def list_entities( if start is not None and end is not None: query = query.filter( - func.strftime("%s", EntityModel.file_created_at).between( + func.strftime("%s", EntityModel.file_created_at, 'utc').between( str(start), str(end) ) ) diff --git a/web/src/routes/+page.svelte b/web/src/routes/+page.svelte index 7d61ebd..cc012bd 100644 --- a/web/src/routes/+page.svelte +++ b/web/src/routes/+page.svelte @@ -19,8 +19,8 @@ let showModal = false; let selectedImage = 0; - let startTimestamp = -1; - let endTimestamp = -1; + let startTimestamp: number | null = null; + let endTimestamp: number | null = null; let selectedLibraries: number[] = []; let searchResult: SearchResult | null = null; @@ -169,21 +169,19 @@ } function handleFiltersChange() { - if (searchString.trim()) { - searchItems( - searchString, - startTimestamp, - endTimestamp, - selectedLibraries, - Object.keys(selectedTags).filter((tag) => selectedTags[tag]), - Object.keys(selectedDates).filter((date) => selectedDates[date]), - false - ); - } + searchItems( + searchString, + startTimestamp, + endTimestamp, + selectedLibraries, + Object.keys(selectedTags).filter((tag) => selectedTags[tag]), + Object.keys(selectedDates).filter((date) => selectedDates[date]), + false + ); } $: { - if (startTimestamp !== -1 || endTimestamp !== -1 || selectedLibraries.length > 0) { + if (startTimestamp != null || endTimestamp != null || selectedLibraries.length > 0) { handleFiltersChange(); } }