Commit 07b43030 authored by Alexander.Trofimov's avatar Alexander.Trofimov

При undo/redo не делали смену выделения с объекта на диапазон

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@51556 954022d7-b5bf-4e40-9824-e11837661b57
parent 3a5a1fed
...@@ -522,6 +522,8 @@ CHistory.prototype = ...@@ -522,6 +522,8 @@ CHistory.prototype =
} }
if(false == Point.bNoSelect && null != oSelectRange) if(false == Point.bNoSelect && null != oSelectRange)
this.workbook.handlers.trigger("setSelection", oSelectRange.clone()); this.workbook.handlers.trigger("setSelection", oSelectRange.clone());
if (Point.SelectionState != null)
this.workbook.handlers.trigger("setSelectionState", Point.SelectionState);
this._sendCanUndoRedo(); this._sendCanUndoRedo();
......
...@@ -475,6 +475,7 @@ ...@@ -475,6 +475,7 @@
_onSetSelection: function (range, validRange) { _onSetSelection: function (range, validRange) {
var ws = this.getWorksheet(); var ws = this.getWorksheet();
ws._checkSelectionShape();
var d = ws.setSelection(range, validRange); var d = ws.setSelection(range, validRange);
if (d) { if (d) {
if (d.deltaX) {this.controller.scrollHorizontal(d.deltaX);} if (d.deltaX) {this.controller.scrollHorizontal(d.deltaX);}
...@@ -496,6 +497,7 @@ ...@@ -496,6 +497,7 @@
} }
} }
var ws = this.getWorksheet(index); var ws = this.getWorksheet(index);
ws.setSelectionShape(true);
ws.objectRender.controller.setSelectionState(state); ws.objectRender.controller.setSelectionState(state);
ws.objectRender.controller.updateSelectionState(); ws.objectRender.controller.updateSelectionState();
}, },
...@@ -549,7 +551,6 @@ ...@@ -549,7 +551,6 @@
case c_oAscHyperlinkType.RangeLink: case c_oAscHyperlinkType.RangeLink:
// ToDo надо поправить отрисовку комментария для данной ячейки (с которой уходим) // ToDo надо поправить отрисовку комментария для данной ячейки (с которой уходим)
this.handlers.trigger("asc_onHideComment"); this.handlers.trigger("asc_onHideComment");
ws._checkSelectionShape();
this.Api._asc_setWorksheetRange(ct.hyperlink); this.Api._asc_setWorksheetRange(ct.hyperlink);
break; break;
} }
......
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