Skip to content

Commit 360e2f5

Browse files
authored
Merge pull request #1726 from kamalqureshi/clean_json_schema_form
Added support for JSONForms through ANTd renderer
2 parents fa9c39b + 09f7cd3 commit 360e2f5

File tree

12 files changed

+1207
-176
lines changed

12 files changed

+1207
-176
lines changed

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ export const DropdownContainer = styled.div<{ $placement: ControlPlacement }>`
1818
width: ${(props) =>
1919
props.$placement === "right"
2020
? "calc(100% - 96px)"
21-
: "bottom"
22-
? "calc(100% - 112px)"
23-
: "calc(100% - 136px"};
21+
: props.$placement === "bottom"
22+
? "calc(100% - 112px)"
23+
: "calc(100% - 136px)"};
2424
flex-grow: 1;
2525
2626
.ant-select:not(.ant-select-customize-input) .ant-select-selector {
@@ -124,8 +124,8 @@ const FlexDiv = styled.div`
124124

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

130130
export type OptionType = {
131131
readonly label: ReactNode;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { default as Form } from "antd/es/form";
2-
import { default as AntdFormItem, FormItemProps as AntdFormItemProps } from "antd/es/form/FormItem";
2+
import { default as AntdFormItem, FormItemProps as AntdFormItemProps} from "antd/es/form/FormItem";
33
import { default as Input, InputProps } from "antd/es/input";
44
import { default as TextArea, TextAreaProps } from "antd/es/input/TextArea";
55
import { default as InputNumber, InputNumberProps } from "antd/es/input-number";

client/packages/lowcoder/package.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
"@fortawesome/free-regular-svg-icons": "^6.5.1",
2525
"@fortawesome/free-solid-svg-icons": "^6.5.1",
2626
"@fortawesome/react-fontawesome": "latest",
27+
"@jsonforms/core": "^3.5.1",
2728
"@lottiefiles/dotlottie-react": "^0.13.0",
2829
"@manaflair/redux-batch": "^1.0.0",
2930
"@rjsf/antd": "^5.24.9",
@@ -45,6 +46,7 @@
4546
"coolshapes-react": "lowcoder-org/coolshapes-react",
4647
"copy-to-clipboard": "^3.3.3",
4748
"core-js": "^3.25.2",
49+
"dayjs": "^1.11.13",
4850
"echarts": "^5.4.3",
4951
"echarts-for-react": "^3.0.2",
5052
"echarts-wordcloud": "^2.1.0",

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy