冲突详情问题

src/view/Manage/Model/Component/model-fork-detail.jsx

@@ -3,7 +3,7 @@ import { Modal } from 'antd'
 
 import { dispatch } from '../../../../model'
 import Table from '../../../../util/Component/Table'
-import BranchModelSync from '../../Model/Component/branch-model-sync'
+import MergeToMaster from './merge-to-master'
 
 const FC = ({ visible, item, onCancel }) => {
   const [loading, setLoading] = React.useState(false)
@@ -11,9 +11,9 @@ const FC = ({ visible, item, onCancel }) => {
 
   const [animating, setAnimating] = React.useState(true)
 
-  const [branchModelSyncParams, setBranchModelSyncParams] = React.useState({
+  const [mergeToMasterParams, setMergeToMasterParams] = React.useState({
     visible: false,
-    item: undefined,
+    items: undefined,
   });
 
   React.useEffect(() => {
@@ -67,9 +67,9 @@ const FC = ({ visible, item, onCancel }) => {
 
   const onRightMenuItemClick = (key, record) => {
     if (key === '冲突详情') {
-      setBranchModelSyncParams({
+      setMergeToMasterParams({
         visible: true,
-        item: {...record, forkedName: item?.name, forkedLastModifiedTs: item?.modifiedTs}
+        items: [{...record, forkedName: item?.name, forkedLastModifiedTs: item?.modifiedTs}]
       })
     } 
   }
@@ -104,13 +104,13 @@ const FC = ({ visible, item, onCancel }) => {
           />
         }
       </Modal>
-      <BranchModelSync
+      <MergeToMaster
         title='冲突详情'
-        {...branchModelSyncParams}
+        {...mergeToMasterParams}
         onCancel={(refresh) => {
-          setBranchModelSyncParams({
+          setMergeToMasterParams({
             visible: false,
-            item: undefined,
+            items: undefined,
           })
         }}
       />