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(sheet-formula): fix error message on missing formula (#1885)
Univer0ab866e2f666
diff --git a/packages/engine-formula/src/engine/analysis/__tests__/parser.spec.ts b/packages/engine-formula/src/engine/analysis/__tests__/parser.spec.tsindex ab40399809..eb15315d2f 100644--- a/packages/engine-formula/src/engine/analysis/__tests__/parser.spec.ts+++ b/packages/engine-formula/src/engine/analysis/__tests__/parser.spec.ts@@ -176,5 +176,25 @@ describe('Test indirect', () => {expect((result as BaseValueObject).getValue()).toStrictEqual(4);});++ it('Reference column', async () => {+ const lexerNode = lexer.treeBuilder('=sum(A:A)');++ const astNode = astTreeBuilder.parse(lexerNode as LexerNode);++ const result = interpreter.execute(astNode as BaseAstNode);++ expect((result as BaseValueObject).getValue()).toStrictEqual(5);+ });++ it('Not exist formula', async () => {+ const lexerNode = lexer.treeBuilder('=notExistFormula(A: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/analysis/parser.ts b/packages/engine-formula/src/engine/analysis/parser.tsindex 1d9ea6af3b..08445fe92f 100644--- a/packages/engine-formula/src/engine/analysis/parser.ts+++ b/packages/engine-formula/src/engine/analysis/parser.ts@@ -232,7 +232,7 @@ export class AstTreeBuilder extends Disposable {currentAstNode = this._checkAstNode(lexerNode);if (currentAstNode == null) {// console.log('error2', currentAstNode, lexerNode);- return ErrorNode.create(ErrorType.ERROR);+ return ErrorNode.create(ErrorType.NAME);}// currentAstNode.setParent(parent);diff --git a/packages/engine-formula/src/engine/ast-node/reference-node.ts b/packages/engine-formula/src/engine/ast-node/reference-node.tsindex 57b78f20ea..130b7691a6 100644--- a/packages/engine-formula/src/engine/ast-node/reference-node.ts+++ b/packages/engine-formula/src/engine/ast-node/reference-node.ts@@ -137,10 +137,12 @@ export class ReferenceNodeFactory extends BaseAstNodeFactory {let node: Nullable<ReferenceNode>;if (new RegExp(REFERENCE_SINGLE_RANGE_REGEX).test(tokenTrim)) {node = new ReferenceNode(this._injector, tokenTrim, new CellReferenceObject(tokenTrim), isPrepareMerge);- } else if (isLexerNode && new RegExp(REFERENCE_REGEX_SINGLE_ROW).test(tokenTrim)) {- node = new ReferenceNode(this._injector, tokenTrim, new RowReferenceObject(tokenTrim), isPrepareMerge);- } else if (isLexerNode && new RegExp(REFERENCE_REGEX_SINGLE_COLUMN).test(tokenTrim)) {- node = new ReferenceNode(this._injector, tokenTrim, new ColumnReferenceObject(tokenTrim), isPrepareMerge);+ } else if (isLexerNode && this._checkParentIsUnionOperator(param as LexerNode)) {+ if (new RegExp(REFERENCE_REGEX_SINGLE_ROW).test(tokenTrim)) {+ node = new ReferenceNode(this._injector, tokenTrim, new RowReferenceObject(tokenTrim), isPrepareMerge);+ } else if (new RegExp(REFERENCE_REGEX_SINGLE_COLUMN).test(tokenTrim)) {+ node = new ReferenceNode(this._injector, tokenTrim, new ColumnReferenceObject(tokenTrim), isPrepareMerge);+ }} else {const unitId = this._formulaRuntimeService.currentUnitId;// parserDataLoader.get@@ -173,4 +175,8 @@ export class ReferenceNodeFactory extends BaseAstNodeFactory {return node;}}++ private _checkParentIsUnionOperator(param: LexerNode) {+ return param.getParent()?.getParent()?.getToken().trim() === matchToken.COLON;+ }}