localnet/localhost-front
10
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' of http://192.168.0.251:3000/localnet/localhost-front

Browse Source
This commit is contained in:
dyhj625 2025-04-03 10:07:07 +09:00
commit 3cf6aeab9a
2 changed files with 14 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/components/main/MainEventCalendar.vue
View File

@ -156,7 +156,7 @@
monthBirthdayPartyList.value = []; monthBirthdayPartyList.value = [];
monthDinnerList.value = []; monthDinnerList.value = [];
monthTeaTimeList.value = []; monthTeaTimeList.value = [];
monthTeaTimeList.value = []; monthWorkShopList.value = [];
if (res?.eventList?.length) { if (res?.eventList?.length) {
res.eventList.forEach(item => { res.eventList.forEach(item => {
@ -520,6 +520,10 @@
}, },
}); });
const handleWheelEvent = e => {
handleCloseModal();
};
// 달력 뷰 변경 감지 (월 변경 시 데이터 다시 가져오기) // 달력 뷰 변경 감지 (월 변경 시 데이터 다시 가져오기)
watch( watch(
() => fullCalendarRef.value?.getApi().currentData.viewTitle, () => fullCalendarRef.value?.getApi().currentData.viewTitle,
@ -551,35 +555,31 @@
await fetchEventList(param); await fetchEventList(param);
useFilterEventList(month, day); useFilterEventList(month, day);
// 이벤트모달 외부 클릭 감지 // 스크롤 감지 이벤트 리스너
// document.addEventListener('click', e => { window.addEventListener('wheel', handleWheelEvent);
// if (showModal.value && !e.target.closest('.event-modal') && !e.target.closest('.fc-daygrid-day')) {
// showModal.value = false;
// }
// });
}); });
</script> </script>
<style> <style scoped>
.fc-h-event { ::v-deep(.fc-h-event) {
background-color: transparent; background-color: transparent;
} }
.event-modal { ::v-deep(.event-modal) {
padding: 8px; padding: 8px;
border: 1px solid #ddd; border: 1px solid #ddd;
} }
.event-icon-select:hover { ::v-deep(.event-icon-select:hover) {
transform: scale(1.1); transform: scale(1.1);
transition: transform 0.2s; transition: transform 0.2s;
} }
/* 이벤트 모달 노출 시 텍스트 선택 방지 */ /* 이벤트 모달 노출 시 텍스트 선택 방지 */
.fc-daygrid-day { ::v-deep(.fc-daygrid-day) {
user-select: none; user-select: none;
} }
.fc-daygrid-day-events { ::v-deep(.fc-daygrid-day-events) {
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: wrap;
justify-content: center; justify-content: center;

7
src/components/main/MainEventList.vue
View File

@ -22,18 +22,13 @@
/> />
</div> </div>
</div> </div>
<div <div class="col-9 mx-0 px-0 d-flex align-items-center">
v-if="category.CMNCODVAL === 300201 || category.CMNCODVAL === 300202"
class="col-9 mx-0 px-0 d-flex align-items-center"
>
<template v-if="category.CMNCODVAL === 300201"> <template v-if="category.CMNCODVAL === 300201">
<MainMemberProfile :members="birthdayList" :baseUrl="baseUrl" /> <MainMemberProfile :members="birthdayList" :baseUrl="baseUrl" />
</template> </template>
<template v-if="category.CMNCODVAL === 300202"> <template v-if="category.CMNCODVAL === 300202">
<MainMemberProfile :members="vacationList" :baseUrl="baseUrl" /> <MainMemberProfile :members="vacationList" :baseUrl="baseUrl" />
</template> </template>
</div>
<div v-else class="col-9 mx-0 px-0 d-flex align-items-center">
<template v-if="category.CMNCODVAL === 300203"> <template v-if="category.CMNCODVAL === 300203">
<MainEventBoard :place="birthdayPartyList[0].LOCEVTPLC" :time="birthdayPartyList[0].LOCEVTTME" /> <MainEventBoard :place="birthdayPartyList[0].LOCEVTPLC" :time="birthdayPartyList[0].LOCEVTTME" />
</template> </template>