Commit b46ea224 authored by GoshaZotov's avatar GoshaZotov Committed by Alexander.Trofimov

Bug #32306

Не происходит обновление канвы после скрытия и раскрытия значений форматированной таблицы
parent cac5d964
...@@ -3381,6 +3381,9 @@ UndoRedoWoorksheet.prototype = { ...@@ -3381,6 +3381,9 @@ UndoRedoWoorksheet.prototype = {
} }
range = ws.getRange3(bbox.r1, bbox.c1, bbox.r2, bbox.c2); range = ws.getRange3(bbox.r1, bbox.c1, bbox.r2, bbox.c2);
range._sortByArray(bbox, places); range._sortByArray(bbox, places);
worksheetView = this.wb.oApi.wb.getWorksheetById(nSheetId);
worksheetView.model.autoFilters.resetTableStyles(bbox);
} }
else if(AscCH.historyitem_Worksheet_MoveRange == Type) else if(AscCH.historyitem_Worksheet_MoveRange == Type)
{ {
......
...@@ -1509,7 +1509,9 @@ ...@@ -1509,7 +1509,9 @@
curFilter.SortState.SortConditions[0].ConditionDescending = resType; curFilter.SortState.SortConditions[0].ConditionDescending = resType;
if(curFilter.TableStyleInfo) if(curFilter.TableStyleInfo)
{
t._setColorStyleTable(curFilter.Ref, curFilter); t._setColorStyleTable(curFilter.Ref, curFilter);
}
t._addHistoryObj({oldFilter: oldFilter}, AscCH.historyitem_AutoFilter_Sort, t._addHistoryObj({oldFilter: oldFilter}, AscCH.historyitem_AutoFilter_Sort,
{activeCells: cellIdRange, type: type, cellId: cellId}, null, curFilter.Ref); {activeCells: cellIdRange, type: type, cellId: cellId}, null, curFilter.Ref);
History.EndTransaction(); History.EndTransaction();
...@@ -4419,6 +4421,22 @@ ...@@ -4419,6 +4421,22 @@
} }
}, },
resetTableStyles: function(range)
{
var worksheet = this.worksheet;
if(worksheet.TableParts && worksheet.TableParts.length > 0)
{
for(var i = 0; i < worksheet.TableParts.length; i++)
{
var ref = worksheet.TableParts[i].Ref;
if(ref.isIntersect(range))
{
this._setColorStyleTable(ref, worksheet.TableParts[i]);
}
}
}
},
_generateColumnName2: function(tableColumns) _generateColumnName2: function(tableColumns)
{ {
var columnName = "Column"; var columnName = "Column";
......
...@@ -11990,8 +11990,9 @@ ...@@ -11990,8 +11990,9 @@
{ {
History.Create_NewPoint(); History.Create_NewPoint();
History.StartTransaction(); History.StartTransaction();
t.model.autoFilters.sortColFilter( type, cellId, ar, sortProps, displayName );
t.cellCommentator.sortComments(sortProps.sortRange.sort(type == 'ascending', sortProps.startCol)); t.cellCommentator.sortComments(sortProps.sortRange.sort(type == 'ascending', sortProps.startCol));
t.model.autoFilters.sortColFilter( type, cellId, ar, sortProps, displayName );
t._onUpdateFormatTable(sortProps.sortRange.bbox, false); t._onUpdateFormatTable(sortProps.sortRange.bbox, false);
History.EndTransaction(); History.EndTransaction();
......
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