From 7e1e8dfa4e4a67938f73a1240599a7dff23b98eb Mon Sep 17 00:00:00 2001 From: wpxp123456 <2677556700@qq.com> Date: Mon, 3 Aug 2026 16:48:10 +0800 Subject: [PATCH] fix(ui): avoid loading desktop UI in mobile apps (#7406) --- packages/action-recorder/src/plugin.ts | 5 ++--- packages/docs-drawing-ui/src/plugin.ts | 2 -- packages/docs-hyper-link-ui/src/plugin.ts | 2 -- packages/docs-mention-ui/src/plugin.ts | 3 +-- packages/docs-quick-insert-ui/src/plugin.ts | 2 -- packages/docs-thread-comment-ui/src/plugin.ts | 2 -- packages/drawing-ui/src/plugin.ts | 3 +-- packages/find-replace/src/plugin.ts | 4 +--- packages/sheets-conditional-formatting-ui/src/plugin.ts | 2 -- packages/sheets-crosshair-highlight/src/plugin.ts | 3 +-- packages/sheets-data-validation-ui/src/plugin.ts | 2 -- packages/sheets-drawing-ui/src/plugin.ts | 2 -- packages/sheets-filter-ui/src/plugin.ts | 2 -- packages/sheets-formula-ui/src/plugin.ts | 3 +-- packages/sheets-hyper-link-ui/src/plugin.ts | 2 -- packages/sheets-note-ui/src/plugin.ts | 2 -- packages/sheets-numfmt-ui/src/plugin.ts | 2 -- packages/sheets-sort-ui/src/plugin.ts | 3 +-- packages/sheets-table-ui/src/plugin.ts | 2 -- packages/sheets-thread-comment-ui/src/plugin.ts | 2 -- packages/sheets-ui/src/mobile-plugin.ts | 2 ++ packages/sheets-ui/src/plugin.ts | 3 +-- packages/slides-ui/src/plugin.ts | 2 -- packages/thread-comment-ui/src/plugin.ts | 3 +-- packages/ui-adapter-vue3/src/plugin.ts | 6 +++--- packages/ui-adapter-web-component/src/plugin.ts | 6 +++--- 26 files changed, 18 insertions(+), 54 deletions(-) diff --git a/packages/action-recorder/src/plugin.ts b/packages/action-recorder/src/plugin.ts index dc832ce2af..660bbaf059 100644 --- a/packages/action-recorder/src/plugin.ts +++ b/packages/action-recorder/src/plugin.ts @@ -16,8 +16,7 @@ import type { Dependency } from '@univerjs/core'; import type { IUniverActionRecorderConfig } from './config/config'; -import { DependentOn, IConfigService, Inject, Injector, merge, Plugin } from '@univerjs/core'; -import { UniverUIPlugin } from '@univerjs/ui'; +import { IConfigService, Inject, Injector, merge, Plugin } from '@univerjs/core'; import pkg from '../package.json'; import { ACTION_RECORDER_PLUGIN_CONFIG_KEY, defaultPluginConfig } from './config/config'; import { ActionRecorderController } from './controllers/action-recorder.controller'; @@ -29,7 +28,7 @@ import { ActionReplayService } from './services/replay.service'; * This plugin provides a recorder for user's interactions with Univer, * it only records commands (and some special operations) so that it can be replayed later. */ -@DependentOn(UniverUIPlugin) + export class UniverActionRecorderPlugin extends Plugin { static override pluginName = 'UNIVER_ACTION_RECORDER_PLUGIN'; static override packageName = pkg.name; diff --git a/packages/docs-drawing-ui/src/plugin.ts b/packages/docs-drawing-ui/src/plugin.ts index 8b3337a665..f0ff923597 100644 --- a/packages/docs-drawing-ui/src/plugin.ts +++ b/packages/docs-drawing-ui/src/plugin.ts @@ -23,7 +23,6 @@ import { UniverDocsUIPlugin } from '@univerjs/docs-ui'; import { UniverDrawingPlugin } from '@univerjs/drawing'; import { UniverDrawingUIPlugin } from '@univerjs/drawing-ui'; import { IRenderManagerService, UniverRenderEnginePlugin } from '@univerjs/engine-render'; -import { UniverUIPlugin } from '@univerjs/ui'; import pkg from '../package.json'; import { defaultPluginConfig, DOCS_DRAWING_UI_PLUGIN_CONFIG_KEY } from './config/config'; import { ComponentsController } from './controllers/components.controller'; @@ -47,7 +46,6 @@ import { DocRefreshDrawingsService } from './services/doc-refresh-drawings.servi UniverDrawingPlugin, UniverRenderEnginePlugin, UniverDocsDrawingPlugin, - UniverUIPlugin, UniverDocsUIPlugin, UniverDrawingUIPlugin ) diff --git a/packages/docs-hyper-link-ui/src/plugin.ts b/packages/docs-hyper-link-ui/src/plugin.ts index 8d771e0f0d..72cc747c22 100644 --- a/packages/docs-hyper-link-ui/src/plugin.ts +++ b/packages/docs-hyper-link-ui/src/plugin.ts @@ -21,7 +21,6 @@ import { UniverDocsPlugin } from '@univerjs/docs'; import { UniverDocsHyperLinkPlugin } from '@univerjs/docs-hyper-link'; import { UniverDocsUIPlugin } from '@univerjs/docs-ui'; import { IRenderManagerService, UniverRenderEnginePlugin } from '@univerjs/engine-render'; -import { UniverUIPlugin } from '@univerjs/ui'; import pkg from '../package.json'; import { defaultPluginConfig, DOCS_HYPER_LINK_UI_PLUGIN_CONFIG_KEY } from './config/config'; import { ComponentsController } from './controllers/components.controller'; @@ -36,7 +35,6 @@ import { DOC_HYPER_LINK_UI_PLUGIN } from './types/const'; UniverDocsPlugin, UniverRenderEnginePlugin, UniverDocsHyperLinkPlugin, - UniverUIPlugin, UniverDocsUIPlugin ) export class UniverDocsHyperLinkUIPlugin extends Plugin { diff --git a/packages/docs-mention-ui/src/plugin.ts b/packages/docs-mention-ui/src/plugin.ts index 0f7f3a228e..e09a78e7fe 100644 --- a/packages/docs-mention-ui/src/plugin.ts +++ b/packages/docs-mention-ui/src/plugin.ts @@ -19,7 +19,6 @@ import type { IUniverDocsMentionUIConfig } from './config/config'; import { DependentOn, IConfigService, Inject, Injector, merge, Plugin, UniverInstanceType } from '@univerjs/core'; import { UniverDocsPlugin } from '@univerjs/docs'; import { UniverDocsUIPlugin } from '@univerjs/docs-ui'; -import { UniverUIPlugin } from '@univerjs/ui'; import pkg from '../package.json'; import { defaultPluginConfig, DOCS_MENTION_UI_PLUGIN_CONFIG_KEY } from './config/config'; import { ComponentsController } from './controllers/components.controller'; @@ -29,7 +28,7 @@ import { DocMentionPopupService } from './services/doc-mention-popup.service'; import { DocMentionService } from './services/doc-mention.service'; import { DOC_MENTION_UI_PLUGIN } from './types/const/const'; -@DependentOn(UniverDocsPlugin, UniverUIPlugin, UniverDocsUIPlugin) +@DependentOn(UniverDocsPlugin, UniverDocsUIPlugin) export class UniverDocsMentionUIPlugin extends Plugin { static override pluginName = DOC_MENTION_UI_PLUGIN; static override packageName = pkg.name; diff --git a/packages/docs-quick-insert-ui/src/plugin.ts b/packages/docs-quick-insert-ui/src/plugin.ts index b626cd131d..50f81cb6bd 100644 --- a/packages/docs-quick-insert-ui/src/plugin.ts +++ b/packages/docs-quick-insert-ui/src/plugin.ts @@ -24,7 +24,6 @@ import { UniverDocsUIPlugin } from '@univerjs/docs-ui'; import { UniverDrawingPlugin } from '@univerjs/drawing'; import { UniverDrawingUIPlugin } from '@univerjs/drawing-ui'; import { IRenderManagerService, UniverRenderEnginePlugin } from '@univerjs/engine-render'; -import { UniverUIPlugin } from '@univerjs/ui'; import pkg from '../package.json'; import { defaultPluginConfig, DOCS_QUICK_INSERT_UI_PLUGIN_CONFIG_KEY } from './config/config'; import { ComponentsController } from './controllers/components.controller'; @@ -38,7 +37,6 @@ import { DocQuickInsertPopupService } from './services/doc-quick-insert-popup.se UniverDrawingPlugin, UniverRenderEnginePlugin, UniverDocsDrawingPlugin, - UniverUIPlugin, UniverDocsUIPlugin, UniverDrawingUIPlugin, UniverDocsDrawingUIPlugin diff --git a/packages/docs-thread-comment-ui/src/plugin.ts b/packages/docs-thread-comment-ui/src/plugin.ts index 609c072090..16e7c1cf3e 100644 --- a/packages/docs-thread-comment-ui/src/plugin.ts +++ b/packages/docs-thread-comment-ui/src/plugin.ts @@ -22,7 +22,6 @@ import { UniverDocsUIPlugin } from '@univerjs/docs-ui'; import { IRenderManagerService, UniverRenderEnginePlugin } from '@univerjs/engine-render'; import { UniverThreadCommentPlugin } from '@univerjs/thread-comment'; import { UniverThreadCommentUIPlugin } from '@univerjs/thread-comment-ui'; -import { UniverUIPlugin } from '@univerjs/ui'; import pkg from '../package.json'; import { PLUGIN_NAME } from './common/const'; import { defaultPluginConfig, DOCS_THREAD_COMMENT_UI_PLUGIN_CONFIG_KEY } from './config/config'; @@ -36,7 +35,6 @@ import { DocThreadCommentService } from './services/doc-thread-comment.service'; UniverDocsPlugin, UniverThreadCommentPlugin, UniverRenderEnginePlugin, - UniverUIPlugin, UniverDocsUIPlugin, UniverThreadCommentUIPlugin ) diff --git a/packages/drawing-ui/src/plugin.ts b/packages/drawing-ui/src/plugin.ts index e991fa7834..73415e0ee0 100644 --- a/packages/drawing-ui/src/plugin.ts +++ b/packages/drawing-ui/src/plugin.ts @@ -19,7 +19,6 @@ import type { IUniverDrawingUIConfig } from './config/config'; import { DependentOn, IConfigService, Inject, Injector, merge, Plugin } from '@univerjs/core'; import { UniverDrawingPlugin } from '@univerjs/drawing'; import { UniverRenderEnginePlugin } from '@univerjs/engine-render'; -import { UniverUIPlugin } from '@univerjs/ui'; import pkg from '../package.json'; import { defaultPluginConfig, DRAWING_UI_PLUGIN_CONFIG_KEY } from './config/config'; import { ComponentsController } from './controllers/components.controller'; @@ -30,7 +29,7 @@ import { DrawingUIController } from './controllers/ui.controller'; import { DrawingImageClipService } from './services/drawing-image-clip.service'; import { DrawingRenderService } from './services/drawing-render.service'; -@DependentOn(UniverDrawingPlugin, UniverRenderEnginePlugin, UniverUIPlugin) +@DependentOn(UniverDrawingPlugin, UniverRenderEnginePlugin) export class UniverDrawingUIPlugin extends Plugin { static override pluginName = 'UNIVER_DRAWING_UI_PLUGIN'; static override packageName = pkg.name; diff --git a/packages/find-replace/src/plugin.ts b/packages/find-replace/src/plugin.ts index 3087c40dd5..13a5ad1997 100644 --- a/packages/find-replace/src/plugin.ts +++ b/packages/find-replace/src/plugin.ts @@ -16,15 +16,13 @@ import type { Dependency } from '@univerjs/core'; import type { IUniverFindReplaceConfig } from './config/config'; -import { DependentOn, IConfigService, Inject, Injector, merge, Plugin } from '@univerjs/core'; -import { UniverUIPlugin } from '@univerjs/ui'; +import { IConfigService, Inject, Injector, merge, Plugin } from '@univerjs/core'; import pkg from '../package.json'; import { defaultPluginConfig, FIND_REPLACE_PLUGIN_CONFIG_KEY } from './config/config'; import { ComponentsController } from './controllers/components.controller'; import { FindReplaceController } from './controllers/find-replace.controller'; import { FindReplaceService, IFindReplaceService } from './services/find-replace.service'; -@DependentOn(UniverUIPlugin) export class UniverFindReplacePlugin extends Plugin { static override pluginName = 'UNIVER_FIND_REPLACE_PLUGIN'; static override packageName = pkg.name; diff --git a/packages/sheets-conditional-formatting-ui/src/plugin.ts b/packages/sheets-conditional-formatting-ui/src/plugin.ts index 28936c2143..797846bc1f 100644 --- a/packages/sheets-conditional-formatting-ui/src/plugin.ts +++ b/packages/sheets-conditional-formatting-ui/src/plugin.ts @@ -32,7 +32,6 @@ import { UniverSheetsPlugin } from '@univerjs/sheets'; import { SHEET_CONDITIONAL_FORMATTING_PLUGIN, UniverSheetsConditionalFormattingPlugin } from '@univerjs/sheets-conditional-formatting'; import { UniverSheetsFormulaPlugin } from '@univerjs/sheets-formula'; import { UniverSheetsUIPlugin } from '@univerjs/sheets-ui'; -import { UniverUIPlugin } from '@univerjs/ui'; import pkg from '../package.json'; import { AddAverageCfCommand } from './commands/commands/add-average-cf.command'; import { AddColorScaleConditionalRuleCommand } from './commands/commands/add-color-scale-cf.command'; @@ -63,7 +62,6 @@ import { ConditionalFormattingMenuController } from './menu/cf.menu.controller'; @DependentOn( UniverRenderEnginePlugin, UniverSheetsPlugin, - UniverUIPlugin, UniverSheetsFormulaPlugin, UniverSheetsConditionalFormattingPlugin, UniverSheetsUIPlugin diff --git a/packages/sheets-crosshair-highlight/src/plugin.ts b/packages/sheets-crosshair-highlight/src/plugin.ts index bd1ea46348..09b511dcee 100644 --- a/packages/sheets-crosshair-highlight/src/plugin.ts +++ b/packages/sheets-crosshair-highlight/src/plugin.ts @@ -20,7 +20,6 @@ import { DependentOn, IConfigService, Inject, Injector, merge, Plugin, UniverIns import { IRenderManagerService, UniverRenderEnginePlugin } from '@univerjs/engine-render'; import { UniverSheetsPlugin } from '@univerjs/sheets'; import { UniverSheetsUIPlugin } from '@univerjs/sheets-ui'; -import { UniverUIPlugin } from '@univerjs/ui'; import pkg from '../package.json'; import { defaultPluginConfig, SHEETS_CROSSHAIR_HIGHLIGHT_PLUGIN_CONFIG_KEY } from './config/config'; import { ComponentsController } from './controllers/components.controller'; @@ -28,7 +27,7 @@ import { SheetsCrosshairHighlightController } from './controllers/crosshair.cont import { SheetsCrosshairHighlightService } from './services/crosshair.service'; import { SheetCrosshairHighlightRenderController } from './views/widgets/crosshair-highlight.render-controller'; -@DependentOn(UniverRenderEnginePlugin, UniverSheetsPlugin, UniverUIPlugin, UniverSheetsUIPlugin) +@DependentOn(UniverRenderEnginePlugin, UniverSheetsPlugin, UniverSheetsUIPlugin) export class UniverSheetsCrosshairHighlightPlugin extends Plugin { static override pluginName: string = 'SHEET_CROSSHAIR_HIGHLIGHT_PLUGIN'; static override packageName = pkg.name; diff --git a/packages/sheets-data-validation-ui/src/plugin.ts b/packages/sheets-data-validation-ui/src/plugin.ts index 2e3689334b..26eb96bb52 100644 --- a/packages/sheets-data-validation-ui/src/plugin.ts +++ b/packages/sheets-data-validation-ui/src/plugin.ts @@ -22,7 +22,6 @@ import { IRenderManagerService, UniverRenderEnginePlugin } from '@univerjs/engin import { UniverSheetsPlugin } from '@univerjs/sheets'; import { UniverSheetsDataValidationPlugin } from '@univerjs/sheets-data-validation'; import { UniverSheetsUIPlugin } from '@univerjs/sheets-ui'; -import { UniverUIPlugin } from '@univerjs/ui'; import pkg from '../package.json'; import { AddSheetDataValidationAndOpenCommand, @@ -53,7 +52,6 @@ import { DataValidationDropdownManagerService } from './services/dropdown-manage UniverDataValidationPlugin, UniverRenderEnginePlugin, UniverSheetsPlugin, - UniverUIPlugin, UniverSheetsUIPlugin, UniverSheetsDataValidationPlugin ) diff --git a/packages/sheets-drawing-ui/src/plugin.ts b/packages/sheets-drawing-ui/src/plugin.ts index a71894b788..7a0911f747 100644 --- a/packages/sheets-drawing-ui/src/plugin.ts +++ b/packages/sheets-drawing-ui/src/plugin.ts @@ -34,7 +34,6 @@ import { IRenderManagerService, UniverRenderEnginePlugin } from '@univerjs/engin import { UniverSheetsPlugin } from '@univerjs/sheets'; import { UniverSheetsDrawingPlugin } from '@univerjs/sheets-drawing'; import { UniverSheetsUIPlugin } from '@univerjs/sheets-ui'; -import { UniverUIPlugin } from '@univerjs/ui'; import pkg from '../package.json'; import { defaultPluginConfig, SHEETS_DRAWING_UI_PLUGIN_CONFIG_KEY } from './config/config'; import { ComponentsController } from './controllers/components.controller'; @@ -63,7 +62,6 @@ import { SheetDrawingHitTestService } from './services/sheet-drawing-hit-test.se UniverRenderEnginePlugin, UniverDocsDrawingPlugin, UniverSheetsPlugin, - UniverUIPlugin, UniverSheetsDrawingPlugin, UniverDrawingUIPlugin, UniverSheetsUIPlugin diff --git a/packages/sheets-filter-ui/src/plugin.ts b/packages/sheets-filter-ui/src/plugin.ts index 5e10a02705..83ad2ad5b0 100644 --- a/packages/sheets-filter-ui/src/plugin.ts +++ b/packages/sheets-filter-ui/src/plugin.ts @@ -32,7 +32,6 @@ import { IRPCChannelService, toModule } from '@univerjs/rpc'; import { UniverSheetsPlugin } from '@univerjs/sheets'; import { UniverSheetsFilterPlugin } from '@univerjs/sheets-filter'; import { UniverSheetsUIPlugin } from '@univerjs/sheets-ui'; -import { UniverUIPlugin } from '@univerjs/ui'; import pkg from '../package.json'; import { defaultPluginConfig, SHEETS_FILTER_UI_PLUGIN_CONFIG_KEY } from './config/config'; import { ComponentsController } from './controllers/components.controller'; @@ -50,7 +49,6 @@ import { @DependentOn( UniverRenderEnginePlugin, UniverSheetsPlugin, - UniverUIPlugin, UniverSheetsFilterPlugin, UniverSheetsUIPlugin ) diff --git a/packages/sheets-formula-ui/src/plugin.ts b/packages/sheets-formula-ui/src/plugin.ts index be91ce9114..ac99249efb 100644 --- a/packages/sheets-formula-ui/src/plugin.ts +++ b/packages/sheets-formula-ui/src/plugin.ts @@ -32,7 +32,7 @@ import { IRenderManagerService, UniverRenderEnginePlugin } from '@univerjs/engin import { UniverSheetsPlugin } from '@univerjs/sheets'; import { UniverSheetsFormulaPlugin } from '@univerjs/sheets-formula'; import { UniverSheetsUIPlugin } from '@univerjs/sheets-ui'; -import { BuiltInUIPart, connectInjector, IUIPartsService, UniverUIPlugin } from '@univerjs/ui'; +import { BuiltInUIPart, connectInjector, IUIPartsService } from '@univerjs/ui'; import pkg from '../package.json'; import { FORMULA_UI_PLUGIN_NAME } from './common/plugin-name'; import { @@ -59,7 +59,6 @@ import { GlobalRangeSelector } from './views/range-selector/Global'; UniverFormulaEnginePlugin, UniverRenderEnginePlugin, UniverSheetsPlugin, - UniverUIPlugin, UniverSheetsFormulaPlugin, UniverSheetsUIPlugin ) diff --git a/packages/sheets-hyper-link-ui/src/plugin.ts b/packages/sheets-hyper-link-ui/src/plugin.ts index 652ce44399..81c21d4e67 100644 --- a/packages/sheets-hyper-link-ui/src/plugin.ts +++ b/packages/sheets-hyper-link-ui/src/plugin.ts @@ -24,7 +24,6 @@ import { IRenderManagerService, UniverRenderEnginePlugin } from '@univerjs/engin import { UniverSheetsPlugin } from '@univerjs/sheets'; import { UniverSheetsHyperLinkPlugin } from '@univerjs/sheets-hyper-link'; import { UniverSheetsUIPlugin } from '@univerjs/sheets-ui'; -import { UniverUIPlugin } from '@univerjs/ui'; import pkg from '../package.json'; import { defaultPluginConfig, SHEETS_HYPER_LINK_UI_PLUGIN_CONFIG_KEY } from './config/config'; import { SheetsHyperLinkAutoFillController } from './controllers/auto-fill.controller'; @@ -45,7 +44,6 @@ import { SHEET_HYPER_LINK_UI_PLUGIN } from './types/const'; UniverFormulaEnginePlugin, UniverRenderEnginePlugin, UniverSheetsPlugin, - UniverUIPlugin, UniverDocsUIPlugin, UniverSheetsHyperLinkPlugin, UniverSheetsUIPlugin diff --git a/packages/sheets-note-ui/src/plugin.ts b/packages/sheets-note-ui/src/plugin.ts index 9a0bfdfedd..3a09dd69a0 100644 --- a/packages/sheets-note-ui/src/plugin.ts +++ b/packages/sheets-note-ui/src/plugin.ts @@ -30,7 +30,6 @@ import { UniverRenderEnginePlugin } from '@univerjs/engine-render'; import { UniverSheetsPlugin } from '@univerjs/sheets'; import { UniverSheetsNotePlugin } from '@univerjs/sheets-note'; import { UniverSheetsUIPlugin } from '@univerjs/sheets-ui'; -import { UniverUIPlugin } from '@univerjs/ui'; import pkg from '../package.json'; import { defaultPluginConfig, SHEETS_NOTE_UI_PLUGIN_CONFIG_KEY } from './config/config'; import { ComponentsController } from './controllers/components.controller'; @@ -43,7 +42,6 @@ import { SheetsNotePopupService } from './services/sheets-note-popup.service'; @DependentOn( UniverRenderEnginePlugin, UniverSheetsPlugin, - UniverUIPlugin, UniverSheetsNotePlugin, UniverSheetsUIPlugin ) diff --git a/packages/sheets-numfmt-ui/src/plugin.ts b/packages/sheets-numfmt-ui/src/plugin.ts index c24c1d4d52..b7488b82c2 100644 --- a/packages/sheets-numfmt-ui/src/plugin.ts +++ b/packages/sheets-numfmt-ui/src/plugin.ts @@ -31,7 +31,6 @@ import { IRenderManagerService, UniverRenderEnginePlugin } from '@univerjs/engin import { UniverSheetsPlugin } from '@univerjs/sheets'; import { UniverSheetsNumfmtPlugin } from '@univerjs/sheets-numfmt'; import { UniverSheetsUIPlugin } from '@univerjs/sheets-ui'; -import { UniverUIPlugin } from '@univerjs/ui'; import pkg from '../package.json'; import { defaultPluginConfig, SHEETS_NUMFMT_UI_PLUGIN_CONFIG_KEY } from './config/config'; import { ComponentsController } from './controllers/components.controller'; @@ -45,7 +44,6 @@ import { NumfmtMenuController } from './menu/numfmt.menu.controller'; @DependentOn( UniverRenderEnginePlugin, UniverSheetsPlugin, - UniverUIPlugin, UniverSheetsNumfmtPlugin, UniverSheetsUIPlugin ) diff --git a/packages/sheets-sort-ui/src/plugin.ts b/packages/sheets-sort-ui/src/plugin.ts index f7954d2ad9..1886662cbb 100644 --- a/packages/sheets-sort-ui/src/plugin.ts +++ b/packages/sheets-sort-ui/src/plugin.ts @@ -28,14 +28,13 @@ import { import { UniverSheetsPlugin } from '@univerjs/sheets'; import { UniverSheetsSortPlugin } from '@univerjs/sheets-sort'; import { UniverSheetsUIPlugin } from '@univerjs/sheets-ui'; -import { UniverUIPlugin } from '@univerjs/ui'; import pkg from '../package.json'; import { defaultPluginConfig, SHEETS_SORT_UI_PLUGIN_CONFIG_KEY } from './config/config'; import { ComponentsController } from './controllers/components.controller'; import { SheetsSortUIController } from './controllers/ui.controller'; import { SheetsSortUIService } from './services/sheets-sort-ui.service'; -@DependentOn(UniverSheetsPlugin, UniverUIPlugin, UniverSheetsSortPlugin, UniverSheetsUIPlugin) +@DependentOn(UniverSheetsPlugin, UniverSheetsSortPlugin, UniverSheetsUIPlugin) export class UniverSheetsSortUIPlugin extends Plugin { static override type = UniverInstanceType.UNIVER_SHEET; static override pluginName = 'SHEET_SORT_UI_PLUGIN'; diff --git a/packages/sheets-table-ui/src/plugin.ts b/packages/sheets-table-ui/src/plugin.ts index 73d6de385e..f9faac2cea 100644 --- a/packages/sheets-table-ui/src/plugin.ts +++ b/packages/sheets-table-ui/src/plugin.ts @@ -21,7 +21,6 @@ import { IRenderManagerService, UniverRenderEnginePlugin } from '@univerjs/engin import { UniverSheetsPlugin } from '@univerjs/sheets'; import { UniverSheetsTablePlugin } from '@univerjs/sheets-table'; import { UniverSheetsUIPlugin } from '@univerjs/sheets-ui'; -import { UniverUIPlugin } from '@univerjs/ui'; import pkg from '../package.json'; import { OpenTableFilterPanelOperation } from './commands/operations/open-table-filter-dialog.opration'; import { OpenTableSelectorOperation } from './commands/operations/open-table-selector.operation'; @@ -40,7 +39,6 @@ import { SheetsTableUiService } from './services/sheets-table-ui.service'; @DependentOn( UniverRenderEnginePlugin, UniverSheetsPlugin, - UniverUIPlugin, UniverSheetsTablePlugin, UniverSheetsUIPlugin ) diff --git a/packages/sheets-thread-comment-ui/src/plugin.ts b/packages/sheets-thread-comment-ui/src/plugin.ts index 575c54f3fc..9e69d16108 100644 --- a/packages/sheets-thread-comment-ui/src/plugin.ts +++ b/packages/sheets-thread-comment-ui/src/plugin.ts @@ -23,7 +23,6 @@ import { UniverSheetsThreadCommentPlugin } from '@univerjs/sheets-thread-comment import { UniverSheetsUIPlugin } from '@univerjs/sheets-ui'; import { UniverThreadCommentPlugin } from '@univerjs/thread-comment'; import { UniverThreadCommentUIPlugin } from '@univerjs/thread-comment-ui'; -import { UniverUIPlugin } from '@univerjs/ui'; import pkg from '../package.json'; import { ShowAddSheetCommentModalOperation, ToggleSheetCommentPanelOperation } from './commands/operations/comment.operation'; import { defaultPluginConfig, SHEETS_THREAD_COMMENT_UI_PLUGIN_CONFIG_KEY } from './config/config'; @@ -41,7 +40,6 @@ import { PLUGIN_NAME } from './types/const'; UniverRenderEnginePlugin, UniverThreadCommentPlugin, UniverSheetsPlugin, - UniverUIPlugin, UniverThreadCommentUIPlugin, UniverSheetsThreadCommentPlugin, UniverSheetsUIPlugin diff --git a/packages/sheets-ui/src/mobile-plugin.ts b/packages/sheets-ui/src/mobile-plugin.ts index 95cdbadebe..3a09e11423 100644 --- a/packages/sheets-ui/src/mobile-plugin.ts +++ b/packages/sheets-ui/src/mobile-plugin.ts @@ -124,6 +124,7 @@ import { SelectAllService } from './services/select-all/select-all.service'; import { ISheetSelectionRenderService } from './services/selection/base-selection-render.service'; import { MobileSheetsSelectionRenderService } from './services/selection/mobile-selection-render.service'; import { ISheetBarService, SheetBarService } from './services/sheet-bar/sheet-bar.service'; +import { ISheetLoadingRenderService, SheetLoadingRenderService } from './services/sheet-loading-render.service'; import { SheetSkeletonManagerService } from './services/sheet-skeleton-manager.service'; import { SheetsRenderService } from './services/sheets-render.service'; import { ShortcutExperienceService } from './services/shortcut-experience.service'; @@ -191,6 +192,7 @@ export class UniverSheetsMobileUIPlugin extends Plugin { [SelectAllService], [ISheetCellDropdownManagerService, { useClass: SheetCellDropdownManagerService }], [SheetCellEditorResizeService], + [ISheetLoadingRenderService, { useClass: SheetLoadingRenderService }], // controllers [AutoHeightController], diff --git a/packages/sheets-ui/src/plugin.ts b/packages/sheets-ui/src/plugin.ts index 0e3f1ac68d..a630ea7f84 100644 --- a/packages/sheets-ui/src/plugin.ts +++ b/packages/sheets-ui/src/plugin.ts @@ -35,7 +35,7 @@ import { UniverDocsUIPlugin } from '@univerjs/docs-ui'; import { UniverFormulaEnginePlugin } from '@univerjs/engine-formula'; import { IRenderManagerService, UniverRenderEnginePlugin } from '@univerjs/engine-render'; import { IRefSelectionsService, RefSelectionsService, UniverSheetsPlugin } from '@univerjs/sheets'; -import { UI_PLUGIN_CONFIG_KEY, UniverUIPlugin } from '@univerjs/ui'; +import { UI_PLUGIN_CONFIG_KEY } from '@univerjs/ui'; import { filter } from 'rxjs/operators'; import pkg from '../package.json'; import { defaultPluginConfig, SHEETS_UI_PLUGIN_CONFIG_KEY } from './config/config'; @@ -131,7 +131,6 @@ import { IStatusBarService, StatusBarService } from './services/status-bar.servi UniverFormulaEnginePlugin, UniverRenderEnginePlugin, UniverSheetsPlugin, - UniverUIPlugin, UniverDocsUIPlugin ) export class UniverSheetsUIPlugin extends Plugin { diff --git a/packages/slides-ui/src/plugin.ts b/packages/slides-ui/src/plugin.ts index 4b1071f502..5cebd53625 100644 --- a/packages/slides-ui/src/plugin.ts +++ b/packages/slides-ui/src/plugin.ts @@ -33,7 +33,6 @@ import { UniverDocsUIPlugin } from '@univerjs/docs-ui'; import { UniverDrawingPlugin } from '@univerjs/drawing'; import { IRenderManagerService, UniverRenderEnginePlugin } from '@univerjs/engine-render'; import { UniverSlidesPlugin } from '@univerjs/slides'; -import { UniverUIPlugin } from '@univerjs/ui'; import pkg from '../package.json'; import { defaultPluginConfig, SLIDES_UI_PLUGIN_CONFIG_KEY } from './config/config'; import { CanvasView } from './controllers/canvas-view'; @@ -53,7 +52,6 @@ import { SlideRenderService } from './services/slide-render.service'; UniverDrawingPlugin, UniverRenderEnginePlugin, UniverSlidesPlugin, - UniverUIPlugin, UniverDocsUIPlugin ) export class UniverSlidesUIPlugin extends Plugin { diff --git a/packages/thread-comment-ui/src/plugin.ts b/packages/thread-comment-ui/src/plugin.ts index 20fa5d2618..2c9f832ee0 100644 --- a/packages/thread-comment-ui/src/plugin.ts +++ b/packages/thread-comment-ui/src/plugin.ts @@ -19,14 +19,13 @@ import type { IUniverThreadCommentUIConfig } from './config/config'; import { DependentOn, ICommandService, IConfigService, Inject, Injector, merge, mergeOverrideWithDependencies, Plugin, UniverInstanceType } from '@univerjs/core'; import { UniverDocsUIPlugin } from '@univerjs/docs-ui'; import { UniverThreadCommentPlugin } from '@univerjs/thread-comment'; -import { UniverUIPlugin } from '@univerjs/ui'; import pkg from '../package.json'; import { SetActiveCommentOperation } from './commands/operations/comment.operations'; import { defaultPluginConfig, THREAD_COMMENT_UI_PLUGIN_CONFIG_KEY } from './config/config'; import { ThreadCommentPanelService } from './services/thread-comment-panel.service'; import { PLUGIN_NAME } from './types/const'; -@DependentOn(UniverThreadCommentPlugin, UniverUIPlugin, UniverDocsUIPlugin) +@DependentOn(UniverThreadCommentPlugin, UniverDocsUIPlugin) export class UniverThreadCommentUIPlugin extends Plugin { static override pluginName = PLUGIN_NAME; static override packageName = pkg.name; diff --git a/packages/ui-adapter-vue3/src/plugin.ts b/packages/ui-adapter-vue3/src/plugin.ts index 3b133eccd6..51a13112db 100644 --- a/packages/ui-adapter-vue3/src/plugin.ts +++ b/packages/ui-adapter-vue3/src/plugin.ts @@ -17,8 +17,8 @@ import type { IComponent } from '@univerjs/ui'; import type { defineComponent } from 'vue'; import type { IUniverVue3AdapterConfig } from './config/config'; -import { DependentOn, IConfigService, Inject, Injector, merge, Plugin } from '@univerjs/core'; -import { ComponentManager, UniverUIPlugin } from '@univerjs/ui'; +import { IConfigService, Inject, Injector, merge, Plugin } from '@univerjs/core'; +import { ComponentManager } from '@univerjs/ui'; import { h, render } from 'vue'; import pkg from '../package.json'; import { defaultPluginConfig, UI_ADAPTER_VUE3_PLUGIN_CONFIG_KEY } from './config/config'; @@ -26,7 +26,7 @@ import { defaultPluginConfig, UI_ADAPTER_VUE3_PLUGIN_CONFIG_KEY } from './config /** * The plugin that allows Univer to use Vue 3 components as UI components. */ -@DependentOn(UniverUIPlugin) + export class UniverVue3AdapterPlugin extends Plugin { static override pluginName = 'UNIVER_UI_ADAPTER_VUE3_PLUGIN'; static override packageName = pkg.name; diff --git a/packages/ui-adapter-web-component/src/plugin.ts b/packages/ui-adapter-web-component/src/plugin.ts index 9e539878bf..15ef9665ed 100644 --- a/packages/ui-adapter-web-component/src/plugin.ts +++ b/packages/ui-adapter-web-component/src/plugin.ts @@ -16,15 +16,15 @@ import type { IComponent } from '@univerjs/ui'; import type { IUniverWebComponentAdapterConfig } from './config/config'; -import { DependentOn, IConfigService, Inject, Injector, merge, Plugin } from '@univerjs/core'; -import { ComponentManager, UniverUIPlugin } from '@univerjs/ui'; +import { IConfigService, Inject, Injector, merge, Plugin } from '@univerjs/core'; +import { ComponentManager } from '@univerjs/ui'; import pkg from '../package.json'; import { defaultPluginConfig, UI_ADAPTER_WEB_COMPONENT_PLUGIN_CONFIG_KEY } from './config/config'; /** * The plugin that allows Univer to use web components as UI components. */ -@DependentOn(UniverUIPlugin) + export class UniverWebComponentAdapterPlugin extends Plugin { static override pluginName = 'UNIVER_UI_ADAPTER_WEB_COMPONENT_PLUGIN'; static override packageName = pkg.name;