Commit 01d74f53 authored by GoshaZotov's avatar GoshaZotov

Merge branch 'release/3.8.1' into develop

parents 847d67f7 d8fc2039
...@@ -496,6 +496,19 @@ ...@@ -496,6 +496,19 @@
if(filterObj.filter === null) if(filterObj.filter === null)
return; return;
//if apply a/f from context menu
if(autoFiltersObject && null === autoFiltersObject.automaticRowCount && currentFilter.isAutoFilter() && currentFilter.isApplyAutoFilter() === false)
{
var automaticRange = this._getAdjacentCellsAF(currentFilter.Ref, true);
var automaticRowCount = automaticRange.r2;
var maxFilterRow = currentFilter.Ref.r2;
if(automaticRowCount > currentFilter.Ref.r2)
maxFilterRow = automaticRowCount;
autoFiltersObject.automaticRowCount = maxFilterRow;
}
//for history //for history
var oldFilter = filterObj.filter.clone(null); var oldFilter = filterObj.filter.clone(null);
History.Create_NewPoint(); History.Create_NewPoint();
......
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