Skip to content

S
sdkjs
Commit 16cbc779 authored by Alexander.Trofimov's avatar Alexander.Trofimov Committed by Alexander.Trofimov
Browse files
Options

getCursorTypeFromXY - добавил параметр isViewerMode (мы не отдаем курсор для... 

getCursorTypeFromXY - добавил параметр isViewerMode (мы не отдаем курсор для редактирования ширины/высоты столбцов/строк и для перемещения и fillHandle)
Баг http://bugzserver/show_bug.cgi?id=20532

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@49953 954022d7-b5bf-4e40-9824-e11837661b57
parent 83fd35f1
Hide whitespace changes
Inline Side-by-side
Showing with 44 additions and 42 deletions
Excel/view/EventsController.js
View file @ 16cbc779
...@@ -1306,15 +1306,14 @@ ...@@ -1306,15 +1306,14 @@
this.targetInfo = undefined; this.targetInfo = undefined;
this.handlers.trigger("updateWorksheet", this.element[0]); this.handlers.trigger("updateWorksheet", this.element[0]);
} }
if( this.isMoveRangeMode ){ if (this.isMoveRangeMode) {
var t = this; t.moveRangeTimerId = window.setTimeout(function(){t._moveRangeHandle2(event)},0);
t.moveRangeTimerId = window.setTimeout(function(){t._moveRangeHandle2(event)},0)
} }
if( this.isMoveResizeRange ){ if (this.isMoveResizeRange) {
t.moveResizeRangeTimerId = window.setTimeout(function(){t._moveResizeRangeHandle2(event)},0) t.moveResizeRangeTimerId = window.setTimeout(function(){t._moveResizeRangeHandle2(event)},0);
} }
if (this.isFillHandleMode){ if (this.isFillHandleMode) {
t.fillHandleModeTimerId = window.setTimeout(function(){t._changeFillHandle2(event)},0) t.fillHandleModeTimerId = window.setTimeout(function(){t._changeFillHandle2(event)},0);
} }
return true; return true;
}, },
......
Excel/view/WorkbookView.js
View file @ 16cbc779
...@@ -500,7 +500,7 @@ ...@@ -500,7 +500,7 @@
this._onWSSelectionChanged(ws.getSelectionInfo()); this._onWSSelectionChanged(ws.getSelectionInfo());
} }
var ct = ws.getCursorTypeFromXY(x, y); var ct = ws.getCursorTypeFromXY(x, y, this.controller.settings.isViewerMode);
if ("hyperlink" === ct.target) { if ("hyperlink" === ct.target) {
// Проверим замерженность // Проверим замерженность
...@@ -558,7 +558,7 @@ ...@@ -558,7 +558,7 @@
} else if (x === undefined && y === undefined) { } else if (x === undefined && y === undefined) {
ws.cleanHighlightedHeaders(); ws.cleanHighlightedHeaders();
} else { } else {
ct = ws.getCursorTypeFromXY(x, y); ct = ws.getCursorTypeFromXY(x, y, this.controller.settings.isViewerMode);
// Отправление эвента об удалении всего листа (именно удалении, т.к. если просто залочен, то не рисуем рамку вокруг) // Отправление эвента об удалении всего листа (именно удалении, т.к. если просто залочен, то не рисуем рамку вокруг)
if (undefined !== ct.userIdAllSheet) { if (undefined !== ct.userIdAllSheet) {
...@@ -740,7 +740,7 @@ ...@@ -740,7 +740,7 @@
_onMouseDblClick: function (x, y, isHideCursor, isCoord, callback) { _onMouseDblClick: function (x, y, isHideCursor, isCoord, callback) {
var res = false; var res = false;
var ws = this.getWorksheet(); var ws = this.getWorksheet();
var ct = ws.getCursorTypeFromXY(x, y); var ct = ws.getCursorTypeFromXY(x, y, this.controller.settings.isViewerMode);
if (ct.target === "colresize" || ct.target === "rowresize") { if (ct.target === "colresize" || ct.target === "rowresize") {
res = true; res = true;
......
Excel/view/WorksheetView.js
View file @ 16cbc779
...@@ -5014,8 +5014,8 @@ ...@@ -5014,8 +5014,8 @@
return null; return null;
}, },
getCursorTypeFromXY: function (x, y) { getCursorTypeFromXY: function (x, y, isViewerMode) {
var c, r, f; var c, r, f, i, offsetX, offsetY;
var left, top, right, bottom; var left, top, right, bottom;
var sheetId = this.model.getId(); var sheetId = this.model.getId();
var userId = undefined; var userId = undefined;
...@@ -5024,7 +5024,7 @@ ...@@ -5024,7 +5024,7 @@
var lockInfo = undefined; var lockInfo = undefined;
var isLocked = false; var isLocked = false;
if ( asc["editor"].isStartAddShape ) if (asc["editor"].isStartAddShape)
return {cursor: kCurFillHandle, target: "shape", col: -1, row: -1}; return {cursor: kCurFillHandle, target: "shape", col: -1, row: -1};
var drawingInfo = this.objectRender.checkCursorDrawingObject(x, y); var drawingInfo = this.objectRender.checkCursorDrawingObject(x, y);
...@@ -5039,23 +5039,25 @@ ...@@ -5039,23 +5039,25 @@
lockRangePosTop = drawingInfo.object.getVisibleTopOffset(true); lockRangePosTop = drawingInfo.object.getVisibleTopOffset(true);
} }
return {cursor: drawingInfo.cursor, target: "shape", drawingId: drawingInfo.id, col: -1, row: -1, userId: userId, lockRangePosLeft: lockRangePosLeft, lockRangePosTop: lockRangePosTop}; return {cursor: drawingInfo.cursor, target: "shape", drawingId: drawingInfo.id, col: -1, row: -1,
userId: userId, lockRangePosLeft: lockRangePosLeft, lockRangePosTop: lockRangePosTop};
} }
var autoFilterCursor = this.autoFilters.isButtonAFClick(x,y,this); var autoFilterCursor = this.autoFilters.isButtonAFClick(x, y, this);
if(autoFilterCursor) if (autoFilterCursor)
return {cursor: autoFilterCursor, target: "aFilterObject", col: -1, row: -1}; return {cursor: autoFilterCursor, target: "aFilterObject", col: -1, row: -1};
x *= asc_getcvt( 0/*px*/, 1/*pt*/, this._getPPIX() ); x *= asc_getcvt(0/*px*/, 1/*pt*/, this._getPPIX());
y *= asc_getcvt( 0/*px*/, 1/*pt*/, this._getPPIY() ); y *= asc_getcvt(0/*px*/, 1/*pt*/, this._getPPIY());
if (this.isFormulaEditMode || this.isChartAreaEditMode) if (this.isFormulaEditMode || this.isChartAreaEditMode) {
{ offsetX = this.cols[this.visibleRange.c1].left - this.cellsLeft;
var offsetX = this.cols[this.visibleRange.c1].left - this.cellsLeft; offsetY = this.rows[this.visibleRange.r1].top - this.cellsTop;
var offsetY = this.rows[this.visibleRange.r1].top - this.cellsTop;
var arr = this.isFormulaEditMode ? this.arrActiveFormulaRanges : this.arrActiveChartsRanges, var arr = this.isFormulaEditMode ? this.arrActiveFormulaRanges : this.arrActiveChartsRanges,
targetArr = this.isFormulaEditMode ? 0 : -1; targetArr = this.isFormulaEditMode ? 0 : -1;
for (var i in arr) { for (i in arr) {
if (!arr.hasOwnProperty(i))
continue;
var arFormulaTmp = arr[i].clone(true); var arFormulaTmp = arr[i].clone(true);
var aFormulaIntersection = arFormulaTmp.intersection(this.visibleRange); var aFormulaIntersection = arFormulaTmp.intersection(this.visibleRange);
...@@ -5065,7 +5067,7 @@ ...@@ -5065,7 +5067,7 @@
var yFormula1 = this.rows[aFormulaIntersection.r1].top - offsetY; var yFormula1 = this.rows[aFormulaIntersection.r1].top - offsetY;
var yFormula2 = this.rows[aFormulaIntersection.r2].top + this.rows[aFormulaIntersection.r2].height - offsetY; var yFormula2 = this.rows[aFormulaIntersection.r2].top + this.rows[aFormulaIntersection.r2].height - offsetY;
if( if (
(x >= xFormula1 + 5 && x <= xFormula2 - 5) && ((y >= yFormula1 - this.height_2px && y <= yFormula1 + this.height_2px) || (y >= yFormula2 - this.height_2px && y <= yFormula2 + this.height_2px)) (x >= xFormula1 + 5 && x <= xFormula2 - 5) && ((y >= yFormula1 - this.height_2px && y <= yFormula1 + this.height_2px) || (y >= yFormula2 - this.height_2px && y <= yFormula2 + this.height_2px))
|| ||
(y >= yFormula1 + 5 && y <= yFormula2 - 5) && ((x >= xFormula1 - this.width_2px && x <= xFormula1 + this.width_2px) || (x >= xFormula2 - this.width_2px && x <= xFormula2 + this.width_2px)) (y >= yFormula1 + 5 && y <= yFormula2 - 5) && ((x >= xFormula1 - this.width_2px && x <= xFormula1 + this.width_2px) || (x >= xFormula2 - this.width_2px && x <= xFormula2 + this.width_2px))
...@@ -5075,29 +5077,25 @@ ...@@ -5075,29 +5077,25 @@
row: -1, row: -1,
formulaRange: arFormulaTmp, indexFormulaRange:i, formulaRange: arFormulaTmp, indexFormulaRange:i,
targetArr: targetArr}; targetArr: targetArr};
} } else if( x >= xFormula1 && x < xFormula1 + 5 && y >= yFormula1 && y < yFormula1 + 5 ){
else if( x >= xFormula1 && x < xFormula1 + 5 && y >= yFormula1 && y < yFormula1 + 5 ){
return {cursor: kCurSEResize, target: "moveResizeRange", return {cursor: kCurSEResize, target: "moveResizeRange",
col: aFormulaIntersection.c2, col: aFormulaIntersection.c2,
row: aFormulaIntersection.r2, row: aFormulaIntersection.r2,
formulaRange: arFormulaTmp, indexFormulaRange:i, formulaRange: arFormulaTmp, indexFormulaRange:i,
targetArr: targetArr}; targetArr: targetArr};
} } else if ( x > xFormula2 - 5 && x <= xFormula2 && y > yFormula2 - 5 && y <= yFormula2 ){
else if ( x > xFormula2 - 5 && x <= xFormula2 && y > yFormula2 - 5 && y <= yFormula2 ){
return {cursor: kCurSEResize, target: "moveResizeRange", return {cursor: kCurSEResize, target: "moveResizeRange",
col: aFormulaIntersection.c1, col: aFormulaIntersection.c1,
row: aFormulaIntersection.r1, row: aFormulaIntersection.r1,
formulaRange: arFormulaTmp, indexFormulaRange:i, formulaRange: arFormulaTmp, indexFormulaRange:i,
targetArr: targetArr}; targetArr: targetArr};
} } else if( x > xFormula2 - 5 && x <= xFormula2 && y >= yFormula1 && y < yFormula1 + 5 ){
else if( x > xFormula2 - 5 && x <= xFormula2 && y >= yFormula1 && y < yFormula1 + 5 ){
return {cursor: kCurNEResize, target: "moveResizeRange", return {cursor: kCurNEResize, target: "moveResizeRange",
col: aFormulaIntersection.c1, col: aFormulaIntersection.c1,
row: aFormulaIntersection.r2, row: aFormulaIntersection.r2,
formulaRange: arFormulaTmp, indexFormulaRange:i, formulaRange: arFormulaTmp, indexFormulaRange:i,
targetArr: targetArr}; targetArr: targetArr};
} } else if( x >= xFormula1 && x < xFormula1 + 5 && y > yFormula2 - 5 && y <= yFormula2 ){
else if( x >= xFormula1 && x < xFormula1 + 5 && y > yFormula2 - 5 && y <= yFormula2 ){
return {cursor: kCurNEResize, target: "moveResizeRange", return {cursor: kCurNEResize, target: "moveResizeRange",
col: aFormulaIntersection.c2, col: aFormulaIntersection.c2,
row: aFormulaIntersection.r1, row: aFormulaIntersection.r1,
...@@ -5111,14 +5109,15 @@ ...@@ -5111,14 +5109,15 @@
do { do {
// Эпсилон для fillHandle // Эпсилон для fillHandle
var fillHandleEpsilon = this.width_1px; var fillHandleEpsilon = this.width_1px;
if (x >= (this.fillHandleL - fillHandleEpsilon) && x <= (this.fillHandleR + fillHandleEpsilon) && if (!isViewerMode && !this.isChartAreaEditMode &&
y >= (this.fillHandleT - fillHandleEpsilon) && y <= (this.fillHandleB + fillHandleEpsilon) && !this.isChartAreaEditMode) { x >= (this.fillHandleL - fillHandleEpsilon) && x <= (this.fillHandleR + fillHandleEpsilon) &&
y >= (this.fillHandleT - fillHandleEpsilon) && y <= (this.fillHandleB + fillHandleEpsilon)) {
// Мы на "квадрате" для автозаполнения // Мы на "квадрате" для автозаполнения
return {cursor: kCurFillHandle, target: "fillhandle", col: -1, row: -1}; return {cursor: kCurFillHandle, target: "fillhandle", col: -1, row: -1};
} }
var offsetX = this.cols[this.visibleRange.c1].left - this.cellsLeft; offsetX = this.cols[this.visibleRange.c1].left - this.cellsLeft;
var offsetY = this.rows[this.visibleRange.r1].top - this.cellsTop; offsetY = this.rows[this.visibleRange.r1].top - this.cellsTop;
var xWithOffset = x + offsetX; var xWithOffset = x + offsetX;
var yWithOffset = y + offsetY; var yWithOffset = y + offsetY;
...@@ -5127,8 +5126,12 @@ ...@@ -5127,8 +5126,12 @@
right = this.cols[this.activeRange.c2].left + this.cols[this.activeRange.c2].width; right = this.cols[this.activeRange.c2].left + this.cols[this.activeRange.c2].width;
top = this.rows[this.activeRange.r1].top; top = this.rows[this.activeRange.r1].top;
bottom = this.rows[this.activeRange.r2].top + this.rows[this.activeRange.r2].height; bottom = this.rows[this.activeRange.r2].top + this.rows[this.activeRange.r2].height;
if ((((xWithOffset >= left - this.width_2px && xWithOffset <= left + this.width_2px) || (xWithOffset >= right - this.width_2px && xWithOffset <= right + this.width_2px)) && yWithOffset >= top - this.height_2px && yWithOffset <= bottom + this.height_2px) || if (!isViewerMode && ((((xWithOffset >= left - this.width_2px && xWithOffset <= left + this.width_2px) ||
(((yWithOffset >= top - this.height_2px && yWithOffset <= top + this.height_2px) || (yWithOffset >= bottom - this.height_2px && yWithOffset <= bottom + this.height_2px)) && xWithOffset >= left - this.width_2px && xWithOffset <= right + this.width_2px)) { (xWithOffset >= right - this.width_2px && xWithOffset <= right + this.width_2px)) &&
yWithOffset >= top - this.height_2px && yWithOffset <= bottom + this.height_2px) ||
(((yWithOffset >= top - this.height_2px && yWithOffset <= top + this.height_2px) ||
(yWithOffset >= bottom - this.height_2px && yWithOffset <= bottom + this.height_2px)) &&
xWithOffset >= left - this.width_2px && xWithOffset <= right + this.width_2px))) {
// Мы навели на границу выделения // Мы навели на границу выделения
return {cursor: kCurMove, target: "moveRange", col: -1, row: -1}; return {cursor: kCurMove, target: "moveRange", col: -1, row: -1};
} }
...@@ -5148,7 +5151,7 @@ ...@@ -5148,7 +5151,7 @@
var lockAllPosTop = undefined; var lockAllPosTop = undefined;
var userIdAllProps = undefined; var userIdAllProps = undefined;
var userIdAllSheet = undefined; var userIdAllSheet = undefined;
if (this.collaborativeEditing.getCollaborativeEditing()) { if (!isViewerMode && this.collaborativeEditing.getCollaborativeEditing()) {
var c1Recalc = null, r1Recalc = null; var c1Recalc = null, r1Recalc = null;
var selectRangeRecalc = asc_Range(c.col, r.row, c.col, r.row); var selectRangeRecalc = asc_Range(c.col, r.row, c.col, r.row);
// Пересчет для входящих ячеек в добавленные строки/столбцы // Пересчет для входящих ячеек в добавленные строки/столбцы
...@@ -5217,7 +5220,7 @@ ...@@ -5217,7 +5220,7 @@
if (0 < comments.length) { if (0 < comments.length) {
indexes = []; indexes = [];
for (var i = 0; i < comments.length; ++i) { for (i = 0; i < comments.length; ++i) {
indexes.push(comments[i].asc_getId()); indexes.push(comments[i].asc_getId());
} }
coords = this.cellCommentator.getCommentsCoords(comments); coords = this.cellCommentator.getCommentsCoords(comments);
...@@ -5245,7 +5248,7 @@ ...@@ -5245,7 +5248,7 @@
if (x <= this.cellsLeft && y >= this.cellsTop) { if (x <= this.cellsLeft && y >= this.cellsTop) {
r = this._findRowUnderCursor(y, true); r = this._findRowUnderCursor(y, true);
if (r === null) {break;} if (r === null) {break;}
f = r.row !== this.visibleRange.r1 && y < r.top + 3 || y >= r.bottom - 3; f = !isViewerMode && (r.row !== this.visibleRange.r1 && y < r.top + 3 || y >= r.bottom - 3);
// ToDo В Excel зависимость epsilon от размера ячейки (у нас фиксированный 3) // ToDo В Excel зависимость epsilon от размера ячейки (у нас фиксированный 3)
return { return {
cursor: f ? kCurRowResize : kCurRowSelect, cursor: f ? kCurRowResize : kCurRowSelect,
...@@ -5259,7 +5262,7 @@ ...@@ -5259,7 +5262,7 @@
if (y <= this.cellsTop && x >= this.cellsLeft) { if (y <= this.cellsTop && x >= this.cellsLeft) {
c = this._findColUnderCursor(x, true); c = this._findColUnderCursor(x, true);
if (c === null) {break;} if (c === null) {break;}
f = c.col !== this.visibleRange.c1 && x < c.left + 3 || x >= c.right - 3; f = !isViewerMode && (c.col !== this.visibleRange.c1 && x < c.left + 3 || x >= c.right - 3);
// ToDo В Excel зависимость epsilon от размера ячейки (у нас фиксированный 3) // ToDo В Excel зависимость epsilon от размера ячейки (у нас фиксированный 3)
return { return {
cursor: f ? kCurColResize : kCurColSelect, cursor: f ? kCurColResize : kCurColSelect,
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7