Skip to content

Commit bac8229

Browse files
committed
fix 日历获取日记时全部获取的问题
1 parent 6a611b1 commit bac8229

4 files changed

Lines changed: 11 additions & 11 deletions

File tree

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,3 +25,5 @@ yarn-error.log*
2525

2626
archive
2727
dev-dist
28+
NUL
29+
nul

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"type": "module",
55
"description": "一句话概括你的一天",
66
"version": "9.5.0",
7-
"dateModify": "2026.04.29",
7+
"dateModify": "2026.05.08",
88
"dateInit": "2018.08.14",
99
"author": {
1010
"email": "kylebing@163.com",

src/view/Calendar/CalendarDiary.vue

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -133,8 +133,8 @@ const formSearch = ref<DiarySearchParamsForCalendar>({
133133
categories: '',
134134
filterShared: 0, // 1 是筛选,0 是不筛选
135135
136-
dateStart: Moment().startOf('year').format('YYYY-MM-DD'), // 2025-01-01
137-
dateEnd: Moment().endOf('year').format('YYYY-MM-DD') // 2025-12-31
136+
timeStart: Moment().startOf('year').format('YYYY-MM-DD'),
137+
timeEnd: Moment().endOf('year').format('YYYY-MM-DD'),
138138
})
139139
const isLoading = ref(false)
140140
@@ -223,12 +223,10 @@ function getDiaryListOfDay(day: CalendarDay) {
223223
focusedDayDiaries.value = [] // 清空列表
224224
diaryApi
225225
.listAll({
226-
dateStart: Moment(day.date).format('YYYY-MM-DD'),
227-
dateEnd: Moment(day.date).format('YYYY-MM-DD'),
226+
timeStart: Moment(day.date).startOf('day').format('YYYY-MM-DD HH:mm:ss'),
227+
timeEnd: Moment(day.date).endOf('day').format('YYYY-MM-DD HH:mm:ss'),
228228
keywords: JSON.stringify(projectStore.keywords),
229229
categories: JSON.stringify(projectStore.filteredCategories),
230-
timeStart: projectStore.dateFilterTimeStart || undefined,
231-
timeEnd: projectStore.dateFilterTimeEnd || undefined,
232230
filterShared: projectStore.isFilterShared ? 1 : 0,
233231
})
234232
.then(res => {
@@ -346,8 +344,8 @@ function onPageChange(data: any) {
346344
// 可选:根据当前日期范围更新搜索参数
347345
function updateDateRangeForSearch() {
348346
if (minDate.value && maxDate.value) {
349-
formSearch.value.dateStart = Moment(minDate.value).format('YYYY-MM-DD')
350-
formSearch.value.dateEnd = Moment(maxDate.value).format('YYYY-MM-DD')
347+
formSearch.value.timeStart = Moment(minDate.value).startOf('day').format('YYYY-MM-DD HH:mm:ss')
348+
formSearch.value.timeEnd = Moment(maxDate.value).endOf('day').format('YYYY-MM-DD HH:mm:ss')
351349
352350
// 可选择为新范围重新加载日记数据
353351
getAllShowingCalendarDiaries()

src/view/DiaryList/Diary.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,8 @@ export interface DiarySearchParams {
7474
}
7575

7676
export interface DiarySearchParamsForCalendar extends DiarySearchParams {
77-
dateStart: string, // date string, format: YYYY-MM-DD
78-
dateEnd: string, // date string, format: YYYY-MM-DD
77+
timeStart: string, // date string, format: YYYY-MM-DD
78+
timeEnd: string, // date string, format: YYYY-MM-DD
7979
}
8080

8181
export interface DiarySubmitEntity{

0 commit comments

Comments
 (0)