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): drawing switch tab position error (#2686)
Univerbd5293c6fd0d
diff --git a/packages/drawing-ui/src/controllers/image-update.controller.ts b/packages/drawing-ui/src/controllers/image-update.controller.tsindex 9188d57c05..a09fcf0332 100644--- a/packages/drawing-ui/src/controllers/image-update.controller.ts+++ b/packages/drawing-ui/src/controllers/image-update.controller.ts@@ -198,8 +198,9 @@ export class ImageUpdateController extends Disposable {(params).forEach(async (param) => {const { unitId, subUnitId, drawingId } = param;const renderObject = this._getSceneAndTransformerByDrawingSearch(unitId);+ const currentSubUnitId = getCurrentUnitInfo(this._currentUniverService)?.subUnitId;- if (renderObject == null) {+ if (renderObject == null || currentSubUnitId !== subUnitId) {return;}diff --git a/packages/sheets-drawing-ui/src/controllers/sheet-drawing-transform-affected.controller.ts b/packages/sheets-drawing-ui/src/controllers/sheet-drawing-transform-affected.controller.tsindex 5ed37fc624..73e336b0b8 100644--- a/packages/sheets-drawing-ui/src/controllers/sheet-drawing-transform-affected.controller.ts+++ b/packages/sheets-drawing-ui/src/controllers/sheet-drawing-transform-affected.controller.ts@@ -1159,34 +1159,38 @@ export class SheetDrawingTransformAffectedController extends Disposable implementhis.disposeWithMe(this._commandService.onCommandExecuted((command: ICommandInfo) => {if (command.id === SetWorksheetActiveOperation.id) {- const params = command.params as ISetWorksheetActiveOperationParams;- const { unitId: showUnitId, subUnitId: showSubunitId } = params;+ setTimeout(() => {+ const params = command.params as ISetWorksheetActiveOperationParams;+ const { unitId: showUnitId, subUnitId: showSubunitId } = params;- const drawingMap = this._drawingManagerService.drawingManagerData;+ const drawingMap = this._drawingManagerService.drawingManagerData;- const insertDrawings: IDrawingParam[] = [];+ const insertDrawings: IDrawingParam[] = [];- const removeDrawings: IDrawingParam[] = [];+ const removeDrawings: IDrawingParam[] = [];- Object.keys(drawingMap).forEach((unitId) => {- const subUnitMap = drawingMap[unitId];- Object.keys(subUnitMap).forEach((subUnitId) => {- const drawingData = subUnitMap[subUnitId].data;- if (drawingData == null) {- return;- }- Object.keys(drawingData).forEach((drawingId) => {- if (unitId === showUnitId && subUnitId === showSubunitId) {- insertDrawings.push(drawingData[drawingId]);- } else {- removeDrawings.push(drawingData[drawingId]);+ Object.keys(drawingMap).forEach((unitId) => {+ const subUnitMap = drawingMap[unitId];+ Object.keys(subUnitMap).forEach((subUnitId) => {+ const drawingData = subUnitMap[subUnitId].data;+ if (drawingData == null) {+ return;}+ Object.keys(drawingData).forEach((drawingId) => {+ if (unitId === showUnitId && subUnitId === showSubunitId) {+ const drawing = drawingData[drawingId] as ISheetDrawing;+ drawing.transform = drawingPositionToTransform(drawing.sheetTransform, this._selectionRenderService, this._sheetSkeletonManagerService);+ insertDrawings.push(drawingData[drawingId]);+ } else {+ removeDrawings.push(drawingData[drawingId]);+ }+ });});});- });- this._drawingManagerService.removeNotification(removeDrawings);- this._drawingManagerService.addNotification(insertDrawings);+ this._drawingManagerService.removeNotification(removeDrawings);+ this._drawingManagerService.addNotification(insertDrawings);+ }, 0);}}));