mirrors/nocobase
1
0
Fork 0
mirror of https://github.com/nocobase/nocobase synced 2024-11-15 07:45:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix(collection-manager): filter out empty

Browse Source
This commit is contained in:
chenos 2023-03-11 09:42:00 +08:00
parent 0832a56868
commit 186da56bdc
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
packages/core/client/src/collection-manager/hooks/useCollectionManager.ts
View File

@ -19,11 +19,11 @@ export const useCollectionManager = () => {
},
[],
);
return inheritedFields;
return inheritedFields.filter(Boolean);
};
const getCollectionFields = (name: string): CollectionFieldOptions[] => {
const currentFields = collections?.find((collection) => collection.name === name)?.fields;
const currentFields = collections?.find((collection) => collection.name === name)?.fields || [];
const inheritedFields = getInheritedFields(name);
const totalFields = unionBy(currentFields?.concat(inheritedFields) || [], 'name').filter((v: any) => {
return !v.isForeignKey;
@ -174,8 +174,8 @@ export const useCollectionManager = () => {
return templates[name] ? clone(templates[name] || templates['general']) : null;
},
getParentCollectionFields: (parentCollection, currentCollection) => {
const currentFields = collections?.find((collection) => collection.name === currentCollection)?.fields;
const parentFields = collections?.find((collection) => collection.name === parentCollection)?.fields;
const currentFields = collections?.find((collection) => collection.name === currentCollection)?.fields || [];
const parentFields = collections?.find((collection) => collection.name === parentCollection)?.fields || [];
const inheritKeys = getInheritCollections(currentCollection);
const index = inheritKeys.indexOf(parentCollection);
let filterFields = currentFields;