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
581efb8d
Commit
581efb8d
authored
Mar 02, 2017
by
GoshaZotov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
transpose property for special paste
parent
7a9fe58f
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
41 additions
and
9 deletions
+41
-9
cell/view/WorksheetView.js
cell/view/WorksheetView.js
+41
-9
No files found.
cell/view/WorksheetView.js
View file @
581efb8d
...
@@ -8759,13 +8759,19 @@
...
@@ -8759,13 +8759,19 @@
newRange
=
this
.
_pasteFromHTML
(
val
,
true
);
newRange
=
this
.
_pasteFromHTML
(
val
,
true
);
}
}
var
g_clipboardBase
=
window
[
'
AscCommon
'
].
g_clipboardBase
;
if
(
!
window
[
"
Asc
"
][
"
editor
"
].
wb
.
clipboard
.
specialPasteStart
)
if
(
!
window
[
"
Asc
"
][
"
editor
"
].
wb
.
clipboard
.
specialPasteStart
)
{
{
var
sBinary
=
window
[
"
Asc
"
][
"
editor
"
].
wb
.
clipboard
.
copyProcessor
.
getBinaryForCopy
(
this
,
newRange
);
var
sBinary
=
window
[
"
Asc
"
][
"
editor
"
].
wb
.
clipboard
.
copyProcessor
.
getBinaryForCopy
(
this
,
newRange
);
g_clipboardBase
.
specialPasteUndoData
.
data
=
sBinary
;
var
specialPasteSelectionRange
=
new
AscCommonExcel
.
SelectionRange
();
var
specialPasteSelectionRange
=
new
AscCommonExcel
.
SelectionRange
();
specialPasteSelectionRange
.
ranges
[
0
]
=
newRange
.
clone
();
specialPasteSelectionRange
.
ranges
[
0
]
=
newRange
.
clone
();
window
[
'
AscCommon
'
].
g_clipboardBase
.
specialPasteData
.
activeRange
=
specialPasteSelectionRange
;
g_clipboardBase
.
specialPasteData
.
activeRange
=
specialPasteSelectionRange
;
window
[
'
AscCommon
'
].
g_clipboardBase
.
specialPasteUndoData
.
data
=
sBinary
;
}
else
if
(
g_clipboardBase
.
specialPasteProps
&&
g_clipboardBase
.
specialPasteProps
.
transpose
)
{
window
[
'
AscCommon
'
].
g_clipboardBase
.
specialPasteUndoData
.
transpose
=
true
;
}
}
checkRange
=
[
newRange
];
checkRange
=
[
newRange
];
...
@@ -8809,7 +8815,7 @@
...
@@ -8809,7 +8815,7 @@
pasteData
=
tempWorkbook
.
aWorksheets
[
0
];
pasteData
=
tempWorkbook
.
aWorksheets
[
0
];
if
(
pasteData
)
if
(
pasteData
)
{
{
t
.
_pasteFromBinary
(
pasteData
,
null
,
null
,
window
[
'
AscCommon
'
].
g_clipboardBase
.
specialPasteProps
);
t
.
_pasteFromBinary
(
pasteData
,
null
,
null
);
}
}
//удаляем вставленные изображения
//удаляем вставленные изображения
...
@@ -8839,6 +8845,11 @@
...
@@ -8839,6 +8845,11 @@
{
{
var
tempProps
=
new
Asc
.
SpecialPasteProps
();
var
tempProps
=
new
Asc
.
SpecialPasteProps
();
tempProps
.
width
=
true
;
tempProps
.
width
=
true
;
if
(
specialPasteUndoData
.
transpose
)
{
tempProps
.
transpose
=
true
;
specialPasteUndoData
.
transpose
=
null
;
}
window
[
'
AscCommon
'
].
g_clipboardBase
.
specialPasteProps
=
tempProps
;
window
[
'
AscCommon
'
].
g_clipboardBase
.
specialPasteProps
=
tempProps
;
//переводим фокус из шейпа на лист
//переводим фокус из шейпа на лист
...
@@ -8971,7 +8982,7 @@
...
@@ -8971,7 +8982,7 @@
t
.
model
.
workbook
.
dependencyFormulas
.
lockRecal
();
t
.
model
.
workbook
.
dependencyFormulas
.
lockRecal
();
var
selectData
;
var
selectData
;
if
(
fromBinary
)
{
if
(
fromBinary
)
{
selectData
=
t
.
_pasteFromBinary
(
val
,
null
,
tablesMap
,
specialPasteProps
);
selectData
=
t
.
_pasteFromBinary
(
val
,
null
,
tablesMap
);
}
else
{
}
else
{
selectData
=
t
.
_pasteFromHTML
(
val
,
null
,
specialPasteProps
);
selectData
=
t
.
_pasteFromHTML
(
val
,
null
,
specialPasteProps
);
}
}
...
@@ -9041,7 +9052,7 @@
...
@@ -9041,7 +9052,7 @@
}
}
else
else
{
{
this
.
updateSpecialPasteOptionsPosition
();
this
.
updateSpecialPasteOptionsPosition
(
selectData
[
0
]
);
}
}
};
};
...
@@ -9343,7 +9354,7 @@
...
@@ -9343,7 +9354,7 @@
return
arnFor
;
return
arnFor
;
};
};
WorksheetView
.
prototype
.
_pasteFromBinary
=
function
(
val
,
isCheckSelection
,
tablesMap
,
specialPasteProps
)
{
WorksheetView
.
prototype
.
_pasteFromBinary
=
function
(
val
,
isCheckSelection
,
tablesMap
)
{
var
t
=
this
;
var
t
=
this
;
var
trueActiveRange
=
t
.
model
.
selectionRange
.
getLast
().
clone
();
var
trueActiveRange
=
t
.
model
.
selectionRange
.
getLast
().
clone
();
var
lastSelection
=
this
.
model
.
selectionRange
.
getLast
();
var
lastSelection
=
this
.
model
.
selectionRange
.
getLast
();
...
@@ -9352,8 +9363,19 @@
...
@@ -9352,8 +9363,19 @@
var
pasteRange
=
window
[
"
Asc
"
][
"
editor
"
].
wb
.
clipboard
.
pasteProcessor
.
activeRange
;
var
pasteRange
=
window
[
"
Asc
"
][
"
editor
"
].
wb
.
clipboard
.
pasteProcessor
.
activeRange
;
var
activeCellsPasteFragment
=
typeof
pasteRange
===
"
string
"
?
AscCommonExcel
.
g_oRangeCache
.
getAscRange
(
pasteRange
)
:
pasteRange
;
var
activeCellsPasteFragment
=
typeof
pasteRange
===
"
string
"
?
AscCommonExcel
.
g_oRangeCache
.
getAscRange
(
pasteRange
)
:
pasteRange
;
var
rMax
=
(
activeCellsPasteFragment
.
r2
-
activeCellsPasteFragment
.
r1
)
+
arn
.
r1
+
1
;
var
cMax
=
(
activeCellsPasteFragment
.
c2
-
activeCellsPasteFragment
.
c1
)
+
arn
.
c1
+
1
;
var
g_clipboardBase
=
window
[
'
AscCommon
'
].
g_clipboardBase
;
var
specialPasteProps
=
g_clipboardBase
.
specialPasteProps
;
var
countPasteRow
=
activeCellsPasteFragment
.
r2
-
activeCellsPasteFragment
.
r1
+
1
;
var
countPasteCol
=
activeCellsPasteFragment
.
c2
-
activeCellsPasteFragment
.
c1
+
1
;
if
(
specialPasteProps
&&
specialPasteProps
.
transpose
)
{
countPasteRow
=
activeCellsPasteFragment
.
c2
-
activeCellsPasteFragment
.
c1
+
1
;
countPasteCol
=
activeCellsPasteFragment
.
r2
-
activeCellsPasteFragment
.
r1
+
1
;
}
var
rMax
=
countPasteRow
+
arn
.
r1
;
var
cMax
=
countPasteCol
+
arn
.
c1
;
if
(
cMax
>
gc_nMaxCol0
)
{
if
(
cMax
>
gc_nMaxCol0
)
{
cMax
=
gc_nMaxCol0
;
cMax
=
gc_nMaxCol0
;
...
@@ -9632,6 +9654,12 @@
...
@@ -9632,6 +9654,12 @@
for
(
var
c
=
0
;
c
<
cMax
-
arn
.
c1
;
++
c
)
{
for
(
var
c
=
0
;
c
<
cMax
-
arn
.
c1
;
++
c
)
{
var
pasteRow
=
r
+
activeCellsPasteFragment
.
r1
;
var
pasteRow
=
r
+
activeCellsPasteFragment
.
r1
;
var
pasteCol
=
c
+
activeCellsPasteFragment
.
c1
;
var
pasteCol
=
c
+
activeCellsPasteFragment
.
c1
;
if
(
specialPasteProps
.
transpose
)
{
pasteRow
=
c
+
activeCellsPasteFragment
.
r1
;
pasteCol
=
r
+
activeCellsPasteFragment
.
c1
;
}
var
newVal
=
val
.
getCell3
(
pasteRow
,
pasteCol
);
var
newVal
=
val
.
getCell3
(
pasteRow
,
pasteCol
);
var
curMerge
=
newVal
.
hasMerged
();
var
curMerge
=
newVal
.
hasMerged
();
...
@@ -9945,7 +9973,7 @@
...
@@ -9945,7 +9973,7 @@
this
.
handlers
.
trigger
(
"
showSpecialPasteOptions
"
,
specialPasteShowOptions
);
this
.
handlers
.
trigger
(
"
showSpecialPasteOptions
"
,
specialPasteShowOptions
);
},
},
WorksheetView
.
prototype
.
updateSpecialPasteOptionsPosition
=
function
()
WorksheetView
.
prototype
.
updateSpecialPasteOptionsPosition
=
function
(
changeActiveRange
)
{
{
var
_clipboard
=
window
[
"
Asc
"
][
"
editor
"
].
wb
.
clipboard
;
var
_clipboard
=
window
[
"
Asc
"
][
"
editor
"
].
wb
.
clipboard
;
var
isIntoShape
=
this
.
objectRender
.
controller
.
getTargetDocContent
(
true
);
var
isIntoShape
=
this
.
objectRender
.
controller
.
getTargetDocContent
(
true
);
...
@@ -9987,6 +10015,10 @@
...
@@ -9987,6 +10015,10 @@
else
if
(
window
[
'
AscCommon
'
].
g_clipboardBase
.
showSpecialPasteButton
)
else
if
(
window
[
'
AscCommon
'
].
g_clipboardBase
.
showSpecialPasteButton
)
{
{
var
specialPasteShowOptions
=
new
Asc
.
SpecialPasteShowOptions
();
var
specialPasteShowOptions
=
new
Asc
.
SpecialPasteShowOptions
();
if
(
changeActiveRange
)
{
window
[
'
AscCommon
'
].
g_clipboardBase
.
specialPasteButtonProps
.
range
=
changeActiveRange
;
}
var
range
=
window
[
'
AscCommon
'
].
g_clipboardBase
.
specialPasteButtonProps
.
range
;
var
range
=
window
[
'
AscCommon
'
].
g_clipboardBase
.
specialPasteButtonProps
.
range
;
var
isVisible
=
null
!==
this
.
getCellVisibleRange
(
range
.
c2
,
range
.
r2
);
var
isVisible
=
null
!==
this
.
getCellVisibleRange
(
range
.
c2
,
range
.
r2
);
...
...
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