Merge branch 'lowcoder-org:main' into main

Author: aaron1604

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

@@ -71,23 +71,29 @@ const SelectWrapper = styled.div<{ border?: boolean }>`
   }
 `;
 
-export type CustomSelectProps = {
+export interface CustomSelectProps extends AntdSelectProps {
   children?: JSX.Element | React.ReactNode;
-  innerRef?: React.Ref<HTMLDivElement> | undefined;
   border?: boolean;
 };
 
-function CustomSelect(props: CustomSelectProps & AntdSelectProps) {
+interface CustomSelectInterface extends React.ForwardRefExoticComponent<
+  CustomSelectProps & React.RefAttributes<HTMLDivElement>
+> {
+  Option: any;
+}
+const CustomSelect = React.forwardRef<HTMLDivElement, CustomSelectProps>((
+  props,
+  ref,
+) => {
   const {
     children,
-    innerRef,
     className,
     border,
     popupClassName = "custom-ant-select-dropdown",
     ...restProps
   } = props;
   return (
-    <SelectWrapper className={className} ref={innerRef} border={border}>
+    <SelectWrapper className={className} ref={ref} border={border}>
       <AntdSelect
         popupClassName={popupClassName}
         popupMatchSelectWidth={false}
@@ -96,9 +102,10 @@ function CustomSelect(props: CustomSelectProps & AntdSelectProps) {
       >
         {children}
       </AntdSelect>
+      <div></div>
     </SelectWrapper>
   );
-}
+}) as CustomSelectInterface;
 
 CustomSelect.Option = AntdSelect.Option;
 export { CustomSelect };

client/packages/lowcoder-design/src/icons/icon-responsive-layout-comp.svg

@@ -291,3 +291,5 @@ export { ReactComponent as TimeLineIcon } from "icons/icon-timeline-comp.svg"
 export { ReactComponent as LottieIcon } from "icons/icon-lottie.svg";
 export { ReactComponent as MentionIcon } from "icons/icon-mention-comp.svg";
 export { ReactComponent as AutoCompleteCompIcon } from "icons/icon-autocomplete-comp.svg";
+export { ReactComponent as WidthIcon } from "icons/icon-width.svg";
+export { ReactComponent as ResponsiveLayoutCompIcon } from "icons/icon-responsive-layout-comp.svg";

client/packages/lowcoder-design/src/icons/icon-width.svg

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

client/packages/lowcoder-design/src/icons/index.ts

@@ -328,7 +328,7 @@ const PermissionSelector = (props: {
       <PermissionSelectWrapper>
         <AddPermissionsSelect
           open
-          innerRef={selectRef}
+          ref={selectRef}
           placeholder={trans("home.addPermissionPlaceholder")}
           mode="multiple"
           getPopupContainer={() => document.getElementById("add-app-user-permission-dropdown")!}

client/packages/lowcoder-sdk/package.json

@@ -44,7 +44,7 @@ import {
   booleanExposingStateControl,
 } from "comps/controls/codeStateControl";
 
-import { getMomentLocale } from "i18n/momentLocale";
+import { getDayJSLocale } from "i18n/dayjsLocale";
 import {
   autoCompleteDate,
   itemsDataTooltip,
@@ -151,7 +151,7 @@ let AutoCompleteCompBase = (function () {
     const [validateState, setvalidateState] = useState({});
 
     //   是否中文环境
-    const [chineseEnv, setChineseEnv] = useState(getMomentLocale() === "zh-cn");
+    const [chineseEnv, setChineseEnv] = useState(getDayJSLocale() === "zh-cn");
 
     useEffect(() => {
       setsearchtext(props.value.value);
@@ -346,11 +346,11 @@ let AutoCompleteCompBase = (function () {
               tooltip: itemsDataTooltip,
               placeholder: "[]",
             })}
-            {getMomentLocale() === "zh-cn" &&
+            {getDayJSLocale() === "zh-cn" &&
               children.searchFirstPY.propertyView({
                 label: trans("autoComplete.searchFirstPY"),
               })}
-            {getMomentLocale() === "zh-cn" &&
+            {getDayJSLocale() === "zh-cn" &&
               children.searchCompletePY.propertyView({
                 label: trans("autoComplete.searchCompletePY"),
               })}

client/packages/lowcoder/src/components/PermissionDialog/Permission.tsx

@@ -88,9 +88,9 @@ const multiSelectComps: CompConfig[] = [
 const dateComp: CompConfig = {
   type: "date",
 };
-// TODO: RAHEEL
+
 function dateTimeToTimestamp(compName: string) {
-  return "moment(" + compName + ".value || 0).valueOf()";
+  return "dayjs(" + compName + ".value || 0).valueOf()";
 }
 function dateTimeComp(toTimestamp?: boolean): CompConfig {
   return {

client/packages/lowcoder/src/comps/comps/autoCompleteComp/autoCompleteComp.tsx

@@ -0,0 +1 @@
+export { ResponsiveLayoutComp } from "./responsiveLayout";