Merge branch 'dev' into ee-setup

Author: FalkWolsky

.github/workflows/sonarcloud.yml

@@ -30,3 +30,4 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}  # Needed to get PR information, if any
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
+          SONAR_SCANNER_OPTS: "-Dsonar.javascript.node.maxspace=8192 -Xmx8192m"

client/VERSION

@@ -1 +1 @@
-2.6.4
+2.6.5

client/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lowcoder-frontend",
-  "version": "2.6.4",
+  "version": "2.6.5",
   "type": "module",
   "private": true,
   "workspaces": [

client/packages/lowcoder-comps/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lowcoder-comps",
-  "version": "2.6.5",
+  "version": "2.6.6",
   "type": "module",
   "license": "MIT",
   "dependencies": {

client/packages/lowcoder-comps/src/comps/calendarComp/calendarComp.tsx

@@ -15,7 +15,10 @@ import {
   lightenColor,
   toHex,
   UnderlineCss,
-  EventModalStyleType
+  EventModalStyleType,
+  DateParser,
+  isValidColor,
+  Theme,
 } from "lowcoder-sdk";
 import styled from "styled-components";
 import dayjs from "dayjs";
@@ -27,6 +30,10 @@ import {
 } from "@fullcalendar/core";
 import { default as Form } from "antd/es/form";
 
+type Theme = typeof Theme;
+type EventModalStyleType = typeof EventModalStyleType;
+type CalendarStyleType = typeof CalendarStyleType;
+
 export const Wrapper = styled.div<{
   $editable?: boolean;
   $style?: CalendarStyleType;
@@ -1135,3 +1142,32 @@ export const viewClassNames = (info: ViewContentArg) => {
   return className;
 };
 
+export const formattedEvents = (events: EventType[], theme?: Theme) => {
+  return events.map((item: EventType) => {
+    return {
+      title: item.label,
+      label: item.label,
+      id: item.id,
+      start: dayjs(item.start, DateParser).format(),
+      end: dayjs(item.end, DateParser).format(),
+      allDay: item.allDay,
+      ...(item.resourceId ? { resourceId: item.resourceId } : {}),
+      ...(item.groupId ? { groupId: item.groupId } : {}),
+      backgroundColor: item.backgroundColor,
+      extendedProps: {   // Ensure color is in extendedProps
+        color: isValidColor(item.color || "") ? item.color : theme?.theme?.primary,
+        detail: item.detail,
+        titleColor: item.titleColor,
+        detailColor: item.detailColor,
+        titleFontWeight: item.titleFontWeight,
+        titleFontStyle: item.titleFontStyle,
+        detailFontWeight: item.detailFontWeight,
+        detailFontStyle: item.detailFontStyle,
+        animation: item?.animation,
+        animationDelay: item?.animationDelay,
+        animationDuration: item?.animationDuration,
+        animationIterationCount: item?.animationIterationCount
+      }
+    }
+  })
+}

client/packages/lowcoder-comps/src/comps/calendarComp/calendarConstants.tsx

@@ -96,6 +96,7 @@ export const KeyValueList = (props: {
   onDelete: (item: ReactNode, index: number) => void;
   isStatic?: boolean;
   indicatorForAll?: boolean;
+  allowDeletingAll?: boolean;
 }) => {
   return (
     <>
@@ -105,8 +106,8 @@ export const KeyValueList = (props: {
             {item}
             {!props.isStatic &&
               <DelIcon
-                onClick={() => props.list.length > 1 && props.onDelete(item, index)}
-                $forbidden={props.list.length === 1}
+                onClick={() => (props.allowDeletingAll || (!props.allowDeletingAll && props.list.length > 1)) && props.onDelete(item, index)}
+                $forbidden={!props.allowDeletingAll && props.list.length === 1}
               />
             }
           </KeyValueListItem>

client/packages/lowcoder-design/src/components/keyValueList.tsx

@@ -1,6 +1,6 @@
 {
   "name": "lowcoder-sdk",
-  "version": "2.6.6",
+  "version": "2.6.7",
   "type": "module",
   "files": [
     "src",

client/packages/lowcoder-sdk/package.json

@@ -54,10 +54,6 @@
     <script>
       window.global = window;
     </script>
-    <script
-      src="https://tag.clearbitscripts.com/v1/pk_dfbc0aeefb28dc63475b67134facf127/tags.js"
-      referrerPolicy="no-referrer"
-    ></script>
     <script async defer src="//js-eu1.hs-scripts.com/144574215.js" type="text/javascript" id="hs-script-loader"></script>
   </head>
   <body>

client/packages/lowcoder/index.html

@@ -1,6 +1,6 @@
 {
   "name": "lowcoder",
-  "version": "2.6.4",
+  "version": "2.6.5",
   "private": true,
   "type": "module",
   "main": "src/index.sdk.ts",
@@ -24,6 +24,7 @@
     "@fortawesome/free-regular-svg-icons": "^6.5.1",
     "@fortawesome/free-solid-svg-icons": "^6.5.1",
     "@fortawesome/react-fontawesome": "latest",
+    "@lottiefiles/dotlottie-react": "^0.13.0",
     "@manaflair/redux-batch": "^1.0.0",
     "@rjsf/antd": "^5.21.2",
     "@rjsf/core": "^5.21.2",