Fix/DEV-217 (#688)

* PS-339 [FIX] Ensure Form buttons line up (#681) * ID-4527 [FIX] Adjust custom button to be in line with form fields (#680) * Adjust custom button to be in line with form fields * ID-4527 [FIX] Adjust custom button to be in line with form fields * PS-53 [FIX] Ensure Rich text field is rendered in Drag and drop accordion of Add fields overlay after switching between settings tabs (#682) * Revert "PS-53 [FIX] Ensure Rich text field is rendered in Drag and drop accor…" (#687) This reverts commit 51a8ad5. * merge with master * DEV-217 [FIX] Ensure that the Address field and Map field names do not cause conflicts with data source columns. --------- Co-authored-by: ysolodka <[email protected]>
Fliplet · Oct 29, 2024 · 1acbcc0 · 1acbcc0
1 parent b5d4898
commit 1acbcc0
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 5 deletions.
diff --git a/css/form.css b/css/form.css
@@ -8,6 +8,10 @@
   margin: 0;
 }
 
+[_type="flCustomButton"] {
+  justify-content: flex-end;
+}
+
 [data-form-field] .col-xs-12 {
   padding: 0;
 }
@@ -260,6 +264,7 @@ form.placeholder button {
 .btn-link,
 a {
   text-decoration: underline;
+  padding: 0;
 }
 
 /* FORM STYLES */

diff --git a/js/components/customButton.js b/js/components/customButton.js
@@ -1,5 +1,5 @@
 Fliplet.FormBuilder.field('customButton', {
-  name: 'Custom button',
+  name: 'Button',
   category: 'Buttons',
   props: {
     description: {

diff --git a/js/libs/builder.js b/js/libs/builder.js
@@ -983,7 +983,7 @@ Fliplet().then(function() {
 
             case 'flMap':
               fieldNames.push('Lat/Long');
-              fieldNames.push('Address');
+              fieldNames.push('Map Address');
 
               break;
 

diff --git a/js/libs/core.js b/js/libs/core.js
@@ -528,7 +528,7 @@ Fliplet.FormBuilder = (function() {
 
       component.props._flexibleWidthComponents = {
         type: Array,
-        default: ['flInput', 'flCheckbox', 'flRadio', 'flEmail', 'flNumber', 'flTelephone', 'flUrl', 'flTextarea', 'flWysiwyg', 'flSelect', 'flDate', 'flTime', 'flDateRange', 'flTimeRange', 'flTimer', 'flStarRating', 'flSignature', 'flImage', 'flFile', 'flSlider', 'flMatrix', 'flTypeahead', 'flGeolocation', 'flPassword', 'flCodeScanner', 'flCustomButton', 'flMap']
+        default: ['flInput', 'flCheckbox', 'flRadio', 'flEmail', 'flNumber', 'flTelephone', 'flUrl', 'flTextarea', 'flWysiwyg', 'flSelect', 'flDate', 'flTime', 'flDateRange', 'flTimeRange', 'flTimer', 'flStarRating', 'flSignature', 'flImage', 'flFile', 'flSlider', 'flMatrix', 'flTypeahead', 'flGeolocation', 'flPassword', 'flCodeScanner', 'flCustomButton', 'flMap', 'flAddress']
       };
 
       component.props._idx = {

diff --git a/js/libs/form.js b/js/libs/form.js
@@ -406,7 +406,7 @@ Fliplet().then(function() {
                 break;
               case 'flMap':
                 fieldData = {
-                  address: entry.data['Address'],
+                  address: entry.data['Map Address'],
                   latLong: entry.data['Lat/Long']
                 };
                 break;
@@ -1197,7 +1197,7 @@ Fliplet().then(function() {
                     });
                   }
                 } else if (type === 'flMap') {
-                  appendField('Address', value.address);
+                  appendField('Map Address', value.address);
                   appendField('Lat/Long', value.latLong);
                 } else if (type === 'flGeolocation') {
                   appendField(field.name, value ? value[0] : null);