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(engine-formula): make UNIQUE text comparison case-insensitive (#7925)
wpxp123456b7f113e897aa
diff --git a/packages/engine-formula/src/functions/lookup/unique/__tests__/index.spec.ts b/packages/engine-formula/src/functions/lookup/unique/__tests__/index.spec.tsindex f0a40d2038..57184c543e 100644--- a/packages/engine-formula/src/functions/lookup/unique/__tests__/index.spec.ts+++ b/packages/engine-formula/src/functions/lookup/unique/__tests__/index.spec.ts@@ -27,6 +27,99 @@ describe('Test unique function', () => {const testFunction = new Unique(FUNCTION_NAMES_LOOKUP.UNIQUE);describe('Unique', () => {+ it('deduplicates text case-insensitively and preserves the first spelling and order', () => {+ const array = ArrayValueObject.createByArray([+ ['Apfel'],+ ['apfel'],+ ['Birne'],+ ['Kiwi'],+ ['Apfel'],+ ]);++ expect(getObjectValue(testFunction.calculate(array))).toStrictEqual([+ ['Apfel'],+ ['Birne'],+ ['Kiwi'],+ ]);+ });++ it.each([false, true])('compares every cell in a row or column case-insensitively (byCol=%s)', (byCol) => {+ const values = [+ ['Apfel', 'Rot'],+ ['apfel', 'rot'],+ ['APFEL', 'Grün'],+ ['Birne', 'ROT'],+ ];+ const expected = byCol+ ? [['Apfel', 'APFEL', 'Birne'], ['Rot', 'Grün', 'ROT']]+ : [['Apfel', 'Rot'], ['APFEL', 'Grün'], ['Birne', 'ROT']];+ const array = ArrayValueObject.createByArray(values);++ const result = testFunction.calculate(byCol ? array.transpose() : array, BooleanValueObject.create(byCol));++ expect(getObjectValue(result)).toStrictEqual(expected);+ });++ it.each([false, true])('excludes all case variants when exactlyOnce is true (byCol=%s)', (byCol) => {+ const array = ArrayValueObject.createByArray([+ ['Apfel'],+ ['apfel'],+ ['Birne'],+ ['Kiwi'],+ ['Apfel'],+ ]);++ const result = testFunction.calculate(+ byCol ? array.transpose() : array,+ BooleanValueObject.create(byCol),+ BooleanValueObject.create(true)+ );++ expect(getObjectValue(result)).toStrictEqual(byCol ? [['Birne', 'Kiwi']] : [['Birne'], ['Kiwi']]);+ });++ it('returns CALC when every value has a case-insensitive duplicate and exactlyOnce is true', () => {+ const array = ArrayValueObject.createByArray([['Apfel'], ['apfel']]);++ const result = testFunction.calculate(array, BooleanValueObject.create(false), BooleanValueObject.create(true));++ expect(getObjectValue(result)).toBe(ErrorType.CALC);+ });++ it('treats wildcard characters as literal text when deduplicating', () => {+ const array = ArrayValueObject.createByArray([+ ['A*'],+ ['a*'],+ ['Apfel'],+ ['A?'],+ ['a?'],+ ['Ab'],+ ]);++ expect(getObjectValue(testFunction.calculate(array))).toStrictEqual([+ ['A*'],+ ['Apfel'],+ ['A?'],+ ['Ab'],+ ]);+ });++ it('uses shared text normalization while retaining accent distinctions', () => {+ const array = ArrayValueObject.createByArray([+ ['Straße'],+ ['STRASSE'],+ ['É'],+ ['e\u0301'],+ ['e'],+ ]);++ expect(getObjectValue(testFunction.calculate(array))).toStrictEqual([+ ['Straße'],+ ['É'],+ ['e'],+ ]);+ });+it('Value is normal', async () => {const array = ArrayValueObject.create({calculateValueList: transformToValueObject([diff --git a/packages/engine-formula/src/functions/lookup/unique/index.ts b/packages/engine-formula/src/functions/lookup/unique/index.tsindex 8db3ccf3a9..0c0e95eecb 100644--- a/packages/engine-formula/src/functions/lookup/unique/index.ts+++ b/packages/engine-formula/src/functions/lookup/unique/index.ts@@ -15,10 +15,11 @@*/import type { Nullable } from '@univerjs/core';-import type { BaseValueObject } from '../../../engine/value-object/base-value-object';import { isRealNum } from '@univerjs/core';+import type { BaseValueObject } from '../../../engine/value-object/base-value-object';import { ErrorType } from '../../../basics/error-type';import { expandArrayValueObject } from '../../../engine/utils/array-object';+import { normalizeTextForComparison } from '../../../engine/utils/compare';import { ArrayValueObject } from '../../../engine/value-object/array-value-object';import { ErrorValueObject } from '../../../engine/value-object/base-value-object';import { BooleanValueObject } from '../../../engine/value-object/primitive-object';@@ -203,8 +204,8 @@ export class Unique extends BaseFunction {if (valueObject.isNull()) {value = null;- } else if (valueObject.isString() && isRealNum(value as number)) {- value = +value;+ } else if (valueObject.isString()) {+ value = isRealNum(value as number) ? +value : normalizeTextForComparison(value as string);}if (!valueMap.has(value)) {