дополнение к Revision: 47347

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

Excel/model/Serialize.js

@@ -336,7 +336,8 @@ var c_oSer_TablePart =
 	AutoFilter:4,
 	SortState:5,
 	TableColumns:6,
-	TableStyleInfo:7
+	TableStyleInfo:7,
+	HeaderRowCount:8
 };
 /** @enum */
 var c_oSer_TableStyleInfo =
@@ -913,6 +914,9 @@ function BinaryTableWriter(memory, aDxfs)
 			this.memory.WriteByte(c_oSer_TablePart.Ref);
 			this.memory.WriteString2(table.Ref);
 		}
+		//HeaderRowCount
+		if(null != table.HeaderRowCount)
+			this.bs.WriteItem(c_oSer_TablePart.HeaderRowCount, function(){oThis.memory.WriteLong(table.HeaderRowCount);});
 		//TotalsRowCount
 		if(null != table.TotalsRowCount)
 			this.bs.WriteItem(c_oSer_TablePart.TotalsRowCount, function(){oThis.memory.WriteLong(table.TotalsRowCount);});
@@ -3310,6 +3314,8 @@ function Binary_TableReader(stream, ws, Dxfs)
         var oThis = this;
         if ( c_oSer_TablePart.Ref == type )
 			oTable.Ref = this.stream.GetString2LE(length);
+		else if ( c_oSer_TablePart.HeaderRowCount == type )
+			oTable.HeaderRowCount = this.stream.GetULongLE();
 		else if ( c_oSer_TablePart.TotalsRowCount == type )
 			oTable.TotalsRowCount = this.stream.GetULongLE();
 		else if ( c_oSer_TablePart.DisplayName == type )
@@ -6210,7 +6216,7 @@ CTableStyle.prototype =
 				}
 			}
 			else
-				res = this.wholeTable;
+				res = this.wholeTable.dxf;
 		}
 		return res;
 	},

Excel/model/Workbook.js

@@ -3840,7 +3840,7 @@ function Cell(worksheet){
 	this.xfs = null;
 	this.tableXfs = null;
 	this.conditionalFormattingXfs = null;
-	this.bNeedCompileXfs = false;
+	this.bNeedCompileXfs = true;
 	this.compiledXfs = null;
 	this.oId = null;
 	this.oFormulaExt = null;

Excel/model/autofilters.js

@@ -2899,8 +2899,9 @@
 				var styleForCurTable;
 				//todo из файла
 				var headerRowCount = 1;
-				var totalRowShown = 0;
 				var totalsRowCount = 0;
+				if(options.HeaderRowCount)
+					headerRowCount = options.HeaderRowCount;
 				if(options.TotalsRowCount)
 					totalsRowCount = options.TotalsRowCount;
 				if(style && style.Name && ws.model.workbook.TableStyles && ws.model.workbook.TableStyles.AllStyles && (styleForCurTable = ws.model.workbook.TableStyles.AllStyles[style.Name]))

Excel/view/WorksheetView.js

@@ -1085,7 +1085,9 @@
 
 									for (var cell in arrayCells) {
 										if (arrayCells.hasOwnProperty(cell)) {
-											arrayCells[cell].cell.setFill(oGradient.calculateColor(arrayCells[cell].val));
+											var dxf = new CellXfs();
+											dxf.fill = new Fill({bg:oGradient.calculateColor(arrayCells[cell].val)});
+											arrayCells[cell].cell.setConditionalFormattingStyle(dxf);
 										}
 									}
 								}