Merge branch 'dev' into private-npm-repositories

Author: FalkWolsky

.gitignore

@@ -14,4 +14,5 @@ application-lowcoder.yml
 application-debug.yaml
 application-dev-localhost.yaml
 .vscode/settings.json
-.vscode/launch.json
+.vscode/launch.json
+server/api-service/lowcoder-server/src/main/resources/application-local-dev.yaml

README.md

@@ -90,7 +90,7 @@ And we mean it... Day by day!
 ## 💻 Deployment Options
 [![Deploy to AWS using Stitch](https://img.shields.io/badge/deploy_with-Stitch-%23E369F7?logo=amazonaws&color=%23E369F7)](https://deploy.stitch.tech/lowcoder/lowcoder)
 
-[![Deploy in minutes on Elest.io](https://raw.githubusercontent.com/elestio-examples/element/main/deploy-on-elestio.png)](https://elest.io/open-source/lowcoder)
+[![Deploy to Elestio](https://img.shields.io/badge/Deploy_to-Elestio-%23E369F7?color=orange)](https://elest.io/open-source/lowcoder)
 
 You can access Lowcoder from [cloud-hosted version](https://app.lowcoder.cloud/) at any time, or use the following resources for self-host Lowcoder on different platforms:
 - [Docker](https://docs.lowcoder.cloud/lowcoder-documentation/setup-and-run/self-hosting)
@@ -110,4 +110,4 @@ Like ...  [@Darkjamin](https://github.com/Darkjamin), [@spacegoats-io](https://g
 
 ## Intro Video
 
-[![Watch the video](https://i.ytimg.com/vi/s4ltAqS0hzM/maxresdefault.jpg?sqp=-oaymwEmCIAKENAF8quKqQMa8AEB-AH-CYAC0AWKAgwIABABGD0gSShyMA8=&rs=AOn4CLAlPOIFdtauythoBKNPXhi6XGwlDQ)](https://youtu.be/s4ltAqS0hzM?feature=shared)
+[![Watch the video](https://i.ytimg.com/vi/s4ltAqS0hzM/maxresdefault.jpg?sqp=-oaymwEmCIAKENAF8quKqQMa8AEB-AH-CYAC0AWKAgwIABABGD0gSShyMA8=&rs=AOn4CLAlPOIFdtauythoBKNPXhi6XGwlDQ)](https://youtu.be/s4ltAqS0hzM?feature=shared)

client/package.json

@@ -80,7 +80,7 @@
     "chalk": "4",
     "flag-icons": "^7.2.1",
     "number-precision": "^1.6.0",
-    "posthog-js": "^1.144.2",
+    "posthog-js": "^1.155.4",
     "react-countup": "^6.5.3",
     "react-player": "^2.11.0",
     "resize-observer-polyfill": "^1.5.1",

client/packages/lowcoder-comps/package.json

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

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

@@ -79,7 +79,7 @@ let childrenMap: any = {
   resourcesEvents: jsonValueExposingStateControl("resourcesEvents", resourcesEventsDefaultData),
   resources: jsonValueExposingStateControl("resources", resourcesDefaultData),
   resourceName: withDefault(StringControl, trans("calendar.resourcesDefault")),
-  onEvent: CalendarEventHandlerControl,
+  onEvent: CalendarEventHandlerControl ? CalendarEventHandlerControl : ChangeEventHandlerControl,
   // onDropEvent: safeDragEventHandlerControl,
   editable: withDefault(BoolControl, true),
   showEventTime: withDefault(BoolControl, true),
@@ -124,10 +124,10 @@ let CalendarBasicComp = (function () {
     currentPremiumView?: string; 
   }, dispatch: any) => {
 
-  const comp = useContext(EditorContext).getUICompByName(
-    useContext(CompNameContext)
+    const comp = useContext(EditorContext).getUICompByName(
+      useContext(CompNameContext)
     );
-    const onEventVal = comp?.toJsonValue().comp.onEvent;
+    const onEventVal = comp?.toJsonValue()?.comp?.onEvent;
 
 
     const theme = useContext(ThemeContext);

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

@@ -235,7 +235,7 @@ export function Dropdown<T extends OptionsType>(props: DropdownProps<T>) {
         <SegmentedWrapper $placement={placement}>
           <Segmented
             block={true}
-            onChange={(value) => props.onChange(value.toString())}
+            onChange={(value) => props.onChange(String(value))}
             defaultValue={props.defaultValue}
             value={props.value}
             options={props.options as any}

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

@@ -181,7 +181,7 @@ const TacoButton = forwardRef(
     props: Omit<ButtonProps, "type"> & {
       buttonType?: TacoButtonType;
     },
-    ref: React.Ref<HTMLElement>
+    ref: React.Ref<HTMLButtonElement>
   ) => {
     const { buttonType, ...restProps } = props;
     let loadingBackground;

client/packages/lowcoder/package.json

@@ -37,7 +37,7 @@
     "@types/react-test-renderer": "^18.0.0",
     "@types/react-virtualized": "^9.21.21",
     "animate.css": "^4.1.1",
-    "antd": "5.13.2",
+    "antd": "^5.20.0",
     "axios": "^1.6.2",
     "buffer": "^6.0.3",
     "clsx": "^2.0.0",

client/packages/lowcoder/src/api/subscriptionApi.ts

@@ -25,7 +25,7 @@ export type ResponseType = {
   response: any;
 };
 
-const apiUrl = "https://flow.lowcoder.cloud/webhook/secure";
+const apiUrl = "http://localhost:8080/api/flow";
 const authHeader = "96a99c7b-3758-4c48-b4b1-a8cbf59e7d6c";
 
 const currentPage = 1;
@@ -41,7 +41,7 @@ const getAxiosInstance = (clientSecret?: string) => {
 
   const headers: Record<string, string> = {
     "Content-Type": "application/json",
-    "Lowcoder-Token": authHeader,
+    // "Lowcoder-Token": authHeader,
   }
 
   const apiRequestConfig: AxiosRequestConfig = {
@@ -55,13 +55,12 @@ const getAxiosInstance = (clientSecret?: string) => {
 
 class SubscriptionApi extends Api {
 
-  static async createCustomer(body: Customer): Promise<any> {
+  static async createCustomer(body: any): Promise<any> {
     console.log("createCustomerCall", body);
 
     let response;
     try {
       response = await getAxiosInstance().request({
-        url: '/create-customer',
         method: "POST",
         withCredentials: true,
         data: body,

client/packages/lowcoder/src/app.tsx

@@ -265,6 +265,7 @@ class AppIndex extends React.Component<AppIndexProps, any> {
               content={trans('productDesc')}
             />,
             <link
+              key="iframely"
               rel="iframely"
               type="text/html"
               href={window.location.href}