Beautiful Open-Source Form Builder
Refactor FormFieldEdit and FieldOptions components for improved type handling and placeholder logic.
JhumanJ07f0f443ea92
diff --git a/client/components/open/forms/fields/FormFieldEdit.vue b/client/components/open/forms/fields/FormFieldEdit.vueindex c44d2129d..9f0c33407 100644--- a/client/components/open/forms/fields/FormFieldEdit.vue+++ b/client/components/open/forms/fields/FormFieldEdit.vue@@ -130,16 +130,15 @@ const isBlockField = computed(() => {})const typeCanBeChanged = computed(() => {+ const textualTypes = ["text", "rich_text", "url", "email", "phone_number", "number"]+ const selectionTypes = ["select", "multi_select"]+ const scaleTypes = ["rating", "scale", "slider"]+ const booleanTypes = ["checkbox"]return [- "text",- "email",- "phone_number",- "number",- "select",- "multi_select",- "rating",- "scale",- "slider",+ ...textualTypes,+ ...selectionTypes,+ ...scaleTypes,+ ...booleanTypes,].includes(field.value.type)})@@ -151,47 +150,44 @@ const useFieldTypeChange = () => {field.value[newType] = field.value[field.value.type] // Set new options with new typedelete field.value[field.value.type] // remove old type options}++ // Preserve/downgrade content when converting between text and rich_text+ if ((field.value.type === 'text' && newType === 'rich_text') || (field.value.type === 'rich_text' && newType === 'text')) {+ // keep existing value in place; renderer handles component mapping+ }+field.value.type = newType}const getChangeTypeOptions = (currentType) => {- let newTypes = []-- if ([- "text",- "email",- "phone_number",- "number",- "slider",- "rating",- "scale",- ].includes(currentType)) {- newTypes = [- { name: "Text Input", value: "text", icon: "i-heroicons-pencil-20-solid" },- { name: "Email Input", value: "email", icon: "i-heroicons-at-symbol-20-solid" },- { name: "Phone Input", value: "phone_number", icon: "i-heroicons-phone-20-solid" },- { name: "Number Input", value: "number", icon: "i-heroicons-hashtag-20-solid" },- { name: "Slider Input", value: "slider", icon: "i-heroicons-adjustments-horizontal-20-solid" },- { name: "Rating Input", value: "rating", icon: "i-heroicons-star-20-solid" },- { name: "Scale Input", value: "scale", icon: "i-heroicons-chart-bar-20-solid" },- ]- }-- if (["select", "multi_select"].includes(currentType)) {- newTypes = [- { name: "Select Input", value: "select", icon: "i-heroicons-chevron-down-20-solid" },- { name: "Multi-Select Input", value: "multi_select", icon: "i-heroicons-check-20-solid" },- ]+ const textualTypes = ["text", "rich_text", "url", "email", "phone_number", "number"]+ const selectionTypes = ["select", "multi_select"]+ const scaleTypes = ["rating", "scale", "slider"]+ const booleanTypes = ["checkbox"]++ let candidateTypes = []++ if (textualTypes.includes(currentType)) {+ candidateTypes = [...textualTypes, ...booleanTypes]+ } else if (selectionTypes.includes(currentType)) {+ candidateTypes = [...selectionTypes]+ } else if (scaleTypes.includes(currentType)) {+ candidateTypes = [...scaleTypes]+ } else if (booleanTypes.includes(currentType)) {+ candidateTypes = [...textualTypes, ...booleanTypes]}-- return newTypes- .filter((item) => item.value !== currentType)- .map((item) => ({- label: item.name,- value: item.value,- icon: item.icon,- onClick: () => onChangeType(item.value)- }))++ return candidateTypes+ .filter((type) => type !== currentType)+ .map((type) => {+ const meta = blocksTypes[type] || {}+ return {+ label: meta.title || type,+ value: type,+ icon: meta.icon || undefined,+ onClick: () => onChangeType(type)+ }+ })}return {diff --git a/client/components/open/forms/fields/components/FieldOptions.vue b/client/components/open/forms/fields/components/FieldOptions.vueindex ac055e89a..3640ac9e3 100644--- a/client/components/open/forms/fields/components/FieldOptions.vue+++ b/client/components/open/forms/fields/components/FieldOptions.vue@@ -545,9 +545,9 @@</small></div>- <!-- Placeholder -->+ <!-- Placeholder --><text-area-input- v-if="hasPlaceholder && field.type === 'text' && field.multi_lines"+ v-if="hasPlaceholder && ((field.type === 'text' && field.multi_lines) || field.type === 'rich_text')"name="placeholder"class="mt-3":form="field"