не появлялись кнопки при добавлении а/ф

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

Excel/model/autofilters.js

@@ -391,7 +391,7 @@ var gUndoInsDelCellsFlag = true;
 									t._showButtonFlag(newRes.result);
 									
 									t._addHistoryObj(changesElemHistory, historyitem_AutoFilter_Add,
-										{activeCells: activeCells, lTable: lTable}, null, activeCells);
+										{activeCells: activeCells, lTable: lTable}, null, changesElemHistory.Ref);
 									//открываем скрытые строки
 									var isHidden;
 									var isInsert = false;
@@ -412,6 +412,10 @@ var gUndoInsDelCellsFlag = true;
 									if(isReDrawFilter && isReDrawFilter.TableColumns && isReDrawFilter.result)
 										t._reDrawCurrentFilter(null, null, isReDrawFilter);
 									
+									t.drawAutoF();
+									
+									isUpdateRange = changesElemHistory.Ref;
+									
 									break;
 								}
 								case 'changeAllFOnTable':
@@ -551,6 +555,8 @@ var gUndoInsDelCellsFlag = true;
 									allAutoFilters[apocal.num - 1].AutoFilter = new AutoFilter();
 									allAutoFilters[apocal.num - 1].AutoFilter.Ref = ref;
 									
+									isUpdateRange = ref;
+
 									break;
 								}
 								case 'setStyleTableForAutoFilter1':
@@ -560,6 +566,8 @@ var gUndoInsDelCellsFlag = true;
 									allAutoFilters[apocal.num].AutoFilter = new AutoFilter();
 									allAutoFilters[apocal.num].AutoFilter.Ref = allAutoFilters[apocal.num].Ref;
 									
+									isUpdateRange = allAutoFilters[apocal.num].Ref;
+
 									break;
 								}
 							}
@@ -622,6 +630,14 @@ var gUndoInsDelCellsFlag = true;
 								activeCells = result.activeCells;
 								mainAdjacentCells = result.mainAdjacentCells;
 								result = result.result;
+								
+								if(!(paramsForCallBackAdd == "addTableFilterOneCell" || paramsForCallBackAdd == "addTableFilterManyCells"))
+								{
+									if(mainAdjacentCells)
+										isUpdateRange = mainAdjacentCells;
+									else
+										isUpdateRange = activeCells;
+								}	
 							}
 							else
 							{
@@ -701,6 +717,8 @@ var gUndoInsDelCellsFlag = true;
 							
 							if(paramsForCallBackAdd && !bIsOpenFilter && !aWs.workbook.bCollaborativeChanges && !aWs.workbook.bUndoChanges && !aWs.workbook.bRedoChanges && (paramsForCallBackAdd == "addTableFilterOneCell" || paramsForCallBackAdd == "addTableFilterManyCells"))
 								ws._onEndAddFormatTable(rangeFilter, true);
+							else if(isUpdateRange != null && paramsForCallBackAdd && !bIsOpenFilter && !aWs.workbook.bCollaborativeChanges && !aWs.workbook.bUndoChanges && !aWs.workbook.bRedoChanges)
+								ws._onEndAddFormatTable(rangeFilter);
 							
 							History.EndTransaction();
 							if(isTurnOffHistory)
@@ -1158,7 +1176,7 @@ var gUndoInsDelCellsFlag = true;
 				//проверяем, затрагивают ли данные кнопки визуальную область
 				if (buttons) {
 					for (var i = 0; i < buttons.length; i++) {
-						if (!this._isNeedDrawButton(buttons[i], updatedRange))
+						if (updatedRange && !this._isNeedDrawButton(buttons[i], updatedRange))
 							continue;
 
 						var range = ws.model.getCell(new CellAddress(buttons[i].id)).getCells();
@@ -6195,7 +6213,7 @@ var gUndoInsDelCellsFlag = true;
 							{
 								var cell = ws.model.getCell(new CellAddress(row,col,0));
 								var type = cell.getType();
-								if(type == 1)
+								if(type == CellValueType.String)
 								{
 									result = true;
 									break;