fix default field title

pull/423/head
Pete Matsyburka 10 months ago
parent 2e43eb189f
commit 6dff6483bf

@ -70,7 +70,7 @@
@keydown.enter.prevent="onNameEnter" @keydown.enter.prevent="onNameEnter"
@focus="onNameFocus" @focus="onNameFocus"
@blur="onNameBlur" @blur="onNameBlur"
>{{ optionIndexText }} {{ (defaultField ? (field.title || field.name) : field.name) || defaultName }}</span> >{{ optionIndexText }} {{ (defaultField ? (defaultField.title || field.title || field.name) : field.name) || defaultName }}</span>
<div <div
v-if="isSettingsFocus || (isValueInput && field.type !== 'heading') || (isNameFocus && !['checkbox', 'phone'].includes(field.type))" v-if="isSettingsFocus || (isValueInput && field.type !== 'heading') || (isNameFocus && !['checkbox', 'phone'].includes(field.type))"
class="flex items-center ml-1.5" class="flex items-center ml-1.5"
@ -212,7 +212,7 @@
:contenteditable="isValueInput" :contenteditable="isValueInput"
class="whitespace-pre-wrap outline-none empty:before:content-[attr(placeholder)] before:text-gray-400" class="whitespace-pre-wrap outline-none empty:before:content-[attr(placeholder)] before:text-gray-400"
:class="{ 'cursor-text': isValueInput }" :class="{ 'cursor-text': isValueInput }"
:placeholder="withFieldPlaceholder && !isValueInput ? field.name || defaultName : t('type_value')" :placeholder="withFieldPlaceholder && !isValueInput ? defaultField?.title || field.title || field.name || defaultName : t('type_value')"
@blur="onDefaultValueBlur" @blur="onDefaultValueBlur"
@paste.prevent="onPaste" @paste.prevent="onPaste"
@keydown.enter="onDefaultValueEnter" @keydown.enter="onDefaultValueEnter"

@ -23,7 +23,7 @@
/> />
<Contenteditable <Contenteditable
ref="name" ref="name"
:model-value="(defaultField ? (field.title || field.name) : field.name) || defaultName" :model-value="(defaultField ? (defaultField.title || field.title || field.name) : field.name) || defaultName"
:editable="editable && !defaultField && field.type != 'heading'" :editable="editable && !defaultField && field.type != 'heading'"
:icon-inline="true" :icon-inline="true"
:icon-width="18" :icon-width="18"

@ -26,7 +26,7 @@
:field="field" :field="field"
:type-index="fields.filter((f) => f.type === field.type).indexOf(field)" :type-index="fields.filter((f) => f.type === field.type).indexOf(field)"
:editable="editable && (!fieldsDragFieldRef.value || fieldsDragFieldRef.value !== field)" :editable="editable && (!fieldsDragFieldRef.value || fieldsDragFieldRef.value !== field)"
:default-field="defaultFields.find((f) => f.name === field.name)" :default-field="defaultFieldsIndex[field.name]"
:draggable="editable" :draggable="editable"
@dragstart="fieldsDragFieldRef.value = field" @dragstart="fieldsDragFieldRef.value = field"
@dragend="fieldsDragFieldRef.value = null" @dragend="fieldsDragFieldRef.value = null"
@ -299,6 +299,13 @@ export default {
isShowFieldSearch () { isShowFieldSearch () {
return this.submitterDefaultFields.length > 15 return this.submitterDefaultFields.length > 15
}, },
defaultFieldsIndex () {
return this.defaultFields.reduce((acc, field) => {
acc[field.name] = field
return acc
}, {})
},
fieldIconsSorted () { fieldIconsSorted () {
if (this.fieldTypes.length) { if (this.fieldTypes.length) {
return this.fieldTypes.reduce((acc, type) => { return this.fieldTypes.reduce((acc, type) => {

@ -25,7 +25,7 @@
:field="item.field" :field="item.field"
:editable="editable" :editable="editable"
:with-field-placeholder="withFieldPlaceholder" :with-field-placeholder="withFieldPlaceholder"
:default-field="defaultFields.find((f) => f.name === item.field.name)" :default-field="defaultFieldsIndex[item.field.name]"
:default-submitters="defaultSubmitters" :default-submitters="defaultSubmitters"
:max-page="totalPages - 1" :max-page="totalPages - 1"
@start-resize="resizeDirection = $event" @start-resize="resizeDirection = $event"
@ -142,6 +142,13 @@ export default {
} }
}, },
computed: { computed: {
defaultFieldsIndex () {
return this.defaultFields.reduce((acc, field) => {
acc[field.name] = field
return acc
}, {})
},
defaultFieldType () { defaultFieldType () {
if (this.drawFieldType) { if (this.drawFieldType) {
return this.drawFieldType return this.drawFieldType

Loading…
Cancel
Save