Commit a73523ba authored by Sergey.Konovalov's avatar Sergey.Konovalov Committed by Alexander.Trofimov

cleanCellCache по ячейкам, а не по строкам.

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@54015 954022d7-b5bf-4e40-9824-e11837661b57
parent e6a3ec74
...@@ -906,23 +906,16 @@ function sortDependency( wb ) { ...@@ -906,23 +906,16 @@ function sortDependency( wb ) {
} }
for ( var sheetId in oCleanCellCacheArea ) { for ( var sheetId in oCleanCellCacheArea ) {
var sheetArea = oCleanCellCacheArea[sheetId]; var sheetArea = oCleanCellCacheArea[sheetId];
var nPrevRow = null; var nPrevCellId = null;
// var nMinRow = Number.MAX_VALUE; var nMinRow = Number.MAX_VALUE;
// var nMaxRow = 0; var nMaxRow = 0;
for ( var rowId in sheetArea ) { for ( var cellId in sheetArea ) {
var nRow = rowId - 0; if(null != nPrevCellId)
// if(nMinRow > nRow) wb.handlers.trigger( "cleanCellCache", sheetId, sheetArea[nPrevCellId], c_oAscCanChangeColWidth.numbers, true );
// nMinRow = nRow; nPrevCellId = cellId;
// 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) if(null != nPrevCellId)
wb.handlers.trigger( "cleanCellCache", sheetId, new Asc.Range( 0, nPrevRow, gc_nMaxCol0, nPrevRow ), c_oAscCanChangeColWidth.numbers ); wb.handlers.trigger( "cleanCellCache", sheetId, sheetArea[nPrevCellId], 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_oVLOOKUPCache.clean();
g_oHLOOKUPCache.clean() g_oHLOOKUPCache.clean()
...@@ -945,11 +938,8 @@ function _sortDependency( wb, node, oWeightMap, bBad, oCleanCellCacheArea ) { ...@@ -945,11 +938,8 @@ function _sortDependency( wb, node, oWeightMap, bBad, oCleanCellCacheArea ) {
sheetArea = {}; sheetArea = {};
oCleanCellCacheArea[node.sheetId] = sheetArea; oCleanCellCacheArea[node.sheetId] = sheetArea;
} }
var range = Asc.g_oRangeCache.getAscRange( node.cellId ); if(!node.isArea)
if ( range ) { sheetArea[node.cellId] = node.getBBox();
for ( var i = range.r1; i <= range.r2; i++ )
sheetArea[i] = 1;
}
//обрабатываем child //обрабатываем child
oWeightMapElem.gray = true; oWeightMapElem.gray = true;
var oSlaveNodes = node.getSlaveEdges(); var oSlaveNodes = node.getSlaveEdges();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment