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): array formula spill error (#3673)
Dushusire8ffd23bdad2
diff --git a/packages/engine-formula/src/basics/common.ts b/packages/engine-formula/src/basics/common.tsindex 509e2b5ffd..82fc38f1b3 100644--- a/packages/engine-formula/src/basics/common.ts+++ b/packages/engine-formula/src/basics/common.ts@@ -163,6 +163,7 @@ export interface IUnitExcludedCell {export interface IFormulaDatasetConfig {formulaData: IFormulaData;arrayFormulaCellData: IArrayFormulaUnitCellType;+ arrayFormulaRange: IArrayFormulaRangeType;forceCalculate: boolean;dirtyRanges: IUnitRange[];dirtyNameMap: IDirtyUnitSheetNameMap;diff --git a/packages/engine-formula/src/controller/calculate.controller.ts b/packages/engine-formula/src/controller/calculate.controller.tsindex 01dad52f4d..a5ff778267 100644--- a/packages/engine-formula/src/controller/calculate.controller.ts+++ b/packages/engine-formula/src/controller/calculate.controller.ts@@ -113,9 +113,13 @@ export class CalculateController extends Disposable {const arrayFormulaCellData = this._formulaDataModel.getArrayFormulaCellData();+ // array formula range is used to check whether the newly added array formula conflicts with the existing array formula+ const arrayFormulaRange = this._formulaDataModel.getArrayFormulaRange();+this._calculateFormulaService.execute({formulaData,arrayFormulaCellData,+ arrayFormulaRange,forceCalculate,dirtyRanges,dirtyNameMap,diff --git a/packages/engine-formula/src/engine/analysis/__tests__/parser.spec.ts b/packages/engine-formula/src/engine/analysis/__tests__/parser.spec.tsindex a31e87dee4..092582cfd4 100644--- a/packages/engine-formula/src/engine/analysis/__tests__/parser.spec.ts+++ b/packages/engine-formula/src/engine/analysis/__tests__/parser.spec.ts@@ -61,6 +61,7 @@ describe('Test indirect', () => {formulaCurrentConfigService.load({formulaData: {},arrayFormulaCellData: {},+ arrayFormulaRange: {},forceCalculate: false,dirtyRanges: [],dirtyNameMap: {},diff --git a/packages/engine-formula/src/functions/__tests__/nested-functions.spec.ts b/packages/engine-formula/src/functions/__tests__/nested-functions.spec.tsindex f499e3c457..dbe73a6a06 100644--- a/packages/engine-formula/src/functions/__tests__/nested-functions.spec.ts+++ b/packages/engine-formula/src/functions/__tests__/nested-functions.spec.ts@@ -15,42 +15,42 @@*/import type { Injector, IWorkbookData } from '@univerjs/core';-import { beforeEach, describe, expect, it } from 'vitest';+import type { LexerNode } from '../../engine/analysis/lexer-node';+import type { BaseAstNode } from '../../engine/ast-node/base-ast-node';import { LocaleType } from '@univerjs/core';+import { beforeEach, describe, expect, it } from 'vitest';+import { ErrorType } from '../../basics/error-type';import { Lexer } from '../../engine/analysis/lexer';import { AstTreeBuilder } from '../../engine/analysis/parser';-import type { BaseAstNode } from '../../engine/ast-node/base-ast-node';import { Interpreter } from '../../engine/interpreter/interpreter';-import { Iferror } from '../logical/iferror';-import { Xlookup } from '../lookup/xlookup';-import { Max } from '../statistical/max';-import { Sumifs } from '../math/sumifs';+import { IFormulaCurrentConfigService } from '../../services/current-data.service';+import { IFunctionService } from '../../services/function.service';+import { IFormulaRuntimeService } from '../../services/runtime.service';+import { Day } from '../date/day';import { Edate } from '../date/edate';+import { FUNCTION_NAMES_DATE } from '../date/function-names';import { Today } from '../date/today';-import { Day } from '../date/day';+import { FUNCTION_NAMES_LOGICAL } from '../logical/function-names';+import { Iferror } from '../logical/iferror';import { Address } from '../lookup/address';+import { Choose } from '../lookup/choose';+import { FUNCTION_NAMES_LOOKUP } from '../lookup/function-names';+import { Xlookup } from '../lookup/xlookup';import { Xmatch } from '../lookup/xmatch';-import { Min } from '../statistical/min';-import { IFormulaCurrentConfigService } from '../../services/current-data.service';-import { IFormulaRuntimeService } from '../../services/runtime.service';-import { Plus } from '../meta/plus';+import { FUNCTION_NAMES_MATH } from '../math/function-names';+import { Sum } from '../math/sum';+import { Sumifs } from '../math/sumifs';+import { Divided } from '../meta/divided';import { FUNCTION_NAMES_META } from '../meta/function-names';import { Minus } from '../meta/minus';-import { Concatenate } from '../text/concatenate';-import { FUNCTION_NAMES_LOGICAL } from '../logical/function-names';-import { FUNCTION_NAMES_MATH } from '../math/function-names';-import { FUNCTION_NAMES_LOOKUP } from '../lookup/function-names';+import { Plus } from '../meta/plus';import { FUNCTION_NAMES_STATISTICAL } from '../statistical/function-names';-import { FUNCTION_NAMES_DATE } from '../date/function-names';+import { Max } from '../statistical/max';+import { Min } from '../statistical/min';+import { Concatenate } from '../text/concatenate';import { FUNCTION_NAMES_TEXT } from '../text/function-names';-import { IFunctionService } from '../../services/function.service';-import type { LexerNode } from '../../engine/analysis/lexer-node';-import { Choose } from '../lookup/choose';-import { Sum } from '../math/sum';-import { ErrorType } from '../../basics/error-type';import { Len } from '../text/len';-import { Divided } from '../meta/divided';import { createFunctionTestBed, getObjectValue } from './create-function-test-bed';const getFunctionsTestWorkbookData = (): IWorkbookData => {@@ -279,6 +279,7 @@ describe('Test nested functions', () => {formulaCurrentConfigService.load({formulaData: {},arrayFormulaCellData: {},+ arrayFormulaRange: {},forceCalculate: false,dirtyRanges: [],dirtyNameMap: {},diff --git a/packages/engine-formula/src/functions/compatibility/rank/__tests__/index.spec.ts b/packages/engine-formula/src/functions/compatibility/rank/__tests__/index.spec.tsindex c6e1887fd8..6c6b11bd47 100644--- a/packages/engine-formula/src/functions/compatibility/rank/__tests__/index.spec.ts+++ b/packages/engine-formula/src/functions/compatibility/rank/__tests__/index.spec.ts@@ -15,13 +15,14 @@*/import type { Injector, IWorkbookData } from '@univerjs/core';-import { beforeEach, describe, expect, it } from 'vitest';+import type { LexerNode } from '../../../../engine/analysis/lexer-node';+import type { BaseAstNode } from '../../../../engine/ast-node/base-ast-node';import { CellValueType, LocaleType } from '@univerjs/core';+import { beforeEach, describe, expect, it } from 'vitest';+import { ErrorType } from '../../../../basics/error-type';import { Lexer } from '../../../../engine/analysis/lexer';-import type { LexerNode } from '../../../../engine/analysis/lexer-node';import { AstTreeBuilder } from '../../../../engine/analysis/parser';-import type { BaseAstNode } from '../../../../engine/ast-node/base-ast-node';import { Interpreter } from '../../../../engine/interpreter/interpreter';import { IFormulaCurrentConfigService } from '../../../../services/current-data.service';import { IFunctionService } from '../../../../services/function.service';@@ -29,7 +30,6 @@ import { IFormulaRuntimeService } from '../../../../services/runtime.service';import { createFunctionTestBed, getObjectValue } from '../../../__tests__/create-function-test-bed';import { FUNCTION_NAMES_COMPATIBILITY } from '../../function-names';import { Rank } from '../index';-import { ErrorType } from '../../../../basics/error-type';const getTestWorkbookData = (): IWorkbookData => {return {@@ -104,6 +104,7 @@ describe('Test rank function', () => {formulaCurrentConfigService.load({formulaData: {},arrayFormulaCellData: {},+ arrayFormulaRange: {},forceCalculate: false,dirtyRanges: [],dirtyNameMap: {},diff --git a/packages/engine-formula/src/functions/information/cell/__tests__/index.spec.ts b/packages/engine-formula/src/functions/information/cell/__tests__/index.spec.tsindex 98319be15c..8b5ee70ba2 100644--- a/packages/engine-formula/src/functions/information/cell/__tests__/index.spec.ts+++ b/packages/engine-formula/src/functions/information/cell/__tests__/index.spec.ts@@ -15,23 +15,23 @@*/import type { Injector, IWorkbookData } from '@univerjs/core';-import { beforeEach, describe, expect, it } from 'vitest';+import type { LexerNode } from '../../../../engine/analysis/lexer-node';+import type { BaseAstNode } from '../../../../engine/ast-node/base-ast-node';+import type { ArrayValueObject } from '../../../../engine/value-object/array-value-object';+import type { BaseValueObject, ErrorValueObject } from '../../../../engine/value-object/base-value-object';import { CellValueType, LocaleType } from '@univerjs/core';+import { beforeEach, describe, expect, it } from 'vitest';+import { ErrorType } from '../../../../basics/error-type';import { Lexer } from '../../../../engine/analysis/lexer';-import type { LexerNode } from '../../../../engine/analysis/lexer-node';import { AstTreeBuilder } from '../../../../engine/analysis/parser';-import type { BaseAstNode } from '../../../../engine/ast-node/base-ast-node';import { Interpreter } from '../../../../engine/interpreter/interpreter';import { IFormulaCurrentConfigService } from '../../../../services/current-data.service';import { IFunctionService } from '../../../../services/function.service';import { IFormulaRuntimeService } from '../../../../services/runtime.service';import { createFunctionTestBed } from '../../../__tests__/create-function-test-bed';import { FUNCTION_NAMES_INFORMATION } from '../../function-names';-import type { BaseValueObject, ErrorValueObject } from '../../../../engine/value-object/base-value-object';-import type { ArrayValueObject } from '../../../../engine/value-object/array-value-object';import { Cell } from '../index';-import { ErrorType } from '../../../../basics/error-type';const getTestWorkbookData = (): IWorkbookData => {return {@@ -166,6 +166,7 @@ describe('Test cell function', () => {formulaCurrentConfigService.load({formulaData: {},arrayFormulaCellData: {},+ arrayFormulaRange: {},forceCalculate: false,dirtyRanges: [],dirtyNameMap: {},diff --git a/packages/engine-formula/src/functions/information/isformula/__tests__/index.spec.ts b/packages/engine-formula/src/functions/information/isformula/__tests__/index.spec.tsindex 8d076a13d3..3d3f4c02d0 100644--- a/packages/engine-formula/src/functions/information/isformula/__tests__/index.spec.ts+++ b/packages/engine-formula/src/functions/information/isformula/__tests__/index.spec.ts@@ -15,23 +15,23 @@*/import type { Injector, IWorkbookData } from '@univerjs/core';-import { beforeEach, describe, expect, it } from 'vitest';+import type { LexerNode } from '../../../../engine/analysis/lexer-node';+import type { BaseAstNode } from '../../../../engine/ast-node/base-ast-node';+import type { ArrayValueObject } from '../../../../engine/value-object/array-value-object';+import type { BaseValueObject, ErrorValueObject } from '../../../../engine/value-object/base-value-object';import { CellValueType, LocaleType } from '@univerjs/core';+import { beforeEach, describe, expect, it } from 'vitest';+import { ErrorType } from '../../../../basics/error-type';import { Lexer } from '../../../../engine/analysis/lexer';-import type { LexerNode } from '../../../../engine/analysis/lexer-node';import { AstTreeBuilder } from '../../../../engine/analysis/parser';-import type { BaseAstNode } from '../../../../engine/ast-node/base-ast-node';import { Interpreter } from '../../../../engine/interpreter/interpreter';import { IFormulaCurrentConfigService } from '../../../../services/current-data.service';import { IFunctionService } from '../../../../services/function.service';import { IFormulaRuntimeService } from '../../../../services/runtime.service';import { createFunctionTestBed } from '../../../__tests__/create-function-test-bed';import { FUNCTION_NAMES_INFORMATION } from '../../function-names';-import type { BaseValueObject, ErrorValueObject } from '../../../../engine/value-object/base-value-object';-import type { ArrayValueObject } from '../../../../engine/value-object/array-value-object';import { Isformula } from '../index';-import { ErrorType } from '../../../../basics/error-type';const getTestWorkbookData = (): IWorkbookData => {return {@@ -104,6 +104,7 @@ describe('Test isformula function', () => {formulaCurrentConfigService.load({formulaData: {},arrayFormulaCellData: {},+ arrayFormulaRange: {},forceCalculate: false,dirtyRanges: [],dirtyNameMap: {},diff --git a/packages/engine-formula/src/functions/information/isref/__tests__/index.spec.ts b/packages/engine-formula/src/functions/information/isref/__tests__/index.spec.tsindex 82f484bccf..7293c5c19e 100644--- a/packages/engine-formula/src/functions/information/isref/__tests__/index.spec.ts+++ b/packages/engine-formula/src/functions/information/isref/__tests__/index.spec.ts@@ -15,21 +15,21 @@*/import type { Injector, IWorkbookData } from '@univerjs/core';-import { beforeEach, describe, expect, it } from 'vitest';+import type { LexerNode } from '../../../../engine/analysis/lexer-node';+import type { BaseAstNode } from '../../../../engine/ast-node/base-ast-node';+import type { ArrayValueObject } from '../../../../engine/value-object/array-value-object';+import type { BaseValueObject, ErrorValueObject } from '../../../../engine/value-object/base-value-object';import { CellValueType, LocaleType } from '@univerjs/core';+import { beforeEach, describe, expect, it } from 'vitest';import { Lexer } from '../../../../engine/analysis/lexer';-import type { LexerNode } from '../../../../engine/analysis/lexer-node';import { AstTreeBuilder } from '../../../../engine/analysis/parser';-import type { BaseAstNode } from '../../../../engine/ast-node/base-ast-node';import { Interpreter } from '../../../../engine/interpreter/interpreter';import { IFormulaCurrentConfigService } from '../../../../services/current-data.service';import { IFunctionService } from '../../../../services/function.service';import { IFormulaRuntimeService } from '../../../../services/runtime.service';import { createFunctionTestBed } from '../../../__tests__/create-function-test-bed';import { FUNCTION_NAMES_INFORMATION } from '../../function-names';-import type { BaseValueObject, ErrorValueObject } from '../../../../engine/value-object/base-value-object';-import type { ArrayValueObject } from '../../../../engine/value-object/array-value-object';import { Isref } from '../index';const getTestWorkbookData = (): IWorkbookData => {@@ -164,6 +164,7 @@ describe('Test isref function', () => {formulaCurrentConfigService.load({formulaData: {},arrayFormulaCellData: {},+ arrayFormulaRange: {},forceCalculate: false,dirtyRanges: [],dirtyNameMap: {},diff --git a/packages/engine-formula/src/functions/lookup/column/__tests__/index.spec.ts b/packages/engine-formula/src/functions/lookup/column/__tests__/index.spec.tsindex d358c7f23b..e84a9c42f2 100644--- a/packages/engine-formula/src/functions/lookup/column/__tests__/index.spec.ts+++ b/packages/engine-formula/src/functions/lookup/column/__tests__/index.spec.ts@@ -15,12 +15,15 @@*/import type { Injector } from '@univerjs/core';-import { beforeEach, describe, expect, it } from 'vitest';+import type { LexerNode } from '../../../../engine/analysis/lexer-node';+import type { BaseAstNode } from '../../../../engine/ast-node/base-ast-node';+import type { ArrayValueObject } from '../../../../engine/value-object/array-value-object';+import type { BaseValueObject, ErrorValueObject } from '../../../../engine/value-object/base-value-object';+import { beforeEach, describe, expect, it } from 'vitest';+import { ErrorType } from '../../../../basics/error-type';import { Lexer } from '../../../../engine/analysis/lexer';-import type { LexerNode } from '../../../../engine/analysis/lexer-node';import { AstTreeBuilder } from '../../../../engine/analysis/parser';-import type { BaseAstNode } from '../../../../engine/ast-node/base-ast-node';import { Interpreter } from '../../../../engine/interpreter/interpreter';import { IFormulaCurrentConfigService } from '../../../../services/current-data.service';import { IFunctionService } from '../../../../services/function.service';@@ -28,9 +31,6 @@ import { IFormulaRuntimeService } from '../../../../services/runtime.service';import { createFunctionTestBed } from '../../../__tests__/create-function-test-bed';import { FUNCTION_NAMES_LOOKUP } from '../../function-names';import { Column } from '../index';-import type { BaseValueObject, ErrorValueObject } from '../../../../engine/value-object/base-value-object';-import { ErrorType } from '../../../../basics/error-type';-import type { ArrayValueObject } from '../../../../engine/value-object/array-value-object';describe('Test column', () => {let get: Injector['get'];@@ -56,6 +56,7 @@ describe('Test column', () => {formulaCurrentConfigService.load({formulaData: {},arrayFormulaCellData: {},+ arrayFormulaRange: {},forceCalculate: false,dirtyRanges: [],dirtyNameMap: {},diff --git a/packages/engine-formula/src/functions/lookup/columns/__tests__/index.spec.ts b/packages/engine-formula/src/functions/lookup/columns/__tests__/index.spec.tsindex c507ac672e..93a4679189 100644--- a/packages/engine-formula/src/functions/lookup/columns/__tests__/index.spec.ts+++ b/packages/engine-formula/src/functions/lookup/columns/__tests__/index.spec.ts@@ -15,12 +15,14 @@*/import type { Injector } from '@univerjs/core';-import { beforeEach, describe, expect, it } from 'vitest';+import type { LexerNode } from '../../../../engine/analysis/lexer-node';+import type { BaseAstNode } from '../../../../engine/ast-node/base-ast-node';+import type { BaseValueObject, ErrorValueObject } from '../../../../engine/value-object/base-value-object';+import { beforeEach, describe, expect, it } from 'vitest';+import { ErrorType } from '../../../../basics/error-type';import { Lexer } from '../../../../engine/analysis/lexer';-import type { LexerNode } from '../../../../engine/analysis/lexer-node';import { AstTreeBuilder } from '../../../../engine/analysis/parser';-import type { BaseAstNode } from '../../../../engine/ast-node/base-ast-node';import { Interpreter } from '../../../../engine/interpreter/interpreter';import { IFormulaCurrentConfigService } from '../../../../services/current-data.service';import { IFunctionService } from '../../../../services/function.service';@@ -28,8 +30,6 @@ import { IFormulaRuntimeService } from '../../../../services/runtime.service';import { createFunctionTestBed } from '../../../__tests__/create-function-test-bed';import { FUNCTION_NAMES_LOOKUP } from '../../function-names';import { Columns } from '../index';-import type { BaseValueObject, ErrorValueObject } from '../../../../engine/value-object/base-value-object';-import { ErrorType } from '../../../../basics/error-type';describe('Test columns', () => {let get: Injector['get'];@@ -55,6 +55,7 @@ describe('Test columns', () => {formulaCurrentConfigService.load({formulaData: {},arrayFormulaCellData: {},+ arrayFormulaRange: {},forceCalculate: false,dirtyRanges: [],dirtyNameMap: {},diff --git a/packages/engine-formula/src/functions/lookup/index/__test__/index.spec.ts b/packages/engine-formula/src/functions/lookup/index/__test__/index.spec.tsindex 5e1d2c3c1d..dedfcffe5c 100644--- a/packages/engine-formula/src/functions/lookup/index/__test__/index.spec.ts+++ b/packages/engine-formula/src/functions/lookup/index/__test__/index.spec.ts@@ -15,13 +15,14 @@*/import type { Injector, IWorkbookData } from '@univerjs/core';-import { beforeEach, describe, expect, it } from 'vitest';+import type { LexerNode } from '../../../../engine/analysis/lexer-node';+import type { BaseAstNode } from '../../../../engine/ast-node/base-ast-node';import { CellValueType, LocaleType } from '@univerjs/core';+import { beforeEach, describe, expect, it } from 'vitest';+import { ErrorType } from '../../../../basics/error-type';import { Lexer } from '../../../../engine/analysis/lexer';-import type { LexerNode } from '../../../../engine/analysis/lexer-node';import { AstTreeBuilder } from '../../../../engine/analysis/parser';-import type { BaseAstNode } from '../../../../engine/ast-node/base-ast-node';import { Interpreter } from '../../../../engine/interpreter/interpreter';import { IFormulaCurrentConfigService } from '../../../../services/current-data.service';import { IFunctionService } from '../../../../services/function.service';@@ -29,7 +30,6 @@ import { IFormulaRuntimeService } from '../../../../services/runtime.service';import { createFunctionTestBed, getObjectValue } from '../../../__tests__/create-function-test-bed';import { FUNCTION_NAMES_LOOKUP } from '../../function-names';import { Index } from '../index';-import { ErrorType } from '../../../../basics/error-type';const getTestWorkbookData = (): IWorkbookData => {return {@@ -163,6 +163,7 @@ describe('Test index', () => {formulaCurrentConfigService.load({formulaData: {},arrayFormulaCellData: {},+ arrayFormulaRange: {},forceCalculate: false,dirtyRanges: [],dirtyNameMap: {},diff --git a/packages/engine-formula/src/functions/lookup/indirect/__test__/index.spec.ts b/packages/engine-formula/src/functions/lookup/indirect/__test__/index.spec.tsindex 8cc9c7dd54..8da095b7d4 100644--- a/packages/engine-formula/src/functions/lookup/indirect/__test__/index.spec.ts+++ b/packages/engine-formula/src/functions/lookup/indirect/__test__/index.spec.ts@@ -15,16 +15,16 @@*/import type { Injector } from '@univerjs/core';-import { beforeEach, describe, expect, it } from 'vitest';+import type { LexerNode } from '../../../../engine/analysis/lexer-node';+import type { BaseAstNode } from '../../../../engine/ast-node/base-ast-node';+import type { BaseReferenceObject } from '../../../../engine/reference-object/base-reference-object';+import type { ArrayValueObject } from '../../../../engine/value-object/array-value-object';+import { beforeEach, describe, expect, it } from 'vitest';import { ErrorType } from '../../../../basics/error-type';import { Lexer } from '../../../../engine/analysis/lexer';-import type { LexerNode } from '../../../../engine/analysis/lexer-node';import { AstTreeBuilder } from '../../../../engine/analysis/parser';-import type { BaseAstNode } from '../../../../engine/ast-node/base-ast-node';import { Interpreter } from '../../../../engine/interpreter/interpreter';-import type { BaseReferenceObject } from '../../../../engine/reference-object/base-reference-object';-import type { ArrayValueObject } from '../../../../engine/value-object/array-value-object';import { IFormulaCurrentConfigService } from '../../../../services/current-data.service';import { IFunctionService } from '../../../../services/function.service';import { IFormulaRuntimeService } from '../../../../services/runtime.service';@@ -59,6 +59,7 @@ describe('Test indirect', () => {formulaCurrentConfigService.load({formulaData: {},arrayFormulaCellData: {},+ arrayFormulaRange: {},forceCalculate: false,dirtyRanges: [],dirtyNameMap: {},diff --git a/packages/engine-formula/src/functions/lookup/offset/__tests__/index.spec.ts b/packages/engine-formula/src/functions/lookup/offset/__tests__/index.spec.tsindex 13c2dd9595..564e072f08 100644--- a/packages/engine-formula/src/functions/lookup/offset/__tests__/index.spec.ts+++ b/packages/engine-formula/src/functions/lookup/offset/__tests__/index.spec.ts@@ -14,10 +14,12 @@* limitations under the License.*/+import type { Injector, IWorkbookData } from '@univerjs/core';+import type { LexerNode } from '../../../../engine/analysis/lexer-node';++import type { BaseAstNode } from '../../../../engine/ast-node/base-ast-node';import { CellValueType, LocaleType } from '@univerjs/core';import { beforeEach, describe, expect, it } from 'vitest';--import type { Injector, IWorkbookData } from '@univerjs/core';import { ErrorType } from '../../../../basics/error-type';import { Lexer } from '../../../../engine/analysis/lexer';import { AstTreeBuilder } from '../../../../engine/analysis/parser';@@ -28,8 +30,6 @@ import { IFormulaRuntimeService } from '../../../../services/runtime.service';import { createFunctionTestBed, getObjectValue } from '../../../__tests__/create-function-test-bed';import { FUNCTION_NAMES_LOOKUP } from '../../function-names';import { Offset } from '../index';-import type { LexerNode } from '../../../../engine/analysis/lexer-node';-import type { BaseAstNode } from '../../../../engine/ast-node/base-ast-node';const getTestWorkbookData = (): IWorkbookData => {return {@@ -158,6 +158,7 @@ describe('Test offset', () => {formulaCurrentConfigService.load({formulaData: {},arrayFormulaCellData: {},+ arrayFormulaRange: {},forceCalculate: false,dirtyRanges: [],dirtyNameMap: {},diff --git a/packages/engine-formula/src/functions/lookup/row/__tests__/index.spec.ts b/packages/engine-formula/src/functions/lookup/row/__tests__/index.spec.tsindex db30d26e9a..6975346459 100644--- a/packages/engine-formula/src/functions/lookup/row/__tests__/index.spec.ts+++ b/packages/engine-formula/src/functions/lookup/row/__tests__/index.spec.ts@@ -15,12 +15,15 @@*/import type { Injector } from '@univerjs/core';-import { beforeEach, describe, expect, it } from 'vitest';+import type { LexerNode } from '../../../../engine/analysis/lexer-node';+import type { BaseAstNode } from '../../../../engine/ast-node/base-ast-node';+import type { ArrayValueObject } from '../../../../engine/value-object/array-value-object';+import type { BaseValueObject, ErrorValueObject } from '../../../../engine/value-object/base-value-object';+import { beforeEach, describe, expect, it } from 'vitest';+import { ErrorType } from '../../../../basics/error-type';import { Lexer } from '../../../../engine/analysis/lexer';-import type { LexerNode } from '../../../../engine/analysis/lexer-node';import { AstTreeBuilder } from '../../../../engine/analysis/parser';-import type { BaseAstNode } from '../../../../engine/ast-node/base-ast-node';import { Interpreter } from '../../../../engine/interpreter/interpreter';import { IFormulaCurrentConfigService } from '../../../../services/current-data.service';import { IFunctionService } from '../../../../services/function.service';@@ -28,9 +31,6 @@ import { IFormulaRuntimeService } from '../../../../services/runtime.service';import { createFunctionTestBed } from '../../../__tests__/create-function-test-bed';import { FUNCTION_NAMES_LOOKUP } from '../../function-names';import { Row } from '../index';-import type { BaseValueObject, ErrorValueObject } from '../../../../engine/value-object/base-value-object';-import type { ArrayValueObject } from '../../../../engine/value-object/array-value-object';-import { ErrorType } from '../../../../basics/error-type';describe('Test row', () => {let get: Injector['get'];@@ -56,6 +56,7 @@ describe('Test row', () => {formulaCurrentConfigService.load({formulaData: {},arrayFormulaCellData: {},+ arrayFormulaRange: {},forceCalculate: false,dirtyRanges: [],dirtyNameMap: {},diff --git a/packages/engine-formula/src/functions/lookup/rows/__tests__/index.spec.ts b/packages/engine-formula/src/functions/lookup/rows/__tests__/index.spec.tsindex 497eca6d08..237dccfcbf 100644--- a/packages/engine-formula/src/functions/lookup/rows/__tests__/index.spec.ts+++ b/packages/engine-formula/src/functions/lookup/rows/__tests__/index.spec.ts@@ -15,12 +15,14 @@*/import type { Injector } from '@univerjs/core';-import { beforeEach, describe, expect, it } from 'vitest';+import type { LexerNode } from '../../../../engine/analysis/lexer-node';+import type { BaseAstNode } from '../../../../engine/ast-node/base-ast-node';+import type { BaseValueObject, ErrorValueObject } from '../../../../engine/value-object/base-value-object';+import { beforeEach, describe, expect, it } from 'vitest';+import { ErrorType } from '../../../../basics/error-type';import { Lexer } from '../../../../engine/analysis/lexer';-import type { LexerNode } from '../../../../engine/analysis/lexer-node';import { AstTreeBuilder } from '../../../../engine/analysis/parser';-import type { BaseAstNode } from '../../../../engine/ast-node/base-ast-node';import { Interpreter } from '../../../../engine/interpreter/interpreter';import { IFormulaCurrentConfigService } from '../../../../services/current-data.service';import { IFunctionService } from '../../../../services/function.service';@@ -28,8 +30,6 @@ import { IFormulaRuntimeService } from '../../../../services/runtime.service';import { createFunctionTestBed } from '../../../__tests__/create-function-test-bed';import { FUNCTION_NAMES_LOOKUP } from '../../function-names';import { Rows } from '../index';-import type { BaseValueObject, ErrorValueObject } from '../../../../engine/value-object/base-value-object';-import { ErrorType } from '../../../../basics/error-type';describe('Test rows', () => {let get: Injector['get'];@@ -55,6 +55,7 @@ describe('Test rows', () => {formulaCurrentConfigService.load({formulaData: {},arrayFormulaCellData: {},+ arrayFormulaRange: {},forceCalculate: false,dirtyRanges: [],dirtyNameMap: {},diff --git a/packages/engine-formula/src/functions/math/subtotal/__tests__/index.spec.ts b/packages/engine-formula/src/functions/math/subtotal/__tests__/index.spec.tsindex b540f2b9cc..66f6e7f489 100644--- a/packages/engine-formula/src/functions/math/subtotal/__tests__/index.spec.ts+++ b/packages/engine-formula/src/functions/math/subtotal/__tests__/index.spec.ts@@ -15,24 +15,24 @@*/import type { Injector, IWorkbookData } from '@univerjs/core';-import { beforeEach, describe, expect, it } from 'vitest';+import type { LexerNode } from '../../../../engine/analysis/lexer-node';+import type { BaseAstNode } from '../../../../engine/ast-node/base-ast-node';+import type { ArrayValueObject } from '../../../../engine/value-object/array-value-object';+import type { BaseValueObject, ErrorValueObject } from '../../../../engine/value-object/base-value-object';import { BooleanNumber, CellValueType, LocaleType } from '@univerjs/core';+import { beforeEach, describe, expect, it } from 'vitest';+import { ErrorType } from '../../../../basics/error-type';import { Lexer } from '../../../../engine/analysis/lexer';-import type { LexerNode } from '../../../../engine/analysis/lexer-node';import { AstTreeBuilder } from '../../../../engine/analysis/parser';-import type { BaseAstNode } from '../../../../engine/ast-node/base-ast-node';import { Interpreter } from '../../../../engine/interpreter/interpreter';+import { stripErrorMargin } from '../../../../engine/utils/math-kit';import { IFormulaCurrentConfigService } from '../../../../services/current-data.service';import { IFunctionService } from '../../../../services/function.service';import { IFormulaRuntimeService } from '../../../../services/runtime.service';import { createFunctionTestBed } from '../../../__tests__/create-function-test-bed';import { FUNCTION_NAMES_MATH } from '../../function-names';import { Subtotal } from '../index';-import type { BaseValueObject, ErrorValueObject } from '../../../../engine/value-object/base-value-object';-import { ErrorType } from '../../../../basics/error-type';-import type { ArrayValueObject } from '../../../../engine/value-object/array-value-object';-import { stripErrorMargin } from '../../../../engine/utils/math-kit';const getTestWorkbookData = (): IWorkbookData => {return {@@ -156,6 +156,7 @@ describe('Test subtotal', () => {formulaCurrentConfigService.load({formulaData: {},arrayFormulaCellData: {},+ arrayFormulaRange: {},forceCalculate: false,dirtyRanges: [],dirtyNameMap: {},diff --git a/packages/engine-formula/src/functions/statistical/averageif/__tests__/index.spec.ts b/packages/engine-formula/src/functions/statistical/averageif/__tests__/index.spec.tsindex cd2bade968..a595fb7a85 100644--- a/packages/engine-formula/src/functions/statistical/averageif/__tests__/index.spec.ts+++ b/packages/engine-formula/src/functions/statistical/averageif/__tests__/index.spec.ts@@ -15,23 +15,23 @@*/import type { Injector, IWorkbookData } from '@univerjs/core';-import { beforeEach, describe, expect, it } from 'vitest';+import type { LexerNode } from '../../../../engine/analysis/lexer-node';+import type { BaseAstNode } from '../../../../engine/ast-node/base-ast-node';+import type { ArrayValueObject } from '../../../../engine/value-object/array-value-object';+import type { BaseValueObject, ErrorValueObject } from '../../../../engine/value-object/base-value-object';import { CellValueType, LocaleType } from '@univerjs/core';+import { beforeEach, describe, expect, it } from 'vitest';+import { ErrorType } from '../../../../basics/error-type';import { Lexer } from '../../../../engine/analysis/lexer';-import type { LexerNode } from '../../../../engine/analysis/lexer-node';import { AstTreeBuilder } from '../../../../engine/analysis/parser';-import type { BaseAstNode } from '../../../../engine/ast-node/base-ast-node';import { Interpreter } from '../../../../engine/interpreter/interpreter';import { IFormulaCurrentConfigService } from '../../../../services/current-data.service';import { IFunctionService } from '../../../../services/function.service';import { IFormulaRuntimeService } from '../../../../services/runtime.service';import { createFunctionTestBed } from '../../../__tests__/create-function-test-bed';import { FUNCTION_NAMES_STATISTICAL } from '../../function-names';-import type { BaseValueObject, ErrorValueObject } from '../../../../engine/value-object/base-value-object';-import type { ArrayValueObject } from '../../../../engine/value-object/array-value-object';import { Averageif } from '../index';-import { ErrorType } from '../../../../basics/error-type';const getTestWorkbookData = (): IWorkbookData => {return {@@ -175,6 +175,7 @@ describe('Test isref function', () => {formulaCurrentConfigService.load({formulaData: {},arrayFormulaCellData: {},+ arrayFormulaRange: {},forceCalculate: false,dirtyRanges: [],dirtyNameMap: {},diff --git a/packages/engine-formula/src/functions/statistical/rank-avg/__tests__/index.spec.ts b/packages/engine-formula/src/functions/statistical/rank-avg/__tests__/index.spec.tsindex 295d7d301b..6adeeb002f 100644--- a/packages/engine-formula/src/functions/statistical/rank-avg/__tests__/index.spec.ts+++ b/packages/engine-formula/src/functions/statistical/rank-avg/__tests__/index.spec.ts@@ -15,13 +15,14 @@*/import type { Injector, IWorkbookData } from '@univerjs/core';-import { beforeEach, describe, expect, it } from 'vitest';+import type { LexerNode } from '../../../../engine/analysis/lexer-node';+import type { BaseAstNode } from '../../../../engine/ast-node/base-ast-node';import { CellValueType, LocaleType } from '@univerjs/core';+import { beforeEach, describe, expect, it } from 'vitest';+import { ErrorType } from '../../../../basics/error-type';import { Lexer } from '../../../../engine/analysis/lexer';-import type { LexerNode } from '../../../../engine/analysis/lexer-node';import { AstTreeBuilder } from '../../../../engine/analysis/parser';-import type { BaseAstNode } from '../../../../engine/ast-node/base-ast-node';import { Interpreter } from '../../../../engine/interpreter/interpreter';import { IFormulaCurrentConfigService } from '../../../../services/current-data.service';import { IFunctionService } from '../../../../services/function.service';@@ -29,7 +30,6 @@ import { IFormulaRuntimeService } from '../../../../services/runtime.service';import { createFunctionTestBed, getObjectValue } from '../../../__tests__/create-function-test-bed';import { FUNCTION_NAMES_STATISTICAL } from '../../function-names';import { RankAvg } from '../index';-import { ErrorType } from '../../../../basics/error-type';const getTestWorkbookData = (): IWorkbookData => {return {@@ -112,6 +112,7 @@ describe('Test rank function', () => {formulaCurrentConfigService.load({formulaData: {},arrayFormulaCellData: {},+ arrayFormulaRange: {},forceCalculate: false,dirtyRanges: [],dirtyNameMap: {},diff --git a/packages/engine-formula/src/functions/statistical/rank-eq/__tests__/index.spec.ts b/packages/engine-formula/src/functions/statistical/rank-eq/__tests__/index.spec.tsindex ab6df96506..74dbb5884c 100644--- a/packages/engine-formula/src/functions/statistical/rank-eq/__tests__/index.spec.ts+++ b/packages/engine-formula/src/functions/statistical/rank-eq/__tests__/index.spec.ts@@ -15,13 +15,14 @@*/import type { Injector, IWorkbookData } from '@univerjs/core';-import { beforeEach, describe, expect, it } from 'vitest';+import type { LexerNode } from '../../../../engine/analysis/lexer-node';+import type { BaseAstNode } from '../../../../engine/ast-node/base-ast-node';import { CellValueType, LocaleType } from '@univerjs/core';+import { beforeEach, describe, expect, it } from 'vitest';+import { ErrorType } from '../../../../basics/error-type';import { Lexer } from '../../../../engine/analysis/lexer';-import type { LexerNode } from '../../../../engine/analysis/lexer-node';import { AstTreeBuilder } from '../../../../engine/analysis/parser';-import type { BaseAstNode } from '../../../../engine/ast-node/base-ast-node';import { Interpreter } from '../../../../engine/interpreter/interpreter';import { IFormulaCurrentConfigService } from '../../../../services/current-data.service';import { IFunctionService } from '../../../../services/function.service';@@ -29,7 +30,6 @@ import { IFormulaRuntimeService } from '../../../../services/runtime.service';import { createFunctionTestBed, getObjectValue } from '../../../__tests__/create-function-test-bed';import { FUNCTION_NAMES_STATISTICAL } from '../../function-names';import { RankEq } from '../index';-import { ErrorType } from '../../../../basics/error-type';const getTestWorkbookData = (): IWorkbookData => {return {@@ -112,6 +112,7 @@ describe('Test rank function', () => {formulaCurrentConfigService.load({formulaData: {},arrayFormulaCellData: {},+ arrayFormulaRange: {},forceCalculate: false,dirtyRanges: [],dirtyNameMap: {},diff --git a/packages/engine-formula/src/models/utils/formula-data-util.ts b/packages/engine-formula/src/models/utils/formula-data-util.tsindex e460bf1dcf..7173e7da42 100644--- a/packages/engine-formula/src/models/utils/formula-data-util.ts+++ b/packages/engine-formula/src/models/utils/formula-data-util.ts@@ -14,9 +14,9 @@* limitations under the License.*/-import { isFormulaId, isFormulaString } from '@univerjs/core';import type { ICellData, IRange, Nullable, ObjectMatrix } from '@univerjs/core';import type { IFormulaDataItem } from '../../basics/common';+import { cellToRange, isFormulaId, isFormulaString, Rectangle } from '@univerjs/core';export interface IFormulaIdMap {f: string;@@ -101,10 +101,38 @@ export function clearArrayFormulaCellDataByCell(arrayFormulaRangeMatrix: ObjectMreturn true;}+ const intersection: IRange[] = [];+ arrayFormulaRangeMatrix.forValue((rangeRow, rangeCol, range) => {+ // skip the current range+ if (rangeRow === r && rangeCol === c) {+ return;+ }++ if (Rectangle.intersects(range, arrayFormulaRangeValue)) {+ intersection.push(range);+ }+ });+const { startRow, startColumn, endRow, endColumn } = arrayFormulaRangeValue;- for (let r = startRow; r <= endRow; r++) {- for (let c = startColumn; c <= endColumn; c++) {- arrayFormulaCellDataMatrix.realDeleteValue(r, c);++ for (let row = startRow; row <= endRow; row++) {+ for (let col = startColumn; col <= endColumn; col++) {+ let isOverlapping = false;+ const currentCell = cellToRange(row, col);++ // Check if the cell is part of any other range in arrayFormulaRangeMatrix+ intersection.some((range) => {+ if (Rectangle.contains(range, currentCell)) {+ isOverlapping = true;+ return true;+ }+ return false;+ });++ // If the cell is not part of any other range, delete its value+ if (!isOverlapping) {+ arrayFormulaCellDataMatrix.realDeleteValue(row, col);+ }}}}diff --git a/packages/engine-formula/src/services/current-data.service.ts b/packages/engine-formula/src/services/current-data.service.tsindex 3098ed16f1..55d3edceba 100644--- a/packages/engine-formula/src/services/current-data.service.ts+++ b/packages/engine-formula/src/services/current-data.service.ts@@ -16,6 +16,7 @@import type { IUnitRange, Nullable, Workbook } from '@univerjs/core';import type {+ IArrayFormulaRangeType,IDirtyUnitFeatureMap,IDirtyUnitOtherFormulaMap,IDirtyUnitSheetDefinedNameMap,@@ -80,6 +81,8 @@ export interface IFormulaCurrentConfigService {getArrayFormulaCellData(): IRuntimeUnitDataType;+ getArrayFormulaRange(): IArrayFormulaRangeType;+getSheetName(unitId: string, sheetId: string): string;getDirtyUnitOtherFormulaMap(): IDirtyUnitOtherFormulaMap;@@ -102,6 +105,8 @@ export class FormulaCurrentConfigService extends Disposable implements IFormulaCprivate _arrayFormulaCellData: IRuntimeUnitDataType = {};+ private _arrayFormulaRange: IArrayFormulaRangeType = {};+private _formulaData: IFormulaData = {};private _sheetNameMap: IUnitSheetNameMap = {};@@ -136,6 +141,7 @@ export class FormulaCurrentConfigService extends Disposable implements IFormulaCthis._unitStylesData = {};this._formulaData = {};this._arrayFormulaCellData = {};+ this._arrayFormulaRange = {};this._sheetNameMap = {};this._dirtyRanges = [];this._dirtyNameMap = {};@@ -182,6 +188,10 @@ export class FormulaCurrentConfigService extends Disposable implements IFormulaCreturn this._arrayFormulaCellData;}+ getArrayFormulaRange() {+ return this._arrayFormulaRange;+ }+getSheetNameMap() {return this._sheetNameMap;}@@ -241,6 +251,8 @@ export class FormulaCurrentConfigService extends Disposable implements IFormulaCthis._arrayFormulaCellData = convertUnitDataToRuntime(config.arrayFormulaCellData);+ this._arrayFormulaRange = config.arrayFormulaRange;+this._forceCalculate = config.forceCalculate;this._clearDependencyTreeCache = config.clearDependencyTreeCache || {};diff --git a/packages/engine-formula/src/services/runtime.service.ts b/packages/engine-formula/src/services/runtime.service.tsindex 77f7835361..d63655f344 100644--- a/packages/engine-formula/src/services/runtime.service.ts+++ b/packages/engine-formula/src/services/runtime.service.ts@@ -540,6 +540,9 @@ export class FormulaRuntimeService extends Disposable implements IFormulaRuntimecell.v = '';}runtimeArrayUnitData.setValue(currentRow, currentColumn, cell);+ } // To determine whether a cell has a value, in addition to cell != null, other array formulas may get undefined (displayed as 0). In this case, the value of the existing array formula cannot be modified.+ else if (this._isInOtherArrayFormulaRange(unitId, sheetId, row, column, currentRow, currentColumn)) {+ return true;} else {runtimeArrayUnitData.setValue(currentRow, currentColumn, { v: '' });}@@ -641,6 +644,7 @@ export class FormulaRuntimeService extends Disposable implements IFormulaRuntime};}+ // eslint-disable-next-line complexityprivate _checkIfArrayFormulaRangeHasData(formulaUnitId: string,formulaSheetId: string,@@ -651,6 +655,8 @@ export class FormulaRuntimeService extends Disposable implements IFormulaRuntimeconst { startRow, startColumn, endRow, endColumn } = arrayRange;const unitData = this._currentConfigService.getUnitData();+ // this._runtimeArrayFormulaCellData data is incomplete, use the data on configService+ const arrayData = this._currentConfigService.getArrayFormulaCellData();const unitArrayFormulaRange =this._unitArrayFormulaRange[formulaUnitId]?.[formulaSheetId]?.[formulaRow]?.[formulaColumn];@@ -663,7 +669,7 @@ export class FormulaRuntimeService extends Disposable implements IFormulaRuntimeconst cell = this._runtimeData?.[formulaUnitId]?.[formulaSheetId]?.getValue(r, c);- const arrayDataCell = this._runtimeArrayFormulaCellData?.[formulaUnitId]?.[formulaSheetId]?.getValue(+ const arrayDataCell = arrayData?.[formulaUnitId]?.[formulaSheetId]?.getValue(r,c);@@ -671,9 +677,10 @@ export class FormulaRuntimeService extends Disposable implements IFormulaRuntimeconst featureCell = this._getRuntimeFeatureCellValue(r, c, formulaSheetId, formulaUnitId);+ // arrayDataCell may display 0 as {v: null}. Although it is an empty cell, it is considered to have a value.if (!isNullCell(cell) ||- (!isNullCell(arrayDataCell) && !this._isInArrayFormulaRange(unitArrayFormulaRange, r, c)) ||+ this._isInOtherArrayFormulaRange(formulaUnitId, formulaSheetId, formulaRow, formulaColumn, r, c) ||!isNullCell(currentCell) ||!isNullCell(featureCell)) {@@ -689,6 +696,55 @@ export class FormulaRuntimeService extends Disposable implements IFormulaRuntimereturn getRuntimeFeatureCell(row, column, sheetId, unitId, this._runtimeFeatureCellData);}+ private _arrayCellHasData(cell: Nullable<ICellData>) {+ if (cell === null || cell === undefined) {+ return false;+ }++ if (cell.v !== undefined) {+ return true;+ }++ return false;+ }++ /**+ * If the current array formula in the extended area intersects with the existing array formula, a #SPILL! error will be reported. Note that if other array formulas are already #SPILL!, they will not conflict with the current array formula+ * @param formulaUnitId+ * @param formulaSheetId+ * @param formulaRow+ * @param formulaColumn+ * @param r+ * @param c+ * @returns+ */+ private _isInOtherArrayFormulaRange(formulaUnitId: string, formulaSheetId: string, formulaRow: number, formulaColumn: number, r: number, c: number) {+ const arrayFormulaRange = this._currentConfigService.getArrayFormulaRange()[formulaUnitId]?.[formulaSheetId];++ if (arrayFormulaRange == null) {+ return false;+ }++ let isCellOverlapping = false;++ const arrayFormulaRangeMatrix = new ObjectMatrix(arrayFormulaRange);+ arrayFormulaRangeMatrix.forValue((rangeRow, rangeCol, range) => {+ // skip the current range+ if (rangeRow === formulaRow && rangeCol === formulaColumn) {+ return;+ }++ // Check if the cell is part of any other range in arrayFormulaRangeMatrix, and value is not #SPILL!+ const isOverlapping = this._isInArrayFormulaRange(range, r, c);+ const cell = this._runtimeData[formulaUnitId]?.[formulaSheetId]?.getValue(rangeRow, rangeCol);+ if (isOverlapping && cell?.v !== ErrorType.SPILL) {+ isCellOverlapping = true;+ }+ });++ return isCellOverlapping;+ }+private _isInArrayFormulaRange(range: Nullable<IRange>, r: number, c: number) {if (range == null) {return false;