Merge branch 'sprint/208_tianshujie_fixbug' into 'master'

Sprint/208 tianshujie fixbug

See merge request easycorp/zentaopms!4295
This commit is contained in:
王怡栋
2022-07-01 01:41:14 +00:00
2 changed files with 3 additions and 1 deletions
+2 -1
View File
@@ -835,7 +835,7 @@ function updateRegion(regionID, regionData = [])
if(!regionData) regionData = regions[regionID];
var data = groupBy == 'default' ? regionData.groups : regionData;
if(data == null || data.length == 0)
if((data == null || data.length == 0) && rdSearchValue != '')
{
if(groupBy == 'default') $("div[data-id^=" + regionID + "].region").hide();
if(groupBy != 'default') $("div[data-id^=" + regionID + "].kanban").hide();
@@ -1608,6 +1608,7 @@ $(function()
{
$.get(createLink('execution', 'ajaxUpdateKanban', "executionID=" + executionID + "&entertime=" + entertime + "&browseType=" + browseType + "&groupBy=" + groupBy + '&from=RD&searchValue=' + rdSearchValue), function(data)
{
if(lastUpdateData == '') lastUpdateData = data;
if(data && lastUpdateData !== data)
{
lastUpdateData = data;
+1
View File
@@ -1268,6 +1268,7 @@ $(function()
{
$.get(createLink('execution', 'ajaxUpdateKanban', "executionID=" + executionID + "&entertime=" + entertime + "&browseType=" + browseType + "&groupBy=" + groupBy + '&from=execution&searchValue=' + searchValue), function(data)
{
if(lastUpdateData == '') lastUpdateData = data;
if(data && lastUpdateData !== data)
{
lastUpdateData = data;