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(docs-drawing-ui): doc drawing load error on uni mode (#3034)
zhangwba4ce37306d0
diff --git a/packages/docs-drawing-ui/src/controllers/render-controllers/doc-drawing-transform-update.controller.ts b/packages/docs-drawing-ui/src/controllers/render-controllers/doc-drawing-transform-update.controller.tsindex ec0a57e59e..61bdb1e049 100644--- a/packages/docs-drawing-ui/src/controllers/render-controllers/doc-drawing-transform-update.controller.ts+++ b/packages/docs-drawing-ui/src/controllers/render-controllers/doc-drawing-transform-update.controller.ts@@ -32,7 +32,7 @@ import { IDrawingManagerService } from '@univerjs/drawing';import type { Documents, DocumentSkeleton, IDocumentSkeletonHeaderFooter, IDocumentSkeletonPage, Image, IRenderContext, IRenderModule } from '@univerjs/engine-render';import { Liquid, TRANSFORM_CHANGE_OBSERVABLE_TYPE } from '@univerjs/engine-render';import { IEditorService } from '@univerjs/ui';-import { debounceTime, filter, first } from 'rxjs';+import { debounceTime, filter } from 'rxjs';import { DocRefreshDrawingsService } from '../../services/doc-refresh-drawings.service';interface IDrawingParamsWithBehindText {@@ -191,7 +191,6 @@ export class DocDrawingTransformUpdateController extends Disposable implements Iconst nonMultiDrawings = updateDrawings.filter((drawing) => !drawing.isMultiTransform);const multiDrawings = updateDrawings.filter((drawing) => drawing.isMultiTransform);-if (nonMultiDrawings.length > 0) {this._drawingManagerService.refreshTransform(nonMultiDrawings as unknown as IDrawingParam[]);}@@ -284,9 +283,8 @@ export class DocDrawingTransformUpdateController extends Disposable implements I}private _drawingInitializeListener() {- this._lifecycleService.lifecycle$.pipe(filter((stage) => stage === LifecycleStages.Steady), first()).subscribe(() => {+ const init = () => {const skeleton = this._docSkeletonManagerService.getSkeleton();-if (skeleton == null) {return;}@@ -294,6 +292,16 @@ export class DocDrawingTransformUpdateController extends Disposable implements Ithis._refreshDrawing(skeleton);this._drawingManagerService.initializeNotification(this._context.unitId);- });+ };++ if (this._lifecycleService.stage === LifecycleStages.Steady) {+ // wait for render unit ready+ // TODO@weird94 need refactor later+ setTimeout(() => {+ init();+ }, 1000);+ } else {+ this._lifecycleService.lifecycle$.pipe(filter((stage) => stage === LifecycleStages.Steady)).subscribe(init);+ }}}diff --git a/packages/docs-drawing/src/controllers/doc-drawing.controller.ts b/packages/docs-drawing/src/controllers/doc-drawing.controller.tsindex 788b581461..36c5fb00d4 100644--- a/packages/docs-drawing/src/controllers/doc-drawing.controller.ts+++ b/packages/docs-drawing/src/controllers/doc-drawing.controller.ts@@ -91,16 +91,15 @@ export class DocDrawingController extends Disposable {}documentDataModel.resetDrawing(drawingMapItem.data, drawingMapItem.order);- this._initDataLoader();+ this._initDataLoader(unitId);}- private _initDataLoader(): boolean {- const dataModel = this._univerInstanceService.getCurrentUnitForType<DocumentDataModel>(UniverInstanceType.UNIVER_DOC);+ private _initDataLoader(unitId: string): boolean {+ const dataModel = this._univerInstanceService.getUnit<DocumentDataModel>(unitId, UniverInstanceType.UNIVER_DOC);if (!dataModel) {return false;}- const unitId = dataModel.getUnitId();const subUnitId = unitId;const drawingDataModels = dataModel.getDrawings();