From 6f7835da43cbb732829067b8b632d3f98fdd26e1 Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie@easycorp.ltd>
Date: Thu, 2 Sep 2021 13:02:26 +0800
Subject: [PATCH 1/2] * Fix bug #14568.

---
 module/execution/css/common.css | 1 -
 module/execution/css/create.css | 1 -
 module/execution/js/create.js   | 3 +++
 module/execution/model.php      | 2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/module/execution/css/common.css b/module/execution/css/common.css
index b944d263d0..b3f5061a7b 100644
--- a/module/execution/css/common.css
+++ b/module/execution/css/common.css
@@ -27,4 +27,3 @@
 
 #whitelistBox .checkbox-inline, #whitelistBox .radio-inline {margin-left: 10px; display: inline-block; padding-left: 0px; padding-right: 10px;}
 .main-table > .table-responsive {padding: 0 1px; background: #fff;}
-#teams_chosen ul li:first-child {max-width:256px; display: inline-block; vertical-align: middle;}
diff --git a/module/execution/css/create.css b/module/execution/css/create.css
index dd61b6bbba..d482356317 100644
--- a/module/execution/css/create.css
+++ b/module/execution/css/create.css
@@ -14,5 +14,4 @@
 .checkbox input[type=checkbox], .checkbox-inline input[type=checkbox], .radio input[type=radio], .radio-inline input[type=radio] {margin-top: 1px;}
 
 #lifeTimeTips {display: none;}
-#teams_chosen ul > li:first-child {max-width: 425px;}
 #teams_chosen ul .label {margin-top: 3px;}
diff --git a/module/execution/js/create.js b/module/execution/js/create.js
index fd90c0791f..8f82a97143 100644
--- a/module/execution/js/create.js
+++ b/module/execution/js/create.js
@@ -48,8 +48,11 @@ $(function()
     {
         if(systemMode == 'new')
         {
+            var maxWidth = $('.chosen-container .chosen-drop.chosen-auto-max-width.in').width() - 70;
+
             $('#teams_chosen ul .label').remove();
             $('#teams_chosen ul li:first').after(' <label class="label">' + projectCommon + '</label>');
+            $('#teams_chosen ul > li:first').attr('style', 'display: inline-block; vertical-align: middle; max-width: ' + maxWidth + 'px');
         }
     })
 
diff --git a/module/execution/model.php b/module/execution/model.php
index 35a0472e04..c64ed00bb7 100644
--- a/module/execution/model.php
+++ b/module/execution/model.php
@@ -2448,7 +2448,7 @@ class executionModel extends model
      */
     public function getTeamPairsByProject($projectID = 0)
     {
-        if(empty($projectID)) return array();
+        if(empty($projectID) and $this->config->systemMode == 'new') return array();
 
         $teams = $this->dao->select('id,name,type')->from(TABLE_PROJECT)
             ->where('deleted')->eq(0)

From 1b0f19c0b92ac8f9e3c074e960a5a75526477e86 Mon Sep 17 00:00:00 2001
From: liyuchun <liyuchun@easycorp.ltd>
Date: Thu, 2 Sep 2021 13:05:19 +0800
Subject: [PATCH 2/2]  * Fix bug #14871.

---
 module/doc/css/objectlibs.css | 1 +
 1 file changed, 1 insertion(+)

diff --git a/module/doc/css/objectlibs.css b/module/doc/css/objectlibs.css
index 1cadc6f3f0..e78f8ac770 100644
--- a/module/doc/css/objectlibs.css
+++ b/module/doc/css/objectlibs.css
@@ -16,6 +16,7 @@
 .main-col .doc-title .actions a + a {margin-left: 8px;}
 .main-col .doc-title .actions i {font-size: 15px; color: #8c8c8c;}
 #content .title {max-width: 54%; overflow: hidden; text-overflow: ellipsis; white-space: nowrap;}
+#content .detail-content {padding-left: 10px;}
 #mainContent .scrollbar-hover {max-height: 2000px; overflow: scroll;}
 #sidebar {width: 275px;}
 #sidebar>.cell {width: 100%;}