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(facade): editing-event not trigger on edit (#4642)
zhangw4914a554e037
diff --git a/examples/src/sheets/main.ts b/examples/src/sheets/main.tsindex 48f053bacc..8c80c2f29f 100644--- a/examples/src/sheets/main.ts+++ b/examples/src/sheets/main.ts@@ -62,6 +62,8 @@ import '@univerjs/sheets-find-replace/facade';import '@univerjs/sheets-drawing-ui/facade';import '@univerjs/sheets-zen-editor/facade';import '@univerjs/sheets-source-binding/facade';+import '@univerjs/sheets-crosshair-highlight/facade';+import '@univerjs/sheets-sort/facade';import '../global.css';import './styles';@@ -175,15 +177,404 @@ declare global {createNewInstance?: typeof createNewInstance;}}-const logService = window.univer!.__getInjector().get(ILogService);-window.univerAPI?.addEvent(window.univerAPI.Event.BeforeSheetEditStart, (params) => {- const { row, column } = params;- if (row === 0 && column === 0) {- params.cancel = true;- }-});+// eslint-disable-next-line max-lines-per-function, complexity+function initEvent() {+ const logService = window.univer!.__getInjector().get(ILogService);++// Workbook Events+ window.univerAPI?.addEvent(window.univerAPI.Event.WorkbookCreated, (params) => {+ logService.log('===WorkbookCreated', params);+ });++ window.univerAPI?.addEvent(window.univerAPI.Event.WorkbookDisposed, (params) => {+ logService.log('===WorkbookDisposed', params);+ });++// Sheet Lifecycle Events+// checked+ window.univerAPI?.addEvent(window.univerAPI.Event.BeforeSheetCreate, (params) => {+ logService.log('===BeforeSheetCreate', params);+ });+// checked+ window.univerAPI?.addEvent(window.univerAPI.Event.SheetCreated, (params) => {+ logService.log('===SheetCreated', params);+ });++// checked+ window.univerAPI?.addEvent(window.univerAPI.Event.BeforeSheetDelete, (params) => {+ logService.log('===BeforeSheetDelete', params);+ });++// checked+ window.univerAPI?.addEvent(window.univerAPI.Event.SheetDeleted, (params) => {+ logService.log('===SheetDeleted', params);+ });++// checked+ window.univerAPI?.addEvent(window.univerAPI.Event.BeforeSheetMove, (params) => {+ logService.log('===BeforeSheetMove', params);+ });++// checked+ window.univerAPI?.addEvent(window.univerAPI.Event.SheetMoved, (params) => {+ logService.log('===SheetMoved', params);+ });++// checked+ window.univerAPI?.addEvent(window.univerAPI.Event.BeforeSheetNameChange, (params) => {+ logService.log('===BeforeSheetNameChange', params);+ });++// checked+ window.univerAPI?.addEvent(window.univerAPI.Event.SheetNameChanged, (params) => {+ logService.log('===SheetNameChanged', params);+ });++// checked+ window.univerAPI?.addEvent(window.univerAPI.Event.BeforeSheetHideChange, (params) => {+ logService.log('===BeforeSheetHideChange', params);+ });++// checked+ window.univerAPI?.addEvent(window.univerAPI.Event.SheetHideChanged, (params) => {+ logService.log('===SheetHideChanged', params);+ });++// checked+ window.univerAPI?.addEvent(window.univerAPI.Event.CellClicked, (params) => {+ logService.log('===CellClicked', params);+ });++// checked+ window.univerAPI?.addEvent(window.univerAPI.Event.CellHover, (params) => {+ logService.log('===CellHover', params);+ });++// checked+ window.univerAPI?.addEvent(window.univerAPI.Event.CellPointerDown, (params) => {+ logService.log('===CellPointerDown', params);+ });++// checked+ window.univerAPI?.addEvent(window.univerAPI.Event.CellPointerUp, (params) => {+ logService.log('===CellPointerUp', params);+ });++// checked+ window.univerAPI?.addEvent(window.univerAPI.Event.CellPointerMove, (params) => {+ logService.log('===CellPointerMove', params);+ });++// checked+ window.univerAPI?.addEvent(window.univerAPI.Event.SelectionChanged, (params) => {+ logService.log('===SelectionChanged', params);+ });++// checked+ window.univerAPI?.addEvent(window.univerAPI.Event.SelectionMoveStart, (params) => {+ logService.log('===SelectionMoveStart', params);+ });++// checked+ window.univerAPI?.addEvent(window.univerAPI.Event.SelectionMoveEnd, (params) => {+ logService.log('===SelectionMoveEnd', params);+ });++// checked+ window.univerAPI?.addEvent(window.univerAPI.Event.SelectionMoving, (params) => {+ logService.log('===SelectionMoving', params);+ });++// checked+ window.univerAPI?.addEvent(window.univerAPI.Event.BeforeSheetEditStart, (params) => {+ logService.log('===BeforeSheetEditStart', params);+ });++// checked+ window.univerAPI?.addEvent(window.univerAPI.Event.SheetEditStarted, (params) => {+ logService.log('===SheetEditStarted', params);+ });++// checked+ window.univerAPI?.addEvent(window.univerAPI.Event.SheetEditChanging, (params) => {+ logService.log('===SheetEditChanging', params);+ });++// checked+ window.univerAPI?.addEvent(window.univerAPI.Event.BeforeSheetEditEnd, (params) => {+ logService.log('===BeforeSheetEditEnd', params);+ });++// checked+ window.univerAPI?.addEvent(window.univerAPI.Event.SheetEditEnded, (params) => {+ logService.log('===SheetEditEnded', params);+ });++// checked+ window.univerAPI?.addEvent(window.univerAPI.Event.SheetValueChanged, (params) => {+ logService.log('===SheetValueChanged', params);+ });++// Clipboard Events+ window.univerAPI?.addEvent(window.univerAPI.Event.BeforeClipboardChange, (params) => {+ logService.log('===BeforeClipboardChange', params);+ });++ window.univerAPI?.addEvent(window.univerAPI.Event.ClipboardChanged, (params) => {+ logService.log('===ClipboardChanged', params);+ });++ window.univerAPI?.addEvent(window.univerAPI.Event.BeforeClipboardPaste, (params) => {+ logService.log('===BeforeClipboardPaste', params);+ });++ window.univerAPI?.addEvent(window.univerAPI.Event.ClipboardPasted, (params) => {+ logService.log('===ClipboardPasted', params);+ });++// checked+ window.univerAPI?.addEvent(window.univerAPI.Event.BeforeGridlineEnableChange, (params) => {+ logService.log('===BeforeGridlineEnableChange', params);+ });++// checked+ window.univerAPI?.addEvent(window.univerAPI.Event.BeforeGridlineColorChange, (params) => {+ logService.log('===BeforeGridlineColorChange', params);+ });++// checked+ window.univerAPI?.addEvent(window.univerAPI.Event.GridlineChanged, (params) => {+ logService.log('===GridlineChanged', params);+ });++// checked+ window.univerAPI?.addEvent(window.univerAPI.Event.BeforeSheetZoomChange, (params) => {+ logService.log('===BeforeSheetZoomChange', params);+ });++// checked+ window.univerAPI?.addEvent(window.univerAPI.Event.SheetZoomChanged, (params) => {+ logService.log('===SheetZoomChanged', params);+ });++// checked+ window.univerAPI?.addEvent(window.univerAPI.Event.Scroll, (params) => {+ logService.log('===Scroll', params);+ });++// checked+ window.univerAPI?.addEvent(window.univerAPI.Event.SheetSkeletonChanged, (params) => {+ logService.log('===SheetSkeletonChanged', params);+ });++// checked+ window.univerAPI?.addEvent(window.univerAPI.Event.BeforeSheetDataValidationAdd, (params) => {+ logService.log('===BeforeSheetDataValidationAdd', params);+ });++// checked+ window.univerAPI?.addEvent(window.univerAPI.Event.SheetDataValidationChanged, (params) => {+ logService.log('===SheetDataValidationChanged', params);+ });++// checked+ window.univerAPI?.addEvent(window.univerAPI.Event.SheetDataValidatorStatusChanged, (params) => {+ logService.log('===SheetDataValidatorStatusChanged', params);+ });++// checked+ window.univerAPI?.addEvent(window.univerAPI.Event.SheetBeforeRangeFilter, (params) => {+ logService.log('===SheetBeforeRangeFilter', params);+ });++// checked+ window.univerAPI?.addEvent(window.univerAPI.Event.SheetRangeFiltered, (params) => {+ logService.log('===SheetRangeFiltered', params);+ });++// checked+ window.univerAPI?.addEvent(window.univerAPI.Event.SheetBeforeRangeSort, (params) => {+ logService.log('===SheetBeforeRangeSort', params);+ });++// checked+ window.univerAPI?.addEvent(window.univerAPI.Event.SheetRangeSorted, (params) => {+ logService.log('===SheetRangeSorted', params);+ });++ window.univerAPI?.addEvent(window.univerAPI.Event.SheetBeforeRangeFilterClear, (params) => {+ logService.log('===SheetBeforeRangeFilterClear', params);+ });++ window.univerAPI?.addEvent(window.univerAPI.Event.SheetRangeFilterCleared, (params) => {+ logService.log('===SheetRangeFilterCleared', params);+ });++// Image Events+ window.univerAPI?.addEvent(window.univerAPI.Event.BeforeOverGridImageInsert, (params) => {+ logService.log('===BeforeOverGridImageInsert', params);+ });++ window.univerAPI?.addEvent(window.univerAPI.Event.OverGridImageInserted, (params) => {+ logService.log('===OverGridImageInserted', params);+ });++ window.univerAPI?.addEvent(window.univerAPI.Event.BeforeOverGridImageChange, (params) => {+ logService.log('===BeforeOverGridImageChange', params);+ });++ window.univerAPI?.addEvent(window.univerAPI.Event.OverGridImageChanged, (params) => {+ logService.log('===OverGridImageChanged', params);+ });++ window.univerAPI?.addEvent(window.univerAPI.Event.BeforeOverGridImageRemove, (params) => {+ logService.log('===BeforeOverGridImageRemove', params);+ });++ window.univerAPI?.addEvent(window.univerAPI.Event.OverGridImageRemoved, (params) => {+ logService.log('===OverGridImageRemoved', params);+ });++ window.univerAPI?.addEvent(window.univerAPI.Event.BeforeOverGridImageSelect, (params) => {+ logService.log('===BeforeOverGridImageSelect', params);+ });++ window.univerAPI?.addEvent(window.univerAPI.Event.OverGridImageSelected, (params) => {+ logService.log('===OverGridImageSelected', params);+ });++// checked+ window.univerAPI?.addEvent(window.univerAPI.Event.BeforeCommentAdd, (params) => {+ logService.log('===BeforeCommentAdd', params);+ });++// checked+ window.univerAPI?.addEvent(window.univerAPI.Event.CommentAdded, (params) => {+ logService.log('===CommentAdded', params);+ });++// checked+ window.univerAPI?.addEvent(window.univerAPI.Event.BeforeCommentUpdate, (params) => {+ logService.log('===BeforeCommentUpdate', params);+ });++// checked+ window.univerAPI?.addEvent(window.univerAPI.Event.CommentUpdated, (params) => {+ logService.log('===CommentUpdated', params);+ });++// checked+ window.univerAPI?.addEvent(window.univerAPI.Event.BeforeCommentDeleted, (params) => {+ logService.log('===BeforeCommentDeleted', params);+ });++// checked+ window.univerAPI?.addEvent(window.univerAPI.Event.CommentDeleted, (params) => {+ logService.log('===CommentDeleted', params);+ });++// checked+ window.univerAPI?.addEvent(window.univerAPI.Event.BeforeCommentResolve, (params) => {+ logService.log('===BeforeCommentResolve', params);+ });++// checked+ window.univerAPI?.addEvent(window.univerAPI.Event.CommentResolved, (params) => {+ logService.log('===CommentResolved', params);+ });++// checked+ window.univerAPI?.addEvent(window.univerAPI.Event.RowHeaderClick, (params) => {+ logService.log('===RowHeaderClick', params);+ });++// checked+ window.univerAPI?.addEvent(window.univerAPI.Event.RowHeaderHover, (params) => {+ logService.log('===RowHeaderHover', params);+ });++// checked+ window.univerAPI?.addEvent(window.univerAPI.Event.RowHeaderPointerDown, (params) => {+ logService.log('===RowHeaderPointerDown', params);+ });++// checked+ window.univerAPI?.addEvent(window.univerAPI.Event.RowHeaderPointerUp, (params) => {+ logService.log('===RowHeaderPointerUp', params);+ });++// checked+ window.univerAPI?.addEvent(window.univerAPI.Event.ColumnHeaderClick, (params) => {+ logService.log('===ColumnHeaderClick', params);+ });++// checked+ window.univerAPI?.addEvent(window.univerAPI.Event.ColumnHeaderHover, (params) => {+ logService.log('===ColumnHeaderHover', params);+ });++// checked+ window.univerAPI?.addEvent(window.univerAPI.Event.ColumnHeaderPointerDown, (params) => {+ logService.log('===ColumnHeaderPointerDown', params);+ });++// checked+ window.univerAPI?.addEvent(window.univerAPI.Event.ColumnHeaderPointerUp, (params) => {+ logService.log('===ColumnHeaderPointerUp', params);+ });++// checked+ window.univerAPI?.addEvent(window.univerAPI.Event.BeforeSheetLinkAdd, (params) => {+ logService.log('===BeforeSheetLinkAdd', params);+ });++// checked+ window.univerAPI?.addEvent(window.univerAPI.Event.BeforeSheetLinkUpdate, (params) => {+ logService.log('===BeforeSheetLinkUpdate', params);+ });++// checked+ window.univerAPI?.addEvent(window.univerAPI.Event.BeforeSheetLinkCancel, (params) => {+ logService.log('===BeforeSheetLinkCancel', params);+ });++// Drag and Drop Events+ window.univerAPI?.addEvent(window.univerAPI.Event.DragOver, (params) => {+ logService.log('===DragOver', params);+ });++ window.univerAPI?.addEvent(window.univerAPI.Event.Drop, (params) => {+ logService.log('===Drop', params);+ });++// checked+ window.univerAPI?.addEvent(window.univerAPI.Event.CrosshairHighlightColorChanged, (params) => {+ logService.log('===CrosshairHighlightColorChanged', params);+ });++// checked+ window.univerAPI?.addEvent(window.univerAPI.Event.CrosshairHighlightEnabledChanged, (params) => {+ logService.log('===CrosshairHighlightEnabledChanged', params);+ });++// checked+ window.univerAPI?.addEvent(window.univerAPI.Event.BeforeSheetEditStart, (params) => {+ const { row, column } = params;+ if (row === 0 && column === 0) {+ params.cancel = true;+ }+ });++// checked+ window.univerAPI?.addEvent(window.univerAPI.Event.ActiveSheetChanged, (params) => {+ logService.log('===active sheet changed', params);+ });++// checked+ window.univerAPI?.addEvent(window.univerAPI.Event.SheetEditChanging, (params) => {+ logService.log('===SheetEditChanging', params);+ });+}-window.univerAPI?.addEvent(window.univerAPI.Event.ActiveSheetChanged, (params) => {- logService.log('===active sheet changed', params);-});+// initEvent();diff --git a/packages/core/src/facade/f-event-registry.ts b/packages/core/src/facade/f-event-registry.tsindex 0dfe010212..c7df0ac8e0 100644--- a/packages/core/src/facade/f-event-registry.ts+++ b/packages/core/src/facade/f-event-registry.ts@@ -40,6 +40,10 @@ export class FEventRegistry {this._eventHandlerMap.set(event, new Set([handler]));}+ if (this._ensureEventRegistry(event).getData().length) {+ this._initEventHandler(event);+ }+return toDisposable(() => {this._eventHandlerMap.get(event)?.delete(handler);this._eventHandlerRegisted.get(event)?.get(handler)?.dispose();@@ -58,6 +62,20 @@ export class FEventRegistry {}}+ private _initEventHandler(event: string): void {+ let current = this._eventHandlerRegisted.get(event);+ const handlers = this._eventHandlerMap.get(event);+ if (!handlers) return;++ if (!current) {+ current = new Map();+ this._eventHandlerRegisted.set(event, current);+ handlers?.forEach((handler) => {+ current?.set(handler, toDisposable(handler()));+ });+ }+ }+/*** Add an event listener* @param {string} event key of event@@ -72,16 +90,7 @@ export class FEventRegistry {*/addEvent<T extends keyof IEventParamConfig>(event: T, callback: (params: IEventParamConfig[T]) => void): IDisposable {this._ensureEventRegistry(event).add(callback);- let current = this._eventHandlerRegisted.get(event);- const handlers = this._eventHandlerMap.get(event);- if (!current) {- current = new Map();- this._eventHandlerRegisted.set(event, current);- handlers?.forEach((handler) => {- current?.set(handler, toDisposable(handler()));- });- }-+ this._initEventHandler(event);return toDisposable(() => this.removeEvent(event, callback));}diff --git a/packages/core/src/facade/f-univer.ts b/packages/core/src/facade/f-univer.tsindex 8ddacd96ee..42fd345f37 100644--- a/packages/core/src/facade/f-univer.ts+++ b/packages/core/src/facade/f-univer.ts@@ -379,6 +379,7 @@ export class FUniver extends Disposable {* ```*/addEvent<T extends keyof IEventParamConfig>(event: T, callback: (params: IEventParamConfig[T]) => void): IDisposable {+ if (!event || !callback) throw new Error('Cannot add empty event');return this._eventRegistry.addEvent(event, callback);}diff --git a/packages/sheets-crosshair-highlight/src/facade/f-univer.ts b/packages/sheets-crosshair-highlight/src/facade/f-univer.tsindex ea525738a2..70a2273984 100644--- a/packages/sheets-crosshair-highlight/src/facade/f-univer.ts+++ b/packages/sheets-crosshair-highlight/src/facade/f-univer.ts@@ -19,8 +19,8 @@ import type { IEventBase } from '@univerjs/core/facade';import type { ISetCrosshairHighlightColorOperationParams } from '@univerjs/sheets-crosshair-highlight';import type { FWorkbook, FWorksheet } from '@univerjs/sheets/facade';import { ICommandService } from '@univerjs/core';-import { FUniver } from '@univerjs/core/facade';-import { CROSSHAIR_HIGHLIGHT_COLORS, DisableCrosshairHighlightOperation, EnableCrosshairHighlightOperation, SetCrosshairHighlightColorOperation, SheetsCrosshairHighlightService } from '@univerjs/sheets-crosshair-highlight';+import { FEventName, FUniver } from '@univerjs/core/facade';+import { CROSSHAIR_HIGHLIGHT_COLORS, DisableCrosshairHighlightOperation, EnableCrosshairHighlightOperation, SetCrosshairHighlightColorOperation, SheetsCrosshairHighlightService, ToggleCrosshairHighlightOperation } from '@univerjs/sheets-crosshair-highlight';/*** @ignore@@ -168,7 +168,11 @@ export class FUniverCrosshairHighlightMixin extends FUniver implements IFUniverCthis.registerEventHandler(this.Event.CrosshairHighlightEnabledChanged,() => commandService.onCommandExecuted((commandInfo) => {- if (commandInfo.id === EnableCrosshairHighlightOperation.id || commandInfo.id === DisableCrosshairHighlightOperation.id) {+ if (+ commandInfo.id === EnableCrosshairHighlightOperation.id ||+ commandInfo.id === DisableCrosshairHighlightOperation.id ||+ commandInfo.id === ToggleCrosshairHighlightOperation.id+ ) {const activeSheet = this.getActiveSheet();if (!activeSheet) return;this.fireEvent(this.Event.CrosshairHighlightEnabledChanged, {@@ -226,7 +230,9 @@ export class FUniverCrosshairHighlightMixin extends FUniver implements IFUniverC}}+FEventName.extend(FSheetCrosshairHighlightEventMixin);FUniver.extend(FUniverCrosshairHighlightMixin);+declare module '@univerjs/core/facade' {// eslint-disable-next-line ts/naming-conventioninterface FUniver extends IFUniverCrosshairHighlightMixin {}diff --git a/packages/sheets-formula-ui/src/views/formula-editor/index.tsx b/packages/sheets-formula-ui/src/views/formula-editor/index.tsxindex f2a6f9cb2c..fae2a051ad 100644--- a/packages/sheets-formula-ui/src/views/formula-editor/index.tsx+++ b/packages/sheets-formula-ui/src/views/formula-editor/index.tsx@@ -38,6 +38,7 @@ import { findIndexFromSequenceNodes, findRefSequenceIndex } from '../range-selecimport { HelpFunction } from './help-function/HelpFunction';import { useFormulaSelecting } from './hooks/use-formula-selection';import { useSheetSelectionChange } from './hooks/use-sheet-selection-change';+import { useStateRef } from './hooks/use-state-ref';import { useVerify } from './hooks/use-verify';import styles from './index.module.less';import { SearchFunction } from './search-function/SearchFunction';@@ -128,6 +129,7 @@ export function FormulaEditor(props: IFormulaEditorProps) {useObservable(document?.change$);const getFormulaToken = useFormulaToken();const formulaText = BuildTextUtils.transform.getPlainText(document?.getBody()?.dataStream ?? '');+ const formulaTextRef = useStateRef(formulaText);const formulaWithoutEqualSymbol = useMemo(() => getFormulaText(formulaText), [formulaText]);const sequenceNodes = useMemo(() => getFormulaToken(formulaWithoutEqualSymbol), [formulaWithoutEqualSymbol, getFormulaToken]);const { isSelecting, isSelectingRef } = useFormulaSelecting({ unitId, subUnitId, editorId, isFocus, disableOnClick: disableSelectionOnClick });@@ -281,7 +283,9 @@ export function FormulaEditor(props: IFormulaEditorProps) {editor,handleSelectionChange);- useSwitchSheet(isFocus && Boolean(isSelecting && docFocusing), unitId, isSupportAcrossSheet, isFocusSet, onBlur, noop);+ useSwitchSheet(isFocus && Boolean(isSelecting && docFocusing), unitId, isSupportAcrossSheet, isFocusSet, onBlur, () => {+ highlight(formulaTextRef.current, false, true);+ });const handleFunctionSelect = (res: { text: string; offset: number }) => {if (res) {diff --git a/packages/sheets-formula-ui/src/views/range-selector/hooks/use-highlight.ts b/packages/sheets-formula-ui/src/views/range-selector/hooks/use-highlight.tsindex da0963e15b..dbdc962a3b 100644--- a/packages/sheets-formula-ui/src/views/range-selector/hooks/use-highlight.ts+++ b/packages/sheets-formula-ui/src/views/range-selector/hooks/use-highlight.ts@@ -93,6 +93,8 @@ export function calcHighlightRanges(opts: {}const range = setEndForRange(rawRange, worksheet.getRowCount(), worksheet.getColumnCount());+ range.unitId = unitId;+ range.sheetId = currentSheetId;selectionWithStyle.push({range,primary: null,diff --git a/packages/sheets-sort/src/facade/f-event.ts b/packages/sheets-sort/src/facade/f-event.tsindex 266ed4a7fa..988fe1978d 100644--- a/packages/sheets-sort/src/facade/f-event.ts+++ b/packages/sheets-sort/src/facade/f-event.ts@@ -57,9 +57,9 @@ export interface IFSheetSortEventMixin {SheetBeforeRangeSort: 'SheetBeforeRangeSort';}-export class FSheetSortEventName extends FEventName implements IFSheetSortEventMixin {- override readonly SheetRangeSorted = 'SheetRangeSorted' as const;- override readonly SheetBeforeRangeSort = 'SheetBeforeRangeSort' as const;+export class FSheetSortEventName implements IFSheetSortEventMixin {+ get SheetRangeSorted(): 'SheetRangeSorted' { return 'SheetRangeSorted' as const; }+ get SheetBeforeRangeSort(): 'SheetBeforeRangeSort' { return 'SheetBeforeRangeSort' as const; }}interface ISortColumn {@@ -84,12 +84,6 @@ export interface ISheetRangeSortEventParamConfig {FEventName.extend(FSheetEventName);-declare module '@univerjs/core/facade' {- // eslint-disable-next-line ts/naming-convention- interface FEventName extends IFSheetSortEventMixin { }- interface IEventParamConfig extends ISheetRangeSortEventParamConfig { }-}-class FUniverSheetsSortEventMixin extends FUniver {/*** @ignore@@ -160,3 +154,10 @@ class FUniverSheetsSortEventMixin extends FUniver {}FUniver.extend(FUniverSheetsSortEventMixin);+FEventName.extend(FSheetSortEventName);++declare module '@univerjs/core/facade' {+ // eslint-disable-next-line ts/naming-convention+ interface FEventName extends IFSheetSortEventMixin { }+ interface IEventParamConfig extends ISheetRangeSortEventParamConfig { }+}diff --git a/packages/sheets-thread-comment/src/facade/f-univer.ts b/packages/sheets-thread-comment/src/facade/f-univer.tsindex 21938bdff5..d2da527a8c 100644--- a/packages/sheets-thread-comment/src/facade/f-univer.ts+++ b/packages/sheets-thread-comment/src/facade/f-univer.ts@@ -19,7 +19,7 @@ import type { IAddCommentCommandParams, IDeleteCommentCommandParams, IResolveComimport type { IBeforeSheetCommentAddEvent, IBeforeSheetCommentDeleteEvent, IBeforeSheetCommentUpdateEvent, ISheetCommentAddEvent, ISheetCommentDeleteEvent, ISheetCommentResolveEvent, ISheetCommentUpdateEvent } from './f-event';import { CanceledError, ICommandService, RichTextValue } from '@univerjs/core';import { FUniver } from '@univerjs/core/facade';-import { AddCommentCommand, DeleteCommentCommand, ResolveCommentCommand, UpdateCommentCommand } from '@univerjs/thread-comment';+import { AddCommentCommand, DeleteCommentCommand, DeleteCommentTreeCommand, ResolveCommentCommand, UpdateCommentCommand } from '@univerjs/thread-comment';import { FTheadCommentBuilder, FTheadCommentItem } from './f-thread-comment';/**@@ -64,7 +64,6 @@ export class FUniverCommentMixin extends FUniver implements IFUniverCommentMixin// eslint-disable-next-line max-lines-per-functionoverride _initialize(injector: Injector): void {const commandService = injector.get(ICommandService);-// After command eventsthis.registerEventHandler(this.Event.CommentAdded,@@ -121,7 +120,7 @@ export class FUniverCommentMixin extends FUniver implements IFUniverCommentMixinthis.registerEventHandler(this.Event.CommentDeleted,() => commandService.onCommandExecuted((commandInfo) => {- if (commandInfo.id !== DeleteCommentCommand.id) return;+ if (commandInfo.id !== DeleteCommentCommand.id && commandInfo.id !== DeleteCommentTreeCommand.id) return;const params = commandInfo.params as { unitId: string; subUnitId: string; sheetId: string };if (!params) return;const workbook = params.unitId ? this.getUniverSheet(params.unitId) : this.getActiveWorkbook?.();@@ -231,7 +230,7 @@ export class FUniverCommentMixin extends FUniver implements IFUniverCommentMixinthis.registerEventHandler(this.Event.BeforeCommentDeleted,() => commandService.beforeCommandExecuted((commandInfo) => {- if (commandInfo.id !== DeleteCommentCommand.id) return;+ if (commandInfo.id !== DeleteCommentCommand.id && commandInfo.id !== DeleteCommentTreeCommand.id) return;const params = commandInfo.params as { unitId: string; subUnitId: string; sheetId: string };if (!params) return;const workbook = params.unitId ? this.getUniverSheet(params.unitId) : this.getActiveWorkbook?.();diff --git a/packages/sheets-thread-comment/src/facade/index.ts b/packages/sheets-thread-comment/src/facade/index.tsindex 98110496bd..215e41bfd4 100644--- a/packages/sheets-thread-comment/src/facade/index.ts+++ b/packages/sheets-thread-comment/src/facade/index.ts@@ -18,10 +18,12 @@ import './f-range';import './f-workbook';import './f-worksheet';import './f-event';+import './f-univer';export type * from './f-event';export type * from './f-range';export type * from './f-thread-comment';export { FThreadComment } from './f-thread-comment';+export type * from './f-univer';export type * from './f-workbook';export type * from './f-worksheet';diff --git a/packages/sheets-ui/src/commands/commands/set-zoom-ratio.command.ts b/packages/sheets-ui/src/commands/commands/set-zoom-ratio.command.tsindex af03ec047a..93774762ec 100644--- a/packages/sheets-ui/src/commands/commands/set-zoom-ratio.command.ts+++ b/packages/sheets-ui/src/commands/commands/set-zoom-ratio.command.ts@@ -71,7 +71,7 @@ export const ChangeZoomRatioCommand: ICommand<IChangeZoomRatioCommandParams> = {export const SetZoomRatioCommand: ICommand<ISetZoomRatioCommandParams> = {id: 'sheet.command.set-zoom-ratio',type: CommandType.COMMAND,- handler: async (accessor, params) => {+ handler: (accessor, params) => {if (!params) {return false;}diff --git a/packages/sheets-ui/src/facade/f-event.ts b/packages/sheets-ui/src/facade/f-event.tsindex dea5900040..b6987a76cd 100644--- a/packages/sheets-ui/src/facade/f-event.ts+++ b/packages/sheets-ui/src/facade/f-event.ts@@ -541,126 +541,134 @@ export interface IFSheetsUIEventNameMixin {}-export class FSheetsUIEventName extends FEventName implements IFSheetsUIEventNameMixin {- override get BeforeClipboardChange(): 'BeforeClipboardChange' {+export class FSheetsUIEventName implements IFSheetsUIEventNameMixin {+ get BeforeClipboardChange(): 'BeforeClipboardChange' {return 'BeforeClipboardChange' as const;}- override get ClipboardChanged(): 'ClipboardChanged' {+ get ClipboardChanged(): 'ClipboardChanged' {return 'ClipboardChanged' as const;}- override get BeforeClipboardPaste(): 'BeforeClipboardPaste' {+ get BeforeClipboardPaste(): 'BeforeClipboardPaste' {return 'BeforeClipboardPaste' as const;}- override get ClipboardPasted(): 'ClipboardPasted' {+ get ClipboardPasted(): 'ClipboardPasted' {return 'ClipboardPasted' as const;}- override get BeforeSheetEditStart(): 'BeforeSheetEditStart' {+ get BeforeSheetEditStart(): 'BeforeSheetEditStart' {return 'BeforeSheetEditStart';}- override get SheetEditStarted(): 'SheetEditStarted' {+ get SheetEditStarted(): 'SheetEditStarted' {return 'SheetEditStarted';}- override get SheetEditChanging(): 'SheetEditChanging' {+ get SheetEditChanging(): 'SheetEditChanging' {return 'SheetEditChanging';}- override get BeforeSheetEditEnd(): 'BeforeSheetEditEnd' {+ get BeforeSheetEditEnd(): 'BeforeSheetEditEnd' {return 'BeforeSheetEditEnd';}- override get SheetEditEnded(): 'SheetEditEnded' {+ get SheetEditEnded(): 'SheetEditEnded' {return 'SheetEditEnded';}- override get CellClicked(): 'CellClicked' {+ get CellClicked(): 'CellClicked' {return CellFEventName.CellClicked;}- override get CellHover(): 'CellHover' {+ get CellHover(): 'CellHover' {return CellFEventName.CellHover;}- override get CellPointerDown(): 'CellPointerDown' {+ get CellPointerDown(): 'CellPointerDown' {return CellFEventName.CellPointerDown;}- override get CellPointerUp(): 'CellPointerUp' {+ get CellPointerUp(): 'CellPointerUp' {return CellFEventName.CellPointerUp;}- override get CellPointerMove(): 'CellPointerMove' {+ get CellPointerMove(): 'CellPointerMove' {return CellFEventName.CellPointerMove;}- override get DragOver(): 'DragOver' {+ get DragOver(): 'DragOver' {return 'DragOver' as const;}- override get Drop(): 'Drop' {+ get Drop(): 'Drop' {return 'Drop' as const;}- override get Scroll(): 'Scroll' {+ get Scroll(): 'Scroll' {return 'Scroll' as const;}- override get SelectionMoveStart(): 'SelectionMoveStart' {+ get SelectionMoveStart(): 'SelectionMoveStart' {return 'SelectionMoveStart' as const;}- override get SelectionChanged(): 'SelectionChanged' {+ get SelectionChanged(): 'SelectionChanged' {return 'SelectionChanged' as const;}- override get SelectionMoving(): 'SelectionMoving' {+ get SelectionMoving(): 'SelectionMoving' {return 'SelectionMoving' as const;}- override get SelectionMoveEnd(): 'SelectionMoveEnd' {+ get SelectionMoveEnd(): 'SelectionMoveEnd' {return 'SelectionMoveEnd' as const;}- override get RowHeaderClick(): 'RowHeaderClick' {+ get RowHeaderClick(): 'RowHeaderClick' {return 'RowHeaderClick' as const;}- override get RowHeaderPointerDown(): 'RowHeaderPointerDown' {+ get RowHeaderPointerDown(): 'RowHeaderPointerDown' {return 'RowHeaderPointerDown' as const;}- override get RowHeaderPointerUp(): 'RowHeaderPointerUp' {+ get RowHeaderPointerUp(): 'RowHeaderPointerUp' {return 'RowHeaderPointerUp' as const;}- override get RowHeaderHover(): 'RowHeaderHover' {+ get RowHeaderHover(): 'RowHeaderHover' {return 'RowHeaderHover' as const;}- override get ColumnHeaderClick(): 'ColumnHeaderClick' {+ get ColumnHeaderClick(): 'ColumnHeaderClick' {return 'ColumnHeaderClick' as const;}- override get ColumnHeaderPointerDown(): 'ColumnHeaderPointerDown' {+ get ColumnHeaderPointerDown(): 'ColumnHeaderPointerDown' {return 'ColumnHeaderPointerDown' as const;}- override get ColumnHeaderPointerUp(): 'ColumnHeaderPointerUp' {+ get ColumnHeaderPointerUp(): 'ColumnHeaderPointerUp' {return 'ColumnHeaderPointerUp' as const;}- override get ColumnHeaderHover(): 'ColumnHeaderHover' {+ get ColumnHeaderHover(): 'ColumnHeaderHover' {return 'ColumnHeaderHover' as const;}- override get SheetSkeletonChanged(): 'SheetSkeletonChanged' {+ get SheetSkeletonChanged(): 'SheetSkeletonChanged' {return 'SheetSkeletonChanged' as const;}++ get BeforeSheetZoomChange(): 'BeforeSheetZoomChange' {+ return 'BeforeSheetZoomChange' as const;+ }++ get SheetZoomChanged(): 'SheetZoomChanged' {+ return 'SheetZoomChanged' as const;+ }}/**diff --git a/packages/sheets-ui/src/facade/f-univer.ts b/packages/sheets-ui/src/facade/f-univer.tsindex 0a6d0c0ac6..26f97ea895 100644--- a/packages/sheets-ui/src/facade/f-univer.ts+++ b/packages/sheets-ui/src/facade/f-univer.ts@@ -231,7 +231,7 @@ export class FUniverSheetsUIMixin extends FUniver implements IFUniverSheetsUIMix() => commandService.onCommandExecuted((commandInfo) => {if (commandInfo.id !== RichTextEditingMutation.id) return;- const target = this.getCommandSheetTarget(commandInfo);+ const target = this.getActiveSheet();if (!target) return;const { workbook, worksheet } = target;diff --git a/packages/sheets-zen-editor/src/facade/f-univer.ts b/packages/sheets-zen-editor/src/facade/f-univer.tsindex 7f5c48f5d8..e5edd8adae 100644--- a/packages/sheets-zen-editor/src/facade/f-univer.ts+++ b/packages/sheets-zen-editor/src/facade/f-univer.ts@@ -171,7 +171,7 @@ export class FUniverSheetsZenEditorMixin extends FUniver implements IFUniverSheethis.Event.SheetEditChanging,() => commandService.onCommandExecuted((commandInfo) => {if (commandInfo.id === RichTextEditingMutation.id) {- const target = this.getCommandSheetTarget(commandInfo);+ const target = this.getActiveSheet();if (!target) {return;}diff --git a/packages/sheets/src/basics/const/command-listener-const.ts b/packages/sheets/src/basics/const/command-listener-const.tsindex fd438f4900..ec41665ec8 100644--- a/packages/sheets/src/basics/const/command-listener-const.ts+++ b/packages/sheets/src/basics/const/command-listener-const.ts@@ -252,11 +252,13 @@ export function getValueChangedEffectedRange(commandInfo: ICommandInfo): { unitIswitch (commandInfo.id) {case SheetValueChangeType.SET_RANGE_VALUES: {const params = commandInfo.params as ISetRangeValuesMutationParams;+ const range = new ObjectMatrix(params.cellValue).getDataRange();+ if (range.endRow === -1) return [];return params.cellValue? [{unitId: params.unitId,subUnitId: params.subUnitId,- range: new ObjectMatrix(params.cellValue).getDataRange(),+ range,}]: [];}diff --git a/packages/sheets/src/facade/f-event.ts b/packages/sheets/src/facade/f-event.tsindex d13b340e0f..0fa6a42582 100644--- a/packages/sheets/src/facade/f-event.ts+++ b/packages/sheets/src/facade/f-event.ts@@ -581,84 +581,84 @@ export interface ISheetEventParamConfig {SheetValueChanged: ISheetValueChangedEvent;}-export class FSheetEventName extends FEventName implements IFSheetEventMixin {- override get SheetCreated(): 'SheetCreated' {+export class FSheetEventName implements IFSheetEventMixin {+ get SheetCreated(): 'SheetCreated' {return 'SheetCreated' as const;}- override get BeforeSheetCreate(): 'BeforeSheetCreate' {+ get BeforeSheetCreate(): 'BeforeSheetCreate' {return 'BeforeSheetCreate' as const;}- override get WorkbookCreated(): 'WorkbookCreated' {+ get WorkbookCreated(): 'WorkbookCreated' {return 'WorkbookCreated' as const;}- override get WorkbookDisposed(): 'WorkbookDisposed' {+ get WorkbookDisposed(): 'WorkbookDisposed' {return 'WorkbookDisposed' as const;}- override get GridlineChanged(): 'GridlineChanged' {+ get GridlineChanged(): 'GridlineChanged' {return 'GridlineChanged' as const;}- override get BeforeGridlineEnableChange(): 'BeforeGridlineEnableChange' {+ get BeforeGridlineEnableChange(): 'BeforeGridlineEnableChange' {return 'BeforeGridlineEnableChange' as const;}- override get BeforeGridlineColorChange(): 'BeforeGridlineColorChange' {+ get BeforeGridlineColorChange(): 'BeforeGridlineColorChange' {return 'BeforeGridlineColorChange' as const;}- override get BeforeActiveSheetChange(): 'BeforeActiveSheetChange' {+ get BeforeActiveSheetChange(): 'BeforeActiveSheetChange' {return 'BeforeActiveSheetChange' as const;}- override get ActiveSheetChanged(): 'ActiveSheetChanged' {+ get ActiveSheetChanged(): 'ActiveSheetChanged' {return 'ActiveSheetChanged' as const;}- override get SheetDeleted(): 'SheetDeleted' {+ get SheetDeleted(): 'SheetDeleted' {return 'SheetDeleted' as const;}- override get BeforeSheetDelete(): 'BeforeSheetDelete' {+ get BeforeSheetDelete(): 'BeforeSheetDelete' {return 'BeforeSheetDelete' as const;}- override get SheetMoved(): 'SheetMoved' {+ get SheetMoved(): 'SheetMoved' {return 'SheetMoved' as const;}- override get BeforeSheetMove(): 'BeforeSheetMove' {+ get BeforeSheetMove(): 'BeforeSheetMove' {return 'BeforeSheetMove' as const;}- override get SheetNameChanged(): 'SheetNameChanged' {+ get SheetNameChanged(): 'SheetNameChanged' {return 'SheetNameChanged' as const;}- override get BeforeSheetNameChange(): 'BeforeSheetNameChange' {+ get BeforeSheetNameChange(): 'BeforeSheetNameChange' {return 'BeforeSheetNameChange' as const;}- override get SheetTabColorChanged(): 'SheetTabColorChanged' {+ get SheetTabColorChanged(): 'SheetTabColorChanged' {return 'SheetTabColorChanged' as const;}- override get BeforeSheetTabColorChange(): 'BeforeSheetTabColorChange' {+ get BeforeSheetTabColorChange(): 'BeforeSheetTabColorChange' {return 'BeforeSheetTabColorChange' as const;}- override get SheetHideChanged(): 'SheetHideChanged' {+ get SheetHideChanged(): 'SheetHideChanged' {return 'SheetHideChanged' as const;}- override get BeforeSheetHideChange(): 'BeforeSheetHideChange' {+ get BeforeSheetHideChange(): 'BeforeSheetHideChange' {return 'BeforeSheetHideChange' as const;}- override get SheetValueChanged(): 'SheetValueChanged' {+ get SheetValueChanged(): 'SheetValueChanged' {return 'SheetValueChanged' as const;}}diff --git a/packages/sheets/src/facade/f-univer.ts b/packages/sheets/src/facade/f-univer.tsindex 0f74aac1ce..c7bb2362ed 100644--- a/packages/sheets/src/facade/f-univer.ts+++ b/packages/sheets/src/facade/f-univer.ts@@ -139,7 +139,7 @@ export interface IFUniverSheetsMixin {export class FUniverSheetsMixin extends FUniver implements IFUniverSheetsMixin {override getCommandSheetTarget(commandInfo: ICommandInfo<object>): Nullable<{ workbook: FWorkbook; worksheet: FWorksheet }> {const params = commandInfo.params as { unitId: string; subUnitId: string; sheetId: string };- if (!params) return;+ if (!params) return this.getActiveSheet();const workbook = params.unitId ? this.getUniverSheet(params.unitId) : this.getActiveWorkbook?.();if (!workbook) {return;