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

* Fix issue #731.

Browse Source
This commit is contained in:
tianshujie
2022-09-01 16:17:04 +08:00
parent c1611935ba
commit 708494da4e
3 changed files with 35 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/kanban/css/view.css
+4
View File
@@ -175,3 +175,7 @@
#regionTabs.affixed ul > li {margin-bottom: 0px !important;}
#regionTabs .region-actions .dropdown-menu {top: 25px;}
#region-tab-actions {display: flex; position: relative; right: 0px; top: -2px;}
.region {display: none;}
.region.active {display: block;}
.region.active.notAll {margin-top: 0px;}
.region.active.notAll .region-header > * {display: none;}
module/kanban/js/view.js
+25
View File
@@ -1923,3 +1923,28 @@ function initRegionTabs()
if($acitiveItem.next().length != 0 && regionTabULWidth > regionTabsWidth) $('#regionTabs').find('.rightBtn').removeClass('disabled');
$('#kanbanBox').removeClass('hidden');
}
$('[data-tab]').on('shown.zui.tab', function(e)
{
var $current = $(e.target);
var $prev = $(e.relatedTarget);
var contentID = $current.attr('href');
$current.addClass('btn-active-text');
$current.parent().addClass('active');
$prev.removeClass('btn-active-text');
$prev.parent().removeClass('active');
if(contentID == 'all')
{
$('.region').addClass('active');
$('.region').removeClass('notAll');
}
else
{
var $currentRegion = $(contentID);
$('.region').removeClass('active');
$currentRegion.addClass('active notAll');
$currentRegion.find('.kanban').css('display', 'block');
}
});
module/kanban/view/view.html.php
+6 -9
View File
@@ -61,15 +61,13 @@ $canViewArchivedColumn = commonModel::hasPriv('kanban', 'viewArchivedColumn');
<div id='regionNavTabs'>
<ul class="nav nav-tabs">
<li data-id='all' class="<?php echo $regionID === 'all' ? 'active' : '';?>" title="<?php echo $lang->kanbanregion->all;?>">
<a href="<?php echo inlink('view', "kanbanID=$kanban->id&regionID=all");?>" class="<?php echo $regionID === 'all' ? 'btn-active-text' : '';?>">
<span class='text'><?php echo $lang->kanbanregion->all;?></span>
</a>
<?php $active = $regionID == 'all' ? 'btn-active-text' : '';?>
<?php echo html::a('all', "<span class='text'>{$lang->kanbanregion->all}</span>", '', "class='$active' data-tab");?>
</li>
<?php foreach($regions as $region):?>
<li data-id="<?php echo $region->id;?>" class="<?php echo $region->id == $regionID ? 'active' : '';?>" title="<?php echo $region->name;?>">
<a href="<?php echo inlink('view', "kanbanID=$kanban->id&regionID=$region->id");?>" class="<?php echo $region->id == $regionID ? 'btn-active-text' : '';?>">
<span class='text'><?php echo $region->name;?></span>
</a>
<?php $active = $region->id == $regionID ? 'btn-active-text' : '';?>
<?php echo html::a("#region{$region->id}", "<span class='text'>$region->name</span>", '', "class='$active' data-tab");?>
</li>
<?php endforeach;?>
</ul>
@@ -96,9 +94,8 @@ $canViewArchivedColumn = commonModel::hasPriv('kanban', 'viewArchivedColumn');
<div class='panel' id='kanbanContainer'>
<div class='panel-body'>
<div id="kanban" data-id='<?php echo $kanban->id;?>'>
<?php $regionGroup = ($regionID !== 'all' and isset($regions[$regionID])) ? array($regionID => $regions[$regionID]) : $regions;?>
<?php foreach($regionGroup as $region):?>
<div class="region<?php if($canSortRegion) echo ' sort';?>" data-id="<?php echo $region->id;?>">
<?php foreach($regions as $region):?>
<div class="region<?php if($canSortRegion) echo ' sort';?>" data-id="<?php echo $region->id;?>" id="<?php echo 'region' . $region->id?>">
<div class="region-header dropdown">
<strong><?php echo $region->name;?></strong>
<i class="icon icon-angle-top btn-link" data-id="<?php echo $region->id;?>"></i>