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
c502f696
Commit
c502f696
authored
Oct 02, 2017
by
GoshaZotov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix bug 35904
parent
96315aac
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
2 deletions
+9
-2
cell/model/autofilters.js
cell/model/autofilters.js
+8
-1
cell/view/WorksheetView.js
cell/view/WorksheetView.js
+1
-1
No files found.
cell/model/autofilters.js
View file @
c502f696
...
...
@@ -3427,7 +3427,7 @@
},
//TODO пока включаю протестированную функцию. позже доработать функцию _getAdjacentCellsAF2, она работает быстрее!
_getAdjacentCellsAF
:
function
(
ar
,
ignoreAutoFilter
,
doNotIncludeMergedCells
)
_getAdjacentCellsAF
:
function
(
ar
,
ignoreAutoFilter
,
doNotIncludeMergedCells
,
ignoreSpaceSymbols
)
{
var
ws
=
this
.
worksheet
;
var
cloneActiveRange
=
ar
.
clone
(
true
);
// ToDo слишком много клонирования
...
...
@@ -3468,6 +3468,13 @@
cell
=
ws
.
getRange3
(
n
,
k
,
n
,
k
);
isEmptyCell
=
cell
.
isEmptyText
();
if
(
!
isEmptyCell
&&
ignoreSpaceSymbols
){
var
tempVal
=
cell
.
getValueWithoutFormat
().
replace
(
/
\s
/g
,
''
);
if
(
""
===
tempVal
){
isEmptyCell
=
true
;
}
}
merged
=
cell
.
hasMerged
();
if
(
merged
&&
doNotIncludeMergedCells
){
continue
;
...
...
cell/view/WorksheetView.js
View file @
c502f696
...
...
@@ -12310,7 +12310,7 @@
var
selectionRange
=
t
.
model
.
selectionRange
;
var
activeCell
=
selectionRange
.
activeCell
.
clone
();
var
activeCellRange
=
new
Asc
.
Range
(
activeCell
.
col
,
activeCell
.
row
,
activeCell
.
col
,
activeCell
.
row
);
var
expandRange
=
t
.
model
.
autoFilters
.
_getAdjacentCellsAF
(
activeCellRange
,
true
,
true
);
var
expandRange
=
t
.
model
.
autoFilters
.
_getAdjacentCellsAF
(
activeCellRange
,
true
,
true
,
true
);
//change selection
t
.
setSelection
(
expandRange
);
...
...
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