Commit bf6668b3 by zhaochengxiang

衍生表不允许直接编辑

parent f7708e18
...@@ -294,9 +294,7 @@ const EditModel = (props) => { ...@@ -294,9 +294,7 @@ const EditModel = (props) => {
let editTip = ''; let editTip = '';
if (modelerData?.inheritedFromEasyDataModelerDataModel) { if (modelerData?.inheritedFromEasyDataModelerDataModel) {
if (!modelerData?.editable) { editTip = '请到对应的当前表修改';
editTip = '请到对应的当前表修改';
}
} else { } else {
if (!editable && stateId !== '4') { if (!editable && stateId !== '4') {
if (stateId === '2') { if (stateId === '2') {
...@@ -324,7 +322,7 @@ const EditModel = (props) => { ...@@ -324,7 +322,7 @@ const EditModel = (props) => {
</Button> </Button>
} }
<Tooltip title={editTip}> <Tooltip title={editTip}>
<Button type='primary' onClick={edit} disabled={(stateId==='4')?!permitCheckOut:!editable} danger > <Button type='primary' onClick={edit} disabled={ modelerData?.inheritedFromEasyDataModelerDataModel?true:((stateId==='4')?!permitCheckOut:!editable)} danger >
编辑 编辑
</Button> </Button>
</Tooltip> </Tooltip>
......
...@@ -462,11 +462,9 @@ const ModelTable = (props) => { ...@@ -462,11 +462,9 @@ const ModelTable = (props) => {
let disableEdit = false, disableDelete = false, editTip = '', deleteTip = '', editMenuTitle = '编辑'; let disableEdit = false, disableDelete = false, editTip = '', deleteTip = '', editMenuTitle = '编辑';
if (currentItem?.inherited) { if (currentItem?.inherited) {
if (!currentItem?.editable) { disableEdit = true;
disableEdit = true; editTip = '请到对应的当前表修改';
editTip = '请到对应的当前表修改'; editMenuTitle = '编辑(请到对应的当前表修改)';
editMenuTitle = '编辑(请到对应的当前表修改)';
}
} else { } else {
if (!currentItem?.editable && currentItem?.state?.id!=='4') { if (!currentItem?.editable && currentItem?.state?.id!=='4') {
disableEdit = true; disableEdit = true;
......
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