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

Merge branch 'sprint/mater_zhouxudong_56368' into 'master'

Browse Source 
* Finish task #56368.

See merge request easycorp/zentaopms!3850
This commit is contained in:
王怡栋
2022-06-10 02:07:33 +00:00
parent 097faf3c7d de0d579bdd
commit 2849f7a229
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/kanban/js/view.js
+5 -5
View File
@@ -1370,9 +1370,9 @@ $(function()
if(navigator.userAgent.toLowerCase().indexOf("qqbrowser") > -1) $('.region .kanban-header-col > .actions').css('top', '30%');
$('.icon-chevron-double-up,.icon-chevron-double-down').on('click', function()
$('.icon-angle-top,.icon-angle-down').on('click', function()
{
$(this).toggleClass('icon-chevron-double-up icon-chevron-double-down');
$(this).toggleClass('icon-angle-top icon-angle-down');
$(this).parents('.region').find('.kanban').toggle();
hideKanbanAction();
resetRegionHeight($(this).hasClass('icon-chevron-double-up') ? 'open' : 'close');
@@ -1530,10 +1530,10 @@ function initSortable()
if(sortType == 'region')
{
showRegionIdList = '';
$('.icon-chevron-double-up').each(function()
$('.icon-angle-top').each(function()
{
showRegionIdList += $(this).attr('data-id') + ',';
$(this).attr('class', 'icon-chevron-double-down');
$(this).attr('class', 'icon-angle-down');
});
$('.region').find('.kanban').hide();
@@ -1564,7 +1564,7 @@ function initSortable()
{
if(showRegionIdList.includes($(this).attr('data-id')))
{
$(this).find('.icon-chevron-double-down').attr('class', 'icon-chevron-double-up');
$(this).find('.icon-angle-down').attr('class', 'icon-angle-top');
$(this).find('.kanban').show();
}
})
module/kanban/view/view.html.php
+1 -1
View File
@@ -57,7 +57,7 @@ $canCreateLane = commonModel::hasPriv('kanban', 'createLane');
<div class="region<?php if($canSortRegion) echo ' sort';?>" data-id="<?php echo $region->id;?>">
<div class="region-header dropdown">
<strong><?php echo $region->name;?></strong>
<a class="text-muted"><i class="icon icon-chevron-double-up" data-id="<?php echo $region->id;?>"></i></a>
<a class="text-muted"><i class="icon icon-angle-top" data-id="<?php echo $region->id;?>"></i></a>
<div class='region-actions'>
<?php if(($canEditRegion || $canCreateLane || $canDeleteRegion) and !(isset($this->config->CRKanban) and $this->config->CRKanban == '0' and $kanban->status == 'closed')):?>
<button class="btn btn-link action" type="button" data-toggle="dropdown"><i class="icon icon-ellipsis-v"></i></button>