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

http://bugzserver/show_bug.cgi?id=25889 - Некорректно работает сортировка для...

http://bugzserver/show_bug.cgi?id=25889 - Некорректно работает сортировка для выделения внутри таблицы (форматированной) 

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@57703 954022d7-b5bf-4e40-9824-e11837661b57
parent 4b173ae0
...@@ -1355,6 +1355,8 @@ var gUndoInsDelCellsFlag = true; ...@@ -1355,6 +1355,8 @@ var gUndoInsDelCellsFlag = true;
var newEndId; var newEndId;
var t = this; var t = this;
var selectionRange; var selectionRange;
var sortCol;
var onSortAutoFilterCallback = function(success) var onSortAutoFilterCallback = function(success)
{ {
if(success) if(success)
...@@ -1377,7 +1379,7 @@ var gUndoInsDelCellsFlag = true; ...@@ -1377,7 +1379,7 @@ var gUndoInsDelCellsFlag = true;
currentFilter.SortState.SortConditions[0].Ref = cellId + ":" + newEndId; currentFilter.SortState.SortConditions[0].Ref = cellId + ":" + newEndId;
currentFilter.SortState.SortConditions[0].ConditionDescending = type; currentFilter.SortState.SortConditions[0].ConditionDescending = type;
//сама сортировка //сама сортировка
var sortCol = curCell.c1; sortCol = curCell.c1;
sortRange.sort(type,sortCol); sortRange.sort(type,sortCol);
if(currentFilter.TableStyleInfo) if(currentFilter.TableStyleInfo)
t._setColorStyleTable(currentFilter.Ref, currentFilter); t._setColorStyleTable(currentFilter.Ref, currentFilter);
...@@ -1482,6 +1484,10 @@ var gUndoInsDelCellsFlag = true; ...@@ -1482,6 +1484,10 @@ var gUndoInsDelCellsFlag = true;
ws._isLockedCells (sortRange1, /*subType*/null, standartSort); ws._isLockedCells (sortRange1, /*subType*/null, standartSort);
return; return;
} }
else if(splitRef.containsRange(activeRange))//TODO разделить обработки для а/ф и форматированной таблицы
{
cellId = Asc.Range(activeRange.startCol, splitRef.r1, activeRange.startCol, splitRef.r1);
}
else else
{ {
ws.setSelectionInfo("sort", type); ws.setSelectionInfo("sort", type);
......
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