From 9de7ac7c904e1c2558a5c2cde693708af654e869 Mon Sep 17 00:00:00 2001
From: caishi <c_15243705227@sina.com>
Date: Mon, 18 Oct 2021 11:15:38 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=98=93=E4=BF=AE=E3=80=81=E5=90=88?=
 =?UTF-8?q?=E5=B9=B6=E8=AF=B7=E6=B1=82=E6=A0=87=E9=A2=98=EF=BC=9A=E5=AD=97?=
 =?UTF-8?q?=E7=AC=A6=E9=95=BF=E5=BA=A6=E3=80=81=E8=AF=A6=E6=83=85=E7=9A=84?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E3=80=81=E5=88=97=E8=A1=A8=E7=9A=84=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E9=95=BF=E5=BA=A6=E7=AD=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/forge/Merge/MergeItem.js    | 2 +-
 src/forge/Merge/MessageCount.js | 8 +++-----
 src/forge/Merge/merge_form.js   | 2 +-
 src/forge/Order/Detail.js       | 2 +-
 src/forge/Order/order_form.js   | 2 +-
 5 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/src/forge/Merge/MergeItem.js b/src/forge/Merge/MergeItem.js
index dadd6d8a..f1afabf9 100644
--- a/src/forge/Merge/MergeItem.js
+++ b/src/forge/Merge/MergeItem.js
@@ -64,7 +64,7 @@ class MergeItem extends Component {
                   <Link
                     to={`/${owner}/${projectsId}/pulls/${item.pull_request_id}`}
                     className="hide-1 font-15 color-grey-3 fwb lineh-30 mr10"
-                    style={{ maxWidth: "300px" }}
+                    style={{ maxWidth: "600px" }}
                   >
                     {item.name}
                   </Link>
diff --git a/src/forge/Merge/MessageCount.js b/src/forge/Merge/MessageCount.js
index 685f4235..3a880165 100644
--- a/src/forge/Merge/MessageCount.js
+++ b/src/forge/Merge/MessageCount.js
@@ -340,8 +340,8 @@ class MessageCount extends Component {
           <div>
             <div className="main">
               <div>
-                <div className="grid-item-top pb20 border-1f">
-                  <div>
+                <div className="pb20 border-1f df">
+                  <div className="flex1">
                     <div className="ver-middle">
                       <span className="mr10 ver-middle">
                         <span className="font-18 fwb">
@@ -445,8 +445,7 @@ class MessageCount extends Component {
                       </span>
                     </div>
                   </div>
-                  <div className="ml10">
-                    <div className="mt15 text-right" style={{display:"flex",justifyContent:"flex-end"}}>
+                  <div className="ml10 text-right">
                       {operate && (
                           <Button
                             type="green"
@@ -469,7 +468,6 @@ class MessageCount extends Component {
                         </Button>
                       )}
                     </div>
-                  </div>
                 </div>
                 {
                 data.issue.description ? 
diff --git a/src/forge/Merge/merge_form.js b/src/forge/Merge/merge_form.js
index 4716bdfc..e6378139 100644
--- a/src/forge/Merge/merge_form.js
+++ b/src/forge/Merge/merge_form.js
@@ -265,7 +265,7 @@ class MergeForm extends Component {
                       },
                     ],
                     initialValue: title,
-                  })(<Input placeholder="标题" maxLength={50} />)}
+                  })(<Input placeholder="标题" maxLength={200} />)}
                 </Form.Item>
                 <MDEditor
                   placeholder={"请输入合并请求的描述..."}
diff --git a/src/forge/Order/Detail.js b/src/forge/Order/Detail.js
index 19ef67c5..4d1b47cf 100644
--- a/src/forge/Order/Detail.js
+++ b/src/forge/Order/Detail.js
@@ -233,7 +233,7 @@ class Detail extends Component {
                           : "合并请求"}
                         】
                       </span>
-                      <span className="font-16 fwb">{data && data.subject}</span>
+                      <span className="font-16 fwb" style={{wordBreak:"break-all"}}>{data && data.subject}</span>
                     </span>
 
                     {data && data.priority && (
diff --git a/src/forge/Order/order_form.js b/src/forge/Order/order_form.js
index 0858ac52..3399a7fe 100644
--- a/src/forge/Order/order_form.js
+++ b/src/forge/Order/order_form.js
@@ -320,7 +320,7 @@ class order_form extends Component {
                         message: "请填写易修标题",
                       },
                     ]
-                  })(<Input placeholder="标题" size="large" maxLength={80}/>)}
+                  })(<Input placeholder="标题" size="large" maxLength={200}/>)}
                 </Form.Item>
                 <div className="quillContent">
                   <MDEditor

From e9546951c90dba230265c1e0d5ca05ccd7c289e4 Mon Sep 17 00:00:00 2001
From: caishi <c_15243705227@sina.com>
Date: Mon, 18 Oct 2021 11:30:20 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E9=9D=9E=E6=B1=89=E5=AD=97=E9=9C=80?=
 =?UTF-8?q?=E8=A6=81=E5=BC=BA=E5=88=B6=E6=8D=A2=E8=A1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/forge/Merge/MessageCount.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/forge/Merge/MessageCount.js b/src/forge/Merge/MessageCount.js
index 3a880165..e2dabd86 100644
--- a/src/forge/Merge/MessageCount.js
+++ b/src/forge/Merge/MessageCount.js
@@ -344,7 +344,7 @@ class MessageCount extends Component {
                   <div className="flex1">
                     <div className="ver-middle">
                       <span className="mr10 ver-middle">
-                        <span className="font-18 fwb">
+                        <span className="font-18 fwb" style={{wordBreak:"break-all"}}>
                           {data.issue.subject}
                         </span>
                       </span>