Skip to content

Build your own AI office with Univer Office SDK. Bring editing, calculation, collaboration, and file processing into your product for people and AI agents. Built on an extensible open-source core.

fix(sheet): move formula ref (#2078)

Univerfa4ebeaa1d92
diff --git a/packages/core/src/shared/common.ts b/packages/core/src/shared/common.ts
index 192de42dc3..18068f4b52 100644
--- a/packages/core/src/shared/common.ts
+++ b/packages/core/src/shared/common.ts
@@ -22,7 +22,7 @@ import {
VerticalAlign,
WrapStrategy,
} from '../types/enum';
-import type { IRange } from '../types/interfaces';
+import { type IRange, RANGE_TYPE } from '../types/interfaces';
import type { ICellData } from '../types/interfaces/i-cell-data';
import type { IDocumentData } from '../types/interfaces/i-document-data';
import type { IRangeWithCoord, ISelectionCell, ISelectionCellWithCoord } from '../types/interfaces/i-selection-data';
@@ -531,20 +531,24 @@ export function getDocsUpdateBody(model: IDocumentData, segmentId?: string) {
}
export function isValidRange(range: IRange): boolean {
- const { startRow, endRow, startColumn, endColumn } = range;
+ const { startRow, endRow, startColumn, endColumn, rangeType } = range;
if (
startRow < 0
|| startColumn < 0
|| endRow < 0
|| endColumn < 0
- || Number.isNaN(startRow)
- || Number.isNaN(endRow)
- || Number.isNaN(startColumn)
- || Number.isNaN(endColumn)
) {
return false;
}
+ if (!(Number.isNaN(startRow) && Number.isNaN(endRow)) && rangeType === RANGE_TYPE.COLUMN) {
+ return false;
+ }
+
+ if (!(Number.isNaN(startColumn) && Number.isNaN(endColumn)) && rangeType === RANGE_TYPE.ROW) {
+ return false;
+ }
+
return true;
}
diff --git a/packages/core/src/shared/range.ts b/packages/core/src/shared/range.ts
index e7f8636d9a..dd4d6ca03f 100644
--- a/packages/core/src/shared/range.ts
+++ b/packages/core/src/shared/range.ts
@@ -23,7 +23,7 @@ export function moveRangeByOffset(range: IRange, refOffsetX: number, refOffsetY:
const startAbsoluteRefType = newRange.startAbsoluteRefType || AbsoluteRefType.NONE;
const endAbsoluteRefType = newRange.endAbsoluteRefType || AbsoluteRefType.NONE;
- if (startAbsoluteRefType === AbsoluteRefType.ALL && endAbsoluteRefType === AbsoluteRefType.ALL) {
+ if (!ignoreAbsolute && startAbsoluteRefType === AbsoluteRefType.ALL && endAbsoluteRefType === AbsoluteRefType.ALL) {
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.ts
index 0edfb94aaf..a179a27456 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
@@ -431,4 +431,56 @@ describe('lexer nodeMaker test', () => {
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))');
});
});
+
+ describe('moveFormulaRefOffset', () => {
+ it('move all', () => {
+ const result = lexerTreeBuilder.moveFormulaRefOffset('=sum(A1:B1)', 1, 1, false);
+ expect(result).toStrictEqual('=sum(B2:C2)');
+ });
+
+ it('move not first column', () => {
+ const result = lexerTreeBuilder.moveFormulaRefOffset('=sum($A1:B1)', 1, 1, false);
+ expect(result).toStrictEqual('=sum($A2:C2)');
+ });
+
+ it('move not first row', () => {
+ const result = lexerTreeBuilder.moveFormulaRefOffset('=sum(A$1:$B1)', 1, 1, false);
+ expect(result).toStrictEqual('=sum(B$1:$B2)');
+ });
+
+ it('move only column', () => {
+ const result = lexerTreeBuilder.moveFormulaRefOffset('=sum(A:B)', 1, 1, false);
+ expect(result).toStrictEqual('=sum(B:C)');
+ });
+
+ it('move only column absolute end', () => {
+ const result = lexerTreeBuilder.moveFormulaRefOffset('=sum(A:$B)', 1, 1, false);
+ expect(result).toStrictEqual('=sum(B:$B)');
+ });
+
+ it('move only column absolute all', () => {
+ const result = lexerTreeBuilder.moveFormulaRefOffset('=sum($A:$B)', 1, 1, false);
+ expect(result).toStrictEqual('=sum($A:$B)');
+ });
+
+ it('move only row absolute end', () => {
+ const result = lexerTreeBuilder.moveFormulaRefOffset('=sum(1:$3)', 1, 1, false);
+ expect(result).toStrictEqual('=sum(2:$3)');
+ });
+
+ it('move only row absolute all', () => {
+ const result = lexerTreeBuilder.moveFormulaRefOffset('=sum($1:$3)', 1, 1, false);
+ expect(result).toStrictEqual('=sum($1:$3)');
+ });
+
+ it('move omit absolute all', () => {
+ const result = lexerTreeBuilder.moveFormulaRefOffset('=sum($A$1:$B$3)', 1, 1, true);
+ expect(result).toStrictEqual('=sum($B$2:$C$4)');
+ });
+
+ it('move omit absolute column', () => {
+ const result = lexerTreeBuilder.moveFormulaRefOffset('=sum(A$1:B$3)', 1, 1, true);
+ expect(result).toStrictEqual('=sum(B$2:C$4)');
+ });
+ });
});
diff --git a/packages/engine-formula/src/engine/analysis/lexer-tree-builder.ts b/packages/engine-formula/src/engine/analysis/lexer-tree-builder.ts
index aea2b2e83e..4abaadffe0 100644
--- a/packages/engine-formula/src/engine/analysis/lexer-tree-builder.ts
+++ b/packages/engine-formula/src/engine/analysis/lexer-tree-builder.ts
@@ -347,7 +347,7 @@ export class LexerTreeBuilder extends Disposable {
let newRange: IRange = sequenceGrid.range;
- if (newRange.startAbsoluteRefType === AbsoluteRefType.ALL && newRange.endAbsoluteRefType === AbsoluteRefType.ALL) {
+ if (!ignoreAbsolute && newRange.startAbsoluteRefType === AbsoluteRefType.ALL && newRange.endAbsoluteRefType === AbsoluteRefType.ALL) {
newSequenceNodes.push(node);
continue;
} else {
diff --git a/packages/engine-formula/src/engine/utils/reference.ts b/packages/engine-formula/src/engine/utils/reference.ts
index ded2267bb9..b225c31f66 100644
--- a/packages/engine-formula/src/engine/utils/reference.ts
+++ b/packages/engine-formula/src/engine/utils/reference.ts
@@ -33,10 +33,17 @@ export interface IAbsoluteRefTypeForRange {
* @param singleRefString for example A1 or B10, not A1:B10
*/
export function getAbsoluteRefTypeWithSingleString(singleRefString: string) {
- const isColumnAbsolute = singleRefString[0] === '$';
+ let isColumnAbsolute = singleRefString[0] === '$';
const remainChar = singleRefString.substring(1);
- const isRowAbsolute = remainChar.indexOf('$') > -1;
+ let isRowAbsolute = remainChar.indexOf('$') > -1;
+
+
+ if (Tools.isStringNumber(remainChar) && isColumnAbsolute && !isRowAbsolute) {
+ isColumnAbsolute = false;
+ isRowAbsolute = true;
+ }
+
if (isColumnAbsolute && isRowAbsolute) {
return AbsoluteRefType.ALL;