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

Merge branch 'Fixbug_zhengrunyu_' into 'master'

Browse Source 
*Fix bug for card.

See merge request easycorp/zentaopms!1678
This commit is contained in:
孙广明
2022-01-27 07:09:30 +00:00
parent 0ada39cc38 3f9410f28c
commit 5625fd1152
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/kanban/css/view.css
+1 -1
View File
@@ -115,5 +115,5 @@
.region .kanban-item > .kanban-card > .execInfo > .user, .region .kanban-item > .kanban-card > .releaseInfo > .user, .region .kanban-item > .kanban-card > .productplanInfo > .user {position: absolute; right: 13px; bottom: 1px}
.region .kanban-item > .kanban-card > .execInfo > .user > .avatar, .region .kanban-item > .kanban-card > .releaseInfo > .user > .avatar, .region .kanban-item > .kanban-card > .productplanInfo > .user > .avatar {display: inline-block; width: 24px; height: 24px; line-height: 24px; margin-right: 0px; margin-left: 2px}
.kanban-card .releaseTitle .icon, .kanban-card .title .icon, .kanban-card .productplanTitle .icon, .kanban-card .title .icon, .kanban-card .buildTitle .icon{padding-right: 5px;}
.kanban-card .label{margin-right: 7px; float: left; background-color:#2a5f29;}
.kanban-card .label-finish {margin-right: 7px; margin-top: -1px; float: left; background-color:#2a5f29;}
.kanban-card .releaseTitle, .kanban-card .productplanTitle {width: 100%; float: left;}
module/kanban/js/view.js
+5 -5
View File
@@ -306,7 +306,7 @@ function renderKanbanItem(item, $item)
if(privs.includes('sortCard')) $item.parent().addClass('sort');
if(!$title.length)
{
$('<div class="label">' + kanbanLang.finished + '</div>').appendTo($item);
$('<div class="label-finish">' + kanbanLang.finished + '</div>').appendTo($item);
if(privs.includes('viewCard')) $title = $('<a class="title iframe" data-toggle="modal" data-width="80%"></a>').appendTo($item).attr('href', createLink('kanban', 'viewCard', 'cardID=' + item.id, '', true));
if(!privs.includes('viewCard')) $title = $('<p class="title"></p>').appendTo($item);
}
@@ -317,20 +317,20 @@ function renderKanbanItem(item, $item)
var finishColor = '#2a5f29';
if(item.color == '#2a5f29') finishColor = '#FFFFFF';
$title.text(item.name).css('color', finishColor);
$item.children('.label').show();
$item.children('.label-finish').show();
if(item.color == '#2a5f29')
{
$item.children('.label').css({'background-color':'#FFFFFF','color':'#2a5f29'});
$item.children('.label-finish').css({'background-color':'#FFFFFF','color':'#2a5f29'});
}
else
{
$item.children('.label').css({'background-color':'','color':''});
$item.children('.label-finish').css({'background-color':'','color':'#FFFFFF'});
}
}
else
{
$title.text(item.name).css('color', '');
$item.children('.label').hide();
$item.children('.label-finish').hide();
}
var $actions = $item.children('.actions');