Skip to content

S
sdkjs
Commit 28580adf authored by Sergey.Konovalov's avatar Sergey.Konovalov Committed by Alexander.Trofimov
Browse files
Options

оптимизация parse похожих формул. 

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@54677 954022d7-b5bf-4e40-9824-e11837661b57
parent c8b10a16
Show whitespace changes
Inline Side-by-side
Showing with 218 additions and 18 deletions
Excel/model/FormulaObjects/parserFormula.js
View file @ 28580adf
......@@ -972,6 +972,14 @@ function cBaseType( val ) {
}
cBaseType.prototype = {
constructor:cBaseType,
cloneTo : function(oRes){
oRes.needRecalc = this.needRecalc;
oRes.numFormat = this.numFormat;
oRes.type = this.type;
oRes.value = this.value;
oRes.ca = this.ca;
oRes.node = this.node;
},
tryConvert:function () {
return this;
},
......@@ -1483,6 +1491,12 @@ function cArea( val, _ws ) {/*Area means "A1:E5" for example*/
// this._valid = this.range ? true : false;
}
cArea.prototype = Object.create( cBaseType.prototype );
cArea.prototype.clone = function () {
var oRes = new cArea(this._cells, this.ws);
cBaseType.prototype.cloneTo.call( this, oRes );
oRes.isAbsolute = this.isAbsolute;
return oRes;
};
cArea.prototype.getWsId = function () {
return this.ws.Id;
};
......@@ -1695,10 +1709,21 @@ function cRef( val, _ws ) {/*Ref means A1 for example*/
this.wb = _ws.workbook;
this.isAbsolute = false;
this.type = cElementType.cell;
this.range = _ws.getRange2( val );
this._valid = new CellAddress( val.replace( rx_space_g, "" ) ).isValid();
var ca = g_oCellAddressUtils.getCellAddress( val.replace( rx_space_g, "" ) );
this.range = null;
this._valid = ca.isValid();
if(this._valid)
this.range = _ws.getRange3( ca.getRow0(), ca.getCol0(), ca.getRow0(), ca.getCol0() );
else
this.range = _ws.getRange3( 0, 0, 0, 0 );
}
cRef.prototype = Object.create( cBaseType.prototype );
cRef.prototype.clone = function () {
var oRes = new cRef(this._cells, this.ws);
cBaseType.prototype.cloneTo.call( this, oRes );
oRes.isAbsolute = oRes.isAbsolute;
return oRes;
};
cRef.prototype.getWsId = function () {
return this.ws.Id;
};
......@@ -1761,6 +1786,14 @@ function cArea3D( val, _wsFrom, _wsTo, wb ) {/*Area3D means "Sheat1!A1:E5" for e
this.wsTo = this._wb.getWorksheetByName( _wsTo ).getId();
}
cArea3D.prototype = Object.create( cBaseType.prototype );
cArea3D.prototype.clone = function () {
var wsFrom = this._wb.getWorksheetById( this.wsFrom ).getName();
var wsTo = this._wb.getWorksheetById( this.wsTo ).getName();
var oRes = new cArea3D(this._cells, wsFrom, wsTo, this._wb);
cBaseType.prototype.cloneTo.call( this, oRes );
oRes.isAbsolute = this.isAbsolute;
return oRes;
};
cArea3D.prototype.wsRange = function () {
var r = [];
if ( !this.wsTo ) this.wsTo = this.wsFrom;
......@@ -2060,6 +2093,12 @@ function cRef3D( val, _wsFrom, wb ) {/*Ref means Sheat1!A1 for example*/
this.ws = this._wb.getWorksheetByName( _wsFrom );
}
cRef3D.prototype = Object.create( cBaseType.prototype );
cRef3D.prototype.clone = function () {
var oRes = new cRef3D(this._cells, this.ws.getName(), this._wb);
cBaseType.prototype.cloneTo.call( this, oRes );
oRes.isAbsolute = this.isAbsolute;
return oRes;
};
cRef3D.prototype.getWsId = function () {
return this.ws.Id;
};
......@@ -2325,37 +2364,67 @@ function parserFormula( formula, _cellId, _ws ) {
var that = this;
this.is3D = false;
this.cellId = _cellId;
this.cellAddress = new CellAddress( this.cellId );
this.cellAddress = g_oCellAddressUtils.getCellAddress( this.cellId );
this.ws = _ws;
this.wb = this.ws.workbook
this.value = null;
this.pCurrPos = 0;
this.elemArr = [];
this.outStack = [];
this.operand_str = null;
this.error = [];
this.Formula = formula;
this.undoParser = {formula:null, outStack:[]};
this.isParsed = false;
//для функции parse и parseDiagramRef
this.pCurrPos = 0;
this.elemArr = [];
this.RefPos = [];
this.operand_str = null;
}
parserFormula.prototype = {
/** @type parserFormula */
constructor:parserFormula,
clone : function(formula, cellId, ws)
{
if(null == formula)
formula = this.Formula;
if(null == cellId)
cellId = this.cellId;
if(null == ws)
ws = this.ws;
var oRes = new parserFormula(formula, cellId, ws);
oRes.is3D = this.is3D;
oRes.value = this.value;
oRes.pCurrPos = this.pCurrPos;
oRes.elemArr = [];
for(var i = 0, length = this.outStack.length; i < length; i++)
{
var oCurElem = this.outStack[i];
if(oCurElem.clone)
oRes.outStack.push(oCurElem.clone());
else
oRes.outStack.push(oCurElem);
}
oRes.RefPos = [];
oRes.operand_str = this.operand_str;
oRes.error = this.error.concat();
oRes.isParsed = this.isParsed;
return oRes;
},
setFormula:function ( formula ) {
this.Formula = formula;
this.value = null;
this.pCurrPos = 0;
this.elemArr = [];
this.outStack = [];
this.RefPos = [];
this.operand_str = null;
},
setCellId:function ( cellId ) {
this.cellId = cellId;
this.cellAddress = new CellAddress( cellId );
this.cellAddress = g_oCellAddressUtils.getCellAddress( cellId );
},
parse:function () {
......@@ -2622,11 +2691,13 @@ parserFormula.prototype = {
return false;
}
if ( parserHelp.isArea.call( this, this.Formula, this.pCurrPos ) ) {
this.RefPos.push({start: this.pCurrPos - this.operand_str.length, end: this.pCurrPos, index: this.outStack.length});
found_operand = new cArea3D( this.operand_str.toUpperCase(), _wsFrom, _wsTo, this.wb );
if ( this.operand_str.indexOf( "$" ) > -1 )
found_operand.isAbsolute = true;
}
else if ( parserHelp.isRef.call( this, this.Formula, this.pCurrPos ) ) {
this.RefPos.push({start: this.pCurrPos - this.operand_str.length, end: this.pCurrPos, index: this.outStack.length});
if ( _wsTo != _wsFrom ) {
found_operand = new cArea3D( this.operand_str.toUpperCase(), _wsFrom, _wsTo, this.wb );
}
......@@ -2643,12 +2714,14 @@ parserFormula.prototype = {
}
/* Referens to cells area A1:A10 */
else if ( parserHelp.isArea.call( this, this.Formula, this.pCurrPos ) ) {
this.RefPos.push({start: this.pCurrPos - this.operand_str.length, end: this.pCurrPos, index: this.outStack.length});
found_operand = new cArea( this.operand_str.toUpperCase(), this.ws );
if ( this.operand_str.indexOf( "$" ) > -1 )
found_operand.isAbsolute = true;
}
/* Referens to cell A4 */
else if ( parserHelp.isRef.call( this, this.Formula, this.pCurrPos, true ) ) {
this.RefPos.push({start: this.pCurrPos - this.operand_str.length, end: this.pCurrPos, index: this.outStack.length});
found_operand = new cRef( this.operand_str.toUpperCase(), this.ws );
if ( this.operand_str.indexOf( "$" ) > -1 )
found_operand.isAbsolute = true;
......@@ -2903,12 +2976,6 @@ parserFormula.prototype = {
cellId - какую ячейку сдвигаем
*/
shiftCells:function ( offset, oBBox, node, wsId, toDelete ) {
this.undoParser.formula = this.Formula
for ( var i = 0; i < this.outStack.length; i++ ) {
this.undoParser.outStack[i] = this.outStack[i];
}
for ( var i = 0; i < this.outStack.length; i++ ) {
if ( this.outStack[i] instanceof cRef ) {
if ( this.ws.Id != wsId ) {
......
Excel/model/Workbook.js
View file @ 28580adf
......@@ -3402,17 +3402,150 @@ Woorksheet.prototype._BuildDependencies=function(cellRange){
/*
Построение графа зависимостей.
*/
var c, ca;
var c, ca, oLengthCache = {};
for(var i in cellRange){
ca = g_oCellAddressUtils.getCellAddress(i);
c = this._getCellNoEmpty(ca.getRow0(),ca.getCol0());
if( c && c.sFormula ){
var elem = oLengthCache[c.sFormula.length];
if(null == elem)
{
elem = [];
oLengthCache[c.sFormula.length] = elem;
}
elem.push(c);
}
}
for(var i in oLengthCache)
{
var temp = oLengthCache[i];
var aCache = [];
for(var j = 0, length2 = temp.length; j < length2; j++)
{
var c = temp[j];
var aRefs = [];
var cache = inCache(aCache, c.sFormula, aRefs);
var bInCache = false;
if(cache)
{
bInCache = true;
var oNewFormula = cache.formulaParsed.clone(c.sFormula, c.oId.getID(), this);
var RefPos = cache.formulaParsed.RefPos;
for(var k = 0, length3 = RefPos.length; k < length3; k++)
{
var pos = RefPos[k];
var elem = oNewFormula.outStack[pos.index];
if(elem)
{
var ref = aRefs[k];
var range = Asc.g_oRangeCache.getAscRange(ref);
if(null != range)
{
var oNewElem;
if(range.isOneCell())
{
if(elem instanceof cRef3D)
oNewElem = new cRef3D(ref, elem.ws.getName(), elem._wb);
else if(elem instanceof cArea3D)
{
var wsFrom = elem._wb.getWorksheetById( elem.wsFrom ).getName();
var wsTo = elem._wb.getWorksheetById( elem.wsTo ).getName();
oNewElem = new cArea3D(ref, wsFrom, wsTo, elem._wb);
}
else
oNewElem = new cRef(ref, elem.ws);
}
else
{
if(elem instanceof cRef3D)
oNewElem = new cArea3D(ref, elem.ws.getName(), elem.ws.getName(), elem._wb);
else if(elem instanceof cArea3D)
{
var wsFrom = elem._wb.getWorksheetById( elem.wsFrom ).getName();
var wsTo = elem._wb.getWorksheetById( elem.wsTo ).getName();
oNewElem = new cArea3D(ref, wsFrom, wsTo, elem._wb);
}
else
oNewElem = new cArea(ref, elem.ws);
}
if ( ref.indexOf( "$" ) > -1 )
oNewElem.isAbsolute = true;
oNewFormula.outStack[pos.index] = oNewElem;
}
else
bInCache = false;
}
}
if(bInCache)
{
c.formulaParsed = oNewFormula;
c.formulaParsed.buildDependencies();
}
}
if(!bInCache)
{
c.formulaParsed = new parserFormula( c.sFormula, c.oId.getID(), this );
c.formulaParsed.parse();
c.formulaParsed.buildDependencies();
aCache.push(c);
}
}
}
}
function inCache(aCache, sFormula, aRefs)
{
var oRes = null;
for(var i = 0, length = aCache.length; i < length; i++)
{
var cache = aCache[i];
var sCurFormula = cache.sFormula;
var RefPos = cache.formulaParsed.RefPos;
if(inCacheStrcmp(sCurFormula, sFormula, RefPos, aRefs))
{
oRes = cache;
break;
}
}
return oRes;
}
function inCacheStrcmp(str1, str2, RefPos, aRefs)
{
var bRes = true;
var nStartIndex = 0;
for(var i = 0, length = RefPos.length; i < length; i++)
{
var mask = RefPos[i];
for(var j = nStartIndex; j < mask.start; j++)
{
if(str1[j] != str2[j])
{
bRes = false;
break;
}
}
nStartIndex = mask.end;
}
if(bRes)
{
for(var i = nStartIndex; i < str1.length; i++)
{
if(str1[i] != str2[i])
{
bRes = false;
break;
}
}
}
if(bRes)
{
for(var i = 0, length = RefPos.length; i < length; i++)
{
var mask = RefPos[i];
aRefs.push(str2.substring(mask.start, mask.end));
}
}
return bRes;
}
Woorksheet.prototype._RecalculatedFunctions=function(cell,bad){
function adjustCellFormat( c ) {
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7