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
bcababca
Commit
bcababca
authored
Jan 18, 2017
by
GoshaZotov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
+previous
parent
50dc5a1e
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
17 deletions
+5
-17
cell/view/WorksheetView.js
cell/view/WorksheetView.js
+5
-17
No files found.
cell/view/WorksheetView.js
View file @
bcababca
...
...
@@ -9297,7 +9297,6 @@
var
mergeArr
=
[];
var
n
=
0
;
var
addComments
=
function
(
pasteRow
,
pasteCol
,
comments
)
{
var
comment
;
...
...
@@ -9323,8 +9322,7 @@
}
}
if
(
!
isOneMerge
)
{
if
(
!
isOneMerge
)
{
if
(
curMerge
!=
null
&&
!
isMerged
)
{
var
offsetCol
=
curMerge
.
c2
-
curMerge
.
c1
;
if
(
offsetCol
+
nCol
>=
gc_nMaxCol0
)
{
...
...
@@ -9337,28 +9335,18 @@
}
pastedRangeProps
.
offsetLast
=
{
offsetCol
:
offsetCol
,
offsetRow
:
offsetRow
};
mergeArr
[
n
]
=
{
mergeArr
.
push
({
r1
:
curMerge
.
r1
+
arn
.
r1
-
activeCellsPasteFragment
.
r1
+
rowDiff
,
r2
:
curMerge
.
r2
+
arn
.
r1
-
activeCellsPasteFragment
.
r1
+
rowDiff
,
c1
:
curMerge
.
c1
+
arn
.
c1
-
activeCellsPasteFragment
.
c1
+
colDiff
,
c2
:
curMerge
.
c2
+
arn
.
c1
-
activeCellsPasteFragment
.
c1
+
colDiff
};
n
++
;
});
}
}
else
{
else
{
if
(
!
isMerged
)
{
pastedRangeProps
.
offsetLast
=
{
offsetCol
:
isMergedFirstCell
.
c2
-
isMergedFirstCell
.
c1
,
offsetRow
:
isMergedFirstCell
.
r2
-
isMergedFirstCell
.
r1
};
mergeArr
[
n
]
=
{
r1
:
isMergedFirstCell
.
r1
,
r2
:
isMergedFirstCell
.
r2
,
c1
:
isMergedFirstCell
.
c1
,
c2
:
isMergedFirstCell
.
c2
};
n
++
;
mergeArr
.
push
({
r1
:
isMergedFirstCell
.
r1
,
r2
:
isMergedFirstCell
.
r2
,
c1
:
isMergedFirstCell
.
c1
,
c2
:
isMergedFirstCell
.
c2
});
}
}
};
...
...
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