Commit 183aefdd authored by Igor.Zotov's avatar Igor.Zotov

функция applyAutoFilter возвращает самую верхнюю измененную строку

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@67581 954022d7-b5bf-4e40-9824-e11837661b57
parent 6e628a0e
...@@ -509,6 +509,8 @@ var maxIndividualValues = 10000; ...@@ -509,6 +509,8 @@ var maxIndividualValues = 10000;
var bUndoChanges = aWs.workbook.bUndoChanges; var bUndoChanges = aWs.workbook.bUndoChanges;
var bRedoChanges = aWs.workbook.bRedoChanges; var bRedoChanges = aWs.workbook.bRedoChanges;
var minChangeRow = null;
//**get filter** //**get filter**
var filterObj = this._getPressedFilter(ar, autoFiltersObject.cellId) var filterObj = this._getPressedFilter(ar, autoFiltersObject.cellId)
var currentFilter = filterObj.filter; var currentFilter = filterObj.filter;
...@@ -577,6 +579,9 @@ var maxIndividualValues = 10000; ...@@ -577,6 +579,9 @@ var maxIndividualValues = 10000;
var isSetHidden = newFilterColumn.isHideValue(currentValue, isDateTimeFormat); var isSetHidden = newFilterColumn.isHideValue(currentValue, isDateTimeFormat);
if(isSetHidden !== aWs.getRowHidden(i) && minChangeRow === null)
minChangeRow = i;
//скрываем строки //скрываем строки
if(hiddenObj.h === null) if(hiddenObj.h === null)
{ {
...@@ -613,6 +618,8 @@ var maxIndividualValues = 10000; ...@@ -613,6 +618,8 @@ var maxIndividualValues = 10000;
this._reDrawFilters(); this._reDrawFilters();
if(!aWs.workbook.bUndoChanges && !aWs.workbook.bRedoChanges) if(!aWs.workbook.bUndoChanges && !aWs.workbook.bRedoChanges)
ws._onUpdateFormatTable(oldFilter.Ref, false, true); ws._onUpdateFormatTable(oldFilter.Ref, false, true);
return minChangeRow;
}, },
checkAddAutoFilter: function(activeRange, styleName, addFormatTableOptionsObj) checkAddAutoFilter: function(activeRange, styleName, addFormatTableOptionsObj)
......
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