Skip to content

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.

fix(formula): fix lookup related bugs (#3847)

wpxp123456ff9cf49e465d
diff --git a/packages/engine-formula/src/functions/__tests__/nested-functions.spec.ts b/packages/engine-formula/src/functions/__tests__/nested-functions.spec.ts
index a7e1fcc638..b3ffb8bb07 100644
--- a/packages/engine-formula/src/functions/__tests__/nested-functions.spec.ts
+++ b/packages/engine-formula/src/functions/__tests__/nested-functions.spec.ts
@@ -340,8 +340,19 @@ describe('Test nested functions', () => {
it('Nested functions IFERROR,XLOOKUP,MAX,SUMIFS,EDATE,TODAY,DAY,PLUS,Minus,CONCATENATE', () => {
const result = calculate('=IFERROR(XLOOKUP(MAX(SUMIFS(C2:C10, A2:A10, ">="&EDATE(TODAY(),-1)+1-DAY(TODAY()), A2:A10, "<"&TODAY()-DAY(TODAY())+1)), SUMIFS(C2:C10, A2:A10, ">="&EDATE(TODAY(),-1)+1-DAY(TODAY()), A2:A10, "<"&TODAY()-DAY(TODAY())+1), B2:B10, "No Data"), "No Data")');
- expect(result).toStrictEqual([[101], [102], [103], [104], [105], [101], [102], [103], [104]]);
+ expect(result).toStrictEqual([
+ [101],
+ [102],
+ [103],
+ [104],
+ [105],
+ [101],
+ [102],
+ [103],
+ [104],
+ ]);
});
+
it('Nested functions ADDRESS,XMATCH,MIN,SUMIFS,EDATE,TODAY,DAY', () => {
const result = calculate('=ADDRESS(XMATCH(MIN(SUMIFS(C2:C10, A2:A10, ">=" & EDATE(TODAY(), -1) + 1 - DAY(TODAY()), A2:A10, "<" & TODAY() - DAY(TODAY()) + 1)), SUMIFS(C2:C10, A2:A10, ">=" & EDATE(TODAY(), -1) + 1 - DAY(TODAY()), A2:A10, "<" & TODAY() - DAY(TODAY()) + 1), 0) + 1, 2)');
diff --git a/packages/engine-formula/src/functions/lookup/vlookup/__tests__/index.spec.ts b/packages/engine-formula/src/functions/lookup/vlookup/__tests__/index.spec.ts
index c06496d12e..dd23dccca0 100644
--- a/packages/engine-formula/src/functions/lookup/vlookup/__tests__/index.spec.ts
+++ b/packages/engine-formula/src/functions/lookup/vlookup/__tests__/index.spec.ts
@@ -207,7 +207,10 @@ describe('Test vlookup', () => {
3, 1
}`)
) as BaseValueObject;
- expect(getObjectValue(resultObject)).toStrictEqual([[ErrorType.REF], [ErrorType.REF]]); // Excel reports [[ErrorType.NA], [ErrorType.REF]]
+ expect(getObjectValue(resultObject)).toStrictEqual([
+ [ErrorType.REF],
+ [ErrorType.REF],
+ ]); // Excel reports [[ErrorType.NA], [ErrorType.REF]]
});
it('LookupValue is array and gets error, colIndexNum is array and gets error,rangeLookup gets error', async () => {
@@ -222,7 +225,10 @@ describe('Test vlookup', () => {
}`),
StringValueObject.create('rangeLookup')
) as BaseValueObject;
- expect(getObjectValue(resultObject)).toStrictEqual([[ErrorType.VALUE], [ErrorType.VALUE]]);
+ expect(getObjectValue(resultObject)).toStrictEqual([
+ [ErrorType.VALUE],
+ [ErrorType.VALUE],
+ ]);
});
it('LookupValue is array, tableArray is error', async () => {
@@ -244,7 +250,11 @@ describe('Test vlookup', () => {
colIndexNumArrayValueObject3.clone(),
rangeLookupArrayValueObject.clone()
) as BaseValueObject;
- expect(getObjectValue(resultObject)).toStrictEqual([['First', 'First', 'First', 'First'], ['Fourth', 'Fourth', 'Fourth', 'Fourth'], ['Eighth', 'Eighth', 'Eighth', 'Eighth']]);
+ expect(getObjectValue(resultObject)).toStrictEqual([
+ ['First', 'First', 'First', 'First'],
+ ['Fourth', 'Fourth', 'Fourth', 'Fourth'],
+ ['Eighth', 'Eighth', 'Eighth', 'Eighth'],
+ ]);
});
it('LookupValue is string, case sensitive', async () => {
@@ -254,7 +264,9 @@ describe('Test vlookup', () => {
NumberValueObject.create(2),
NumberValueObject.create(0)
) as BaseValueObject;
- expect(getObjectValue(resultObject)).toStrictEqual([[2]]);
+ expect(getObjectValue(resultObject)).toStrictEqual([
+ [2],
+ ]);
});
});
@@ -266,7 +278,9 @@ describe('Test vlookup', () => {
NumberValueObject.create(2),
NumberValueObject.create(1)
) as BaseValueObject;
- expect(getObjectValue(resultObject)).toStrictEqual([['Second']]);
+ expect(getObjectValue(resultObject)).toStrictEqual([
+ ['Second'],
+ ]);
});
it('Approximate search eight', async () => {
@@ -275,7 +289,9 @@ describe('Test vlookup', () => {
arrayValueObject1.clone(),
NumberValueObject.create(2)
) as BaseValueObject;
- expect(getObjectValue(resultObject)).toStrictEqual([['Eighth']]);
+ expect(getObjectValue(resultObject)).toStrictEqual([
+ ['Eighth'],
+ ]);
});
it('Approximate exceeding columns', async () => {
@@ -284,7 +300,9 @@ describe('Test vlookup', () => {
arrayValueObject1.clone(),
NumberValueObject.create(3)
) as BaseValueObject;
- expect(getObjectValue(resultObject)).toStrictEqual([[ErrorType.REF]]);
+ expect(getObjectValue(resultObject)).toStrictEqual([
+ [ErrorType.REF],
+ ]);
});
it('Approximate not match', async () => {
@@ -294,7 +312,9 @@ describe('Test vlookup', () => {
NumberValueObject.create(2),
NumberValueObject.create(1)
) as BaseValueObject;
- expect(getObjectValue(resultObject)).toStrictEqual([['Eighth']]);
+ expect(getObjectValue(resultObject)).toStrictEqual([
+ ['Eighth'],
+ ]);
});
it('Approximate not order data', async () => {
@@ -304,7 +324,9 @@ describe('Test vlookup', () => {
NumberValueObject.create(2),
NumberValueObject.create(1)
) as BaseValueObject;
- expect(getObjectValue(resultObject)).toStrictEqual([[ErrorType.NA]]);
+ expect(getObjectValue(resultObject)).toStrictEqual([
+ [ErrorType.NA],
+ ]);
});
it('Approximate not order data match', async () => {
@@ -313,7 +335,9 @@ describe('Test vlookup', () => {
arrayValueObject2.clone(),
NumberValueObject.create(2)
) as BaseValueObject;
- expect(getObjectValue(resultObject)).toStrictEqual([['Third']]);
+ expect(getObjectValue(resultObject)).toStrictEqual([
+ ['Third'],
+ ]);
});
it('Approximate order data match', async () => {
@@ -326,7 +350,9 @@ describe('Test vlookup', () => {
}`),
NumberValueObject.create(1)
) as BaseValueObject;
- expect(getObjectValue(resultObject)).toStrictEqual([[2]]);
+ expect(getObjectValue(resultObject)).toStrictEqual([
+ [2],
+ ]);
resultObject = testFunction.calculate(
NumberValueObject.create(3),
@@ -337,7 +363,9 @@ describe('Test vlookup', () => {
}`),
NumberValueObject.create(1)
) as BaseValueObject;
- expect(getObjectValue(resultObject)).toStrictEqual([[2]]);
+ expect(getObjectValue(resultObject)).toStrictEqual([
+ [2],
+ ]);
});
});
});
diff --git a/packages/engine-formula/src/functions/lookup/vlookup/index.ts b/packages/engine-formula/src/functions/lookup/vlookup/index.ts
index 28d82d38be..e5a8e1f0da 100644
--- a/packages/engine-formula/src/functions/lookup/vlookup/index.ts
+++ b/packages/engine-formula/src/functions/lookup/vlookup/index.ts
@@ -15,14 +15,14 @@
*/
import type { Nullable } from '@univerjs/core';
-import { ErrorType } from '../../../basics/error-type';
-import { createNewArray, expandArrayValueObject } from '../../../engine/utils/array-object';
import type { ArrayValueObject } from '../../../engine/value-object/array-value-object';
import type { BaseValueObject } from '../../../engine/value-object/base-value-object';
+import { ErrorType } from '../../../basics/error-type';
+import { createNewArray, expandArrayValueObject } from '../../../engine/utils/array-object';
+import { isSingleValueObject } from '../../../engine/utils/value-object';
import { ErrorValueObject } from '../../../engine/value-object/base-value-object';
import { BooleanValueObject } from '../../../engine/value-object/primitive-object';
import { BaseFunction } from '../../base-function';
-import { isSingleValueObject } from '../../../engine/utils/value-object';
export class Vlookup extends BaseFunction {
override minParams = 3;
@@ -158,12 +158,18 @@ export class Vlookup extends BaseFunction {
}
private _handleTableArray(lookupValue: BaseValueObject, tableArray: BaseValueObject, colIndexNum: BaseValueObject, rangeLookupValue: number) {
- const colIndexNumValue = this.getIndexNumValue(colIndexNum);
+ let colIndexNumValue = this.getIndexNumValue(colIndexNum);
if (colIndexNumValue instanceof ErrorValueObject) {
return colIndexNumValue;
}
+ colIndexNumValue = Math.floor(colIndexNumValue);
+
+ if (colIndexNumValue < 1) {
+ return ErrorValueObject.create(ErrorType.VALUE);
+ }
+
const searchArray = (tableArray as ArrayValueObject).slice(undefined, [0, 1]);
if (searchArray == null) {
diff --git a/packages/engine-formula/src/functions/lookup/xlookup/__tests__/index.spec.ts b/packages/engine-formula/src/functions/lookup/xlookup/__tests__/index.spec.ts
index d1f4081a12..cccf345ac8 100644
--- a/packages/engine-formula/src/functions/lookup/xlookup/__tests__/index.spec.ts
+++ b/packages/engine-formula/src/functions/lookup/xlookup/__tests__/index.spec.ts
@@ -14,8 +14,9 @@
* limitations under the License.
*/
-import { describe, expect, it } from 'vitest';
+import type { BaseValueObject } from '../../../../engine/value-object/base-value-object';
+import { describe, expect, it } from 'vitest';
import { ErrorType } from '../../../../basics/error-type';
import { ArrayValueObject } from '../../../../engine/value-object/array-value-object';
import {
@@ -23,9 +24,9 @@ import {
NumberValueObject,
StringValueObject,
} from '../../../../engine/value-object/primitive-object';
+import { getObjectValue } from '../../../__tests__/create-function-test-bed';
import { FUNCTION_NAMES_LOOKUP } from '../../function-names';
import { Xlookup } from '../index';
-import type { BaseValueObject } from '../../../../engine/value-object/base-value-object';
const arrayValueObject1 = ArrayValueObject.create(/*ts*/ `{
1, "First", 100, 89;
@@ -73,7 +74,7 @@ describe('Test xlookup', () => {
arrayValueObject1.slice(undefined, [1, 2])!,
arrayValueObject1.slice(undefined, [3, 4])!
) as BaseValueObject;
- expect(resultObject.getValue().toString()).toBe('66');
+ expect(getObjectValue(resultObject).toString()).toBe('66');
});
it('Search normal2', async () => {
@@ -82,7 +83,7 @@ describe('Test xlookup', () => {
arrayValueObject1.slice(undefined, [1, 2])!,
arrayValueObject1.slice(undefined, [0, 1])!
) as BaseValueObject;
- expect(resultObject.getValue().toString()).toBe('2');
+ expect(getObjectValue(resultObject).toString()).toBe('2');
});
it('Search horizon', async () => {
@@ -91,7 +92,7 @@ describe('Test xlookup', () => {
arrayValueObject1.transpose().slice([1, 2])!,
arrayValueObject1.transpose().slice([0, 1])!
) as BaseValueObject;
- expect(resultObject.getValue().toString()).toBe('2');
+ expect(getObjectValue(resultObject).toString()).toBe('2');
});
it('Search array', async () => {
@@ -100,7 +101,11 @@ describe('Test xlookup', () => {
arrayValueObject1.slice(undefined, [1, 2])!,
arrayValueObject1.slice(undefined, [3, 4])!
) as BaseValueObject;
- expect((resultObject as ArrayValueObject).toValue()).toStrictEqual([[82], [89], [70]]);
+ expect(getObjectValue(resultObject)).toStrictEqual([
+ [82],
+ [89],
+ [70],
+ ]);
});
it('Search across multiple columns', async () => {
@@ -109,7 +114,9 @@ describe('Test xlookup', () => {
arrayValueObject1.slice(undefined, [0, 1])!,
arrayValueObject1.slice(undefined, [1])!
) as BaseValueObject;
- expect((resultObject as ArrayValueObject).toValue()).toStrictEqual([['Fifth', 87, 69]]);
+ expect(getObjectValue(resultObject)).toStrictEqual([
+ ['Fifth', 87, 69],
+ ]);
});
});
@@ -122,7 +129,7 @@ describe('Test xlookup', () => {
NullValueObject.create(),
NumberValueObject.create(2)
) as BaseValueObject;
- expect(resultObject.getValue().toString()).toBe('66');
+ expect(getObjectValue(resultObject).toString()).toBe('66');
});
it('Approximate asc', async () => {
@@ -133,7 +140,7 @@ describe('Test xlookup', () => {
NullValueObject.create(),
NumberValueObject.create(2)
) as BaseValueObject;
- expect(resultObject.getValue().toString()).toBe('69');
+ expect(getObjectValue(resultObject).toString()).toBe('69');
});
it('Approximate desc', async () => {
@@ -145,7 +152,7 @@ describe('Test xlookup', () => {
NumberValueObject.create(2),
NumberValueObject.create(-1)
) as BaseValueObject;
- expect(resultObject.getValue().toString()).toBe('82');
+ expect(getObjectValue(resultObject).toString()).toBe('82');
});
it('match_mode is -1', async () => {
@@ -156,7 +163,7 @@ describe('Test xlookup', () => {
NullValueObject.create(),
NumberValueObject.create(-1)
) as BaseValueObject;
- expect(resultObject.getValue().toString()).toBe('800');
+ expect(getObjectValue(resultObject).toString()).toBe('800');
});
it('match_mode 1', async () => {
@@ -167,7 +174,7 @@ describe('Test xlookup', () => {
NullValueObject.create(),
NumberValueObject.create(1)
) as BaseValueObject;
- expect(resultObject.getValue().toString()).toBe('1000');
+ expect(getObjectValue(resultObject).toString()).toBe('1000');
});
it('match_mode binary asc', async () => {
@@ -180,7 +187,7 @@ describe('Test xlookup', () => {
NumberValueObject.create(0),
NumberValueObject.create(2)
) as BaseValueObject;
- expect(resultObject.getValue().toString()).toBe('0');
+ expect(getObjectValue(resultObject).toString()).toBe('0');
// match_mode 0 matched
resultObject = testFunction.calculate(
@@ -191,7 +198,7 @@ describe('Test xlookup', () => {
NumberValueObject.create(0),
NumberValueObject.create(2)
) as BaseValueObject;
- expect(resultObject.getValue().toString()).toBe('0');
+ expect(getObjectValue(resultObject).toString()).toBe('0');
// match_mode -1
resultObject = testFunction.calculate(
@@ -202,7 +209,7 @@ describe('Test xlookup', () => {
NumberValueObject.create(-1),
NumberValueObject.create(2)
) as BaseValueObject;
- expect(resultObject.getValue().toString()).toBe('2000');
+ expect(getObjectValue(resultObject).toString()).toBe('2000');
// match_mode -1 matched
resultObject = testFunction.calculate(
@@ -213,7 +220,7 @@ describe('Test xlookup', () => {
NumberValueObject.create(-1),
NumberValueObject.create(2)
) as BaseValueObject;
- expect(resultObject.getValue().toString()).toBe('0');
+ expect(getObjectValue(resultObject).toString()).toBe('0');
// match_mode 1
resultObject = testFunction.calculate(
@@ -224,7 +231,7 @@ describe('Test xlookup', () => {
NumberValueObject.create(1),
NumberValueObject.create(2)
) as BaseValueObject;
- expect(resultObject.getValue().toString()).toBe('5000');
+ expect(getObjectValue(resultObject).toString()).toBe('5000');
// match_mode 1 matched
resultObject = testFunction.calculate(
@@ -235,7 +242,7 @@ describe('Test xlookup', () => {
NumberValueObject.create(1),
NumberValueObject.create(2)
) as BaseValueObject;
- expect(resultObject.getValue().toString()).toBe('3000');
+ expect(getObjectValue(resultObject).toString()).toBe('3000');
// match_mode 2
resultObject = testFunction.calculate(
@@ -246,7 +253,7 @@ describe('Test xlookup', () => {
NumberValueObject.create(2),
NumberValueObject.create(2)
) as BaseValueObject;
- expect(resultObject.getValue().toString()).toBe(ErrorType.VALUE);
+ expect(getObjectValue(resultObject).toString()).toBe(ErrorType.VALUE);
// match_mode 2 matched
resultObject = testFunction.calculate(
@@ -257,7 +264,7 @@ describe('Test xlookup', () => {
NumberValueObject.create(2),
NumberValueObject.create(2)
) as BaseValueObject;
- expect(resultObject.getValue().toString()).toBe(ErrorType.VALUE);
+ expect(getObjectValue(resultObject).toString()).toBe(ErrorType.VALUE);
});
it('match_mode binary desc', async () => {
@@ -270,7 +277,7 @@ describe('Test xlookup', () => {
NumberValueObject.create(0),
NumberValueObject.create(-2)
) as BaseValueObject;
- expect(resultObject.getValue().toString()).toBe('0');
+ expect(getObjectValue(resultObject).toString()).toBe('0');
// match_mode 0, matched
resultObject = testFunction.calculate(
@@ -281,7 +288,7 @@ describe('Test xlookup', () => {
NumberValueObject.create(0),
NumberValueObject.create(-2)
) as BaseValueObject;
- expect(resultObject.getValue().toString()).toBe('1200');
+ expect(getObjectValue(resultObject).toString()).toBe('1200');
// match_mode -1
resultObject = testFunction.calculate(
@@ -292,7 +299,7 @@ describe('Test xlookup', () => {
NumberValueObject.create(-1),
NumberValueObject.create(-2)
) as BaseValueObject;
- expect(resultObject.getValue().toString()).toBe('2900');
+ expect(getObjectValue(resultObject).toString()).toBe('2900');
// match_mode -1 matched
resultObject = testFunction.calculate(
@@ -303,7 +310,7 @@ describe('Test xlookup', () => {
NumberValueObject.create(-1),
NumberValueObject.create(-2)
) as BaseValueObject;
- expect(resultObject.getValue().toString()).toBe('1200');
+ expect(getObjectValue(resultObject).toString()).toBe('1200');
// match_mode 1
resultObject = testFunction.calculate(
@@ -314,7 +321,7 @@ describe('Test xlookup', () => {
NumberValueObject.create(1),
NumberValueObject.create(-2)
) as BaseValueObject;
- expect(resultObject.getValue().toString()).toBe('6000');
+ expect(getObjectValue(resultObject).toString()).toBe('6000');
// match_mode 1 matched
resultObject = testFunction.calculate(
@@ -325,7 +332,7 @@ describe('Test xlookup', () => {
NumberValueObject.create(1),
NumberValueObject.create(-2)
) as BaseValueObject;
- expect(resultObject.getValue().toString()).toBe('1200');
+ expect(getObjectValue(resultObject).toString()).toBe('1200');
// match_mode 2
resultObject = testFunction.calculate(
@@ -336,7 +343,7 @@ describe('Test xlookup', () => {
NumberValueObject.create(2),
NumberValueObject.create(-2)
) as BaseValueObject;
- expect(resultObject.getValue().toString()).toBe(ErrorType.VALUE);
+ expect(getObjectValue(resultObject).toString()).toBe(ErrorType.VALUE);
// match_mode 2 matched
resultObject = testFunction.calculate(
@@ -347,7 +354,7 @@ describe('Test xlookup', () => {
NumberValueObject.create(2),
NumberValueObject.create(-2)
) as BaseValueObject;
- expect(resultObject.getValue().toString()).toBe(ErrorType.VALUE);
+ expect(getObjectValue(resultObject).toString()).toBe(ErrorType.VALUE);
});
it('match_mode search first-to-last', async () => {
@@ -360,7 +367,7 @@ describe('Test xlookup', () => {
NumberValueObject.create(0),
NumberValueObject.create(1)
) as BaseValueObject;
- expect(resultObject.getValue().toString()).toBe('0');
+ expect(getObjectValue(resultObject).toString()).toBe('0');
// match_mode 0 matched
resultObject = testFunction.calculate(
@@ -371,7 +378,7 @@ describe('Test xlookup', () => {
NumberValueObject.create(0),
NumberValueObject.create(1)
) as BaseValueObject;
- expect(resultObject.getValue().toString()).toBe('800');
+ expect(getObjectValue(resultObject).toString()).toBe('800');
// match_mode -1
resultObject = testFunction.calculate(
@@ -382,7 +389,7 @@ describe('Test xlookup', () => {
NumberValueObject.create(-1),
NumberValueObject.create(1)
) as BaseValueObject;
- expect(resultObject.getValue().toString()).toBe('2900');
+ expect(getObjectValue(resultObject).toString()).toBe('2900');
// match_mode -1 matched
resultObject = testFunction.calculate(
@@ -393,7 +400,7 @@ describe('Test xlookup', () => {
NumberValueObject.create(-1),
NumberValueObject.create(1)
) as BaseValueObject;
- expect(resultObject.getValue().toString()).toBe('800');
+ expect(getObjectValue(resultObject).toString()).toBe('800');
// match_mode 1
resultObject = testFunction.calculate(
@@ -404,7 +411,7 @@ describe('Test xlookup', () => {
NumberValueObject.create(1),
NumberValueObject.create(1)
) as BaseValueObject;
- expect(resultObject.getValue().toString()).toBe('3000');
+ expect(getObjectValue(resultObject).toString()).toBe('3000');
// match_mode 1 matched
resultObject = testFunction.calculate(
@@ -415,7 +422,7 @@ describe('Test xlookup', () => {
NumberValueObject.create(1),
NumberValueObject.create(1)
) as BaseValueObject;
- expect(resultObject.getValue().toString()).toBe('800');
+ expect(getObjectValue(resultObject).toString()).toBe('800');
// match_mode 2
resultObject = testFunction.calculate(
@@ -426,7 +433,7 @@ describe('Test xlookup', () => {
NumberValueObject.create(2),
NumberValueObject.create(1)
) as BaseValueObject;
- expect(resultObject.getValue().toString()).toBe('0');
+ expect(getObjectValue(resultObject).toString()).toBe('0');
// match_mode 2 matched
resultObject = testFunction.calculate(
@@ -437,7 +444,7 @@ describe('Test xlookup', () => {
NumberValueObject.create(2),
NumberValueObject.create(1)
) as BaseValueObject;
- expect(resultObject.getValue().toString()).toBe('800');
+ expect(getObjectValue(resultObject).toString()).toBe('800');
});
it('match_mode search last-to-first', async () => {
@@ -450,7 +457,7 @@ describe('Test xlookup', () => {
NumberValueObject.create(0),
NumberValueObject.create(-1)
) as BaseValueObject;
- expect(resultObject.getValue().toString()).toBe('0');
+ expect(getObjectValue(resultObject).toString()).toBe('0');
// match_mode 0 matched
resultObject = testFunction.calculate(
@@ -461,7 +468,7 @@ describe('Test xlookup', () => {
NumberValueObject.create(0),
NumberValueObject.create(-1)
) as BaseValueObject;
- expect(resultObject.getValue().toString()).toBe('1200');
+ expect(getObjectValue(resultObject).toString()).toBe('1200');
// match_mode -1
resultObject = testFunction.calculate(
@@ -472,7 +479,7 @@ describe('Test xlookup', () => {
NumberValueObject.create(-1),
NumberValueObject.create(-1)
) as BaseValueObject;
- expect(resultObject.getValue().toString()).toBe('2900');
+ expect(getObjectValue(resultObject).toString()).toBe('2900');
// match_mode -1 matched
resultObject = testFunction.calculate(
@@ -483,7 +490,7 @@ describe('Test xlookup', () => {
NumberValueObject.create(-1),
NumberValueObject.create(-1)
) as BaseValueObject;
- expect(resultObject.getValue().toString()).toBe('1200');
+ expect(getObjectValue(resultObject).toString()).toBe('1200');
// match_mode 1
resultObject = testFunction.calculate(
@@ -494,7 +501,7 @@ describe('Test xlookup', () => {
NumberValueObject.create(1),
NumberValueObject.create(-1)
) as BaseValueObject;
- expect(resultObject.getValue().toString()).toBe('3000');
+ expect(getObjectValue(resultObject).toString()).toBe('3000');
// match_mode 1 matched
resultObject = testFunction.calculate(
@@ -505,7 +512,7 @@ describe('Test xlookup', () => {
NumberValueObject.create(1),
NumberValueObject.create(-1)
) as BaseValueObject;
- expect(resultObject.getValue().toString()).toBe('1200');
+ expect(getObjectValue(resultObject).toString()).toBe('1200');
// match_mode 2
resultObject = testFunction.calculate(
@@ -516,7 +523,7 @@ describe('Test xlookup', () => {
NumberValueObject.create(2),
NumberValueObject.create(-1)
) as BaseValueObject;
- expect(resultObject.getValue().toString()).toBe('0');
+ expect(getObjectValue(resultObject).toString()).toBe('0');
// match_mode 2 matched
resultObject = testFunction.calculate(
@@ -527,7 +534,7 @@ describe('Test xlookup', () => {
NumberValueObject.create(2),
NumberValueObject.create(-1)
) as BaseValueObject;
- expect(resultObject.getValue().toString()).toBe('1200');
+ expect(getObjectValue(resultObject).toString()).toBe('1200');
});
});
});
diff --git a/packages/engine-formula/src/functions/lookup/xlookup/index.ts b/packages/engine-formula/src/functions/lookup/xlookup/index.ts
index d60ca9ee30..7f1b8747c8 100644
--- a/packages/engine-formula/src/functions/lookup/xlookup/index.ts
+++ b/packages/engine-formula/src/functions/lookup/xlookup/index.ts
@@ -16,19 +16,20 @@
import type { Nullable } from '@univerjs/core';
+import type { ArrayValueObject } from '../../../engine/value-object/array-value-object';
+import type { BaseValueObject } from '../../../engine/value-object/base-value-object';
import { ErrorType } from '../../../basics/error-type';
import { ArrayOrderSearchType, getMatchModeValue, getSearchModeValue } from '../../../engine/utils/compare';
import { ErrorValueObject } from '../../../engine/value-object/base-value-object';
import { NumberValueObject } from '../../../engine/value-object/primitive-object';
import { BaseFunction } from '../../base-function';
-import type { ArrayValueObject } from '../../../engine/value-object/array-value-object';
-import type { BaseValueObject } from '../../../engine/value-object/base-value-object';
export class Xlookup extends BaseFunction {
override minParams = 3;
override maxParams = 6;
+ // eslint-disable-next-line
override calculate(
lookupValue: BaseValueObject,
lookupArray: ArrayValueObject,
@@ -54,7 +55,11 @@ export class Xlookup extends BaseFunction {
const rowCountReturn = returnArray.getRowCount();
const columnCountReturn = returnArray.getColumnCount();
- if ((rowCountLookup !== 1 && columnCountLookup !== 1) || (rowCountLookup !== rowCountReturn && columnCountLookup !== columnCountReturn)) {
+ if (
+ (rowCountLookup !== 1 && columnCountLookup !== 1) ||
+ (rowCountLookup === 1 && columnCountLookup > 1 && columnCountLookup !== columnCountReturn) ||
+ (columnCountLookup === 1 && rowCountLookup > 1 && rowCountLookup !== rowCountReturn)
+ ) {
return ErrorValueObject.create(ErrorType.VALUE);
}
@@ -102,7 +107,10 @@ export class Xlookup extends BaseFunction {
rowCountReturn: number,
columnCountReturn: number
) {
- if (lookupValue.isArray()) {
+ const lookupValueRowCount = lookupValue.isArray() ? (lookupValue as ArrayValueObject).getRowCount() : 1;
+ const lookupValueColumnCount = lookupValue.isArray() ? (lookupValue as ArrayValueObject).getColumnCount() : 1;
+
+ if (lookupValueRowCount > 1 || lookupValueColumnCount > 1) {
let resultArray: Nullable<ArrayValueObject>;
if (rowCountLookup === 1) {
@@ -132,6 +140,8 @@ export class Xlookup extends BaseFunction {
});
}
+ const _lookupValue = lookupValue.isArray() ? (lookupValue as ArrayValueObject).get(0, 0) as BaseValueObject : lookupValue;
+
if (columnCountLookup === columnCountReturn && rowCountLookup === rowCountReturn) {
const checkErrorCombination = this._checkErrorCombination(matchModeValue, searchModeValue);
@@ -139,7 +149,7 @@ export class Xlookup extends BaseFunction {
return checkErrorCombination;
}
- const result = this._handleSingleObject(lookupValue, lookupArray, returnArray!, matchModeValue, searchModeValue);
+ const result = this._handleSingleObject(_lookupValue, lookupArray, returnArray!, matchModeValue, searchModeValue);
if (result.isError()) {
return ifNotFound!;
@@ -157,7 +167,7 @@ export class Xlookup extends BaseFunction {
axis = 1;
}
- const resultArray = this._handleExpandObject(lookupValue, lookupArray, returnArray, matchModeValue, searchModeValue, axis);
+ const resultArray = this._handleExpandObject(_lookupValue, lookupArray, returnArray, matchModeValue, searchModeValue, axis);
if (resultArray == null) {
return ErrorValueObject.create(ErrorType.NA);