Commit 3a4adce7 by zhaochengxiang

分支管理按钮不做权限控制

parent 803d2490
...@@ -112,10 +112,10 @@ const EditModel = (props) => { ...@@ -112,10 +112,10 @@ const EditModel = (props) => {
}, [approvalId]) }, [approvalId])
useEffect(() => { useEffect(() => {
if (getQueryParam(Action, props.location?.search) !== 'flow' && modelerId) { if (getQueryParam(Action, props.location?.search) !== 'flow' && modelerId && !branchId) {
getModelPrivilege() getModelPrivilege()
} }
}, [modelerId]) }, [modelerId, branchId])
useMount(() => { useMount(() => {
window?.addEventListener('beforeunload', confirmQuit); window?.addEventListener('beforeunload', confirmQuit);
...@@ -487,6 +487,7 @@ const EditModel = (props) => { ...@@ -487,6 +487,7 @@ const EditModel = (props) => {
danger danger
tip={deleteTip} tip={deleteTip}
permissionKey='删除' permissionKey='删除'
defaultPermission={branchId?true:undefined}
permissions={privilege?.optionList?.filter(item => item.enabled)?.map(item => item.name)} permissions={privilege?.optionList?.filter(item => item.enabled)?.map(item => item.name)}
> >
删除 删除
...@@ -496,6 +497,7 @@ const EditModel = (props) => { ...@@ -496,6 +497,7 @@ const EditModel = (props) => {
onClick={onCopy} onClick={onCopy}
ghost ghost
permissionKey='新增' permissionKey='新增'
defaultPermission={branchId?true:undefined}
permissions={privilege?.optionList?.filter(item => item.enabled)?.map(item => item.name)} permissions={privilege?.optionList?.filter(item => item.enabled)?.map(item => item.name)}
> >
复制模型 复制模型
...@@ -505,6 +507,7 @@ const EditModel = (props) => { ...@@ -505,6 +507,7 @@ const EditModel = (props) => {
onClick={onExport} onClick={onExport}
ghost ghost
permissionKey='导出' permissionKey='导出'
defaultPermission={branchId?true:undefined}
permissions={privilege?.optionList?.filter(item => item.enabled)?.map(item => item.name)} permissions={privilege?.optionList?.filter(item => item.enabled)?.map(item => item.name)}
> >
导出 导出
...@@ -515,6 +518,7 @@ const EditModel = (props) => { ...@@ -515,6 +518,7 @@ const EditModel = (props) => {
onClick={onChangeCatalog} onClick={onChangeCatalog}
ghost ghost
permissionKey='变更目录' permissionKey='变更目录'
defaultPermission={branchId?true:undefined}
permissions={privilege?.optionList?.filter(item => item.enabled)?.map(item => item.name)} permissions={privilege?.optionList?.filter(item => item.enabled)?.map(item => item.name)}
> >
变更目录 变更目录
...@@ -525,6 +529,7 @@ const EditModel = (props) => { ...@@ -525,6 +529,7 @@ const EditModel = (props) => {
onClick={onHistory} onClick={onHistory}
ghost ghost
permissionKey='历史版本' permissionKey='历史版本'
defaultPermission={branchId?true:undefined}
permissions={privilege?.optionList?.filter(item => item.enabled)?.map(item => item.name)} permissions={privilege?.optionList?.filter(item => item.enabled)?.map(item => item.name)}
> >
历史版本 历史版本
...@@ -544,6 +549,7 @@ const EditModel = (props) => { ...@@ -544,6 +549,7 @@ const EditModel = (props) => {
}} }}
ghost ghost
permissionKey='编辑' permissionKey='编辑'
defaultPermission={branchId?true:undefined}
permissions={privilege?.optionList?.filter(item => item.enabled)?.map(item => item.name)} permissions={privilege?.optionList?.filter(item => item.enabled)?.map(item => item.name)}
> >
编辑历史存储形式 编辑历史存储形式
...@@ -555,6 +561,7 @@ const EditModel = (props) => { ...@@ -555,6 +561,7 @@ const EditModel = (props) => {
disabled={ modelerData?.inheritedFromEasyDataModelerDataModel?true:((stateId==='4')?!permitCheckOut:!editable)} disabled={ modelerData?.inheritedFromEasyDataModelerDataModel?true:((stateId==='4')?!permitCheckOut:!editable)}
tip={editTip} tip={editTip}
permissionKey='编辑' permissionKey='编辑'
defaultPermission={branchId?true:undefined}
permissions={privilege?.optionList?.filter(item => item.enabled)?.map(item => item.name)} permissions={privilege?.optionList?.filter(item => item.enabled)?.map(item => item.name)}
> >
编辑 编辑
...@@ -574,6 +581,7 @@ const EditModel = (props) => { ...@@ -574,6 +581,7 @@ const EditModel = (props) => {
onClick={onHistory} onClick={onHistory}
ghost ghost
permissionKey='历史版本' permissionKey='历史版本'
defaultPermission={branchId?true:undefined}
permissions={modelerData?.optionList?.filter(item => item.enabled)?.map(item => item.name)} permissions={modelerData?.optionList?.filter(item => item.enabled)?.map(item => item.name)}
> >
历史版本 历史版本
......
...@@ -165,7 +165,7 @@ const ImportActionHeader = (props) => { ...@@ -165,7 +165,7 @@ const ImportActionHeader = (props) => {
}, [editable, modelerData]) }, [editable, modelerData])
const marginBottom = useMemo(() => { const marginBottom = useMemo(() => {
return editable ? 15 : 10 return editable ? 15 : 10
}, [editable]) }, [editable])
const formItemLayout = { const formItemLayout = {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment