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
e65898f4
Commit
e65898f4
authored
Jun 16, 2017
by
GoshaZotov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
add cFormulaFunctionGroup['NotRealised'] array
delete asc_CFormula "arg" property
parent
243be54d
Changes
10
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
46 additions
and
15 deletions
+46
-15
cell/model/FormulaObjects/_xlfnFunctions.js
cell/model/FormulaObjects/_xlfnFunctions.js
+10
-0
cell/model/FormulaObjects/databaseFunctions.js
cell/model/FormulaObjects/databaseFunctions.js
+4
-0
cell/model/FormulaObjects/dateandtimeFunctions.js
cell/model/FormulaObjects/dateandtimeFunctions.js
+3
-0
cell/model/FormulaObjects/engineeringFunctions.js
cell/model/FormulaObjects/engineeringFunctions.js
+3
-0
cell/model/FormulaObjects/lookupandreferenceFunctions.js
cell/model/FormulaObjects/lookupandreferenceFunctions.js
+3
-0
cell/model/FormulaObjects/mathematicFunctions.js
cell/model/FormulaObjects/mathematicFunctions.js
+3
-0
cell/model/FormulaObjects/parserFormula.js
cell/model/FormulaObjects/parserFormula.js
+3
-2
cell/model/FormulaObjects/statisticalFunctions.js
cell/model/FormulaObjects/statisticalFunctions.js
+14
-8
cell/model/FormulaObjects/textanddataFunctions.js
cell/model/FormulaObjects/textanddataFunctions.js
+3
-0
common/AdvancedOptions.js
common/AdvancedOptions.js
+0
-5
No files found.
cell/model/FormulaObjects/_xlfnFunctions.js
View file @
e65898f4
...
...
@@ -74,6 +74,16 @@
cFormulaFunctionGroup
[
'
Information
'
]
=
cFormulaFunctionGroup
[
'
Information
'
]
||
[];
cFormulaFunctionGroup
[
'
Information
'
].
push
(
cISFORMULA
,
cSHEET
,
cSHEETS
);
cFormulaFunctionGroup
[
'
NotRealised
'
]
=
cFormulaFunctionGroup
[
'
NotRealised
'
]
||
[];
cFormulaFunctionGroup
[
'
NotRealised
'
].
push
(
cDAYS
,
cISOWEEKNUM
,
cBITAND
,
cBITLSHIFT
,
cBITOR
,
cBITRSHIFT
,
cBITXOR
,
cERF_PRECISE
,
cERFC_PRECISE
,
cDBCS
,
cUNICHAR
,
cUNICODE
,
cBINOM_DIST
,
cBINOM_DIST_RANGE
,
cBINOM_INV
,
cCHISQ_TEST
,
cCONFIDENCE_NORM
,
cCONFIDENCE_T
,
cCOVARIANCE_P
,
cCOVARIANCE_S
,
cF_TEST
,
cFORECAST_ETS
,
cFORECAST_ETS_CONFINT
,
cFORECAST_ETS_SEASONALITY
,
cFORECAST_ETS_STAT
,
cFORECAST_LINEAR
,
cHYPGEOM_DIST
,
cMODE_MULT
,
cMODE_SNGL
,
cNEGBINOM_DIST
,
cNORM_DIST
,
cNORM_INV
,
cNORM_S_DIST
,
cNORM_S_INV
,
cPERCENTILE_EXC
,
cPERCENTILE_INC
,
cPERCENTRANK_EXC
,
cPERCENTRANK_INC
,
cPERMUTATIONA
,
cPHI
,
cPOISSON_DIST
,
cQUARTILE_EXC
,
cQUARTILE_INC
,
cRANK_AVG
,
cRANK_EQ
,
cSKEW_P
,
cSTDEV_P
,
cSTDEV_S
,
cT_TEST
,
cVAR_P
,
cVAR_S
,
cWEIBULL_DIST
,
cZ_TEST
,
cPDURATION
,
cRRI
,
cAGGREGATE
,
cMUNIT
,
cFORMULATEXT
,
cISFORMULA
,
cSHEET
,
cSHEETS
);
/**
* @constructor
* @extends {AscCommonExcel.cBaseFunction}
...
...
cell/model/FormulaObjects/databaseFunctions.js
View file @
e65898f4
...
...
@@ -44,6 +44,10 @@
cFormulaFunctionGroup
[
'
Database
'
].
push
(
cDAVERAGE
,
cDCOUNT
,
cDCOUNTA
,
cDGET
,
cDMAX
,
cDMIN
,
cDPRODUCT
,
cDSTDEV
,
cDSTDEVP
,
cDSUM
,
cDVAR
,
cDVARP
);
cFormulaFunctionGroup
[
'
NotRealised
'
]
=
cFormulaFunctionGroup
[
'
NotRealised
'
]
||
[];
cFormulaFunctionGroup
[
'
NotRealised
'
].
push
(
cDAVERAGE
,
cDCOUNT
,
cDCOUNTA
,
cDGET
,
cDMAX
,
cDMIN
,
cDPRODUCT
,
cDSTDEV
,
cDSTDEVP
,
cDSUM
,
cDVAR
,
cDVARP
);
/**
* @constructor
* @extends {AscCommonExcel.cBaseFunction}
...
...
cell/model/FormulaObjects/dateandtimeFunctions.js
View file @
e65898f4
...
...
@@ -293,6 +293,9 @@
cMINUTE
,
cMONTH
,
cNETWORKDAYS
,
cNETWORKDAYS_INTL
,
cNOW
,
cSECOND
,
cTIME
,
cTIMEVALUE
,
cTODAY
,
cWEEKDAY
,
cWEEKNUM
,
cWORKDAY
,
cWORKDAY_INTL
,
cYEAR
,
cYEARFRAC
);
cFormulaFunctionGroup
[
'
NotRealised
'
]
=
cFormulaFunctionGroup
[
'
NotRealised
'
]
||
[];
cFormulaFunctionGroup
[
'
NotRealised
'
].
push
(
cNETWORKDAYS_INTL
,
cWORKDAY_INTL
);
/**
* @constructor
* @extends {AscCommonExcel.cBaseFunction}
...
...
cell/model/FormulaObjects/engineeringFunctions.js
View file @
e65898f4
...
...
@@ -940,6 +940,9 @@
cIMABS
,
cIMAGINARY
,
cIMARGUMENT
,
cIMCONJUGATE
,
cIMCOS
,
cIMCOSH
,
cIMCOT
,
cIMCSC
,
cIMCSCH
,
cIMDIV
,
cIMEXP
,
cIMLN
,
cIMLOG10
,
cIMLOG2
,
cIMPOWER
,
cIMPRODUCT
,
cIMREAL
,
cIMSEC
,
cIMSECH
,
cIMSIN
,
cIMSINH
,
cIMSQRT
,
cIMSUB
,
cIMSUM
,
cIMTAN
,
cOCT2BIN
,
cOCT2DEC
,
cOCT2HEX
);
cFormulaFunctionGroup
[
'
NotRealised
'
]
=
cFormulaFunctionGroup
[
'
NotRealised
'
]
||
[];
cFormulaFunctionGroup
[
'
NotRealised
'
].
push
(
cBESSELI
,
cBESSELJ
,
cBESSELK
,
cBESSELY
,
cCONVERT
);
/**
* @constructor
* @extends {AscCommonExcel.cBaseFunction}
...
...
cell/model/FormulaObjects/lookupandreferenceFunctions.js
View file @
e65898f4
...
...
@@ -71,6 +71,9 @@
cFormulaFunctionGroup
[
'
LookupAndReference
'
].
push
(
cADDRESS
,
cAREAS
,
cCHOOSE
,
cCOLUMN
,
cCOLUMNS
,
cGETPIVOTDATA
,
cHLOOKUP
,
cHYPERLINK
,
cINDEX
,
cINDIRECT
,
cLOOKUP
,
cMATCH
,
cOFFSET
,
cROW
,
cROWS
,
cRTD
,
cTRANSPOSE
,
cVLOOKUP
);
cFormulaFunctionGroup
[
'
NotRealised
'
]
=
cFormulaFunctionGroup
[
'
NotRealised
'
]
||
[];
cFormulaFunctionGroup
[
'
NotRealised
'
].
push
(
cAREAS
,
cGETPIVOTDATA
,
cHYPERLINK
,
cRTD
);
function
searchRegExp
(
str
,
flags
)
{
var
vFS
=
str
.
replace
(
/
(\\)
/g
,
"
\\
"
)
...
...
cell/model/FormulaObjects/mathematicFunctions.js
View file @
e65898f4
...
...
@@ -63,6 +63,9 @@
cSIGN
,
cSIN
,
cSINH
,
cSQRT
,
cSQRTPI
,
cSUBTOTAL
,
cSUM
,
cSUMIF
,
cSUMIFS
,
cSUMPRODUCT
,
cSUMSQ
,
cSUMX2MY2
,
cSUMX2PY2
,
cSUMXMY2
,
cTAN
,
cTANH
,
cTRUNC
);
cFormulaFunctionGroup
[
'
NotRealised
'
]
=
cFormulaFunctionGroup
[
'
NotRealised
'
]
||
[];
cFormulaFunctionGroup
[
'
NotRealised
'
].
push
(
cECMA_CEILING
);
var
cSubTotalFunctionType
=
{
includes
:
{
AVERAGE
:
1
,
COUNT
:
2
,
COUNTA
:
3
,
MAX
:
4
,
MIN
:
5
,
PRODUCT
:
6
,
STDEV
:
7
,
STDEVP
:
8
,
SUM
:
9
,
VAR
:
10
,
VARP
:
11
...
...
cell/model/FormulaObjects/parserFormula.js
View file @
e65898f4
...
...
@@ -3140,8 +3140,9 @@ var cFormulaOperators = {
b
=
new
AscCommon
.
asc_CFormulaGroup
(
type
);
for
(
var
i
=
0
;
i
<
cFormulaFunctionGroup
[
type
].
length
;
++
i
)
{
a
=
new
cFormulaFunctionGroup
[
type
][
i
]();
if
(
a
.
getInfo
)
{
f
=
new
AscCommon
.
asc_CFormula
(
a
.
getInfo
());
//cFormulaFunctionGroup['NotRealised'] - массив ещё не реализованных формул
if
(
-
1
===
cFormulaFunctionGroup
[
'
NotRealised
'
].
indexOf
(
cFormulaFunctionGroup
[
type
][
i
]))
{
f
=
new
AscCommon
.
asc_CFormula
(
a
);
b
.
asc_addFormulaElement
(
f
);
cFormulaFunction
[
f
.
asc_getName
()]
=
cFormulaFunctionGroup
[
type
][
i
];
}
...
...
cell/model/FormulaObjects/statisticalFunctions.js
View file @
e65898f4
...
...
@@ -60,14 +60,20 @@
var
maxGammaArgument
=
171.624376956302
;
cFormulaFunctionGroup
[
'
Statistical
'
]
=
cFormulaFunctionGroup
[
'
Statistical
'
]
||
[];
cFormulaFunctionGroup
[
'
Statistical
'
].
push
(
cAVEDEV
,
cAVERAGE
,
cAVERAGEA
,
cAVERAGEIF
,
cAVERAGEIFS
,
cBETADIST
,
cBETA_DIST
,
cBETA_INV
,
cBINOMDIST
,
cCHIDIST
,
cCHIINV
,
cCHISQ_DIST
,
cCHISQ_DIST_RT
,
cCHISQ_INV
,
cCHISQ_INV_RT
,
cCHITEST
,
cCONFIDENCE
,
cCORREL
,
cCOUNT
,
cCOUNTA
,
cCOUNTBLANK
,
cCOUNTIF
,
cCOUNTIFS
,
cCOVAR
,
cCRITBINOM
,
cDEVSQ
,
cEXPON_DIST
,
cEXPONDIST
,
cFDIST
,
cF_DIST
,
cF_DIST_RT
,
cF_INV
,
cFINV
,
cF_INV_RT
,
cFISHER
,
cFISHERINV
,
cFORECAST
,
cFREQUENCY
,
cFTEST
,
cGAMMA
,
cGAMMA_DIST
,
cGAMMADIST
,
cGAMMA_INV
,
cGAMMAINV
,
cGAMMALN
,
cGAMMALN_PRECISE
,
cGAUSS
,
cGEOMEAN
,
cGROWTH
,
cHARMEAN
,
cHYPGEOMDIST
,
cINTERCEPT
,
cKURT
,
cLARGE
,
cLINEST
,
cLOGEST
,
cLOGINV
,
cLOGNORM_DIST
,
cLOGNORM_INV
,
cLOGNORMDIST
,
cMAX
,
cMAXA
,
cMEDIAN
,
cMIN
,
cMINA
,
cMODE
,
cNEGBINOMDIST
,
cNORMDIST
,
cNORMINV
,
cNORMSDIST
,
cNORMSINV
,
cPEARSON
,
cPERCENTILE
,
cPERCENTRANK
,
cPERMUT
,
cPOISSON
,
cPROB
,
cQUARTILE
,
cRANK
,
cRSQ
,
cSKEW
,
cSLOPE
,
cSMALL
,
cSTANDARDIZE
,
cSTDEV
,
cSTDEVA
,
cSTDEVP
,
cSTDEVPA
,
cSTEYX
,
cTDIST
,
cT_DIST
,
cT_DIST_2T
,
cT_DIST_RT
,
cT_INV
,
cT_INV_2T
,
cTINV
,
cTREND
,
cTRIMMEAN
,
cTTEST
,
cVAR
,
cVARA
,
cVARP
,
cVARPA
,
cWEIBULL
,
cZTEST
);
cFormulaFunctionGroup
[
'
Statistical
'
].
push
(
cAVEDEV
,
cAVERAGE
,
cAVERAGEA
,
cAVERAGEIF
,
cAVERAGEIFS
,
cBETADIST
,
cBETA_DIST
,
cBETA_INV
,
cBINOMDIST
,
cCHIDIST
,
cCHIINV
,
cCHISQ_DIST
,
cCHISQ_DIST_RT
,
cCHISQ_INV
,
cCHISQ_INV_RT
,
cCHITEST
,
cCONFIDENCE
,
cCORREL
,
cCOUNT
,
cCOUNTA
,
cCOUNTBLANK
,
cCOUNTIF
,
cCOUNTIFS
,
cCOVAR
,
cCRITBINOM
,
cDEVSQ
,
cEXPON_DIST
,
cEXPONDIST
,
cFDIST
,
cF_DIST
,
cF_DIST_RT
,
cF_INV
,
cFINV
,
cF_INV_RT
,
cFISHER
,
cFISHERINV
,
cFORECAST
,
cFREQUENCY
,
cFTEST
,
cGAMMA
,
cGAMMA_DIST
,
cGAMMADIST
,
cGAMMA_INV
,
cGAMMAINV
,
cGAMMALN
,
cGAMMALN_PRECISE
,
cGAUSS
,
cGEOMEAN
,
cGROWTH
,
cHARMEAN
,
cHYPGEOMDIST
,
cINTERCEPT
,
cKURT
,
cLARGE
,
cLINEST
,
cLOGEST
,
cLOGINV
,
cLOGNORM_DIST
,
cLOGNORM_INV
,
cLOGNORMDIST
,
cMAX
,
cMAXA
,
cMEDIAN
,
cMIN
,
cMINA
,
cMODE
,
cNEGBINOMDIST
,
cNORMDIST
,
cNORMINV
,
cNORMSDIST
,
cNORMSINV
,
cPEARSON
,
cPERCENTILE
,
cPERCENTRANK
,
cPERMUT
,
cPOISSON
,
cPROB
,
cQUARTILE
,
cRANK
,
cRSQ
,
cSKEW
,
cSLOPE
,
cSMALL
,
cSTANDARDIZE
,
cSTDEV
,
cSTDEVA
,
cSTDEVP
,
cSTDEVPA
,
cSTEYX
,
cTDIST
,
cT_DIST
,
cT_DIST_2T
,
cT_DIST_RT
,
cT_INV
,
cT_INV_2T
,
cTINV
,
cTREND
,
cTRIMMEAN
,
cTTEST
,
cVAR
,
cVARA
,
cVARP
,
cVARPA
,
cWEIBULL
,
cZTEST
);
cFormulaFunctionGroup
[
'
NotRealised
'
]
=
cFormulaFunctionGroup
[
'
NotRealised
'
]
||
[];
cFormulaFunctionGroup
[
'
NotRealised
'
].
push
(
cCHITEST
,
cFDIST
,
cFTEST
,
cGROWTH
,
cLINEST
,
cLOGEST
,
cRANK
,
cTREND
,
cTRIMMEAN
,
cTTEST
,
cWEIBULL
,
cZTEST
);
function
isInteger
(
value
)
{
return
typeof
value
===
'
number
'
&&
isFinite
(
value
)
&&
Math
.
floor
(
value
)
===
value
;
...
...
cell/model/FormulaObjects/textanddataFunctions.js
View file @
e65898f4
...
...
@@ -61,6 +61,9 @@
cFIND
,
cFINDB
,
cFIXED
,
cJIS
,
cLEFT
,
cLEFTB
,
cLEN
,
cLENB
,
cLOWER
,
cMID
,
cMIDB
,
cNUMBERVALUE
,
cPHONETIC
,
cPROPER
,
cREPLACE
,
cREPLACEB
,
cREPT
,
cRIGHT
,
cRIGHTB
,
cSEARCH
,
cSEARCHB
,
cSUBSTITUTE
,
cT
,
cTEXT
,
cTRIM
,
cUPPER
,
cVALUE
);
cFormulaFunctionGroup
[
'
NotRealised
'
]
=
cFormulaFunctionGroup
[
'
NotRealised
'
]
||
[];
cFormulaFunctionGroup
[
'
NotRealised
'
].
push
(
cASC
,
cBAHTTEXT
,
cJIS
,
cPHONETIC
);
/**
* @constructor
* @extends {AscCommonExcel.cBaseFunction}
...
...
common/AdvancedOptions.js
View file @
e65898f4
...
...
@@ -157,7 +157,6 @@
/** @constructor */
function
asc_CFormula
(
o
){
this
.
name
=
o
.
name
;
this
.
arg
=
o
.
args
;
}
asc_CFormula
.
prototype
.
asc_getName
=
function
()
{
return
this
.
name
;
...
...
@@ -165,9 +164,6 @@
asc_CFormula
.
prototype
.
asc_getLocaleName
=
function
()
{
return
AscCommonExcel
.
cFormulaFunctionToLocale
?
AscCommonExcel
.
cFormulaFunctionToLocale
[
this
.
name
]
:
this
.
name
;
};
asc_CFormula
.
prototype
.
asc_getArguments
=
function
()
{
return
this
.
arg
;
};
//----------------------------------------------------------export----------------------------------------------------
var
prot
;
...
...
@@ -227,6 +223,5 @@
prot
=
asc_CFormula
.
prototype
;
prot
[
"
asc_getName
"
]
=
prot
.
asc_getName
;
prot
[
"
asc_getLocaleName
"
]
=
prot
.
asc_getLocaleName
;
prot
[
"
asc_getArguments
"
]
=
prot
.
asc_getArguments
;
}
)(
window
);
\ No newline at end of file
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