Skip to content

Updated jsonschema forms #1740

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
merged 2 commits into from
Jun 3, 2025
Merged

Updated jsonschema forms #1740

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6284ae7
Merge pull request #1739 from lowcoder-org/dev
FalkWolsky Jun 3, 2025
f84b565
Added support for grids similar to rjsf
kamal-qureshi Jun 3, 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
71 changes: 43 additions & 28 deletions client/packages/lowcoder/src/comps/comps/jsonSchemaFormComp/JsonFormsRenderer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,11 @@ import {
Steps,
} from "antd";
import styled from "styled-components";
import type { JsonSchema } from "@jsonforms/core";
import type { JSONSchema7 } from "json-schema";
import { debounce } from "lodash";
import dayjs from "dayjs";
import { trans } from "i18n";
import type {
JsonFormsUiSchema,
FieldUiSchema,
Layout,
Categorization,
Expand All @@ -30,10 +28,14 @@ import type {
Category,
Control
} from "./types";
import type { SwitchChangeEventHandler } from "antd/es/switch";
import { useContainerWidth } from "./jsonSchemaFormComp";

const { TextArea } = Input;

const Container = styled.div`
const Container = styled.div
`
gap: 16px;
width: 100%;
.ant-form-item {
margin-bottom: 16px;
}
Expand Down Expand Up @@ -62,11 +64,6 @@ const Container = styled.div`
}
`;

interface HorizontalLayout {
type: "HorizontalLayout";
elements: Control[];
}

const JsonFormsRenderer: React.FC<JsonFormsRendererProps> = ({
schema,
data,
Expand All @@ -78,6 +75,7 @@ const JsonFormsRenderer: React.FC<JsonFormsRendererProps> = ({
validationState: externalValidationState,
onValidationChange,
}) => {
const containerWidth = useContainerWidth();
// Local state to handle immediate updates
const [localData, setLocalData] = useState(data);
// Track focused field
Expand Down Expand Up @@ -116,7 +114,7 @@ const JsonFormsRenderer: React.FC<JsonFormsRendererProps> = ({
if (!uiSchema) return undefined;

// For JSONForms UI schema, we need to find the Control element that matches the path
if (uiSchema.type === "HorizontalLayout" && Array.isArray(uiSchema.elements)) {
if (Array.isArray(uiSchema.elements)) {
const control = uiSchema.elements.find((element: any) => {
if (element.type === "Control") {
// Convert the scope path to match our field path
Expand Down Expand Up @@ -666,24 +664,41 @@ const JsonFormsRenderer: React.FC<JsonFormsRendererProps> = ({

// Fallback to default rendering if not a categorization
return (
<Container style={style}>
<Form layout="vertical">
{Object.entries(schema.properties || {}).map(
([key, fieldSchema]: [string, any]) =>
renderField(key, fieldSchema, localData?.[key])
)}
<Form.Item>
<Button
type="primary"
onClick={handleSubmit}
style={{ float: "right" }}
>
{trans("event.submit")}
</Button>
</Form.Item>
</Form>
</Container>
<Container>
<Form layout="vertical">
<Row gutter={16}>
{Object.entries(schema.properties || {}).map(([key, fieldSchema]) => {
const fieldUiSchema = uiSchema?.[key] || {};
const colSpan = calculateColSpan(fieldUiSchema, containerWidth);

return (
<Col key={key} {...colSpan}>
{renderField(key, fieldSchema, localData?.[key])}
</Col>
);
})}
</Row>
<Form.Item>
<Button
type="primary"
onClick={handleSubmit}
style={{ float: "right" }}
>
{trans("event.submit")}
</Button>
</Form.Item>
</Form>
</Container>
);
};

export default React.memo(JsonFormsRenderer);
const calculateColSpan = (uiSchema: any, containerWidth: number) => {
const colSpan = uiSchema?.["ui:colSpan"] || { xs: 24, sm: 24, md: 12, lg: 12, xl: 8 };
if (containerWidth > 1200 && colSpan.xl) return { span: colSpan.xl };
if (containerWidth > 992 && colSpan.lg) return { span: colSpan.lg };
if (containerWidth > 768 && colSpan.md) return { span: colSpan.md };
if (containerWidth > 576 && colSpan.sm) return { span: colSpan.sm };
return { span: 24 };
};

export default React.memo(JsonFormsRenderer);
7 changes: 0 additions & 7 deletions client/packages/lowcoder/src/comps/comps/jsonSchemaFormComp/jsonSchemaFormComp.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -483,13 +483,6 @@ let FormBasicComp = (function () {
tooltip: "Define custom error messages for form fields. Use __errors array for field-specific errors.",
})
)
// : (
// children.validationState.propertyView({
// key: "validationState",
// label: trans("jsonSchemaForm.validationState"),
// tooltip: "Current validation state of the form fields. Shows errors and touched state for each field.",
// })
// )
}
</Section>
)}
Expand Down
Loading