Nigel
/
forgeplus-react
forked from Gitlink/forgeplus-react
0
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

build

This commit is contained in:
sylor_huang@126.com 2020-07-02 16:56:45 +08:00
parent 914e653b13
commit 90b87a3e9a
1 changed files with 0 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/forge/Merge/UpdateMerge.js
View File

@ -63,22 +63,12 @@ class UpdateMerge extends Component {
<div>
<div className="merge-header width100 inline-block">
<div className="width45 pull-left">
<<<<<<< HEAD
<div className="color-grey-3 mb10 fwb"> 源分支: </div>{" "}
<Input.Group compact className="display-flex">
<Button className="merge-header-button maxW50 hide-1 task-hide">
{" "}
{data && data.project_author}/{" "}
{data && data.project_name}{" "}
</Button>{" "}
=======
<div className="color-grey-3 mb10 fwb">源分支:</div>
<Input.Group compact className="display-flex">
<Button className="merge-header-button maxW50 hide-1 task-hide">
{data.is_original ? `${data.fork_project_user_name}/${data.fork_project_identifier}` : `${data.project_author}/${data.project_name}`}
</Button>
>>>>>>> newVersion_forge
<Select
defaultValue={data.is_original ? `${data.fork_project_user}:${pull}` : `${pull}`}
className="minW50 merge-flex1"
@ -96,15 +86,8 @@ class UpdateMerge extends Component {
<div className="color-grey-3 mb10 fwb"> 目标分支 : </div>{" "}
<Input.Group compact className="display-flex">
<Button className="merge-header-button maxW50 hide-1 task-hide">
<<<<<<< HEAD
{" "}
{data && data.project_author}/{" "}
{data && data.project_name}{" "}
</Button>{" "}
=======
{`${data.project_author}/${data.project_name}`}
</Button>
>>>>>>> newVersion_forge
<Select
defaultValue={data.is_original ? `${data.project_login}:${merge}` : `${merge}`}
className="minW50 merge-flex1"
@ -124,23 +107,12 @@ class UpdateMerge extends Component {
</div>
) : (
""
<<<<<<< HEAD
)}{" "}
</Spin>{" "}
</div>{" "}
<div className=" main">
<MergeFooter footer_type="new" {...this.props}>
{" "}
</MergeFooter>{" "}
</div>{" "}
=======
)}
</Spin>
</div>
{/* <div className=" main">
<MergeFooter footer_type="new" {...this.props}></MergeFooter>
</div> */}
>>>>>>> newVersion_forge
</div>
);
}