Commit b1428bc7 authored by GoshaZotov's avatar GoshaZotov

fix bug 33263

parent 8440dedb
......@@ -809,46 +809,45 @@
//для проверки возможности добавить ф/т - попробовать использовать parserHelper.checkDataRange
var bIsInFilter = this._searchRangeInFilters(activeCells);
var addRange;
if(false === bIsInFilter)
if(false === bIsInFilter)
{
bIsInFilter = null;
}
if(null === bIsInFilter)
{
res = false;
if(activeCells.r1 == activeCells.r2 && activeCells.c1 == activeCells.c2)//если ячейка выделенная одна
{
addRange = this._getAdjacentCellsAF(activeCells);
}
else
{
addRange = activeCells;
}
}
else
else//range внутри а/ф или ф/т
{
if(null === bIsInFilter)
if(bIsInFilter.isAutoFilter())
{
if(activeCells.r1 == activeCells.r2 && activeCells.c1 == activeCells.c2)//если ячейка выделенная одна
{
addRange = this._getAdjacentCellsAF(activeCells);
}
else
{
addRange = activeCells;
}
addRange = bIsInFilter.Ref;
}
else//range внутри а/ф или ф/т
else
{
if(bIsInFilter.isAutoFilter())
{
addRange = bIsInFilter.Ref;
}
else
{
res = false;
}
res = false;
}
if(false !== res)
{
res = new AddFormatTableOptions();
}
if(false !== res)
{
res = new AddFormatTableOptions();
var bIsTitle = this._isAddNameColumn(addRange);
var range = addRange.clone();
addRange.setAbs(true, true, true, true);
res.asc_setIsTitle(bIsTitle);
res.asc_setRange(range.getName());
}
var bIsTitle = this._isAddNameColumn(addRange);
var range = addRange.clone();
addRange.setAbs(true, true, true, true);
res.asc_setIsTitle(bIsTitle);
res.asc_setRange(range.getName());
}
return res;
......
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