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): defined name move (#1888)
Univerbe2fec37cbad
diff --git a/packages/core/src/shared/__test__/range.spec.ts b/packages/core/src/shared/__test__/range.spec.tsnew file mode 100644index 0000000000..eb73ad88f8--- /dev/null+++ b/packages/core/src/shared/__test__/range.spec.ts@@ -0,0 +1,78 @@+/**+ * Copyright 2023-present DreamNum Inc.+ *+ * Licensed under the Apache License, Version 2.0 (the "License");+ * you may not use this file except in compliance with the License.+ * You may obtain a copy of the License at+ *+ * http://www.apache.org/licenses/LICENSE-2.0+ *+ * Unless required by applicable law or agreed to in writing, software+ * distributed under the License is distributed on an "AS IS" BASIS,+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.+ * See the License for the specific language governing permissions and+ * limitations under the License.+ */++import { describe, expect, it } from 'vitest';++import { AbsoluteRefType } from '../../types/interfaces/i-range';+import { moveRangeByOffset } from '../range';++describe('test moveRangeByOffset', () => {+ it('test normal', () => {+ const range = {+ startRow: 1,+ startColumn: 1,+ endRow: 3,+ endColumn: 3,+ };+ const newRange = moveRangeByOffset(range, 1, 1);+ expect(newRange).toEqual({+ startRow: 2,+ startColumn: 2,+ endRow: 4,+ endColumn: 4,+ });+ });++ it('test absolute', () => {+ const range = {+ startRow: 1,+ startColumn: 1,+ endRow: 3,+ endColumn: 3,+ startAbsoluteRefType: AbsoluteRefType.ROW,+ endAbsoluteRefType: AbsoluteRefType.COLUMN,+ };+ const newRange = moveRangeByOffset(range, 1, 1);+ expect(newRange).toEqual({+ startRow: 1,+ startColumn: 2,+ endRow: 4,+ endColumn: 3,+ startAbsoluteRefType: AbsoluteRefType.ROW,+ endAbsoluteRefType: AbsoluteRefType.COLUMN,+ });+ });++ it('test ignoreAbsolute', () => {+ const range = {+ startRow: 1,+ startColumn: 1,+ endRow: 3,+ endColumn: 3,+ startAbsoluteRefType: AbsoluteRefType.ROW,+ endAbsoluteRefType: AbsoluteRefType.COLUMN,+ };+ const newRange = moveRangeByOffset(range, 1, 1, true);+ expect(newRange).toEqual({+ startRow: 2,+ startColumn: 2,+ endRow: 4,+ endColumn: 4,+ startAbsoluteRefType: AbsoluteRefType.ROW,+ endAbsoluteRefType: AbsoluteRefType.COLUMN,+ });+ });+});diff --git a/packages/core/src/shared/index.ts b/packages/core/src/shared/index.tsindex 6101782b1b..6817c4b888 100644--- a/packages/core/src/shared/index.ts+++ b/packages/core/src/shared/index.ts@@ -14,6 +14,7 @@* limitations under the License.*/+export * from './array-search';export * from './blob';export * from './color/color';@@ -38,3 +39,4 @@ export * from './tools';export * from './types';export * from './debounce';export { queryObjectMatrix } from './object-matrix-query';+export { moveRangeByOffset } from './range';diff --git a/packages/core/src/shared/range.ts b/packages/core/src/shared/range.tsnew file mode 100644index 0000000000..e7f8636d9a--- /dev/null+++ b/packages/core/src/shared/range.ts@@ -0,0 +1,52 @@+/**+ * Copyright 2023-present DreamNum Inc.+ *+ * Licensed under the Apache License, Version 2.0 (the "License");+ * you may not use this file except in compliance with the License.+ * You may obtain a copy of the License at+ *+ * http://www.apache.org/licenses/LICENSE-2.0+ *+ * Unless required by applicable law or agreed to in writing, software+ * distributed under the License is distributed on an "AS IS" BASIS,+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.+ * See the License for the specific language governing permissions and+ * limitations under the License.+ */++import { AbsoluteRefType, type IRange } from '../types/interfaces/i-range';+import { Rectangle } from './rectangle';++export function moveRangeByOffset(range: IRange, refOffsetX: number, refOffsetY: number, ignoreAbsolute = false): IRange {+ let newRange = { ...range };++ const startAbsoluteRefType = newRange.startAbsoluteRefType || AbsoluteRefType.NONE;+ const endAbsoluteRefType = newRange.endAbsoluteRefType || AbsoluteRefType.NONE;++ if (startAbsoluteRefType === AbsoluteRefType.ALL && endAbsoluteRefType === AbsoluteRefType.ALL) {+ return newRange;+ }++ if (ignoreAbsolute || (startAbsoluteRefType === AbsoluteRefType.NONE && endAbsoluteRefType === AbsoluteRefType.NONE)) {+ return Rectangle.moveOffset(newRange, refOffsetX, refOffsetY);+ }++ if (startAbsoluteRefType === AbsoluteRefType.NONE) {+ newRange = { ...newRange, startRow: newRange.startRow + refOffsetY, startColumn: newRange.startColumn + refOffsetX };+ } else if (startAbsoluteRefType === AbsoluteRefType.COLUMN) {+ newRange = { ...newRange, startRow: newRange.startRow + refOffsetY };+ } else if (startAbsoluteRefType === AbsoluteRefType.ROW) {+ newRange = { ...newRange, startColumn: newRange.startColumn + refOffsetX };+ }+++ if (endAbsoluteRefType === AbsoluteRefType.NONE) {+ newRange = { ...newRange, endRow: newRange.endRow + refOffsetY, endColumn: newRange.endColumn + refOffsetX };+ } else if (endAbsoluteRefType === AbsoluteRefType.COLUMN) {+ newRange = { ...newRange, endRow: newRange.endRow + refOffsetY };+ } else if (endAbsoluteRefType === AbsoluteRefType.ROW) {+ newRange = { ...newRange, endColumn: newRange.endColumn + refOffsetX };+ }++ return newRange;+}diff --git a/packages/engine-formula/src/engine/analysis/__tests__/lexer-tree-builder.spec.ts b/packages/engine-formula/src/engine/analysis/__tests__/lexer-tree-builder.spec.tsindex 0edfb94aaf..7aef87e29f 100644--- a/packages/engine-formula/src/engine/analysis/__tests__/lexer-tree-builder.spec.ts+++ b/packages/engine-formula/src/engine/analysis/__tests__/lexer-tree-builder.spec.ts@@ -16,11 +16,24 @@import { describe, expect, it } from 'vitest';-import { AbsoluteRefType } from '@univerjs/core';import type { LexerNode } from '../lexer-node';import { LexerTreeBuilder } from '../lexer-tree-builder';import { ErrorType } from '../../../basics/error-type';+function checkDefinedName(token: string) {+ if (token === 'myName') {+ return true;+ }+ return false;+}++function checkDefinedName2(token: string) {+ if (token === 'DefinedName2') {+ return true;+ }+ return false;+}+describe('lexer nodeMaker test', () => {const lexerTreeBuilder = new LexerTreeBuilder();@@ -244,7 +257,7 @@ describe('lexer nodeMaker test', () => {describe('sequenceNodesBuilder', () => {it('workbook ref build', () => {- expect(lexerTreeBuilder.sequenceNodesBuilder('=[workbook-01]工作表11!G14:M20')).toStrictEqual([+ expect(lexerTreeBuilder.sequenceNodesBuilder('=[workbook-01]工作表11!G14:M20', () => false)).toStrictEqual([{endIndex: 25,nodeType: 4,@@ -255,7 +268,7 @@ describe('lexer nodeMaker test', () => {});it('special workbook ref build', () => {- expect(lexerTreeBuilder.sequenceNodesBuilder('=\'[workbook-01]工作表11\'!G14:M20,\'[workbook-01]工作表11\'!K27:N32')).toStrictEqual([+ expect(lexerTreeBuilder.sequenceNodesBuilder('=\'[workbook-01]工作表11\'!G14:M20,\'[workbook-01]工作表11\'!K27:N32', () => false)).toStrictEqual([{endIndex: 27,nodeType: 4,@@ -273,7 +286,7 @@ describe('lexer nodeMaker test', () => {});it('cube', () => {- expect(lexerTreeBuilder.sequenceNodesBuilder('=INDEX((A6:B6,C6:D7),1,1,2)')).toStrictEqual([+ expect(lexerTreeBuilder.sequenceNodesBuilder('=INDEX((A6:B6,C6:D7),1,1,2)', () => false)).toStrictEqual([{endIndex: 4,nodeType: 3,@@ -322,7 +335,7 @@ describe('lexer nodeMaker test', () => {});it('No Parameter Function', () => {- expect(lexerTreeBuilder.sequenceNodesBuilder('=today()+today()+column()')).toStrictEqual([+ expect(lexerTreeBuilder.sequenceNodesBuilder('=today()+today()+column()', () => false)).toStrictEqual([{endIndex: 4,nodeType: 3,@@ -353,7 +366,7 @@ describe('lexer nodeMaker test', () => {});it('No Parameter Today', () => {- expect(lexerTreeBuilder.sequenceNodesBuilder('=IF(TODAY()>1,"TRUE", "FALSE")')).toStrictEqual([+ expect(lexerTreeBuilder.sequenceNodesBuilder('=IF(TODAY()>1,"TRUE", "FALSE")', () => false)).toStrictEqual([{endIndex: 1,nodeType: 3,@@ -393,42 +406,56 @@ describe('lexer nodeMaker test', () => {')',]);});- });-- describe('convertRefersToAbsolute', () => {- it('Formula All', () => {- const result = lexerTreeBuilder.convertRefersToAbsolute('=sum(A1:B1,A1:B1,A1:B1,A1:B1)', AbsoluteRefType.ALL, AbsoluteRefType.ALL);- expect(result).toStrictEqual('=sum($A$1:$B$1,$A$1:$B$1,$A$1:$B$1,$A$1:$B$1)');- });-- it('Range All', () => {- const result = lexerTreeBuilder.convertRefersToAbsolute('A1:B1,A1:B1,A1:B1,A1:B1', AbsoluteRefType.ALL, AbsoluteRefType.ALL);- expect(result).toStrictEqual('$A$1:$B$1,$A$1:$B$1,$A$1:$B$1,$A$1:$B$1');- });-- it('Formula Column', () => {- const result = lexerTreeBuilder.convertRefersToAbsolute('=sum(A1:B1,A1:B1,A1:B1,A1:B1)', AbsoluteRefType.COLUMN, AbsoluteRefType.COLUMN);- expect(result).toStrictEqual('=sum($A1:$B1,$A1:$B1,$A1:$B1,$A1:$B1)');- });-- it('Range Column', () => {- const result = lexerTreeBuilder.convertRefersToAbsolute('A1:B1,A1:B1,A1:B1,A1:B1', AbsoluteRefType.COLUMN, AbsoluteRefType.COLUMN);- expect(result).toStrictEqual('$A1:$B1,$A1:$B1,$A1:$B1,$A1:$B1');- });-- it('Formula Row', () => {- const result = lexerTreeBuilder.convertRefersToAbsolute('=sum(A1:B1,A1:B1,A1:B1,A1:B1)', AbsoluteRefType.ROW, AbsoluteRefType.ROW);- expect(result).toStrictEqual('=sum(A$1:B$1,A$1:B$1,A$1:B$1,A$1:B$1)');- });- it('Range Row', () => {- const result = lexerTreeBuilder.convertRefersToAbsolute('A1:B1,A1:B1,A1:B1,A1:B1', AbsoluteRefType.ROW, AbsoluteRefType.ROW);- expect(result).toStrictEqual('A$1:B$1,A$1:B$1,A$1:B$1,A$1:B$1');+ it('Has defined name', () => {+ expect(lexerTreeBuilder.sequenceNodesBuilder('=myName+A1:B10', checkDefinedName.bind(this))).toStrictEqual([+ {+ endIndex: 5,+ nodeType: 6,+ startIndex: 0,+ token: 'myName',+ },+ '+',+ {+ endIndex: 12,+ nodeType: 4,+ startIndex: 7,+ token: 'A1:B10',+ },+ ]);});- it('Complex Formula', () => {- const result = lexerTreeBuilder.convertRefersToAbsolute('=SUM(A1:B10) + LAMBDA(x, y, x*y*x)(A1:B10, A10) + MAX(A1:B10,SUM(A2))', AbsoluteRefType.ALL, AbsoluteRefType.ALL);- expect(result).toStrictEqual('=SUM($A$1:$B$10) + LAMBDA(x, y, x*y*x)($A$1:$B$10,$A$10) + MAX($A$1:$B$10,SUM($A$2))');+ it('Has defined name11', () => {+ expect(lexerTreeBuilder.sequenceNodesBuilder('=SUM(DefinedName2+E22:E32,J21:J32)', checkDefinedName2.bind(this))).toStrictEqual([+ {+ endIndex: 2,+ nodeType: 3,+ startIndex: 0,+ token: 'SUM',+ },+ '(',+ {+ endIndex: 15,+ nodeType: 6,+ startIndex: 4,+ token: 'DefinedName2',+ },+ '+',+ {+ endIndex: 23,+ nodeType: 4,+ startIndex: 17,+ token: 'E22:E32',+ },+ ',',+ {+ endIndex: 31,+ nodeType: 4,+ startIndex: 25,+ token: 'J21:J32',+ },+ ')',+ ]);});});});diff --git a/packages/engine-formula/src/engine/analysis/__tests__/lexer.spec.ts b/packages/engine-formula/src/engine/analysis/__tests__/lexer.spec.tsindex 39ebc2e3aa..beffdd24e7 100644--- a/packages/engine-formula/src/engine/analysis/__tests__/lexer.spec.ts+++ b/packages/engine-formula/src/engine/analysis/__tests__/lexer.spec.ts@@ -15,7 +15,7 @@*/import type { IWorkbookData, Univer, Workbook } from '@univerjs/core';-import { LocaleType } from '@univerjs/core';+import { AbsoluteRefType, IUniverInstanceService, LocaleType } from '@univerjs/core';import type { Injector } from '@wendellhu/redi';import { afterEach, beforeEach, describe, expect, it } from 'vitest';@@ -62,7 +62,7 @@ const TEST_WORKBOOK_DATA: IWorkbookData = {styles: {},};-describe('lexer nodeMaker test', () => {+describe('lexer test', () => {let univer: Univer;let lexer: Lexer;let get: Injector['get'];@@ -70,6 +70,7 @@ describe('lexer nodeMaker test', () => {let definedNamesService: IDefinedNamesService;let formulaCurrentConfigService: IFormulaCurrentConfigService;let lexerTreeBuilder: LexerTreeBuilder;+ let univerInstanceService: IUniverInstanceService;beforeEach(() => {const testBed = createCommandTestBed(TEST_WORKBOOK_DATA);@@ -78,17 +79,16 @@ describe('lexer nodeMaker test', () => {get = testBed.get;definedNamesService = get(IDefinedNamesService);-formulaCurrentConfigService = get(IFormulaCurrentConfigService);-lexerTreeBuilder = get(LexerTreeBuilder);+ univerInstanceService = get(IUniverInstanceService);formulaCurrentConfigService.setExecuteUnitId('test');formulaCurrentConfigService.setExecuteSubUnitId('sheet1');// runtimeService.setCurrent(0, 0, 4, 1, 'sheet1', 'test');- lexer = new Lexer(definedNamesService, lexerTreeBuilder, formulaCurrentConfigService);+ lexer = new Lexer(definedNamesService, lexerTreeBuilder, formulaCurrentConfigService, univerInstanceService);});afterEach(() => {@@ -116,4 +116,41 @@ describe('lexer nodeMaker test', () => {);});});++ describe('convertRefersToAbsolute', () => {+ it('Formula All', () => {+ const result = lexer.convertRefersToAbsolute('=sum(A1:B1,A1:B1,A1:B1,A1:B1)', AbsoluteRefType.ALL, AbsoluteRefType.ALL);+ expect(result).toStrictEqual('=sum($A$1:$B$1,$A$1:$B$1,$A$1:$B$1,$A$1:$B$1)');+ });++ it('Range All', () => {+ const result = lexer.convertRefersToAbsolute('A1:B1,A1:B1,A1:B1,A1:B1', AbsoluteRefType.ALL, AbsoluteRefType.ALL);+ expect(result).toStrictEqual('$A$1:$B$1,$A$1:$B$1,$A$1:$B$1,$A$1:$B$1');+ });++ it('Formula Column', () => {+ const result = lexer.convertRefersToAbsolute('=sum(A1:B1,A1:B1,A1:B1,A1:B1)', AbsoluteRefType.COLUMN, AbsoluteRefType.COLUMN);+ expect(result).toStrictEqual('=sum($A1:$B1,$A1:$B1,$A1:$B1,$A1:$B1)');+ });++ it('Range Column', () => {+ const result = lexer.convertRefersToAbsolute('A1:B1,A1:B1,A1:B1,A1:B1', AbsoluteRefType.COLUMN, AbsoluteRefType.COLUMN);+ expect(result).toStrictEqual('$A1:$B1,$A1:$B1,$A1:$B1,$A1:$B1');+ });++ it('Formula Row', () => {+ const result = lexer.convertRefersToAbsolute('=sum(A1:B1,A1:B1,A1:B1,A1:B1)', AbsoluteRefType.ROW, AbsoluteRefType.ROW);+ expect(result).toStrictEqual('=sum(A$1:B$1,A$1:B$1,A$1:B$1,A$1:B$1)');+ });++ it('Range Row', () => {+ const result = lexer.convertRefersToAbsolute('A1:B1,A1:B1,A1:B1,A1:B1', AbsoluteRefType.ROW, AbsoluteRefType.ROW);+ expect(result).toStrictEqual('A$1:B$1,A$1:B$1,A$1:B$1,A$1:B$1');+ });++ it('Complex Formula', () => {+ const result = lexer.convertRefersToAbsolute('=SUM(A1:B10) + LAMBDA(x, y, x*y*x)(A1:B10, A10) + MAX(A1:B10,SUM(A2))', AbsoluteRefType.ALL, AbsoluteRefType.ALL);+ expect(result).toStrictEqual('=SUM($A$1:$B$10) + LAMBDA(x, y, x*y*x)($A$1:$B$10,$A$10) + MAX($A$1:$B$10,SUM($A$2))');+ });+ });});diff --git a/packages/engine-formula/src/engine/analysis/lexer-tree-builder.ts b/packages/engine-formula/src/engine/analysis/lexer-tree-builder.tsindex 9ad5c8fe34..f02082f4de 100644--- a/packages/engine-formula/src/engine/analysis/lexer-tree-builder.ts+++ b/packages/engine-formula/src/engine/analysis/lexer-tree-builder.ts@@ -14,8 +14,8 @@* limitations under the License.*/-import type { AbsoluteRefType, Nullable } from '@univerjs/core';-import { Disposable, isValidRange, Rectangle, Tools } from '@univerjs/core';+import type { Nullable } from '@univerjs/core';+import { Disposable, Tools } from '@univerjs/core';import { FormulaAstLRU } from '../../basics/cache-lru';import { ErrorType } from '../../basics/error-type';@@ -38,9 +38,8 @@ import {DEFAULT_TOKEN_TYPE_PARAMETER,DEFAULT_TOKEN_TYPE_ROOT,} from '../../basics/token-type';-import { deserializeRangeWithSheet, serializeRangeToRefString } from '../utils/reference';import type { ISequenceArray, ISequenceNode } from '../utils/sequence';-import { generateStringWithSequence, sequenceNodeType } from '../utils/sequence';+import { sequenceNodeType } from '../utils/sequence';import { LexerNode } from './lexer-node';enum bracketType {@@ -168,50 +167,6 @@ export class LexerTreeBuilder extends Disposable {}}- moveFormulaRefOffset(formulaString: string, refOffsetX: number, refOffsetY: number) {- const sequenceNodes = this.sequenceNodesBuilder(formulaString);-- if (sequenceNodes == null) {- return formulaString;- }-- const newSequenceNodes: Array<string | ISequenceNode> = [];-- for (let i = 0, len = sequenceNodes.length; i < len; i++) {- const node = sequenceNodes[i];- if (typeof node === 'string' || node.nodeType !== sequenceNodeType.REFERENCE) {- newSequenceNodes.push(node);- continue;- }-- const { token } = node;-- const sequenceGrid = deserializeRangeWithSheet(token);-- const { range, sheetName, unitId: sequenceUnitId } = sequenceGrid;-- const newRange = Rectangle.moveOffset(range, refOffsetX, refOffsetY);-- let newToken = '';- if (isValidRange(newRange)) {- newToken = serializeRangeToRefString({- range: newRange,- unitId: sequenceUnitId,- sheetName,- });- } else {- newToken = ErrorType.REF;- }-- newSequenceNodes.push({- ...node,- token: newToken,- });- }-- return `=${generateStringWithSequence(newSequenceNodes)}`;- }-/*** Estimate the number of right brackets that need to be automatically added to the end of the formula.* @param formulaString@@ -275,71 +230,7 @@ export class LexerTreeBuilder extends Disposable {return bracketCount;}- convertRefersToAbsolute(formulaString: string, startAbsoluteRefType: AbsoluteRefType, endAbsoluteRefType: AbsoluteRefType) {- const nodes = this.sequenceNodesBuilder(formulaString);- if (nodes == null) {- return formulaString;- }-- let prefixToken = '';- if (formulaString.substring(0, 1) === operatorToken.EQUALS) {- prefixToken = operatorToken.EQUALS;- }-- for (let i = 0, len = nodes.length; i < len; i++) {- const node = nodes[i];- if (typeof node === 'string') {- continue;- }-- if (node.nodeType === sequenceNodeType.REFERENCE) {- const { token, endIndex } = node;- const sequenceGrid = deserializeRangeWithSheet(token);- if (sequenceGrid == null) {- continue;- }-- const { range, sheetName, unitId } = sequenceGrid;-- const newRange = {- ...range,- startAbsoluteRefType,- endAbsoluteRefType,- };-- const newToken = serializeRangeToRefString({- range: newRange,- unitId,- sheetName,- });-- const minusCount = newToken.length - token.length;-- nodes[i] = {- ...node,- token: newToken,- endIndex: endIndex + minusCount,- };-- /**- * Adjust the start and end indexes of the subsequent nodes.- */- for (let j = i + 1; j < len; j++) {- const nextNode = nodes[j];- if (typeof nextNode === 'string') {- continue;- }-- nextNode.startIndex += minusCount;- nextNode.endIndex += minusCount;- }- }- }-- return `${prefixToken}${generateStringWithSequence(nodes)}`;- }-- sequenceNodesBuilder(formulaString: string) {+ sequenceNodesBuilder(formulaString: string, definedNameCheck: (nodeToken: string) => boolean) {const sequenceNodesCache = FormulaSequenceNodeCache.get(formulaString);if (sequenceNodesCache) {return [...sequenceNodesCache];@@ -350,7 +241,7 @@ export class LexerTreeBuilder extends Disposable {return;}- const newSequenceNodes = this.getSequenceNode(sequenceArray);+ const newSequenceNodes = this.getSequenceNode(sequenceArray, definedNameCheck);// let sequenceString = '';// for (const node of newSequenceNodes) {@@ -367,7 +258,7 @@ export class LexerTreeBuilder extends Disposable {return newSequenceNodes;}- getSequenceNode(sequenceArray: ISequenceArray[]) {+ getSequenceNode(sequenceArray: ISequenceArray[], definedNameCheck: (nodeToken: string) => boolean) {const sequenceNodes: Array<ISequenceNode | string> = [];let maybeString = false;@@ -411,7 +302,18 @@ export class LexerTreeBuilder extends Disposable {const preSegmentNotPrefixToken = this._replacePrefixString(preSegmentTrim);- if (maybeString === true && preSegmentTrim[preSegmentTrim.length - 1] === matchToken.DOUBLE_QUOTATION) {+ if (definedNameCheck && definedNameCheck(preSegmentTrim)) {+ this._pushSequenceNode(+ sequenceNodes,+ {+ nodeType: sequenceNodeType.DEFINED_NAME,+ token: preSegment,+ startIndex,+ endIndex,+ },+ deleteEndIndex+ );+ } else if (maybeString === true && preSegmentTrim[preSegmentTrim.length - 1] === matchToken.DOUBLE_QUOTATION) {maybeString = false;this._pushSequenceNode(sequenceNodes,@@ -1458,7 +1360,7 @@ export class LexerTreeBuilder extends Disposable {cur++;continue;}- } else if (this._segment.length > 0 && formulaStringArray[cur - 1] && formulaStringArray[cur - 1].toUpperCase() === 'E' && (currentString === operatorToken.MINUS || currentString === operatorToken.PLUS)) {+ } else if (this._segment.length > 0 && this._isScientificNotation(formulaStringArray, cur, currentString)) {this._pushSegment(currentString);// if (!(isZeroAdded && cur === 0)) {@@ -1511,6 +1413,25 @@ export class LexerTreeBuilder extends Disposable {this._pushNodeToChildren(this._segment);}+ private _isScientificNotation(formulaStringArray: string[], cur: number, currentString: string) {+ const preTwoChar = formulaStringArray[cur - 2];+ if (preTwoChar && Number.isNaN(Number(preTwoChar))) {+ return false;+ }++ if (!(currentString === operatorToken.MINUS || currentString === operatorToken.PLUS)) {+ return false;+ }++ const nextOneChar = formulaStringArray[cur + 1];+ if (nextOneChar && Number.isNaN(Number(nextOneChar))) {+ return false;+ }++ const preOneChar = formulaStringArray[cur - 1];+ return preOneChar && preOneChar.toUpperCase() === 'E';+ }+private _addSequenceArray(sequenceArray: ISequenceArray[] | undefined, currentString: string, cur: number, isZeroAdded: boolean) {if (!(isZeroAdded && cur === 0)) {sequenceArray?.push({diff --git a/packages/engine-formula/src/engine/analysis/lexer.ts b/packages/engine-formula/src/engine/analysis/lexer.tsindex 1ccc06b0af..c01ce1f129 100644--- a/packages/engine-formula/src/engine/analysis/lexer.ts+++ b/packages/engine-formula/src/engine/analysis/lexer.ts@@ -14,22 +14,25 @@* limitations under the License.*/-import { Disposable } from '@univerjs/core';+import type { IRange } from '@univerjs/core';+import { AbsoluteRefType, Disposable, isValidRange, IUniverInstanceService, moveRangeByOffset } from '@univerjs/core';import { Inject } from '@wendellhu/redi';import { IDefinedNamesService } from '../../services/defined-names.service';-import type { ISequenceArray } from '../utils/sequence';-import { sequenceNodeType } from '../utils/sequence';+import type { ISequenceArray, ISequenceNode } from '../utils/sequence';+import { generateStringWithSequence, sequenceNodeType } from '../utils/sequence';import { operatorToken } from '../../basics/token';import { IFormulaCurrentConfigService } from '../../services/current-data.service';import { ErrorType } from '../../basics/error-type';+import { deserializeRangeWithSheet, serializeRangeToRefString } from '../utils/reference';import { LexerTreeBuilder } from './lexer-tree-builder';export class Lexer extends Disposable {constructor(@IDefinedNamesService private readonly _definedNamesService: IDefinedNamesService,@Inject(LexerTreeBuilder) private readonly _lexerTreeBuilder: LexerTreeBuilder,- @IFormulaCurrentConfigService private readonly _formulaCurrentConfigService: IFormulaCurrentConfigService+ @IFormulaCurrentConfigService private readonly _formulaCurrentConfigService: IFormulaCurrentConfigService,+ @IUniverInstanceService private readonly _univerInstanceService: IUniverInstanceService) {super();}@@ -38,6 +41,144 @@ export class Lexer extends Disposable {return this._lexerTreeBuilder.treeBuilder(formulaString, transformSuffix, this._injectDefinedName.bind(this), this._simpleCheckDefinedName.bind(this));}+ sequenceNodesBuilder(formulaString: string) {+ return this._lexerTreeBuilder.sequenceNodesBuilder(formulaString, this._injectDefinedNameCheck.bind(this));+ }++ convertRefersToAbsolute(formulaString: string, startAbsoluteRefType: AbsoluteRefType, endAbsoluteRefType: AbsoluteRefType) {+ const nodes = this.sequenceNodesBuilder(formulaString);+ if (nodes == null) {+ return formulaString;+ }++ let prefixToken = '';+ if (formulaString.substring(0, 1) === operatorToken.EQUALS) {+ prefixToken = operatorToken.EQUALS;+ }++ for (let i = 0, len = nodes.length; i < len; i++) {+ const node = nodes[i];+ if (typeof node === 'string') {+ continue;+ }++ if (node.nodeType === sequenceNodeType.REFERENCE) {+ const { token, endIndex } = node;+ const sequenceGrid = deserializeRangeWithSheet(token);+ if (sequenceGrid == null) {+ continue;+ }++ const { range, sheetName, unitId } = sequenceGrid;++ const newRange = {+ ...range,+ startAbsoluteRefType,+ endAbsoluteRefType,+ };++ const newToken = serializeRangeToRefString({+ range: newRange,+ unitId,+ sheetName,+ });++ const minusCount = newToken.length - token.length;++ nodes[i] = {+ ...node,+ token: newToken,+ endIndex: endIndex + minusCount,+ };++ /**+ * Adjust the start and end indexes of the subsequent nodes.+ */+ for (let j = i + 1; j < len; j++) {+ const nextNode = nodes[j];+ if (typeof nextNode === 'string') {+ continue;+ }++ nextNode.startIndex += minusCount;+ nextNode.endIndex += minusCount;+ }+ }+ }++ return `${prefixToken}${generateStringWithSequence(nodes)}`;+ }++ moveFormulaRefOffset(formulaString: string, refOffsetX: number, refOffsetY: number, ignoreAbsolute = false) {+ const sequenceNodes = this.sequenceNodesBuilder(formulaString);++ if (sequenceNodes == null) {+ return formulaString;+ }++ const newSequenceNodes: Array<string | ISequenceNode> = [];++ for (let i = 0, len = sequenceNodes.length; i < len; i++) {+ const node = sequenceNodes[i];+ if (typeof node === 'string' || node.nodeType !== sequenceNodeType.REFERENCE) {+ newSequenceNodes.push(node);+ continue;+ }++ const { token } = node;++ const sequenceGrid = deserializeRangeWithSheet(token);++ const { sheetName, unitId: sequenceUnitId } = sequenceGrid;++ let newRange: IRange = sequenceGrid.range;++ if (newRange.startAbsoluteRefType === AbsoluteRefType.ALL && newRange.endAbsoluteRefType === AbsoluteRefType.ALL) {+ newSequenceNodes.push(node);+ continue;+ } else {+ newRange = moveRangeByOffset(newRange, refOffsetX, refOffsetY, ignoreAbsolute);+ }++ let newToken = '';+ if (isValidRange(newRange)) {+ newToken = serializeRangeToRefString({+ range: newRange,+ unitId: sequenceUnitId,+ sheetName,+ });+ } else {+ newToken = ErrorType.REF;+ }++ newSequenceNodes.push({+ ...node,+ token: newToken,+ });+ }++ return `=${generateStringWithSequence(newSequenceNodes)}`;+ }+++ private _injectDefinedNameCheck(nodeToken: string) {+ let executeUnitId = this._formulaCurrentConfigService.getExecuteUnitId();++ if (!executeUnitId || executeUnitId === '') {+ executeUnitId = this._univerInstanceService.getCurrentUniverSheetInstance()?.getUnitId();+ }++ if (!executeUnitId || executeUnitId === '') {+ return false;+ }++ if (this._definedNamesService.getValueByName(executeUnitId, nodeToken)) {+ return true;+ }++ return false;+ }+private _simpleCheckDefinedName(formulaString: string) {const definedNameMap = this._formulaCurrentConfigService.getDirtyDefinedNameMap();const executeUnitId = this._formulaCurrentConfigService.getExecuteUnitId();@@ -81,7 +222,7 @@ export class Lexer extends Disposable {};}- const sequenceNodes = this._lexerTreeBuilder.getSequenceNode(sequenceArray);+ const sequenceNodes = this._lexerTreeBuilder.getSequenceNode(sequenceArray, () => false);let sequenceString = '';let hasDefinedName = false;const definedNames: string[] = [];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.tsindex 113104d9ec..e887f39afd 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,7 +15,7 @@*/import type { ICellData, IRange, Nullable } from '@univerjs/core';-import { CellValueType, isNullCell } from '@univerjs/core';+import { CellValueType, isNullCell, moveRangeByOffset } from '@univerjs/core';import { FormulaAstLRU } from '../../basics/cache-lru';import type { INumfmtItemMap, IRuntimeUnitDataType, IUnitData, IUnitSheetNameMap } from '../../basics/common';@@ -113,10 +113,7 @@ export class BaseReferenceObject extends ObjectClassType {}getRangePosition() {- let startRow = this._rangeData.startRow + this._refOffsetY;- let endRow = this._rangeData.endRow + this._refOffsetY;- let startColumn = this._rangeData.startColumn + this._refOffsetX;- let endColumn = this._rangeData.endColumn + this._refOffsetX;+ let { startRow, startColumn, endRow, endColumn } = moveRangeByOffset(this._rangeData, this._refOffsetX, this._refOffsetY);if (Number.isNaN(startRow)) {startRow = 0;diff --git a/packages/engine-formula/src/engine/reference-object/cell-reference-object.ts b/packages/engine-formula/src/engine/reference-object/cell-reference-object.tsindex a4c6e3c2f9..3d521d2467 100644--- a/packages/engine-formula/src/engine/reference-object/cell-reference-object.ts+++ b/packages/engine-formula/src/engine/reference-object/cell-reference-object.ts@@ -78,6 +78,14 @@ export class CellReferenceObject extends BaseReferenceObject {range.endColumn = startColumn2;}+ if (rangeData1.startAbsoluteRefType) {+ range.startAbsoluteRefType = rangeData1.startAbsoluteRefType;+ }++ if (rangeData2.startAbsoluteRefType) {+ range.endAbsoluteRefType = rangeData2.startAbsoluteRefType;+ }+return range;}diff --git a/packages/engine-formula/src/engine/reference-object/column-reference-object.ts b/packages/engine-formula/src/engine/reference-object/column-reference-object.tsindex ec7986211b..0bafe25fb4 100644--- a/packages/engine-formula/src/engine/reference-object/column-reference-object.ts+++ b/packages/engine-formula/src/engine/reference-object/column-reference-object.ts@@ -14,7 +14,7 @@* limitations under the License.*/-import type { IRange } from '@univerjs/core';+import { type IRange, RANGE_TYPE } from '@univerjs/core';import { ErrorType } from '../../basics/error-type';import { deserializeRangeWithSheet } from '../utils/reference';@@ -60,7 +60,9 @@ export class ColumnReferenceObject extends BaseReferenceObject {// return ErrorValueObject.create(ErrorType.REF);// }- const newColumn = columnReferenceObject.getRangeData().startColumn;+ const newColumnRange = columnReferenceObject.getRangeData();++ const newColumn = newColumnRange.startColumn;const column = currentRangeData.startColumn;@@ -71,6 +73,12 @@ export class ColumnReferenceObject extends BaseReferenceObject {currentRangeData.endColumn = column;}+ if (newColumnRange.startAbsoluteRefType) {+ currentRangeData.endAbsoluteRefType = newColumnRange.startAbsoluteRefType;+ }++ currentRangeData.rangeType = RANGE_TYPE.COLUMN;+this.setToken(`${this.getToken()}${matchToken.COLON}${columnReferenceObject.getToken()}`);return this;diff --git a/packages/engine-formula/src/engine/reference-object/row-reference-object.ts b/packages/engine-formula/src/engine/reference-object/row-reference-object.tsindex 5bebfad113..4322660641 100644--- a/packages/engine-formula/src/engine/reference-object/row-reference-object.ts+++ b/packages/engine-formula/src/engine/reference-object/row-reference-object.ts@@ -14,7 +14,7 @@* limitations under the License.*/-import type { IRange } from '@univerjs/core';+import { type IRange, RANGE_TYPE } from '@univerjs/core';import { ErrorType } from '../../basics/error-type';import { deserializeRangeWithSheet } from '../utils/reference';@@ -56,8 +56,9 @@ export class RowReferenceObject extends BaseReferenceObject {// if (currentRangeData.endRow !== -1) {// return ErrorValueObject.create(ErrorType.REF);// }+ const newRowRange = rowReferenceObject.getRangeData();- const newRow = rowReferenceObject.getRangeData().startRow;+ const newRow = newRowRange.startRow;const row = currentRangeData.startRow;@@ -68,6 +69,12 @@ export class RowReferenceObject extends BaseReferenceObject {currentRangeData.endRow = row;}+ if (newRowRange.startAbsoluteRefType) {+ currentRangeData.endAbsoluteRefType = newRowRange.startAbsoluteRefType;+ }++ currentRangeData.rangeType = RANGE_TYPE.ROW;+this.setToken(`${this.getToken()}${matchToken.COLON}${rowReferenceObject.getToken()}`);return this;diff --git a/packages/engine-formula/src/engine/utils/relative-formula.ts b/packages/engine-formula/src/engine/utils/relative-formula.tsindex 5cfaa4d2c9..43e9dbd1ed 100644--- a/packages/engine-formula/src/engine/utils/relative-formula.ts+++ b/packages/engine-formula/src/engine/utils/relative-formula.ts@@ -15,11 +15,11 @@*/import { Rectangle, Tools } from '@univerjs/core';-import type { LexerTreeBuilder } from '../analysis/lexer-tree-builder';+import type { Lexer } from '../analysis/lexer';import { generateStringWithSequence, sequenceNodeType } from './sequence';import { deserializeRangeWithSheet, serializeRange } from './reference';-export function isFormulaTransformable(lexerTreeBuilder: LexerTreeBuilder, formula: string) {+export function isFormulaTransformable(lexerTreeBuilder: Lexer, formula: string) {const originSequenceNodes = lexerTreeBuilder.sequenceNodesBuilder(formula);if (!originSequenceNodes) {return false;@@ -32,7 +32,7 @@ export function isFormulaTransformable(lexerTreeBuilder: LexerTreeBuilder, formureturn true;}-export function transformFormula(lexerTreeBuilder: LexerTreeBuilder, formula: string, originRow: number, originCol: number, targetRow: number, targetCol: number) {+export function transformFormula(lexerTreeBuilder: Lexer, formula: string, originRow: number, originCol: number, targetRow: number, targetCol: number) {if (!isFormulaTransformable(lexerTreeBuilder, formula)) {return formula;}diff --git a/packages/engine-formula/src/engine/utils/sequence.ts b/packages/engine-formula/src/engine/utils/sequence.tsindex fc5d667628..84d7129c18 100644--- a/packages/engine-formula/src/engine/utils/sequence.ts+++ b/packages/engine-formula/src/engine/utils/sequence.ts@@ -23,6 +23,7 @@ export enum sequenceNodeType {FUNCTION,REFERENCE,ARRAY,+ DEFINED_NAME,}export interface ISequenceNode {diff --git a/packages/engine-formula/src/index.ts b/packages/engine-formula/src/index.tsindex a049f3ddd3..b79720cb45 100644--- a/packages/engine-formula/src/index.ts+++ b/packages/engine-formula/src/index.ts@@ -14,6 +14,7 @@* limitations under the License.*/+export type {IArrayFormulaRangeType,IArrayFormulaUnitCellType,@@ -70,6 +71,7 @@ export {export { UnregisterFunctionMutation } from './commands/mutations/unregister-function.mutation';export { LexerNode } from './engine/analysis/lexer-node';export { LexerTreeBuilder } from './engine/analysis/lexer-tree-builder';+export { Lexer } from './engine/analysis/lexer';export { BaseReferenceObject, type FunctionVariantType } from './engine/reference-object/base-reference-object';export { RangeReferenceObject } from './engine/reference-object/range-reference-object';export { deserializeRangeForR1C1 } from './engine/utils/r1c1-reference';diff --git a/packages/engine-formula/src/models/__tests__/create-command-test-bed.ts b/packages/engine-formula/src/models/__tests__/create-command-test-bed.tsindex 8ece3a28b0..80ac5c8dc4 100644--- a/packages/engine-formula/src/models/__tests__/create-command-test-bed.ts+++ b/packages/engine-formula/src/models/__tests__/create-command-test-bed.ts@@ -25,6 +25,7 @@ import { FormulaCurrentConfigService, IFormulaCurrentConfigService } from '../..import { DefinedNamesService, IDefinedNamesService } from '../../services/defined-names.service';import { FormulaRuntimeService, IFormulaRuntimeService } from '../../services/runtime.service';import { FormulaDataModel } from '../formula-data.model';+import { Lexer } from '../../engine/analysis/lexer';const TEST_WORKBOOK_DATA: IWorkbookData = {id: 'test',@@ -71,6 +72,7 @@ export function createCommandTestBed(workbookConfig?: IWorkbookData, dependencieinjector.add([CalculateFormulaService]);injector.add([FormulaDataModel]);injector.add([LexerTreeBuilder]);+ injector.add([Lexer]);injector.add([IDefinedNamesService, { useClass: DefinedNamesService }]);injector.add([IFormulaRuntimeService, { useClass: FormulaRuntimeService }]);injector.add([IFormulaCurrentConfigService, { useClass: FormulaCurrentConfigService }]);diff --git a/packages/engine-formula/src/models/formula-data.model.ts b/packages/engine-formula/src/models/formula-data.model.tsindex bf097f08eb..17c0177d70 100644--- a/packages/engine-formula/src/models/formula-data.model.ts+++ b/packages/engine-formula/src/models/formula-data.model.ts@@ -29,7 +29,7 @@ import type {IUnitData,IUnitSheetNameMap,} from '../basics/common';-import { LexerTreeBuilder } from '../engine/analysis/lexer-tree-builder';+import { Lexer } from '../engine/analysis/lexer';import type { IFormulaIdMap } from './utils/formula-data-util';import { clearArrayFormulaCellDataByCell, updateFormulaDataByCellValue } from './utils/formula-data-util';@@ -50,7 +50,7 @@ export class FormulaDataModel extends Disposable {constructor(@IUniverInstanceService private readonly _univerInstanceService: IUniverInstanceService,- @Inject(LexerTreeBuilder) private readonly _lexerTreeBuilder: LexerTreeBuilder+ @Inject(Lexer) private readonly _lexer: Lexer) {super();}@@ -405,7 +405,7 @@ export class FormulaDataModel extends Disposable {} else if (typeof deleteFormula === 'string') {const x = cell.x || 0;const y = cell.y || 0;- const offsetFormula = this._lexerTreeBuilder.moveFormulaRefOffset(deleteFormula, x, y);+ const offsetFormula = this._lexer.moveFormulaRefOffset(deleteFormula, x, y);deleteFormulaIdMap.set(formulaId, {r,diff --git a/packages/engine-formula/src/plugin.ts b/packages/engine-formula/src/plugin.tsindex 23ca7762c0..b989733daa 100644--- a/packages/engine-formula/src/plugin.ts+++ b/packages/engine-formula/src/plugin.ts@@ -84,12 +84,14 @@ export class UniverFormulaEnginePlugin extends Plugin {[IDefinedNamesService, { useClass: DefinedNamesService }],[IActiveDirtyManagerService, { useClass: ActiveDirtyManagerService }],[ISuperTableService, { useClass: SuperTableService }],+ [IFormulaCurrentConfigService, { useClass: FormulaCurrentConfigService }],// Models[FormulaDataModel],// Engine[LexerTreeBuilder],+ [Lexer],//Controllers[@@ -109,7 +111,6 @@ export class UniverFormulaEnginePlugin extends Plugin {// Services[CalculateFormulaService],[IOtherFormulaManagerService, { useClass: OtherFormulaManagerService }],- [IFormulaCurrentConfigService, { useClass: FormulaCurrentConfigService }],[IFormulaRuntimeService, { useClass: FormulaRuntimeService }],//Controller@@ -121,7 +122,6 @@ export class UniverFormulaEnginePlugin extends Plugin {[FormulaDependencyGenerator],[Interpreter],[AstTreeBuilder],- [Lexer],// AstNode factory[AstRootNodeFactory],diff --git a/packages/sheets-conditional-formatting/src/services/calculate-unit/highlight-cell.ts b/packages/sheets-conditional-formatting/src/services/calculate-unit/highlight-cell.tsindex 2e58047f09..0c5b1964dd 100644--- a/packages/sheets-conditional-formatting/src/services/calculate-unit/highlight-cell.ts+++ b/packages/sheets-conditional-formatting/src/services/calculate-unit/highlight-cell.ts@@ -17,7 +17,7 @@import type { IStyleBase } from '@univerjs/core';import { CellValueType, ObjectMatrix, Range, Rectangle, Tools } from '@univerjs/core';import dayjs from 'dayjs';-import { deserializeRangeWithSheet, ERROR_TYPE_SET, generateStringWithSequence, LexerTreeBuilder, sequenceNodeType, serializeRange } from '@univerjs/engine-formula';+import { deserializeRangeWithSheet, ERROR_TYPE_SET, generateStringWithSequence, Lexer, sequenceNodeType, serializeRange } from '@univerjs/engine-formula';import { CFNumberOperator, CFRuleType, CFSubRuleType, CFTextOperator, CFTimePeriodOperator } from '../../base/const';import type { IAverageHighlightCell, IConditionFormattingRule, IFormulaHighlightCell, IHighlightCell, INumberHighlightCell, IRankHighlightCell, ITextHighlightCell, ITimePeriodHighlightCell } from '../../models/type';import { ConditionalFormattingFormulaService, FormulaResultStatus } from '../conditional-formatting-formula.service';@@ -91,9 +91,9 @@ export const highlightCellCalculateUnit: ICalculateUnit = {}case CFSubRuleType.formula:{const subRuleConfig = ruleConfig as IFormulaHighlightCell;- const lexerTreeBuilder = context.accessor.get(LexerTreeBuilder);+ const lexer = context.accessor.get(Lexer);const formulaString = subRuleConfig.value;- const sequenceNodes = lexerTreeBuilder.sequenceNodesBuilder(formulaString);+ const sequenceNodes = lexer.sequenceNodesBuilder(formulaString);if (!sequenceNodes) {return {sequenceNodes: null,diff --git a/packages/sheets-data-validation/src/services/dv-custom-formula.service.ts b/packages/sheets-data-validation/src/services/dv-custom-formula.service.tsindex 2d9f7bc39d..c8f9fb600a 100644--- a/packages/sheets-data-validation/src/services/dv-custom-formula.service.ts+++ b/packages/sheets-data-validation/src/services/dv-custom-formula.service.ts@@ -16,7 +16,7 @@import type { IRange, ISheetDataValidationRule } from '@univerjs/core';import { DataValidationType, Disposable, isFormulaString, IUniverInstanceService, ObjectMatrix, Range } from '@univerjs/core';-import { isFormulaTransformable, LexerTreeBuilder, transformFormula } from '@univerjs/engine-formula';+import { isFormulaTransformable, Lexer, transformFormula } from '@univerjs/engine-formula';import { Inject } from '@wendellhu/redi';import { DataValidationModel } from '@univerjs/data-validation';import { RegisterOtherFormulaService } from './register-formula.service';@@ -62,7 +62,7 @@ export class DataValidationCustomFormulaService extends Disposable {constructor(@Inject(RegisterOtherFormulaService) private _registerOtherFormulaService: RegisterOtherFormulaService,- @Inject(LexerTreeBuilder) private _lexerTreeBuilder: LexerTreeBuilder,+ @Inject(Lexer) private _lexer: Lexer,@IUniverInstanceService private readonly _univerInstanceService: IUniverInstanceService,@Inject(DataValidationModel) private readonly _dataValidationModel: DataValidationModel,@Inject(DataValidationCacheService) private readonly _dataValidationCacheService: DataValidationCacheService@@ -181,7 +181,7 @@ export class DataValidationCustomFormulaService extends Disposable {}const isTransformable = isFormulaTransformable(- this._lexerTreeBuilder,+ this._lexer,formula);@@ -193,7 +193,7 @@ export class DataValidationCustomFormulaService extends Disposable {ranges.forEach((range) => {Range.foreach(range, (row, column) => {const relativeFormula = transformFormula(- this._lexerTreeBuilder,+ this._lexer,formula,originRow,originCol,@@ -268,7 +268,7 @@ export class DataValidationCustomFormulaService extends Disposable {}if (isTransformable) {- const relativeText = transformFormula(this._lexerTreeBuilder, formula, originRow, originCol, row, col);+ const relativeText = transformFormula(this._lexer, formula, originRow, originCol, row, col);const formulaId = this._registerFormula(unitId, subUnitId, ruleId, relativeText);formulaMap.setValue(row, col, {// formulaText: relativeText,diff --git a/packages/sheets-formula/src/controllers/__tests__/create-command-test-bed.ts b/packages/sheets-formula/src/controllers/__tests__/create-command-test-bed.tsindex 9c6c5ed69f..65fefb8a8d 100644--- a/packages/sheets-formula/src/controllers/__tests__/create-command-test-bed.ts+++ b/packages/sheets-formula/src/controllers/__tests__/create-command-test-bed.ts@@ -16,7 +16,7 @@import type { IWorkbookData, Workbook } from '@univerjs/core';import { ILogService, IUniverInstanceService, LocaleType, LogLevel, Plugin, PluginType, Univer } from '@univerjs/core';-import { CalculateFormulaService, DefinedNamesService, FormulaCurrentConfigService, FormulaDataModel, FormulaRuntimeService, IDefinedNamesService, IFormulaCurrentConfigService, IFormulaRuntimeService, LexerTreeBuilder } from '@univerjs/engine-formula';+import { CalculateFormulaService, DefinedNamesService, FormulaCurrentConfigService, FormulaDataModel, FormulaRuntimeService, IDefinedNamesService, IFormulaCurrentConfigService, IFormulaRuntimeService, Lexer, LexerTreeBuilder } from '@univerjs/engine-formula';import { SelectionManagerService, SheetInterceptorService } from '@univerjs/sheets';import type { Dependency } from '@wendellhu/redi';import { Inject, Injector } from '@wendellhu/redi';@@ -79,6 +79,7 @@ export function createCommandTestBed(workbookConfig?: IWorkbookData, dependencieinjector.add([CalculateFormulaService]);injector.add([FormulaDataModel]);injector.add([LexerTreeBuilder]);+ injector.add([Lexer]);injector.add([IDefinedNamesService, { useClass: DefinedNamesService }]);injector.add([IFormulaRuntimeService, { useClass: FormulaRuntimeService }]);injector.add([IFormulaCurrentConfigService, { useClass: FormulaCurrentConfigService }]);diff --git a/packages/sheets-formula/src/controllers/__tests__/formula-clipboard.controller.spec.ts b/packages/sheets-formula/src/controllers/__tests__/formula-clipboard.controller.spec.tsindex 16fbd3811e..9ec97b9b85 100644--- a/packages/sheets-formula/src/controllers/__tests__/formula-clipboard.controller.spec.ts+++ b/packages/sheets-formula/src/controllers/__tests__/formula-clipboard.controller.spec.ts@@ -16,7 +16,7 @@import type { ICellData, Nullable, Univer } from '@univerjs/core';import { ICommandService, IUniverInstanceService, ObjectMatrix } from '@univerjs/core';-import { LexerTreeBuilder } from '@univerjs/engine-formula';+import { Lexer } from '@univerjs/engine-formula';import { type ISetRangeValuesMutationParams, SetRangeValuesMutation } from '@univerjs/sheets';import type { ICellDataWithSpanInfo } from '@univerjs/sheets-ui';import { COPY_TYPE, ISelectionRenderService, SelectionRenderService } from '@univerjs/sheets-ui';@@ -30,7 +30,7 @@ describe('Test paste with formula', () => {let univer: Univer;let get: Injector['get'];let commandService: ICommandService;- let lexerTreeBuilder: LexerTreeBuilder;+ let lexer: Lexer;let getValues: (startRow: number,startColumn: number,@@ -45,7 +45,7 @@ describe('Test paste with formula', () => {univer = testBed.univer;get = testBed.get;commandService = get(ICommandService);- lexerTreeBuilder = get(LexerTreeBuilder);+ lexer = get(Lexer);getValues = (startRow: number,@@ -163,7 +163,7 @@ describe('Test paste with formula', () => {matrix,accessor,copyInfo,- lexerTreeBuilder+ lexer);expect(redoUndoList).toStrictEqual(result);@@ -606,7 +606,7 @@ describe('Test paste with formula', () => {matrix,accessor,copyInfo,- lexerTreeBuilder+ lexer);// Randomly generated id, no comparison is madediff --git a/packages/sheets-formula/src/controllers/formula-auto-fill.controller.ts b/packages/sheets-formula/src/controllers/formula-auto-fill.controller.tsindex 7e4e2aa913..27ba600422 100644--- a/packages/sheets-formula/src/controllers/formula-auto-fill.controller.ts+++ b/packages/sheets-formula/src/controllers/formula-auto-fill.controller.ts@@ -24,7 +24,7 @@ import {OnLifecycle,Tools,} from '@univerjs/core';-import { LexerTreeBuilder } from '@univerjs/engine-formula';+import { Lexer } from '@univerjs/engine-formula';import type { AutoFillService, IAutoFillRule, ICopyDataInTypeIndexInfo, ICopyDataPiece } from '@univerjs/sheets-ui';import { APPLY_TYPE, DATA_TYPE, IAutoFillService } from '@univerjs/sheets-ui';import { Inject } from '@wendellhu/redi';@@ -33,7 +33,7 @@ import { Inject } from '@wendellhu/redi';export class FormulaAutoFillController extends Disposable {constructor(@IAutoFillService private readonly _autoFillService: AutoFillService,- @Inject(LexerTreeBuilder) private readonly _lexerTreeBuilder: LexerTreeBuilder+ @Inject(Lexer) private readonly _lexer: Lexer) {super();@@ -107,7 +107,7 @@ export class FormulaAutoFillController extends Disposable {formulaIdMap.set(index, formulaId);const { offsetX, offsetY } = directionToOffset(step, direction);- const shiftedFormula = this._lexerTreeBuilder.moveFormulaRefOffset(+ const shiftedFormula = this._lexer.moveFormulaRefOffset(originalFormula,offsetX,offsetYdiff --git a/packages/sheets-formula/src/controllers/formula-clipboard.controller.ts b/packages/sheets-formula/src/controllers/formula-clipboard.controller.tsindex b5f64ed30c..ab6839ff0f 100644--- a/packages/sheets-formula/src/controllers/formula-clipboard.controller.ts+++ b/packages/sheets-formula/src/controllers/formula-clipboard.controller.ts@@ -25,7 +25,7 @@ import {OnLifecycle,Tools,} from '@univerjs/core';-import { LexerTreeBuilder } from '@univerjs/engine-formula';+import { Lexer } from '@univerjs/engine-formula';import type { ISetRangeValuesMutationParams } from '@univerjs/sheets';import { SetRangeValuesMutation, SetRangeValuesUndoMutationFactory } from '@univerjs/sheets';import type { ICellDataWithSpanInfo, ICopyPastePayload, ISheetClipboardHook, ISheetRangeLocation } from '@univerjs/sheets-ui';@@ -41,7 +41,7 @@ export const DEFAULT_PASTE_FORMULA = 'default-paste-formula';export class FormulaClipboardController extends Disposable {constructor(@IUniverInstanceService private readonly _currentUniverSheet: IUniverInstanceService,- @Inject(LexerTreeBuilder) private readonly _lexerTreeBuilder: LexerTreeBuilder,+ @Inject(Lexer) private readonly _lexer: Lexer,@ISheetClipboardService private readonly _sheetClipboardService: ISheetClipboardService,@Inject(Injector) private readonly _injector: Injector) {@@ -100,7 +100,7 @@ export class FormulaClipboardController extends Disposable {matrix,accessor,copyInfo,- this._lexerTreeBuilder,+ this._lexer,isSpecialPaste));}@@ -116,7 +116,7 @@ export function getSetCellFormulaMutations(copyType: COPY_TYPE;copyRange?: IRange;},- lexerTreeBuilder: LexerTreeBuilder,+ lexer: Lexer,isSpecialPaste = false) {const redoMutationsInfo: IMutationInfo[] = [];@@ -175,7 +175,7 @@ export function getSetCellFormulaMutations(const offsetX = col + startColumn - (copyRangeStartColumn + colIndex);const offsetY = row + startRow - (copyRangeStartRow + rowIndex);- const shiftedFormula = lexerTreeBuilder.moveFormulaRefOffset(originalFormula, offsetX, offsetY);+ const shiftedFormula = lexer.moveFormulaRefOffset(originalFormula, offsetX, offsetY);valueObject.si = formulaId;valueObject.f = shiftedFormula;diff --git a/packages/sheets-formula/src/controllers/formula-editor-show.controller.ts b/packages/sheets-formula/src/controllers/formula-editor-show.controller.tsindex 5d9b4af700..25d69262ee 100644--- a/packages/sheets-formula/src/controllers/formula-editor-show.controller.ts+++ b/packages/sheets-formula/src/controllers/formula-editor-show.controller.ts@@ -29,7 +29,7 @@ import {import {ErrorType,FormulaDataModel,- LexerTreeBuilder,+ Lexer,SetArrayFormulaDataMutation,SetFormulaCalculationResultMutation,} from '@univerjs/engine-formula';@@ -50,7 +50,7 @@ export class FormulaEditorShowController extends Disposable {constructor(@Inject(IEditorBridgeService) private _editorBridgeService: IEditorBridgeService,@Inject(FormulaDataModel) private readonly _formulaDataModel: FormulaDataModel,- @Inject(LexerTreeBuilder) private readonly _lexerTreeBuilder: LexerTreeBuilder,+ @Inject(Lexer) private readonly _lexer: Lexer,@Inject(ThemeService) private readonly _themeService: ThemeService,@IRenderManagerService private readonly _renderManagerService: IRenderManagerService,@ISelectionRenderService private readonly _selectionRenderService: ISelectionRenderService,@@ -115,7 +115,7 @@ export class FormulaEditorShowController extends Disposable {formulaString = originItem.f;}- const newFormulaString = this._lexerTreeBuilder.moveFormulaRefOffset(+ const newFormulaString = this._lexer.moveFormulaRefOffset(formulaString,x,ydiff --git a/packages/sheets-formula/src/controllers/prompt.controller.ts b/packages/sheets-formula/src/controllers/prompt.controller.tsindex 7894ef659e..66fc9eeb8e 100644--- a/packages/sheets-formula/src/controllers/prompt.controller.ts+++ b/packages/sheets-formula/src/controllers/prompt.controller.ts@@ -53,6 +53,7 @@ import {deserializeRangeWithSheet,generateStringWithSequence,getAbsoluteRefTypeWitString,+ Lexer,LexerTreeBuilder,matchRefDrawToken,matchToken,@@ -159,6 +160,7 @@ export class PromptController extends Disposable {@Inject(IEditorBridgeService) private readonly _editorBridgeService: EditorBridgeService,@Inject(IFormulaPromptService) private readonly _formulaPromptService: IFormulaPromptService,@Inject(LexerTreeBuilder) private readonly _lexerTreeBuilder: LexerTreeBuilder,+ @Inject(Lexer) private readonly _lexer: Lexer,@IRenderManagerService private readonly _renderManagerService: IRenderManagerService,@Inject(ThemeService) private readonly _themeService: ThemeService,@Inject(SelectionManagerService) private readonly _selectionManagerService: SelectionManagerService,@@ -811,7 +813,7 @@ export class PromptController extends Disposable {this._contextService.setContextValue(FOCUSING_EDITOR_INPUT_FORMULA, true);const lastSequenceNodes =- this._lexerTreeBuilder.sequenceNodesBuilder(config.dataStream.replace(/\r/g, '').replace(/\n/g, '')) ||+ this._lexer.sequenceNodesBuilder(config.dataStream.replace(/\r/g, '').replace(/\n/g, '')) ||[];this._formulaPromptService.setSequenceNodes(lastSequenceNodes);@@ -1907,7 +1909,7 @@ export class PromptController extends Disposable {});}- const lastSequenceNodes = this._lexerTreeBuilder.sequenceNodesBuilder(formulaString) || [];+ const lastSequenceNodes = this._lexer.sequenceNodesBuilder(formulaString) || [];this._formulaPromptService.setSequenceNodes(lastSequenceNodes);diff --git a/packages/sheets-formula/src/controllers/update-formula.controller.ts b/packages/sheets-formula/src/controllers/update-formula.controller.tsindex aa518292b0..aeac3a8a8d 100644--- a/packages/sheets-formula/src/controllers/update-formula.controller.ts+++ b/packages/sheets-formula/src/controllers/update-formula.controller.ts@@ -34,19 +34,19 @@ import {Tools,} from '@univerjs/core';import type { IFormulaData, IFormulaDataItem, ISequenceNode, IUnitSheetNameMap } from '@univerjs/engine-formula';-import {- deserializeRangeWithSheet,+import { deserializeRangeWithSheet,ErrorType,FormulaDataModel,generateStringWithSequence,initSheetFormulaData,- LexerTreeBuilder,+ Lexer,sequenceNodeType,serializeRangeToRefString,SetArrayFormulaDataMutation,SetFormulaDataMutation,SetNumfmtFormulaDataMutation,} from '@univerjs/engine-formula';+import type {IDeleteRangeMoveLeftCommandParams,IDeleteRangeMoveUpCommandParams,@@ -162,7 +162,7 @@ export class UpdateFormulaController extends Disposable {constructor(@IUniverInstanceService private readonly _univerInstanceService: IUniverInstanceService,@ICommandService private readonly _commandService: ICommandService,- @Inject(LexerTreeBuilder) private readonly _lexerTreeBuilder: LexerTreeBuilder,+ @Inject(Lexer) private readonly _lexer: Lexer,@Inject(FormulaDataModel) private readonly _formulaDataModel: FormulaDataModel,@Inject(SheetInterceptorService) private _sheetInterceptorService: SheetInterceptorService,@Inject(SelectionManagerService) private _selectionManagerService: SelectionManagerService,@@ -674,7 +674,7 @@ export class UpdateFormulaController extends Disposable {const { f: formulaString, x, y, si } = formulaDataItem;- const sequenceNodes = this._lexerTreeBuilder.sequenceNodesBuilder(formulaString);+ const sequenceNodes = this._lexer.sequenceNodesBuilder(formulaString);if (sequenceNodes == null) {return true;diff --git a/packages/sheets-formula/src/services/formula-ref-range.service.ts b/packages/sheets-formula/src/services/formula-ref-range.service.tsindex 9baecac623..97ef9fc5e3 100644--- a/packages/sheets-formula/src/services/formula-ref-range.service.ts+++ b/packages/sheets-formula/src/services/formula-ref-range.service.ts@@ -16,7 +16,7 @@import type { IMutationInfo, IRange } from '@univerjs/core';import { Disposable, DisposableCollection, IUniverInstanceService } from '@univerjs/core';-import { deserializeRangeWithSheet, ErrorType, generateStringWithSequence, LexerTreeBuilder, sequenceNodeType, serializeRange, serializeRangeWithSheet, serializeRangeWithSpreadsheet } from '@univerjs/engine-formula';+import { deserializeRangeWithSheet, ErrorType, generateStringWithSequence, Lexer, sequenceNodeType, serializeRange, serializeRangeWithSheet, serializeRangeWithSpreadsheet } from '@univerjs/engine-formula';import type { EffectRefRangeParams } from '@univerjs/sheets';import { handleDefaultRangeChangeWithEffectRefCommands, RefRangeService } from '@univerjs/sheets';import type { IDisposable } from '@wendellhu/redi';@@ -32,7 +32,7 @@ export type FormulaChangeCallback = (formulaString: string) => {export class FormulaRefRangeService extends Disposable {constructor(@Inject(RefRangeService) private readonly _refRangeService: RefRangeService,- @Inject(LexerTreeBuilder) private readonly _lexerTreeBuilder: LexerTreeBuilder,+ @Inject(Lexer) private readonly _lexer: Lexer,@IUniverInstanceService private readonly _univerInstanceService: IUniverInstanceService) {super();@@ -40,7 +40,7 @@ export class FormulaRefRangeService extends Disposable {registerFormula(formula: string, callback: FormulaChangeCallback): IDisposable {const rangeMap = new Map<string, { unitId: string; subUnitId: string; range: IRange; sheetName: string }>();- const sequenceNodes = this._lexerTreeBuilder.sequenceNodesBuilder(formula);+ const sequenceNodes = this._lexer.sequenceNodesBuilder(formula);const disposableCollection = new DisposableCollection();const handleChange = (params: EffectRefRangeParams) => {const workbook = this._univerInstanceService.getCurrentUniverSheetInstance()!;diff --git a/packages/sheets-ui/src/views/defined-name/DefinedNameInput.tsx b/packages/sheets-ui/src/views/defined-name/DefinedNameInput.tsxindex b7e549477e..4d75697c55 100644--- a/packages/sheets-ui/src/views/defined-name/DefinedNameInput.tsx+++ b/packages/sheets-ui/src/views/defined-name/DefinedNameInput.tsx@@ -21,7 +21,7 @@ import type { IUnitRange, Nullable } from '@univerjs/core';import { AbsoluteRefType, createInternalEditorID, IUniverInstanceService, LocaleService, Tools } from '@univerjs/core';import { useDependency } from '@wendellhu/redi/react-bindings';import { Button, Input, Radio, RadioGroup, Select } from '@univerjs/design';-import { IDefinedNamesService, type IDefinedNamesServiceParam, IFunctionService, isReferenceString, LexerTreeBuilder, operatorToken, serializeRangeToRefString } from '@univerjs/engine-formula';+import { IDefinedNamesService, type IDefinedNamesServiceParam, IFunctionService, isReferenceString, Lexer, operatorToken, serializeRangeToRefString } from '@univerjs/engine-formula';import { ErrorSingle } from '@univerjs/icons';import { hasCJKText } from '@univerjs/engine-render';import styles from './index.module.less';@@ -60,7 +60,7 @@ export const DefinedNameInput = (props: IDefinedNameInputProps) => {const localeService = useDependency(LocaleService);const definedNamesService = useDependency(IDefinedNamesService);const functionService = useDependency(IFunctionService);- const lexerTreeBuilder = useDependency(LexerTreeBuilder);+ const lexer = useDependency(Lexer);if (workbook == null) {return;@@ -185,7 +185,7 @@ export const DefinedNameInput = (props: IDefinedNameInputProps) => {confirm && confirm({id: id || '',name: nameValue,- formulaOrRefString: lexerTreeBuilder.convertRefersToAbsolute(formulaOrRefStringValue, AbsoluteRefType.ALL, AbsoluteRefType.ALL),+ formulaOrRefString: lexer.convertRefersToAbsolute(formulaOrRefStringValue, AbsoluteRefType.ALL, AbsoluteRefType.ALL),comment: commentValue,localSheetId: localSheetIdValue,});