Commit 3d09caf1 authored by Alexander.Trofimov's avatar Alexander.Trofimov

fix bug 32590

parent cb0b720a
...@@ -301,7 +301,7 @@ ...@@ -301,7 +301,7 @@
if(this.targetInfo && (this.targetInfo.target == c_oTargetType.MoveResizeRange || if(this.targetInfo && (this.targetInfo.target == c_oTargetType.MoveResizeRange ||
this.targetInfo.target == c_oTargetType.MoveRange || this.targetInfo.target == c_oTargetType.MoveRange ||
this.targetInfo.target == c_oTargetType.FillHandle)) this.targetInfo.target == c_oTargetType.FillHandle || this.targetInfo.target == c_oTargetType.FilterObject))
return true; return true;
if (t.handlers.trigger("getCellEditMode")) {if (!t.handlers.trigger("stopCellEditing")) {return true;}} if (t.handlers.trigger("getCellEditMode")) {if (!t.handlers.trigger("stopCellEditing")) {return true;}}
...@@ -1186,7 +1186,7 @@ ...@@ -1186,7 +1186,7 @@
t.clickCounter.mouseDownEvent(coord.x, coord.y, event.button); t.clickCounter.mouseDownEvent(coord.x, coord.y, event.button);
event.ClickCount = t.clickCounter.clickCount; event.ClickCount = t.clickCounter.clickCount;
if (0 === event.ClickCount % 2) if (0 === event.ClickCount % 2)
t.isDblClickInMouseDown = true;; t.isDblClickInMouseDown = true;
t.handlers.trigger("graphicObjectMouseDown", event, coord.x, coord.y); t.handlers.trigger("graphicObjectMouseDown", event, coord.x, coord.y);
t.handlers.trigger("updateSelectionShape", /*isSelectOnShape*/true); t.handlers.trigger("updateSelectionShape", /*isSelectOnShape*/true);
...@@ -1236,26 +1236,26 @@ ...@@ -1236,26 +1236,26 @@
t.isResizeMode = true; t.isResizeMode = true;
t._resizeElement(event); t._resizeElement(event);
return; return;
} else if (t.targetInfo && t.targetInfo.target === c_oTargetType.FillHandle && false === this.settings.isViewerMode) { } else if (t.targetInfo.target === c_oTargetType.FillHandle && false === this.settings.isViewerMode) {
// В режиме автозаполнения // В режиме автозаполнения
this.isFillHandleMode = true; this.isFillHandleMode = true;
t._changeFillHandle(event); t._changeFillHandle(event);
return; return;
} else if (t.targetInfo && t.targetInfo.target === c_oTargetType.MoveRange && false === this.settings.isViewerMode) { } else if (t.targetInfo.target === c_oTargetType.MoveRange && false === this.settings.isViewerMode) {
// В режиме перемещения диапазона // В режиме перемещения диапазона
this.isMoveRangeMode = true; this.isMoveRangeMode = true;
t._moveRangeHandle(event); t._moveRangeHandle(event);
return; return;
} else if (t.targetInfo && t.targetInfo.target === c_oTargetType.FilterObject && 0 === event.button) { } else if (t.targetInfo.target === c_oTargetType.FilterObject && 0 === event.button) {
t._autoFiltersClick(t.targetInfo.idFilter); t._autoFiltersClick(t.targetInfo.idFilter);
return; return;
} else if (t.targetInfo && undefined !== t.targetInfo.commentIndexes && false === this.settings.isViewerMode) { } else if (undefined !== t.targetInfo.commentIndexes && false === this.settings.isViewerMode) {
t._commentCellClick(event); t._commentCellClick(event);
} else if ( t.targetInfo && t.targetInfo.target === c_oTargetType.MoveResizeRange && false === this.settings.isViewerMode ){ } else if (t.targetInfo.target === c_oTargetType.MoveResizeRange && false === this.settings.isViewerMode ){
this.isMoveResizeRange = true; this.isMoveResizeRange = true;
t._moveResizeRangeHandle(event, t.targetInfo); t._moveResizeRangeHandle(event, t.targetInfo);
return; return;
} else if (t.targetInfo && (t.targetInfo.target === c_oTargetType.FrozenAnchorV || } else if ((t.targetInfo.target === c_oTargetType.FrozenAnchorV ||
t.targetInfo.target === c_oTargetType.FrozenAnchorH) && false === this.settings.isViewerMode) { t.targetInfo.target === c_oTargetType.FrozenAnchorH) && false === this.settings.isViewerMode) {
// Режим установки закреплённых областей // Режим установки закреплённых областей
this.frozenAnchorMode = t.targetInfo.target; this.frozenAnchorMode = t.targetInfo.target;
......
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