From 0fc8ebc741b25665287b2e423de01627e490a95c Mon Sep 17 00:00:00 2001
From: Hao Sun <sunhao@easycorp.ltd>
Date: Wed, 1 Sep 2021 13:40:31 +0800
Subject: [PATCH 1/2] * improve style for project table.

---
 module/project/css/browse.css | 7 ++++---
 module/project/model.php      | 4 +++-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/module/project/css/browse.css b/module/project/css/browse.css
index f9f56577d9..da23a432c8 100644
--- a/module/project/css/browse.css
+++ b/module/project/css/browse.css
@@ -11,6 +11,7 @@ td.c-actions {overflow: visible;}
 .icon-list {padding-left: 7px;}
 .panel-actions {position: relative; padding: 0 0;}
 
-td.flex {display: flex; flex-flow: row nowrap; justify-content: flex-start; align-items: center;}
-td.flex span.label-badge {margin-left: 5px; min-width: 50px;}
-td.flex a.text-ellipsis {min-width: 30px;}
+#projectTableList .project-name {position: relative; display: flex; align-items: center;}
+#projectTableList .project-name > span,
+#projectTableList .project-name > span {flex: none;}
+#projectTableList .project-name > a {color: #0c60e1; display: inline-block; max-width: calc(100% - 100px); flex: auto; padding: 0 5px;}
diff --git a/module/project/model.php b/module/project/model.php
index ce24e747f2..7b612123fc 100644
--- a/module/project/model.php
+++ b/module/project/model.php
@@ -1387,7 +1387,7 @@ class projectModel extends model
 
             if($id == 'name')
             {
-                $class .= ' text-left flex';
+                $class .= ' text-left';
                 $title  = "title='{$project->name}'";
             }
 
@@ -1425,6 +1425,7 @@ class projectModel extends model
                     }
                     break;
                 case 'name':
+                    echo '<div class="project-name">';
                     if(isset($this->config->maxVersion))
                     {
                         if($project->model === 'waterfall') echo "<span class='project-type-label label label-outline label-warning'>{$this->lang->project->waterfall}</span> ";
@@ -1432,6 +1433,7 @@ class projectModel extends model
                     }
                     echo html::a($projectLink, $project->name, '', "class='text-ellipsis'");
                     if(isset($project->delay)) echo "<span class='label label-danger label-badge'>{$this->lang->project->statusList['delay']}</span>";
+                    echo '</div>';
                     break;
                 case 'PM':
                     $user   = $this->loadModel('user')->getByID($project->PM, 'account');

From 4415f0c6e4770058600f6840b395de81e04eaabe Mon Sep 17 00:00:00 2001
From: xieqiyu <xieqiyu@easycorp.ltd>
Date: Wed, 1 Sep 2021 13:47:16 +0800
Subject: [PATCH 2/2] * Adjust card height for project kanban.

---
 module/project/js/kanban.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module/project/js/kanban.js b/module/project/js/kanban.js
index 522fe5ff68..9ee873302d 100644
--- a/module/project/js/kanban.js
+++ b/module/project/js/kanban.js
@@ -6,7 +6,7 @@ $(function()
     {
         var boardWaitCount   = $(this).find('.board-wait .board-item').length;
         var boardClosedCount = $(this).find('.board-closed .board-item').length;
-        var boardDoingCount  = $(this).find('.board-doing .board-item').length;
+        var boardDoingCount  = $(this).find('.board-doing-project .board-item').length;
 
         if((boardWaitCount > 5 || boardClosedCount > 5) && (boardWaitCount > boardDoingCount || boardClosedCount > boardDoingCount))
         {