Commit f7708e18 by zhaochengxiang

修改提示

parent 453d1c5a
...@@ -293,6 +293,11 @@ const EditModel = (props) => { ...@@ -293,6 +293,11 @@ const EditModel = (props) => {
} else if (action === 'detail' || action === 'edit-inherited') { } else if (action === 'detail' || action === 'edit-inherited') {
let editTip = ''; let editTip = '';
if (modelerData?.inheritedFromEasyDataModelerDataModel) {
if (!modelerData?.editable) {
editTip = '请到对应的当前表修改';
}
} else {
if (!editable && stateId !== '4') { if (!editable && stateId !== '4') {
if (stateId === '2') { if (stateId === '2') {
editTip = '待发布的模型不允许编辑'; editTip = '待发布的模型不允许编辑';
...@@ -302,6 +307,7 @@ const EditModel = (props) => { ...@@ -302,6 +307,7 @@ const EditModel = (props) => {
if (!permitCheckOut && stateId === '4') { if (!permitCheckOut && stateId === '4') {
editTip = `${holder||''}正在编辑中, 不允许再编辑`; editTip = `${holder||''}正在编辑中, 不允许再编辑`;
} }
}
actionsBtn = ( actionsBtn = (
<Space> <Space>
......
...@@ -461,6 +461,13 @@ const ModelTable = (props) => { ...@@ -461,6 +461,13 @@ 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) {
disableEdit = true;
editTip = '请到对应的当前表修改';
editMenuTitle = '编辑(请到对应的当前表修改)';
}
} else {
if (!currentItem?.editable && currentItem?.state?.id!=='4') { if (!currentItem?.editable && currentItem?.state?.id!=='4') {
disableEdit = true; disableEdit = true;
...@@ -474,6 +481,7 @@ const ModelTable = (props) => { ...@@ -474,6 +481,7 @@ const ModelTable = (props) => {
editTip = `${currentItem.holder||''}正在编辑中, 不允许再编辑`; editTip = `${currentItem.holder||''}正在编辑中, 不允许再编辑`;
editMenuTitle = `编辑(${currentItem.holder||''}正在编辑中)`; editMenuTitle = `编辑(${currentItem.holder||''}正在编辑中)`;
} }
}
if (!currentItem?.deletable) { if (!currentItem?.deletable) {
disableDelete = true; disableDelete = 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