Commit 5ba88862 authored by Alexander.Trofimov's avatar Alexander.Trofimov Committed by Alexander.Trofimov

Добавил параметр updateHeight в обновление range

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@60527 954022d7-b5bf-4e40-9824-e11837661b57
parent 127c9e89
......@@ -426,11 +426,11 @@
"onScroll" : function (d) {self.controller.scroll(d);}
});
this.model.handlers.add("cleanCellCache", function (wsId, oRanges, canChangeColWidth, bLockDraw) {
this.model.handlers.add("cleanCellCache", function (wsId, oRanges, canChangeColWidth, bLockDraw, updateHeight) {
var ws = self.getWorksheetById(wsId);
if (ws)
ws.updateRanges(oRanges, canChangeColWidth,
bLockDraw || wsId != self.getWorksheet(self.wsActive).model.getId());
bLockDraw || wsId != self.getWorksheet(self.wsActive).model.getId(), updateHeight);
});
this.model.handlers.add("changeWorksheetUpdate", function (wsId, val) {
var ws = self.getWorksheetById(wsId);
......
......@@ -10642,8 +10642,9 @@
* @param {Object} ranges
* @param canChangeColWidth
* @param lockDraw
* @param updateHeight
*/
WorksheetView.prototype.updateRanges = function (ranges, canChangeColWidth, lockDraw) {
WorksheetView.prototype.updateRanges = function (ranges, canChangeColWidth, lockDraw, updateHeight) {
var arrRanges = [], range;
for (var i in ranges) {
range = ranges[i];
......@@ -10651,8 +10652,12 @@
arrRanges.push(range);
}
if (0 < arrRanges.length)
if (0 < arrRanges.length) {
if (updateHeight)
this.isChanged = true;
this._recalculateAfterUpdate(arrRanges, lockDraw);
}
};
WorksheetView.prototype.updateRange = function (range, canChangeColWidth, lockDraw) {
// Для принятия изменения нужно делать расширение диапазона
......
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