Commit 03c11ccb by zhaochengxiang

放开衍生表编辑

parent df6b39ab
...@@ -475,18 +475,13 @@ const EditModel = (props) => { ...@@ -475,18 +475,13 @@ const EditModel = (props) => {
) )
} else if (action === 'detail') { } else if (action === 'detail') {
let editTip = '', deleteTip = '', editDisabled = false; let editTip = '', deleteTip = '', editDisabled = false;
if (modelerData?.inheritedFromEasyDataModelerDataModel) { if (modelerData?.state?.id === '4') {
editTip = '请到对应的当前表修改'; if (!modelerData?.permitCheckOut) {
editDisabled = true; editTip = `${modelerData?.holder||''}正在编辑中, 不允许再编辑`;
} else {
if (modelerData?.state?.id === '4') {
if (!modelerData?.permitCheckOut) {
editTip = `${modelerData?.holder||''}正在编辑中, 不允许再编辑`;
editDisabled = true;
}
} else if (!modelerData?.editable) {
editDisabled = true; editDisabled = true;
} }
} else if (!modelerData?.editable) {
editDisabled = true;
} }
if (modelerData?.state?.id === '2') { if (modelerData?.state?.id === '2') {
......
...@@ -706,20 +706,14 @@ const ModelTable = (props) => { ...@@ -706,20 +706,14 @@ const ModelTable = (props) => {
let disableEdit = false, disableDelete = false, editTip = '', deleteTip = '', editMenuTitle = '编辑'; let disableEdit = false, disableDelete = false, editTip = '', deleteTip = '', editMenuTitle = '编辑';
if (currentItem?.inherited) { if (!currentItem?.editable && currentItem?.state?.id!=='4') {
disableEdit = true; disableEdit = true;
editTip = '请到对应的当前表修改'; }
editMenuTitle = '编辑(请到对应的当前表修改)';
} else { if (!currentItem?.permitCheckOut && currentItem?.state?.id==='4') {
if (!currentItem?.editable && currentItem?.state?.id!=='4') { disableEdit = true;
disableEdit = true; editTip = `${currentItem.holder||''}正在编辑中, 不允许再编辑`;
} editMenuTitle = `编辑(${currentItem.holder||''}正在编辑中)`;
if (!currentItem?.permitCheckOut && currentItem?.state?.id==='4') {
disableEdit = true;
editTip = `${currentItem.holder||''}正在编辑中, 不允许再编辑`;
editMenuTitle = `编辑(${currentItem.holder||''}正在编辑中)`;
}
} }
if (!currentItem?.deletable) { if (!currentItem?.deletable) {
......
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