diff --git a/src/forge/Merge/MergeItem.js b/src/forge/Merge/MergeItem.js
index c8fd34c1..1abefe4b 100644
--- a/src/forge/Merge/MergeItem.js
+++ b/src/forge/Merge/MergeItem.js
@@ -68,7 +68,15 @@ class MergeItem extends Component{
{this.set_issue_tags(item.issue_tags)}
{/*{item.issue_type || "--"}*/}
{item.version || "--"}
- {item.assign_user_name || "--"}
+
+ {
+ item.assign_user_name ?
+
+ {item.assign_user_name}
+
+ : "--"
+ }
+
diff --git a/src/forge/Order/OrderItem.js b/src/forge/Order/OrderItem.js
index 7d9ebf2b..26fbc0c7 100644
--- a/src/forge/Order/OrderItem.js
+++ b/src/forge/Order/OrderItem.js
@@ -74,8 +74,26 @@ class OrderItem extends Component{
{this.set_issue_tags(item.issue_tags)}
{/*
{item.issue_type || "--"}*/}
{item.tracker || "--"}
-
{item.author_name || "--"}
-
{item.assign_user_name || "--"}
+
+ {
+ item.author_name ?
+
+ {item.author_name}
+
+ : "--"
+ }
+
+
+
+ {
+ item.assign_user_name ?
+
+ {item.assign_user_name}
+
+ : "--"
+ }
+ {/* {item.assign_user_name || "--"} */}
+
{item.priority|| "--"}
{item.done_ratio || "--"}
diff --git a/src/forge/Order/order.css b/src/forge/Order/order.css
index a8d6ca47..21898e86 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;