Fix display rendering in o2m / m2m

Fixes #162
This commit is contained in:
rijkvanzanten
2020-09-18 12:26:55 -04:00
parent aa014542a4
commit 021fa44877
2 changed files with 18 additions and 11 deletions

View File

@@ -16,13 +16,13 @@
<template v-for="header in tableHeaders" v-slot:[`item.${header.value}`]="{ item }">
<render-display
:key="header.value"
:value="get(item, header.value)"
:value="item[header.value]"
:display="header.field.display"
:options="header.field.display_options"
:options="header.field.displayOptions"
:interface="header.field.interface"
:interface-options="header.field.options"
:interface-options="header.field.interfaceOptions"
:type="header.field.type"
:collection="header.field.collection"
:collection="relatedCollection.collection"
:field="header.field.field"
/>
</template>
@@ -224,15 +224,22 @@ export default defineComponent({
tableHeaders.value = props.fields.map(
(fieldKey): TableHeader => {
const fieldInfo = fieldsStore.getField(junctionCollection.value, fieldKey);
const field = fieldsStore.getField(junctionCollection.value, fieldKey);
return {
text: fieldInfo.name,
text: field.name,
value: fieldKey,
align: 'left',
sortable: true,
width: null,
field: fieldInfo,
field: {
display: field.meta?.display,
displayOptions: field.meta?.display_options,
interface: field.meta?.interface,
interfaceOptions: field.meta?.options,
type: field.type,
field: field.field,
},
};
}
);

View File

@@ -319,10 +319,10 @@ export default defineComponent({
sortable: true,
width: null,
field: {
display: field.display,
displayOptions: field.display_options,
interface: field.interface,
interfaceOptions: field.options,
display: field.meta?.display,
displayOptions: field.meta?.display_options,
interface: field.meta?.interface,
interfaceOptions: field.meta?.options,
type: field.type,
field: field.field,
},