Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
sdkjs
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boris Kocherov
sdkjs
Commits
bc659c1c
Commit
bc659c1c
authored
Sep 14, 2017
by
Alexander.Trofimov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix bug 35845
check pivot in move range
parent
28b13d91
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
6 deletions
+5
-6
cell/view/WorksheetView.js
cell/view/WorksheetView.js
+5
-6
No files found.
cell/view/WorksheetView.js
View file @
bc659c1c
...
...
@@ -8198,6 +8198,11 @@
this
.
_cleanSelectionMoveRange
();
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
);
if
(
resmove
===
-
2
)
{
...
...
@@ -8205,12 +8210,6 @@
this
.
_cleanSelectionMoveRange
();
}
else
if
(
resmove
===
-
1
)
{
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
,
function
(
can
)
{
if
(
can
)
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment