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): ref a1:a gets name error (#2666)
Dushusir692b30cd6eab
diff --git a/packages/engine-formula/src/basics/regex.ts b/packages/engine-formula/src/basics/regex.tsindex 783b76988e..5289252c3f 100644--- a/packages/engine-formula/src/basics/regex.ts+++ b/packages/engine-formula/src/basics/regex.ts@@ -28,21 +28,25 @@ export const ABSOLUTE_SYMBOL = '$';export const RANGE_SYMBOL = '\\s*?:\\s*?';+// Column numbers range from A to Z, and row numbers start at 1+const COLUMN_REGEX = '[A-Za-z]+';+const ROW_REGEX = '[1-9][0-9]*';+export const UNIT_NAME_SHEET_NAME_REGEX = `'?(${UNIT_NAME_REGEX})?(${SHEET_NAME_REGEX})?'?`;-export const SIMPLE_SINGLE_RANGE_REGEX = `\\${ABSOLUTE_SYMBOL}?[A-Za-z]+\\${ABSOLUTE_SYMBOL}?[0-9]+`;+export const SIMPLE_SINGLE_RANGE_REGEX = `\\${ABSOLUTE_SYMBOL}?${COLUMN_REGEX}\\${ABSOLUTE_SYMBOL}?${ROW_REGEX}`;export const REFERENCE_MULTIPLE_RANGE_REGEX = `^(${prefixToken.AT})?${UNIT_NAME_SHEET_NAME_REGEX}${SIMPLE_SINGLE_RANGE_REGEX}${RANGE_SYMBOL}${SIMPLE_SINGLE_RANGE_REGEX}$`;export const REFERENCE_SINGLE_RANGE_REGEX = `^${UNIT_NAME_SHEET_NAME_REGEX}\\s*?${SIMPLE_SINGLE_RANGE_REGEX}(${suffixToken.POUND})?$`;-export const REFERENCE_REGEX_ROW = `^${UNIT_NAME_SHEET_NAME_REGEX}\\${ABSOLUTE_SYMBOL}?[0-9]+${RANGE_SYMBOL}\\${ABSOLUTE_SYMBOL}?[0-9]+$`;+export const REFERENCE_REGEX_ROW = `^${UNIT_NAME_SHEET_NAME_REGEX}\\${ABSOLUTE_SYMBOL}?${ROW_REGEX}${RANGE_SYMBOL}\\${ABSOLUTE_SYMBOL}?${ROW_REGEX}$`;-export const REFERENCE_REGEX_COLUMN = `^${UNIT_NAME_SHEET_NAME_REGEX}\\${ABSOLUTE_SYMBOL}?[A-Za-z]+${RANGE_SYMBOL}\\${ABSOLUTE_SYMBOL}?[A-Za-z]+$`;+export const REFERENCE_REGEX_COLUMN = `^${UNIT_NAME_SHEET_NAME_REGEX}\\${ABSOLUTE_SYMBOL}?${COLUMN_REGEX}${RANGE_SYMBOL}\\${ABSOLUTE_SYMBOL}?${COLUMN_REGEX}$`;-export const REFERENCE_REGEX_SINGLE_ROW = `^${UNIT_NAME_SHEET_NAME_REGEX}\\s*?\\${ABSOLUTE_SYMBOL}?[0-9]+$`;+export const REFERENCE_REGEX_SINGLE_ROW = `^${UNIT_NAME_SHEET_NAME_REGEX}\\s*?\\${ABSOLUTE_SYMBOL}?${ROW_REGEX}$`;-export const REFERENCE_REGEX_SINGLE_COLUMN = `^${UNIT_NAME_SHEET_NAME_REGEX}\\s*?\\${ABSOLUTE_SYMBOL}?[A-Za-z]+$`;+export const REFERENCE_REGEX_SINGLE_COLUMN = `^${UNIT_NAME_SHEET_NAME_REGEX}\\s*?\\${ABSOLUTE_SYMBOL}?${COLUMN_REGEX}$`;const TABLE_NAME_REGEX = '((?![~!@#$%^&*()_+<>?:,./;’,。、‘:“《》?~!@#¥%……()【】\\[\\]\\/\\\\]).)+';diff --git a/packages/engine-formula/src/engine/analysis/__tests__/parser.spec.ts b/packages/engine-formula/src/engine/analysis/__tests__/parser.spec.tsindex 0058a59aa5..b08c1419fc 100644--- a/packages/engine-formula/src/engine/analysis/__tests__/parser.spec.ts+++ b/packages/engine-formula/src/engine/analysis/__tests__/parser.spec.ts@@ -204,5 +204,15 @@ describe('Test indirect', () => {expect((result as BaseValueObject).getValue()).toStrictEqual(3);});++ it('Error #NAME?', async () => {+ const lexerNode = lexer.treeBuilder('=A1:A');++ const astNode = astTreeBuilder.parse(lexerNode as LexerNode);++ const result = interpreter.execute(astNode as BaseAstNode);++ expect((result as BaseValueObject).getValue()).toStrictEqual(ErrorType.NAME);+ });});});diff --git a/packages/engine-formula/src/engine/ast-node/union-node.ts b/packages/engine-formula/src/engine/ast-node/union-node.tsindex 4bba4656d5..a44885903e 100644--- a/packages/engine-formula/src/engine/ast-node/union-node.ts+++ b/packages/engine-formula/src/engine/ast-node/union-node.ts@@ -76,7 +76,8 @@ export class UnionNode extends BaseAstNode {return variant1.unionBy(variant2);}- return ErrorValueObject.create(ErrorType.REF);+ // =A1:A gets #NAME?+ return ErrorValueObject.create(ErrorType.NAME);}}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.tsindex b56e4016b3..3ab5ef9fd4 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@@ -18,7 +18,7 @@ import { describe, expect, it } from 'vitest';import { ErrorType } from '../../../../basics/error-type';import { ArrayValueObject } from '../../../../engine/value-object/array-value-object';-import type { BaseValueObject } from '../../../../engine/value-object/base-value-object';+import { type BaseValueObject, ErrorValueObject } from '../../../../engine/value-object/base-value-object';import { NumberValueObject, StringValueObject } from '../../../../engine/value-object/primitive-object';import { FUNCTION_NAMES_LOOKUP } from '../../function-names';import { Vlookup } from '../index';@@ -225,6 +225,18 @@ describe('Test vlookup', () => {expect(getObjectValue(resultObject)).toStrictEqual([[ErrorType.VALUE], [ErrorType.VALUE]]);});+ it('LookupValue is array, tableArray is error', async () => {+ const resultObject = testFunction.calculate(+ ArrayValueObject.create(/*ts*/ `{+ "Univer";+ 2+ }`),+ ErrorValueObject.create(ErrorType.NAME),+ NumberValueObject.create(2)+ ) as BaseValueObject;+ expect(getObjectValue(resultObject)).toStrictEqual(ErrorType.NAME);+ });+it('LookupValue is array, colIndexNum is array, rangeLookup is array', async () => {const resultObject = testFunction.calculate(matchArrayValueObject2.clone(),diff --git a/packages/engine-formula/src/functions/lookup/vlookup/index.ts b/packages/engine-formula/src/functions/lookup/vlookup/index.tsindex 12732ce055..1713a28b47 100644--- a/packages/engine-formula/src/functions/lookup/vlookup/index.ts+++ b/packages/engine-formula/src/functions/lookup/vlookup/index.ts@@ -40,7 +40,7 @@ export class Vlookup extends BaseFunction {}if (tableArray.isError()) {- return ErrorValueObject.create(ErrorType.REF);+ return tableArray;}if (!tableArray.isArray()) {@@ -48,11 +48,11 @@ export class Vlookup extends BaseFunction {}if (colIndexNum.isError()) {- return ErrorValueObject.create(ErrorType.NA);+ return colIndexNum;}if (rangeLookup?.isError()) {- return ErrorValueObject.create(ErrorType.NA);+ return rangeLookup;}rangeLookup = rangeLookup ?? BooleanValueObject.create(true);diff --git a/packages/sheets-formula/src/services/description.service.ts b/packages/sheets-formula/src/services/description.service.tsindex bcd7115213..966f3bf06d 100644--- a/packages/sheets-formula/src/services/description.service.ts+++ b/packages/sheets-formula/src/services/description.service.ts@@ -150,8 +150,9 @@ export class DescriptionService implements IDescriptionService, IDisposable {const functionList = this._functionService.getDescriptions();searchText = searchText.toLocaleUpperCase();functionList.forEach((item) => {- const { functionName, abstract } = item;- if (functionName.toLocaleUpperCase().indexOf(searchText) > -1) {+ const { functionName, abstract, functionType } = item;+ // Exclude DefinedName+ if ((functionName.toLocaleUpperCase().indexOf(searchText) > -1) && functionType !== FunctionType.DefinedName) {searchList.push({ name: functionName, desc: abstract });}});@@ -178,7 +179,8 @@ export class DescriptionService implements IDescriptionService, IDisposable {const functionList = this._functionService.getDescriptions();functionList.forEach((item) => {const { functionName, functionType, abstract } = item;- if (functionType === type || type === -1) {+ // Exclude DefinedName+ if ((functionType === type || type === -1) && functionType !== FunctionType.DefinedName) {searchList.push({ name: functionName, desc: abstract });}});diff --git a/packages/sheets-formula/src/services/utils.ts b/packages/sheets-formula/src/services/utils.tsindex 81499474a8..09d5408e60 100644--- a/packages/sheets-formula/src/services/utils.ts+++ b/packages/sheets-formula/src/services/utils.ts@@ -21,8 +21,9 @@ export function getFunctionTypeValues(enumObj: any,localeService: LocaleService): Array<{ label: string; value: string }> {+ // Exclude the DefinedName keyreturn Object.keys(enumObj)- .filter((key) => isNaN(Number(key)))+ .filter((key) => isNaN(Number(key)) && key !== 'DefinedName').map((key) => ({label: localeService.t(`formula.functionType.${key.toLocaleLowerCase()}`),value: `${enumObj[key]}`,diff --git a/packages/sheets-ui/src/views/status-bar/CopyableStatisticItem.tsx b/packages/sheets-ui/src/views/status-bar/CopyableStatisticItem.tsxindex 208dd44abc..aaaf601ac5 100644--- a/packages/sheets-ui/src/views/status-bar/CopyableStatisticItem.tsx+++ b/packages/sheets-ui/src/views/status-bar/CopyableStatisticItem.tsx@@ -83,7 +83,7 @@ export const CopyableStatisticItem: React.FC<IStatisticItem> = (item: IStatisticexport function formatNumber(item: IStatisticItem) {const { pattern, value: num } = item;if (typeof num !== 'number') {- return 'Invalid input';+ return 0;}if (num >= 1e8) {