From 6b85403297f7d35d25e0d2cb2788e42286d8ace4 Mon Sep 17 00:00:00 2001
From: ksbin1025 <ksbin1025@naver.com>
Date: Fri, 5 Nov 2021 19:19:47 +0900
Subject: [PATCH] more

---
 client/src/components/Calendar/AdminMonthly.js |  9 +++++++++
 client/src/components/Calendar/Monthly.js      | 13 ++++++++++++-
 client/src/scss/custom.scss                    |  6 ++++++
 3 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/client/src/components/Calendar/AdminMonthly.js b/client/src/components/Calendar/AdminMonthly.js
index e322455..f934f14 100644
--- a/client/src/components/Calendar/AdminMonthly.js
+++ b/client/src/components/Calendar/AdminMonthly.js
@@ -93,6 +93,11 @@ const AdminMonthly = () => {
                     const weekList = ["일", "월", "화", "수", "목", "금", "토"]
                     return weekList[date.dow]
                 }}
+                views={{
+                    dayGridMonth: {
+                        dayMaxEvents: 3
+                    }
+                }}
                 validRange={{
                     start: moment(initialDate).subtract(3, 'years').format('YYYY-MM[-01]'),
                     end: moment(initialDate).add(3, 'years').add(1, 'months').format('YYYY-MM[-01]')
@@ -128,6 +133,10 @@ const AdminMonthly = () => {
                 }}
                 timeZone="local"
                 events={scheduleList}
+                eventLimit={3}
+                moreLinkContent={function(arg) {
+                    return arg.shortText
+                }}
                 themeSystem='bootstrap'
                 height='78vh'
             />
diff --git a/client/src/components/Calendar/Monthly.js b/client/src/components/Calendar/Monthly.js
index 52da44d..d207abd 100644
--- a/client/src/components/Calendar/Monthly.js
+++ b/client/src/components/Calendar/Monthly.js
@@ -88,6 +88,11 @@ const Monthly = () => {
                     const weekList = ["일", "월", "화", "수", "목", "금", "토"]
                     return weekList[date.dow]
                 }}
+                views={{
+                    dayGridMonth: {
+                        dayMaxEvents: 3
+                    }
+                }}
                 validRange={{
                     start: moment(initialDate).subtract(3, 'years').format('YYYY-MM[-01]'),
                     end: moment(initialDate).add(3, 'years').add(1, 'months').format('YYYY-MM[-01]')
@@ -120,7 +125,13 @@ const Monthly = () => {
                 dateClick={({ dateStr }) => history.push(`/schedule/${dateStr}`)}
                 timeZone="local"
                 themeSystem='bootstrap'
-                eventLimit="3"
+                eventLimit={3}
+                moreLinkClick={function(arg) {
+                    console.log("click..?",arg)
+                }}
+                moreLinkContent={function(arg) {
+                    return arg.shortText
+                }}
                 height='80vh'
             />
             <DatePickerModal initialDate={initialDate} changeDate={changeDate} setChangeDate={setChangeDate} show={show} setShow={setShow} />
diff --git a/client/src/scss/custom.scss b/client/src/scss/custom.scss
index 0a3291a..c2a15eb 100644
--- a/client/src/scss/custom.scss
+++ b/client/src/scss/custom.scss
@@ -145,6 +145,10 @@ button {
         color: #FF0000;
     }
 
+    & .fc-more-popover {
+        display: none;
+    }
+
     & .fc-dayGridDay-view {
         display: none;
     }
@@ -155,6 +159,8 @@ button {
         & .fc-event-title {
             display: block;
             text-overflow: ellipsis;
+            height: 15px;
+            padding: 0;
         }
     }
 
-- 
GitLab