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
93ca1b55
Commit
93ca1b55
authored
Feb 21, 2017
by
GoshaZotov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
changes for format table special paste
parent
41adcdef
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
1 deletion
+11
-1
cell/model/clipboard.js
cell/model/clipboard.js
+5
-0
cell/view/WorksheetView.js
cell/view/WorksheetView.js
+6
-1
No files found.
cell/model/clipboard.js
View file @
93ca1b55
...
@@ -92,6 +92,7 @@
...
@@ -92,6 +92,7 @@
this
.
angle
=
true
;
this
.
angle
=
true
;
this
.
format
=
true
;
this
.
format
=
true
;
this
.
formatTable
=
true
;
this
.
images
=
true
;
this
.
images
=
true
;
}
}
...
@@ -117,6 +118,7 @@
...
@@ -117,6 +118,7 @@
this
.
angle
=
true
;
this
.
angle
=
true
;
this
.
format
=
true
;
this
.
format
=
true
;
this
.
formatTable
=
true
;
this
.
images
=
true
;
this
.
images
=
true
;
},
},
...
@@ -137,6 +139,7 @@
...
@@ -137,6 +139,7 @@
this
.
angle
=
null
;
this
.
angle
=
null
;
this
.
format
=
null
;
this
.
format
=
null
;
this
.
formatTable
=
null
;
this
.
images
=
null
;
this
.
images
=
null
;
},
},
...
@@ -204,12 +207,14 @@
...
@@ -204,12 +207,14 @@
{
{
//все кроме формул
//все кроме формул
this
.
formula
=
null
;
this
.
formula
=
null
;
this
.
formatTable
=
null
;
break
;
break
;
}
}
case
c_oSpecialPasteProps
.
pasteOnlyFormating
:
case
c_oSpecialPasteProps
.
pasteOnlyFormating
:
{
{
this
.
formula
=
null
;
this
.
formula
=
null
;
this
.
val
=
null
;
this
.
val
=
null
;
this
.
formatTable
=
null
;
break
;
break
;
}
}
case
c_oSpecialPasteProps
.
transpose
:
case
c_oSpecialPasteProps
.
transpose
:
...
...
cell/view/WorksheetView.js
View file @
93ca1b55
...
@@ -8837,6 +8837,9 @@
...
@@ -8837,6 +8837,9 @@
this
.
model
.
selectionRange
=
specialPasteData
.
activeRange
.
clone
(
this
.
model
);
this
.
model
.
selectionRange
=
specialPasteData
.
activeRange
.
clone
(
this
.
model
);
}
}
//нужно удалить данные предыдущей вставки(нужно для удаления ф/т)
t
.
model
.
autoFilters
.
isEmptyAutoFilters
(
this
.
model
.
selectionRange
.
getLast
());
undoPreviousPaste
();
undoPreviousPaste
();
}
}
else
if
(
isIntoShape
&&
preSpecialPasteData
&&
preSpecialPasteData
.
shapeSelectionState
)
//курсор и специальная вставка в шейпе
else
if
(
isIntoShape
&&
preSpecialPasteData
&&
preSpecialPasteData
.
shapeSelectionState
)
//курсор и специальная вставка в шейпе
...
@@ -8876,7 +8879,7 @@
...
@@ -8876,7 +8879,7 @@
//добавляем форматированные таблицы
//добавляем форматированные таблицы
var
arnToRange
=
t
.
model
.
selectionRange
.
getLast
();
var
arnToRange
=
t
.
model
.
selectionRange
.
getLast
();
var
tablesMap
=
null
;
var
tablesMap
=
null
;
if
(
fromBinary
&&
val
.
TableParts
&&
val
.
TableParts
.
length
)
{
if
(
fromBinary
&&
val
.
TableParts
&&
val
.
TableParts
.
length
&&
specialPasteProps
.
formatTable
)
{
var
range
,
tablePartRange
,
tables
=
val
.
TableParts
,
diffRow
,
diffCol
,
curTable
,
bIsAddTable
;
var
range
,
tablePartRange
,
tables
=
val
.
TableParts
,
diffRow
,
diffCol
,
curTable
,
bIsAddTable
;
var
activeRange
=
window
[
"
Asc
"
][
"
editor
"
].
wb
.
clipboard
.
pasteProcessor
.
activeRange
;
var
activeRange
=
window
[
"
Asc
"
][
"
editor
"
].
wb
.
clipboard
.
pasteProcessor
.
activeRange
;
var
refInsertBinary
=
AscCommonExcel
.
g_oRangeCache
.
getAscRange
(
activeRange
);
var
refInsertBinary
=
AscCommonExcel
.
g_oRangeCache
.
getAscRange
(
activeRange
);
...
@@ -9181,6 +9184,7 @@
...
@@ -9181,6 +9184,7 @@
if
(
specialPasteProps
.
format
)
if
(
specialPasteProps
.
format
)
{
{
rangeUnMerge
.
unmerge
();
rangeUnMerge
.
unmerge
();
//this.cellCommentator.deleteCommentsRange(rangeUnMerge.bbox);
}
}
if
(
!
isOneMerge
)
{
if
(
!
isOneMerge
)
{
...
@@ -9418,6 +9422,7 @@
...
@@ -9418,6 +9422,7 @@
if
(
specialPasteProps
.
format
)
if
(
specialPasteProps
.
format
)
{
{
rangeUnMerge
.
unmerge
();
rangeUnMerge
.
unmerge
();
//this.cellCommentator.deleteCommentsRange(rangeUnMerge.bbox);
}
}
if
(
!
isOneMerge
)
{
if
(
!
isOneMerge
)
{
arn
.
r2
=
rMax2
-
1
;
arn
.
r2
=
rMax2
-
1
;
...
...
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