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

fix bug #32326 (Выделение таблицы не перестраивается и закрывается правая...

fix bug #32326 (Выделение таблицы не перестраивается и закрывается правая панель Table Settings при снятии опции Header)
parent 8b5e51c3
...@@ -2247,6 +2247,8 @@ ...@@ -2247,6 +2247,8 @@
this._cleanStyleTable(tablePart.Ref); this._cleanStyleTable(tablePart.Ref);
this._setColorStyleTable(tablePart.Ref, tablePart, null, isSetValue); this._setColorStyleTable(tablePart.Ref, tablePart, null, isSetValue);
History.EndTransaction(); History.EndTransaction();
return tablePart.Ref.clone();
}, },
changeTableRange: function(tableName, range) changeTableRange: function(tableName, range)
......
...@@ -12850,6 +12850,7 @@ ...@@ -12850,6 +12850,7 @@
{ {
var tablePart = this.model.autoFilters._getFilterByDisplayName(tableName); var tablePart = this.model.autoFilters._getFilterByDisplayName(tableName);
var t = this; var t = this;
var ar = this.activeRange;
if(!tablePart || (tablePart && !tablePart.TableStyleInfo)) if(!tablePart || (tablePart && !tablePart.TableStyleInfo))
{ {
...@@ -12867,7 +12868,17 @@ ...@@ -12867,7 +12868,17 @@
History.Create_NewPoint(); History.Create_NewPoint();
History.StartTransaction(); History.StartTransaction();
t.model.autoFilters.changeFormatTableInfo(tableName, optionType, val);
var newTableRef = t.model.autoFilters.changeFormatTableInfo(tableName, optionType, val);
if(newTableRef.r1 > ar.r1 || newTableRef.r2 < ar.r2)
{
var startRow = newTableRef.r1 > ar.r1 ? newTableRef.r1 : ar.r1;
var endRow = newTableRef.r2 < ar.r2 ? newTableRef.r2 : ar.r2;
var newActiveRange = new Asc.Range(ar.c1, startRow, ar.c2, endRow);
t.setSelection(newActiveRange);
History.SetSelectionRedo(newActiveRange);
}
t._onUpdateFormatTable(isChangeTableInfo, false, true); t._onUpdateFormatTable(isChangeTableInfo, false, true);
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