Elgato_dark/ToolJet
1
0
Fork 0
mirror of https://github.com/ToolJet/ToolJet synced 2026-05-23 08:58:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Merge pull request #12714 from ToolJet/fix/form-layout-default-11

Browse source 
fix: Matches default form layout to design
This commit is contained in:
Johnson Cherian 2025-04-28 18:43:06 +05:30 committed by GitHub
commit 3dab29c235
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 30 additions and 78 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
frontend/src/AppBuilder/WidgetManager/widgets/form.js
View file

@ -19,9 +19,10 @@ export const formConfig = {
accessorKey: 'text',
styles: ['fontWeight', 'textSize', 'textColor'],
defaultValue: {
text: 'Form',
text: 'Form title',
textSize: 16,
textColor: '#000',
fontWeight: 'bold',
},
},
{
@ -29,8 +30,9 @@ export const formConfig = {
slotName: 'footer',
layout: {
top: 12,
left: 32,
left: 29,
height: 36,
width: 13,
},
properties: ['text'],
defaultValue: {
@ -42,9 +44,9 @@ export const formConfig = {
componentName: 'TextInput',
layout: {
top: 20,
left: 5,
left: 1,
height: 40,
width: 31,
width: 41,
},
properties: ['placeholder', 'label'],
styles: ['alignment', 'width', 'auto', 'padding', 'direction'],
@ -62,9 +64,9 @@ export const formConfig = {
componentName: 'NumberInput',
layout: {
top: 80,
left: 5,
left: 1,
height: 40,
width: 31,
width: 41,
},
properties: ['placeholder', 'label'],
styles: ['alignment', 'width', 'auto', 'padding', 'direction'],
@ -78,26 +80,6 @@ export const formConfig = {
padding: 'default',
},
},
{
componentName: 'TextInput',
layout: {
top: 140,
left: 5,
height: 40,
width: 31,
},
properties: ['placeholder', 'label'],
styles: ['alignment', 'width', 'auto', 'padding', 'direction'],
defaultValue: {
placeholder: 'Tomy',
label: 'Pet name',
width: '{{60}}',
alignment: 'side',
direction: 'left',
auto: '{{false}}',
padding: 'default',
},
},
],
component: 'Form',
others: {
@ -289,6 +271,8 @@ export const formConfig = {
backgroundColor: { value: '#fff' },
borderRadius: { value: '0' },
borderColor: { value: '#fff' },
headerBackgroundColor: { value: '#fff' },
footerBackgroundColor: { value: '#fff' },
},
},
};

36
frontend/src/Editor/WidgetManager/configs/form.js
View file

@ -19,9 +19,10 @@ export const formConfig = {
accessorKey: 'text',
styles: ['fontWeight', 'textSize', 'textColor'],
defaultValue: {
text: 'Form',
text: 'Form title',
textSize: 16,
textColor: '#000',
fontWeight: 'bold',
},
},
{
@ -29,8 +30,9 @@ export const formConfig = {
slotName: 'footer',
layout: {
top: 12,
left: 32,
left: 29,
height: 36,
width: 13,
},
properties: ['text'],
defaultValue: {
@ -42,9 +44,9 @@ export const formConfig = {
componentName: 'TextInput',
layout: {
top: 20,
left: 5,
left: 1,
height: 40,
width: 31,
width: 41,
},
properties: ['placeholder', 'label'],
styles: ['alignment', 'width', 'auto', 'padding', 'direction'],
@ -62,9 +64,9 @@ export const formConfig = {
componentName: 'NumberInput',
layout: {
top: 80,
left: 5,
left: 1,
height: 40,
width: 31,
width: 41,
},
properties: ['placeholder', 'label'],
styles: ['alignment', 'width', 'auto', 'padding', 'direction'],
@ -78,26 +80,6 @@ export const formConfig = {
padding: 'default',
},
},
{
componentName: 'TextInput',
layout: {
top: 140,
left: 5,
height: 40,
width: 31,
},
properties: ['placeholder', 'label'],
styles: ['alignment', 'width', 'auto', 'padding', 'direction'],
defaultValue: {
placeholder: 'Tomy',
label: 'Pet name',
width: '{{60}}',
alignment: 'side',
direction: 'left',
auto: '{{false}}',
padding: 'default',
},
},
],
component: 'Form',
others: {
@ -289,6 +271,8 @@ export const formConfig = {
backgroundColor: { value: '#fff' },
borderRadius: { value: '0' },
borderColor: { value: '#fff' },
headerBackgroundColor: { value: '#fff' },
footerBackgroundColor: { value: '#fff' },
},
},
};

36
server/src/modules/apps/services/widget-config/form.js
View file

@ -19,9 +19,10 @@ export const formConfig = {
accessorKey: 'text',
styles: ['fontWeight', 'textSize', 'textColor'],
defaultValue: {
text: 'Form',
text: 'Form title',
textSize: 16,
textColor: '#000',
fontWeight: 'bold',
},
},
{
@ -29,8 +30,9 @@ export const formConfig = {
slotName: 'footer',
layout: {
top: 12,
left: 32,
left: 29,
height: 36,
width: 13,
},
properties: ['text'],
defaultValue: {
@ -42,9 +44,9 @@ export const formConfig = {
componentName: 'TextInput',
layout: {
top: 20,
left: 5,
left: 1,
height: 40,
width: 31,
width: 41,
},
properties: ['placeholder', 'label'],
styles: ['alignment', 'width', 'auto', 'padding', 'direction'],
@ -62,9 +64,9 @@ export const formConfig = {
componentName: 'NumberInput',
layout: {
top: 80,
left: 5,
left: 1,
height: 40,
width: 31,
width: 41,
},
properties: ['placeholder', 'label'],
styles: ['alignment', 'width', 'auto', 'padding', 'direction'],
@ -78,26 +80,6 @@ export const formConfig = {
padding: 'default',
},
},
{
componentName: 'TextInput',
layout: {
top: 140,
left: 5,
height: 40,
width: 31,
},
properties: ['placeholder', 'label'],
styles: ['alignment', 'width', 'auto', 'padding', 'direction'],
defaultValue: {
placeholder: 'Tomy',
label: 'Pet name',
width: '{{60}}',
alignment: 'side',
direction: 'left',
auto: '{{false}}',
padding: 'default',
},
},
],
component: 'Form',
others: {
@ -289,6 +271,8 @@ export const formConfig = {
backgroundColor: { value: '#fff' },
borderRadius: { value: '0' },
borderColor: { value: '#fff' },
headerBackgroundColor: { value: '#fff' },
footerBackgroundColor: { value: '#fff' },
},
},
};