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: image initial render (#2921)
Ran Luoc165edcd9ed3
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 b3b4a0003f..677554c784 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@@ -20,7 +20,11 @@ import {Disposable,ICommandService,Inject,+ IUniverInstanceService,+ LifecycleService,+ LifecycleStages,PositionedObjectLayoutType,+ UniverInstanceType,} from '@univerjs/core';import type { IRichTextEditingMutationParams } from '@univerjs/docs';import { DocSkeletonManagerService, RichTextEditingMutation, SetDocZoomRatioOperation } from '@univerjs/docs';@@ -28,6 +32,7 @@ import { IDrawingManagerService } from '@univerjs/drawing';import type { Documents, DocumentSkeleton, IDocumentSkeletonHeaderFooter, IDocumentSkeletonPage, Image, IRenderContext, IRenderModule } from '@univerjs/engine-render';import { Liquid } from '@univerjs/engine-render';import { IEditorService } from '@univerjs/ui';+import { filter, first } from 'rxjs';import { DocRefreshDrawingsService } from '../../services/doc-refresh-drawings.service';interface IDrawingParamsWithBehindText {@@ -51,7 +56,9 @@ export class DocDrawingTransformUpdateController extends Disposable implements I@ICommandService private readonly _commandService: ICommandService,@IEditorService private readonly _editorService: IEditorService,@IDrawingManagerService private readonly _drawingManagerService: IDrawingManagerService,- @Inject(DocRefreshDrawingsService) private readonly _docRefreshDrawingsService: DocRefreshDrawingsService+ @Inject(DocRefreshDrawingsService) private readonly _docRefreshDrawingsService: DocRefreshDrawingsService,+ @IUniverInstanceService private _univerInstanceService: IUniverInstanceService,+ @Inject(LifecycleService) private _lifecycleService: LifecycleService) {super();@@ -62,6 +69,7 @@ export class DocDrawingTransformUpdateController extends Disposable implements Iprivate _initialize() {this._initialRenderRefresh();+ this._drawingInitializeListener();}private _initialRenderRefresh() {@@ -258,4 +266,23 @@ export class DocDrawingTransformUpdateController extends Disposable implements ImarginLeft,} as IDocumentSkeletonPage);}++ private _drawingInitializeListener() {+ this._lifecycleService.lifecycle$.pipe(filter((stage) => stage === LifecycleStages.Steady), first()).subscribe((stage) => {+ const unitId = this._univerInstanceService.getCurrentUnitForType(UniverInstanceType.UNIVER_DOC)?.getUnitId();+ if (!unitId) {+ return;+ }++ const skeleton = this._docSkeletonManagerService.getSkeleton();++ if (skeleton == null) {+ return;+ }++ this._refreshDrawing(skeleton);++ this._drawingManagerService.initializeNotification(unitId);+ });+ }}diff --git a/packages/docs-drawing/src/controllers/doc-drawing.controller.ts b/packages/docs-drawing/src/controllers/doc-drawing.controller.tsindex daaf95b527..788b581461 100644--- a/packages/docs-drawing/src/controllers/doc-drawing.controller.ts+++ b/packages/docs-drawing/src/controllers/doc-drawing.controller.ts@@ -15,10 +15,9 @@*/import type { DocumentDataModel, IDocumentData } from '@univerjs/core';-import { Disposable, ICommandService, Inject, IResourceManagerService, IUniverInstanceService, LifecycleService, LifecycleStages, OnLifecycle, UniverInstanceType } from '@univerjs/core';+import { Disposable, ICommandService, IResourceManagerService, IUniverInstanceService, LifecycleStages, OnLifecycle, UniverInstanceType } from '@univerjs/core';import type { IDrawingMapItem, IDrawingMapItemData } from '@univerjs/drawing';import { IDrawingManagerService } from '@univerjs/drawing';-import { filter, first } from 'rxjs/operators';import { type IDocDrawing, IDocDrawingService } from '../services/doc-drawing.service';export const DOCS_DRAWING_PLUGIN = 'DOC_DRAWING_PLUGIN';@@ -39,8 +38,7 @@ export class DocDrawingController extends Disposable {@IDocDrawingService private readonly _docDrawingService: IDocDrawingService,@IDrawingManagerService private readonly _drawingManagerService: IDrawingManagerService,@IResourceManagerService private _resourceManagerService: IResourceManagerService,- @IUniverInstanceService private _univerInstanceService: IUniverInstanceService,- @Inject(LifecycleService) private _lifecycleService: LifecycleService+ @IUniverInstanceService private _univerInstanceService: IUniverInstanceService) {super();@@ -49,7 +47,6 @@ export class DocDrawingController extends Disposable {private _init(): void {this._initSnapshot();- this._drawingInitializeListener();}private _initSnapshot() {@@ -136,15 +133,4 @@ export class DocDrawingController extends Disposable {this._drawingManagerService.registerDrawingData(unitId, subDrawings);return true;}-- private _drawingInitializeListener() {- this._lifecycleService.lifecycle$.pipe(filter((stage) => stage === LifecycleStages.Rendered), first()).subscribe((stage) => {- const unitId = this._univerInstanceService.getCurrentUnitForType(UniverInstanceType.UNIVER_DOC)?.getUnitId();- if (!unitId) {- return;- }- this._docDrawingService.initializeNotification(unitId);- this._drawingManagerService.initializeNotification(unitId);- });- }}diff --git a/packages/drawing-ui/src/controllers/image-update.controller.ts b/packages/drawing-ui/src/controllers/image-update.controller.tsindex 3f2532c05e..99b6a6ca4d 100644--- a/packages/drawing-ui/src/controllers/image-update.controller.ts+++ b/packages/drawing-ui/src/controllers/image-update.controller.ts@@ -23,6 +23,7 @@ import {LifecycleStages,OnLifecycle,toDisposable,+ UniverInstanceType,} from '@univerjs/core';import type { Image, Scene } from '@univerjs/engine-render';import { CURSOR_TYPE, IRenderManagerService } from '@univerjs/engine-render';@@ -38,6 +39,8 @@ const IMAGE_VIEWER_DROPDOWN_PADDING = 50;@OnLifecycle(LifecycleStages.Rendered, ImageUpdateController)export class ImageUpdateController extends Disposable {+ private _imageInsertCache: Set<string> = new Set();+constructor(@ICommandService private readonly _commandService: ICommandService,@IRenderManagerService private readonly _renderManagerService: IRenderManagerService,@@ -54,6 +57,8 @@ export class ImageUpdateController extends Disposable {override dispose(): void {super.dispose();++ this._imageInsertCache.clear();}private _initialize() {@@ -73,7 +78,11 @@ export class ImageUpdateController extends Disposable {return;}- const { unitId: currentUnitId, subUnitId: currentSubUnitId } = info;+ const { unitId: currentUnitId, subUnitId: currentSubUnitId, current } = info;++ if (current.type === UniverInstanceType.UNIVER_DOC) {+ return;+ }Object.keys(drawingList).forEach((unitId) => {Object.keys(drawingList[unitId]).forEach((subUnitId) => {@@ -196,7 +205,7 @@ export class ImageUpdateController extends Disposable {private _insertImages(params: IDrawingSearch[]) {(params).forEach(async (param) => {- const { unitId, subUnitId } = param;+ const { unitId, subUnitId, drawingId } = param;const renderObject = this._getSceneAndTransformerByDrawingSearch(unitId);const currentSubUnitId = getCurrentUnitInfo(this._currentUniverService)?.subUnitId;@@ -204,12 +213,21 @@ export class ImageUpdateController extends Disposable {return;}+ const drawingShapeKey = getDrawingShapeKeyByDrawingSearch({ unitId, subUnitId, drawingId });++ if (this._imageInsertCache.has(drawingShapeKey)) {+ return;+ }++ this._imageInsertCache.add(drawingShapeKey);+const imageParam = this._drawingManagerService.getDrawingByParam(param) as IImageData;if (imageParam == null) {return;}const images = await this._drawingRenderService.renderImages(imageParam, renderObject.scene);+if (images == null || images.length === 0) {return;}diff --git a/packages/drawing-ui/src/controllers/utils.ts b/packages/drawing-ui/src/controllers/utils.tsindex a9581b57d9..6ced585bf6 100644--- a/packages/drawing-ui/src/controllers/utils.ts+++ b/packages/drawing-ui/src/controllers/utils.ts@@ -73,5 +73,5 @@ export function getCurrentUnitInfo(currentUniverService: IUniverInstanceService)subUnitId = unitId;}- return { unitId, subUnitId };+ return { unitId, subUnitId, current };}