From e454aa2757e44eae845136a58111d6c93e6bac3c Mon Sep 17 00:00:00 2001
From: liumengyi <liumengyi@easycorp.ltd>
Date: Wed, 22 Dec 2021 14:26:22 +0800
Subject: [PATCH] * Fix bug #17768.

---
 module/kanban/css/space.css |  4 ++--
 module/kanban/css/view.css  |  2 ++
 module/kanban/js/space.js   |  4 ++--
 module/kanban/js/view.js    | 13 +++++++------
 4 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/module/kanban/css/space.css b/module/kanban/css/space.css
index 0318e68a95..46f2d06956 100644
--- a/module/kanban/css/space.css
+++ b/module/kanban/css/space.css
@@ -14,12 +14,12 @@
 .kanbans .panel:hover {border-color: #006AF1; box-shadow: 0 0 10px 0 rgba(0,0,100,.25);}
 .kanbans .panel-heading {padding: 4px 2px 10px 16px;}
 .kanbans .kanban-name {overflow: hidden; white-space:nowrap; width: 88%; float: left; padding-top: 8px;}
-.kanbans .kanban-actions {float: right; display: none;}
+.kanbans .kanban-actions {float: right; visibility: hidden;}
 .kanbans .kanban-actions .dropdown-menu.pull-right {top:31px; right: -84px; left: auto;}
 .kanbans .kanban-actions .dropdown-menu.pull-left {top:31px; right:-1px; left: auto;}
 .kanbans .panel .label-closed {background: #AAA !important; color: #FFF; margin-top:-6px;}
 .kanbans .panel-body {padding: 0 16px 16px;}
-.kanbans .kanban-desc {color: #838a9d; word-break:break-all; height: 70px; overflow: hidden; display: -webkit-box;}
+.kanbans .kanban-desc {color: #838a9d; word-break:break-all; height: 70px; overflow: hidden; display: -webkit-box; float:left;}
 .kanbans .kanban-footer {position: absolute; bottom: 10px; right: 10px; left: 15px;}
 .kanbans .kanban-members {float: left; height: 24px; line-height: 24px;}
 .kanbans .kanban-members > div {display: inline-block; height: 24px;}
diff --git a/module/kanban/css/view.css b/module/kanban/css/view.css
index 533447c2e3..cbfc4d1dd5 100644
--- a/module/kanban/css/view.css
+++ b/module/kanban/css/view.css
@@ -81,6 +81,8 @@ body {background-color: #fff}
 .region .kanban-item .has-color .title,
 .region .kanban-item .has-color .actions .icon-more-v,
 .region .kanban-item .has-color .info > .label-pri,
+.region .kanban-item .has-color .info > .estimate,
+.region .kanban-item .has-color .info > .user .lable-teamSumCount,
 .region .kanban-item .has-color .info > .label-light {color: #FFFFFF;}
 .region .kanban-item .has-color .info > .label-pri {border-color: #FFFFFF;}
 .region .kanban-item .item-more {position: absolute; right: 6px; top: 0px;}
diff --git a/module/kanban/js/space.js b/module/kanban/js/space.js
index 86d5425456..1902408d91 100644
--- a/module/kanban/js/space.js
+++ b/module/kanban/js/space.js
@@ -11,12 +11,12 @@ $kanbans.on('click', '.panel', function(e)
 /* Display drop-down menu.*/
 $('.panel').mouseenter(function(e)
 {
-    $('.kanban-actions' + e.currentTarget.parentElement.dataset.id).css('display','block');
+    $('.kanban-actions' + e.currentTarget.parentElement.dataset.id).css('visibility','visible');
 });
 
 /* Hide drop-down menu. */
 $('.panel').mouseleave(function(e)
 {
-    $('.kanban-actions').css('display','none');
+    $('.kanban-actions').css('visibility','hidden');
     $('.dropdown').removeClass('open');
 });
diff --git a/module/kanban/js/view.js b/module/kanban/js/view.js
index 17dc9ac78c..410c2312c5 100644
--- a/module/kanban/js/view.js
+++ b/module/kanban/js/view.js
@@ -234,7 +234,7 @@ function renderUsersAvatar(users, itemID, size)
     if(assignees.length > 2)
     {
         assignees.splice(1, assignees.length - 2, '<span>...</span>');
-        assignees.push('<div>' + kanbanLang.teamSumCount.replace('%s', members) + '</div>');
+        assignees.push('<div class="lable-teamSumCount">' + kanbanLang.teamSumCount.replace('%s', members) + '</div>');
     }
 
     return assignees;
@@ -289,6 +289,10 @@ function renderKanbanItem(item, $item)
         .attr('class', 'pri label-pri label-pri-' + item.pri)
         .text(item.pri);
 
+    $item.css('background-color', item.color);
+    $item.toggleClass('has-color', item.color != '#fff' && item.color != '');
+    $item.find('.info > .label-light').css('background-color', item.color);
+
     var $time = $info.children('.time');
     if(item.end == '0000-00-00' && item.begin == '0000-00-00')
     {
@@ -313,7 +317,8 @@ function renderKanbanItem(item, $item)
             $time.text($.zui.formatDate(begin, 'MM-dd') + ' ' +  kanbancardLang.to + ' ' + $.zui.formatDate(end, 'MM-dd')).attr('title', $.zui.formatDate(begin, 'yyyy-MM-dd') + ' ' +  kanbancardLang.to + ' ' +  $.zui.formatDate(end, 'yyyy-MM-dd')).show();
         }
 
-        $time.toggleClass('text-red', needRemind);
+        if(!$item.hasClass('has-color') && needRemind) $time.css('background-color', 'rgba(210, 50, 61, 0.3)');
+        if($item.hasClass('has-color') && needRemind)  $time.css('background-color', 'rgba(255, 255, 255, 0.3)');
     }
 
     /* Display avatars of assignedTo. */
@@ -322,10 +327,6 @@ function renderKanbanItem(item, $item)
     var title = [];
     for(i = 0; i < assignedTo.length; i++) title.push(users[assignedTo[i]]);
     $user.html(renderUsersAvatar(assignedTo, item.id)).attr('title', title);
-
-    $item.css('background-color', item.color);
-    $item.toggleClass('has-color', item.color != '#fff' && item.color != '');
-    $item.find('.info > .label-light').css('background-color', item.color);
 }
 
 /**