fm453/nocobase
1
0
Fork 0
mirror of https://gitee.com/nocobase/nocobase.git synced 2025-05-05 21:49:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: test

Browse Source
This commit is contained in:
霍世杰 2025-02-21 11:29:43 +08:00
parent 65eb91bef3
commit b80b6702ab
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/core/acl/src/acl.ts
View File

@ -170,7 +170,7 @@ export class ACL extends EventEmitter {
} }
getRoles(names: string[]): ACLRole[] { getRoles(names: string[]): ACLRole[] {
return names.map((name) => this.getRole(name)); return names.map((name) => this.getRole(name)).filter((x) => Boolean(x));
} }
removeRole(name: string) { removeRole(name: string) {

2
packages/plugins/@nocobase/plugin-acl/src/server/actions/role-check.ts
View File

@ -39,7 +39,7 @@ export async function checkAction(ctx, next) {
let roles = ctx.app.acl.getRoles(currentRoles); let roles = ctx.app.acl.getRoles(currentRoles);
if (!roles.length) { if (!roles.length) {
await ctx.app.emitAsync('acl:writeRoleToACL', roleInstances); await Promise.all(roleInstances.map((x) => ctx.app.emitAsync('acl:writeRoleToACL', x)));
roles = ctx.app.acl.getRoles(currentRoles); roles = ctx.app.acl.getRoles(currentRoles);
} }
const availableActions = ctx.app.acl.getAvailableActions(); const availableActions = ctx.app.acl.getAvailableActions();

7
packages/plugins/@nocobase/plugin-acl/src/server/utils/role.ts
View File

@ -12,9 +12,7 @@ import _ from 'lodash';
export function mergeRole(roles) { export function mergeRole(roles) {
const result: Record<string, any> = { const result: Record<string, any> = {
roles: [], roles: [],
strategy: { strategy: {},
actions: [],
},
actions: null, actions: null,
snippets: [], snippets: [],
resources: null, resources: null,
@ -35,6 +33,9 @@ function mergeRoleNames(sourceRoleNames, newRoleName) {
} }
function mergeRoleStrategy(sourceStrategy, newStrategy) { function mergeRoleStrategy(sourceStrategy, newStrategy) {
if (!newStrategy) {
return sourceStrategy;
}
const actions = sourceStrategy.actions.concat(newStrategy.actions); const actions = sourceStrategy.actions.concat(newStrategy.actions);
return { return {
...sourceStrategy, ...sourceStrategy,