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

pullrequest

This commit is contained in:
caishi 2020-10-28 16:07:45 +08:00
parent 3591666e5e
commit e42de09b99
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/forge/Merge/NewMerge.js
View File

@ -233,12 +233,12 @@ class NewMerge extends Component {
<div className="main">
<Spin spinning={isSpin}>
<div className="merge-header width100 inline-block">
<div className="width45 pull-left">
<div className="width40 pull-left">
<div className="color-grey-3 mb10 fwb">源分支:</div>
<Input.Group compact className="display-flex">
<Select
value={project && project.id}
className="hide-1 task-hide w240"
className="hide-1 task-hide flex1"
disabled
>
{renderProjectNames(projects_names)}
@ -247,7 +247,7 @@ class NewMerge extends Component {
value={pull}
onSelect={(e) => this.selectBrach("pull", e)}
showSearch
className="merge-flex1 w120"
className="merge-flex1 flex1"
>
{renderBrances(branches, false)}
</Select>
@ -258,13 +258,13 @@ class NewMerge extends Component {
className={"iconfont icon-youjiang color-grey-c font-32"}
></i>
</div>
<div className="width45 pull-left">
<div className="width40 pull-left">
<div>
<div className="color-grey-3 mb10 fwb">目标分支:</div>
<Input.Group compact className="display-flex">
<Select
value={project && project.id}
className="hide-1 task-hide w240"
className="hide-1 task-hide flex1"
onSelect={(e) => this.selectProjectName(e)}
>
{renderProjectNames(merge_projects)}
@ -273,7 +273,7 @@ class NewMerge extends Component {
value={merge}
onSelect={(e) => this.selectBrach("merge", e)}
showSearch
className="merge-flex1 w120"
className="merge-flex1 flex1"
>
{renderBrances(merge_branches, merge_head)}
</Select>

6
src/forge/Merge/merge.css
View File

@ -47,6 +47,12 @@ form .ant-cascader-picker, form .ant-select {
.width30{
width:30%;
}
.width40{
width:40%;
}
.display-flex{
display: flex!important;
}
.w120{
width: 120px;
}