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

Merge branch 'main' into next

Browse Source
This commit is contained in:
nocobase[bot] 2025-02-12 13:16:16 +00:00
commit f79412daab
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/core/client/src/acl/ACLProvider.tsx
View File

@ -23,6 +23,7 @@ import {
useCollectionManager,
useCollectionRecordData,
useDataBlockProps,
useDataBlockRequest,
} from '../data-source';
import { useDataSourceKey } from '../data-source/data-source/DataSourceProvider';
import { SchemaComponentOptions, useDesignable } from '../schema-component';
@ -182,7 +183,8 @@ const getIgnoreScope = (options: any = {}) => {
const useAllowedActions = () => {
const service = useResourceActionContext();
return service?.data?.meta?.allowedActions;
const dataBlockRequest: any = useDataBlockRequest();
return service?.data?.meta?.allowedActions || dataBlockRequest?.data?.meta?.allowedActions;
};
const useResourceName = () => {