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
e874f403
Commit
e874f403
authored
Jul 29, 2016
by
GoshaZotov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix bug 32834
parent
a86ec2a8
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
20 additions
and
18 deletions
+20
-18
cell/model/clipboard.js
cell/model/clipboard.js
+1
-1
cell/view/WorksheetView.js
cell/view/WorksheetView.js
+19
-17
No files found.
cell/model/clipboard.js
View file @
e874f403
...
...
@@ -2324,7 +2324,7 @@
}
var
cell
=
this
.
aResult
.
getCell
(
row
+
this
.
maxLengthRowCount
,
col
);
if
(
cell
&&
cell
.
length
===
0
&&
(
cell
.
borders
||
cell
.
rowSpan
!=
null
))
if
(
cell
&&
cell
.
content
&&
cell
.
content
.
length
===
0
&&
(
cell
.
borders
||
cell
.
rowSpan
!=
null
))
{
if
(
cell
.
borders
)
{
...
...
cell/view/WorksheetView.js
View file @
e874f403
...
...
@@ -9596,15 +9596,17 @@
if
(
undefined
!==
pasteContent
.
content
[
r
][
c
]
)
{
var
range
=
t
.
model
.
getRange3
(
r
+
autoR
*
plRow
,
c
+
autoC
*
plCol
,
r
+
autoR
*
plRow
,
c
+
autoC
*
plCol
);
var
currentObj
=
pasteContent
.
content
[
r
][
c
].
content
;
if
(
currentObj
.
length
===
1
)
var
currentObj
=
pasteContent
.
content
[
r
][
c
];
var
contentCurrentObj
=
currentObj
.
content
;
if
(
contentCurrentObj
.
length
===
1
)
{
var
valFormat
=
currentObj
[
0
].
text
;
var
onlyChild
=
contentCurrentObj
[
0
];
var
valFormat
=
onlyChild
.
text
;
var
nameFormat
=
false
;
if
(
currentObj
[
0
]
.
cellFrom
)
if
(
onlyChild
.
cellFrom
)
{
var
offset
=
range
.
getCells
()[
0
].
getOffset2
(
currentObj
[
0
].
cellFrom
),
assemb
,
_p_
=
new
AscCommonExcel
.
parserFormula
(
currentObj
[
0
]
.
text
.
substring
(
1
),
""
,
range
.
worksheet
);
var
offset
=
range
.
getCells
()[
0
].
getOffset2
(
onlyChild
.
cellFrom
),
assemb
,
_p_
=
new
AscCommonExcel
.
parserFormula
(
onlyChild
.
text
.
substring
(
1
),
""
,
range
.
worksheet
);
if
(
_p_
.
parse
()
)
{
...
...
@@ -9625,27 +9627,27 @@
{
range
.
setNumFormat
(
nameFormat
);
}
range
.
setBold
(
currentObj
[
0
]
.
format
.
b
);
range
.
setItalic
(
currentObj
[
0
]
.
format
.
i
);
range
.
setStrikeout
(
currentObj
[
0
]
.
format
.
s
);
if
(
!
isOneMerge
&&
currentObj
[
0
].
format
&&
currentObj
[
0
].
format
.
c
!=
null
&&
currentObj
[
0
]
.
format
.
c
!=
undefined
)
range
.
setBold
(
onlyChild
.
format
.
b
);
range
.
setItalic
(
onlyChild
.
format
.
i
);
range
.
setStrikeout
(
onlyChild
.
format
.
s
);
if
(
!
isOneMerge
&&
onlyChild
.
format
&&
onlyChild
.
format
.
c
!=
null
&&
onlyChild
.
format
.
c
!=
undefined
)
{
range
.
setFontcolor
(
currentObj
[
0
]
.
format
.
c
);
range
.
setFontcolor
(
onlyChild
.
format
.
c
);
}
range
.
setUnderline
(
currentObj
[
0
]
.
format
.
u
);
range
.
setAlignVertical
(
currentObj
.
va
);
range
.
setFontname
(
currentObj
[
0
]
.
format
.
fn
);
range
.
setFontsize
(
currentObj
[
0
]
.
format
.
fs
);
range
.
setUnderline
(
onlyChild
.
format
.
u
);
range
.
setAlignVertical
(
c
ontentC
urrentObj
.
va
);
range
.
setFontname
(
onlyChild
.
format
.
fn
);
range
.
setFontsize
(
onlyChild
.
format
.
fs
);
}
else
{
range
.
setValue2
(
currentObj
);
range
.
setValue2
(
c
ontentC
urrentObj
);
range
.
setAlignVertical
(
currentObj
.
va
);
}
if
(
c
urrentObj
.
length
===
1
&&
currentObj
[
0
].
format
.
fs
!==
''
&&
currentObj
[
0
].
format
.
fs
!==
null
&&
c
urrentObj
[
0
].
format
.
fs
!==
undefined
)
if
(
c
ontentCurrentObj
.
length
===
1
&&
contentCurrentObj
[
0
].
format
.
fs
!==
''
&&
contentCurrentObj
[
0
].
format
.
fs
!==
null
&&
contentC
urrentObj
[
0
].
format
.
fs
!==
undefined
)
{
range
.
setFontsize
(
currentObj
[
0
].
format
.
fs
);
range
.
setFontsize
(
c
ontentC
urrentObj
[
0
].
format
.
fs
);
}
if
(
!
isOneMerge
)
{
...
...
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