Commit 85278c6e authored by GoshaZotov's avatar GoshaZotov

exclude hidden rows (autocomplete)

parent 6c62b3ba
...@@ -8668,6 +8668,11 @@ Woorksheet.prototype.isApplyFilterBySheet = function(){ ...@@ -8668,6 +8668,11 @@ Woorksheet.prototype.isApplyFilterBySheet = function(){
oPromoteHelper.setIndex(i - nStartRow); oPromoteHelper.setIndex(i - nStartRow);
for(var j = nStartCol; (nStartCol - j) * (nEndCol - j) <= 0; j += nColDx) for(var j = nStartCol; (nStartCol - j) * (nEndCol - j) <= 0; j += nColDx)
{ {
if (bVertical && wsTo.bExcludeHiddenRows && wsTo.getRowHidden(j))
{
continue;
}
var data = oPromoteHelper.getNext(); var data = oPromoteHelper.getNext();
if(null != data && (data.oAdditional || (false == bCopy && null != data.nCurValue))) if(null != data && (data.oAdditional || (false == bCopy && null != data.nCurValue)))
{ {
......
...@@ -8011,8 +8011,14 @@ ...@@ -8011,8 +8011,14 @@
if (null != oCanPromote) { if (null != oCanPromote) {
History.Create_NewPoint(); History.Create_NewPoint();
History.StartTransaction(); History.StartTransaction();
if(t.model.autoFilters.bIsExcludeHiddenRows(changedRange, t.model.selectionRange.activeCell)){
t.model.excludeHiddenRows(true);
}
range.promote(/*bCtrl*/ctrlPress, /*bVertical*/(1 === t.fillHandleDirection), nIndex, range.promote(/*bCtrl*/ctrlPress, /*bVertical*/(1 === t.fillHandleDirection), nIndex,
oCanPromote); oCanPromote);
t.model.excludeHiddenRows(false);
// Вызываем функцию пересчета для заголовков форматированной таблицы // Вызываем функцию пересчета для заголовков форматированной таблицы
t.model.autoFilters.renameTableColumn(arn); t.model.autoFilters.renameTableColumn(arn);
......
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