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

* Fix kanban style issues.

Browse Source
This commit is contained in:
tianshujie
2022-01-25 17:26:55 +08:00
parent d243960742
commit 03d3855aae
2 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/kanban/css/view.css
+3 -3
View File
@@ -84,7 +84,7 @@
.region .kanban-item .item-more {position: absolute; right: 6px; top: 0px;}
.kanban-card {height: auto !important; padding: 8px 14px !important; min-height: 60px;}
.kanban-card > .title {word-break: break-all;}
.kanban-card > .title, .kanban-card > .productplanTitle, .kanban-card > .releaseTitle, .kanban-card > .buildTitle {word-break: break-all;}
.kanban-card > .info {position: relative; margin-top: 5px}
.kanban-card > .info > .info + .info {margin-left: 8px}
.kanban-card:hover > .actions {opacity: 1;}
@@ -101,7 +101,7 @@
.gray .actions {display:none;}
.kanban-card .header .executionName {display: flex; width: 100%; float: left;}
.kanban-card .header .executionName .title {padding-right: 0px; margin-right: 5px;}
.kanban-card .header .executionName .title {padding-right: 0px; margin-right: 5px; overflow: hidden; white-space: nowrap;}
.kanban-card .header .executionName > span {flex: none;}
.execInfo, .releaseInfo, .productplanInfo {margin-top: 23px;}
.label-wait {background: #EFEFEF !important; color: #838A9D;}
@@ -113,5 +113,5 @@
.label-normal {background: #e1e8d9 !important; color: #9abe76;}
.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 {padding-right: 5px;}
.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 .releaseTitle, .kanban-card .productplanTitle {width: 100%; float: left;}
module/kanban/js/view.js
+12 -7
View File
@@ -406,7 +406,9 @@ function renderKanbanItem(item, $item)
function renderExecutionItem(item, $item)
{
/* Output header information. */
var privs = item.actions;
var privs = item.actions;
if(privs.includes('sortCard')) $item.parent().addClass('sort');
var $header = $item.children('.header');
if(!$header.length) $header = $(
[
@@ -427,7 +429,7 @@ function renderExecutionItem(item, $item)
{
var viewMethod = item.execType == 'kanban' ? 'kanban' : 'view';
if(privs.includes('viewExecution') && item.deleted == '0') $title = $('<a class="title"><i class="icon icon-run"></i>' + item.name + '</a>').appendTo($titleBox).attr('href', createLink('execution', viewMethod, 'executionID=' + item.fromID));
if(!privs.includes('viewExecution') || item.deleted == '1') $title = $('<a class="title"><i class="icon icon-run"></i>' + item.name + '</a>').appendTo($titleBox);
if(!privs.includes('viewExecution') || item.deleted == '1') $title = $('<div class="title"><i class="icon icon-run"></i>' + item.name + '</div>').appendTo($titleBox);
}
$title.attr('title', item.name);
@@ -492,13 +494,14 @@ function renderExecutionItem(item, $item)
function renderReleaseItem(item, $item)
{
var privs = item.actions;
if(privs.includes('sortCard')) $item.parent().addClass('sort');
/* Print name. */
var $title = $item.children('.releaseTitle');
if(!$title.length)
{
if(privs.includes('viewRelease') && item.deleted == '0') $title = $('<a class="releaseTitle"><i class="icon icon-publish"></i>' + item.name + '</a>').appendTo($item).attr('href', createLink('release', 'view', 'releaseID=' + item.fromID));
if(!privs.includes('viewRelease') || item.deleted == '1') $title = $('<a class="releaseTitle"><i class="icon icon-publish"></i>' + item.name + '</a>').appendTo($item);
if(!privs.includes('viewRelease') || item.deleted == '1') $title = $('<div class="releaseTitle"><i class="icon icon-publish"></i>' + item.name + '</div>').appendTo($item);
}
$title.attr('title', item.name);
@@ -550,13 +553,14 @@ function renderReleaseItem(item, $item)
function renderProductplanItem(item, $item)
{
var privs = item.actions;
if(privs.includes('sortCard')) $item.parent().addClass('sort');
/* Print name. */
var $title = $item.children('.productplanTitle');
if(!$title.length)
{
if(privs.includes('viewPlan') && item.deleted == '0') $title = $('<a class="productplanTitle"><i class="icon icon-delay"></i>' + item.title + '</a>').appendTo($item).attr('href', createLink('productplan', 'view', 'productplanID=' + item.fromID));
if(!privs.includes('viewPlan') || item.deleted == '1') $title = $('<a class="productplanTitle"><i class="icon icon-delay"></i>' + item.title + '</a>').appendTo($item);
if(!privs.includes('viewPlan') || item.deleted == '1') $title = $('<div class="productplanTitle"><i class="icon icon-delay"></i>' + item.title + '</div>').appendTo($item);
}
$title.attr('title', item.title);
@@ -617,13 +621,14 @@ function renderProductplanItem(item, $item)
function renderBuildItem(item, $item)
{
var privs = item.actions;
if(privs.includes('sortCard')) $item.parent().addClass('sort');
/* Print name. */
var $title = $item.children('.title');
var $title = $item.children('.buildTitle');
if(!$title.length)
{
if(privs.includes('viewBuild') && item.deleted == '0') $title = $('<a class="title"><i class="icon icon-ver"></i>' + item.name + '</a>').appendTo($item).attr('href', createLink('build', 'view', 'buildID=' + item.fromID));
if(!privs.includes('viewBuild') || item.deleted == '1') $title = $('<a class="title"><i class="icon icon-ver"></i>' + item.name + '</a>').appendTo($item);
if(privs.includes('viewBuild') && item.deleted == '0') $title = $('<a class="buildTitle"><i class="icon icon-ver"></i>' + item.name + '</a>').appendTo($item).attr('href', createLink('build', 'view', 'buildID=' + item.fromID));
if(!privs.includes('viewBuild') || item.deleted == '1') $title = $('<div class="buildTitle"><i class="icon icon-ver"></i>' + item.name + '</div>').appendTo($item);
}
$title.attr('title', item.name);