diff --git a/resources/js/components/fieldtypes/ArrayFieldtype.vue b/resources/js/components/fieldtypes/ArrayFieldtype.vue index b62dd7dc98b..16cdfc60c69 100644 --- a/resources/js/components/fieldtypes/ArrayFieldtype.vue +++ b/resources/js/components/fieldtypes/ArrayFieldtype.vue @@ -7,7 +7,7 @@ @@ -129,8 +129,12 @@ export default { }, computed: { + keys() { + return this.meta.keys || this.config.keys; + }, + isKeyed() { - return Boolean(Object.keys(this.meta.keys).length); + return Boolean(Object.keys(this.keys).length); }, isDynamic() { @@ -142,7 +146,7 @@ export default { }, keyedData() { - return this.data.filter(element => this.meta.keys.hasOwnProperty(element.key)); + return this.data.filter(element => this.keys.hasOwnProperty(element.key)); }, maxItems() { diff --git a/resources/js/components/fieldtypes/ButtonGroupFieldtype.vue b/resources/js/components/fieldtypes/ButtonGroupFieldtype.vue index 246833595f8..93aeb89e74f 100644 --- a/resources/js/components/fieldtypes/ButtonGroupFieldtype.vue +++ b/resources/js/components/fieldtypes/ButtonGroupFieldtype.vue @@ -39,7 +39,7 @@ export default { computed: { options() { - return this.normalizeInputOptions(this.meta.options); + return this.normalizeInputOptions(this.meta.options || this.config.options); }, replicatorPreview() { diff --git a/resources/js/components/fieldtypes/CheckboxesFieldtype.vue b/resources/js/components/fieldtypes/CheckboxesFieldtype.vue index 93f35eaa655..96b717e64fd 100644 --- a/resources/js/components/fieldtypes/CheckboxesFieldtype.vue +++ b/resources/js/components/fieldtypes/CheckboxesFieldtype.vue @@ -30,7 +30,7 @@ export default { computed: { options() { - return this.normalizeInputOptions(this.meta.options); + return this.normalizeInputOptions(this.meta.options || this.config.options); }, replicatorPreview() { diff --git a/resources/js/components/fieldtypes/RadioFieldtype.vue b/resources/js/components/fieldtypes/RadioFieldtype.vue index a9abd770eab..82b22b94ad1 100644 --- a/resources/js/components/fieldtypes/RadioFieldtype.vue +++ b/resources/js/components/fieldtypes/RadioFieldtype.vue @@ -48,7 +48,7 @@ export default { computed: { options() { - return this.normalizeInputOptions(this.meta.options); + return this.normalizeInputOptions(this.meta.options || this.config.options); }, replicatorPreview() { diff --git a/resources/js/components/fieldtypes/SelectFieldtype.vue b/resources/js/components/fieldtypes/SelectFieldtype.vue index 1a06a08d769..945a10f1c35 100644 --- a/resources/js/components/fieldtypes/SelectFieldtype.vue +++ b/resources/js/components/fieldtypes/SelectFieldtype.vue @@ -106,7 +106,7 @@ export default { }, options() { - return this.normalizeInputOptions(this.meta.options); + return this.normalizeInputOptions(this.meta.options || this.config.options); }, replicatorPreview() {