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): remove throw new error (#6365)

Univer6655dd20b9e5
diff --git a/packages/engine-formula/src/engine/ast-node/prefix-node.ts b/packages/engine-formula/src/engine/ast-node/prefix-node.ts
index 2db8f8c3cb..d113691cb2 100644
--- a/packages/engine-formula/src/engine/ast-node/prefix-node.ts
+++ b/packages/engine-formula/src/engine/ast-node/prefix-node.ts
@@ -49,7 +49,9 @@ export class PrefixNode extends BaseAstNode {
let value = children[0].getValue();
let result: FunctionVariantType;
if (value == null) {
- throw new Error('object is null');
+ console.error('PrefixNode execute value is null');
+ this.setValue(ErrorValueObject.create(ErrorType.VALUE));
+ return;
}
if (this._operatorString === prefixToken.MINUS) {
diff --git a/packages/engine-formula/src/engine/ast-node/union-node.ts b/packages/engine-formula/src/engine/ast-node/union-node.ts
index e60ab8cf92..154bcf7abf 100644
--- a/packages/engine-formula/src/engine/ast-node/union-node.ts
+++ b/packages/engine-formula/src/engine/ast-node/union-node.ts
@@ -44,7 +44,9 @@ export class UnionNode extends BaseAstNode {
const rightNode = rightChild.getValue();
if (leftNode == null || rightNode == null) {
- throw new Error('leftNode and rightNode');
+ console.error('UnionNode execute leftNode or rightNode is null');
+ this.setValue(ErrorValueObject.create(ErrorType.VALUE));
+ return;
}
let result: FunctionVariantType;
diff --git a/packages/engine-formula/src/engine/dependency/formula-dependency.ts b/packages/engine-formula/src/engine/dependency/formula-dependency.ts
index fc8cf7d9e2..38320f7132 100644
--- a/packages/engine-formula/src/engine/dependency/formula-dependency.ts
+++ b/packages/engine-formula/src/engine/dependency/formula-dependency.ts
@@ -1337,12 +1337,13 @@ export class FormulaDependencyGenerator extends Disposable {
protected _formulaDependencyTreeModel = new Map<number, FormulaDependencyTreeModel>();
- protected _getTreeModel(treeId: number): FormulaDependencyTreeModel {
+ protected _getTreeModel(treeId: number): FormulaDependencyTreeModel | undefined {
let treeModel = this._formulaDependencyTreeModel.get(treeId);
if (!treeModel) {
const tree = this._getTreeById(treeId);
if (!tree) {
- throw new Error('FormulaDependencyTree is null');
+ console.error('FormulaDependencyTree is null for treeId:', treeId);
+ return;
}
treeModel = new FormulaDependencyTreeModel(tree);
@@ -1370,8 +1371,16 @@ export class FormulaDependencyGenerator extends Disposable {
protected _getFormulaDependencyTreeModel(tree: IFormulaDependencyTree): FormulaDependencyTreeModel {
const treeModel = this._getTreeModel(tree.treeId);
const parentIds = this._getDependencyTreeParenIds(tree);
+
+ if (!treeModel) {
+ return new FormulaDependencyTreeModel(tree);
+ }
+
for (const parentId of parentIds) {
const parentTreeModel = this._getTreeModel(parentId);
+ if (!parentTreeModel) {
+ continue;
+ }
treeModel.addParent(parentTreeModel);
parentTreeModel.addChild(treeModel);
}
@@ -1453,6 +1462,9 @@ export class FormulaDependencyGenerator extends Disposable {
const childIds = this._getDependencyTreeChildrenIds(tree);
for (const childId of childIds) {
const childTreeModel = this._getTreeModel(childId);
+ if (!childTreeModel) {
+ continue;
+ }
this._setRealFormulaString(childTreeModel);
treeModel.addChild(childTreeModel);
}
diff --git a/packages/engine-formula/src/engine/utils/generate-ast-node.ts b/packages/engine-formula/src/engine/utils/generate-ast-node.ts
index 47839ca595..48ddf22ab2 100644
--- a/packages/engine-formula/src/engine/utils/generate-ast-node.ts
+++ b/packages/engine-formula/src/engine/utils/generate-ast-node.ts
@@ -51,7 +51,8 @@ export function generateAstNode(unitId: string, formulaString: string, lexer: Le
astNode = astTreeBuilder.parse(lexerNode as LexerNode);
if (astNode == null) {
- throw new Error('astNode is null');
+ console.error('generateAstNode astNode is null');
+ return ErrorNode.create(lexerNode as ErrorType);
}
// astNode.setRefOffset(refOffsetX, refOffsetY);
diff --git a/packages/engine-formula/src/engine/utils/value-object.ts b/packages/engine-formula/src/engine/utils/value-object.ts
index bebc49dc9c..144c898c5e 100644
--- a/packages/engine-formula/src/engine/utils/value-object.ts
+++ b/packages/engine-formula/src/engine/utils/value-object.ts
@@ -451,17 +451,17 @@ export enum ReferenceObjectType {
export function getReferenceObjectFromCache(trimToken: string, type: ReferenceObjectType) {
let referenceObject: BaseReferenceObject;
switch (type) {
- case ReferenceObjectType.CELL:
- referenceObject = new CellReferenceObject(trimToken);
- break;
case ReferenceObjectType.COLUMN:
referenceObject = new ColumnReferenceObject(trimToken);
break;
case ReferenceObjectType.ROW:
referenceObject = new RowReferenceObject(trimToken);
break;
+
+ case ReferenceObjectType.CELL:
default:
- throw new Error('Unknown reference object type');
+ referenceObject = new CellReferenceObject(trimToken);
+ break;
}
return referenceObject;
diff --git a/packages/engine-formula/src/engine/value-object/array-value-object.ts b/packages/engine-formula/src/engine/value-object/array-value-object.ts
index 9ad944eacc..a66454d41b 100644
--- a/packages/engine-formula/src/engine/value-object/array-value-object.ts
+++ b/packages/engine-formula/src/engine/value-object/array-value-object.ts
@@ -283,7 +283,8 @@ export class ArrayValueObject extends BaseValueObject {
set(row: number, column: number, value: Nullable<BaseValueObject>) {
if (row >= this._rowCount || column >= this._columnCount) {
- throw new Error('Exceeding array bounds.');
+ console.error('Exceeding array bounds.');
+ return;
}
this._clearCache();