Skip to content

Commit 233c56a

Browse files
iamfaraniamfaran
committed
Merge branch 'dev' of github.com:lowcoder-org/lowcoder into dev
2 parents d2f618f + f9f6a70 commit 233c56a

File tree

66 files changed

+1965
-556
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

66 files changed

+1965
-556
lines changed

‎.github/workflows/sonarcloud.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,3 +30,4 @@ jobs:
3030
env:
3131
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any
3232
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
33+
SONAR_SCANNER_OPTS: "-Dsonar.javascript.node.maxspace=8192 -Xmx8192m"

‎client/VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.6.4
1+
2.6.5

‎client/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "lowcoder-frontend",
3-
"version": "2.6.4",
3+
"version": "2.6.5",
44
"type": "module",
55
"private": true,
66
"workspaces": [

‎client/packages/lowcoder-comps/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "lowcoder-comps",
3-
"version": "2.6.5",
3+
"version": "2.6.6",
44
"type": "module",
55
"license": "MIT",
66
"dependencies": {

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

Lines changed: 83 additions & 94 deletions
Large diffs are not rendered by default.

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

Lines changed: 37 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,10 @@ import {
1515
lightenColor,
1616
toHex,
1717
UnderlineCss,
18-
EventModalStyleType
18+
EventModalStyleType,
19+
DateParser,
20+
isValidColor,
21+
Theme,
1922
} from "lowcoder-sdk";
2023
import styled from "styled-components";
2124
import dayjs from "dayjs";
@@ -27,6 +30,10 @@ import {
2730
} from "@fullcalendar/core";
2831
import { default as Form } from "antd/es/form";
2932

33+
type Theme = typeof Theme;
34+
type EventModalStyleType = typeof EventModalStyleType;
35+
type CalendarStyleType = typeof CalendarStyleType;
36+
3037
export const Wrapper = styled.div<{
3138
$editable?: boolean;
3239
$style?: CalendarStyleType;
@@ -1135,3 +1142,32 @@ export const viewClassNames = (info: ViewContentArg) => {
11351142
return className;
11361143
};
11371144

1145+
export const formattedEvents = (events: EventType[], theme?: Theme) => {
1146+
return events.map((item: EventType) => {
1147+
return {
1148+
title: item.label,
1149+
label: item.label,
1150+
id: item.id,
1151+
start: dayjs(item.start, DateParser).format(),
1152+
end: dayjs(item.end, DateParser).format(),
1153+
allDay: item.allDay,
1154+
...(item.resourceId ? { resourceId: item.resourceId } : {}),
1155+
...(item.groupId ? { groupId: item.groupId } : {}),
1156+
backgroundColor: item.backgroundColor,
1157+
extendedProps: { // Ensure color is in extendedProps
1158+
color: isValidColor(item.color || "") ? item.color : theme?.theme?.primary,
1159+
detail: item.detail,
1160+
titleColor: item.titleColor,
1161+
detailColor: item.detailColor,
1162+
titleFontWeight: item.titleFontWeight,
1163+
titleFontStyle: item.titleFontStyle,
1164+
detailFontWeight: item.detailFontWeight,
1165+
detailFontStyle: item.detailFontStyle,
1166+
animation: item?.animation,
1167+
animationDelay: item?.animationDelay,
1168+
animationDuration: item?.animationDuration,
1169+
animationIterationCount: item?.animationIterationCount
1170+
}
1171+
}
1172+
})
1173+
}

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,7 @@ export const KeyValueList = (props: {
9696
onDelete: (item: ReactNode, index: number) => void;
9797
isStatic?: boolean;
9898
indicatorForAll?: boolean;
99+
allowDeletingAll?: boolean;
99100
}) => {
100101
return (
101102
<>
@@ -105,8 +106,8 @@ export const KeyValueList = (props: {
105106
{item}
106107
{!props.isStatic &&
107108
<DelIcon
108-
onClick={() => props.list.length > 1 && props.onDelete(item, index)}
109-
$forbidden={props.list.length === 1}
109+
onClick={() => (props.allowDeletingAll || (!props.allowDeletingAll && props.list.length > 1)) && props.onDelete(item, index)}
110+
$forbidden={!props.allowDeletingAll && props.list.length === 1}
110111
/>
111112
}
112113
</KeyValueListItem>

‎client/packages/lowcoder-sdk/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "lowcoder-sdk",
3-
"version": "2.6.6",
3+
"version": "2.6.7",
44
"type": "module",
55
"files": [
66
"src",

‎client/packages/lowcoder/index.html

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,10 +54,6 @@
5454
<script>
5555
window.global = window;
5656
</script>
57-
<script
58-
src="https://tag.clearbitscripts.com/v1/pk_dfbc0aeefb28dc63475b67134facf127/tags.js"
59-
referrerPolicy="no-referrer"
60-
></script>
6157
<script async defer src="//js-eu1.hs-scripts.com/144574215.js" type="text/javascript" id="hs-script-loader"></script>
6258
</head>
6359
<body>

‎client/packages/lowcoder/package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "lowcoder",
3-
"version": "2.6.4",
3+
"version": "2.6.5",
44
"private": true,
55
"type": "module",
66
"main": "src/index.sdk.ts",
@@ -24,6 +24,7 @@
2424
"@fortawesome/free-regular-svg-icons": "^6.5.1",
2525
"@fortawesome/free-solid-svg-icons": "^6.5.1",
2626
"@fortawesome/react-fontawesome": "latest",
27+
"@lottiefiles/dotlottie-react": "^0.13.0",
2728
"@manaflair/redux-batch": "^1.0.0",
2829
"@rjsf/antd": "^5.21.2",
2930
"@rjsf/core": "^5.21.2",

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy