Fix the formula calculation result issue of the OR function (qax-os#1374

) Co-authored-by: gonghaibin <gonghaibin@qq.com>
jenbonzhang · Oct 20, 2022 · 2dc0e8c · 2dc0e8c
1 parent 920ec7b
commit 2dc0e8c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/calc.go b/calc.go
@@ -11623,6 +11623,9 @@ func (fn *formulaFuncs) OR(argsList *list.List) formulaArg {
 			return newErrorFormulaArg(formulaErrorVALUE, formulaErrorVALUE)
 		case ArgNumber:
 			or = token.Number != 0
+			if or {
+				return newStringFormulaArg(strings.ToUpper(strconv.FormatBool(or)))
+			}
 		case ArgMatrix:
 			// TODO
 			return newErrorFormulaArg(formulaErrorVALUE, formulaErrorVALUE)

diff --git a/calc_test.go b/calc_test.go
@@ -1421,6 +1421,7 @@ func TestCalcCellValue(t *testing.T) {
 		"=OR(0)":                  "FALSE",
 		"=OR(1=2,2=2)":            "TRUE",
 		"=OR(1=2,2=3)":            "FALSE",
+		"=OR(1=1,2=3)":            "TRUE",
 		"=OR(\"TRUE\",\"FALSE\")": "TRUE",
 		// SWITCH
 		"=SWITCH(1,1,\"A\",2,\"B\",3,\"C\",\"N\")": "A",