Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* Fix bug #17768.

Browse Source
This commit is contained in:
liumengyi
2021-12-22 14:26:22 +08:00
parent b282a51d1c
commit e454aa2757
4 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/kanban/css/space.css
+2 -2
View File
@@ -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;}
module/kanban/css/view.css
+2
View File
@@ -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;}
module/kanban/js/space.js
+2 -2
View File
@@ -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');
});
module/kanban/js/view.js
+7 -6
View File
@@ -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);
}
/**