Build your own AI office with Univer Office SDK. Bring editing, calculation, collaboration, and file processing into your product for people and AI agents. Built on an extensible open-source core.
TypeScript boardcollaborationdocdocxexceloffce365officepdfpptpptxpresentationsdksheetslidesspreadsheetuniverwordwordprocessorworkspacexlsx
fix(formula): fix compare of range and criteria in related formulas (#4216)
wpxp123456ebf12d67b7c1
diff --git a/packages/engine-formula/src/engine/utils/value-object.ts b/packages/engine-formula/src/engine/utils/value-object.tsindex 348bfe9417..069a180db4 100644--- a/packages/engine-formula/src/engine/utils/value-object.ts+++ b/packages/engine-formula/src/engine/utils/value-object.ts@@ -199,11 +199,9 @@ export function getBooleanResults(variants: BaseValueObject[], maxRowLength: num// range must be an ArrayValueObject, criteria must be a BaseValueObjectlet resultArrayObject = valueObjectCompare(range, criteriaValueObject);- const [, criteriaStringObject] = findCompareToken(`${criteriaValueObject.getValue()}`);-// When comparing non-numbers and numbers, countifs does not take the resultif (isNumberSensitive) {- resultArrayObject = filterSameValueObjectResult(resultArrayObject as ArrayValueObject, range as ArrayValueObject, criteriaStringObject);+ resultArrayObject = filterSameValueObjectResult(resultArrayObject as ArrayValueObject, range as ArrayValueObject, criteriaValueObject);}if (booleanResults[rowIndex] === undefined) {@@ -230,11 +228,34 @@ export function getBooleanResults(variants: BaseValueObject[], maxRowLength: num* @returns*/export function filterSameValueObjectResult(array: ArrayValueObject, range: ArrayValueObject, criteria: BaseValueObject) {+ const [operator, criteriaObject] = findCompareToken(`${criteria.getValue()}`);+return array.mapValue((valueObject, r, c) => {const rangeValueObject = range.get(r, c);- if (rangeValueObject && isSameValueObjectType(rangeValueObject, criteria)) {++ if (rangeValueObject && isSameValueObjectType(rangeValueObject, criteriaObject)) {return valueObject;- } else if (rangeValueObject?.isError() && criteria.isError() && rangeValueObject.getValue() === criteria.getValue()) {+ } else if (rangeValueObject?.isNumber()) {+ if (criteriaObject.isString()) {+ const criteriaNumber = criteriaObject.convertToNumberObjectValue();++ if (criteriaNumber.isNumber()) {+ return rangeValueObject.compare(criteriaNumber, operator);+ }+ }++ return BooleanValueObject.create(false);+ } else if (criteriaObject.isNumber()) {+ if (rangeValueObject?.isString()) {+ const rangeNumber = rangeValueObject.convertToNumberObjectValue();++ if (rangeNumber.isNumber()) {+ return rangeNumber.compare(criteriaObject, operator);+ }+ }++ return BooleanValueObject.create(false);+ } else if (rangeValueObject?.isError() && criteriaObject.isError() && rangeValueObject.getValue() === criteriaObject.getValue()) {return BooleanValueObject.create(true);} else {return BooleanValueObject.create(false);diff --git a/packages/engine-formula/src/functions/__tests__/nested-functions.spec.ts b/packages/engine-formula/src/functions/__tests__/nested-functions.spec.tsindex 1e76184c0b..cea6066353 100644--- a/packages/engine-formula/src/functions/__tests__/nested-functions.spec.ts+++ b/packages/engine-formula/src/functions/__tests__/nested-functions.spec.ts@@ -41,6 +41,7 @@ import { Xlookup } from '../lookup/xlookup';import { Xmatch } from '../lookup/xmatch';import { FUNCTION_NAMES_MATH } from '../math/function-names';import { Sum } from '../math/sum';+import { Sumif } from '../math/sumif';import { Sumifs } from '../math/sumifs';import { Divided } from '../meta/divided';import { FUNCTION_NAMES_META } from '../meta/function-names';@@ -246,6 +247,26 @@ const getFunctionsTestWorkbookData = (): IWorkbookData => {t: 2,},},+ 10: {+ 0: {+ v: 1,+ t: 2,+ },+ 1: {+ v: 2,+ t: 2,+ },+ 2: {+ v: 3,+ t: 2,+ },+ },+ 11: {+ 0: {+ v: '2',+ t: 4,+ },+ },},},},@@ -308,6 +329,7 @@ describe('Test nested functions', () => {new Iferror(FUNCTION_NAMES_LOGICAL.IFERROR),new Xlookup(FUNCTION_NAMES_LOOKUP.XLOOKUP),new Max(FUNCTION_NAMES_STATISTICAL.MAX),+ new Sumif(FUNCTION_NAMES_MATH.SUMIF),new Sumifs(FUNCTION_NAMES_MATH.SUMIFS),new Edate(FUNCTION_NAMES_DATE.EDATE),new Today(FUNCTION_NAMES_DATE.TODAY),@@ -396,5 +418,36 @@ describe('Test nested functions', () => {result = calculate('=LEN(0.1+0.2)');expect(result).toStrictEqual(3);});++ it('Sumifs test, range is number, criteria is number string', () => {+ let result = calculate('=SUMIFS(A11:C11,A11:C11,"2")');+ expect(result).toStrictEqual([+ [2],+ ]);++ result = calculate('=SUMIFS(A11:C11,A11:C11,A12)');+ expect(result).toStrictEqual([+ [2],+ ]);++ result = calculate('=SUMIFS(A11:C11,A11:C11,"2",A11:C11,3)');+ expect(result).toStrictEqual([+ [0],+ ]);++ result = calculate('=SUMIFS(A11:C11,A11:C11,"2",A11:C11,2)');+ expect(result).toStrictEqual([+ [2],+ ]);++ result = calculate('=SUMIF(A11:C11,"1",A11:C11)');+ expect(result).toBe(1);++ result = calculate('=SUMIF(A11:C11,3,A11:C11)');+ expect(result).toBe(3);++ result = calculate('=SUMIF(A11:C11,A12,A11:C11)');+ expect(result).toBe(2);+ });});});diff --git a/packages/engine-formula/src/functions/math/sumif/index.ts b/packages/engine-formula/src/functions/math/sumif/index.tsindex eac0859ec4..8c76a1c8be 100644--- a/packages/engine-formula/src/functions/math/sumif/index.ts+++ b/packages/engine-formula/src/functions/math/sumif/index.ts@@ -17,7 +17,7 @@import type { BaseReferenceObject, FunctionVariantType } from '../../../engine/reference-object/base-reference-object';import type { ArrayValueObject } from '../../../engine/value-object/array-value-object';import { ErrorType } from '../../../basics/error-type';-import { findCompareToken, valueObjectCompare } from '../../../engine/utils/object-compare';+import { valueObjectCompare } from '../../../engine/utils/object-compare';import { filterSameValueObjectResult } from '../../../engine/utils/value-object';import { type BaseValueObject, ErrorValueObject } from '../../../engine/value-object/base-value-object';import { BaseFunction } from '../../base-function';@@ -70,9 +70,8 @@ export class Sumif extends BaseFunction {let resultArrayObject = valueObjectCompare(_range, criteria);- const [, criteriaStringObject] = findCompareToken(`${criteria.getValue()}`);// When comparing non-numbers and numbers, it does not take the result- resultArrayObject = filterSameValueObjectResult(resultArrayObject as ArrayValueObject, _range, criteriaStringObject);+ resultArrayObject = filterSameValueObjectResult(resultArrayObject as ArrayValueObject, _range, criteria);const rangeRowCount = _range.getRowCount();const rangeColumnCount = _range.getColumnCount();diff --git a/packages/engine-formula/src/functions/math/sumifs/index.ts b/packages/engine-formula/src/functions/math/sumifs/index.tsindex 02801a9af3..1a23837cbb 100644--- a/packages/engine-formula/src/functions/math/sumifs/index.ts+++ b/packages/engine-formula/src/functions/math/sumifs/index.ts@@ -14,10 +14,10 @@* limitations under the License.*/+import type { BaseValueObject, IArrayValueObject } from '../../../engine/value-object/base-value-object';import { ErrorType } from '../../../basics/error-type';import { calculateMaxDimensions, getBooleanResults, getErrorArray } from '../../../engine/utils/value-object';import { ArrayValueObject } from '../../../engine/value-object/array-value-object';-import type { BaseValueObject, IArrayValueObject } from '../../../engine/value-object/base-value-object';import { ErrorValueObject } from '../../../engine/value-object/base-value-object';import { BaseFunction } from '../../base-function';diff --git a/packages/engine-formula/src/functions/statistical/averageif/index.ts b/packages/engine-formula/src/functions/statistical/averageif/index.tsindex 6f53041986..d324e781bd 100644--- a/packages/engine-formula/src/functions/statistical/averageif/index.ts+++ b/packages/engine-formula/src/functions/statistical/averageif/index.ts@@ -14,12 +14,12 @@* limitations under the License.*/-import { ErrorType } from '../../../basics/error-type';import type { BaseReferenceObject, FunctionVariantType } from '../../../engine/reference-object/base-reference-object';+import type { ArrayValueObject } from '../../../engine/value-object/array-value-object';+import { ErrorType } from '../../../basics/error-type';import { createNewArray } from '../../../engine/utils/array-object';-import { findCompareToken, valueObjectCompare } from '../../../engine/utils/object-compare';+import { valueObjectCompare } from '../../../engine/utils/object-compare';import { filterSameValueObjectResult } from '../../../engine/utils/value-object';-import type { ArrayValueObject } from '../../../engine/value-object/array-value-object';import { type BaseValueObject, ErrorValueObject } from '../../../engine/value-object/base-value-object';import { BaseFunction } from '../../base-function';@@ -75,9 +75,8 @@ export class Averageif extends BaseFunction {private _handleSingleObject(range: BaseValueObject, criteria: BaseValueObject, averageRange?: BaseReferenceObject) {let resultArrayObject = valueObjectCompare(range, criteria);- const [, criteriaStringObject] = findCompareToken(`${criteria.getValue()}`);// When comparing non-numbers and numbers, it does not take the result- resultArrayObject = filterSameValueObjectResult(resultArrayObject as ArrayValueObject, range as ArrayValueObject, criteriaStringObject);+ resultArrayObject = filterSameValueObjectResult(resultArrayObject as ArrayValueObject, range as ArrayValueObject, criteria);// averageRange has the same dimensions as rangelet averageRangeArray = averageRangediff --git a/packages/engine-formula/src/functions/statistical/countif/index.ts b/packages/engine-formula/src/functions/statistical/countif/index.tsindex 638ea40e7c..a17f7bdad4 100644--- a/packages/engine-formula/src/functions/statistical/countif/index.ts+++ b/packages/engine-formula/src/functions/statistical/countif/index.ts@@ -14,10 +14,10 @@* limitations under the License.*/+import type { ArrayValueObject } from '../../../engine/value-object/array-value-object';import { ErrorType } from '../../../basics/error-type';-import { findCompareToken, valueObjectCompare } from '../../../engine/utils/object-compare';+import { valueObjectCompare } from '../../../engine/utils/object-compare';import { filterSameValueObjectResult } from '../../../engine/utils/value-object';-import type { ArrayValueObject } from '../../../engine/value-object/array-value-object';import { type BaseValueObject, ErrorValueObject } from '../../../engine/value-object/base-value-object';import { NumberValueObject } from '../../../engine/value-object/primitive-object';import { BaseFunction } from '../../base-function';@@ -46,9 +46,8 @@ export class Countif extends BaseFunction {private _handleSingleObject(range: BaseValueObject, criteria: BaseValueObject) {let resultArrayObject = valueObjectCompare(range, criteria);- const [, criteriaStringObject] = findCompareToken(`${criteria.getValue()}`);// If the condition is a numeric comparison, only numbers are counted, otherwise text is counted.- resultArrayObject = filterSameValueObjectResult(resultArrayObject as ArrayValueObject, range as ArrayValueObject, criteriaStringObject);+ resultArrayObject = filterSameValueObjectResult(resultArrayObject as ArrayValueObject, range as ArrayValueObject, criteria);const picked = (range as ArrayValueObject).pick(resultArrayObject as ArrayValueObject);return this._countA(picked);