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)`

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

@@ -1,7 +1,7 @@
 import { trans } from "i18n/design";
 import React, { ReactNode, useContext } from "react";
 import styled from "styled-components";
-import { ReactComponent as Packup } from "icons/icon-Pack-up.svg";
+import { ReactComponent as Packup } from "icons/v1/icon-Pack-up.svg";
 import { labelCss } from "./Label";
 import { controlItem, ControlNode } from "./control";
 import { Tooltip } from "./toolTip";

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

@@ -1,5 +1,5 @@
 import styled from "styled-components";
-import { ReactComponent as close } from "icons/icon-flokclose.svg";
+import { ReactComponent as close } from "icons/v1/icon-flokclose.svg";
 import { ScrollBar } from "../components/ScrollBar";
 
 const Container = styled.div<{ $width: number }>`

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

@@ -1,8 +1,8 @@
 import * as React from "react";
 import { ReactNode } from "react";
 import styled, { css } from "styled-components";
-import { ReactComponent as jsIcon } from "icons/icon-Js-colors.svg";
-import { ReactComponent as jsIconGray } from "icons/icon-Js-Gray.svg";
+import { ReactComponent as jsIcon } from "icons/v1/icon-Js-colors.svg";
+import { ReactComponent as jsIconGray } from "icons/v1/icon-Js-Gray.svg";
 import { ToolTipLabel } from "components/toolTip";
 
 type ControlPlacement = "bottom" | "right" | "modal";

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

@@ -1,5 +1,5 @@
 import styled, { css } from "styled-components";
-import { ReactComponent as Folded } from "icons/icon-folded.svg";
+import { ReactComponent as Folded } from "icons/v1/icon-folded.svg";
 import { DataNode, TreeProps } from "antd/es/tree";
 import DirectoryTree from "antd/es/tree/DirectoryTree";
 

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-design/src/components/container.tsx

@@ -1,7 +1,7 @@
 import { trans } from "i18n/design";
 import { ReactNode } from "react";
 import styled from "styled-components";
-import { ReactComponent as ContainerDrag } from "icons/icon-container-drag.svg";
+import { ReactComponent as ContainerDrag } from "icons/v1/icon-container-drag.svg";
 
 type ContainerPlaceholderProps = {
   children?: ReactNode;

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

@@ -1,6 +1,6 @@
 import copy from "copy-to-clipboard";
 import styled from "styled-components";
-import { ReactComponent as Dcopy } from "icons/icon-copy.svg";
+import { ReactComponent as Dcopy } from "icons/v1/icon-copy.svg";
 import { trans } from "i18n/design";
 import { CSSProperties } from "react";
 import { messageInstance } from "./GlobalInstances";

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

@@ -1,5 +1,5 @@
 import { default as AntdSelect, SelectProps as AntdSelectProps } from "antd/es/select";
-import { ReactComponent as PackUpIcon } from "icons/icon-Pack-up.svg";
+import { ReactComponent as PackUpIcon } from "icons/v1/icon-Pack-up.svg";
 import styled from "styled-components";
 import React from "react";
 

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

@@ -1,5 +1,5 @@
 import styled from "styled-components";
-import { ReactComponent as Edit } from "icons/icon-text-edit.svg";
+import { ReactComponent as Edit } from "icons/v1/icon-text-edit.svg";
 import { CSSProperties, ReactNode, useEffect, useRef, useState } from "react";
 import { Input } from "../components/Input";
 import { InputProps, InputRef } from "antd/es/input";

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

@@ -11,7 +11,7 @@ import { CustomSelect } from "./customSelect";
 import { EllipsisTextCss, labelCss } from "./Label";
 import { ToolTipLabel } from "./toolTip";
 import styled from "styled-components";
-import { ReactComponent as Star } from "icons/icon-star.svg";
+import { ReactComponent as Star } from "icons/v1/icon-star.svg";
 import _ from "lodash";
 import { KeyValueList } from "./keyValueList";
 import { OptionsType, ValueFromOption } from "./Dropdown";

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

@@ -1,5 +1,5 @@
 import styled from "styled-components";
-import { ReactComponent as Bin } from "icons/icon-recycle-bin.svg";
+import { ReactComponent as Bin } from "icons/v1/icon-recycle-bin.svg";
 import { TacoButton } from "./button";
 import { ReactNode } from "react";
 import { BluePlusIcon } from "icons";

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

@@ -8,7 +8,7 @@ import React, { useState } from "react";
 import { CSS } from "@dnd-kit/utilities";
 import { SortableContext, useSortable, verticalListSortingStrategy } from "@dnd-kit/sortable";
 import { ConstructorToComp, MultiCompConstructor } from "lowcoder-core";
-import { ReactComponent as WarnIcon } from "icons/icon-warning-white.svg";
+import { ReactComponent as WarnIcon } from "icons/v1/icon-warning-white.svg";
 import { DndContext } from "@dnd-kit/core";
 import { restrictToVerticalAxis } from "@dnd-kit/modifiers";
 import { ActiveTextColor, GreyTextColor } from "constants/style";

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

@@ -1,5 +1,5 @@
 import { default as AntdInput, InputRef } from "antd/es/input";
-import { ReactComponent as MustFillStar } from "icons/icon-must-fill-star.svg";
+import { ReactComponent as MustFillStar } from "icons/v1/icon-must-fill-star.svg";
 import { trans } from "i18n/design";
 import { CSSProperties, Ref, useEffect, useRef, useState } from "react";
 import styled, { css } from "styled-components";

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

@@ -1,6 +1,6 @@
 import { default as Pagination, PaginationProps } from "antd/es/pagination";
 import styled, { css } from "styled-components";
-import { ReactComponent as PackUpIcon } from "icons/icon-Pack-up.svg";
+import { ReactComponent as PackUpIcon } from "icons/v1/icon-Pack-up.svg";
 
 const packUpIconCss = css`
   height: 24px;

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

@@ -3,7 +3,7 @@ import { default as AntdTooltip, TooltipProps } from "antd/es/tooltip";
 import { CSSProperties, ReactNode } from "react";
 import styled, { css } from "styled-components";
 import { labelCss } from "components/Label";
-import { ReactComponent as CloseIcon } from "icons/icon-close.svg";
+import { ReactComponent as CloseIcon } from "icons/v1/icon-close.svg";
 import { TooltipRenderProps } from "react-joyride";
 import { trans } from "i18n/design";