bugzserver/show_bug.cgi?id=30191 - [Drag&Drop]Не отображается кнопка...

bugzserver/show_bug.cgi?id=30191 -  [Drag&Drop]Не отображается кнопка автофильтра после переноса диапазона со скрытым значением

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

Excel/model/WorkbookElems.js

@@ -4551,7 +4551,13 @@ AutoFilter.prototype.cleanFilters = function() {
 	
 	for(var i = 0; i < this.FilterColumns.length; i++)
 	{
-		this.FilterColumns[i].clean();
+		if(this.FilterColumns[i].ShowButton === false)
+			this.FilterColumns[i].clean();
+		else
+		{
+			this.FilterColumns.splice(i, 1);
+			i--;
+		}	
 	}
 };
 

Excel/model/autofilters.js

@@ -562,7 +562,10 @@ var maxIndividualValues = 10000;
 							
 							//скрываем строки
 							if(hiddenObj.h === null)
+							{
 								hiddenObj.h = isSetHidden;
+								hiddenObj.start = i;
+							}
 							else if(hiddenObj.h !== isSetHidden)
 							{
 								aWs.setRowHidden(hiddenObj.h, hiddenObj.start, i - 1);
@@ -730,7 +733,7 @@ var maxIndividualValues = 10000;
 										{
 											if(filter.FilterColumns[i].isApplyAutoFilter())
 												isSetFilter = true;
-											else
+											else if(filter.FilterColumns[i].ShowButton === false)
 												isShowButton = false;
 											
 											break;
@@ -1739,6 +1742,19 @@ var maxIndividualValues = 10000;
 						return;
 				}
 				
+				var cloneFilterColumns = function(filterColumns)
+				{
+					var cloneFilterColumns = [];
+					if(filterColumns && filterColumns.length)
+					{
+						for(var i = 0; i < filterColumns.length; i++)
+						{
+							cloneFilterColumns[i] = filterColumns[i].clone();
+						}
+					}
+					return cloneFilterColumns;
+				};
+				
 				var addRedo = false;
 				
 				if(copyRange)
@@ -1779,9 +1795,9 @@ var maxIndividualValues = 10000;
 							else if(!data && findFilters[i] && findFilters[i].FilterColumns)
 								findFilters[i].cleanFilters();
 							else if(data && data[i] && data[i].AutoFilter && data[i].AutoFilter.FilterColumns)
-								findFilters[i].AutoFilter.FilterColumns = data[i].AutoFilter.FilterColumns;
+								findFilters[i].AutoFilter.FilterColumns = cloneFilterColumns(data[i].AutoFilter.FilterColumns);
 							else if(data && data[i] && data[i].FilterColumns)
-								findFilters[i].FilterColumns = data[i].FilterColumns;
+								findFilters[i].FilterColumns = cloneFilterColumns(data[i].FilterColumns);
 							
 							
 							if(oCurFilter[i].TableStyleInfo && oCurFilter[i] && findFilters[i])