Merge branch 'main' into feat-table-number-input

Author: FalkWolsky

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-autocomplete-comp.svg

@@ -288,4 +288,6 @@ export { ReactComponent as ExpandIcon } from "icons/icon-expand.svg";
 export { ReactComponent as CompressIcon } from "icons/icon-compress.svg";
 export { ReactComponent as TableCellsIcon } from "icons/icon-table-cells.svg"; // Added By Aqib Mirza
 export { ReactComponent as TimeLineIcon } from "icons/icon-timeline-comp.svg"
-export { ReactComponent as LottieIcon } from "icons/icon-lottie.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";

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

@@ -42,6 +42,7 @@
     "axios": "^0.21.1",
     "buffer": "^6.0.3",
     "clsx": "^1.2.1",
+    "cnchar": "^3.2.4",
     "copy-to-clipboard": "^3.3.3",
     "core-js": "^3.25.2",
     "echarts": "^5.4.2",

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

@@ -111,7 +111,7 @@ const defaultTheme = EditorView.theme({
   "&.cm-editor": {
     backgroundColor: "#ffffff",
     width: "100%",
-    height: "100%",
+    // height: "100%",
     "font-size": "13px",
     transition: "all .4s ease",
     outline: "none",

client/packages/lowcoder/package.json

@@ -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")!}