@univerjs/sheets-drawing-ui 0.25.1 → 1.0.0-alpha.1

package/lib/index.js

@@ -1,17 +1,17 @@
-import { BooleanNumber, BuildTextUtils, CommandType, DOCS_FORMULA_BAR_EDITOR_UNIT_ID_KEY, DOCS_NORMAL_EDITOR_UNIT_ID_KEY, DOCS_ZEN_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, ImageSourceType, Inject, Injector, InterceptorEffectEnum, LifecycleService, LifecycleStages, LocaleService, ObjectMatrix, ObjectRelativeFromH, ObjectRelativeFromV, PRINT_CHART_COMPONENT_KEY, Plugin, PositionedObjectLayoutType, RANGE_TYPE, Rectangle, RxDisposable, Tools, UniverInstanceType, UserManagerService, WrapTextType, createDocumentModelWithStyle, createIdentifier, fromEventSubject, generateRandomId, merge, registerDependencies, sequenceExecute, 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, IPermissionService, IURLImageService, IUndoRedoService, IUniverInstanceService, ImageSourceType, Inject, Injector, InterceptorEffectEnum, LifecycleService, LifecycleStages, LocaleService, ObjectMatrix, ObjectRelativeFromH, ObjectRelativeFromV, PRINT_CHART_COMPONENT_KEY, Plugin, PositionedObjectLayoutType, RANGE_TYPE, Rectangle, RxDisposable, Tools, UniverInstanceType, UserManagerService, WrapTextType, createDocumentModelWithStyle, createIdentifier, fromEventSubject, generateRandomId, merge, registerDependencies, sequenceExecute, touchDependencies } from "@univerjs/core";
 import { ClearSheetDrawingTransformerOperation, DrawingApplyType, ISheetDrawingService, InsertSheetDrawingCommand, RemoveSheetDrawingCommand, SetDrawingApplyMutation, SetDrawingArrangeCommand, SetSheetDrawingCommand, SheetDrawingAnchorType, UniverSheetsDrawingPlugin, drawingPositionToTransform, transformToAxisAlignPosition, transformToDrawingPosition } from "@univerjs/sheets-drawing";
 import { CURSOR_TYPE, DRAWING_OBJECT_LAYER_INDEX, IRenderManagerService, ObjectType, Rect, SHEET_VIEWPORT_KEY, getCurrentTypeOfRenderer, getGroupState, transformObjectOutOfGroup } from "@univerjs/engine-render";
 import { Button, Checkbox, CheckboxGroup, FormLayout, MessageType, Radio, RadioGroup, Select, clsx, render, unmount } from "@univerjs/design";
-import { InnerPasteCommand, ReplaceSnapshotCommand, docDrawingPositionToTransform } from "@univerjs/docs-ui";
+import { InnerPasteCommand, docDrawingPositionToTransform } from "@univerjs/docs-ui";
 import { DRAWING_IMAGE_ALLOW_IMAGE_LIST, DRAWING_IMAGE_COUNT_LIMIT, DRAWING_IMAGE_HEIGHT_LIMIT, DRAWING_IMAGE_WIDTH_LIMIT, IDrawingManagerService, IImageIoService as IImageIoService$1, ImageSourceType as ImageSourceType$1, ImageUploadStatusType, SetDrawingSelectedOperation, UniverDrawingPlugin, getDrawingImageAllowSize, getDrawingShapeKeyByDrawingSearch, getImageSize } from "@univerjs/drawing";
 import { COMMAND_LISTENER_SKELETON_CHANGE, DeleteRangeMoveLeftCommand, DeleteRangeMoveUpCommand, DeltaColumnWidthCommand, DeltaRowHeightCommand, IAutoFillService, INTERCEPTOR_POINT, InsertColCommand, InsertRangeMoveDownCommand, InsertRangeMoveRightCommand, InsertRowCommand, InterceptCellContentPriority, MoveColsCommand, MoveRangeCommand, MoveRowsCommand, RangeProtectionPermissionEditPoint, RemoveColCommand, RemoveRowCommand, SetColHiddenCommand, SetColHiddenMutation, SetColVisibleMutation, SetColWidthCommand, SetFrozenMutation, SetRangeValuesCommand, SetRowHeightCommand, SetRowHiddenCommand, SetRowHiddenMutation, SetRowVisibleMutation, SetSelectionsOperation, SetSpecificColsVisibleCommand, SetSpecificRowsVisibleCommand, SetWorksheetActiveOperation, SetWorksheetColWidthMutation, SetWorksheetRowAutoHeightMutation, SetWorksheetRowHeightMutation, SetWorksheetRowIsAutoHeightMutation, SheetInterceptorService, SheetPermissionCheckController, SheetSkeletonService, SheetsSelectionsService, WorkbookEditablePermission, WorkbookViewPermission, WorksheetEditPermission, WorksheetViewPermission, attachRangeWithCoord, discreteRangeToRange, getSheetCommandTarget } from "@univerjs/sheets";
 import { COPY_TYPE, EditingRenderController, HoverManagerService, IEditorBridgeService, ISheetClipboardService, ISheetSelectionRenderService, PREDEFINED_HOOK_NAME_PASTE, SetCellEditVisibleOperation, SetScrollOperation, SetZoomRatioOperation, SheetCanvasPopManagerService, SheetPrintInterceptorService, SheetSkeletonManagerService, getCurrentRangeDisable$, useHighlightRange, virtualizeDiscreteRanges } from "@univerjs/sheets-ui";
 import { CanvasFloatDomService, ComponentManager, ContextMenuGroup, ContextMenuPosition, IClipboardInterfaceService, IContextMenuService, IDialogService, ILocalFileService, IMenuManagerService, IMessageService, IShortcutService, ISidebarService, KeyCode, MenuItemType, PrintFloatDomSingle, RibbonInsertGroup, connectInjector, getMenuHiddenObservable, useDependency } from "@univerjs/ui";
 import { DocDrawingController, UniverDocsDrawingPlugin } from "@univerjs/docs-drawing";
 import { COMPONENT_IMAGE_POPUP_MENU, DrawingCommonPanel, DrawingRenderService, ImageCropperObject, ImageResetSizeOperation, OpenImageCropOperation, UniverDrawingUIPlugin } from "@univerjs/drawing-ui";
-import { BehaviorSubject, EMPTY, Subject, combineLatest, distinctUntilChanged, filter, map, of, switchMap, take, tap, throttleTime } from "rxjs";
 import { useCallback, useEffect, useMemo, useState } from "react";
 import { jsx, jsxs } from "react/jsx-runtime";
+import { BehaviorSubject, EMPTY, Subject, combineLatest, distinctUntilChanged, filter, map, of, switchMap, take, tap, throttleTime } from "rxjs";
 
 //#region src/commands/commands/delete-drawings.command.ts
 const DeleteDrawingsCommand = {
@@ -291,7 +291,7 @@ const UngroupSheetDrawingCommand = {
 };
 
 //#endregion
-//#region \0@oxc-project+runtime@0.133.0/helpers/esm/typeof.js
+//#region \0@oxc-project+runtime@0.137.0/helpers/esm/typeof.js
 function _typeof(o) {
 	"@babel/helpers - typeof";
 	return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function(o) {
@@ -302,7 +302,7 @@ function _typeof(o) {
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.133.0/helpers/esm/toPrimitive.js
+//#region \0@oxc-project+runtime@0.137.0/helpers/esm/toPrimitive.js
 function toPrimitive(t, r) {
 	if ("object" != _typeof(t) || !t) return t;
 	var e = t[Symbol.toPrimitive];
@@ -315,14 +315,14 @@ function toPrimitive(t, r) {
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.133.0/helpers/esm/toPropertyKey.js
+//#region \0@oxc-project+runtime@0.137.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.133.0/helpers/esm/defineProperty.js
+//#region \0@oxc-project+runtime@0.137.0/helpers/esm/defineProperty.js
 function _defineProperty(e, r, t) {
 	return (r = toPropertyKey(r)) in e ? Object.defineProperty(e, r, {
 		value: t,
@@ -333,7 +333,7 @@ function _defineProperty(e, r, t) {
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.133.0/helpers/esm/decorateParam.js
+//#region \0@oxc-project+runtime@0.137.0/helpers/esm/decorateParam.js
 function __decorateParam(paramIndex, decorator) {
 	return function(target, key) {
 		decorator(target, key, paramIndex);
@@ -341,7 +341,7 @@ function __decorateParam(paramIndex, decorator) {
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.133.0/helpers/esm/decorate.js
+//#region \0@oxc-project+runtime@0.137.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);
@@ -1659,27 +1659,27 @@ function ImageMenuFactory(accessor) {
 		})
 	};
 }
-function UploadFloatImageMenuFactory(_accessor) {
+function UploadFloatImageMenuFactory(accessor) {
 	return {
 		id: InsertFloatImageCommand.id,
 		title: "sheets-drawing-ui.upload.float",
 		type: MenuItemType.BUTTON,
-		hidden$: getMenuHiddenObservable(_accessor, UniverInstanceType.UNIVER_SHEET)
+		hidden$: getMenuHiddenObservable(accessor, UniverInstanceType.UNIVER_SHEET)
 	};
 }
-function UploadCellImageMenuFactory(_accessor) {
+function UploadCellImageMenuFactory(accessor) {
 	return {
 		id: InsertCellImageCommand.id,
 		title: "sheets-drawing-ui.upload.cell",
 		type: MenuItemType.BUTTON,
-		hidden$: getMenuHiddenObservable(_accessor, UniverInstanceType.UNIVER_SHEET)
+		hidden$: getMenuHiddenObservable(accessor, UniverInstanceType.UNIVER_SHEET)
 	};
 }
 
 //#endregion
 //#region package.json
 var name = "@univerjs/sheets-drawing-ui";
-var version = "0.25.1";
+var version = "1.0.0-alpha.1";
 
 //#endregion
 //#region src/config/config.ts
@@ -1687,6 +1687,282 @@ const SHEETS_DRAWING_UI_PLUGIN_CONFIG_KEY = "sheets-drawing-ui.config";
 const configSymbol = Symbol(SHEETS_DRAWING_UI_PLUGIN_CONFIG_KEY);
 const defaultPluginConfig = {};
 
+//#endregion
+//#region src/views/batch-save-images/BatchSaveImagesDialog.tsx
+function BatchSaveImagesDialog() {
+	const localeService = useDependency(LocaleService);
+	const dialogService = useDependency(IDialogService);
+	const batchSaveService = useDependency(IBatchSaveImagesService);
+	const [fileNameParts, setFileNameParts] = useState(["cellAddress"]);
+	const [saving, setSaving] = useState(false);
+	const [error, setError] = useState(null);
+	const images = useMemo(() => batchSaveService.getCellImagesInSelection(), [batchSaveService]);
+	const dataColumns = useMemo(() => batchSaveService.getDataColumns(), [batchSaveService]);
+	const rowRange = useMemo(() => batchSaveService.getSelectionRowRange(), [batchSaveService]);
+	const hasAvailableColumns = dataColumns.length > 0;
+	const columnOptions = useMemo(() => {
+		return dataColumns.map((col) => ({
+			label: col.label,
+			value: String(col.index)
+		}));
+	}, [dataColumns]);
+	const [selectedColumn, setSelectedColumn] = useState(() => columnOptions.length > 0 ? columnOptions[0].value : "0");
+	useHighlightRange(useMemo(() => {
+		if (!fileNameParts.includes("columnValue") || !rowRange) return [];
+		const colIndex = Number(selectedColumn);
+		return [{
+			startRow: rowRange.startRow,
+			endRow: rowRange.endRow,
+			startColumn: colIndex,
+			endColumn: colIndex
+		}];
+	}, [
+		fileNameParts,
+		selectedColumn,
+		rowRange
+	]));
+	const handleFileNamePartsChange = useCallback((value) => {
+		if (value.length === 0) return;
+		setFileNameParts(value);
+	}, []);
+	const handleColumnChange = useCallback((value) => {
+		setSelectedColumn(String(value));
+	}, []);
+	const handleCancel = useCallback(() => {
+		dialogService.close(BATCH_SAVE_IMAGES_DIALOG_ID);
+	}, [dialogService]);
+	const handleConfirm = useCallback(async () => {
+		if (images.length === 0) return;
+		setSaving(true);
+		setError(null);
+		try {
+			await batchSaveService.saveImages(images, {
+				fileNameParts,
+				columnIndex: fileNameParts.includes("columnValue") ? Number(selectedColumn) : void 0
+			});
+			dialogService.close(BATCH_SAVE_IMAGES_DIALOG_ID);
+		} catch (err) {
+			console.error("Failed to save images:", err);
+			setError(localeService.t("sheets-drawing-ui.save.error"));
+		} finally {
+			setSaving(false);
+		}
+	}, [
+		batchSaveService,
+		images,
+		fileNameParts,
+		selectedColumn,
+		dialogService,
+		localeService
+	]);
+	const showColumnSelect = fileNameParts.includes("columnValue");
+	return /* @__PURE__ */ jsxs("div", {
+		className: "univer-flex univer-flex-col",
+		children: [
+			/* @__PURE__ */ jsx(FormLayout, {
+				label: localeService.t("sheets-drawing-ui.save.imageCount"),
+				children: /* @__PURE__ */ jsx("div", {
+					className: "univer-text-sm univer-text-gray-600",
+					children: images.length
+				})
+			}),
+			/* @__PURE__ */ jsx(FormLayout, {
+				label: localeService.t("sheets-drawing-ui.save.fileNameConfig"),
+				children: /* @__PURE__ */ jsxs(CheckboxGroup, {
+					value: fileNameParts,
+					onChange: handleFileNamePartsChange,
+					direction: "vertical",
+					children: [/* @__PURE__ */ jsx(Checkbox, {
+						value: "cellAddress",
+						disabled: !hasAvailableColumns,
+						children: localeService.t("sheets-drawing-ui.save.useRowCol")
+					}), hasAvailableColumns && /* @__PURE__ */ jsx(Checkbox, {
+						value: "columnValue",
+						children: localeService.t("sheets-drawing-ui.save.useColumnValue")
+					})]
+				})
+			}),
+			showColumnSelect && /* @__PURE__ */ jsx(FormLayout, {
+				label: localeService.t("sheets-drawing-ui.save.selectColumn"),
+				children: /* @__PURE__ */ jsx(Select, {
+					value: selectedColumn,
+					options: columnOptions,
+					onChange: handleColumnChange
+				})
+			}),
+			error && /* @__PURE__ */ jsx("div", {
+				className: "univer-text-xs univer-text-red-500",
+				children: error
+			}),
+			/* @__PURE__ */ jsxs("div", {
+				className: "univer-flex univer-justify-end univer-gap-2 univer-border-t univer-border-gray-200 univer-pt-3",
+				children: [/* @__PURE__ */ jsx(Button, {
+					onClick: handleCancel,
+					disabled: saving,
+					children: localeService.t("sheets-drawing-ui.save.cancel")
+				}), /* @__PURE__ */ jsx(Button, {
+					variant: "primary",
+					onClick: handleConfirm,
+					disabled: saving || images.length === 0,
+					children: saving ? localeService.t("sheets-drawing-ui.save.saving") : localeService.t("sheets-drawing-ui.save.confirm")
+				})]
+			})
+		]
+	});
+}
+
+//#endregion
+//#region src/views/sheet-image-panel/SheetDrawingAnchor.tsx
+const SheetDrawingAnchor = (props) => {
+	var _drawingParam$anchorT;
+	const commandService = useDependency(ICommandService);
+	const localeService = useDependency(LocaleService);
+	const drawingManagerService = useDependency(IDrawingManagerService);
+	const renderManagerService = useDependency(IRenderManagerService);
+	const { drawings } = props;
+	const drawingParam = drawings[0];
+	if (drawingParam == null) return;
+	const { unitId } = drawingParam;
+	const renderObject = renderManagerService.getRenderById(unitId);
+	const scene = renderObject === null || renderObject === void 0 ? void 0 : renderObject.scene;
+	if (scene == null) return;
+	const transformer = scene.getTransformerByCreate();
+	const [anchorShow, setAnchorShow] = useState(true);
+	const [value, setValue] = useState((_drawingParam$anchorT = drawingParam.anchorType) !== null && _drawingParam$anchorT !== void 0 ? _drawingParam$anchorT : SheetDrawingAnchorType.Position);
+	function getUpdateParams(objects, drawingManagerService) {
+		const params = [];
+		objects.forEach((object) => {
+			const { oKey } = object;
+			const searchParam = drawingManagerService.getDrawingOKey(oKey);
+			if (searchParam == null) {
+				params.push(null);
+				return true;
+			}
+			const { unitId, subUnitId, drawingId, drawingType, anchorType, sheetTransform, axisAlignSheetTransform } = searchParam;
+			params.push({
+				unitId,
+				subUnitId,
+				drawingId,
+				anchorType,
+				sheetTransform,
+				drawingType,
+				axisAlignSheetTransform
+			});
+		});
+		return params;
+	}
+	useEffect(() => {
+		const onClearControlObserver = transformer.clearControl$.subscribe((changeSelf) => {
+			if (changeSelf === true) setAnchorShow(false);
+		});
+		const onChangeStartObserver = transformer.changeStart$.subscribe((state) => {
+			const { objects } = state;
+			const params = getUpdateParams(objects, drawingManagerService);
+			if (params.length === 0) setAnchorShow(false);
+			else if (params.length >= 1) {
+				var _params$;
+				setAnchorShow(true);
+				setValue(((_params$ = params[0]) === null || _params$ === void 0 ? void 0 : _params$.anchorType) || SheetDrawingAnchorType.Position);
+			}
+		});
+		return () => {
+			onChangeStartObserver.unsubscribe();
+			onClearControlObserver.unsubscribe();
+		};
+	}, []);
+	function handleChange(value) {
+		setValue(value);
+		const focusDrawings = drawingManagerService.getFocusDrawings();
+		if (focusDrawings.length === 0) return;
+		const updateParams = focusDrawings.map((drawing) => {
+			return {
+				unitId: drawing.unitId,
+				subUnitId: drawing.subUnitId,
+				drawingId: drawing.drawingId,
+				anchorType: value
+			};
+		});
+		commandService.executeCommand(SetSheetDrawingCommand.id, {
+			unitId: focusDrawings[0].unitId,
+			drawings: updateParams
+		});
+	}
+	return /* @__PURE__ */ jsxs("div", {
+		className: clsx("univer-grid univer-gap-2 univer-py-2 univer-text-gray-400", { "univer-hidden": !anchorShow }),
+		children: [/* @__PURE__ */ jsx("header", {
+			className: "univer-text-gray-600 dark:!univer-text-gray-200",
+			children: /* @__PURE__ */ jsx("div", { children: localeService.t("sheets-drawing-ui.drawing-anchor.title") })
+		}), /* @__PURE__ */ jsx("div", { children: /* @__PURE__ */ jsxs(RadioGroup, {
+			value,
+			onChange: handleChange,
+			direction: "vertical",
+			children: [
+				/* @__PURE__ */ jsx(Radio, {
+					value: SheetDrawingAnchorType.Both,
+					children: localeService.t("sheets-drawing-ui.drawing-anchor.both")
+				}),
+				/* @__PURE__ */ jsx(Radio, {
+					value: SheetDrawingAnchorType.Position,
+					children: localeService.t("sheets-drawing-ui.drawing-anchor.position")
+				}),
+				/* @__PURE__ */ jsx(Radio, {
+					value: SheetDrawingAnchorType.None,
+					children: localeService.t("sheets-drawing-ui.drawing-anchor.none")
+				})
+			]
+		}) })]
+	});
+};
+
+//#endregion
+//#region src/views/sheet-image-panel/SheetDrawingPanel.tsx
+const SheetDrawingPanel = () => {
+	const drawingManagerService = useDependency(IDrawingManagerService);
+	const [drawings, setDrawings] = useState(drawingManagerService.getFocusDrawings());
+	useEffect(() => {
+		const focusDispose = drawingManagerService.focus$.subscribe((drawings) => {
+			setDrawings(drawings);
+		});
+		return () => {
+			focusDispose.unsubscribe();
+		};
+	}, []);
+	return !!(drawings === null || drawings === void 0 ? void 0 : drawings.length) && /* @__PURE__ */ jsxs("div", {
+		className: "univer-text-sm",
+		children: [/* @__PURE__ */ jsx(DrawingCommonPanel, { drawings }), /* @__PURE__ */ jsx(SheetDrawingAnchor, { drawings })]
+	});
+};
+
+//#endregion
+//#region src/controllers/components.controller.ts
+/**
+* Copyright 2023-present DreamNum Co., Ltd.
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+*     http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+let ComponentsController = class ComponentsController extends Disposable {
+	constructor(_componentManager) {
+		super();
+		this._componentManager = _componentManager;
+		this._registerComponents();
+	}
+	_registerComponents() {
+		this.disposeWithMe(this._componentManager.register(COMPONENT_SHEET_DRAWING_PANEL, SheetDrawingPanel));
+		this.disposeWithMe(this._componentManager.register(BATCH_SAVE_IMAGES_DIALOG_ID, BatchSaveImagesDialog));
+	}
+};
+ComponentsController = __decorate([__decorateParam(0, Inject(ComponentManager))], ComponentsController);
+
 //#endregion
 //#region src/controllers/drawing-context-menu.controller.ts
 let DrawingContextMenuController = class DrawingContextMenuController extends RxDisposable {
@@ -1744,12 +2020,21 @@ let SheetCellImageHoverRenderController = class SheetCellImageHoverRenderControl
 	}
 	_initHover() {
 		this.disposeWithMe(this._hoverManagerService.currentRichTextNoDistinct$.pipe(throttleTime(33)).subscribe((richText) => {
-			var _currentSelections$0$, _currentSelections$0$2;
 			let currentSelections = [];
 			if (richText !== null) currentSelections = this._selectionsService.getWorkbookSelections(this._context.unitId).getCurrentSelections();
-			if (currentSelections.length > 0 && (richText === null || richText === void 0 ? void 0 : richText.unitId) === this._context.unitId && (richText === null || richText === void 0 ? void 0 : richText.drawing) && currentSelections.length === 1 && ((_currentSelections$0$ = currentSelections[0].primary) === null || _currentSelections$0$ === void 0 ? void 0 : _currentSelections$0$.actualRow) === richText.row && ((_currentSelections$0$2 = currentSelections[0].primary) === null || _currentSelections$0$2 === void 0 ? void 0 : _currentSelections$0$2.actualColumn) === richText.col) {
-				this._isSetCursor = true;
-				this._context.scene.setCursor(CURSOR_TYPE.ZOOM_IN);
+			if ((richText === null || richText === void 0 ? void 0 : richText.unitId) === this._context.unitId && (richText === null || richText === void 0 ? void 0 : richText.drawing) && currentSelections.length === 1 && currentSelections[0].primary) {
+				const { row, col } = richText;
+				const { actualRow, actualColumn, startRow, startColumn, endRow, endColumn, isMerged, isMergedMainCell } = currentSelections[0].primary;
+				if ((isMerged || isMergedMainCell) && row >= startRow && row <= endRow && col >= startColumn && col <= endColumn) {
+					this._isSetCursor = true;
+					this._context.scene.setCursor(CURSOR_TYPE.ZOOM_IN);
+				} else if (row === actualRow && col === actualColumn) {
+					this._isSetCursor = true;
+					this._context.scene.setCursor(CURSOR_TYPE.ZOOM_IN);
+				} else if (this._isSetCursor) {
+					this._isSetCursor = false;
+					this._context.scene.resetCursor();
+				}
 			} else if (this._isSetCursor) {
 				this._isSetCursor = false;
 				this._context.scene.resetCursor();
@@ -1842,9 +2127,8 @@ function resizeImageByCell(injector, location, cell) {
 	return false;
 }
 let SheetCellImageController = class SheetCellImageController extends Disposable {
-	constructor(_commandService, _sheetInterceptorService, _injector, _drawingManagerService, _docDrawingController, _editorBridgeService) {
+	constructor(_sheetInterceptorService, _injector, _drawingManagerService, _docDrawingController, _editorBridgeService) {
 		super();
-		this._commandService = _commandService;
 		this._sheetInterceptorService = _sheetInterceptorService;
 		this._injector = _injector;
 		this._drawingManagerService = _drawingManagerService;
@@ -1862,15 +2146,6 @@ let SheetCellImageController = class SheetCellImageController extends Disposable
 				this._drawingManagerService.initializeNotification(DOCS_NORMAL_EDITOR_UNIT_ID_KEY);
 			}
 		}));
-		this.disposeWithMe(this._commandService.onCommandExecuted((commandInfo) => {
-			if (commandInfo.id === ReplaceSnapshotCommand.id) {
-				if (commandInfo.params.unitId === DOCS_ZEN_EDITOR_UNIT_ID_KEY) {
-					this._drawingManagerService.removeDrawingDataForUnit(DOCS_ZEN_EDITOR_UNIT_ID_KEY);
-					this._docDrawingController.loadDrawingDataForUnit(DOCS_ZEN_EDITOR_UNIT_ID_KEY);
-					this._drawingManagerService.initializeNotification(DOCS_ZEN_EDITOR_UNIT_ID_KEY);
-				}
-			}
-		}));
 	}
 	_initCellContentInterceptor() {
 		this.disposeWithMe(this._sheetInterceptorService.intercept(INTERCEPTOR_POINT.CELL_CONTENT, {
@@ -1895,12 +2170,11 @@ let SheetCellImageController = class SheetCellImageController extends Disposable
 	}
 };
 SheetCellImageController = __decorate([
-	__decorateParam(0, ICommandService),
-	__decorateParam(1, Inject(SheetInterceptorService)),
-	__decorateParam(2, Inject(Injector)),
-	__decorateParam(3, IDrawingManagerService),
-	__decorateParam(4, Inject(DocDrawingController)),
-	__decorateParam(5, Inject(IEditorBridgeService))
+	__decorateParam(0, Inject(SheetInterceptorService)),
+	__decorateParam(1, Inject(Injector)),
+	__decorateParam(2, IDrawingManagerService),
+	__decorateParam(3, Inject(DocDrawingController)),
+	__decorateParam(4, Inject(IEditorBridgeService))
 ], SheetCellImageController);
 
 //#endregion
@@ -1947,11 +2221,7 @@ SheetCellImageAutofillController = __decorate([__decorateParam(0, Inject(IAutoFi
 
 //#endregion
 //#region src/controllers/sheet-cell-image-copy-paste.controller.ts
-const DISABLE_UNITS = [
-	DOCS_NORMAL_EDITOR_UNIT_ID_KEY,
-	DOCS_FORMULA_BAR_EDITOR_UNIT_ID_KEY,
-	DOCS_ZEN_EDITOR_UNIT_ID_KEY
-];
+const DISABLE_UNITS = [DOCS_NORMAL_EDITOR_UNIT_ID_KEY, DOCS_FORMULA_BAR_EDITOR_UNIT_ID_KEY];
 let SheetCellImageCopyPasteController = class SheetCellImageCopyPasteController extends Disposable {
 	constructor(_commandService, _univerInstanceService, _dialogService, _renderManagerService, _localeService) {
 		super();
@@ -1989,31 +2259,29 @@ let SheetCellImageCopyPasteController = class SheetCellImageCopyPasteController
 				if (currentDoc == null || !Object.keys((_doc$drawings = doc.drawings) !== null && _doc$drawings !== void 0 ? _doc$drawings : {}).length) return;
 				const docUnitId = currentDoc.getUnitId();
 				if (DISABLE_UNITS.includes(docUnitId)) {
-					if (docUnitId !== DOCS_ZEN_EDITOR_UNIT_ID_KEY) {
-						var _currentDoc$getBody;
-						const handleCloseDialog = () => {
-							this._dialogService.close("sheet-cell-image-copy-paste");
-							this._commandService.syncExecuteCommand(SetCellEditVisibleOperation.id, { visible: false });
-						};
-						if (((_currentDoc$getBody = currentDoc.getBody()) === null || _currentDoc$getBody === void 0 ? void 0 : _currentDoc$getBody.dataStream) === "\r\n") {
-							this._commandService.syncExecuteCommand(SetCellEditVisibleOperation.id, { visible: false });
+					var _currentDoc$getBody;
+					const handleCloseDialog = () => {
+						this._dialogService.close("sheet-cell-image-copy-paste");
+						this._commandService.syncExecuteCommand(SetCellEditVisibleOperation.id, { visible: false });
+					};
+					if (((_currentDoc$getBody = currentDoc.getBody()) === null || _currentDoc$getBody === void 0 ? void 0 : _currentDoc$getBody.dataStream) === "\r\n") {
+						this._commandService.syncExecuteCommand(SetCellEditVisibleOperation.id, { visible: false });
+						this._setCellImage(Object.values(doc.drawings)[0]);
+					} else this._dialogService.open({
+						id: "sheet-cell-image-copy-paste",
+						title: { label: this._localeService.t("sheets-drawing-ui.cell-image.pasteTitle") },
+						children: { label: this._localeService.t("sheets-drawing-ui.cell-image.pasteContent") },
+						width: 320,
+						destroyOnClose: true,
+						onClose: handleCloseDialog,
+						showOk: true,
+						showCancel: true,
+						onOk: () => {
+							handleCloseDialog();
 							this._setCellImage(Object.values(doc.drawings)[0]);
-						} else this._dialogService.open({
-							id: "sheet-cell-image-copy-paste",
-							title: { label: this._localeService.t("sheets-drawing-ui.cell-image.pasteTitle") },
-							children: { label: this._localeService.t("sheets-drawing-ui.cell-image.pasteContent") },
-							width: 320,
-							destroyOnClose: true,
-							onClose: handleCloseDialog,
-							showOk: true,
-							showCancel: true,
-							onOk: () => {
-								handleCloseDialog();
-								this._setCellImage(Object.values(doc.drawings)[0]);
-							},
-							onCancel: handleCloseDialog
-						});
-					}
+						},
+						onCancel: handleCloseDialog
+					});
 				}
 			}
 		}));
@@ -3686,7 +3954,7 @@ function calculateOffset(value, rangeWidth) {
 }
 
 //#endregion
-//#region src/views/printing-float-dom/index.tsx
+//#region src/views/PrintingFloatDom.tsx
 const PrintingFloatDom = (props) => {
 	const { floatDomInfos, scene, skeleton, worksheet } = props;
 	return /* @__PURE__ */ jsx("div", {
@@ -3739,17 +4007,20 @@ const PrintingFloatDom = (props) => {
 		}, id))
 	});
 };
+function mountPrintingFloatDom(props, root, injector) {
+	render(/* @__PURE__ */ jsx(connectInjector(PrintingFloatDom, injector), { ...props }), root);
+	return () => unmount(root);
+}
 
 //#endregion
-//#region src/controllers/sheet-drawing-printing.controller.tsx
+//#region src/controllers/sheet-drawing-printing.controller.ts
 let SheetDrawingPrintingController = class SheetDrawingPrintingController extends Disposable {
-	constructor(_sheetPrintInterceptorService, _drawingRenderService, _drawingManagerService, _renderManagerService, _canvasFloatDomManagerService, _componetManager, _injector) {
+	constructor(_sheetPrintInterceptorService, _drawingRenderService, _drawingManagerService, _renderManagerService, _componetManager, _injector) {
 		super();
 		this._sheetPrintInterceptorService = _sheetPrintInterceptorService;
 		this._drawingRenderService = _drawingRenderService;
 		this._drawingManagerService = _drawingManagerService;
 		this._renderManagerService = _renderManagerService;
-		this._canvasFloatDomManagerService = _canvasFloatDomManagerService;
 		this._componetManager = _componetManager;
 		this._injector = _injector;
 		this._initPrinting();
@@ -3811,29 +4082,28 @@ let SheetDrawingPrintingController = class SheetDrawingPrintingController extend
 			const unitData = this._drawingManagerService.getDrawingDataForUnit(unitId);
 			const subUnitData = unitData === null || unitData === void 0 ? void 0 : unitData[subUnitId];
 			if (subUnitData) {
-				const floatDomInfos = subUnitData.order.map((id) => {
-					const drawing = subUnitData.data[id];
-					if (drawing.drawingType === DrawingTypeEnum.DRAWING_CHART) return {
-						...drawing,
-						componentKey: this._componetManager.get(PRINT_CHART_COMPONENT_KEY)
-					};
-					if (drawing.drawingType === DrawingTypeEnum.DRAWING_DOM) {
-						const printingComponentKey = this._sheetPrintInterceptorService.getPrintComponent(drawing.componentKey);
-						return {
+				const unmountPrintingFloatDom = mountPrintingFloatDom({
+					floatDomInfos: subUnitData.order.map((id) => {
+						const drawing = subUnitData.data[id];
+						if (drawing.drawingType === DrawingTypeEnum.DRAWING_CHART) return {
 							...drawing,
-							componentKey: this._componetManager.get(printingComponentKey || drawing.componentKey)
+							componentKey: this._componetManager.get(PRINT_CHART_COMPONENT_KEY)
 						};
-					}
-					return null;
-				}).filter(Boolean);
-				render(/* @__PURE__ */ jsx(connectInjector(PrintingFloatDom, this._injector), {
-					floatDomInfos,
+						if (drawing.drawingType === DrawingTypeEnum.DRAWING_DOM) {
+							const printingComponentKey = this._sheetPrintInterceptorService.getPrintComponent(drawing.componentKey);
+							return {
+								...drawing,
+								componentKey: this._componetManager.get(printingComponentKey || drawing.componentKey)
+							};
+						}
+						return null;
+					}).filter(Boolean),
 					scene: pos.scene,
 					skeleton: pos.skeleton,
 					worksheet: pos.worksheet
-				}), pos.root);
+				}, pos.root, this._injector);
 				disposableCollection === null || disposableCollection === void 0 || disposableCollection.add(() => {
-					unmount(pos.root);
+					unmountPrintingFloatDom();
 				});
 				return next(disposableCollection);
 			}
@@ -3845,9 +4115,8 @@ SheetDrawingPrintingController = __decorate([
 	__decorateParam(1, Inject(DrawingRenderService)),
 	__decorateParam(2, IDrawingManagerService),
 	__decorateParam(3, IRenderManagerService),
-	__decorateParam(4, Inject(SheetCanvasFloatDomManagerService)),
-	__decorateParam(5, Inject(ComponentManager)),
-	__decorateParam(6, Inject(Injector))
+	__decorateParam(4, Inject(ComponentManager)),
+	__decorateParam(5, Inject(Injector))
 ], SheetDrawingPrintingController);
 
 //#endregion
@@ -5508,252 +5777,6 @@ const menuSchema = {
 	} } }
 };
 
-//#endregion
-//#region src/views/batch-save-images/BatchSaveImagesDialog.tsx
-function BatchSaveImagesDialog() {
-	const localeService = useDependency(LocaleService);
-	const dialogService = useDependency(IDialogService);
-	const batchSaveService = useDependency(IBatchSaveImagesService);
-	const [fileNameParts, setFileNameParts] = useState(["cellAddress"]);
-	const [saving, setSaving] = useState(false);
-	const [error, setError] = useState(null);
-	const images = useMemo(() => batchSaveService.getCellImagesInSelection(), [batchSaveService]);
-	const dataColumns = useMemo(() => batchSaveService.getDataColumns(), [batchSaveService]);
-	const rowRange = useMemo(() => batchSaveService.getSelectionRowRange(), [batchSaveService]);
-	const hasAvailableColumns = dataColumns.length > 0;
-	const columnOptions = useMemo(() => {
-		return dataColumns.map((col) => ({
-			label: col.label,
-			value: String(col.index)
-		}));
-	}, [dataColumns]);
-	const [selectedColumn, setSelectedColumn] = useState(() => columnOptions.length > 0 ? columnOptions[0].value : "0");
-	useHighlightRange(useMemo(() => {
-		if (!fileNameParts.includes("columnValue") || !rowRange) return [];
-		const colIndex = Number(selectedColumn);
-		return [{
-			startRow: rowRange.startRow,
-			endRow: rowRange.endRow,
-			startColumn: colIndex,
-			endColumn: colIndex
-		}];
-	}, [
-		fileNameParts,
-		selectedColumn,
-		rowRange
-	]));
-	const handleFileNamePartsChange = useCallback((value) => {
-		if (value.length === 0) return;
-		setFileNameParts(value);
-	}, []);
-	const handleColumnChange = useCallback((value) => {
-		setSelectedColumn(String(value));
-	}, []);
-	const handleCancel = useCallback(() => {
-		dialogService.close(BATCH_SAVE_IMAGES_DIALOG_ID);
-	}, [dialogService]);
-	const handleConfirm = useCallback(async () => {
-		if (images.length === 0) return;
-		setSaving(true);
-		setError(null);
-		try {
-			await batchSaveService.saveImages(images, {
-				fileNameParts,
-				columnIndex: fileNameParts.includes("columnValue") ? Number(selectedColumn) : void 0
-			});
-			dialogService.close(BATCH_SAVE_IMAGES_DIALOG_ID);
-		} catch (err) {
-			console.error("Failed to save images:", err);
-			setError(localeService.t("sheets-drawing-ui.save.error"));
-		} finally {
-			setSaving(false);
-		}
-	}, [
-		batchSaveService,
-		images,
-		fileNameParts,
-		selectedColumn,
-		dialogService,
-		localeService
-	]);
-	const showColumnSelect = fileNameParts.includes("columnValue");
-	return /* @__PURE__ */ jsxs("div", {
-		className: "univer-flex univer-flex-col",
-		children: [
-			/* @__PURE__ */ jsx(FormLayout, {
-				label: localeService.t("sheets-drawing-ui.save.imageCount"),
-				children: /* @__PURE__ */ jsx("div", {
-					className: "univer-text-sm univer-text-gray-600",
-					children: images.length
-				})
-			}),
-			/* @__PURE__ */ jsx(FormLayout, {
-				label: localeService.t("sheets-drawing-ui.save.fileNameConfig"),
-				children: /* @__PURE__ */ jsxs(CheckboxGroup, {
-					value: fileNameParts,
-					onChange: handleFileNamePartsChange,
-					direction: "vertical",
-					children: [/* @__PURE__ */ jsx(Checkbox, {
-						value: "cellAddress",
-						disabled: !hasAvailableColumns,
-						children: localeService.t("sheets-drawing-ui.save.useRowCol")
-					}), hasAvailableColumns && /* @__PURE__ */ jsx(Checkbox, {
-						value: "columnValue",
-						children: localeService.t("sheets-drawing-ui.save.useColumnValue")
-					})]
-				})
-			}),
-			showColumnSelect && /* @__PURE__ */ jsx(FormLayout, {
-				label: localeService.t("sheets-drawing-ui.save.selectColumn"),
-				children: /* @__PURE__ */ jsx(Select, {
-					value: selectedColumn,
-					options: columnOptions,
-					onChange: handleColumnChange
-				})
-			}),
-			error && /* @__PURE__ */ jsx("div", {
-				className: "univer-text-xs univer-text-red-500",
-				children: error
-			}),
-			/* @__PURE__ */ jsxs("div", {
-				className: "univer-flex univer-justify-end univer-gap-2 univer-border-t univer-border-gray-200 univer-pt-3",
-				children: [/* @__PURE__ */ jsx(Button, {
-					onClick: handleCancel,
-					disabled: saving,
-					children: localeService.t("sheets-drawing-ui.save.cancel")
-				}), /* @__PURE__ */ jsx(Button, {
-					variant: "primary",
-					onClick: handleConfirm,
-					disabled: saving || images.length === 0,
-					children: saving ? localeService.t("sheets-drawing-ui.save.saving") : localeService.t("sheets-drawing-ui.save.confirm")
-				})]
-			})
-		]
-	});
-}
-
-//#endregion
-//#region src/views/sheet-image-panel/SheetDrawingAnchor.tsx
-const SheetDrawingAnchor = (props) => {
-	var _drawingParam$anchorT;
-	const commandService = useDependency(ICommandService);
-	const localeService = useDependency(LocaleService);
-	const drawingManagerService = useDependency(IDrawingManagerService);
-	const renderManagerService = useDependency(IRenderManagerService);
-	const { drawings } = props;
-	const drawingParam = drawings[0];
-	if (drawingParam == null) return;
-	const { unitId } = drawingParam;
-	const renderObject = renderManagerService.getRenderById(unitId);
-	const scene = renderObject === null || renderObject === void 0 ? void 0 : renderObject.scene;
-	if (scene == null) return;
-	const transformer = scene.getTransformerByCreate();
-	const [anchorShow, setAnchorShow] = useState(true);
-	const [value, setValue] = useState((_drawingParam$anchorT = drawingParam.anchorType) !== null && _drawingParam$anchorT !== void 0 ? _drawingParam$anchorT : SheetDrawingAnchorType.Position);
-	function getUpdateParams(objects, drawingManagerService) {
-		const params = [];
-		objects.forEach((object) => {
-			const { oKey } = object;
-			const searchParam = drawingManagerService.getDrawingOKey(oKey);
-			if (searchParam == null) {
-				params.push(null);
-				return true;
-			}
-			const { unitId, subUnitId, drawingId, drawingType, anchorType, sheetTransform, axisAlignSheetTransform } = searchParam;
-			params.push({
-				unitId,
-				subUnitId,
-				drawingId,
-				anchorType,
-				sheetTransform,
-				drawingType,
-				axisAlignSheetTransform
-			});
-		});
-		return params;
-	}
-	useEffect(() => {
-		const onClearControlObserver = transformer.clearControl$.subscribe((changeSelf) => {
-			if (changeSelf === true) setAnchorShow(false);
-		});
-		const onChangeStartObserver = transformer.changeStart$.subscribe((state) => {
-			const { objects } = state;
-			const params = getUpdateParams(objects, drawingManagerService);
-			if (params.length === 0) setAnchorShow(false);
-			else if (params.length >= 1) {
-				var _params$;
-				setAnchorShow(true);
-				setValue(((_params$ = params[0]) === null || _params$ === void 0 ? void 0 : _params$.anchorType) || SheetDrawingAnchorType.Position);
-			}
-		});
-		return () => {
-			onChangeStartObserver.unsubscribe();
-			onClearControlObserver.unsubscribe();
-		};
-	}, []);
-	function handleChange(value) {
-		setValue(value);
-		const focusDrawings = drawingManagerService.getFocusDrawings();
-		if (focusDrawings.length === 0) return;
-		const updateParams = focusDrawings.map((drawing) => {
-			return {
-				unitId: drawing.unitId,
-				subUnitId: drawing.subUnitId,
-				drawingId: drawing.drawingId,
-				anchorType: value
-			};
-		});
-		commandService.executeCommand(SetSheetDrawingCommand.id, {
-			unitId: focusDrawings[0].unitId,
-			drawings: updateParams
-		});
-	}
-	return /* @__PURE__ */ jsxs("div", {
-		className: clsx("univer-grid univer-gap-2 univer-py-2 univer-text-gray-400", { "univer-hidden": !anchorShow }),
-		children: [/* @__PURE__ */ jsx("header", {
-			className: "univer-text-gray-600 dark:!univer-text-gray-200",
-			children: /* @__PURE__ */ jsx("div", { children: localeService.t("sheets-drawing-ui.drawing-anchor.title") })
-		}), /* @__PURE__ */ jsx("div", { children: /* @__PURE__ */ jsxs(RadioGroup, {
-			value,
-			onChange: handleChange,
-			direction: "vertical",
-			children: [
-				/* @__PURE__ */ jsx(Radio, {
-					value: SheetDrawingAnchorType.Both,
-					children: localeService.t("sheets-drawing-ui.drawing-anchor.both")
-				}),
-				/* @__PURE__ */ jsx(Radio, {
-					value: SheetDrawingAnchorType.Position,
-					children: localeService.t("sheets-drawing-ui.drawing-anchor.position")
-				}),
-				/* @__PURE__ */ jsx(Radio, {
-					value: SheetDrawingAnchorType.None,
-					children: localeService.t("sheets-drawing-ui.drawing-anchor.none")
-				})
-			]
-		}) })]
-	});
-};
-
-//#endregion
-//#region src/views/sheet-image-panel/SheetDrawingPanel.tsx
-const SheetDrawingPanel = () => {
-	const drawingManagerService = useDependency(IDrawingManagerService);
-	const [drawings, setDrawings] = useState(drawingManagerService.getFocusDrawings());
-	useEffect(() => {
-		const focusDispose = drawingManagerService.focus$.subscribe((drawings) => {
-			setDrawings(drawings);
-		});
-		return () => {
-			focusDispose.unsubscribe();
-		};
-	}, []);
-	return !!(drawings === null || drawings === void 0 ? void 0 : drawings.length) && /* @__PURE__ */ jsxs("div", {
-		className: "univer-text-sm",
-		children: [/* @__PURE__ */ jsx(DrawingCommonPanel, { drawings }), /* @__PURE__ */ jsx(SheetDrawingAnchor, { drawings })]
-	});
-};
-
 //#endregion
 //#region src/controllers/shortcuts/drawing.shortcut.ts
 function whenSheetDrawingFocused(contextService) {
@@ -5811,7 +5834,7 @@ const DeleteDrawingsShortcutItem = {
 };
 
 //#endregion
-//#region src/controllers/sheet-drawing.controller.ts
+//#region src/controllers/ui.controller.ts
 /**
 * Copyright 2023-present DreamNum Co., Ltd.
 *
@@ -5828,19 +5851,14 @@ const DeleteDrawingsShortcutItem = {
 * limitations under the License.
 */
 let SheetDrawingUIController = class SheetDrawingUIController extends Disposable {
-	constructor(_componentManager, _menuManagerService, _commandService, _shortcutService) {
+	constructor(_menuManagerService, _commandService, _shortcutService) {
 		super();
-		this._componentManager = _componentManager;
 		this._menuManagerService = _menuManagerService;
 		this._commandService = _commandService;
 		this._shortcutService = _shortcutService;
 		this._init();
 	}
-	_initCustomComponents() {
-		const componentManager = this._componentManager;
-		this.disposeWithMe(componentManager.register(COMPONENT_SHEET_DRAWING_PANEL, SheetDrawingPanel));
-		this.disposeWithMe(componentManager.register(BATCH_SAVE_IMAGES_DIALOG_ID, BatchSaveImagesDialog));
-	}
+	_initCustomComponents() {}
 	_initMenus() {
 		this._menuManagerService.mergeMenu(menuSchema);
 	}
@@ -5877,10 +5895,9 @@ let SheetDrawingUIController = class SheetDrawingUIController extends Disposable
 	}
 };
 SheetDrawingUIController = __decorate([
-	__decorateParam(0, Inject(ComponentManager)),
-	__decorateParam(1, IMenuManagerService),
-	__decorateParam(2, ICommandService),
-	__decorateParam(3, IShortcutService)
+	__decorateParam(0, IMenuManagerService),
+	__decorateParam(1, ICommandService),
+	__decorateParam(2, IShortcutService)
 ], SheetDrawingUIController);
 
 //#endregion
@@ -5914,7 +5931,7 @@ let DrawingPopupMenuController = class DrawingPopupMenuController extends RxDisp
 			if (status > 0 && !messageDisposable) messageDisposable = this._messageService.show({
 				id: MESSAGE_ID,
 				type: MessageType.Loading,
-				content: `${this._localeService.t("sheets-ui.uploadLoading.loading")}: ${status}`,
+				content: `${this._localeService.t("sheets-drawing-ui.uploadLoading.loading")}: ${status}`,
 				duration: 0
 			});
 			else if (status === 0) {
@@ -5961,7 +5978,7 @@ let DrawingPopupMenuController = class DrawingPopupMenuController extends RxDisp
 			if (!object) return;
 			const oKey = object.oKey;
 			const drawingParam = this._drawingManagerService.getDrawingOKey(oKey);
-			if (!drawingParam) return;
+			if (!drawingParam || drawingParam.drawingType === DrawingTypeEnum.DRAWING_SHAPE) return;
 			const { unitId, subUnitId, drawingId, drawingType } = drawingParam;
 			const data = drawingParam.data;
 			if (data && data.disablePopup) return;
@@ -6096,6 +6113,7 @@ let UniverSheetsDrawingUIPlugin = class UniverSheetsDrawingUIPlugin extends Plug
 	}
 	onStarting() {
 		registerDependencies(this._injector, [
+			[ComponentsController],
 			[SheetCanvasFloatDomManagerService],
 			[SheetDrawingUIController],
 			[DrawingPopupMenuController],
@@ -6110,6 +6128,7 @@ let UniverSheetsDrawingUIPlugin = class UniverSheetsDrawingUIPlugin extends Plug
 			[DrawingContextMenuController]
 		]);
 		touchDependencies(this._injector, [[SheetCanvasFloatDomManagerService]]);
+		this._injector.get(ComponentsController);
 	}
 	onReady() {
 		touchDependencies(this._injector, [