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

fix: get children collection bug

Browse Source
This commit is contained in:
dream2023 2024-01-17 10:38:48 +08:00
parent 087e2dcfe4
commit c9aae391bd
1 changed files with 35 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
packages/core/client/src/collection-manager/mixins/InheritanceCollectionMixin.ts
View File

@ -1,10 +1,12 @@
import { CollectionFieldOptionsV2, GetCollectionFieldPredicate } from '../../application'; import { CollectionFieldOptionsV2, GetCollectionFieldPredicate } from '../../application';
import { CollectionV2 } from '../../application/collection/Collection'; import { CollectionV2 } from '../../application/collection/Collection';
import _, { filter, unionBy, uniq, uniqBy } from 'lodash'; import _, { filter, unionBy, uniq } from 'lodash';
export class InheritanceCollectionMixin extends CollectionV2 { export class InheritanceCollectionMixin extends CollectionV2 {
protected parentCollections: string[]; protected parentCollectionsName: string[];
protected childrenCollections: string[]; protected parentCollections: CollectionV2[];
protected childrenCollections: { supportView?: CollectionV2[]; notSupportView?: CollectionV2[] } = {};
protected childrenCollectionsName: { supportView?: string[]; notSupportView?: string[] } = {};
protected inheritsFields: CollectionFieldOptionsV2[]; protected inheritsFields: CollectionFieldOptionsV2[];
protected currentFields: CollectionFieldOptionsV2[]; protected currentFields: CollectionFieldOptionsV2[];
protected allFields: CollectionFieldOptionsV2[]; protected allFields: CollectionFieldOptionsV2[];
@ -14,9 +16,10 @@ export class InheritanceCollectionMixin extends CollectionV2 {
protected foreignKeyFields: CollectionFieldOptionsV2[]; protected foreignKeyFields: CollectionFieldOptionsV2[];
getParentCollectionsName() { getParentCollectionsName() {
if (this.parentCollections?.length) { if (this.parentCollectionsName?.length) {
return this.parentCollections; return this.parentCollectionsName;
} }
const parents: string[] = []; const parents: string[] = [];
const getParentCollectionsInner = (collectionName: string) => { const getParentCollectionsInner = (collectionName: string) => {
const collection = this.collectionManager.getCollection(collectionName); const collection = this.collectionManager.getCollection(collectionName);
@ -33,19 +36,24 @@ export class InheritanceCollectionMixin extends CollectionV2 {
return uniq(parents); return uniq(parents);
}; };
this.parentCollections = getParentCollectionsInner(this.name); this.parentCollectionsName = getParentCollectionsInner(this.name);
return this.parentCollections; return this.parentCollectionsName;
} }
getParentCollections() { getParentCollections() {
return this.getParentCollectionsName().map((collectionName) => { if (this.parentCollections?.length) {
return this.parentCollections;
}
this.parentCollections = this.getParentCollectionsName().map((collectionName) => {
return this.collectionManager.getCollection(collectionName); return this.collectionManager.getCollection(collectionName);
}); });
return this.parentCollections;
} }
getChildrenCollectionsName(isSupportView = false) { getChildrenCollectionsName(isSupportView = false) {
if (this.childrenCollections?.length) { const cacheKey = isSupportView ? 'supportView' : 'notSupportView';
return this.childrenCollections; if (this.childrenCollectionsName[cacheKey]?.length) {
return this.childrenCollectionsName[cacheKey];
} }
const children: string[] = []; const children: string[] = [];
@ -56,12 +64,12 @@ export class InheritanceCollectionMixin extends CollectionV2 {
}); });
inheritCollections.forEach((v) => { inheritCollections.forEach((v) => {
const collectionKey = v.name; const collectionKey = v.name;
children.push(v.name); children.push(collectionKey);
return getChildrenCollectionsInner(collectionKey); return getChildrenCollectionsInner(collectionKey);
}); });
if (isSupportView) { if (isSupportView) {
const sourceCollections = collections.filter((v) => { const sourceCollections = collections.filter((v) => {
return v.sources?.length === 1 && v?.sources[0] === name; return v.sources?.length === 1 && v?.sources[0] === collectionName;
}); });
sourceCollections.forEach((v) => { sourceCollections.forEach((v) => {
const collectionKey = v.name; const collectionKey = v.name;
@ -69,17 +77,22 @@ export class InheritanceCollectionMixin extends CollectionV2 {
return getChildrenCollectionsInner(collectionKey); return getChildrenCollectionsInner(collectionKey);
}); });
} }
return uniqBy(children, 'key'); return uniq(children);
}; };
this.childrenCollections = getChildrenCollectionsInner(this.name); this.childrenCollectionsName[cacheKey] = getChildrenCollectionsInner(this.name);
return this.childrenCollections; return this.childrenCollectionsName[cacheKey];
} }
getChildrenCollections(isSupportView = false) { getChildrenCollections(isSupportView = false) {
return this.getChildrenCollectionsName(isSupportView).map((collectionName) => { const cacheKey = isSupportView ? 'supportView' : 'notSupportView';
if (this.childrenCollections[cacheKey]?.length) {
return this.childrenCollections[cacheKey];
}
this.childrenCollections[cacheKey] = this.getChildrenCollectionsName(isSupportView).map((collectionName) => {
return this.collectionManager.getCollection(collectionName); return this.collectionManager.getCollection(collectionName);
}); });
return this.childrenCollections[cacheKey];
} }
getInheritedFields() { getInheritedFields() {
@ -98,12 +111,13 @@ export class InheritanceCollectionMixin extends CollectionV2 {
// override CollectionV2 // override CollectionV2
getFieldsMap() { getFieldsMap() {
if (!this.fieldsMap) { if (this.fieldsMap) {
this.fieldsMap = this.getAllFields().reduce((memo, field) => { return this.fieldsMap;
memo[field.name] = field;
return memo;
}, {});
} }
this.fieldsMap = this.getAllFields().reduce((memo, field) => {
memo[field.name] = field;
return memo;
}, {});
return this.fieldsMap; return this.fieldsMap;
} }
getCurrentFields(predicate?: GetCollectionFieldPredicate) { getCurrentFields(predicate?: GetCollectionFieldPredicate) {