From d47c725b96bf3bc92850957c9e2f14e45d679179 Mon Sep 17 00:00:00 2001
From: caishi <c_15243705227@sina.com>
Date: Wed, 20 Oct 2021 15:25:35 +0800
Subject: [PATCH 1/2] =?UTF-8?q?pr=E5=88=86=E6=94=AF=E8=BF=87=E9=95=BF?=
 =?UTF-8?q?=EF=BC=8C=E6=98=BE=E7=A4=BA=E6=97=B6=E5=BA=94=E5=9B=BA=E5=AE=9A?=
 =?UTF-8?q?=E5=AE=BD=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/forge/Merge/CreateMerge.js | 4 ++--
 src/forge/Merge/merge.css      | 6 +++++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/forge/Merge/CreateMerge.js b/src/forge/Merge/CreateMerge.js
index 2659f2e83..b039c6347 100644
--- a/src/forge/Merge/CreateMerge.js
+++ b/src/forge/Merge/CreateMerge.js
@@ -367,7 +367,7 @@ class CreateMerge extends Component {
                     value={pull}
                     onSelect={(e) => this.selectBrach('pull', e)}
                     showSearch
-                    className="merge-flex1 flex1"
+                    className="merge-flex1 flex1 matchwidth"
                     dropdownMatchSelectWidth={false}
                   >
                     {this.renderBrances(pullBranches)}
@@ -394,7 +394,7 @@ class CreateMerge extends Component {
                       value={merge}
                       onSelect={(e) => this.selectBrach('merge', e)}
                       showSearch
-                      className="merge-flex1 flex1"
+                      className="merge-flex1 flex1 matchwidth"
                       dropdownMatchSelectWidth={false}
                     >
                       {this.renderBrances(mergeBranches)}
diff --git a/src/forge/Merge/merge.css b/src/forge/Merge/merge.css
index 3ea2620cb..1d635028e 100644
--- a/src/forge/Merge/merge.css
+++ b/src/forge/Merge/merge.css
@@ -213,4 +213,8 @@ form .ant-cascader-picker, form .ant-select {
 .mergeRequest .folders{
     /* width: 72rem; */
     width: 100%;
-  }
\ No newline at end of file
+  }
+
+ .matchwidth .ant-select-selection__rendered{
+   max-width: 200px;
+ }
\ No newline at end of file

From 057881097d79a4607088d0a384a8bd0a6dbe3310 Mon Sep 17 00:00:00 2001
From: caishi <c_15243705227@sina.com>
Date: Wed, 20 Oct 2021 16:26:23 +0800
Subject: [PATCH 2/2] =?UTF-8?q?pr=20=E5=88=86=E6=94=AF=E9=95=BF=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/forge/Merge/CreateMerge.js  | 2 ++
 src/forge/Merge/MergeItem.js    | 4 ++--
 src/forge/Merge/MessageCount.js | 4 ++--
 src/forge/Merge/UpdateMerge.js  | 8 ++++----
 src/forge/Merge/merge.css       | 7 ++++++-
 5 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/src/forge/Merge/CreateMerge.js b/src/forge/Merge/CreateMerge.js
index b039c6347..d7a320099 100644
--- a/src/forge/Merge/CreateMerge.js
+++ b/src/forge/Merge/CreateMerge.js
@@ -369,6 +369,7 @@ class CreateMerge extends Component {
                     showSearch
                     className="merge-flex1 flex1 matchwidth"
                     dropdownMatchSelectWidth={false}
+                    dropdownClassName="overlihide"
                   >
                     {this.renderBrances(pullBranches)}
                   </Select>
@@ -396,6 +397,7 @@ class CreateMerge extends Component {
                       showSearch
                       className="merge-flex1 flex1 matchwidth"
                       dropdownMatchSelectWidth={false}
+                      dropdownClassName="overlihide"
                     >
                       {this.renderBrances(mergeBranches)}
                     </Select>
diff --git a/src/forge/Merge/MergeItem.js b/src/forge/Merge/MergeItem.js
index f1afabf90..61477c142 100644
--- a/src/forge/Merge/MergeItem.js
+++ b/src/forge/Merge/MergeItem.js
@@ -110,7 +110,7 @@ class MergeItem extends Component {
                         <Tag className="pr-branch-tag">
                           <Link
                             to={`/${item.is_original ? item.fork_project_user : owner}/${ item.is_original ? item.fork_project_identifier : projectsId }/tree/${turnbar(item.pull_request_head)}`}
-                            className="maxW200px hide-1 ver-middle"
+                            className="maxW200px task-hide ver-middle" style={{maxWidth:"200px"}}
                           >
                             {item.is_original
                               ? item.fork_project_user
@@ -134,7 +134,7 @@ class MergeItem extends Component {
                         <Tag className="pr-branch-tag">
                           <Link
                             to={`/${owner}/${projectsId}/tree/${turnbar(item.pull_request_base)}`}
-                            className="maxW200px hide-1 ver-middle"
+                            className="maxW200px task-hide ver-middle" style={{maxWidth:"200px"}}
                           >
                             {/* {item.is_fork ? item.pull_request_base : `${item.author_name}:${item.pull_request_base}`} */}
                             {project_author_name}:{item.pull_request_base}
diff --git a/src/forge/Merge/MessageCount.js b/src/forge/Merge/MessageCount.js
index e2dabd865..6d01e8a37 100644
--- a/src/forge/Merge/MessageCount.js
+++ b/src/forge/Merge/MessageCount.js
@@ -366,7 +366,7 @@ class MessageCount extends Component {
                         <Tag className="pr-branch-tag">
                           <Link
                             to={`/${data.pull_request.is_original ? data.pull_request.fork_project_user : data.issue.project_author_name}/${data.pull_request.is_original?data.project_identifier:projectsId}/tree/${turnbar(data.pull_request && data.pull_request.head)}`}
-                            className="ver-middle"
+                            className="ver-middle task-hide" style={{maxWidth:"200px"}} title={`${data.pull_request.is_original ? data.pull_request.fork_project_user : data.issue.project_author_name}: ${data.pull_request && data.pull_request.head}`}
                           >
                             {data.pull_request.is_original ? data.pull_request.fork_project_user : data.issue.project_author_name}: {data.pull_request && data.pull_request.head}
                           </Link>
@@ -381,7 +381,7 @@ class MessageCount extends Component {
                         <Tag className="pr-branch-tag">
                           <Link
                             to={`/${owner}/${projectsId}/tree/${data.pull_request.base}`}
-                            className="ver-middle"
+                            className="ver-middle task-hide" style={{maxWidth:"200px"}} title={`${data.issue.project_author_name}:${data.pull_request.base}`}
                           >
                             {data.issue.project_author_name}:{data.pull_request.base}
                           </Link>
diff --git a/src/forge/Merge/UpdateMerge.js b/src/forge/Merge/UpdateMerge.js
index 001bedd57..8918db6eb 100644
--- a/src/forge/Merge/UpdateMerge.js
+++ b/src/forge/Merge/UpdateMerge.js
@@ -64,12 +64,12 @@ 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">
+                      <Button className="merge-header-button flex1 maxW50 hide-1 task-hide" disabled>
                         {data.is_original ? `${data.fork_project_user_name}/${data.fork_project_identifier}` : `${data.project_author}/${data.project_name}`}
                       </Button>
                       <Select
                         defaultValue={data.is_original ? `${data.fork_project_user}:${pull}` : `${pull}`}
-                        className="minW50 merge-flex1 flex1"
+                        className="minW50 merge-flex1 flex1 matchwidth"
                         disabled
                       ></Select>{" "}
                     </Input.Group>{" "}
@@ -83,12 +83,12 @@ class UpdateMerge extends Component {
                     <div>
                       <div className="color-grey-3 mb10 fwb"> 目标分支 : </div>{" "}
                       <Input.Group compact className="display-flex">
-                        <Button className="merge-header-button  maxW50 hide-1 task-hide">
+                        <Button className="merge-header-button flex1 maxW50 hide-1 task-hide" disabled>
                           {`${data.project_author}/${data.project_name}`}
                         </Button>
                         <Select
                           defaultValue={data.is_original ? `${data.project_login}:${merge}` : `${merge}`}
-                          className="minW50 merge-flex1 flex1"
+                          className="minW50 merge-flex1 flex1 matchwidth"
                           disabled
                         ></Select>{" "}
                       </Input.Group>{" "}
diff --git a/src/forge/Merge/merge.css b/src/forge/Merge/merge.css
index 1d635028e..d61543b49 100644
--- a/src/forge/Merge/merge.css
+++ b/src/forge/Merge/merge.css
@@ -40,6 +40,7 @@ form .ant-cascader-picker, form .ant-select {
 }
 .merge-header-button{
   background:rgba(241,248,255,1);
+  text-align: left;
 }
 .width70{
   width:70%;
@@ -216,5 +217,9 @@ form .ant-cascader-picker, form .ant-select {
   }
 
  .matchwidth .ant-select-selection__rendered{
-   max-width: 200px;
+   width: 200px;
+ }
+ .overlihide li{
+  max-width: 450px;
+  
  }
\ No newline at end of file