@univerjs/sheets-drawing-ui 1.0.4 → 1.1.0

package/lib/es/index.js

@@ -1,4 +1,4 @@
-import { BooleanNumber, BuildTextUtils, CommandType, DOCS_FORMULA_BAR_EDITOR_UNIT_ID_KEY, DOCS_NORMAL_EDITOR_UNIT_ID_KEY, DependentOn, Direction, Disposable, DisposableCollection, DrawingTypeEnum, FOCUSING_COMMON_DRAWINGS, FOCUSING_FX_BAR_EDITOR, FOCUSING_PANEL_EDITOR, FOCUSING_SHAPE_TEXT_EDITOR, FOCUSING_SHEET, ICommandService, IConfigService, IContextService, IImageIoService, IPermissionService, IURLImageService, IUndoRedoService, IUniverInstanceService, ImageCacheMap, ImageSourceType, ImageUploadStatusType, Inject, Injector, InterceptorEffectEnum, LifecycleService, LifecycleStages, LocaleService, ObjectMatrix, Optional, Plugin, PositionedObjectLayoutType, RxDisposable, Tools, UniverInstanceType, UserManagerService, WrapTextType, createDocumentModelWithStyle, createIdentifier, fromEventSubject, generateRandomId, merge, mergeOverrideWithDependencies, registerDependencies, sequenceExecute, toDisposable, touchDependencies } from "@univerjs/core";
+import { BooleanNumber, BuildTextUtils, CommandType, DOCS_FORMULA_BAR_EDITOR_UNIT_ID_KEY, DOCS_NORMAL_EDITOR_UNIT_ID_KEY, DependentOn, Direction, Disposable, DisposableCollection, DrawingTypeEnum, FOCUSING_COMMON_DRAWINGS, FOCUSING_FX_BAR_EDITOR, FOCUSING_PANEL_EDITOR, FOCUSING_SHAPE_TEXT_EDITOR, FOCUSING_SHEET, ICommandService, IConfigService, IContextService, IImageIoService, ILogService, IPermissionService, IURLImageService, IUndoRedoService, IUniverInstanceService, ImageCacheMap, ImageSourceType, ImageUploadStatusType, Inject, Injector, InterceptorEffectEnum, LifecycleService, LifecycleStages, LocaleService, ObjectMatrix, Optional, Plugin, PositionedObjectLayoutType, RxDisposable, Tools, UniverInstanceType, UserManagerService, WrapTextType, createDocumentModelWithStyle, createIdentifier, fromEventSubject, generateRandomId, merge, mergeOverrideWithDependencies, registerDependencies, sequenceExecute, toDisposable, touchDependencies } from "@univerjs/core";
 import { ClearSheetDrawingTransformerOperation, DrawingApplyType, ISheetDrawingService, InsertSheetDrawingCommand, RemoveSheetDrawingCommand, SetDrawingApplyMutation, SetDrawingArrangeCommand, SetSheetDrawingCommand, SetSheetDrawingPlacementCommand, SetWorksheetBackgroundImageCommand, SetWorksheetBackgroundImageMutation, SheetDrawingAnchorType, UniverSheetsDrawingPlugin, applySheetDrawingPlacement, drawingPositionToTransform, getSheetDrawingPlacement, transformToAxisAlignPosition, transformToDrawingPosition } from "@univerjs/sheets-drawing";
 import { CURSOR_TYPE, DEFAULT_TRANSFORMER_CONFIG, DRAWING_OBJECT_LAYER_INDEX, IRenderManagerService, Image, ObjectType, Rect, SHEET_EXTENSION_TYPE, SHEET_VIEWPORT_KEY, SheetExtension, UniverRenderEnginePlugin, Vector2, getCurrentTypeOfRenderer, getGroupState, transformObjectOutOfGroup } from "@univerjs/engine-render";
 import { Button, Checkbox, CheckboxGroup, DropdownMenu, FormLayout, Input, MessageType, MobileSelect, Radio, RadioGroup, Select, borderClassName, clsx, render, unmount } from "@univerjs/design";
@@ -427,7 +427,7 @@ function readUint32Be(bytes, offset) {
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.149.0/helpers/esm/typeof.js
+//#region \0@oxc-project+runtime@0.153.0/helpers/esm/typeof.js
 function _typeof(o) {
 	"@babel/helpers - typeof";
 	return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function(o) {
@@ -438,7 +438,7 @@ function _typeof(o) {
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.149.0/helpers/esm/toPrimitive.js
+//#region \0@oxc-project+runtime@0.153.0/helpers/esm/toPrimitive.js
 function toPrimitive(t, r) {
 	if ("object" != _typeof(t) || !t) return t;
 	var e = t[Symbol.toPrimitive];
@@ -451,14 +451,14 @@ function toPrimitive(t, r) {
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.149.0/helpers/esm/toPropertyKey.js
+//#region \0@oxc-project+runtime@0.153.0/helpers/esm/toPropertyKey.js
 function toPropertyKey(t) {
 	var i = toPrimitive(t, "string");
 	return "symbol" == _typeof(i) ? i : i + "";
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.149.0/helpers/esm/defineProperty.js
+//#region \0@oxc-project+runtime@0.153.0/helpers/esm/defineProperty.js
 function _defineProperty(e, r, t) {
 	return (r = toPropertyKey(r)) in e ? Object.defineProperty(e, r, {
 		value: t,
@@ -469,7 +469,7 @@ function _defineProperty(e, r, t) {
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.149.0/helpers/esm/decorateParam.js
+//#region \0@oxc-project+runtime@0.153.0/helpers/esm/decorateParam.js
 function __decorateParam(paramIndex, decorator) {
 	return function(target, key) {
 		decorator(target, key, paramIndex);
@@ -477,7 +477,7 @@ function __decorateParam(paramIndex, decorator) {
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.149.0/helpers/esm/decorate.js
+//#region \0@oxc-project+runtime@0.153.0/helpers/esm/decorate.js
 function __decorate(decorators, target, key, desc) {
 	var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
 	if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
@@ -3070,7 +3070,12 @@ let SheetCanvasFloatDomManagerService = _SheetCanvasFloatDomManagerService = cla
 				domAnchor,
 				unitId,
 				subUnitId,
-				id: drawingId
+				id: drawingId,
+				runtimeMetadata: {
+					componentKey,
+					data,
+					allowTransform
+				}
 			};
 			const initedPosition = calcSheetFloatDomPosition(domRect, renderObject.renderUnit.scene, skeletonParam.skeleton, target.worksheet, floatDomInfo);
 			const position$ = new BehaviorSubject(initedPosition);
@@ -3274,7 +3279,12 @@ let SheetCanvasFloatDomManagerService = _SheetCanvasFloatDomManagerService = cla
 					right: viewMain.right
 				},
 				domAnchor: domLayoutParam,
-				scrollDirectionResponse: "HORIZONTAL"
+				scrollDirectionResponse: "HORIZONTAL",
+				runtimeMetadata: {
+					componentKey,
+					data,
+					allowTransform
+				}
 			};
 			const initedPosition = calcSheetFloatDomPosition(domRect, renderObject.renderUnit.scene, skeleton.skeleton, target.worksheet, floatDomInfo);
 			const position$ = new BehaviorSubject(initedPosition);
@@ -3717,7 +3727,7 @@ const menuSchema = {
 //#endregion
 //#region package.json
 var name = "@univerjs/sheets-drawing-ui";
-var version = "1.0.4";
+var version = "1.1.0";
 
 //#endregion
 //#region src/config/config.ts
@@ -4898,13 +4908,14 @@ SheetCellImageCopyPasteController = __decorate([
 //#endregion
 //#region src/controllers/sheet-drawing-active-render.controller.ts
 let SheetDrawingActiveRenderController = class SheetDrawingActiveRenderController extends Disposable {
-	constructor(_context, _commandService, _sheetSkeletonService, _sheetDrawingService, _drawingManagerService) {
+	constructor(_context, _commandService, _sheetSkeletonService, _sheetDrawingService, _drawingManagerService, _logService) {
 		super();
 		this._context = _context;
 		this._commandService = _commandService;
 		this._sheetSkeletonService = _sheetSkeletonService;
 		this._sheetDrawingService = _sheetDrawingService;
 		this._drawingManagerService = _drawingManagerService;
+		this._logService = _logService;
 		_defineProperty(this, "_renderTimeout", void 0);
 		this._commandListener();
 	}
@@ -4926,64 +4937,58 @@ let SheetDrawingActiveRenderController = class SheetDrawingActiveRenderControlle
 		}, 0);
 	}
 	_commandListener() {
+		this.disposeWithMe(this._commandService.beforeCommandExecuted((command) => {
+			if (command.id !== SetWorksheetActiveOperation.id) return;
+			const { unitId, subUnitId } = command.params;
+			const { unit, unitId: contextUnitId } = this._context;
+			if (unitId !== contextUnitId || !unit.getSheetBySheetId(subUnitId) || unit.getActiveSheet().getSheetId() === subUnitId) return;
+			this._clearDrawings(unitId, subUnitId);
+		}));
 		this.disposeWithMe(this._commandService.onCommandExecuted((command) => {
 			if (command.id === SetWorksheetActiveOperation.id) {
 				const { unitId, subUnitId } = command.params;
-				this._updateDrawings(unitId, subUnitId);
+				if (unitId === this._context.unitId && subUnitId === this._context.unit.getActiveSheet().getSheetId()) this._updateDrawings(unitId, subUnitId);
 			}
 		}));
 		this.disposeWithMe(this._context.activated$.subscribe((activated) => {
 			const { unit, unitId } = this._context;
-			if (activated) this._updateDrawings(unitId, unit.getActiveSheet().getSheetId());
-			else this._clearDrawings(unitId);
+			if (activated) {
+				const subUnitId = unit.getActiveSheet().getSheetId();
+				this._clearDrawings(unitId, subUnitId);
+				this._updateDrawings(unitId, subUnitId);
+			} else this._clearDrawings(unitId);
 		}));
 	}
-	_clearDrawings(selfUnitId) {
-		this._scheduleRender(() => {
-			const drawingMap = this._drawingManagerService.drawingManagerData;
-			const removeDrawings = [];
-			Object.keys(drawingMap ?? {}).forEach((unitId) => {
-				const subUnitMap = drawingMap[unitId] ?? {};
-				Object.keys(subUnitMap).forEach((subUnitId) => {
-					var _subUnitMap$subUnitId;
-					const drawingData = ((_subUnitMap$subUnitId = subUnitMap[subUnitId]) === null || _subUnitMap$subUnitId === void 0 ? void 0 : _subUnitMap$subUnitId.data) ?? {};
-					Object.keys(drawingData).forEach((drawingId) => {
-						if (unitId === selfUnitId) removeDrawings.push(drawingData[drawingId]);
-					});
-				});
-			});
-			this._sheetDrawingService.removeNotification(removeDrawings);
-			this._drawingManagerService.removeNotification(removeDrawings);
-		});
+	_clearDrawings(unitId, keepSubUnitId) {
+		this._cancelPendingRender();
+		const subUnitMap = this._drawingManagerService.drawingManagerData[unitId] ?? {};
+		const removeDrawings = [];
+		for (const subUnitId of Object.keys(subUnitMap)) {
+			var _subUnitMap$subUnitId;
+			if (subUnitId === keepSubUnitId) continue;
+			for (const drawing of Object.values(((_subUnitMap$subUnitId = subUnitMap[subUnitId]) === null || _subUnitMap$subUnitId === void 0 ? void 0 : _subUnitMap$subUnitId.data) ?? {})) removeDrawings.push(drawing);
+		}
+		this._sheetDrawingService.removeNotification(removeDrawings);
+		this._drawingManagerService.removeNotification(removeDrawings);
 	}
 	_updateDrawings(showUnitId, showSubunitId) {
 		this._scheduleRender(() => {
+			var _subUnitMap$showSubun;
 			const sheetSkeletonParam = this._sheetSkeletonService.getSkeletonParam(showUnitId, showSubunitId);
-			const drawingMap = this._drawingManagerService.drawingManagerData;
-			const insertDrawings = [];
-			const refreshedDrawings = [];
-			const removeDrawings = [];
-			Object.keys(drawingMap ?? {}).forEach((unitId) => {
-				if (unitId !== showUnitId) return;
-				const subUnitMap = drawingMap[unitId] ?? {};
-				Object.keys(subUnitMap).forEach((subUnitId) => {
-					var _subUnitMap$subUnitId2;
-					const drawingData = ((_subUnitMap$subUnitId2 = subUnitMap[subUnitId]) === null || _subUnitMap$subUnitId2 === void 0 ? void 0 : _subUnitMap$subUnitId2.data) ?? {};
-					Object.keys(drawingData).forEach((drawingId) => {
-						if (unitId === showUnitId && subUnitId === showSubunitId) {
-							const drawing = drawingData[drawingId];
-							if (sheetSkeletonParam && drawing.sheetTransform && drawing.anchorType !== SheetDrawingAnchorType.None) refreshedDrawings.push(applySheetDrawingPlacement(drawing, getSheetDrawingPlacement(drawing), sheetSkeletonParam.skeleton));
-							insertDrawings.push(drawingData[drawingId]);
-						} else removeDrawings.push(drawingData[drawingId]);
-					});
-				});
-			});
+			const drawingData = ((_subUnitMap$showSubun = (this._drawingManagerService.drawingManagerData[showUnitId] ?? {})[showSubunitId]) === null || _subUnitMap$showSubun === void 0 ? void 0 : _subUnitMap$showSubun.data) ?? {};
+			const { successDrawings, refreshedDrawings, failures } = prepareSheetDrawings(Object.values(drawingData), sheetSkeletonParam === null || sheetSkeletonParam === void 0 ? void 0 : sheetSkeletonParam.skeleton);
+			const removeDrawings = failures.map(({ drawingId }) => drawingData[drawingId]);
 			this._sheetDrawingService.refreshTransform(refreshedDrawings);
 			this._drawingManagerService.refreshTransform(refreshedDrawings);
 			this._sheetDrawingService.removeNotification(removeDrawings);
-			this._sheetDrawingService.addNotification(insertDrawings);
+			this._sheetDrawingService.addNotification(successDrawings);
 			this._drawingManagerService.removeNotification(removeDrawings);
-			this._drawingManagerService.addNotification(insertDrawings);
+			this._drawingManagerService.addNotification(successDrawings);
+			if (failures.length) this._logService.error("[SheetDrawingActiveRenderController]", {
+				unitId: showUnitId,
+				subUnitId: showSubunitId,
+				failures
+			});
 		});
 	}
 };
@@ -4991,8 +4996,33 @@ SheetDrawingActiveRenderController = __decorate([
 	__decorateParam(1, ICommandService),
 	__decorateParam(2, Inject(SheetSkeletonService)),
 	__decorateParam(3, ISheetDrawingService),
-	__decorateParam(4, IDrawingManagerService)
+	__decorateParam(4, IDrawingManagerService),
+	__decorateParam(5, ILogService)
 ], SheetDrawingActiveRenderController);
+function prepareSheetDrawings(drawings, skeleton) {
+	const successDrawings = [];
+	const refreshedDrawings = [];
+	const failures = [];
+	for (const drawing of drawings) {
+		if (skeleton && drawing.sheetTransform && drawing.anchorType !== SheetDrawingAnchorType.None) try {
+			refreshedDrawings.push(applySheetDrawingPlacement(drawing, getSheetDrawingPlacement(drawing), skeleton));
+		} catch (error) {
+			failures.push({
+				drawingId: drawing.drawingId,
+				drawingType: drawing.drawingType,
+				anchorType: drawing.anchorType ?? SheetDrawingAnchorType.Position,
+				error
+			});
+			continue;
+		}
+		successDrawings.push(drawing);
+	}
+	return {
+		successDrawings,
+		refreshedDrawings,
+		failures
+	};
+}
 
 //#endregion
 //#region src/controllers/sheet-drawing-copy-paste.controller.ts

package/lib/facade.js

@@ -13,16 +13,23 @@ import { IRenderManagerService, getCurrentTypeOfRenderer } from "@univerjs/engin
 var FWorksheetDrawingUIMixin = class extends FWorksheet {
 	getFloatDomById(id) {
 		const info = this._injector.get(SheetCanvasFloatDomManagerService).getFloatDomInfo(id);
-		if (!info) return null;
-		const { unitId, subUnitId } = info;
-		const { rect } = info;
-		const { left = 0, top = 0, width = 0, height = 0, flipX = false, flipY = false, angle = 0, skewX = 0, skewY = 0 } = rect.getState();
-		const drawingParm = this._injector.get(ISheetDrawingService).getDrawingByParam({
-			drawingId: info.id,
+		return info ? this._getFloatDomResult(info) : null;
+	}
+	getAllFloatDoms() {
+		const floatDomService = this._injector.get(SheetCanvasFloatDomManagerService);
+		const unitId = this._workbook.getUnitId();
+		const subUnitId = this._worksheet.getSheetId();
+		return floatDomService.getFloatDomsBySubUnitId(unitId, subUnitId).map((info) => this._getFloatDomResult(info)).filter((dom) => dom != null);
+	}
+	_getFloatDomResult(info) {
+		const { unitId, subUnitId, id, rect, runtimeMetadata } = info;
+		const metadata = runtimeMetadata ?? this._injector.get(ISheetDrawingService).getDrawingByParam({
+			drawingId: id,
 			unitId,
 			subUnitId
 		});
-		if (!drawingParm) return null;
+		if (!metadata) return null;
+		const { left = 0, top = 0, width = 0, height = 0, flipX = false, flipY = false, angle = 0, skewX = 0, skewY = 0 } = rect.getState();
 		return {
 			position: {
 				left,
@@ -35,44 +42,12 @@ var FWorksheetDrawingUIMixin = class extends FWorksheet {
 				skewX,
 				skewY
 			},
-			componentKey: drawingParm.componentKey,
-			allowTransform: drawingParm.allowTransform,
-			data: drawingParm.data,
-			id: info.id
+			componentKey: metadata.componentKey,
+			allowTransform: metadata.allowTransform,
+			data: metadata.data,
+			id
 		};
 	}
-	getAllFloatDoms() {
-		const floatDomService = this._injector.get(SheetCanvasFloatDomManagerService);
-		const unitId = this._workbook.getUnitId();
-		const subUnitId = this._worksheet.getSheetId();
-		return Array.from(floatDomService.getFloatDomsBySubUnitId(unitId, subUnitId).values()).map((info) => {
-			const { rect } = info;
-			const drawingParm = this._injector.get(ISheetDrawingService).getDrawingByParam({
-				drawingId: info.id,
-				unitId,
-				subUnitId
-			});
-			if (!drawingParm) return null;
-			const { left, top, width, height, flipX, flipY, angle, skewX, skewY } = rect.getState();
-			return {
-				position: {
-					left,
-					top,
-					width,
-					height,
-					flipX,
-					flipY,
-					angle,
-					skewX,
-					skewY
-				},
-				componentKey: drawingParm.componentKey,
-				allowTransform: drawingParm.allowTransform,
-				data: drawingParm.data,
-				id: info.id
-			};
-		}).filter((dom) => dom != null);
-	}
 	updateFloatDom(id, config) {
 		const sheetSkeletonService = this._injector.get(SheetSkeletonService);
 		const info = this._injector.get(SheetCanvasFloatDomManagerService).getFloatDomInfo(id);

package/lib/index.js

@@ -1,4 +1,4 @@
-import { BooleanNumber, BuildTextUtils, CommandType, DOCS_FORMULA_BAR_EDITOR_UNIT_ID_KEY, DOCS_NORMAL_EDITOR_UNIT_ID_KEY, DependentOn, Direction, Disposable, DisposableCollection, DrawingTypeEnum, FOCUSING_COMMON_DRAWINGS, FOCUSING_FX_BAR_EDITOR, FOCUSING_PANEL_EDITOR, FOCUSING_SHAPE_TEXT_EDITOR, FOCUSING_SHEET, ICommandService, IConfigService, IContextService, IImageIoService, IPermissionService, IURLImageService, IUndoRedoService, IUniverInstanceService, ImageCacheMap, ImageSourceType, ImageUploadStatusType, Inject, Injector, InterceptorEffectEnum, LifecycleService, LifecycleStages, LocaleService, ObjectMatrix, Optional, Plugin, PositionedObjectLayoutType, RxDisposable, Tools, UniverInstanceType, UserManagerService, WrapTextType, createDocumentModelWithStyle, createIdentifier, fromEventSubject, generateRandomId, merge, mergeOverrideWithDependencies, registerDependencies, sequenceExecute, toDisposable, touchDependencies } from "@univerjs/core";
+import { BooleanNumber, BuildTextUtils, CommandType, DOCS_FORMULA_BAR_EDITOR_UNIT_ID_KEY, DOCS_NORMAL_EDITOR_UNIT_ID_KEY, DependentOn, Direction, Disposable, DisposableCollection, DrawingTypeEnum, FOCUSING_COMMON_DRAWINGS, FOCUSING_FX_BAR_EDITOR, FOCUSING_PANEL_EDITOR, FOCUSING_SHAPE_TEXT_EDITOR, FOCUSING_SHEET, ICommandService, IConfigService, IContextService, IImageIoService, ILogService, IPermissionService, IURLImageService, IUndoRedoService, IUniverInstanceService, ImageCacheMap, ImageSourceType, ImageUploadStatusType, Inject, Injector, InterceptorEffectEnum, LifecycleService, LifecycleStages, LocaleService, ObjectMatrix, Optional, Plugin, PositionedObjectLayoutType, RxDisposable, Tools, UniverInstanceType, UserManagerService, WrapTextType, createDocumentModelWithStyle, createIdentifier, fromEventSubject, generateRandomId, merge, mergeOverrideWithDependencies, registerDependencies, sequenceExecute, toDisposable, touchDependencies } from "@univerjs/core";
 import { ClearSheetDrawingTransformerOperation, DrawingApplyType, ISheetDrawingService, InsertSheetDrawingCommand, RemoveSheetDrawingCommand, SetDrawingApplyMutation, SetDrawingArrangeCommand, SetSheetDrawingCommand, SetSheetDrawingPlacementCommand, SetWorksheetBackgroundImageCommand, SetWorksheetBackgroundImageMutation, SheetDrawingAnchorType, UniverSheetsDrawingPlugin, applySheetDrawingPlacement, drawingPositionToTransform, getSheetDrawingPlacement, transformToAxisAlignPosition, transformToDrawingPosition } from "@univerjs/sheets-drawing";
 import { CURSOR_TYPE, DEFAULT_TRANSFORMER_CONFIG, DRAWING_OBJECT_LAYER_INDEX, IRenderManagerService, Image, ObjectType, Rect, SHEET_EXTENSION_TYPE, SHEET_VIEWPORT_KEY, SheetExtension, UniverRenderEnginePlugin, Vector2, getCurrentTypeOfRenderer, getGroupState, transformObjectOutOfGroup } from "@univerjs/engine-render";
 import { Button, Checkbox, CheckboxGroup, DropdownMenu, FormLayout, Input, MessageType, MobileSelect, Radio, RadioGroup, Select, borderClassName, clsx, render, unmount } from "@univerjs/design";
@@ -427,7 +427,7 @@ function readUint32Be(bytes, offset) {
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.149.0/helpers/esm/typeof.js
+//#region \0@oxc-project+runtime@0.153.0/helpers/esm/typeof.js
 function _typeof(o) {
 	"@babel/helpers - typeof";
 	return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function(o) {
@@ -438,7 +438,7 @@ function _typeof(o) {
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.149.0/helpers/esm/toPrimitive.js
+//#region \0@oxc-project+runtime@0.153.0/helpers/esm/toPrimitive.js
 function toPrimitive(t, r) {
 	if ("object" != _typeof(t) || !t) return t;
 	var e = t[Symbol.toPrimitive];
@@ -451,14 +451,14 @@ function toPrimitive(t, r) {
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.149.0/helpers/esm/toPropertyKey.js
+//#region \0@oxc-project+runtime@0.153.0/helpers/esm/toPropertyKey.js
 function toPropertyKey(t) {
 	var i = toPrimitive(t, "string");
 	return "symbol" == _typeof(i) ? i : i + "";
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.149.0/helpers/esm/defineProperty.js
+//#region \0@oxc-project+runtime@0.153.0/helpers/esm/defineProperty.js
 function _defineProperty(e, r, t) {
 	return (r = toPropertyKey(r)) in e ? Object.defineProperty(e, r, {
 		value: t,
@@ -469,7 +469,7 @@ function _defineProperty(e, r, t) {
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.149.0/helpers/esm/decorateParam.js
+//#region \0@oxc-project+runtime@0.153.0/helpers/esm/decorateParam.js
 function __decorateParam(paramIndex, decorator) {
 	return function(target, key) {
 		decorator(target, key, paramIndex);
@@ -477,7 +477,7 @@ function __decorateParam(paramIndex, decorator) {
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.149.0/helpers/esm/decorate.js
+//#region \0@oxc-project+runtime@0.153.0/helpers/esm/decorate.js
 function __decorate(decorators, target, key, desc) {
 	var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
 	if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
@@ -3070,7 +3070,12 @@ let SheetCanvasFloatDomManagerService = _SheetCanvasFloatDomManagerService = cla
 				domAnchor,
 				unitId,
 				subUnitId,
-				id: drawingId
+				id: drawingId,
+				runtimeMetadata: {
+					componentKey,
+					data,
+					allowTransform
+				}
 			};
 			const initedPosition = calcSheetFloatDomPosition(domRect, renderObject.renderUnit.scene, skeletonParam.skeleton, target.worksheet, floatDomInfo);
 			const position$ = new BehaviorSubject(initedPosition);
@@ -3274,7 +3279,12 @@ let SheetCanvasFloatDomManagerService = _SheetCanvasFloatDomManagerService = cla
 					right: viewMain.right
 				},
 				domAnchor: domLayoutParam,
-				scrollDirectionResponse: "HORIZONTAL"
+				scrollDirectionResponse: "HORIZONTAL",
+				runtimeMetadata: {
+					componentKey,
+					data,
+					allowTransform
+				}
 			};
 			const initedPosition = calcSheetFloatDomPosition(domRect, renderObject.renderUnit.scene, skeleton.skeleton, target.worksheet, floatDomInfo);
 			const position$ = new BehaviorSubject(initedPosition);
@@ -3717,7 +3727,7 @@ const menuSchema = {
 //#endregion
 //#region package.json
 var name = "@univerjs/sheets-drawing-ui";
-var version = "1.0.4";
+var version = "1.1.0";
 
 //#endregion
 //#region src/config/config.ts
@@ -4898,13 +4908,14 @@ SheetCellImageCopyPasteController = __decorate([
 //#endregion
 //#region src/controllers/sheet-drawing-active-render.controller.ts
 let SheetDrawingActiveRenderController = class SheetDrawingActiveRenderController extends Disposable {
-	constructor(_context, _commandService, _sheetSkeletonService, _sheetDrawingService, _drawingManagerService) {
+	constructor(_context, _commandService, _sheetSkeletonService, _sheetDrawingService, _drawingManagerService, _logService) {
 		super();
 		this._context = _context;
 		this._commandService = _commandService;
 		this._sheetSkeletonService = _sheetSkeletonService;
 		this._sheetDrawingService = _sheetDrawingService;
 		this._drawingManagerService = _drawingManagerService;
+		this._logService = _logService;
 		_defineProperty(this, "_renderTimeout", void 0);
 		this._commandListener();
 	}
@@ -4926,64 +4937,58 @@ let SheetDrawingActiveRenderController = class SheetDrawingActiveRenderControlle
 		}, 0);
 	}
 	_commandListener() {
+		this.disposeWithMe(this._commandService.beforeCommandExecuted((command) => {
+			if (command.id !== SetWorksheetActiveOperation.id) return;
+			const { unitId, subUnitId } = command.params;
+			const { unit, unitId: contextUnitId } = this._context;
+			if (unitId !== contextUnitId || !unit.getSheetBySheetId(subUnitId) || unit.getActiveSheet().getSheetId() === subUnitId) return;
+			this._clearDrawings(unitId, subUnitId);
+		}));
 		this.disposeWithMe(this._commandService.onCommandExecuted((command) => {
 			if (command.id === SetWorksheetActiveOperation.id) {
 				const { unitId, subUnitId } = command.params;
-				this._updateDrawings(unitId, subUnitId);
+				if (unitId === this._context.unitId && subUnitId === this._context.unit.getActiveSheet().getSheetId()) this._updateDrawings(unitId, subUnitId);
 			}
 		}));
 		this.disposeWithMe(this._context.activated$.subscribe((activated) => {
 			const { unit, unitId } = this._context;
-			if (activated) this._updateDrawings(unitId, unit.getActiveSheet().getSheetId());
-			else this._clearDrawings(unitId);
+			if (activated) {
+				const subUnitId = unit.getActiveSheet().getSheetId();
+				this._clearDrawings(unitId, subUnitId);
+				this._updateDrawings(unitId, subUnitId);
+			} else this._clearDrawings(unitId);
 		}));
 	}
-	_clearDrawings(selfUnitId) {
-		this._scheduleRender(() => {
-			const drawingMap = this._drawingManagerService.drawingManagerData;
-			const removeDrawings = [];
-			Object.keys(drawingMap ?? {}).forEach((unitId) => {
-				const subUnitMap = drawingMap[unitId] ?? {};
-				Object.keys(subUnitMap).forEach((subUnitId) => {
-					var _subUnitMap$subUnitId;
-					const drawingData = ((_subUnitMap$subUnitId = subUnitMap[subUnitId]) === null || _subUnitMap$subUnitId === void 0 ? void 0 : _subUnitMap$subUnitId.data) ?? {};
-					Object.keys(drawingData).forEach((drawingId) => {
-						if (unitId === selfUnitId) removeDrawings.push(drawingData[drawingId]);
-					});
-				});
-			});
-			this._sheetDrawingService.removeNotification(removeDrawings);
-			this._drawingManagerService.removeNotification(removeDrawings);
-		});
+	_clearDrawings(unitId, keepSubUnitId) {
+		this._cancelPendingRender();
+		const subUnitMap = this._drawingManagerService.drawingManagerData[unitId] ?? {};
+		const removeDrawings = [];
+		for (const subUnitId of Object.keys(subUnitMap)) {
+			var _subUnitMap$subUnitId;
+			if (subUnitId === keepSubUnitId) continue;
+			for (const drawing of Object.values(((_subUnitMap$subUnitId = subUnitMap[subUnitId]) === null || _subUnitMap$subUnitId === void 0 ? void 0 : _subUnitMap$subUnitId.data) ?? {})) removeDrawings.push(drawing);
+		}
+		this._sheetDrawingService.removeNotification(removeDrawings);
+		this._drawingManagerService.removeNotification(removeDrawings);
 	}
 	_updateDrawings(showUnitId, showSubunitId) {
 		this._scheduleRender(() => {
+			var _subUnitMap$showSubun;
 			const sheetSkeletonParam = this._sheetSkeletonService.getSkeletonParam(showUnitId, showSubunitId);
-			const drawingMap = this._drawingManagerService.drawingManagerData;
-			const insertDrawings = [];
-			const refreshedDrawings = [];
-			const removeDrawings = [];
-			Object.keys(drawingMap ?? {}).forEach((unitId) => {
-				if (unitId !== showUnitId) return;
-				const subUnitMap = drawingMap[unitId] ?? {};
-				Object.keys(subUnitMap).forEach((subUnitId) => {
-					var _subUnitMap$subUnitId2;
-					const drawingData = ((_subUnitMap$subUnitId2 = subUnitMap[subUnitId]) === null || _subUnitMap$subUnitId2 === void 0 ? void 0 : _subUnitMap$subUnitId2.data) ?? {};
-					Object.keys(drawingData).forEach((drawingId) => {
-						if (unitId === showUnitId && subUnitId === showSubunitId) {
-							const drawing = drawingData[drawingId];
-							if (sheetSkeletonParam && drawing.sheetTransform && drawing.anchorType !== SheetDrawingAnchorType.None) refreshedDrawings.push(applySheetDrawingPlacement(drawing, getSheetDrawingPlacement(drawing), sheetSkeletonParam.skeleton));
-							insertDrawings.push(drawingData[drawingId]);
-						} else removeDrawings.push(drawingData[drawingId]);
-					});
-				});
-			});
+			const drawingData = ((_subUnitMap$showSubun = (this._drawingManagerService.drawingManagerData[showUnitId] ?? {})[showSubunitId]) === null || _subUnitMap$showSubun === void 0 ? void 0 : _subUnitMap$showSubun.data) ?? {};
+			const { successDrawings, refreshedDrawings, failures } = prepareSheetDrawings(Object.values(drawingData), sheetSkeletonParam === null || sheetSkeletonParam === void 0 ? void 0 : sheetSkeletonParam.skeleton);
+			const removeDrawings = failures.map(({ drawingId }) => drawingData[drawingId]);
 			this._sheetDrawingService.refreshTransform(refreshedDrawings);
 			this._drawingManagerService.refreshTransform(refreshedDrawings);
 			this._sheetDrawingService.removeNotification(removeDrawings);
-			this._sheetDrawingService.addNotification(insertDrawings);
+			this._sheetDrawingService.addNotification(successDrawings);
 			this._drawingManagerService.removeNotification(removeDrawings);
-			this._drawingManagerService.addNotification(insertDrawings);
+			this._drawingManagerService.addNotification(successDrawings);
+			if (failures.length) this._logService.error("[SheetDrawingActiveRenderController]", {
+				unitId: showUnitId,
+				subUnitId: showSubunitId,
+				failures
+			});
 		});
 	}
 };
@@ -4991,8 +4996,33 @@ SheetDrawingActiveRenderController = __decorate([
 	__decorateParam(1, ICommandService),
 	__decorateParam(2, Inject(SheetSkeletonService)),
 	__decorateParam(3, ISheetDrawingService),
-	__decorateParam(4, IDrawingManagerService)
+	__decorateParam(4, IDrawingManagerService),
+	__decorateParam(5, ILogService)
 ], SheetDrawingActiveRenderController);
+function prepareSheetDrawings(drawings, skeleton) {
+	const successDrawings = [];
+	const refreshedDrawings = [];
+	const failures = [];
+	for (const drawing of drawings) {
+		if (skeleton && drawing.sheetTransform && drawing.anchorType !== SheetDrawingAnchorType.None) try {
+			refreshedDrawings.push(applySheetDrawingPlacement(drawing, getSheetDrawingPlacement(drawing), skeleton));
+		} catch (error) {
+			failures.push({
+				drawingId: drawing.drawingId,
+				drawingType: drawing.drawingType,
+				anchorType: drawing.anchorType ?? SheetDrawingAnchorType.Position,
+				error
+			});
+			continue;
+		}
+		successDrawings.push(drawing);
+	}
+	return {
+		successDrawings,
+		refreshedDrawings,
+		failures
+	};
+}
 
 //#endregion
 //#region src/controllers/sheet-drawing-copy-paste.controller.ts

package/lib/types/controllers/sheet-drawing-active-render.controller.d.ts

@@ -15,7 +15,7 @@
  */
 import type { Workbook } from '@univerjs/core';
 import type { IRenderContext, IRenderModule } from '@univerjs/engine-render';
-import { Disposable, ICommandService } from '@univerjs/core';
+import { Disposable, ICommandService, ILogService } from '@univerjs/core';
 import { IDrawingManagerService } from '@univerjs/drawing';
 import { SheetSkeletonService } from '@univerjs/sheets';
 import { ISheetDrawingService } from '@univerjs/sheets-drawing';
@@ -25,8 +25,9 @@ export declare class SheetDrawingActiveRenderController extends Disposable imple
     private readonly _sheetSkeletonService;
     private readonly _sheetDrawingService;
     private readonly _drawingManagerService;
+    private readonly _logService;
     private _renderTimeout;
-    constructor(_context: IRenderContext<Workbook>, _commandService: ICommandService, _sheetSkeletonService: SheetSkeletonService, _sheetDrawingService: ISheetDrawingService, _drawingManagerService: IDrawingManagerService);
+    constructor(_context: IRenderContext<Workbook>, _commandService: ICommandService, _sheetSkeletonService: SheetSkeletonService, _sheetDrawingService: ISheetDrawingService, _drawingManagerService: IDrawingManagerService, _logService: ILogService);
     dispose(): void;
     private _cancelPendingRender;
     private _scheduleRender;

package/lib/types/facade/f-worksheet.d.ts

@@ -405,6 +405,7 @@ export interface IFWorksheetDrawingUIMixin {
 export declare class FWorksheetDrawingUIMixin extends FWorksheet implements IFWorksheetDrawingUIMixin {
     getFloatDomById(id: string): Nullable<IFCanvasFloatDomResult>;
     getAllFloatDoms(): IFCanvasFloatDomResult[];
+    private _getFloatDomResult;
     updateFloatDom(id: string, config: Partial<Omit<IFCanvasFloatDomResult, 'id'>>): this;
     batchUpdateFloatDoms(updates: Array<{
         id: string;

package/lib/types/services/canvas-float-dom-manager.service.d.ts

@@ -70,6 +70,8 @@ export interface ICanvasFloatDomInfo {
     scrollDirectionResponse?: ScrollDirectionResponse;
     domAnchor?: IDOMAnchor;
     id: string;
+    /** Query attributes for float doms created without a backing drawing. */
+    runtimeMetadata?: Pick<ICanvasFloatDom, 'componentKey' | 'data' | 'allowTransform'>;
     domId?: string;
     floatDomConfig?: IFloatDom;
     runtimeMounted?: boolean;