Commit 3681dba5 by zhaochengxiang

bug fix

parent 375727c6
...@@ -586,7 +586,7 @@ const EditModel = (props) => { ...@@ -586,7 +586,7 @@ const EditModel = (props) => {
onClick={onHistory} onClick={onHistory}
ghost ghost
permissionKey='历史版本' permissionKey='历史版本'
defaultPermission={(branchId||approvalId)?true:undefined} defaultPermission={(branchId||getQueryParam(Action, props.location?.search)==='flow')?true:undefined}
permissions={privilege?.optionList?.filter(item => item.enabled)?.map(item => item.name)} permissions={privilege?.optionList?.filter(item => item.enabled)?.map(item => item.name)}
> >
历史版本 历史版本
...@@ -632,7 +632,7 @@ const EditModel = (props) => { ...@@ -632,7 +632,7 @@ const EditModel = (props) => {
onClick={onHistory} onClick={onHistory}
ghost ghost
permissionKey='历史版本' permissionKey='历史版本'
permissions={modelerData?.optionList?.filter(item => item.enabled)?.map(item => item.name)} defaultPermission={true}
> >
历史版本 历史版本
</PermissionButton> </PermissionButton>
...@@ -649,7 +649,7 @@ const EditModel = (props) => { ...@@ -649,7 +649,7 @@ const EditModel = (props) => {
}} }}
ghost ghost
permissionKey='编辑' permissionKey='编辑'
permissions={modelerData?.optionList?.filter(item => item.enabled)?.map(item => item.name)} defaultPermission={true}
> >
编辑历史存储形式 编辑历史存储形式
</PermissionButton> </PermissionButton>
...@@ -660,7 +660,7 @@ const EditModel = (props) => { ...@@ -660,7 +660,7 @@ const EditModel = (props) => {
tooltipPlacement='topRight' tooltipPlacement='topRight'
onClick={edit} onClick={edit}
permissionKey='编辑' permissionKey='编辑'
permissions={modelerData?.optionList?.filter(item => item.enabled)?.map(item => item.name)} defaultPermission={true}
> >
编辑 编辑
</PermissionButton> </PermissionButton>
......
...@@ -529,7 +529,7 @@ export const ImportActionTable = (props) => { ...@@ -529,7 +529,7 @@ export const ImportActionTable = (props) => {
const menuData = useMemo(() => { const menuData = useMemo(() => {
let newMenuData = [] let newMenuData = []
if (action === 'flow') { if (originAction === 'flow') {
if (currentItem?.isPossibleNewRecommendedDefinition?.possible) { if (currentItem?.isPossibleNewRecommendedDefinition?.possible) {
newMenuData.push({ newMenuData.push({
title: '加入标准', title: '加入标准',
......
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