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
00b8f414
Commit
00b8f414
authored
Dec 12, 2016
by
GoshaZotov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix bug(add format table into 1 cell)
parent
e708e2bb
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
17 additions
and
6 deletions
+17
-6
cell/model/autofilters.js
cell/model/autofilters.js
+17
-6
No files found.
cell/model/autofilters.js
View file @
00b8f414
...
@@ -837,7 +837,7 @@
...
@@ -837,7 +837,7 @@
if
(
null
===
bIsInFilter
)
if
(
null
===
bIsInFilter
)
{
{
if
(
activeCells
.
r1
==
activeCells
.
r2
&&
activeCells
.
c1
==
activeCells
.
c2
)
//если ячейка выделенная одна
if
(
activeCells
.
r1
==
activeCells
.
r2
&&
activeCells
.
c1
==
activeCells
.
c2
&&
!
userRange
)
//если ячейка выделенная одна
{
{
addRange
=
this
.
_getAdjacentCellsAF
(
activeCells
);
addRange
=
this
.
_getAdjacentCellsAF
(
activeCells
);
}
}
...
@@ -867,7 +867,7 @@
...
@@ -867,7 +867,7 @@
addRange
.
setAbs
(
true
,
true
,
true
,
true
);
addRange
.
setAbs
(
true
,
true
,
true
,
true
);
res
.
asc_setIsTitle
(
bIsTitle
);
res
.
asc_setIsTitle
(
bIsTitle
);
res
.
asc_setRange
(
range
.
getName
());
res
.
asc_setRange
(
range
.
get
Abs
Name
());
}
}
return
res
;
return
res
;
...
@@ -5033,18 +5033,23 @@
...
@@ -5033,18 +5033,23 @@
_getFilterInfoByAddTableProps
:
function
(
ar
,
addFormatTableOptionsObj
)
_getFilterInfoByAddTableProps
:
function
(
ar
,
addFormatTableOptionsObj
)
{
{
var
tempRange
=
new
Asc
.
Range
(
ar
.
c1
,
ar
.
r1
,
ar
.
c2
,
ar
.
r2
);
var
tempRange
=
new
Asc
.
Range
(
ar
.
c1
,
ar
.
r1
,
ar
.
c2
,
ar
.
r2
);
var
addNameColumn
,
filterRange
;
var
addNameColumn
,
filterRange
,
bIsManualOptions
=
false
;
if
(
addFormatTableOptionsObj
===
false
)
if
(
addFormatTableOptionsObj
===
false
)
{
addNameColumn
=
true
;
addNameColumn
=
true
;
}
else
if
(
addFormatTableOptionsObj
&&
typeof
addFormatTableOptionsObj
==
'
object
'
)
else
if
(
addFormatTableOptionsObj
&&
typeof
addFormatTableOptionsObj
==
'
object
'
)
{
{
tempRange
=
addFormatTableOptionsObj
.
asc_getRange
();
tempRange
=
addFormatTableOptionsObj
.
asc_getRange
();
addNameColumn
=
!
addFormatTableOptionsObj
.
asc_getIsTitle
();
addNameColumn
=
!
addFormatTableOptionsObj
.
asc_getIsTitle
();
tempRange
=
AscCommonExcel
.
g_oRangeCache
.
getAscRange
(
tempRange
).
clone
();
tempRange
=
AscCommonExcel
.
g_oRangeCache
.
getAscRange
(
tempRange
).
clone
();
bIsManualOptions
=
true
;
}
}
else
if
(
addFormatTableOptionsObj
===
true
)
else
if
(
addFormatTableOptionsObj
===
true
)
{
addNameColumn
=
false
;
addNameColumn
=
false
;
}
//expand range
//expand range
var
tablePartsContainsRange
=
this
.
_isTablePartsContainsRange
(
tempRange
);
var
tablePartsContainsRange
=
this
.
_isTablePartsContainsRange
(
tempRange
);
...
@@ -5052,14 +5057,20 @@
...
@@ -5052,14 +5057,20 @@
{
{
filterRange
=
tablePartsContainsRange
.
Ref
.
clone
();
filterRange
=
tablePartsContainsRange
.
Ref
.
clone
();
}
}
else
if
(
tempRange
.
isOneCell
())
else
if
(
tempRange
.
isOneCell
()
&&
!
bIsManualOptions
)
{
filterRange
=
this
.
_getAdjacentCellsAF
(
tempRange
,
this
.
worksheet
);
filterRange
=
this
.
_getAdjacentCellsAF
(
tempRange
,
this
.
worksheet
);
}
else
else
{
filterRange
=
tempRange
;
filterRange
=
tempRange
;
}
var
rangeWithoutDiff
=
filterRange
.
clone
();
var
rangeWithoutDiff
=
filterRange
.
clone
();
if
(
addNameColumn
)
if
(
addNameColumn
)
{
filterRange
.
r2
=
filterRange
.
r2
+
1
;
filterRange
.
r2
=
filterRange
.
r2
+
1
;
}
return
{
filterRange
:
filterRange
,
addNameColumn
:
addNameColumn
,
rangeWithoutDiff
:
rangeWithoutDiff
,
tablePartsContainsRange
:
tablePartsContainsRange
};
return
{
filterRange
:
filterRange
,
addNameColumn
:
addNameColumn
,
rangeWithoutDiff
:
rangeWithoutDiff
,
tablePartsContainsRange
:
tablePartsContainsRange
};
}
}
...
...
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