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): ui dependency (#2577)
YuHong55f6f723fa2d
diff --git a/packages/sheets-sort-ui/src/controllers/sheets-sort-ui.controller.ts b/packages/sheets-sort-ui/src/controllers/sheets-sort-ui.controller.tsindex ca83b1f5b9..d24cb68c29 100644--- a/packages/sheets-sort-ui/src/controllers/sheets-sort-ui.controller.ts+++ b/packages/sheets-sort-ui/src/controllers/sheets-sort-ui.controller.ts@@ -14,8 +14,7 @@* limitations under the License.*/-import type { UniverInstanceService } from '@univerjs/core';-import { ICommandService, IUniverInstanceService, LifecycleStages, LocaleService, OnLifecycle, RxDisposable } from '@univerjs/core';+import { ICommandService, LifecycleStages, LocaleService, OnLifecycle, RxDisposable } from '@univerjs/core';import { Inject, Injector } from '@wendellhu/redi';import type { MenuConfig, UIPartsService } from '@univerjs/ui';@@ -24,7 +23,8 @@ import { takeUntil } from 'rxjs';import { serializeRange } from '@univerjs/engine-formula';import { AscendingSingle, CustomSortSingle, DescendingSingle, ExpandAscendingSingle, ExpandDescendingSingle } from '@univerjs/icons';import { connectInjector } from '@wendellhu/redi/react-bindings';-import { SheetsUIPart } from '@univerjs/sheets-ui';+import { SheetsRenderService, SheetsUIPart } from '@univerjs/sheets-ui';+import { SortRangeCommand } from '@univerjs/sheets-sort';import { SortRangeAscCommand, SortRangeAscExtCommand, SortRangeAscExtInCtxMenuCommand, SortRangeAscInCtxMenuCommand, SortRangeCustomCommand, SortRangeCustomInCtxMenuCommand, SortRangeDescCommand, SortRangeDescExtCommand, SortRangeDescExtInCtxMenuCommand, SortRangeDescInCtxMenuCommand } from '../commands/sheets-sort.command';import { CustomSortPanel } from '../views/CustomSortPanel';import type { ISheetSortLocation } from '../services/sheets-sort-ui.service';@@ -47,11 +47,11 @@ export class SheetsSortUIController extends RxDisposable {constructor(private readonly _config: Partial<IUniverSheetsSortUIConfig>,@ICommandService private readonly _commandService: ICommandService,- @IUniverInstanceService private readonly _instanceService: UniverInstanceService,@IMenuService private readonly _menuService: IMenuService,@IDialogService private readonly _dialogService: IDialogService,@ILayoutService private readonly _layoutService: ILayoutService,@IUIPartsService private readonly _uiPartsService: UIPartsService,+ @Inject(SheetsRenderService) private _sheetRenderService: SheetsRenderService,@Inject(LocaleService) private readonly _localeService: LocaleService,@Inject(SheetsSortUIService) private readonly _sheetsSortUIService: SheetsSortUIService,@Inject(Injector) private _injector: Injector,@@ -101,6 +101,8 @@ export class SheetsSortUIController extends RxDisposable {SortRangeCustomInCtxMenuCommand,].forEach((command) => this.disposeWithMe(this._commandService.registerCommand(command)));++ this.disposeWithMe(this._sheetRenderService.registerSkeletonChangingMutations(SortRangeCommand.id));}private _initUI(): void {diff --git a/packages/sheets-sort/src/controllers/sheets-sort.controller.ts b/packages/sheets-sort/src/controllers/sheets-sort.controller.tsindex 3049232007..1a200de9da 100644--- a/packages/sheets-sort/src/controllers/sheets-sort.controller.ts+++ b/packages/sheets-sort/src/controllers/sheets-sort.controller.ts@@ -18,7 +18,6 @@ import type { ICellData, Nullable } from '@univerjs/core';import { CellValueType, Disposable, ICommandService, LifecycleStages, OnLifecycle } from '@univerjs/core';import { Inject } from '@wendellhu/redi';-import { SheetsRenderService } from '@univerjs/sheets-ui';import type { ICellValueCompareFn } from '../commands/sheets-sort.command';import { SortRangeCommand } from '../commands/sheets-sort.command';import { SheetsSortService } from '../services/sheets-sort.service';@@ -30,13 +29,9 @@ export type ICommonComparableCellValue = number | string | null;export class SheetsSortController extends Disposable {constructor(@ICommandService private readonly _commandService: ICommandService,- @Inject(SheetsRenderService) private _sheetRenderService: SheetsRenderService,@Inject(SheetsSortService) private readonly _sortService: SheetsSortService) {super();- [- SortRangeCommand,- ].forEach((m) => this.disposeWithMe(this._sheetRenderService.registerSkeletonChangingMutations(m.id)));this._initCommands();this._registerCompareFns();}