Elgato_dark/ToolJet
1
0
Fork 0
mirror of https://github.com/ToolJet/ToolJet synced 2026-05-24 09:28:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix label text issue for text, password and number inputs (#10435)

Browse source
This commit is contained in:
Kartik Gupta 2024-07-26 08:32:43 +05:30 committed by GitHub
parent 966d515718
commit 7183ba6038
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
frontend/src/Editor/Components/Form/FormUtils.js
View file

@ -55,7 +55,8 @@ export function generateUIComponents(JSONSchema, advanced) {
uiComponentsDraft[index * 2 + 1]['definition']['properties']['value']['value'] = value?.value;
if (value?.placeholder)
uiComponentsDraft[index * 2 + 1]['definition']['properties']['placeholder']['value'] = value?.placeholder;
if (value?.label) uiComponentsDraft[index * 2 + 1]['definition']['properties']['label']['value'] = '';
// prevent label from showing up in text input, because it is already shown in the text component. (Defaults to "Label" if not updated explicitly with an empty string)
uiComponentsDraft[index * 2 + 1]['definition']['properties']['label']['value'] = '';
break;
case 'DropDown':
if (value?.styles?.disabled)
@ -156,7 +157,7 @@ export function generateUIComponents(JSONSchema, advanced) {
uiComponentsDraft[index * 2 + 1]['definition']['properties']['minValue']['value'] = value?.minValue;
if (value?.placeholder)
uiComponentsDraft[index * 2 + 1]['definition']['properties']['placeholder']['value'] = value?.placeholder;
if (value?.label) uiComponentsDraft[index * 2 + 1]['definition']['properties']['label']['value'] = '';
uiComponentsDraft[index * 2 + 1]['definition']['properties']['label']['value'] = '';
break;
case 'PasswordInput':
@ -187,7 +188,7 @@ export function generateUIComponents(JSONSchema, advanced) {
uiComponentsDraft[index * 2 + 1]['definition']['validation']['regex']['value'] = value?.validation?.regex;
if (value?.placeholder)
uiComponentsDraft[index * 2 + 1]['definition']['properties']['placeholder']['value'] = value?.placeholder;
if (value?.label) uiComponentsDraft[index * 2 + 1]['definition']['properties']['label']['value'] = '';
uiComponentsDraft[index * 2 + 1]['definition']['properties']['label']['value'] = '';
break;
case 'Datepicker':
@ -274,8 +275,7 @@ export function generateUIComponents(JSONSchema, advanced) {
if (value?.value)
uiComponentsDraft[index * 2 + 1]['definition']['properties']['defaultValue']['value'] = value?.value;
if (value?.label)
uiComponentsDraft[index * 2 + 1]['definition']['properties']['label']['value'] = value?.label;
uiComponentsDraft[index * 2 + 1]['definition']['properties']['label']['value'] = value?.label;
break;
case 'TextArea':

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

@ -315,7 +315,7 @@ export const formConfig = {
advanced: { value: '{{false}}' },
JSONSchema: {
value:
"{{ {title: 'User registration form', properties: {firstname: {type: 'textinput',value: 'Maria',label:'First name', validation:{maxLength:6}, styles: {backgroundColor: '#f6f5ff',textColor: 'black'},},lastname:{type: 'textinput',value: 'Doe', label:'Last name', styles: {backgroundColor: '#f6f5ff',textColor: 'black'},},age:{type:'number'},}, submitButton: {value: 'Submit', styles: {backgroundColor: '#3a433b',borderColor:'#595959'}}} }}",
"{{ {title: 'User registration form', properties: {firstname: {type: 'textinput',value: 'Maria',label:'First name', validation:{maxLength:6}, styles: {backgroundColor: '#f6f5ff',textColor: 'black'},},lastname:{type: 'textinput',value: 'Doe', label:'Last name', styles: {backgroundColor: '#f6f5ff',textColor: 'black'},},age:{type:'number', label:'Age'},}, submitButton: {value: 'Submit', styles: {backgroundColor: '#3a433b',borderColor:'#595959'}}} }}",
},
},
events: [],