修改提示

src/view/Manage/Model/Component/EditModel.jsx

@@ -293,14 +293,20 @@ const EditModel = (props) => {
   } else if (action === 'detail' || action === 'edit-inherited') {
 
     let editTip = '';
-    if (!editable && stateId !== '4') {
-      if (stateId === '2') {
-        editTip = '待发布的模型不允许编辑';
+    if (modelerData?.inheritedFromEasyDataModelerDataModel) {
+      if (!modelerData?.editable) {
+        editTip = '请到对应的当前表修改';
+      }
+    } else {
+      if (!editable && stateId !== '4') {
+        if (stateId === '2') {
+          editTip = '待发布的模型不允许编辑';
+        }
+      }
+  
+      if (!permitCheckOut && stateId === '4') {
+        editTip = `${holder||''}正在编辑中, 不允许再编辑`;
       }
-    }
-
-    if (!permitCheckOut && stateId === '4') {
-      editTip = `${holder||''}正在编辑中, 不允许再编辑`;
     }
 
     actionsBtn = (

src/view/Manage/Model/Component/ModelTable.jsx

@@ -461,18 +461,26 @@ const ModelTable = (props) => {
 
   let disableEdit = false, disableDelete = false, editTip = '', deleteTip = '', editMenuTitle = '编辑';
 
-  if (!currentItem?.editable && currentItem?.state?.id!=='4') {
-    disableEdit = true;
-
-    if (currentItem?.state?.id === '2') {
-      editTip = '待发布的模型不允许编辑';
+  if (currentItem?.inherited) {
+    if (!currentItem?.editable) {
+      disableEdit = true;
+      editTip = '请到对应的当前表修改';
+      editMenuTitle = '编辑(请到对应的当前表修改)';
+    }
+  } else {
+    if (!currentItem?.editable && currentItem?.state?.id!=='4') {
+      disableEdit = true;
+  
+      if (currentItem?.state?.id === '2') {
+        editTip = '待发布的模型不允许编辑';
+      }
+    }
+  
+    if (!currentItem?.permitCheckOut && currentItem?.state?.id==='4') {
+      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) {