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: fix where formulas reference a changed array formula range would result in abnormal updates (#6527)

wpxp123456981756801a8e
diff --git a/packages/engine-formula/src/engine/ast-node/function-node.ts b/packages/engine-formula/src/engine/ast-node/function-node.ts
index 45a852ef77..25b8978aaf 100644
--- a/packages/engine-formula/src/engine/ast-node/function-node.ts
+++ b/packages/engine-formula/src/engine/ast-node/function-node.ts
@@ -367,10 +367,14 @@ export class FunctionNode extends BaseAstNode {
referenceObject.setArrayFormulaCellData(this._currentConfigService.getArrayFormulaCellData());
+ referenceObject.setArrayFormulaRange(this._currentConfigService.getArrayFormulaRange());
+
referenceObject.setRuntimeData(this._runtimeService.getUnitData());
referenceObject.setRuntimeArrayFormulaCellData(this._runtimeService.getRuntimeArrayFormulaCellData());
+ referenceObject.setRuntimeArrayFormulaRange(this._runtimeService.getUnitArrayFormula());
+
referenceObject.setRuntimeFeatureCellData(this._runtimeService.getRuntimeFeatureCellData());
}
diff --git a/packages/engine-formula/src/engine/ast-node/reference-node.ts b/packages/engine-formula/src/engine/ast-node/reference-node.ts
index 5230c9f63e..527078e8b3 100644
--- a/packages/engine-formula/src/engine/ast-node/reference-node.ts
+++ b/packages/engine-formula/src/engine/ast-node/reference-node.ts
@@ -76,12 +76,16 @@ export class ReferenceNode extends BaseAstNode {
referenceObject.setArrayFormulaCellData(currentConfigService.getArrayFormulaCellData());
+ referenceObject.setArrayFormulaRange(currentConfigService.getArrayFormulaRange());
+
referenceObject.setRuntimeData(runtimeService.getUnitData());
referenceObject.setUnitStylesData(currentConfigService.getUnitStylesData());
referenceObject.setRuntimeArrayFormulaCellData(runtimeService.getRuntimeArrayFormulaCellData());
+ referenceObject.setRuntimeArrayFormulaRange(runtimeService.getUnitArrayFormula());
+
referenceObject.setRuntimeFeatureCellData(runtimeService.getRuntimeFeatureCellData());
const currentRow = runtimeService.currentRow;
diff --git a/packages/engine-formula/src/engine/reference-object/base-reference-object.ts b/packages/engine-formula/src/engine/reference-object/base-reference-object.ts
index d905326b83..9c7f8b8254 100644
--- a/packages/engine-formula/src/engine/reference-object/base-reference-object.ts
+++ b/packages/engine-formula/src/engine/reference-object/base-reference-object.ts
@@ -15,9 +15,9 @@
*/
import type { ICellData, IRange, Nullable } from '@univerjs/core';
-import type { IRuntimeUnitDataType, IUnitData, IUnitSheetNameMap, IUnitStylesData } from '../../basics/common';
+import type { IArrayFormulaRangeType, IRuntimeUnitDataType, IUnitData, IUnitSheetNameMap, IUnitStylesData } from '../../basics/common';
import type { BaseValueObject, IArrayValueObject } from '../value-object/base-value-object';
-import { CellValueType, isTextFormat, moveRangeByOffset } from '@univerjs/core';
+import { CellValueType, isTextFormat, moveRangeByOffset, ObjectMatrix } from '@univerjs/core';
import { FormulaAstLRU } from '../../basics/cache-lru';
import { ERROR_TYPE_SET, ErrorType } from '../../basics/error-type';
import { isNullCellForFormula } from '../../basics/is-null-cell';
@@ -69,8 +69,12 @@ export class BaseReferenceObject extends ObjectClassType {
private _arrayFormulaCellData: IRuntimeUnitDataType = {};
+ private _arrayFormulaRange: IArrayFormulaRangeType = {};
+
private _runtimeArrayFormulaCellData: IRuntimeUnitDataType = {};
+ private _runtimeArrayFormulaRange: IArrayFormulaRangeType = {};
+
private _runtimeFeatureCellData: { [featureId: string]: IRuntimeUnitDataType } = {};
private _refOffsetX = 0;
@@ -332,6 +336,14 @@ export class BaseReferenceObject extends ObjectClassType {
this._arrayFormulaCellData = unitData;
}
+ getArrayFormulaRange() {
+ return this._arrayFormulaRange;
+ }
+
+ setArrayFormulaRange(rangeData: IArrayFormulaRangeType) {
+ this._arrayFormulaRange = rangeData;
+ }
+
getRuntimeArrayFormulaCellData() {
return this._runtimeArrayFormulaCellData;
}
@@ -340,6 +352,14 @@ export class BaseReferenceObject extends ObjectClassType {
this._runtimeArrayFormulaCellData = unitData;
}
+ getRuntimeArrayFormulaRange() {
+ return this._runtimeArrayFormulaRange;
+ }
+
+ setRuntimeArrayFormulaRange(rangeData: IArrayFormulaRangeType) {
+ this._runtimeArrayFormulaRange = rangeData;
+ }
+
getRuntimeFeatureCellData() {
return this._runtimeFeatureCellData;
}
@@ -484,6 +504,14 @@ export class BaseReferenceObject extends ObjectClassType {
return this._runtimeArrayFormulaCellData?.[this.getUnitId()]?.[this.getSheetId()];
}
+ getCurrentActiveArrayFormulaRange() {
+ return this._arrayFormulaRange?.[this.getUnitId()]?.[this.getSheetId()];
+ }
+
+ getCurrentRuntimeActiveArrayFormulaRange() {
+ return this._runtimeArrayFormulaRange?.[this.getUnitId()]?.[this.getSheetId()];
+ }
+
getCellData(row: number, column: number) {
const activeSheetData = this.getCurrentActiveSheetData();
@@ -493,13 +521,39 @@ export class BaseReferenceObject extends ObjectClassType {
const activeRuntimeArrayFormulaCellData = this.getCurrentRuntimeActiveArrayFormulaCellData();
- return (
- activeRuntimeData?.getValue(row, column) ||
+ const activeArrayFormulaRangeMatrix = new ObjectMatrix<IRange>(this.getCurrentActiveArrayFormulaRange());
+
+ const activeRuntimeArrayFormulaRangeMatrix = new ObjectMatrix<IRange>(this.getCurrentRuntimeActiveArrayFormulaRange());
+
+ let cellData: Nullable<ICellData> = activeRuntimeData?.getValue(row, column) ||
activeRuntimeArrayFormulaCellData?.getValue(row, column) ||
- this.getRuntimeFeatureCellValue(row, column) ||
- activeArrayFormulaCellData?.getValue(row, column) ||
- activeSheetData?.cellData.getValue(row, column)
- );
+ this.getRuntimeFeatureCellValue(row, column);
+
+ if (cellData) {
+ return cellData;
+ }
+
+ cellData = activeArrayFormulaCellData?.getValue(row, column);
+
+ if (cellData) {
+ // Check if the cell is in the runtime array formula range. if so, do not return the original array formula cell data.
+ let isInRuntimeArrayFormulaRange = false;
+
+ activeArrayFormulaRangeMatrix.forValue((_row, _column, range) => {
+ if (row >= range.startRow && row <= range.endRow && column >= range.startColumn && column <= range.endColumn && activeRuntimeArrayFormulaRangeMatrix.getValue(_row, _column)) {
+ isInRuntimeArrayFormulaRange = true;
+ return false;
+ }
+ });
+
+ if (!isInRuntimeArrayFormulaRange) {
+ return cellData;
+ }
+
+ return null;
+ }
+
+ return activeSheetData?.cellData.getValue(row, column);
}
getRuntimeFeatureCellValue(row: number, column: number) {