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

Merge branch 'sprint/201_liumengyi_fixbug' into 'master'

Browse Source 
* Fix bug #23506, #23439.

See merge request easycorp/zentaopms!3835
This commit is contained in:
孙广明
2022-06-09 08:26:54 +00:00
parent e407b58e2a f3ce4377a8
commit d3afbb5922
3 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/execution/css/kanban.css
+1 -1
View File
@@ -80,7 +80,7 @@
#kanbanScaleControl > .input-group-btn:first-child > .btn {border-radius: 16px 0 0 16px; border-right-color: transparent;}
#kanbanScaleControl > .input-group-btn:last-child > .btn {border-radius: 0 16px 16px 0; border-left-color: transparent;}
#kanbanScaleControl > .input-group-btn > .btn:hover {border-color: #b8bfce;}
#kanbanActionMenu {top: 24px; right: auto;}
#kanbanActionMenu {top: 24px; right: 57px;}
.kanban + .kanban {margin-top: 15px}
.kanban-card > .title {display: block; white-space: nowrap; overflow: hidden; text-overflow: ellipsis}
module/execution/js/kanban.js
+4 -5
View File
@@ -1668,19 +1668,18 @@ function searchCards(value)
rdSearchValue = value;
$.get(createLink('execution', 'ajaxUpdateKanban', "executionID=" + executionID + "&entertime=0&browseType=" + browseType + "&groupBy=" + groupBy + '&from=RD&searchValue=' + rdSearchValue), function(data)
{
if(lastUpdateData === data) return;
lastUpdateData = data;
var kanbanData = $.parseJSON(data);
kanbanData = $.parseJSON(data);
var hideAll = true;
$('#kanban').children('.region').children("div[id^='kanban']").each(function()
{
var regionID = $(this).attr('data-id');
if(kanbanData != null) data = groupBy == 'default' ? kanbanData[regionID] : kanbanData[groupBy];
if(rdSearchValue != '' && data.laneCount != 0) $(this).parent().show();
if(rdSearchValue != '' && data.laneCount == 0) $(this).parent().hide();
if(rdSearchValue != '' && groupBy == 'default' && data.laneCount != 0) $(this).parent().show();
if(rdSearchValue != '' && groupBy == 'default' && data.laneCount == 0) $(this).parent().hide();
hideAll = hideAll && !updateRegion(regionID, data);
hideAll = !updateRegion(regionID, data) && hideAll;
});
if(hideAll && rdSearchValue != '')
module/kanban/model.php
+1 -1
View File
@@ -1577,7 +1577,7 @@ class kanbanModel extends model
$laneData['cards'][$column->columnType][] = $cardData;
$cardOrder ++;
}
if($searchValue != '' and !isset($laneData['cards'][$column->columnType])) $laneData['cards'][$column->columnType] = array();
if($searchValue == '' and !isset($laneData['cards'][$column->columnType])) $laneData['cards'][$column->columnType] = array();
}
if($searchValue != '' and empty($laneData['cards'])) continue;