fix modal title

pull/381/merge
Pete Matsyburka 2 months ago
parent 659997c6c1
commit cf60dae2ff

@ -287,6 +287,7 @@
<FormulaModal <FormulaModal
:field="field" :field="field"
:editable="editable && !defaultField" :editable="editable && !defaultField"
:default-field="defaultField"
:build-default-name="buildDefaultName" :build-default-name="buildDefaultName"
@close="isShowFormulaModal = false" @close="isShowFormulaModal = false"
/> />
@ -298,6 +299,7 @@
<FontModal <FontModal
:field="field" :field="field"
:editable="editable && !defaultField" :editable="editable && !defaultField"
:default-field="defaultField"
:build-default-name="buildDefaultName" :build-default-name="buildDefaultName"
@close="isShowFontModal = false" @close="isShowFontModal = false"
/> />
@ -309,6 +311,7 @@
<ConditionsModal <ConditionsModal
:item="field" :item="field"
:build-default-name="buildDefaultName" :build-default-name="buildDefaultName"
:default-field="defaultField"
@close="isShowConditionsModal = false" @close="isShowConditionsModal = false"
/> />
</Teleport> </Teleport>
@ -319,6 +322,7 @@
<DescriptionModal <DescriptionModal
:field="field" :field="field"
:editable="editable && !defaultField" :editable="editable && !defaultField"
:default-field="defaultField"
:build-default-name="buildDefaultName" :build-default-name="buildDefaultName"
@close="isShowDescriptionModal = false" @close="isShowDescriptionModal = false"
/> />

@ -9,7 +9,7 @@
<div class="modal-box pt-4 pb-6 px-6 mt-20 max-h-none w-full max-w-xl"> <div class="modal-box pt-4 pb-6 px-6 mt-20 max-h-none w-full max-w-xl">
<div class="flex justify-between items-center border-b pb-2 mb-2 font-medium"> <div class="flex justify-between items-center border-b pb-2 mb-2 font-medium">
<span class="modal-title"> <span class="modal-title">
{{ t('condition') }} - {{ item.name || buildDefaultName(item, template.fields) }} {{ t('condition') }} - {{ (defaultField ? (defaultField.title || item.title || item.name) : item.name) || buildDefaultName(item, template.fields) }}
</span> </span>
<a <a
href="#" href="#"
@ -160,6 +160,11 @@ export default {
type: Object, type: Object,
required: true required: true
}, },
defaultField: {
type: Object,
required: false,
default: null
},
buildDefaultName: { buildDefaultName: {
type: Function, type: Function,
required: true required: true

@ -9,7 +9,7 @@
<div class="modal-box pt-4 pb-6 px-6 mt-20 max-h-none w-full max-w-xl"> <div class="modal-box pt-4 pb-6 px-6 mt-20 max-h-none w-full max-w-xl">
<div class="flex justify-between items-center border-b pb-2 mb-2 font-medium"> <div class="flex justify-between items-center border-b pb-2 mb-2 font-medium">
<span class="modal-title"> <span class="modal-title">
{{ field.name || buildDefaultName(field, template.fields) }} {{ (defaultField ? (defaultField.title || field.title || field.name) : field.name) || buildDefaultName(field, template.fields) }}
</span> </span>
<a <a
href="#" href="#"
@ -73,6 +73,11 @@ export default {
type: Object, type: Object,
required: true required: true
}, },
defaultField: {
type: Object,
required: false,
default: null
},
editable: { editable: {
type: Boolean, type: Boolean,
required: false, required: false,

@ -248,6 +248,7 @@
<FormulaModal <FormulaModal
:field="field" :field="field"
:editable="editable && !defaultField" :editable="editable && !defaultField"
:default-field="defaultField"
:build-default-name="buildDefaultName" :build-default-name="buildDefaultName"
@close="isShowFormulaModal = false" @close="isShowFormulaModal = false"
/> />
@ -259,6 +260,7 @@
<FontModal <FontModal
:field="field" :field="field"
:editable="editable && !defaultField" :editable="editable && !defaultField"
:default-field="defaultField"
:build-default-name="buildDefaultName" :build-default-name="buildDefaultName"
@close="isShowFontModal = false" @close="isShowFontModal = false"
/> />
@ -269,6 +271,7 @@
> >
<ConditionsModal <ConditionsModal
:item="field" :item="field"
:default-field="defaultField"
:build-default-name="buildDefaultName" :build-default-name="buildDefaultName"
@close="isShowConditionsModal = false" @close="isShowConditionsModal = false"
/> />
@ -280,6 +283,7 @@
<DescriptionModal <DescriptionModal
:field="field" :field="field"
:editable="editable && !defaultField" :editable="editable && !defaultField"
:default-field="defaultField"
:build-default-name="buildDefaultName" :build-default-name="buildDefaultName"
@close="isShowDescriptionModal = false" @close="isShowDescriptionModal = false"
/> />

@ -9,7 +9,7 @@
<div class="modal-box pt-4 pb-6 px-6 mt-20 max-h-none w-full max-w-xl"> <div class="modal-box pt-4 pb-6 px-6 mt-20 max-h-none w-full max-w-xl">
<div class="flex justify-between items-center border-b pb-2 mb-2 font-medium"> <div class="flex justify-between items-center border-b pb-2 mb-2 font-medium">
<span class="modal-title"> <span class="modal-title">
{{ t('font') }} - {{ field.name || buildDefaultName(field, template.fields) }} {{ t('font') }} - {{ (defaultField ? (defaultField.title || field.title || field.name) : field.name) || buildDefaultName(field, template.fields) }}
</span> </span>
<a <a
href="#" href="#"
@ -202,6 +202,11 @@ export default {
type: Object, type: Object,
required: true required: true
}, },
defaultField: {
type: Object,
required: false,
default: null
},
editable: { editable: {
type: Boolean, type: Boolean,
required: false, required: false,

@ -9,7 +9,7 @@
<div class="modal-box pt-4 pb-6 px-6 mt-20 max-h-none w-full max-w-xl"> <div class="modal-box pt-4 pb-6 px-6 mt-20 max-h-none w-full max-w-xl">
<div class="flex justify-between items-center border-b pb-2 mb-2 font-medium"> <div class="flex justify-between items-center border-b pb-2 mb-2 font-medium">
<span class="modal-title"> <span class="modal-title">
{{ t('formula') }} - {{ field.name || buildDefaultName(field, template.fields) }} {{ t('formula') }} - {{ (defaultField ? (defaultField.title || field.title || field.name) : field.name) || buildDefaultName(field, template.fields) }}
</span> </span>
<a <a
href="#" href="#"
@ -137,6 +137,11 @@ export default {
type: Object, type: Object,
required: true required: true
}, },
defaultField: {
type: Object,
required: false,
default: null
},
editable: { editable: {
type: Boolean, type: Boolean,
required: false, required: false,

Loading…
Cancel
Save