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(sheets-drawing): sheet-drawing error depend on renderManagerService (#3030)
zhangwefc17020fe45
diff --git a/packages/sheets-drawing/src/controllers/render-controllers/sheet-drawing.render-controller.ts b/packages/sheets-drawing-ui/src/controllers/render-controllers/sheet-drawing.render-controller.tssimilarity index 95%rename from packages/sheets-drawing/src/controllers/render-controllers/sheet-drawing.render-controller.tsrename to packages/sheets-drawing-ui/src/controllers/render-controllers/sheet-drawing.render-controller.tsindex 48264b46bb..67024c32eb 100644--- a/packages/sheets-drawing/src/controllers/render-controllers/sheet-drawing.render-controller.ts+++ b/packages/sheets-drawing-ui/src/controllers/render-controllers/sheet-drawing.render-controller.ts@@ -16,8 +16,8 @@import { Disposable, Inject, LifecycleService, LifecycleStages, UniverInstanceType } from '@univerjs/core';import type { IRenderContext, IRenderModule } from '@univerjs/engine-render';+import { ISheetDrawingService } from '@univerjs/sheets-drawing';import { filter, first } from 'rxjs';-import { ISheetDrawingService } from '../../services/sheet-drawing.service';export class SheetsDrawingRenderController extends Disposable implements IRenderModule {constructor(diff --git a/packages/sheets-drawing-ui/src/plugin.ts b/packages/sheets-drawing-ui/src/plugin.tsindex e5f60cc9aa..687b3aea75 100644--- a/packages/sheets-drawing-ui/src/plugin.ts+++ b/packages/sheets-drawing-ui/src/plugin.ts@@ -29,6 +29,7 @@ import { SheetCanvasFloatDomManagerService } from './services/canvas-float-dom-mimport { SheetDrawingPrintingController } from './controllers/sheet-drawing-printing.controller';import { SheetDrawingPermissionController } from './controllers/sheet-drawing-permission.controller';import { SheetsDrawingCopyPasteController } from './controllers/sheet-drawing-copy-paste.controller';+import { SheetsDrawingRenderController } from './controllers/render-controllers/sheet-drawing.render-controller';const PLUGIN_NAME = 'SHEET_IMAGE_UI_PLUGIN';@@ -76,6 +77,7 @@ export class UniverSheetsDrawingUIPlugin extends Plugin {([[SheetDrawingUpdateController],[SheetDrawingTransformAffectedController],+ [SheetsDrawingRenderController],] as Dependency[]).forEach((m) => {this.disposeWithMe(this._renderManagerService.registerRenderModule(UniverInstanceType.UNIVER_SHEET, m));});diff --git a/packages/sheets-drawing/package.json b/packages/sheets-drawing/package.jsonindex ee93584897..ce7bd84dfb 100644--- a/packages/sheets-drawing/package.json+++ b/packages/sheets-drawing/package.json@@ -60,13 +60,11 @@"peerDependencies": {"@univerjs/core": "workspace:*","@univerjs/drawing": "workspace:*",- "@univerjs/engine-render": "workspace:*","rxjs": ">=7.0.0"},"devDependencies": {"@univerjs/core": "workspace:*","@univerjs/drawing": "workspace:*",- "@univerjs/engine-render": "workspace:*","@univerjs/shared": "workspace:*","@univerjs/sheets": "workspace:*","typescript": "^5.5.4",diff --git a/packages/sheets-drawing/src/plugin.ts b/packages/sheets-drawing/src/plugin.tsindex 5e7557044e..e4b2201c33 100644--- a/packages/sheets-drawing/src/plugin.ts+++ b/packages/sheets-drawing/src/plugin.ts@@ -16,10 +16,8 @@import { Inject, Injector, Plugin, UniverInstanceType } from '@univerjs/core';import type { Dependency } from '@univerjs/core';-import { IRenderManagerService } from '@univerjs/engine-render';import { SHEET_DRAWING_PLUGIN, SheetsDrawingLoadController } from './controllers/sheet-drawing.controller';import { ISheetDrawingService, SheetDrawingService } from './services/sheet-drawing.service';-import { SheetsDrawingRenderController } from './controllers/render-controllers/sheet-drawing.render-controller';export class UniverSheetsDrawingPlugin extends Plugin {static override pluginName = SHEET_DRAWING_PLUGIN;@@ -27,8 +25,7 @@ export class UniverSheetsDrawingPlugin extends Plugin {constructor(private readonly _config: unknown,- @Inject(Injector) override readonly _injector: Injector,- @IRenderManagerService private readonly _renderManagerService: IRenderManagerService+ @Inject(Injector) override readonly _injector: Injector) {super();}@@ -39,10 +36,4 @@ export class UniverSheetsDrawingPlugin extends Plugin {[ISheetDrawingService, { useClass: SheetDrawingService }],] as Dependency[]).forEach((dependency) => this._injector.add(dependency));}-- override onRendered(): void {- ([[SheetsDrawingRenderController]] as Dependency[]).forEach((m) => {- this.disposeWithMe(this._renderManagerService.registerRenderModule(UniverInstanceType.UNIVER_SHEET, m));- });- }}diff --git a/pnpm-lock.yaml b/pnpm-lock.yamlindex 92e3054778..027fa9b394 100644--- a/pnpm-lock.yaml+++ b/pnpm-lock.yaml@@ -1891,9 +1891,6 @@ importers:'@univerjs/drawing':specifier: workspace:*version: link:../drawing- '@univerjs/engine-render':- specifier: workspace:*- version: link:../engine-render'@univerjs/shared':specifier: workspace:*version: link:../../common/shared