Fixed empty calculated inline fields showing calc

This commit is contained in:
Stefan Zermatten
2022-09-25 12:39:49 +02:00
parent 9f0ffe13f8
commit 87f79737e8
2 changed files with 39 additions and 19 deletions

View File

@@ -10,7 +10,7 @@
</v-toolbar-title>
<v-spacer />
</template>
<v-card-text v-if="model.summary">
<v-card-text v-if="summaryText">
<property-description
text
:model="model.summary"
@@ -20,21 +20,31 @@
</template>
<script lang="js">
import ToolbarCard from '/imports/ui/components/ToolbarCard.vue';
import PropertyDescription from '/imports/ui/properties/viewers/shared/PropertyDescription.vue'
import ToolbarCard from '/imports/ui/components/ToolbarCard.vue';
import PropertyDescription from '/imports/ui/properties/viewers/shared/PropertyDescription.vue'
export default {
components: {
ToolbarCard,
PropertyDescription,
},
props: {
model: {
type: Object,
required: true,
},
},
};
export default {
components: {
ToolbarCard,
PropertyDescription,
},
props: {
model: {
type: Object,
required: true,
},
},
computed: {
summaryText() {
if (!this.model || !this.model.summary) return;
if (typeof this.model.summary.value === 'string') {
return this.model.summary.value;
} else {
return this.model.summary.text
}
},
}
};
</script>
<style lang="css" scoped>

View File

@@ -1,15 +1,15 @@
<template lang="html">
<markdown-text
v-if="text && model"
:markdown="model.value || model.text"
:markdown="textValue"
/>
<property-field
v-else-if="model && (model.value || model.text)"
v-else-if="model && textValue"
:name="name"
:cols="{cols: 12}"
>
<markdown-text
:markdown="model.value || model.text"
:markdown="textValue"
/>
</property-field>
</template>
@@ -33,7 +33,17 @@ export default {
default: undefined,
},
text: Boolean,
},
},
computed: {
textValue() {
if (!this.model) return;
if (typeof this.model.value === 'string') {
return this.model.value;
} else {
return this.model.text
}
},
},
}
</script>