Commit 092ff0e4 authored by Alexander.Trofimov's avatar Alexander.Trofimov

fix calculate COUNTIF with 3dRange

parent e62ce138
...@@ -1205,7 +1205,7 @@ ...@@ -1205,7 +1205,7 @@
arg0 = arg[k]; arg0 = arg[k];
arg1 = arg[k + 1]; arg1 = arg[k + 1];
if (cElementType.cell !== arg0.type && cElementType.cell3D !== arg0.type && if (cElementType.cell !== arg0.type && cElementType.cell3D !== arg0.type &&
cElementType.cellsRange !== arg0.type && cElementType.cellsRange3D !== arg0.type) { cElementType.cellsRange !== arg0.type && !(cElementType.cellsRange3D === arg0.type && arg0.isSingleSheet())) {
return this.value = new cError(cErrorType.wrong_value_type); return this.value = new cError(cErrorType.wrong_value_type);
} }
...@@ -1222,6 +1222,9 @@ ...@@ -1222,6 +1222,9 @@
matchingInfo = AscCommonExcel.matchingValue(arg1.toString()); matchingInfo = AscCommonExcel.matchingValue(arg1.toString());
arg1Matrix = arg0.getMatrix(); arg1Matrix = arg0.getMatrix();
if (cElementType.cellsRange3D === arg0.type) {
arg1Matrix = arg1Matrix[0];
}
if (!arg0Matrix) { if (!arg0Matrix) {
arg0Matrix = arg1Matrix; arg0Matrix = arg1Matrix;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment