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

Merge branch 'main' into next

Browse Source
This commit is contained in:
nocobase[bot] 2025-04-24 09:09:34 +00:00
commit b739367029
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -316,6 +316,8 @@ export const ACLActionProvider = (props) => {
let actionPath = schema['x-acl-action']; let actionPath = schema['x-acl-action'];
// 只兼容这些数据表资源按钮 // 只兼容这些数据表资源按钮
const resourceActionPath = ['create', 'update', 'destroy', 'importXlsx', 'export']; const resourceActionPath = ['create', 'update', 'destroy', 'importXlsx', 'export'];
// 视图表无编辑权限时不支持的操作
const writableViewCollectionAction = ['create', 'update', 'destroy', 'importXlsx', 'bulkDestroy', 'bulkUpdate'];
if (!actionPath && resource && schema['x-action'] && resourceActionPath.includes(schema['x-action'])) { if (!actionPath && resource && schema['x-action'] && resourceActionPath.includes(schema['x-action'])) {
actionPath = `${resource}:${schema['x-action']}`; actionPath = `${resource}:${schema['x-action']}`;
@ -339,15 +341,15 @@ export const ACLActionProvider = (props) => {
if (!params) { if (!params) {
return <ACLActionParamsContext.Provider value={params}>{props.children}</ACLActionParamsContext.Provider>; return <ACLActionParamsContext.Provider value={params}>{props.children}</ACLActionParamsContext.Provider>;
} }
//视图表无编辑权限时仅支持显示导出按钮 //视图表无编辑权限时不支持 writableViewCollectionAction 的按钮
if ( if (
['create', 'update', 'destroy', 'importXlsx'].includes(actionPath) || writableViewCollectionAction.includes(actionPath) ||
['create', 'update', 'destroy', 'importXlsx'].includes(actionPath?.split(':')[1]) writableViewCollectionAction.includes(actionPath?.split(':')[1])
) { ) {
if ((collection && collection.template !== 'view') || collection?.writableView) { if ((collection && collection.template !== 'view') || collection?.writableView) {
return <ACLActionParamsContext.Provider value={params}>{props.children}</ACLActionParamsContext.Provider>; return <ACLActionParamsContext.Provider value={params}>{props.children}</ACLActionParamsContext.Provider>;
} }
return null; return <ACLActionParamsContext.Provider value={false}>{props.children}</ACLActionParamsContext.Provider>;
} }
return <ACLActionParamsContext.Provider value={params}>{props.children}</ACLActionParamsContext.Provider>; return <ACLActionParamsContext.Provider value={params}>{props.children}</ACLActionParamsContext.Provider>;
}; };