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
1e25875d
Commit
1e25875d
authored
Nov 01, 2016
by
Alexander.Trofimov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
add asc_getMultiselect
parent
cf991600
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
40 additions
and
32 deletions
+40
-32
cell/model/CellInfo.js
cell/model/CellInfo.js
+35
-27
cell/view/WorksheetView.js
cell/view/WorksheetView.js
+5
-5
No files found.
cell/model/CellInfo.js
View file @
1e25875d
...
...
@@ -33,34 +33,41 @@
"
use strict
"
;
(
/**
* @param {Window} window
* @param {undefined} undefined
*/
function
(
window
,
undefined
)
{
// Import
var
c_oAscBorderStyles
=
AscCommon
.
c_oAscBorderStyles
;
* @param {Window} window
* @param {undefined} undefined
*/
function
(
window
,
undefined
)
{
// Import
var
c_oAscBorderStyles
=
AscCommon
.
c_oAscBorderStyles
;
/** @constructor */
function
asc_CCellFlag
(
m
,
s
,
w
,
t
,
l
)
{
this
.
merge
=
!!
m
;
this
.
shrinkToFit
=
!!
s
;
this
.
wrapText
=
!!
w
;
this
.
selectionType
=
t
;
this
.
lockText
=
!!
l
;
}
asc_CCellFlag
.
prototype
=
{
asc_getMerge
:
function
()
{
return
this
.
merge
;
},
asc_getShrinkToFit
:
function
()
{
return
this
.
shrinkToFit
;
},
asc_getWrapText
:
function
()
{
return
this
.
wrapText
;
},
asc_getSelectionType
:
function
()
{
return
this
.
selectionType
;
},
asc_getLockText
:
function
()
{
return
this
.
lockText
;
}
};
/** @constructor */
function
asc_CCellFlag
(
m
,
s
,
w
,
t
,
l
)
{
this
.
merge
=
!!
m
;
this
.
shrinkToFit
=
!!
s
;
this
.
wrapText
=
!!
w
;
this
.
selectionType
=
t
;
this
.
lockText
=
!!
l
;
this
.
multiselect
=
false
;
}
asc_CCellFlag
.
prototype
.
asc_getMerge
=
function
()
{
return
this
.
merge
;
};
asc_CCellFlag
.
prototype
.
asc_getShrinkToFit
=
function
()
{
return
this
.
shrinkToFit
;
};
asc_CCellFlag
.
prototype
.
asc_getWrapText
=
function
()
{
return
this
.
wrapText
;
};
asc_CCellFlag
.
prototype
.
asc_getSelectionType
=
function
()
{
return
this
.
selectionType
;
};
asc_CCellFlag
.
prototype
.
asc_getMultiselect
=
function
()
{
return
this
.
multiselect
;
};
asc_CCellFlag
.
prototype
.
asc_getLockText
=
function
()
{
return
this
.
lockText
;
};
/** @constructor */
function
asc_CFont
(
name
,
size
,
color
,
b
,
i
,
u
,
s
,
sub
,
sup
)
{
...
...
@@ -373,6 +380,7 @@
prot
[
"
asc_getShrinkToFit
"
]
=
prot
.
asc_getShrinkToFit
;
prot
[
"
asc_getWrapText
"
]
=
prot
.
asc_getWrapText
;
prot
[
"
asc_getSelectionType
"
]
=
prot
.
asc_getSelectionType
;
prot
[
"
asc_getMultiselect
"
]
=
prot
.
asc_getMultiselect
;
prot
[
"
asc_getLockText
"
]
=
prot
.
asc_getLockText
;
window
[
"
AscCommonExcel
"
].
asc_CFont
=
asc_CFont
;
...
...
cell/view/WorksheetView.js
View file @
1e25875d
...
...
@@ -73,7 +73,6 @@
var
asc_CMM
=
AscCommonExcel
.
asc_CMouseMoveData
;
var
asc_VR
=
AscCommonExcel
.
VisibleRange
;
var
asc_CCellFlag
=
AscCommonExcel
.
asc_CCellFlag
;
var
asc_CFont
=
AscCommonExcel
.
asc_CFont
;
var
asc_CFill
=
AscCommonExcel
.
asc_CFill
;
var
asc_CCellInfo
=
AscCommonExcel
.
asc_CCellInfo
;
...
...
@@ -6968,12 +6967,13 @@
cell_info
.
styleName
=
c
.
getStyleName
();
cell_info
.
angle
=
c
.
getAngle
();
cell_info
.
flags
=
new
asc_CCellFlag
();
cell_info
.
flags
=
new
AscCommonExcel
.
asc_CCellFlag
();
cell_info
.
flags
.
shrinkToFit
=
c
.
getShrinkToFit
();
cell_info
.
flags
.
wrapText
=
c
.
getWrap
();
// ToDo activeRange type
cell_info
.
flags
.
selectionType
=
selectionRange
.
getLast
().
type
;
cell_info
.
flags
.
multiselect
=
!
selectionRange
.
isSingleRange
();
cell_info
.
flags
.
lockText
=
(
""
!==
cell_info
.
text
&&
(
isNumberFormat
||
""
!==
cell_info
.
formula
));
...
...
@@ -7031,7 +7031,7 @@
WorksheetView
.
prototype
.
_getSelectionInfoObject
=
function
()
{
var
objectInfo
=
new
asc_CCellInfo
();
objectInfo
.
flags
=
new
asc_CCellFlag
();
objectInfo
.
flags
=
new
AscCommonExcel
.
asc_CCellFlag
();
var
graphicObjects
=
this
.
objectRender
.
getSelectedGraphicObjects
();
if
(
graphicObjects
.
length
)
{
objectInfo
.
flags
.
selectionType
=
this
.
objectRender
.
getGraphicSelectionType
(
graphicObjects
[
0
].
Id
);
...
...
@@ -8722,13 +8722,13 @@
};
if
(
"
paste
"
===
prop
&&
val
.
onlyImages
!==
true
)
{
// Для past свой диапазон
var
newRange
;
var
newRange
;
if
(
isLocal
===
"
binary
"
)
{
newRange
=
this
.
_pasteFromBinary
(
val
,
true
);
}
else
{
newRange
=
this
.
_pasteFromHTML
(
val
,
true
);
}
checkRange
=
[
newRange
];
checkRange
=
[
newRange
];
}
if
(
"
paste
"
===
prop
&&
val
.
onlyImages
===
true
)
{
onSelectionCallback
();
...
...
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