рефакторинг

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@56015 954022d7-b5bf-4e40-9824-e11837661b57

Excel/model/autofilters.js

@@ -3655,14 +3655,10 @@ var gUndoInsDelCellsFlag = true;
 				}
 			},
 			
-			_getArrayOpenCells : function(index,buttonId)
+			_getArrayOpenCells : function(index, buttonId)
 			{
-				var ws = this.worksheet;
-				var aWs = this._getCurrentWS();
-				var currentFilter;
-				var numFilter;
-				var curIndex = index.split(':');
-				var opFil;
+				var aWs = this._getCurrentWS(), currentFilter, numFilter, curIndex = index.split(':'), opFil;
+				
 				if(curIndex[0] == 'all')
 				{
 					currentFilter = aWs.AutoFilter;
@@ -3682,18 +3678,23 @@ var gUndoInsDelCellsFlag = true;
 					if(!currentFilter.AutoFilter.FilterColumns)
 						currentFilter.AutoFilter.FilterColumns = [];
 					opFil = currentFilter.AutoFilter.FilterColumns;
-				}
-					
+				};
 					
 				//анализируем структуру фильтра
 				//проверяем какие параметры применены к данному столбцу и к другим в этом фильтре
 				//проходимся по всем фильтрам
-				var idDigitalFilter = false;
-				var min;
 				if(opFil)
 				{
-					var isFilterCol = false;
-					var result = [];
+					var result = this._getOpenAndClosedValues(numFilter, currentFilter, opFil, buttonId);
+					return result;
+				};
+			},
+			
+			_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];
@@ -3878,7 +3879,7 @@ var gUndoInsDelCellsFlag = true;
 						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(nRow = startRow + 1; nRow <= endRow; nRow++)
+						for(var nRow = startRow + 1; nRow <= endRow; nRow++)
 						{
 							var cell = ws.model.getCell(new CellAddress(nRow,col,0));
 							var val = cell.getValueWithFormat();
@@ -4018,11 +4019,16 @@ var gUndoInsDelCellsFlag = true;
 						}
 					}
 				}
+				
 				if(!isFilterCol)//если фильтр не применен
 				{
 					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 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();
@@ -4034,8 +4040,13 @@ var gUndoInsDelCellsFlag = true;
 					}
 					
 					var col = ws.model.getCell(new CellAddress(buttonId)).first.col - 1;
-						var startRow = filterStart.first.row;
-						var endRow = filterEnd.first.row - 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++)
 					{
@@ -4059,7 +4070,10 @@ var gUndoInsDelCellsFlag = true;
 						else
 							nC++;
 					}
-					}
+				};
+				
+				var idDigitalFilter = result.dF;
+					
 				for(var i = 0; i < result.length; i++)
 				{
 					if(this._findCloneElement2(result,i))
@@ -4067,21 +4081,12 @@ var gUndoInsDelCellsFlag = true;
 						result.splice(i,1);
 						i--;
 					}
-					}
+				};
+				
 				if(idDigitalFilter)
 					result.dF = true;
-					/*for(var l = 0; l < result.length; )
-					{
-						if(result[l].rep)
-							result.splice(l,1);
-						else
-							l++*/
-						/*if(result[l].rep)
-							result[l].visible = 'hidden';
-						delete result[l].rep;*/
-					//}
+				
 				return result;
-				}
 			},
 			
 			_addNewFilter: function(val,tableColumns,aWs,isAll,style)