Commit bc659c1c authored by Alexander.Trofimov's avatar Alexander.Trofimov

fix bug 35845

check pivot in move range
parent 28b13d91
...@@ -8198,6 +8198,11 @@ ...@@ -8198,6 +8198,11 @@
this._cleanSelectionMoveRange(); this._cleanSelectionMoveRange();
return; return;
} }
if (this.model.inPivotTable([arnFrom, arnTo])) {
this._cleanSelectionMoveRange();
this.model.workbook.handlers.trigger("asc_onError", c_oAscError.ID.LockedCellPivot, c_oAscError.Level.NoCritical);
return;
}
var resmove = this.model._prepareMoveRange(arnFrom, arnTo); var resmove = this.model._prepareMoveRange(arnFrom, arnTo);
if (resmove === -2) { if (resmove === -2) {
...@@ -8205,12 +8210,6 @@ ...@@ -8205,12 +8210,6 @@
this._cleanSelectionMoveRange(); this._cleanSelectionMoveRange();
} else if (resmove === -1) { } else if (resmove === -1) {
var t = this; var t = this;
if (this.model.inPivotTable([arnFrom, arnTo])) {
this._cleanSelectionMoveRange();
this.model.workbook.handlers.trigger("asc_onError", c_oAscError.ID.LockedCellPivot, c_oAscError.Level.NoCritical);
return;
}
this.model.workbook.handlers.trigger("asc_onConfirmAction", Asc.c_oAscConfirm.ConfirmReplaceRange, this.model.workbook.handlers.trigger("asc_onConfirmAction", Asc.c_oAscConfirm.ConfirmReplaceRange,
function (can) { function (can) {
if (can) { if (can) {
......
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