sortDependency вставлен lockDraw на отрисовку.

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

Excel/model/Workbook.js

@@ -906,10 +906,23 @@ function sortDependency( wb ) {
         }
         for ( var sheetId in oCleanCellCacheArea ) {
             var sheetArea = oCleanCellCacheArea[sheetId];
+			var nPrevRow = null;
+			// var nMinRow = Number.MAX_VALUE;
+			// var nMaxRow = 0;
             for ( var rowId in sheetArea ) {
                 var nRow = rowId - 0;
-                wb.handlers.trigger( "cleanCellCache", sheetId, new Asc.Range( 0, nRow, gc_nMaxCol0, nRow ), c_oAscCanChangeColWidth.numbers );
+				// if(nMinRow > nRow)
+					// nMinRow = nRow;
+				// if(nMaxRow < nRow)
+					// nMaxRow = nRow;
+				if(null != nPrevRow)
+					wb.handlers.trigger( "cleanCellCache", sheetId, new Asc.Range( 0, nPrevRow, gc_nMaxCol0, nPrevRow ), c_oAscCanChangeColWidth.numbers, true );
+				nPrevRow = nRow;
             }
+			if(null != nPrevRow)
+				wb.handlers.trigger( "cleanCellCache", sheetId, new Asc.Range( 0, nPrevRow, gc_nMaxCol0, nPrevRow ), c_oAscCanChangeColWidth.numbers );
+			// if(nMinRow < nMaxRow)
+				// wb.handlers.trigger( "cleanCellCache", sheetId, new Asc.Range( 0, nMinRow, gc_nMaxCol0, nMaxRow ), c_oAscCanChangeColWidth.numbers );
         }
 		g_oVLOOKUPCache.clean();
         g_oHLOOKUPCache.clean()

Excel/view/WorkbookView.js

@@ -233,11 +233,11 @@
 				    "updateSelectionShape":			function () {return self._onUpdateSelectionShape.apply(self, arguments);}
 			    });
 
-			    this.model.handlers.add("cleanCellCache", function (wsId, range, canChangeColWidth) {
+			    this.model.handlers.add("cleanCellCache", function (wsId, range, canChangeColWidth, bLockDraw) {
 				    var ws = self.getWorksheetById(wsId);
 				    if (ws)
 					    ws.changeWorksheet("updateRange", {range: range,
-						    isLockDraw: wsId != self.getWorksheet(self.wsActive).model.getId(),
+						    isLockDraw: bLockDraw || wsId != self.getWorksheet(self.wsActive).model.getId(),
 						    canChangeColWidth: canChangeColWidth});
 			    });
 			    this.model.handlers.add("changeWorksheetUpdate", function (wsId, val) {