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): fix some formula bugs (#3722)
wpxp123456559825aa850f
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 0bafe25fb4..9ff9d1495e 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@@ -17,9 +17,9 @@import { type IRange, RANGE_TYPE } from '@univerjs/core';import { ErrorType } from '../../basics/error-type';+import { matchToken } from '../../basics/token';import { deserializeRangeWithSheet } from '../utils/reference';import { ErrorValueObject } from '../value-object/base-value-object';-import { matchToken } from '../../basics/token';import { BaseReferenceObject } from './base-reference-object';export class ColumnReferenceObject extends BaseReferenceObject {@@ -64,6 +64,11 @@ export class ColumnReferenceObject extends BaseReferenceObject {const newColumn = newColumnRange.startColumn;+ // if the column is already in the range, return the same object+ if (newColumn >= currentRangeData.startColumn && newColumn <= currentRangeData.endColumn) {+ return this;+ }+const column = currentRangeData.startColumn;if (newColumn > column) {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 4322660641..72e6f06f9b 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@@ -17,9 +17,9 @@import { type IRange, RANGE_TYPE } from '@univerjs/core';import { ErrorType } from '../../basics/error-type';+import { matchToken } from '../../basics/token';import { deserializeRangeWithSheet } from '../utils/reference';import { ErrorValueObject } from '../value-object/base-value-object';-import { matchToken } from '../../basics/token';import { BaseReferenceObject } from './base-reference-object';export class RowReferenceObject extends BaseReferenceObject {@@ -60,6 +60,11 @@ export class RowReferenceObject extends BaseReferenceObject {const newRow = newRowRange.startRow;+ // if the row is already in the range, return the same object+ if (newRow >= currentRangeData.startRow && newRow <= currentRangeData.endRow) {+ return this;+ }+const row = currentRangeData.startRow;if (newRow > row) {diff --git a/packages/sheets-formula-ui/src/controllers/prompt.controller.ts b/packages/sheets-formula-ui/src/controllers/prompt.controller.tsindex aadfd1da17..bbae714eb0 100644--- a/packages/sheets-formula-ui/src/controllers/prompt.controller.ts+++ b/packages/sheets-formula-ui/src/controllers/prompt.controller.ts@@ -952,12 +952,12 @@ export class PromptController extends Disposable {}private _exceedCurrentRange(range: IRange, rowCount: number, columnCount: number) {- const { endRow, endColumn } = range;- if (endRow > rowCount) {+ const { startRow, startColumn } = range;+ if (startRow > rowCount - 1) {return true;}- if (endColumn > columnCount) {+ if (startColumn > columnCount - 1) {return true;}diff --git a/packages/sheets-formula-ui/src/views/more-functions/select-function/SelectFunction.tsx b/packages/sheets-formula-ui/src/views/more-functions/select-function/SelectFunction.tsxindex 5e49a77301..e7fab08922 100644--- a/packages/sheets-formula-ui/src/views/more-functions/select-function/SelectFunction.tsx+++ b/packages/sheets-formula-ui/src/views/more-functions/select-function/SelectFunction.tsx@@ -16,11 +16,13 @@import type { IFunctionInfo, IFunctionParam } from '@univerjs/engine-formula';import type { ISearchItem } from '@univerjs/sheets-formula';-import { LocaleService, useDependency } from '@univerjs/core';+import type { ISidebarMethodOptions } from '@univerjs/ui';+import { LocaleService, useDependency, useObservable } from '@univerjs/core';import { Input, Select } from '@univerjs/design';import { FunctionType } from '@univerjs/engine-formula';import { CheckMarkSingle } from '@univerjs/icons';import { IDescriptionService } from '@univerjs/sheets-formula';+import { ISidebarService } from '@univerjs/ui';import React, { useEffect, useState } from 'react';import { getFunctionTypeValues } from '../../../services/utils';import { FunctionHelp } from '../function-help/FunctionHelp';@@ -42,6 +44,8 @@ export function SelectFunction(props: ISelectFunctionProps) {const [functionInfo, setFunctionInfo] = useState<IFunctionInfo | null>(null);const descriptionService = useDependency(IDescriptionService);const localeService = useDependency(LocaleService);+ const sidebarService = useDependency(ISidebarService);+ const sidebarOptions = useObservable<ISidebarMethodOptions>(sidebarService.sidebarOptions$);const options = getFunctionTypeValues(FunctionType, localeService);options.unshift({@@ -60,6 +64,19 @@ export function SelectFunction(props: ISelectFunctionProps) {setCurrentFunctionInfo(0);}, [selectList]);+ // Reset data when the component enters again+ useEffect(() => {+ if (sidebarOptions?.visible) {+ setSearchText('');+ setSelectList([]);+ setActive(0);+ setTypeSelected(allTypeValue);+ setNameSelected(0);+ setFunctionInfo(null);+ handleSelectChange(allTypeValue);+ }+ }, [sidebarOptions]);+const highlightSearchText = (text: string) => {if (searchText.trim() === '') return text;