github/directus
1
0
Fork 0
mirror of https://github.com/directus/directus.git synced 2026-02-01 05:45:09 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix order of form group filter (#6566)

Browse Source 
Fixes #6557
This commit is contained in:
Rijk van Zanten
2021-06-29 16:10:24 -04:00
committed by rijkvanzanten
parent e1a0d80b4e
commit 81fa88322a
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
app/src/components/v-form/v-form.vue
View File

@@ -204,7 +204,13 @@ export default defineComponent({
throw new Error('[v-form]: You need to pass either the collection or fields prop.');
});
const { formFields } = useFormFields(fields);
const fieldsInGroup = computed(() =>
fields.value.filter(
(field) => field.meta?.group === props.group || (props.group === null && isNil(field.meta?.group))
)
);
const { formFields } = useFormFields(fieldsInGroup);
const formFieldsParsed = computed(() => {
const blockPrimaryKey = (field: Field) => {
@@ -224,13 +230,7 @@ export default defineComponent({
return formFields.value.map((field) => blockPrimaryKey(field));
});
const formFieldsInGroup = computed(() =>
formFieldsParsed.value.filter(
(field) => field.meta?.group === props.group || (props.group === null && isNil(field.meta?.group))
)
);
return { formFields: formFieldsInGroup, isDisabled, getFieldsForGroup };
return { formFields: formFieldsParsed, isDisabled, getFieldsForGroup };
function isDisabled(field: Field) {
return (
@@ -242,7 +242,7 @@ export default defineComponent({
}
function getFieldsForGroup(group: null | number): Field[] {
const fieldsInGroup: Field[] = formFieldsParsed.value.filter(
const fieldsInGroup: Field[] = fields.value.filter(
(field) => field.meta?.group === group || (group === null && isNil(field.meta))
);