Commit 15bc2dfc authored by konovalovsergey's avatar konovalovsergey

error after merge

parent 531487de
...@@ -2627,17 +2627,7 @@ Woorksheet.prototype.copyFrom=function(wsFrom, sName, tableNames){ var i, elem, ...@@ -2627,17 +2627,7 @@ Woorksheet.prototype.copyFrom=function(wsFrom, sName, tableNames){ var i, elem,
this.sheetViews[j].pane = null; this.sheetViews[j].pane = null;
} }
} }
this.setTableFormulaAfterOpen();
if (this.TableParts && this.TableParts.length) {
var tableParts = this.TableParts;
if (tableParts) {
for (var i = 0; i < tableParts.length; i++) {
//TODO пока заменяем при открытии на TotalsRowFormula
tableParts[i].checkTotalRowFormula();
}
}
}
this._updateConditionalFormatting(null); this._updateConditionalFormatting(null);
this.handlers = handlers; this.handlers = handlers;
...@@ -4453,6 +4443,13 @@ Woorksheet.prototype.updateSparklineCache = function(sheet, ranges) { ...@@ -4453,6 +4443,13 @@ Woorksheet.prototype.updateSparklineCache = function(sheet, ranges) {
for (var i = 0; i < this.TableParts.length; i++) { for (var i = 0; i < this.TableParts.length; i++) {
var table = this.TableParts[i]; var table = this.TableParts[i];
this.autoFilters._setColorStyleTable(table.Ref, table); this.autoFilters._setColorStyleTable(table.Ref, table);
}
}
};
Woorksheet.prototype.setTableFormulaAfterOpen = function () {
if (this.TableParts && this.TableParts.length) {
for (var i = 0; i < this.TableParts.length; i++) {
var table = this.TableParts[i];
//TODO пока заменяем при открытии на TotalsRowFormula //TODO пока заменяем при открытии на TotalsRowFormula
table.checkTotalRowFormula(this); table.checkTotalRowFormula(this);
} }
......
...@@ -11866,21 +11866,6 @@ ...@@ -11866,21 +11866,6 @@
return arrResult; return arrResult;
}; };
WorksheetView.prototype.af_setStyleAfterOpen = function () {
var worksheet = this.model;
if (worksheet.TableParts && worksheet.TableParts.length) {
var tableParts = worksheet.TableParts;
if (tableParts) {
for (var i = 0; i < tableParts.length; i++) {
this.model.autoFilters._setColorStyleTable(tableParts[i].Ref, tableParts[i]);
//TODO пока заменяем при открытии на TotalsRowFormula
tableParts[i].checkTotalRowFormula(worksheet);
}
}
}
};
WorksheetView.prototype.af_drawButtons = function (updatedRange, offsetX, offsetY) { WorksheetView.prototype.af_drawButtons = function (updatedRange, offsetX, offsetY) {
var ws = this; var ws = this;
var aWs = this.model; var aWs = this.model;
......
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