Commit c502f696 authored by GoshaZotov's avatar GoshaZotov

fix bug 35904

parent 96315aac
......@@ -3427,7 +3427,7 @@
},
//TODO пока включаю протестированную функцию. позже доработать функцию _getAdjacentCellsAF2, она работает быстрее!
_getAdjacentCellsAF: function(ar, ignoreAutoFilter, doNotIncludeMergedCells)
_getAdjacentCellsAF: function(ar, ignoreAutoFilter, doNotIncludeMergedCells, ignoreSpaceSymbols)
{
var ws = this.worksheet;
var cloneActiveRange = ar.clone(true); // ToDo слишком много клонирования
......@@ -3468,6 +3468,13 @@
cell = ws.getRange3(n, k, n, k);
isEmptyCell = cell.isEmptyText();
if(!isEmptyCell && ignoreSpaceSymbols){
var tempVal = cell.getValueWithoutFormat().replace(/\s/g, '');
if("" === tempVal){
isEmptyCell = true;
}
}
merged = cell.hasMerged();
if(merged && doNotIncludeMergedCells){
continue;
......
......@@ -12310,7 +12310,7 @@
var selectionRange = t.model.selectionRange;
var activeCell = selectionRange.activeCell.clone();
var activeCellRange = new Asc.Range(activeCell.col, activeCell.row, activeCell.col, activeCell.row);
var expandRange = t.model.autoFilters._getAdjacentCellsAF(activeCellRange, true, true);
var expandRange = t.model.autoFilters._getAdjacentCellsAF(activeCellRange, true, true, true);
//change selection
t.setSelection(expandRange);
......
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