Commit 3d0912d6 authored by Dmitry.Vikulov's avatar Dmitry.Vikulov Committed by Alexander.Trofimov

Исправлена проблема с отрисовкой объектов при первом открытии таблицы

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@47286 954022d7-b5bf-4e40-9824-e11837661b57
parent 46e41827
This diff is collapsed.
...@@ -1382,7 +1382,7 @@ var ASC_DOCS_API_USE_EMBEDDED_FONTS = "@@ASC_DOCS_API_USE_EMBEDDED_FONTS"; ...@@ -1382,7 +1382,7 @@ var ASC_DOCS_API_USE_EMBEDDED_FONTS = "@@ASC_DOCS_API_USE_EMBEDDED_FONTS";
_onShowDrawingObjects: function () { _onShowDrawingObjects: function () {
if (this.wb) { if (this.wb) {
this.wb.getWorksheet().objectRender.showDrawingObjects(true, /*printOptions*/null, /*bMouseUp*/false, /*bUpdateCharts*/false); this.wb.getWorksheet().objectRender.showDrawingObjects(true, /*printOptions*/null, /*bUpdateCharts*/false);
} }
}, },
......
...@@ -1866,7 +1866,7 @@ ...@@ -1866,7 +1866,7 @@
bottom: printPagesData.bottomFieldInPt bottom: printPagesData.bottomFieldInPt
} }
}; };
this.objectRender.showDrawingObjects(false, drawingPrintOptions, false, true); this.objectRender.showDrawingObjects(false, drawingPrintOptions, false);
this.visibleRange = tmpVisibleRange.clone(true); this.visibleRange = tmpVisibleRange.clone(true);
if (isAppBridge) {window['appBridge']['dummyCommandUpdate'] ();} if (isAppBridge) {window['appBridge']['dummyCommandUpdate'] ();}
...@@ -1894,7 +1894,7 @@ ...@@ -1894,7 +1894,7 @@
} }
//draw auto filters //draw auto filters
this.autoFilters.drawAutoF(this); this.autoFilters.drawAutoF(this);
this.objectRender.showDrawingObjects(true, null/*printOptions*/, false/*bMouseUp*/, true/*bUpdateCharts*/); this.objectRender.showDrawingObjects(true, null/*printOptions*/, true/*bUpdateCharts*/);
this.cellCommentator.drawCommentCells(false); this.cellCommentator.drawCommentCells(false);
return this; return this;
...@@ -3456,7 +3456,7 @@ ...@@ -3456,7 +3456,7 @@
t.overlayCtx.ctx.globalAlpha = 1; t.overlayCtx.ctx.globalAlpha = 1;
if (res) { if (res) {
// Все хорошо, мы залочили, теперь применяем // Все хорошо, мы залочили, теперь применяем
t.objectRender.showDrawingObjects(true, null, true, true); t.objectRender.showDrawingObjects(true, null, true);
} }
else { else {
// Не удалось, восстанавливаем состояние // Не удалось, восстанавливаем состояние
...@@ -8017,7 +8017,7 @@ ...@@ -8017,7 +8017,7 @@
if (isUpdateCols) { t._updateVisibleColsCount(); } if (isUpdateCols) { t._updateVisibleColsCount(); }
if (isUpdateRows) { t._updateVisibleRowsCount(); } if (isUpdateRows) { t._updateVisibleRowsCount(); }
t.objectRender.showDrawingObjects(true, null, false, true); t.objectRender.showDrawingObjects(true, null, true);
}; };
switch (prop) { switch (prop) {
...@@ -8304,7 +8304,7 @@ ...@@ -8304,7 +8304,7 @@
if (isUpdateRows) { t._updateVisibleRowsCount(); } if (isUpdateRows) { t._updateVisibleRowsCount(); }
if (false === lockDraw) { if (false === lockDraw) {
t.objectRender.showDrawingObjects(true, null, false, true); t.objectRender.showDrawingObjects(true, null, true);
t.autoFilters.drawAutoF(t); t.autoFilters.drawAutoF(t);
} }
}, },
...@@ -9034,7 +9034,6 @@ ...@@ -9034,7 +9034,6 @@
t._trigger("selectionChanged", t.getSelectionInfo()); t._trigger("selectionChanged", t.getSelectionInfo());
} }
t.objectRender.reloadChartDrawingObjects();
t.cellCommentator.updateCommentPosition(); t.cellCommentator.updateCommentPosition();
t.draw(lockDraw); t.draw(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