Commit 6b032d6f authored by Igor.Zotov's avatar Igor.Zotov Committed by Alexander.Trofimov

http://bugzserver/show_bug.cgi?id=24902 - Окно автофильтра не закрывается...

http://bugzserver/show_bug.cgi?id=24902 - Окно автофильтра не закрывается после отбора данных поиском среди значений Date/Time

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@56913 954022d7-b5bf-4e40-9824-e11837661b57
parent eba5f216
......@@ -2538,18 +2538,18 @@ var gUndoInsDelCellsFlag = true;
{
if(this._dataFilterParse(arrVal[h],valActive))
isConsist = h;
}
};
if(isConsist == undefined)//создаём новый элемент дата
{
var dataVal = NumFormat.prototype.parseDate(valActive);
valActive =
{
DateTimeGrouping: 1,
Day: dataVal.d,
Month: dataVal.month + 1,
Year: dataVal.year
}
}
valActive = new DateGroupItem();
valActive.DateTimeGrouping = 1;
valActive.Day = dataVal.d;
valActive.Month = dataVal.month + 1;
valActive.Year = dataVal.year;
};
if(array[i] == true && isConsist == undefined)//добавляем значение в конец
arrVal[arrVal.length] = valActive;
else if(array[i] == false && isConsist != undefined)//убираем данное значение из массива
......@@ -5325,6 +5325,8 @@ var gUndoInsDelCellsFlag = true;
{
if(filter.AutoFilter)
filter.AutoFilter.FilterColumns = cloneFilterColums;
if(!filter.AutoFilter)
filter.AutoFilter = new AutoFilter();
filter.AutoFilter.Ref = inFilter;
}
};
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment