Skip to content

Added support for JSONForms through ANTd renderer #1726

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
FalkWolsky merged 8 commits into from
May 30, 2025
Merged

Added support for JSONForms through ANTd renderer #1726

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
bdf5a26
Added suport for JSONForms through ANTd renderer
kamal-qureshi May 29, 2025
a40765a
Clear prettify
kamal-qureshi May 30, 2025
775b7a1
CLear prettify changes
kamal-qureshi May 30, 2025
ac418a7
Reviewed Changes
kamal-qureshi May 30, 2025
8951efe
Merge branch 'dev' into clean_json_schema_form
kamal-qureshi May 30, 2025
9954a49
Error handling in JSONForms
kamal-qureshi May 30, 2025
af9e431
Merge branch 'dev' into clean_json_schema_form
kamal-qureshi May 30, 2025
09f7cd3
Merge branch 'dev' into clean_json_schema_form
FalkWolsky May 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions client/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,14 +72,25 @@
"eslint-plugin-only-ascii@^0.0.0": "patch:eslint-plugin-only-ascii@npm%3A0.0.0#./.yarn/patches/eslint-plugin-only-ascii-npm-0.0.0-29e3417685.patch"
},
"dependencies": {
"@emotion/react": "^11.14.0",
"@emotion/styled": "^11.14.0",
"@jsonforms/core": "3.5.1",
"@jsonforms/material-renderers": "^3.5.1",
"@jsonforms/react": "3.5.1",
"@lottiefiles/react-lottie-player": "^3.5.3",
"@remixicon/react": "^4.1.1",
"@rjsf/antd": "^6.0.0-beta.10",
"@rjsf/core": "^6.0.0-beta.10",
"@rjsf/utils": "^6.0.0-beta.10",
"@rjsf/validator-ajv8": "^6.0.0-beta.10",
"@supabase/supabase-js": "^2.45.4",
"@testing-library/react": "^14.1.2",
"@testing-library/user-event": "^14.5.1",
"@types/styled-components": "^5.1.34",
"antd": "^5.25.3",
"antd-mobile": "^5.34.0",
"chalk": "4",
"dayjs": "^1.11.13",
"flag-icons": "^7.2.1",
"number-precision": "^1.6.0",
"react-countup": "^6.5.3",
Expand All @@ -88,6 +99,7 @@
"resize-observer-polyfill": "^1.5.1",
"rollup": "^4.22.5",
"simplebar": "^6.2.5",
"styled-components": "^6.1.18",
"tui-image-editor": "^3.15.3"
}
}
14 changes: 8 additions & 6 deletions client/packages/lowcoder-comps/src/comps/calendarComp/calendarConstants.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import {
SlotLabelContentArg,
ViewContentArg,
} from "@fullcalendar/core";
import { default as Form } from "antd/es/form";
import { default as Form, FormProps } from "antd/es/form";

type Theme = typeof Theme;
type EventModalStyleType = typeof EventModalStyleType;
Expand Down Expand Up @@ -776,9 +776,11 @@ export const Event = styled.div<{
}
`;

export const FormWrapper = styled(Form)<{
$modalStyle?: EventModalStyleType
}>`
export const FormWrapper = styled(Form)<
FormProps & {
$modalStyle?: EventModalStyleType;
}
>`
.ant-form-item-label {
width: 125px;
text-align: left;
Expand All @@ -787,12 +789,12 @@ export const FormWrapper = styled(Form)<{
label:not(.ant-form-item-required) {
margin-left: 2px;
}
label.ant-form-item-required{
label.ant-form-item-required{
margin-left: 2px;
}
label span {
${UnderlineCss}

}
}

Expand Down
10 changes: 5 additions & 5 deletions client/packages/lowcoder-design/src/components/Dropdown.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ export const DropdownContainer = styled.div<{ $placement: ControlPlacement }>`
width: ${(props) =>
props.$placement === "right"
? "calc(100% - 96px)"
: "bottom"
? "calc(100% - 112px)"
: "calc(100% - 136px"};
: props.$placement === "bottom"
? "calc(100% - 112px)"
: "calc(100% - 136px)"};
flex-grow: 1;

.ant-select:not(.ant-select-customize-input) .ant-select-selector {
Expand Down Expand Up @@ -124,8 +124,8 @@ const FlexDiv = styled.div`

const LabelWrapper = styled.div<{ $placement: ControlPlacement }>`
flex-shrink: 0;
width: ${(props) => (props.$placement === "right" ? "96px" : "bottom" ? "112px" : "136px")};
`;
width: ${(props) => props.$placement === "right" ? "96px" : props.$placement === "bottom" ? "112px" : "136px"};
`;

export type OptionType = {
readonly label: ReactNode;
Expand Down
6 changes: 3 additions & 3 deletions client/packages/lowcoder-design/src/components/form.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { default as Form } from "antd/es/form";
import { default as AntdFormItem, FormItemProps as AntdFormItemProps } from "antd/es/form/FormItem";
import { default as Form, FormProps } from "antd/es/form";
import { default as AntdFormItem, FormItemProps as AntdFormItemProps} from "antd/es/form/FormItem";
import { default as Input, InputProps } from "antd/es/input";
import { default as TextArea, TextAreaProps } from "antd/es/input/TextArea";
import { default as InputNumber, InputNumberProps } from "antd/es/input-number";
Expand Down Expand Up @@ -429,7 +429,7 @@ export const FormKeyValueItem = (props: FormItemProps) => (
</FormItemContain>
);

export const DatasourceForm = styled(Form)`
export const DatasourceForm = styled(Form)<FormProps>`
display: flex;
flex-direction: column;
gap: 8px;
Expand Down
6 changes: 5 additions & 1 deletion client/packages/lowcoder/src/components/JSLibraryTree.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,11 @@ const JSLibraryCollapse = styled(Collapse)<{ $mode: "row" | "column" }>`
}

.lib-label-name {
${EllipsisTextCss};
${css`
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
`}
}
`;

Expand Down
Loading
Loading