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

fix: pagination error in roles collections resourcer

Browse Source
This commit is contained in:
Chareice 2024-03-12 15:14:59 +08:00
parent de6e8469d3
commit 023096b1a9
No known key found for this signature in database
1 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
packages/plugins/@nocobase/plugin-data-source-manager/src/server/resourcers/roles-data-sources-collections.ts
View File

@ -22,7 +22,7 @@ const rolesRemoteCollectionsResourcer = {
const collectionRepository = new FullDataRepository<any>(dataSource.collectionManager.getCollections());
// all collections
const [collections, count] = await collectionRepository.findAndCount();
const [collections] = await collectionRepository.findAndCount();
const filterItem = lodash.get(filter, '$and');
const filterByTitle = filterItem?.find((item) => item.title);
@ -45,44 +45,44 @@ const rolesRemoteCollectionsResourcer = {
.filter((roleResources) => roleResources.get('usingActionsConfig'))
.map((roleResources) => roleResources.get('name'));
const filtedCollections = collections.filter((collection) => {
return (
(!filterTitle || lodash.get(collection, 'options.title')?.toLowerCase().includes(filterTitle)) &&
(!filterName || collection.options.name.toLowerCase().includes(filterName))
);
});
const items = lodash.sortBy(
collections
.filter((collection) => {
return (
(!filterTitle || lodash.get(collection, 'options.title')?.toLowerCase().includes(filterTitle)) &&
(!filterName || collection.options.name.toLowerCase().includes(filterName))
);
})
.map((collection, i) => {
const collectionName = collection.options.name;
const exists = roleResourcesNames.includes(collectionName);
filtedCollections.map((collection, i) => {
const collectionName = collection.options.name;
const exists = roleResourcesNames.includes(collectionName);
const usingConfig: UsingConfigType = roleResourceActionResourceNames.includes(collectionName)
? 'resourceAction'
: 'strategy';
const usingConfig: UsingConfigType = roleResourceActionResourceNames.includes(collectionName)
? 'resourceAction'
: 'strategy';
return {
type: 'collection',
name: collectionName,
collectionName,
title: collection.options.uiSchema?.title || collection.options.title,
roleName: role,
usingConfig,
exists,
fields: [...collection.fields.values()].map((field) => {
return field.options;
}),
};
}),
return {
type: 'collection',
name: collectionName,
collectionName,
title: collection.options.uiSchema?.title || collection.options.title,
roleName: role,
usingConfig,
exists,
fields: [...collection.fields.values()].map((field) => {
return field.options;
}),
};
}),
'name',
);
ctx.body = {
count,
count: filtedCollections.length,
rows: items,
page: Number(page),
pageSize: Number(pageSize),
totalPage: totalPage(count, pageSize),
totalPage: totalPage(filtedCollections.length, pageSize),
};
await next();