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
2d94935b
Commit
2d94935b
authored
7 years ago
by
GoshaZotov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix bug 35735
parent
00c02782
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
59 additions
and
11 deletions
+59
-11
cell/model/FormulaObjects/databaseFunctions.js
cell/model/FormulaObjects/databaseFunctions.js
+59
-11
No files found.
cell/model/FormulaObjects/databaseFunctions.js
View file @
2d94935b
...
...
@@ -118,6 +118,7 @@
//преобразуем аргумент поле
var
isNumberField
=
field
.
tocNumber
();
var
isEmptyField
=
cElementType
.
empty
===
field
.
type
;
if
(
cElementType
.
error
===
isNumberField
.
type
){
field
=
field
.
getValue
();
}
else
{
...
...
@@ -130,7 +131,7 @@
}
}
if
(
null
===
field
){
if
(
!
isEmptyField
&&
null
===
field
){
return
new
cError
(
cErrorType
.
wrong_value_type
);
}
...
...
@@ -164,9 +165,16 @@
winElems
[
i
-
1
]
=
previousWinArray
;
}
var
needDataColumn
=
headersDataMap
[
field
];
var
resArr
=
[];
var
usuallyAddElems
=
[];
var
needDataColumn
;
if
(
isEmptyField
&&
headersConditionArr
&&
headersConditionArr
[
0
]){
needDataColumn
=
headersDataMap
[
headersConditionArr
[
0
]];
}
else
{
needDataColumn
=
headersDataMap
[
field
];
}
if
(
!
needDataColumn
){
return
new
cError
(
cErrorType
.
wrong_value_type
);
}
...
...
@@ -211,6 +219,10 @@
var
oArguments
=
this
.
_prepareArguments
(
arg
,
arguments
[
1
],
true
,
[
cElementType
.
array
,
null
,
cElementType
.
array
]);
var
argClone
=
oArguments
.
args
;
if
(
cElementType
.
empty
===
argClone
[
1
].
type
){
return
new
cError
(
cErrorType
.
wrong_value_type
);
}
argClone
[
1
]
=
argClone
[
1
].
tocString
();
var
argError
;
...
...
@@ -259,7 +271,7 @@
var
oArguments
=
this
.
_prepareArguments
(
arg
,
arguments
[
1
],
true
,
[
cElementType
.
array
,
null
,
cElementType
.
array
]);
var
argClone
=
oArguments
.
args
;
argClone
[
1
]
=
argClone
[
1
].
tocString
();
argClone
[
1
]
=
cElementType
.
empty
===
argClone
[
1
].
type
?
argClone
[
1
]
:
argClone
[
1
].
tocString
();
var
argError
;
if
(
argError
=
this
.
_checkErrorArg
(
argClone
))
{
...
...
@@ -300,7 +312,7 @@
var
oArguments
=
this
.
_prepareArguments
(
arg
,
arguments
[
1
],
true
,
[
cElementType
.
array
,
null
,
cElementType
.
array
]);
var
argClone
=
oArguments
.
args
;
argClone
[
1
]
=
argClone
[
1
].
tocString
();
argClone
[
1
]
=
cElementType
.
empty
===
argClone
[
1
].
type
?
argClone
[
1
]
:
argClone
[
1
].
tocString
();
var
argError
;
if
(
argError
=
this
.
_checkErrorArg
(
argClone
))
{
...
...
@@ -339,6 +351,10 @@
var
oArguments
=
this
.
_prepareArguments
(
arg
,
arguments
[
1
],
true
,
[
cElementType
.
array
,
null
,
cElementType
.
array
]);
var
argClone
=
oArguments
.
args
;
if
(
cElementType
.
empty
===
argClone
[
1
].
type
){
return
new
cError
(
cErrorType
.
wrong_value_type
);
}
argClone
[
1
]
=
argClone
[
1
].
tocString
();
var
argError
;
...
...
@@ -375,6 +391,10 @@
var
oArguments
=
this
.
_prepareArguments
(
arg
,
arguments
[
1
],
true
,
[
cElementType
.
array
,
null
,
cElementType
.
array
]);
var
argClone
=
oArguments
.
args
;
if
(
cElementType
.
empty
===
argClone
[
1
].
type
){
return
new
cError
(
cErrorType
.
wrong_value_type
);
}
argClone
[
1
]
=
argClone
[
1
].
tocString
();
var
argError
;
...
...
@@ -412,6 +432,10 @@
var
oArguments
=
this
.
_prepareArguments
(
arg
,
arguments
[
1
],
true
,
[
cElementType
.
array
,
null
,
cElementType
.
array
]);
var
argClone
=
oArguments
.
args
;
if
(
cElementType
.
empty
===
argClone
[
1
].
type
){
return
new
cError
(
cErrorType
.
wrong_value_type
);
}
argClone
[
1
]
=
argClone
[
1
].
tocString
();
var
argError
;
...
...
@@ -450,6 +474,10 @@
var
oArguments
=
this
.
_prepareArguments
(
arg
,
arguments
[
1
],
true
,
[
cElementType
.
array
,
null
,
cElementType
.
array
]);
var
argClone
=
oArguments
.
args
;
if
(
cElementType
.
empty
===
argClone
[
1
].
type
){
return
new
cError
(
cErrorType
.
wrong_value_type
);
}
argClone
[
1
]
=
argClone
[
1
].
tocString
();
var
argError
;
...
...
@@ -492,15 +520,19 @@
cDSTDEV
.
prototype
.
argumentsMax
=
3
;
cDSTDEV
.
prototype
.
Calculate
=
function
(
arg
)
{
var
oArguments
=
this
.
_prepareArguments
(
arg
,
arguments
[
1
],
true
,
[
cElementType
.
array
,
null
,
cElementType
.
array
]);
var
argClone
=
oArguments
.
args
;
var
oArguments
=
this
.
_prepareArguments
(
arg
,
arguments
[
1
],
true
,
[
cElementType
.
array
,
null
,
cElementType
.
array
]);
var
argClone
=
oArguments
.
args
;
if
(
cElementType
.
empty
===
argClone
[
1
].
type
){
return
new
cError
(
cErrorType
.
wrong_value_type
);
}
argClone
[
1
]
=
argClone
[
1
].
tocString
();
argClone
[
1
]
=
argClone
[
1
].
tocString
();
var
argError
;
if
(
argError
=
this
.
_checkErrorArg
(
argClone
))
{
return
this
.
value
=
argError
;
}
var
argError
;
if
(
argError
=
this
.
_checkErrorArg
(
argClone
))
{
return
this
.
value
=
argError
;
}
var
resArr
=
getNeedValuesFromDataBase
(
argClone
[
0
],
argClone
[
1
],
argClone
[
2
]);
if
(
cElementType
.
error
===
resArr
.
type
){
...
...
@@ -548,6 +580,10 @@
var
oArguments
=
this
.
_prepareArguments
(
arg
,
arguments
[
1
],
true
,
[
cElementType
.
array
,
null
,
cElementType
.
array
]);
var
argClone
=
oArguments
.
args
;
if
(
cElementType
.
empty
===
argClone
[
1
].
type
){
return
new
cError
(
cErrorType
.
wrong_value_type
);
}
argClone
[
1
]
=
argClone
[
1
].
tocString
();
var
argError
;
...
...
@@ -602,6 +638,10 @@
var
oArguments
=
this
.
_prepareArguments
(
arg
,
arguments
[
1
],
true
,
[
cElementType
.
array
,
null
,
cElementType
.
array
]);
var
argClone
=
oArguments
.
args
;
if
(
cElementType
.
empty
===
argClone
[
1
].
type
){
return
new
cError
(
cErrorType
.
wrong_value_type
);
}
argClone
[
1
]
=
argClone
[
1
].
tocString
();
var
argError
;
...
...
@@ -643,6 +683,10 @@
var
oArguments
=
this
.
_prepareArguments
(
arg
,
arguments
[
1
],
true
,
[
cElementType
.
array
,
null
,
cElementType
.
array
]);
var
argClone
=
oArguments
.
args
;
if
(
cElementType
.
empty
===
argClone
[
1
].
type
){
return
new
cError
(
cErrorType
.
wrong_value_type
);
}
argClone
[
1
]
=
argClone
[
1
].
tocString
();
var
argError
;
...
...
@@ -703,6 +747,10 @@
var
oArguments
=
this
.
_prepareArguments
(
arg
,
arguments
[
1
],
true
,
[
cElementType
.
array
,
null
,
cElementType
.
array
]);
var
argClone
=
oArguments
.
args
;
if
(
cElementType
.
empty
===
argClone
[
1
].
type
){
return
new
cError
(
cErrorType
.
wrong_value_type
);
}
argClone
[
1
]
=
argClone
[
1
].
tocString
();
var
argError
;
...
...
This diff is collapsed.
Click to expand it.
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