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
d10bcaaf
Commit
d10bcaaf
authored
Apr 08, 2016
by
GoshaZotov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
add const in c_oAscError(FTChangeTableRangeError, FTRangeIncludedOtherTables)
parent
38d59d72
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
9 deletions
+10
-9
cell/apiDefines.js
cell/apiDefines.js
+2
-0
cell/view/WorksheetView.js
cell/view/WorksheetView.js
+8
-9
No files found.
cell/apiDefines.js
View file @
d10bcaaf
...
@@ -82,6 +82,8 @@ var c_oAscError = {
...
@@ -82,6 +82,8 @@ var c_oAscError = {
AutoFilterMoveToHiddenRangeError
:
-
53
,
AutoFilterMoveToHiddenRangeError
:
-
53
,
LockedAllError
:
-
54
,
LockedAllError
:
-
54
,
LockedWorksheetRename
:
-
55
,
LockedWorksheetRename
:
-
55
,
FTChangeTableRangeError
:
-
56
,
FTRangeIncludedOtherTables
:
-
57
,
PasteMaxRangeError
:
-
65
,
PasteMaxRangeError
:
-
65
,
...
...
cell/view/WorksheetView.js
View file @
d10bcaaf
...
@@ -13215,18 +13215,17 @@
...
@@ -13215,18 +13215,17 @@
var
ws
=
this
.
model
;
var
ws
=
this
.
model
;
var
intersectionTables
=
this
.
model
.
autoFilters
.
getTableIntersectionRange
(
range
);
var
intersectionTables
=
this
.
model
.
autoFilters
.
getTableIntersectionRange
(
range
);
if
(
!
intersectionTables
||
(
intersectionTables
&&
intersectionTables
.
length
!==
1
))
var
tablePart
=
intersectionTables
[
0
];
if
(
tablePart
)
{
{
res
=
c_oAscError
.
ID
.
AutoFilterMoveToHiddenRangeError
;
if
(
range
.
r1
!==
tablePart
.
Ref
.
r1
)
//первая строка таблицы не равно первой строке выделенного диапазона
}
else
{
{
var
tablePart
=
intersectionTables
[
0
];
res
=
c_oAscError
.
ID
.
FTChangeTableRangeError
;
if
(
range
.
r1
!==
tablePart
.
Ref
.
r1
)
}
else
if
(
intersectionTables
.
length
!==
1
)
//выделено несколько таблиц
{
{
res
=
c_oAscError
.
ID
.
AutoFilterMoveToHiddenRangeError
;
res
=
c_oAscError
.
ID
.
FTRangeIncludedOtherTables
;
}
}
}
}
return
res
;
return
res
;
...
...
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