From 9c9af7959e8f855776a41efb3fb1563d622fa90c Mon Sep 17 00:00:00 2001 From: wasserpanther Date: Thu, 21 Sep 2023 14:36:54 +0200 Subject: [PATCH] make `showAllDay` work in Day/Week/Month view --- .../lowcoder-comps/src/comps/calendarComp/calendarComp.tsx | 1 + .../src/comps/calendarComp/calendarConstants.tsx | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/client/packages/lowcoder-comps/src/comps/calendarComp/calendarComp.tsx b/client/packages/lowcoder-comps/src/comps/calendarComp/calendarComp.tsx index 0b3dc5bdb..37c15507f 100644 --- a/client/packages/lowcoder-comps/src/comps/calendarComp/calendarComp.tsx +++ b/client/packages/lowcoder-comps/src/comps/calendarComp/calendarComp.tsx @@ -125,6 +125,7 @@ let CalendarBasicComp = (function () { isList={isList} bg={eventInfo.backgroundColor} theme={theme?.theme} + allDay={showAllDay} $style={props.style} >
{eventInfo.timeText}
diff --git a/client/packages/lowcoder-comps/src/comps/calendarComp/calendarConstants.tsx b/client/packages/lowcoder-comps/src/comps/calendarComp/calendarConstants.tsx index 907780f74..0e33adf1e 100644 --- a/client/packages/lowcoder-comps/src/comps/calendarComp/calendarConstants.tsx +++ b/client/packages/lowcoder-comps/src/comps/calendarComp/calendarConstants.tsx @@ -388,7 +388,7 @@ export const Wrapper = styled.div<{ .fc-scrollgrid-liquid > tbody { & > tr:nth-of-type(2) { - display: none; + display: ${(props) => props.allDay && 1}; } } .fc .fc-timegrid-slot-label-cushion { @@ -639,6 +639,7 @@ export const Event = styled.div<{ bg: string; theme: Object; isList: boolean; + allDay: boolean; $style: CalendarStyleType; }>` height: 100%;