From 5ab66792c65a551e073d0740d338f99864021529 Mon Sep 17 00:00:00 2001
From: "sylor_huang@126.com" <sylor_huang@126.com>
Date: Mon, 27 Apr 2020 17:05:27 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=89=8D=E7=AB=AF=E7=9A=84?=
 =?UTF-8?q?=E9=83=A8=E5=88=86=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/forge/Merge/MergeItem.js | 10 +++++++++-
 src/forge/Order/OrderItem.js | 22 ++++++++++++++++++++--
 src/forge/Order/order.css    |  8 ++++----
 3 files changed, 33 insertions(+), 7 deletions(-)

diff --git a/src/forge/Merge/MergeItem.js b/src/forge/Merge/MergeItem.js
index c8fd34c1e..1abefe4b7 100644
--- a/src/forge/Merge/MergeItem.js
+++ b/src/forge/Merge/MergeItem.js
@@ -68,7 +68,15 @@ class MergeItem extends Component{
                   <li>{this.set_issue_tags(item.issue_tags)}</li>
                   {/*<li>{item.issue_type || "--"}</li>*/}
                   <li>{item.version || "--"}</li>
-                  <li>{item.assign_user_name || "--"}</li>
+                  <li>
+                  {
+                      item.assign_user_name ?
+                      <Link to={`/users/${item.assign_user_login}/projects`} className="show-user-link">
+                        {item.assign_user_name}
+                      </Link>
+                      : "--"
+                    }
+                    </li>
                   <li>
                     <div className="flex-1">
                       <p>
diff --git a/src/forge/Order/OrderItem.js b/src/forge/Order/OrderItem.js
index 7d9ebf2b1..26fbc0c7d 100644
--- a/src/forge/Order/OrderItem.js
+++ b/src/forge/Order/OrderItem.js
@@ -74,8 +74,26 @@ class OrderItem extends Component{
                   <li>{this.set_issue_tags(item.issue_tags)}</li>
                   {/*<li>{item.issue_type || "--"}</li>*/}
                   <li>{item.tracker || "--"}</li>
-                  <li>{item.author_name || "--"}</li>
-                  <li>{item.assign_user_name || "--"}</li>
+                  <li>
+                    {
+                      item.author_name ?
+                      <Link to={`/users/${item.author_login}/projects`} className="show-user-link">
+                        {item.author_name}
+                      </Link>
+                      : "--"
+                    }
+
+                  </li>
+                  <li>
+                  {
+                      item.assign_user_name ?
+                      <Link to={`/users/${item.assign_user_login}/projects`} className="show-user-link">
+                        {item.assign_user_name}
+                      </Link>
+                      : "--"
+                    }
+                    {/* {item.assign_user_name || "--"} */}
+                    </li>
                   <li><p style={{width:60,height:25,margin:'auto', paddingTop:2,background:item.priority==='高'?'#e67e22':item.priority==='正常'?'#28be6c':item.priority==='低'?'#1abc9c':'#e74c3c',color:'#ffffff',borderRadius:4}}>{item.priority|| "--"}</p></li>
                   <li>{item.done_ratio || "--"}</li>
                   <li>
diff --git a/src/forge/Order/order.css b/src/forge/Order/order.css
index a8d6ca476..21898e86c 100644
--- a/src/forge/Order/order.css
+++ b/src/forge/Order/order.css
@@ -175,7 +175,7 @@
 }
 .topWrapper_select li{
   text-align: center;
-  cursor: pointer;
+  /* cursor: pointer; */
   color: #666;
   width:90px;
   text-align: center;
@@ -185,10 +185,10 @@
   -o-text-overflow: ellipsis;
   text-overflow: ellipsis;
 }
-.topWrapper_select li:active{
+/* .topWrapper_select li:active{
   background: #f4f4f4;
   border-radius: 4px;
-}
+} */
 .ant-dropdown-menu .ant-dropdown-menu-item{
   text-align: center;
   padding:6px 30px;
@@ -537,7 +537,7 @@ a.issue-type-button.active:hover{background: #f4f4f4; color: #4CACFF;}
   overflow-y:auto;
 }
 .ql-bubble .ql-editor img{
-  width:100px!important;
+  min-width:100px!important;
 }
 .AmplifyImg .ant-modal{
   padding:0px;