Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 3889547

Browse files
Merge branch 'main' into feat-table-number-input
2 parents 6b7d7d7 + eaab1d4 commit 3889547

File tree

59 files changed

+1342
-170
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

59 files changed

+1342
-170
lines changed

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

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -71,23 +71,29 @@ const SelectWrapper = styled.div<{ border?: boolean }>`
7171
}
7272
`;
7373

74-
export type CustomSelectProps = {
74+
export interface CustomSelectProps extendsAntdSelectProps {
7575
children?: JSX.Element | React.ReactNode;
76-
innerRef?: React.Ref<HTMLDivElement> | undefined;
7776
border?: boolean;
7877
};
7978

80-
function CustomSelect(props: CustomSelectProps & AntdSelectProps) {
79+
interface CustomSelectInterface extends React.ForwardRefExoticComponent<
80+
CustomSelectProps & React.RefAttributes<HTMLDivElement>
81+
> {
82+
Option: any;
83+
}
84+
const CustomSelect = React.forwardRef<HTMLDivElement, CustomSelectProps>((
85+
props,
86+
ref,
87+
) => {
8188
const {
8289
children,
83-
innerRef,
8490
className,
8591
border,
8692
popupClassName = "custom-ant-select-dropdown",
8793
...restProps
8894
} = props;
8995
return (
90-
<SelectWrapper className={className} ref={innerRef} border={border}>
96+
<SelectWrapper className={className} ref={ref} border={border}>
9197
<AntdSelect
9298
popupClassName={popupClassName}
9399
popupMatchSelectWidth={false}
@@ -96,9 +102,10 @@ function CustomSelect(props: CustomSelectProps & AntdSelectProps) {
96102
>
97103
{children}
98104
</AntdSelect>
105+
<div></div>
99106
</SelectWrapper>
100107
);
101-
}
108+
})asCustomSelectInterface;
102109

103110
CustomSelect.Option = AntdSelect.Option;
104111
export { CustomSelect };
Lines changed: 1 addition & 0 deletions
Loading[フレーム]
Lines changed: 1 addition & 0 deletions
Loading[フレーム]

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -288,4 +288,6 @@ export { ReactComponent as ExpandIcon } from "icons/icon-expand.svg";
288288
export { ReactComponent as CompressIcon } from "icons/icon-compress.svg";
289289
export { ReactComponent as TableCellsIcon } from "icons/icon-table-cells.svg"; // Added By Aqib Mirza
290290
export { ReactComponent as TimeLineIcon } from "icons/icon-timeline-comp.svg"
291-
export { ReactComponent as LottieIcon } from "icons/icon-lottie.svg";
291+
export { ReactComponent as LottieIcon } from "icons/icon-lottie.svg";
292+
export { ReactComponent as MentionIcon } from "icons/icon-mention-comp.svg";
293+
export { ReactComponent as AutoCompleteCompIcon } from "icons/icon-autocomplete-comp.svg";

‎client/packages/lowcoder/package.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@
4242
"axios": "^0.21.1",
4343
"buffer": "^6.0.3",
4444
"clsx": "^1.2.1",
45+
"cnchar": "^3.2.4",
4546
"copy-to-clipboard": "^3.3.3",
4647
"core-js": "^3.25.2",
4748
"echarts": "^5.4.2",

‎client/packages/lowcoder/src/base/codeEditor/extensions.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ const defaultTheme = EditorView.theme({
111111
"&.cm-editor": {
112112
backgroundColor: "#ffffff",
113113
width: "100%",
114-
height: "100%",
114+
// height: "100%",
115115
"font-size": "13px",
116116
transition: "all .4s ease",
117117
outline: "none",

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -328,7 +328,7 @@ const PermissionSelector = (props: {
328328
<PermissionSelectWrapper>
329329
<AddPermissionsSelect
330330
open
331-
innerRef={selectRef}
331+
ref={selectRef}
332332
placeholder={trans("home.addPermissionPlaceholder")}
333333
mode="multiple"
334334
getPopupContainer={() => document.getElementById("add-app-user-permission-dropdown")!}

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /