Commit 079c427c by zhaochengxiang

编辑检出功能合并

parent 8aca7976
...@@ -761,7 +761,22 @@ const ModelTable = (props) => { ...@@ -761,7 +761,22 @@ const ModelTable = (props) => {
const handleItemClick = ({ id, event, props }) => { const handleItemClick = ({ id, event, props }) => {
if (id === 'edit') { if (id === 'edit') {
if (currentItem?.editable) {
editItem(currentItem); editItem(currentItem);
} else if (currentItem?.permitCheckOut) {
dispatch({
type: 'pds.checkoutService',
payload: {
params: {
id: currentItem?.id
}
},
callback: data => {
onChange && onChange();
editItem(data);
}
})
}
} else if (id === 'delete') { } else if (id === 'delete') {
deleteItem(currentItem); deleteItem(currentItem);
} else if (id === 'sample') { } else if (id === 'sample') {
...@@ -929,17 +944,17 @@ const ModelTable = (props) => { ...@@ -929,17 +944,17 @@ const ModelTable = (props) => {
} }
<RcMenu id={MENU_ID}> <RcMenu id={MENU_ID}>
{ {
(getDataModelerRole(user)!==DataModelerRoleReader) && view!=='grant' && <RcItem id="edit" disabled={!currentItem?.editable} onClick={handleItemClick}> (getDataModelerRole(user)!==DataModelerRoleReader) && view!=='grant' && !isOnlyEnding && <RcItem id="edit" disabled={!currentItem?.editable&&!currentItem?.permitCheckOut} onClick={handleItemClick}>
编辑 编辑
</RcItem> </RcItem>
} }
{ {
getDataModelerRole(user)!==DataModelerRoleReader && view!=='grant' && !isOnlyEnding && currentItem?.permitCheckOut && <RcItem id="checkout" onClick={handleItemClick}> // getDataModelerRole(user)!==DataModelerRoleReader && view!=='grant' && !isOnlyEnding && currentItem?.permitCheckOut && <RcItem id="checkout" onClick={handleItemClick}>
检出 // 检出
</RcItem> // </RcItem>
} }
{ {
(getDataModelerRole(user)!==DataModelerRoleReader) && view!=='grant' && <RcItem id="delete" disabled={!currentItem?.deletable} onClick={handleItemClick}> (getDataModelerRole(user)!==DataModelerRoleReader) && view!=='grant'&& !isOnlyEnding && <RcItem id="delete" disabled={!currentItem?.deletable} onClick={handleItemClick}>
<Tooltip title={deleteTip}> <Tooltip title={deleteTip}>
删除 删除
</Tooltip> </Tooltip>
......
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