From ee6356daa0f8a34bc3f21f9a70ff90baa261b1de Mon Sep 17 00:00:00 2001
From: caishi <1149225589@qq.com>
Date: Fri, 23 Oct 2020 10:15:40 +0800
Subject: [PATCH] style

---
 src/forge/Merge/NewMerge.js | 19 +++++++------------
 src/forge/Merge/merge.css   | 12 ++++++++++++
 2 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/src/forge/Merge/NewMerge.js b/src/forge/Merge/NewMerge.js
index 4105f9c23..6422a04c3 100644
--- a/src/forge/Merge/NewMerge.js
+++ b/src/forge/Merge/NewMerge.js
@@ -228,8 +228,6 @@ class NewMerge extends Component {
       return <div dangerouslySetInnerHTML={{ __html: html }}></div>;
     };
     let { project } = this.props;
-    console.log("222 ",project);
-    console.log("222111 ",projects_names);
     return (
       <div>
         <div className="main">
@@ -239,18 +237,17 @@ class NewMerge extends Component {
                 <div className="color-grey-3 mb10 fwb">源分支:</div>
                 <Input.Group compact className="display-flex">
                   <Select
-                    defaultValue={project && project.id}
-                    class=" maxW50 hide-1 task-hide"
+                    value={project && project.id}
+                    className="hide-1 task-hide w240"
                     disabled
-                    style={{maxWidth:"200px"}}
                   >
                     {renderProjectNames(projects_names)}
                   </Select>
                   <Select
-                    defaultValue={pull}
+                    value={pull}
                     onSelect={(e) => this.selectBrach("pull", e)}
                     showSearch
-                    className="minW50 merge-flex1"
+                    className="merge-flex1 w120"
                   >
                     {renderBrances(branches, false)}
                   </Select>
@@ -266,19 +263,17 @@ class NewMerge extends Component {
                   <div className="color-grey-3 mb10 fwb">目标分支:</div>
                   <Input.Group compact className="display-flex">
                     <Select
-                      defaultValue={project && project.id}
-                      class=" maxW50 hide-1 task-hide"
+                      value={project && project.id}
+                      className="hide-1 task-hide w240"
                       onSelect={(e) => this.selectProjectName(e)}
-                      style={{maxWidth:"200px"}}
                     >
                       {renderProjectNames(merge_projects)}
                     </Select>
                     <Select
-                      defaultValue={merge}
                       value={merge}
                       onSelect={(e) => this.selectBrach("merge", e)}
                       showSearch
-                      className="minW50 merge-flex1"
+                      className="merge-flex1 w120"
                     >
                       {renderBrances(merge_branches, merge_head)}
                     </Select>
diff --git a/src/forge/Merge/merge.css b/src/forge/Merge/merge.css
index d6a4770e5..b962e886b 100644
--- a/src/forge/Merge/merge.css
+++ b/src/forge/Merge/merge.css
@@ -40,4 +40,16 @@ form .ant-cascader-picker, form .ant-select {
 }
 .merge-header-button{
   background:rgba(241,248,255,1);
+}
+.width70{
+  width:70%;
+}
+.width30{
+  width:30%;
+}
+.w120{
+  width: 120px;
+}
+.w240{
+  width: 240px;
 }
\ No newline at end of file