Skip to content

S
sdkjs
Commit 7399ee22 authored by Igor.Zotov's avatar Igor.Zotov Committed by Alexander.Trofimov
Browse files
Options

рефакторинг 

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@56015 954022d7-b5bf-4e40-9824-e11837661b57
parent 8b8d43cc
Hide whitespace changes
Inline Side-by-side
Showing with 330 additions and 325 deletions
Excel/model/autofilters.js
View file @ 7399ee22
...@@ -3655,14 +3655,10 @@ var gUndoInsDelCellsFlag = true; ...@@ -3655,14 +3655,10 @@ var gUndoInsDelCellsFlag = true;
} }
}, },
_getArrayOpenCells : function(index,buttonId) _getArrayOpenCells : function(index, buttonId)
{ {
var ws = this.worksheet; var aWs = this._getCurrentWS(), currentFilter, numFilter, curIndex = index.split(':'), opFil;
var aWs = this._getCurrentWS();
var currentFilter;
var numFilter;
var curIndex = index.split(':');
var opFil;
if(curIndex[0] == 'all') if(curIndex[0] == 'all')
{ {
currentFilter = aWs.AutoFilter; currentFilter = aWs.AutoFilter;
...@@ -3682,183 +3678,35 @@ var gUndoInsDelCellsFlag = true; ...@@ -3682,183 +3678,35 @@ var gUndoInsDelCellsFlag = true;
if(!currentFilter.AutoFilter.FilterColumns) if(!currentFilter.AutoFilter.FilterColumns)
currentFilter.AutoFilter.FilterColumns = []; currentFilter.AutoFilter.FilterColumns = [];
opFil = currentFilter.AutoFilter.FilterColumns; opFil = currentFilter.AutoFilter.FilterColumns;
} };
//анализируем структуру фильтра //анализируем структуру фильтра
//проверяем какие параметры применены к данному столбцу и к другим в этом фильтре //проверяем какие параметры применены к данному столбцу и к другим в этом фильтре
//проходимся по всем фильтрам //проходимся по всем фильтрам
var idDigitalFilter = false;
var min;
if(opFil) if(opFil)
{ {
var isFilterCol = false; var result = this._getOpenAndClosedValues(numFilter, currentFilter, opFil, buttonId);
var result = []; return result;
for(var fN = 0; fN < opFil.length; fN++) };
},
_getOpenAndClosedValues: function(numFilter, currentFilter, opFil, buttonId)
{
var isFilterCol = false, idDigitalFilter = false, result = [], ws = this.worksheet;
for(var fN = 0; fN < opFil.length; fN++)
{
var curFilter = opFil[fN];
//стандартный фильтр
if(curFilter && curFilter.Filters)
{ {
var curFilter = opFil[fN]; if(curFilter.Filters.Values || curFilter.Filters.Dates)
//стандартный фильтр
if(curFilter && curFilter.Filters)
{
if(curFilter.Filters.Values || curFilter.Filters.Dates)
{
//пересматриваем все значения
var filValue = curFilter.Filters.Values;
var dataValues = curFilter.Filters.Dates;
var isBlank = curFilter.Filters.Blank;
var nC = 0;
var acCell = currentFilter.result[curFilter.ColId];
//если имеются мерженные ячейки, переносим кнопку
if(acCell.showButton == false)
{
for(var sb = curFilter.ColId + 1; sb < currentFilter.result.length; sb++)
{
if(currentFilter.result[sb].showButton != false)
{
//acCell = currentFilter.result[sb];
break;
}
}
}
if(sb && sb == numFilter)
numFilter = curFilter.ColId;
var startRow = ws.model.getCell(new CellAddress(acCell.id)).first.row - 1;
var endRow = ws.model.getCell(new CellAddress(acCell.idNext)).first.row - 1;
var col = ws.model.getCell(new CellAddress(acCell.id)).first.col - 1;
var visible;
for(var nRow = startRow + 1; nRow <= endRow; nRow++)
{
var cell = ws.model.getCell(new CellAddress(nRow,col,0));
var val = cell.getValueWithFormat();
var val2 = cell.getValueWithoutFormat();
if(!result[nC])
result[nC] = new AutoFiltersOptionsElements();
if(curFilter.ColId == numFilter)//щёлкнули по кнопке данного фильтра
{
var isFilterCol = true;
var isInput = false;
result[nC].val = val;
result[nC].val2 = val2;
visible = (result[nC].visible == "hidden") ? true : false;
if(filValue && filValue.length != 0)
{
for(var nVal = 0; nVal < filValue.length; nVal++)
{
if(val2 == '' && isBlank == null)
{
if(!visible)
result[nC].visible = false;
}
if(val2 == '' && isBlank == true)
{
isInput = true;
if(!visible)
result[nC].visible = true;
break;
}
else if(filValue[nVal] == val2)
{
isInput = true;
if(!visible)
result[nC].visible = true;
break;
}
else
{
if(!visible)
result[nC].visible = false;
}
}
}
else if(filValue && filValue.length == 0 && val2 == '' && isBlank == true)
{
isInput = true;
if(!visible)
result[nC].visible = true;
}
if(dataValues && dataValues.length != 0 && !isInput)
{
for(var nVal = 0; nVal < dataValues.length; nVal++)
{
if(this._dataFilterParse(dataValues[nVal],val2))
{
result[nC].val = val;
result[nC].val2 = val2;
if(result[nC].visible != 'hidden')
result[nC].visible = true;
break;
}
else
{
result[nC].val = val;
result[nC].val2 = val2;
if(result[nC].visible != 'hidden')
result[nC].visible = false;
}
}
}
}
else//тот же диапазон просмотатриваем другими кнопками фильтра
{
var check = false;
if(filValue.length == 0 && val == '' && isBlank == true)
check = true;
for(var nVal = 0; nVal < filValue.length; nVal++)
{
if((filValue[nVal] == val2) || (val == '' && isBlank == true))
{
check = true;
break;
}
}
if(dataValues)
{
for(var nVal = 0; nVal < dataValues.length; nVal++)
{
if(this._dataFilterParse(dataValues[nVal],val2))
{
check = true;
break;
}
}
}
if(!check)
{
result[nC].visible = 'hidden';
}
}
if(result[nC].visible != 'hidden')
{
if(result[nC].val == undefined)
{
result[nC].val = val;
result[nC].val2 = val2;
}
/*var anotherFilterHidden = this._isHiddenAnotherFilter(buttonId,nRow,ws);
if(anotherFilterHidden != undefined)
result[nC].visible = anotherFilterHidden;
if(anotherFilterHidden == undefined && result[nC].visible == undefined)
result[nC].visible = false;*/
}
if(nC >= 1000)
{
break;
}
else
nC++;
}
}
}
else if(curFilter && curFilter.CustomFiltersObj && curFilter.CustomFiltersObj.CustomFilters)//числовой фильтр
{ {
//пересматриваем все значения //пересматриваем все значения
//var filValue = curFilter.Filters.Values; var filValue = curFilter.Filters.Values;
var dataValues = curFilter.Filters.Dates;
var isBlank = curFilter.Filters.Blank;
var nC = 0; var nC = 0;
var acCell = currentFilter.result[curFilter.ColId]; var acCell = currentFilter.result[curFilter.ColId];
//если имеются мерженные ячейки, переносим кнопку //если имеются мерженные ячейки, переносим кнопку
...@@ -3875,49 +3723,129 @@ var gUndoInsDelCellsFlag = true; ...@@ -3875,49 +3723,129 @@ var gUndoInsDelCellsFlag = true;
} }
if(sb && sb == numFilter) if(sb && sb == numFilter)
numFilter = curFilter.ColId; numFilter = curFilter.ColId;
var startRow = ws.model.getCell(new CellAddress(acCell.id)).first.row - 1; var startRow = ws.model.getCell(new CellAddress(acCell.id)).first.row - 1;
var endRow = ws.model.getCell(new CellAddress(acCell.idNext)).first.row - 1; var endRow = ws.model.getCell(new CellAddress(acCell.idNext)).first.row - 1;
var col = ws.model.getCell(new CellAddress(acCell.id)).first.col - 1; var col = ws.model.getCell(new CellAddress(acCell.id)).first.col - 1;
for(nRow = startRow + 1; nRow <= endRow; nRow++) var visible;
for(var nRow = startRow + 1; nRow <= endRow; nRow++)
{ {
var cell = ws.model.getCell(new CellAddress(nRow,col,0)); var cell = ws.model.getCell(new CellAddress(nRow,col,0));
var val = cell.getValueWithFormat(); var val = cell.getValueWithFormat();
var val2 = cell.getValueWithoutFormat(); var val2 = cell.getValueWithoutFormat();
var type = cell.getType();
if(!result[nC]) if(!result[nC])
result[nC] = new AutoFiltersOptionsElements(); result[nC] = new AutoFiltersOptionsElements();
if(curFilter.ColId == numFilter) if(curFilter.ColId == numFilter)//щёлкнули по кнопке данного фильтра
{ {
var isFilterCol = true; var isFilterCol = true;
idDigitalFilter = true; var isInput = false;
/*for(nVal = 0; nVal < filValue.length; nVal++)
{*/
result[nC].rep = this._findCloneElement(result,val);
result[nC].val = val; result[nC].val = val;
result[nC].val2 = val2; result[nC].val2 = val2;
if(result[nC].visible != 'hidden') visible = (result[nC].visible == "hidden") ? true : false;
result[nC].visible = false; if(filValue && filValue.length != 0)
{
for(var nVal = 0; nVal < filValue.length; nVal++)
{
if(val2 == '' && isBlank == null)
{
if(!visible)
result[nC].visible = false;
}
if(val2 == '' && isBlank == true)
{
isInput = true;
if(!visible)
result[nC].visible = true;
break;
}
else if(filValue[nVal] == val2)
{
isInput = true;
if(!visible)
result[nC].visible = true;
break;
}
else
{
if(!visible)
result[nC].visible = false;
}
}
}
else if(filValue && filValue.length == 0 && val2 == '' && isBlank == true)
{
isInput = true;
if(!visible)
result[nC].visible = true;
}
if(dataValues && dataValues.length != 0 && !isInput)
{
for(var nVal = 0; nVal < dataValues.length; nVal++)
{
if(this._dataFilterParse(dataValues[nVal],val2))
{
result[nC].val = val;
result[nC].val2 = val2;
if(result[nC].visible != 'hidden')
result[nC].visible = true;
break;
}
else
{
result[nC].val = val;
result[nC].val2 = val2;
if(result[nC].visible != 'hidden')
result[nC].visible = false;
}
}
}
} }
else else//тот же диапазон просмотатриваем другими кнопками фильтра
{ {
var check = false; var check = false;
//проверка на скрытие данных строк другим числовым фильтром if(filValue.length == 0 && val == '' && isBlank == true)
var filterCust = check = true;
{ for(var nVal = 0; nVal < filValue.length; nVal++)
filter1: curFilter.CustomFiltersObj.CustomFilters[0].Operator, {
filter2: curFilter.CustomFiltersObj.CustomFilters[1] ? curFilter.CustomFiltersObj.CustomFilters[1].Operator : undefined, if((filValue[nVal] == val2) || (val == '' && isBlank == true))
valFilter1: curFilter.CustomFiltersObj.CustomFilters[0].Val, {
valFilter2: curFilter.CustomFiltersObj.CustomFilters[1]?curFilter.CustomFiltersObj.CustomFilters[1].Val : undefined, check = true;
isChecked: curFilter.CustomFiltersObj.And break;
}; }
if(!isNaN(parseFloat(val2))) }
val2 = parseFloat(val2); if(dataValues)
if(!this._getLogical(filterCust,{val: val2, type: type, valWithFormat: val})) {
for(var nVal = 0; nVal < dataValues.length; nVal++)
{
if(this._dataFilterParse(dataValues[nVal],val2))
{
check = true;
break;
}
}
}
if(!check)
{ {
result[nC].visible = 'hidden'; result[nC].visible = 'hidden';
} }
} }
this._isHiddenAnotherFilter(curFilter.ColId,nRow); if(result[nC].visible != 'hidden')
{
if(result[nC].val == undefined)
{
result[nC].val = val;
result[nC].val2 = val2;
}
/*var anotherFilterHidden = this._isHiddenAnotherFilter(buttonId,nRow,ws);
if(anotherFilterHidden != undefined)
result[nC].visible = anotherFilterHidden;
if(anotherFilterHidden == undefined && result[nC].visible == undefined)
result[nC].visible = false;*/
}
if(nC >= 1000) if(nC >= 1000)
{ {
break; break;
...@@ -3925,163 +3853,240 @@ var gUndoInsDelCellsFlag = true; ...@@ -3925,163 +3853,240 @@ var gUndoInsDelCellsFlag = true;
else else
nC++; nC++;
} }
} }
else if(curFilter && curFilter.Top10)//Top10 }
else if(curFilter && curFilter.CustomFiltersObj && curFilter.CustomFiltersObj.CustomFilters)//числовой фильтр
{
//пересматриваем все значения
//var filValue = curFilter.Filters.Values;
var nC = 0;
var acCell = currentFilter.result[curFilter.ColId];
//если имеются мерженные ячейки, переносим кнопку
if(acCell.showButton == false)
{ {
//пересматриваем все значения for(var sb = curFilter.ColId + 1; sb < currentFilter.result.length; sb++)
var nC = 0;
var acCell = currentFilter.result[curFilter.ColId];
var startRow = ws.model.getCell(new CellAddress(acCell.id)).first.row - 1;
var endRow = ws.model.getCell(new CellAddress(acCell.idNext)).first.row - 1;
var col = ws.model.getCell(new CellAddress(acCell.id)).first.col - 1;
var top10Arr = [];
for(nRow = startRow + 1; nRow <= endRow; nRow++)
{ {
var cell = ws.model.getCell(new CellAddress(nRow,col,0)); if(currentFilter.result[sb].showButton != false)
var val = cell.getValueWithFormat();
var val2 = cell.getValueWithoutFormat();
if(!result[nC])
result[nC] = new AutoFiltersOptionsElements();
if(curFilter.ColId == numFilter)
{
var isFilterCol = true;
idDigitalFilter = true;
result[nC].rep = this._findCloneElement(result,val);
result[nC].val = val;
result[nC].val2 = val2;
if(result[nC].visible != 'hidden')
result[nC].visible = false;
}
else
{
if(!isNaN(parseFloat(val2)))
val2 = parseFloat(val2);
top10Arr[nC] = val2;
}
this._isHiddenAnotherFilter(curFilter.ColId,nRow);
if(this._findCloneElement2(result,nC))
{
result.splice(nC,1);
}
else if(nC >= 1000)
{ {
//acCell = currentFilter.result[sb];
break; break;
} }
else
nC++;
} }
if(top10Arr.length != 0) }
if(sb && sb == numFilter)
numFilter = curFilter.ColId;
var startRow = ws.model.getCell(new CellAddress(acCell.id)).first.row - 1;
var endRow = ws.model.getCell(new CellAddress(acCell.idNext)).first.row - 1;
var col = ws.model.getCell(new CellAddress(acCell.id)).first.col - 1;
for(var nRow = startRow + 1; nRow <= endRow; nRow++)
{
var cell = ws.model.getCell(new CellAddress(nRow,col,0));
var val = cell.getValueWithFormat();
var val2 = cell.getValueWithoutFormat();
var type = cell.getType();
if(!result[nC])
result[nC] = new AutoFiltersOptionsElements();
if(curFilter.ColId == numFilter)
{ {
var top10Filter = curFilter.Top10; var isFilterCol = true;
var sortTop10; idDigitalFilter = true;
if(top10Filter.Top != false) /*for(nVal = 0; nVal < filValue.length; nVal++)
{ {*/
sortTop10 = top10Arr.sort(function sortArr(a, b) result[nC].rep = this._findCloneElement(result,val);
{ result[nC].val = val;
return b - a; result[nC].val2 = val2;
}) if(result[nC].visible != 'hidden')
} result[nC].visible = false;
else }
sortTop10 = top10Arr.sort(); else
var nC = 0; {
if(sortTop10.length > top10Filter.Val - 1) var check = false;
//проверка на скрытие данных строк другим числовым фильтром
var filterCust =
{
filter1: curFilter.CustomFiltersObj.CustomFilters[0].Operator,
filter2: curFilter.CustomFiltersObj.CustomFilters[1] ? curFilter.CustomFiltersObj.CustomFilters[1].Operator : undefined,
valFilter1: curFilter.CustomFiltersObj.CustomFilters[0].Val,
valFilter2: curFilter.CustomFiltersObj.CustomFilters[1]?curFilter.CustomFiltersObj.CustomFilters[1].Val : undefined,
isChecked: curFilter.CustomFiltersObj.And
};
if(!isNaN(parseFloat(val2)))
val2 = parseFloat(val2);
if(!this._getLogical(filterCust,{val: val2, type: type, valWithFormat: val}))
{ {
var limit = sortTop10[top10Filter.Val - 1]; result[nC].visible = 'hidden';
for(nRow = startRow + 1; nRow <= endRow; nRow++)
{
var cell = ws.model.getCell(new CellAddress(nRow,col,0));
var val2 = cell.getValueWithoutFormat();
if(!isNaN(parseFloat(val2)))
val2 = parseFloat(val2);
if(top10Filter.Top == false)
{
if(val2 > limit)
result[nC].visible = 'hidden';
}
else
{
if(val2 < limit)
result[nC].visible = 'hidden';
}
if(this._findCloneElement2(result,nC))
{
result.splice(nC,1);
}
else if(nC >= 1000)
{
break;
}
else
nC++;
}
} }
} }
this._isHiddenAnotherFilter(curFilter.ColId,nRow);
if(nC >= 1000)
{
break;
}
else
nC++;
} }
} }
if(!isFilterCol)//если фильтр не применен else if(curFilter && curFilter.Top10)//Top10
{ {
var ref = currentFilter.Ref; //пересматриваем все значения
var filterStart = ws.model.getCell(new CellAddress(ref.split(':')[0]));
var filterEnd = ws.model.getCell(new CellAddress(ref.split(':')[1]));
//если есть мерженные ячейки в головной строке
var cell = ws.model.getCell(new CellAddress(buttonId));
var isMerged = cell.hasMerged();
if(isMerged)
{
var range = this._idToRange(buttonId);
range.c1 = isMerged.c1;
buttonId = this._rangeToId(range);
}
var col = ws.model.getCell(new CellAddress(buttonId)).first.col - 1;
var startRow = filterStart.first.row;
var endRow = filterEnd.first.row - 1;
var nC = 0; var nC = 0;
for(var s = startRow; s <= endRow; s++) var acCell = currentFilter.result[curFilter.ColId];
{ var startRow = ws.model.getCell(new CellAddress(acCell.id)).first.row - 1;
var cell = ws.model.getCell(new CellAddress(s,col,0)); var endRow = ws.model.getCell(new CellAddress(acCell.idNext)).first.row - 1;
var col = ws.model.getCell(new CellAddress(acCell.id)).first.col - 1;
var top10Arr = [];
for(nRow = startRow + 1; nRow <= endRow; nRow++)
{
var cell = ws.model.getCell(new CellAddress(nRow,col,0));
var val = cell.getValueWithFormat();
var val2 = cell.getValueWithoutFormat();
if(!result[nC]) if(!result[nC])
result[nC] = new AutoFiltersOptionsElements(); result[nC] = new AutoFiltersOptionsElements();
if(curFilter.ColId == numFilter)
result[nC].val = cell.getValueWithFormat();
result[nC].val2 = cell.getValueWithoutFormat();
if(result[nC].visible != 'hidden')
result[nC].visible = true;
if(result[nC].visible != 'hidden')
{ {
if(ws.model._getRow(s).hd) var isFilterCol = true;
result[nC].visible = 'hidden'; idDigitalFilter = true;
result[nC].rep = this._findCloneElement(result,val);
result[nC].val = val;
result[nC].val2 = val2;
if(result[nC].visible != 'hidden')
result[nC].visible = false;
} }
if(nC >= 1000) else
{
if(!isNaN(parseFloat(val2)))
val2 = parseFloat(val2);
top10Arr[nC] = val2;
}
this._isHiddenAnotherFilter(curFilter.ColId,nRow);
if(this._findCloneElement2(result,nC))
{
result.splice(nC,1);
}
else if(nC >= 1000)
{ {
break; break;
} }
else else
nC++; nC++;
} }
if(top10Arr.length != 0)
{
var top10Filter = curFilter.Top10;
var sortTop10;
if(top10Filter.Top != false)
{
sortTop10 = top10Arr.sort(function sortArr(a, b)
{
return b - a;
})
}
else
sortTop10 = top10Arr.sort();
var nC = 0;
if(sortTop10.length > top10Filter.Val - 1)
{
var limit = sortTop10[top10Filter.Val - 1];
for(nRow = startRow + 1; nRow <= endRow; nRow++)
{
var cell = ws.model.getCell(new CellAddress(nRow,col,0));
var val2 = cell.getValueWithoutFormat();
if(!isNaN(parseFloat(val2)))
val2 = parseFloat(val2);
if(top10Filter.Top == false)
{
if(val2 > limit)
result[nC].visible = 'hidden';
}
else
{
if(val2 < limit)
result[nC].visible = 'hidden';
}
if(this._findCloneElement2(result,nC))
{
result.splice(nC,1);
}
else if(nC >= 1000)
{
break;
}
else
nC++;
}
}
}
} }
for(var i = 0; i < result.length; i++) }
if(!isFilterCol)//если фильтр не применен
{
var ref = currentFilter.Ref;
var rangeFilter = this._refToRange(ref);
//var filterStart = ws.model.getCell(new CellAddress(ref.split(':')[0]));
//var filterEnd = ws.model.getCell(new CellAddress(ref.split(':')[1]));
//если есть мерженные ячейки в головной строке
var cell = ws.model.getCell(new CellAddress(buttonId));
var isMerged = cell.hasMerged();
if(isMerged)
{
var range = this._idToRange(buttonId);
range.c1 = isMerged.c1;
buttonId = this._rangeToId(range);
}
var col = ws.model.getCell(new CellAddress(buttonId)).first.col - 1;
//var startRow = filterStart.first.row;
//var endRow = filterEnd.first.row - 1;
var startRow = rangeFilter.r1 + 1;
var endRow = rangeFilter.r2;
var nC = 0;
for(var s = startRow; s <= endRow; s++)
{ {
if(this._findCloneElement2(result,i)) var cell = ws.model.getCell(new CellAddress(s,col,0));
if(!result[nC])
result[nC] = new AutoFiltersOptionsElements();
result[nC].val = cell.getValueWithFormat();
result[nC].val2 = cell.getValueWithoutFormat();
if(result[nC].visible != 'hidden')
result[nC].visible = true;
if(result[nC].visible != 'hidden')
{ {
result.splice(i,1); if(ws.model._getRow(s).hd)
i--; result[nC].visible = 'hidden';
} }
if(nC >= 1000)
{
break;
}
else
nC++;
} }
if(idDigitalFilter) };
result.dF = true;
/*for(var l = 0; l < result.length; ) var idDigitalFilter = result.dF;
for(var i = 0; i < result.length; i++)
{
if(this._findCloneElement2(result,i))
{ {
if(result[l].rep) result.splice(i,1);
result.splice(l,1); i--;
else }
l++*/ };
/*if(result[l].rep)
result[l].visible = 'hidden'; if(idDigitalFilter)
delete result[l].rep;*/ result.dF = true;
//}
return result; return result;
}
}, },
_addNewFilter: function(val,tableColumns,aWs,isAll,style) _addNewFilter: function(val,tableColumns,aWs,isAll,style)
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7