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(sheets-formula-ui): range selector callback not triggered (#4758)

ZhangWei1dfb03439afb
diff --git a/packages/sheets-formula-ui/src/services/range-selector.service.ts b/packages/sheets-formula-ui/src/services/range-selector.service.ts
index fa100ad625..9ed959a286 100644
--- a/packages/sheets-formula-ui/src/services/range-selector.service.ts
+++ b/packages/sheets-formula-ui/src/services/range-selector.service.ts
@@ -23,7 +23,7 @@ export interface IShowRangeSelectorDialogOptions {
initialValue?: IUnitRangeName[];
maxRangeCount?: number;
supportAcrossSheet?: boolean;
- callback: (ranges: IUnitRangeName[], isCancel: boolean) => void;
+ callback: (ranges: IUnitRangeName[]) => void;
}
export class GlobalRangeSelectorService {
@@ -34,9 +34,9 @@ export class GlobalRangeSelectorService {
showRangeSelectorDialog(opts: IShowRangeSelectorDialogOptions) {
const callback = opts.callback;
const promise = new Promise<IUnitRangeName[]>((resolve) => {
- opts.callback = (ranges, isCancel) => {
+ opts.callback = (ranges) => {
resolve(ranges);
- callback(ranges, isCancel);
+ callback(ranges);
};
});
diff --git a/packages/sheets-formula-ui/src/views/range-selector/global.tsx b/packages/sheets-formula-ui/src/views/range-selector/global.tsx
index 48ff699134..5205d98961 100644
--- a/packages/sheets-formula-ui/src/views/range-selector/global.tsx
+++ b/packages/sheets-formula-ui/src/views/range-selector/global.tsx
@@ -15,6 +15,7 @@
*/
import type { IRangeSelectorInstance } from './index';
+import { deserializeRangeWithSheet } from '@univerjs/engine-formula';
import { useDependency, useObservable } from '@univerjs/ui';
import { useEffect, useRef } from 'react';
import { GlobalRangeSelectorService } from '../../services/range-selector.service';
@@ -34,12 +35,16 @@ export const GlobalRangeSelector = () => {
};
}
}, [current]);
+
return (
<RangeSelector
unitId={current?.unitId ?? ''}
subUnitId={current?.subUnitId ?? ''}
hideEditor
selectorRef={instance}
+ onChange={(_, value) => {
+ current?.callback(value?.split(',').map((i) => deserializeRangeWithSheet(i)) ?? []);
+ }}
/>
);
};