Commit 7e8d9865 authored by GoshaZotov's avatar GoshaZotov

fix bug 32805

parent 524bbd81
......@@ -5590,6 +5590,12 @@ Filters.prototype.init = function(obj) {
if(obj.values[i].visible)
{
if(obj.values[i].isDateFormat)
{
if(obj.values[i].text === "")
{
this.Blank = true;
}
else
{
var dateGroupItem = new DateGroupItem();
var autoFilterDateElem = new AutoFilterDateElem(obj.values[i].val, obj.values[i].val, 1);
......@@ -5598,6 +5604,7 @@ Filters.prototype.init = function(obj) {
this.Dates.push(autoFilterDateElem);
}
}
else
{
if(obj.values[i].text === "")
......@@ -5618,7 +5625,16 @@ Filters.prototype.isHideValue = function(val, isDateTimeFormat) {
var res = false;
if(isDateTimeFormat && this.Dates)
{
if(val === "")
{
res = !this.Blank ? true : false;
}
else
{
res = this.binarySearch(val, this.Dates) !== -1 ? false : true;
}
}
else if(this.Values)
{
if(val === "")
......@@ -5626,8 +5642,10 @@ Filters.prototype.isHideValue = function(val, isDateTimeFormat) {
res = !this.Blank ? true : false;
}
else
{
res = !this.lowerCaseValues[val] ? true : false;
}
}
return res;
};
......
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