diff --git a/src/components/Journal/JournalCalendar.vue b/src/components/Journal/JournalCalendar.vue index 8336c5a..1ebfd18 100644 --- a/src/components/Journal/JournalCalendar.vue +++ b/src/components/Journal/JournalCalendar.vue @@ -5,8 +5,11 @@ :is-dark="appStore.isDark" class="journal-calendar card-item"/> - +
+ +
@@ -35,6 +38,7 @@ const dailyInfo = reactive({ }) const updateInfo = () => { + journalStore.dateJournalList = [] getCalendarMoveDate() getCalendarAttrDates() } @@ -42,7 +46,7 @@ const updateInfo = () => { const getCalendarMoveDate = () => { const recordLength = journalStore.journalList.length if (recordLength > 0) { - journalStore.currentJournal = getJournalDay(formatDate(new Date())) + journalStore.dateJournalList = getJournalDay(formatDate(new Date())) } } @@ -54,7 +58,7 @@ const getCalendarAttrDates = () => { dates: new Date() }) - const dateList = journalStore.journalList.map((item) => item.date) + const dateList = journalStore.journalList.map((item) => formatDate(item.date)) dailyInfo.attrs.push({ dot: 'red', dates: [...new Set(dateList)] @@ -66,12 +70,11 @@ const getCalendarAttrDates = () => { * @param day 日期 */ const dateClick = (day: CalendarDay) => { - journalStore.currentJournal = getJournalDay(formatDate(day.date)) + journalStore.dateJournalList = getJournalDay(formatDate(day.date)) } -const getJournalDay = (date: string): IJournal => { - return journalStore.journalList.find((item) => formatDate(item.date) === date) - || journalStore.getEmptyJournal() +const getJournalDay = (date: string): IJournal[] => { + return journalStore.journalList.filter((item) => formatDate(item.date) === date) || [] } /** @@ -96,5 +99,12 @@ const changeMonthClick = async (value) => { .journal-calendar { width: 100%; } + + .journal-list { + width: 100%; + display: flex; + flex-direction: column; + gap: 1vh; + } } diff --git a/src/store/journal.ts b/src/store/journal.ts index d266002..9fe4d99 100644 --- a/src/store/journal.ts +++ b/src/store/journal.ts @@ -25,6 +25,7 @@ export const useJournalStore = defineStore('journal', { imageUrl: '', videoUrl: '' } as IJournal, + dateJournalList: [] as IJournal[], journalImagePath: ImagePathEnum.JOURNAL, journalVideoPath: ImagePathEnum.JOURNAL, journalDialog: {