Commit 7e9472db authored by Alexander.Trofimov's avatar Alexander.Trofimov

убрал $.extend. Это место вообще не работает.

parent 8e8cd26d
...@@ -5357,31 +5357,35 @@ ...@@ -5357,31 +5357,35 @@
} }
}; };
WorksheetView.prototype.prepareDepCells = function ( se ) { WorksheetView.prototype.prepareDepCells = function(se) {
var activeCell = this.activeRange, mc = this.model.getMergedByCell( activeCell.startRow, activeCell.startCol ), c1 = mc ? mc.c1 : activeCell.startCol, r1 = mc ? mc.r1 : activeCell.startRow, c = this._getVisibleCell( c1, r1 ), nodes = (se == c_oAscDrawDepOptions.Master) ? this.model.workbook.dependencyFormulas.getMasterNodes( this.model.getId(), c.getName() ) : this.model.workbook.dependencyFormulas.getSlaveNodes( this.model.getId(), c.getName() ); var activeCell = this.activeRange, mc = this.model.getMergedByCell(activeCell.startRow,
activeCell.startCol), c1 = mc ? mc.c1 : activeCell.startCol, r1 = mc ? mc.r1 :
if ( !nodes ) { activeCell.startRow, c = this._getVisibleCell(c1, r1), nodes = (se == c_oAscDrawDepOptions.Master) ?
this.model.workbook.dependencyFormulas.getMasterNodes(this.model.getId(), c.getName()) :
this.model.workbook.dependencyFormulas.getSlaveNodes(this.model.getId(), c.getName());
if (!nodes) {
return; return;
} }
if ( !this.depDrawCells ) { if (!this.depDrawCells) {
this.depDrawCells = {}; this.depDrawCells = {};
} }
if ( se == c_oAscDrawDepOptions.Master ) { if (se == c_oAscDrawDepOptions.Master) {
c = c.getCells()[0]; c = c.getCells()[0];
var id = getVertexId( this.model.getId(), c.getName() ); var id = getVertexId(this.model.getId(), c.getName());
this.depDrawCells[id] = {from: c, to: nodes}; this.depDrawCells[id] = {from: c, to: nodes};
} } else {
else { var to = {}, to1, id = getVertexId(this.model.getId(), c.getName());
var to = {}, to1, id = getVertexId( this.model.getId(), c.getName() ); to[getVertexId(this.model.getId(), c.getName())] =
to[getVertexId( this.model.getId(), c.getName() )] = this.model.workbook.dependencyFormulas.getNode( this.model.getId(), c.getName() ); this.model.workbook.dependencyFormulas.getNode(this.model.getId(), c.getName());
to1 = this.model.workbook.dependencyFormulas.getNode( this.model.getId(), c.getName() ); to1 = this.model.workbook.dependencyFormulas.getNode(this.model.getId(), c.getName());
for ( var id2 in nodes ) { for (var id2 in nodes) {
if ( this.depDrawCells[id2] ) { if (this.depDrawCells[id2]) {
$.extend( this.depDrawCells[id2].to, to ) //$.extend(this.depDrawCells[id2].to, to);
} //ToDo убрал $.extend. Это место вообще не работает.
else { } else {
this.depDrawCells[id2] = {} this.depDrawCells[id2] = {}
this.depDrawCells[id2].from = nodes[id2].returnCell() this.depDrawCells[id2].from = nodes[id2].returnCell()
this.depDrawCells[id2].to = {} this.depDrawCells[id2].to = {}
...@@ -5390,7 +5394,6 @@ ...@@ -5390,7 +5394,6 @@
} }
} }
this.drawDepCells(); this.drawDepCells();
}; };
WorksheetView.prototype.cleanDepCells = function () { WorksheetView.prototype.cleanDepCells = function () {
......
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