Merge branch 'dev' into oauth-fe

FalkWolsky · web-flow · commit 8e14e7ba8d87 · 2023-10-06T20:23:54.000+02:00
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -6,15 +6,19 @@ updates:
     directory: "/server/api-service"
     schedule:
       interval: "monthly"
+    target-branch: "dev"
   - package-ecosystem: "npm"
     directory: "/server/node-service"
     schedule:
       interval: "monthly"
+    target-branch: "dev"
   - package-ecosystem: "npm"
     directory: "/client"
     schedule:
       interval: "monthly"
+    target-branch: "dev"
   - package-ecosystem: "docker"
     directory: "/deploy/docker"
     schedule:
       interval: "monthly"
+    target-branch: "dev"
diff --git 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}
         >
           <div className="event-time">{eventInfo.timeText}</div>
diff --git 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%;

Original file line number	Diff line number	Diff line change
`@@ -125,6 +125,7 @@ let CalendarBasicComp = (function () {`
`125`	`125`	`isList={isList}`
`126`	`126`	`bg={eventInfo.backgroundColor}`
`127`	`127`	`theme={theme?.theme}`
	`128`	`+ allDay={showAllDay}`
`128`	`129`	`$style={props.style}`
`129`	`130`	`>`
`130`	`131`	`<div className="event-time">{eventInfo.timeText}</div>`