Commit ec7b300f authored by Alexander.Trofimov's avatar Alexander.Trofimov Committed by Alexander.Trofimov

Ускорил raplaceAll. Не делаем перерисовку на каждую замену.

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@58623 954022d7-b5bf-4e40-9824-e11837661b57
parent 06e8d624
...@@ -426,7 +426,7 @@ ...@@ -426,7 +426,7 @@
var ws = self.getWorksheetById(wsId); var ws = self.getWorksheetById(wsId);
if (ws) if (ws)
ws.changeWorksheet("updateRange", {range: range, ws.changeWorksheet("updateRange", {range: range,
isLockDraw: bLockDraw || wsId != self.getWorksheet(self.wsActive).model.getId(), lockDraw: bLockDraw || wsId != self.getWorksheet(self.wsActive).model.getId(),
canChangeColWidth: canChangeColWidth}); canChangeColWidth: canChangeColWidth});
}); });
this.model.handlers.add("changeWorksheetUpdate", function (wsId, val) { this.model.handlers.add("changeWorksheetUpdate", function (wsId, val) {
...@@ -712,7 +712,7 @@ ...@@ -712,7 +712,7 @@
ct.hyperlink.hyperlinkModel.setVisited(true); ct.hyperlink.hyperlinkModel.setVisited(true);
if (ct.hyperlink.hyperlinkModel.Ref) if (ct.hyperlink.hyperlinkModel.Ref)
ws.changeWorksheet("updateRange", {range: ct.hyperlink.hyperlinkModel.Ref.getBBox0(), ws.changeWorksheet("updateRange", {range: ct.hyperlink.hyperlinkModel.Ref.getBBox0(),
isLockDraw: false, canChangeColWidth: false}); lockDraw: false, canChangeColWidth: false});
} }
switch (ct.hyperlink.asc_getType()) { switch (ct.hyperlink.asc_getType()) {
case c_oAscHyperlinkType.WebLink: case c_oAscHyperlinkType.WebLink:
......
...@@ -9350,7 +9350,7 @@ ...@@ -9350,7 +9350,7 @@
t._prepareCellTextMetricsCache(); t._prepareCellTextMetricsCache();
t.objectRender.setScrollOffset(); t.objectRender.setScrollOffset();
t.objectRender.rebuildChartGraphicObjects(oChangeData); t.objectRender.rebuildChartGraphicObjects(oChangeData);
t.draw(); t.draw(lockDraw);
t.handlers.trigger("reinitializeScroll"); t.handlers.trigger("reinitializeScroll");
...@@ -9734,7 +9734,7 @@ ...@@ -9734,7 +9734,7 @@
t.handlers.trigger("reinitializeScrollY"); t.handlers.trigger("reinitializeScrollY");
} }
t._updateCellsRange(val.range, val.canChangeColWidth, val.isLockDraw); t._updateCellsRange(val.range, val.canChangeColWidth, val.lockDraw);
} }
break; break;
} }
...@@ -10137,8 +10137,10 @@ ...@@ -10137,8 +10137,10 @@
WorksheetView.prototype._replaceCellText = function (aReplaceCells, valueForSearching, options, WorksheetView.prototype._replaceCellText = function (aReplaceCells, valueForSearching, options,
lockDraw, callback) { lockDraw, callback) {
var t = this; var t = this;
if (options.indexInArray >= aReplaceCells.length) if (options.indexInArray >= aReplaceCells.length) {
this.draw(lockDraw);
return callback(options); return callback(options);
}
var onReplaceCallback = function (isSuccess) { var onReplaceCallback = function (isSuccess) {
var cell = aReplaceCells[options.indexInArray]; var cell = aReplaceCells[options.indexInArray];
...@@ -10163,7 +10165,7 @@ ...@@ -10163,7 +10165,7 @@
newValue[0] = new Fragment({text: cellValue, format: v[0].format.clone()}); newValue[0] = new Fragment({text: cellValue, format: v[0].format.clone()});
t._saveCellValueAfterEdit(oCellEdit, c, newValue, /*flags*/undefined, /*skipNLCheck*/false, t._saveCellValueAfterEdit(oCellEdit, c, newValue, /*flags*/undefined, /*skipNLCheck*/false,
/*isNotHistory*/true, lockDraw); /*isNotHistory*/true, /*lockDraw*/true);
} }
} }
......
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