diff --git a/src/forge/Merge/MergeItem.js b/src/forge/Merge/MergeItem.js index 0a0053747..2585b9d44 100644 --- a/src/forge/Merge/MergeItem.js +++ b/src/forge/Merge/MergeItem.js @@ -98,7 +98,7 @@ class MergeItem extends Component { {item.is_original diff --git a/src/forge/Merge/merge.js b/src/forge/Merge/merge.js index 9ae719944..0eeb07f6f 100644 --- a/src/forge/Merge/merge.js +++ b/src/forge/Merge/merge.js @@ -407,7 +407,7 @@ class merge extends Component { {data && data.search_count && data.search_count > 0 ? ( -
+
{ search_count > limit? -
+
:"" } diff --git a/src/forge/Order/order.css b/src/forge/Order/order.css index 5db5aaf0a..1d225f43b 100644 --- a/src/forge/Order/order.css +++ b/src/forge/Order/order.css @@ -211,6 +211,9 @@ padding: 6px 30px; cursor: pointer; } +.setItemStyle{ + min-height:440px; +} .setItemStyle .issueItem{ padding:16px 0px; } @@ -221,9 +224,6 @@ border-bottom: 1px solid #eee; padding: 16px 20px; } -.issueItem:last-child{ - border-bottom: none; -} .issueNo { padding: 0px 5px; border-radius: 4px; diff --git a/src/forge/Order/order.js b/src/forge/Order/order.js index 7e2715f26..51a94f3e5 100644 --- a/src/forge/Order/order.js +++ b/src/forge/Order/order.js @@ -826,7 +826,7 @@ class order extends Component { )} { search_count > select_params.limit ? -
+