Merge branch 'dev' into fix/expire

Author: GoldenAnt

.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

client/VERSION

@@ -1 +1 @@
-2.4.4
+2.4.5

client/packages/lowcoder-comps/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lowcoder-comps",
-  "version": "2.4.10",
+  "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/Collapase.tsx

@@ -1,7 +1,7 @@
 import { default as AntdCollapse, CollapseProps } from "antd/es/collapse";
-import { ReactComponent as UnFold } from "icons/icon-unfold.svg";
-import { ReactComponent as Folded } from "icons/icon-folded.svg";
-import { ReactComponent as Omit } from "icons/icon-omit.svg";
+import { ReactComponent as UnFold } from "icons/v1/icon-unfold.svg";
+import { ReactComponent as Folded } from "icons/v1/icon-folded.svg";
+import { ReactComponent as Omit } from "icons/v1/icon-omit.svg";
 import styled, { css } from "styled-components";
 import React, { ReactNode } from "react";
 

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

@@ -1,6 +1,6 @@
 import { ButtonProps } from "antd/es/button";
 import { default as AntdModal, ModalFuncProps, ModalProps as AntdModalProps } from "antd/es/modal";
-import { ReactComponent as PackUpIcon } from "icons/icon-Pack-up.svg";
+import { ReactComponent as PackUpIcon } from "icons/v1/icon-Pack-up.svg";
 import React, { ReactNode, useState } from "react";
 import styled from "styled-components";
 import { TacoButtonType, TacoButton } from "components/button";

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/Menu.tsx

@@ -1,7 +1,7 @@
 import { default as AntdMenu, MenuProps, SubMenuProps } from "antd/es/menu";
 import { NormalMenuIconColor, TabActiveColor } from "constants/style";
-import { ReactComponent as AddIcon } from "icons/icon-add.svg";
-import { ReactComponent as RecycleBinIcon } from "icons/icon-recycle-bin.svg";
+import { ReactComponent as AddIcon } from "icons/v1/icon-add.svg";
+import { ReactComponent as RecycleBinIcon } from "icons/v1/icon-recycle-bin.svg";
 import styled from "styled-components";
 
 const MenuItemWrapper = styled.div`

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

@@ -56,6 +56,8 @@ interface IProps {
   };
   $hideplaceholder?: boolean;
   hideScrollbar?: boolean;
+  prefixNode?: React.ReactNode;
+  suffixNode?: React.ReactNode;
 }
 
 export const ScrollBar = ({
@@ -65,6 +67,8 @@ export const ScrollBar = ({
   scrollableNodeProps,
   hideScrollbar = false,
   $hideplaceholder = false,
+  prefixNode,
+  suffixNode,
   ...otherProps
 }: IProps) => {
   const height = style?.height ?? '100%';
@@ -73,12 +77,24 @@ export const ScrollBar = ({
 
   return hideScrollbar ? (
     <ScrollBarWrapper className={className}>
+      {prefixNode}
       {children}
+      {suffixNode}
     </ScrollBarWrapper>
   ) : (
     <ScrollBarWrapper className={className}>
       <SimpleBar style={combinedStyle} scrollableNodeProps={scrollableNodeProps} {...otherProps}>
-        {children}
+        {({ scrollableNodeProps, contentNodeProps }) => {
+          return (
+            <div {...scrollableNodeProps as any}>
+              {prefixNode}
+              <div {...contentNodeProps as any}>
+                {children}
+              </div>
+              {suffixNode}
+            </div>
+          );
+        }}
       </SimpleBar>
     </ScrollBarWrapper>
   );

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

@@ -1,6 +1,6 @@
 import styled from "styled-components";
 import { default as Input, InputProps } from "antd/es/input";
-import { ReactComponent as Icon } from "icons/icon-Search.svg";
+import { ReactComponent as Icon } from "icons/v1/icon-Search.svg";
 import React, { CSSProperties } from "react";
 
 const SearchInput = styled(Input)`