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
6fc57785
Commit
6fc57785
authored
Sep 19, 2016
by
Alexander.Trofimov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix active merged cell selection
parent
d7d6d0d9
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
12 additions
and
7 deletions
+12
-7
cell/view/WorksheetView.js
cell/view/WorksheetView.js
+12
-7
No files found.
cell/view/WorksheetView.js
View file @
6fc57785
...
...
@@ -3641,15 +3641,20 @@
// draw active cell in selection
var
isPromote
=
AscCommonExcel
.
selectionLineType
.
RangeWithPromote
===
selectionLineType
;
if
(
isPromote
&&
oIntersection
.
contains
(
range
.
startCol
,
range
.
startRow
))
{
var
_x1
=
c
[
range
.
startCol
].
left
-
offsetX
+
width_1px
;
var
_y1
=
r
[
range
.
startRow
].
top
-
offsetY
+
height_1px
;
var
_w
=
c
[
range
.
startCol
].
width
-
width_2px
;
var
_h
=
r
[
range
.
startRow
].
height
-
height_2px
;
if
(
isPromote
)
{
var
fs
=
this
.
model
.
getMergedByCell
(
range
.
startRow
,
range
.
startCol
);
fs
=
range
.
intersectionSimple
(
fs
?
fs
:
new
asc_Range
(
range
.
startCol
,
range
.
startRow
,
range
.
startCol
,
range
.
startRow
));
if
(
fs
)
{
var
_x1
=
c
[
fs
.
c1
].
left
-
offsetX
+
width_1px
;
var
_y1
=
r
[
fs
.
r1
].
top
-
offsetY
+
height_1px
;
var
_w
=
c
[
fs
.
c2
].
left
-
c
[
fs
.
c1
].
left
+
c
[
fs
.
c2
].
width
-
width_2px
;
var
_h
=
r
[
fs
.
r2
].
top
-
r
[
fs
.
r1
].
top
+
r
[
fs
.
r2
].
height
-
height_2px
;
if
(
0
<
_w
&&
0
<
_h
)
{
ctx
.
clearRect
(
_x1
,
_y1
,
_w
,
_h
);
}
}
}
// Отрисовка квадратов для move/resize
var
isResize
=
AscCommonExcel
.
selectionLineType
.
RangeWithResize
===
selectionLineType
;
...
...
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