Commit 6e97e36d authored by GoshaZotov's avatar GoshaZotov Committed by Alexander.Trofimov

unmerge range(after move into formattable)

parent 1456fba8
...@@ -4771,6 +4771,9 @@ Woorksheet.prototype._moveRange=function(oBBoxFrom, oBBoxTo, copyRange){ ...@@ -4771,6 +4771,9 @@ Woorksheet.prototype._moveRange=function(oBBoxFrom, oBBoxTo, copyRange){
*/ */
sortDependency(this.workbook); sortDependency(this.workbook);
} }
this.autoFilters.unmergeTablesAfterMove( oBBoxTo );
// ToDo возможно нужно уменьшить диапазон обновления // ToDo возможно нужно уменьшить диапазон обновления
History.Add(AscCommonExcel.g_oUndoRedoWorksheet, AscCH.historyitem_Worksheet_MoveRange, History.Add(AscCommonExcel.g_oUndoRedoWorksheet, AscCH.historyitem_Worksheet_MoveRange,
this.getId(), new Asc.Range(0, 0, gc_nMaxCol0, gc_nMaxRow0), this.getId(), new Asc.Range(0, 0, gc_nMaxCol0, gc_nMaxRow0),
......
...@@ -1701,6 +1701,21 @@ ...@@ -1701,6 +1701,21 @@
return false; return false;
}, },
unmergeTablesAfterMove: function(arnTo)
{
var worksheet = this.worksheet;
var intersectionRangeWithTableParts = this._intersectionRangeWithTableParts(arnTo);
if(intersectionRangeWithTableParts && intersectionRangeWithTableParts.length)
{
for(var i = 0; i < intersectionRangeWithTableParts.length; i++)
{
var tablePart = intersectionRangeWithTableParts[i];
worksheet.mergeManager.remove(tablePart.Ref.clone());
}
}
},
_setStyleTablePartsAfterOpenRows: function(ref) _setStyleTablePartsAfterOpenRows: function(ref)
{ {
......
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