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
ace70bdf
Commit
ace70bdf
authored
Oct 06, 2016
by
Alexander.Trofimov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix paste
parent
ef597b07
Changes
2
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
188 additions
and
220 deletions
+188
-220
cell/model/clipboard.js
cell/model/clipboard.js
+8
-23
cell/view/WorksheetView.js
cell/view/WorksheetView.js
+180
-197
No files found.
cell/model/clipboard.js
View file @
ace70bdf
...
...
@@ -246,26 +246,10 @@
else
{
pptx_content_writer
.
Start_UseFullUrl
();
//TODO стоит убрать заглушку при правке бага с activeRange
var
cloneActiveRange
=
worksheet
.
activeRange
.
clone
();
var
temp
;
if
(
cloneActiveRange
.
c1
>
cloneActiveRange
.
c2
)
{
temp
=
cloneActiveRange
.
c1
;
cloneActiveRange
.
c1
=
cloneActiveRange
.
c2
;
cloneActiveRange
.
c2
=
temp
;
};
if
(
cloneActiveRange
.
r1
>
cloneActiveRange
.
r2
)
{
temp
=
cloneActiveRange
.
r1
;
cloneActiveRange
.
r1
=
cloneActiveRange
.
r2
;
cloneActiveRange
.
r2
=
temp
;
};
var
oBinaryFileWriter
=
new
AscCommonExcel
.
BinaryFileWriter
(
worksheet
.
model
.
workbook
,
cloneActiveRange
);
var
sBase64
=
"
xslData;
"
+
oBinaryFileWriter
.
Write
();
// ToDo multiselect ?
var
oBinaryFileWriter
=
new
AscCommonExcel
.
BinaryFileWriter
(
worksheet
.
model
.
workbook
,
worksheet
.
model
.
selectionRange
.
getLast
());
sBase64
=
"
xslData;
"
+
oBinaryFileWriter
.
Write
();
pptx_content_writer
.
End_UseFullUrl
();
}
...
...
@@ -278,7 +262,7 @@
var
sBase64
;
var
selectedContent
=
new
CSelectedContent
();
isIntoShape
.
Get_SelectedContent
(
selectedContent
)
isIntoShape
.
Get_SelectedContent
(
selectedContent
)
;
var
oPresentationWriter
=
new
AscCommon
.
CBinaryFileWriter
();
...
...
@@ -1897,8 +1881,9 @@
_checkPasteFromBinaryExcel
:
function
(
worksheet
,
isWriteError
,
insertWorksheet
)
{
var
activeCellsPasteFragment
=
AscCommonExcel
.
g_oRangeCache
.
getAscRange
(
this
.
activeRange
);
var
rMax
=
(
activeCellsPasteFragment
.
r2
-
activeCellsPasteFragment
.
r1
)
+
worksheet
.
activeRange
.
r1
;
var
cMax
=
(
activeCellsPasteFragment
.
c2
-
activeCellsPasteFragment
.
c1
)
+
worksheet
.
activeRange
.
c1
;
var
lastRange
=
worksheet
.
model
.
selectionRange
.
getLast
();
var
rMax
=
(
activeCellsPasteFragment
.
r2
-
activeCellsPasteFragment
.
r1
)
+
lastRange
.
r1
;
var
cMax
=
(
activeCellsPasteFragment
.
c2
-
activeCellsPasteFragment
.
c1
)
+
lastRange
.
c1
;
var
res
=
true
;
//если область вставки выходит за пределы доступной области
...
...
cell/view/WorksheetView.js
View file @
ace70bdf
This diff is collapsed.
Click to expand it.
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