Commit 7513bcbe authored by Igor.Zotov's avatar Igor.Zotov Committed by Alexander.Trofimov

http://bugzserver/show_bug.cgi?id=29037 - [CoEdit] Рассинхронизация данных...

http://bugzserver/show_bug.cgi?id=29037 -  [CoEdit] Рассинхронизация данных при скрытии значений автофильтра пользователями

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@62755 954022d7-b5bf-4e40-9824-e11837661b57
parent 60e7070d
......@@ -482,10 +482,10 @@ var maxIndividualValues = 10000;
},
applyAutoFilter: function (autoFiltersObject, ar) {
console.time("_applyMainFilter2");
var ws = this.worksheet;
var aWs = this._getCurrentWS();
var bUndoChanges = aWs.workbook.bUndoChanges;
var bRedoChanges = aWs.workbook.bRedoChanges;
//**get filter**
var filterObj = this._getPressedFilter(ar, autoFiltersObject.cellId);
......@@ -519,6 +519,8 @@ var maxIndividualValues = 10000;
//open/close rows
if(!bUndoChanges && !bRedoChanges)
{
for(var i = currentFilter.Ref.r1 + 1; i <= currentFilter.Ref.r2; i++)
{
var isHidden = false;
......@@ -536,6 +538,7 @@ var maxIndividualValues = 10000;
aWs.setRowHidden(newFilterColumn.isHideValue(currentValue, isDateTimeFormat), i, i);
}
}
}
//history
this._addHistoryObj(oldFilter, historyitem_AutoFilter_ApplyMF,
......@@ -546,8 +549,6 @@ var maxIndividualValues = 10000;
this._reDrawFilters();
if(!aWs.workbook.bUndoChanges && !aWs.workbook.bRedoChanges)
ws._onUpdateFormatTable(oldFilter.Ref, false, true);
console.timeEnd("_applyMainFilter2");
},
checkAddAutoFilter: function(activeRange, styleName)
......
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