bug fix

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

@@ -331,7 +331,9 @@ const EditModel = (props) => {
           conflictItemId
         }
       },
-      callback: () => {}
+      callback: () => {
+        LocalStorage.set('conflictChange', !(LocalStorage.get('conflictChange')||false));
+      }
     })
   }
 

src/view/Manage/ModelCompareList/index.jsx

@@ -82,7 +82,7 @@ const FC = (props) => {
             setBranchModelSyncParams({
               visible: true,
               item: {
-                id: record.conflictEasyDataModelerDataModelId,
+                id: record.conflictMergeEasyDataModelerDataModelId,
                 conflictItemId: record.conflictItemId,
               }
             })
@@ -155,6 +155,12 @@ const FC = (props) => {
 
   React.useEffect(() => {
     getDetail()
+
+    window?.addEventListener("storage", storageChange)
+
+    return () => {
+      window?.removeEventListener("storage", storageChange)
+    }
   }, [])
 
   const cols = React.useMemo(() => {
@@ -165,6 +171,12 @@ const FC = (props) => {
     return []
   }, [data])
 
+  const storageChange = (e) => {
+    if (e.key === 'conflictChange') {
+      getDetail()
+    }
+  }
+
   const getDetail = () => {
     setLoading(true)
     dispatch({