@univerjs/sheets-drawing 0.24.0 → 0.25.0-insiders.20260608-e4336f7

package/lib/es/facade.js

@@ -1,11 +1,12 @@
-import { ArrangeTypeEnum, CanceledError, DrawingTypeEnum, ICommandService, ImageSourceType, Inject, Injector, generateRandomId } from "@univerjs/core";
+import { ArrangeTypeEnum, CanceledError, DrawingTypeEnum, ICommandService, IUndoRedoService, ImageSourceType, Inject, Injector, generateRandomId } from "@univerjs/core";
 import { FBase, FEnum, FEventName, FUniver } from "@univerjs/core/facade";
 import { IDrawingManagerService, SetDrawingSelectedOperation, getImageSize } from "@univerjs/drawing";
 import { SheetSkeletonService, convertPositionCellToSheetOverGrid, convertPositionSheetOverGridToAbsolute } from "@univerjs/sheets";
-import { ISheetDrawingService, InsertSheetDrawingCommand, RemoveSheetDrawingCommand, SetDrawingArrangeCommand, SetSheetDrawingCommand, SheetDrawingAnchorType, transformToAxisAlignPosition } from "@univerjs/sheets-drawing";
+import { DrawingApplyType, ISheetDrawingService, InsertSheetDrawingCommand, RemoveSheetDrawingCommand, SetDrawingApplyMutation, SetDrawingArrangeCommand, SetSheetDrawingCommand, SheetDrawingAnchorType, transformToAxisAlignPosition } from "@univerjs/sheets-drawing";
+import { getGroupState, transformObjectOutOfGroup } from "@univerjs/engine-render";
 import { FWorksheet } from "@univerjs/sheets/facade";
 
-//#region \0@oxc-project+runtime@0.129.0/helpers/typeof.js
+//#region \0@oxc-project+runtime@0.134.0/helpers/esm/typeof.js
 function _typeof(o) {
 	"@babel/helpers - typeof";
 	return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function(o) {
@@ -16,7 +17,7 @@ function _typeof(o) {
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.129.0/helpers/toPrimitive.js
+//#region \0@oxc-project+runtime@0.134.0/helpers/esm/toPrimitive.js
 function toPrimitive(t, r) {
 	if ("object" != _typeof(t) || !t) return t;
 	var e = t[Symbol.toPrimitive];
@@ -29,14 +30,14 @@ function toPrimitive(t, r) {
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.129.0/helpers/toPropertyKey.js
+//#region \0@oxc-project+runtime@0.134.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.129.0/helpers/defineProperty.js
+//#region \0@oxc-project+runtime@0.134.0/helpers/esm/defineProperty.js
 function _defineProperty(e, r, t) {
 	return (r = toPropertyKey(r)) in e ? Object.defineProperty(e, r, {
 		value: t,
@@ -47,7 +48,7 @@ function _defineProperty(e, r, t) {
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.129.0/helpers/decorateParam.js
+//#region \0@oxc-project+runtime@0.134.0/helpers/esm/decorateParam.js
 function __decorateParam(paramIndex, decorator) {
 	return function(target, key) {
 		decorator(target, key, paramIndex);
@@ -55,7 +56,7 @@ function __decorateParam(paramIndex, decorator) {
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.129.0/helpers/decorate.js
+//#region \0@oxc-project+runtime@0.134.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);
@@ -173,7 +174,8 @@ let FOverGridImageBuilder = class FOverGridImageBuilder {
 	* // create a new image builder and set initial image configuration.
 	* // then build `ISheetImage` and insert it into the sheet, position is start from F6 cell.
 	* const fWorkbook = univerAPI.getActiveWorkbook();
-	* const fWorksheet = fWorkbook.getActiveSheet();
+	* const fWorksheet = fWorkbook.getSheetByName('Sheet1');
+	* if (!fWorksheet) return;
 	* const image = await fWorksheet.newOverGridImage()
 	*   .setImage({
 	*     drawingId: '123456',
@@ -236,7 +238,8 @@ let FOverGridImageBuilder = class FOverGridImageBuilder {
 	* @example
 	* ```ts
 	* const fWorkbook = univerAPI.getActiveWorkbook();
-	* const fWorksheet = fWorkbook.getActiveSheet();
+	* const fWorksheet = fWorkbook.getSheetByName('Sheet1');
+	* if (!fWorksheet) return;
 	* const images = fWorksheet.getImages();
 	* images.forEach((image) => {
 	*   console.log(image, image.toBuilder().getSource());
@@ -252,7 +255,8 @@ let FOverGridImageBuilder = class FOverGridImageBuilder {
 	* @example
 	* ```ts
 	* const fWorkbook = univerAPI.getActiveWorkbook();
-	* const fWorksheet = fWorkbook.getActiveSheet();
+	* const fWorksheet = fWorkbook.getSheetByName('Sheet1');
+	* if (!fWorksheet) return;
 	* const images = fWorksheet.getImages();
 	* images.forEach((image) => {
 	*   console.log(image, image.toBuilder().getSourceType());
@@ -271,7 +275,8 @@ let FOverGridImageBuilder = class FOverGridImageBuilder {
 	* // create a new image builder and set image source.
 	* // then build `ISheetImage` and insert it into the sheet, position is start from F6 cell.
 	* const fWorkbook = univerAPI.getActiveWorkbook();
-	* const fWorksheet = fWorkbook.getActiveSheet();
+	* const fWorksheet = fWorkbook.getSheetByName('Sheet1');
+	* if (!fWorksheet) return;
 	* const image = await fWorksheet.newOverGridImage()
 	*   .setSource('https://avatars.githubusercontent.com/u/61444807?s=48&v=4', univerAPI.Enum.ImageSourceType.URL)
 	*   .setColumn(5)
@@ -293,7 +298,8 @@ let FOverGridImageBuilder = class FOverGridImageBuilder {
 	* // create a new image builder and set image source.
 	* // then build `ISheetImage` and insert it into the sheet, position is start from F6 cell.
 	* const fWorkbook = univerAPI.getActiveWorkbook();
-	* const fWorksheet = fWorkbook.getActiveSheet();
+	* const fWorksheet = fWorkbook.getSheetByName('Sheet1');
+	* if (!fWorksheet) return;
 	* const image = await fWorksheet.newOverGridImage()
 	*   .setSource('https://avatars.githubusercontent.com/u/61444807?s=48&v=4', univerAPI.Enum.ImageSourceType.URL)
 	*   .setColumn(5)
@@ -315,7 +321,8 @@ let FOverGridImageBuilder = class FOverGridImageBuilder {
 	* // create a new image builder and set image source.
 	* // then build `ISheetImage` and insert it into the sheet, position is start from F6 cell and horizontal offset is 10px.
 	* const fWorkbook = univerAPI.getActiveWorkbook();
-	* const fWorksheet = fWorkbook.getActiveSheet();
+	* const fWorksheet = fWorkbook.getSheetByName('Sheet1');
+	* if (!fWorksheet) return;
 	* const image = await fWorksheet.newOverGridImage()
 	*   .setSource('https://avatars.githubusercontent.com/u/61444807?s=48&v=4', univerAPI.Enum.ImageSourceType.URL)
 	*   .setColumn(5)
@@ -338,7 +345,8 @@ let FOverGridImageBuilder = class FOverGridImageBuilder {
 	* // create a new image builder and set image source.
 	* // then build `ISheetImage` and insert it into the sheet, position is start from F6 cell and vertical offset is 10px.
 	* const fWorkbook = univerAPI.getActiveWorkbook();
-	* const fWorksheet = fWorkbook.getActiveSheet();
+	* const fWorksheet = fWorkbook.getSheetByName('Sheet1');
+	* if (!fWorksheet) return;
 	* const image = await fWorksheet.newOverGridImage()
 	*   .setSource('https://avatars.githubusercontent.com/u/61444807?s=48&v=4', univerAPI.Enum.ImageSourceType.URL)
 	*   .setColumn(5)
@@ -361,7 +369,8 @@ let FOverGridImageBuilder = class FOverGridImageBuilder {
 	* // create a new image builder and set image source.
 	* // then build `ISheetImage` and insert it into the sheet, position is start from F6 cell, width is 120px and height is 50px.
 	* const fWorkbook = univerAPI.getActiveWorkbook();
-	* const fWorksheet = fWorkbook.getActiveSheet();
+	* const fWorksheet = fWorkbook.getSheetByName('Sheet1');
+	* if (!fWorksheet) return;
 	* const image = await fWorksheet.newOverGridImage()
 	*   .setSource('https://avatars.githubusercontent.com/u/61444807?s=48&v=4', univerAPI.Enum.ImageSourceType.URL)
 	*   .setColumn(5)
@@ -385,7 +394,8 @@ let FOverGridImageBuilder = class FOverGridImageBuilder {
 	* // create a new image builder and set image source.
 	* // then build `ISheetImage` and insert it into the sheet, position is start from F6 cell, width is 120px and height is 50px.
 	* const fWorkbook = univerAPI.getActiveWorkbook();
-	* const fWorksheet = fWorkbook.getActiveSheet();
+	* const fWorksheet = fWorkbook.getSheetByName('Sheet1');
+	* if (!fWorksheet) return;
 	* const image = await fWorksheet.newOverGridImage()
 	*   .setSource('https://avatars.githubusercontent.com/u/61444807?s=48&v=4', univerAPI.Enum.ImageSourceType.URL)
 	*   .setColumn(5)
@@ -407,7 +417,8 @@ let FOverGridImageBuilder = class FOverGridImageBuilder {
 	* @example
 	* ```ts
 	* const fWorkbook = univerAPI.getActiveWorkbook();
-	* const fWorksheet = fWorkbook.getActiveSheet();
+	* const fWorksheet = fWorkbook.getSheetByName('Sheet1');
+	* if (!fWorksheet) return;
 	*
 	* // image1 position is start from A6 cell, anchor type is Position.
 	* // Only the position of the drawing follows the cell changes. When rows or columns are inserted or deleted, the position of the drawing changes, but the size remains the same.
@@ -459,7 +470,8 @@ let FOverGridImageBuilder = class FOverGridImageBuilder {
 	* // create a new image builder and set image source.
 	* // then build `ISheetImage` and insert it into the sheet, position is start from F6 cell, top crop is 10px.
 	* const fWorkbook = univerAPI.getActiveWorkbook();
-	* const fWorksheet = fWorkbook.getActiveSheet();
+	* const fWorksheet = fWorkbook.getSheetByName('Sheet1');
+	* if (!fWorksheet) return;
 	* const image = await fWorksheet.newOverGridImage()
 	*   .setSource('https://avatars.githubusercontent.com/u/61444807?s=48&v=4', univerAPI.Enum.ImageSourceType.URL)
 	*   .setColumn(5)
@@ -483,7 +495,8 @@ let FOverGridImageBuilder = class FOverGridImageBuilder {
 	* // create a new image builder and set image source.
 	* // then build `ISheetImage` and insert it into the sheet, position is start from F6 cell, left crop is 10px.
 	* const fWorkbook = univerAPI.getActiveWorkbook();
-	* const fWorksheet = fWorkbook.getActiveSheet();
+	* const fWorksheet = fWorkbook.getSheetByName('Sheet1');
+	* if (!fWorksheet) return;
 	* const image = await fWorksheet.newOverGridImage()
 	*   .setSource('https://avatars.githubusercontent.com/u/61444807?s=48&v=4', univerAPI.Enum.ImageSourceType.URL)
 	*   .setColumn(5)
@@ -507,7 +520,8 @@ let FOverGridImageBuilder = class FOverGridImageBuilder {
 	* // create a new image builder and set image source.
 	* // then build `ISheetImage` and insert it into the sheet, position is start from F6 cell, bottom crop is 10px.
 	* const fWorkbook = univerAPI.getActiveWorkbook();
-	* const fWorksheet = fWorkbook.getActiveSheet();
+	* const fWorksheet = fWorkbook.getSheetByName('Sheet1');
+	* if (!fWorksheet) return;
 	* const image = await fWorksheet.newOverGridImage()
 	*   .setSource('https://avatars.githubusercontent.com/u/61444807?s=48&v=4', univerAPI.Enum.ImageSourceType.URL)
 	*   .setColumn(5)
@@ -531,7 +545,8 @@ let FOverGridImageBuilder = class FOverGridImageBuilder {
 	* // create a new image builder and set image source.
 	* // then build `ISheetImage` and insert it into the sheet, position is start from F6 cell, right crop is 10px.
 	* const fWorkbook = univerAPI.getActiveWorkbook();
-	* const fWorksheet = fWorkbook.getActiveSheet();
+	* const fWorksheet = fWorkbook.getSheetByName('Sheet1');
+	* if (!fWorksheet) return;
 	* const image = await fWorksheet.newOverGridImage()
 	*   .setSource('https://avatars.githubusercontent.com/u/61444807?s=48&v=4', univerAPI.Enum.ImageSourceType.URL)
 	*   .setColumn(5)
@@ -563,7 +578,8 @@ let FOverGridImageBuilder = class FOverGridImageBuilder {
 	* // create a new image builder and set image source.
 	* // then build `ISheetImage` and insert it into the sheet, position is start from F6 cell, rotate 90 degrees.
 	* const fWorkbook = univerAPI.getActiveWorkbook();
-	* const fWorksheet = fWorkbook.getActiveSheet();
+	* const fWorksheet = fWorkbook.getSheetByName('Sheet1');
+	* if (!fWorksheet) return;
 	* const image = await fWorksheet.newOverGridImage()
 	*   .setSource('https://avatars.githubusercontent.com/u/61444807?s=48&v=4', univerAPI.Enum.ImageSourceType.URL)
 	*   .setColumn(5)
@@ -611,7 +627,8 @@ let FOverGridImage = class FOverGridImage extends FBase {
 	* @example
 	* ```ts
 	* const fWorkbook = univerAPI.getActiveWorkbook();
-	* const fWorksheet = fWorkbook.getActiveSheet();
+	* const fWorksheet = fWorkbook.getSheetByName('Sheet1');
+	* if (!fWorksheet) return;
 	* const images = fWorksheet.getImages();
 	* images.forEach((image) => {
 	*   console.log(image, image.getId());
@@ -627,7 +644,8 @@ let FOverGridImage = class FOverGridImage extends FBase {
 	* @example
 	* ```ts
 	* const fWorkbook = univerAPI.getActiveWorkbook();
-	* const fWorksheet = fWorkbook.getActiveSheet();
+	* const fWorksheet = fWorkbook.getSheetByName('Sheet1');
+	* if (!fWorksheet) return;
 	* const images = fWorksheet.getImages();
 	* images.forEach((image) => {
 	*   console.log(image, image.getType());
@@ -643,7 +661,8 @@ let FOverGridImage = class FOverGridImage extends FBase {
 	* @example
 	* ```ts
 	* const fWorkbook = univerAPI.getActiveWorkbook();
-	* const fWorksheet = fWorkbook.getActiveSheet();
+	* const fWorksheet = fWorkbook.getSheetByName('Sheet1');
+	* if (!fWorksheet) return;
 	* const image = fWorksheet.getImages()[0];
 	* const result = image?.remove();
 	* console.log(result);
@@ -661,7 +680,8 @@ let FOverGridImage = class FOverGridImage extends FBase {
 	* @example
 	* ```ts
 	* const fWorkbook = univerAPI.getActiveWorkbook();
-	* const fWorksheet = fWorkbook.getActiveSheet();
+	* const fWorksheet = fWorkbook.getSheetByName('Sheet1');
+	* if (!fWorksheet) return;
 	* const images = fWorksheet.getImages();
 	* images.forEach((image) => {
 	*   console.log(image, image.toBuilder().getSource());
@@ -703,7 +723,8 @@ let FOverGridImage = class FOverGridImage extends FBase {
 	* ```ts
 	* // set the image width 120px and height 50px
 	* const fWorkbook = univerAPI.getActiveWorkbook();
-	* const fWorksheet = fWorkbook.getActiveSheet();
+	* const fWorksheet = fWorkbook.getSheetByName('Sheet1');
+	* if (!fWorksheet) return;
 	* const image = fWorksheet.getImages()[0];
 	* const result = image?.setSizeAsync(120, 50);
 	* console.log(result);
@@ -730,7 +751,8 @@ let FOverGridImage = class FOverGridImage extends FBase {
 	* ```ts
 	* // set the crop of the image, top 10px, left 10px, bottom 10px, right 10px.
 	* const fWorkbook = univerAPI.getActiveWorkbook();
-	* const fWorksheet = fWorkbook.getActiveSheet();
+	* const fWorksheet = fWorkbook.getSheetByName('Sheet1');
+	* if (!fWorksheet) return;
 	* const image = fWorksheet.getImages()[0];
 	* const result = image?.setCrop(10, 10, 10, 10);
 	* console.log(result);
@@ -760,7 +782,8 @@ let FOverGridImage = class FOverGridImage extends FBase {
 	* ```ts
 	* // set 90 degrees rotation of the image
 	* const fWorkbook = univerAPI.getActiveWorkbook();
-	* const fWorksheet = fWorkbook.getActiveSheet();
+	* const fWorksheet = fWorkbook.getSheetByName('Sheet1');
+	* if (!fWorksheet) return;
 	* const image = fWorksheet.getImages()[0];
 	* const result = image?.setRotate(90);
 	* console.log(result);
@@ -785,7 +808,8 @@ let FOverGridImage = class FOverGridImage extends FBase {
 	* @example
 	* ```ts
 	* const fWorkbook = univerAPI.getActiveWorkbook();
-	* const fWorksheet = fWorkbook.getActiveSheet();
+	* const fWorksheet = fWorkbook.getSheetByName('Sheet1');
+	* if (!fWorksheet) return;
 	* const image = fWorksheet.getImages()[0];
 	* const result = image?.setForward();
 	* console.log(result);
@@ -805,7 +829,8 @@ let FOverGridImage = class FOverGridImage extends FBase {
 	* @example
 	* ```ts
 	* const fWorkbook = univerAPI.getActiveWorkbook();
-	* const fWorksheet = fWorkbook.getActiveSheet();
+	* const fWorksheet = fWorkbook.getSheetByName('Sheet1');
+	* if (!fWorksheet) return;
 	* const image = fWorksheet.getImages()[0];
 	* const result = image?.setBackward();
 	* console.log(result);
@@ -825,7 +850,8 @@ let FOverGridImage = class FOverGridImage extends FBase {
 	* @example
 	* ```ts
 	* const fWorkbook = univerAPI.getActiveWorkbook();
-	* const fWorksheet = fWorkbook.getActiveSheet();
+	* const fWorksheet = fWorkbook.getSheetByName('Sheet1');
+	* if (!fWorksheet) return;
 	* const image = fWorksheet.getImages()[0];
 	* const result = image?.setBack();
 	* console.log(result);
@@ -845,7 +871,8 @@ let FOverGridImage = class FOverGridImage extends FBase {
 	* @example
 	* ```ts
 	* const fWorkbook = univerAPI.getActiveWorkbook();
-	* const fWorksheet = fWorkbook.getActiveSheet();
+	* const fWorksheet = fWorkbook.getSheetByName('Sheet1');
+	* if (!fWorksheet) return;
 	* const image = fWorksheet.getImages()[0];
 	* const result = image?.setFront();
 	* console.log(result);
@@ -864,6 +891,11 @@ FOverGridImage = __decorate([__decorateParam(1, ICommandService), __decoratePara
 
 //#endregion
 //#region src/facade/f-worksheet.ts
+const GROUPABLE_DRAWING_TYPES = new Set([
+	DrawingTypeEnum.DRAWING_IMAGE,
+	DrawingTypeEnum.DRAWING_SHAPE,
+	DrawingTypeEnum.DRAWING_GROUP
+]);
 var FWorksheetDrawingMixin = class extends FWorksheet {
 	async insertImage(url, column, row, offsetX, offsetY) {
 		const imageBuilder = this.newOverGridImage();
@@ -953,6 +985,201 @@ var FWorksheetDrawingMixin = class extends FWorksheet {
 		const subUnitId = this.getSheetId();
 		return this._injector.createInstance(FOverGridImageBuilder, unitId, subUnitId);
 	}
+	groupDrawings(drawingIds, groupId = generateRandomId(10)) {
+		const uniqueDrawingIds = Array.from(new Set(drawingIds));
+		if (uniqueDrawingIds.length < 2) return null;
+		const unitId = this._fWorkbook.getId();
+		const subUnitId = this.getSheetId();
+		const sheetDrawingService = this._injector.get(ISheetDrawingService);
+		if (sheetDrawingService.getDrawingByParam({
+			unitId,
+			subUnitId,
+			drawingId: groupId
+		})) return null;
+		const drawings = uniqueDrawingIds.map((drawingId) => sheetDrawingService.getDrawingByParam({
+			unitId,
+			subUnitId,
+			drawingId
+		}));
+		if (drawings.some((drawing) => !drawing)) return null;
+		if (drawings.some((drawing) => !GROUPABLE_DRAWING_TYPES.has(drawing.drawingType))) return null;
+		const validDrawings = drawings;
+		const groupTransform = getGroupState(0, 0, validDrawings.map((drawing) => drawing.transform || {}));
+		const groupParam = {
+			unitId,
+			subUnitId,
+			drawingId: groupId,
+			drawingType: DrawingTypeEnum.DRAWING_GROUP,
+			transform: groupTransform,
+			groupBaseBound: {
+				left: groupTransform.left,
+				top: groupTransform.top,
+				width: groupTransform.width,
+				height: groupTransform.height
+			}
+		};
+		const children = validDrawings.map((drawing) => ({
+			...drawing,
+			groupId
+		}));
+		return this._applyGroupDrawingOperation([{
+			parent: groupParam,
+			children
+		}], DrawingApplyType.GROUP) ? groupId : null;
+	}
+	ungroupDrawings(groupIds) {
+		const unitId = this._fWorkbook.getId();
+		const subUnitId = this.getSheetId();
+		const sheetDrawingService = this._injector.get(ISheetDrawingService);
+		const groupParams = [];
+		for (const groupId of groupIds) {
+			const groupDrawing = sheetDrawingService.getDrawingByParam({
+				unitId,
+				subUnitId,
+				drawingId: groupId
+			});
+			if (!groupDrawing || groupDrawing.drawingType !== DrawingTypeEnum.DRAWING_GROUP) continue;
+			const groupTransform = groupDrawing.transform || {
+				width: 0,
+				height: 0
+			};
+			const children = sheetDrawingService.getDrawingsByGroup({
+				unitId,
+				subUnitId,
+				drawingId: groupId
+			}).map((drawing) => {
+				const newTransform = transformObjectOutOfGroup(drawing.transform || {}, groupTransform, groupTransform.width || 0, groupTransform.height || 0, groupDrawing.groupBaseBound);
+				return {
+					...drawing,
+					transform: {
+						...drawing.transform,
+						...newTransform
+					},
+					groupId: void 0
+				};
+			});
+			if (children.length > 0) groupParams.push({
+				parent: groupDrawing,
+				children
+			});
+		}
+		return this._applyGroupDrawingOperation(groupParams, DrawingApplyType.UNGROUP);
+	}
+	getDrawingGroupChildren(groupId, recursive = false) {
+		const unitId = this._fWorkbook.getId();
+		const subUnitId = this.getSheetId();
+		const sheetDrawingService = this._injector.get(ISheetDrawingService);
+		if (!recursive) return sheetDrawingService.getDrawingsByGroup({
+			unitId,
+			subUnitId,
+			drawingId: groupId
+		});
+		const nested = sheetDrawingService.getDrawingsByGroupNested({
+			unitId,
+			subUnitId,
+			drawingId: groupId
+		});
+		if (!nested) return [];
+		return [...nested.flatChildren || [], ...nested.groups.filter((group) => group.drawingId !== groupId)];
+	}
+	getDrawingParentGroup(drawingId) {
+		const unitId = this._fWorkbook.getId();
+		const subUnitId = this.getSheetId();
+		const sheetDrawingService = this._injector.get(ISheetDrawingService);
+		const drawing = sheetDrawingService.getDrawingByParam({
+			unitId,
+			subUnitId,
+			drawingId
+		});
+		if (!(drawing === null || drawing === void 0 ? void 0 : drawing.groupId)) return null;
+		const groupDrawing = sheetDrawingService.getDrawingByParam({
+			unitId,
+			subUnitId,
+			drawingId: drawing.groupId
+		});
+		if (!groupDrawing || groupDrawing.drawingType !== DrawingTypeEnum.DRAWING_GROUP) return null;
+		return groupDrawing;
+	}
+	isDrawingGrouped(drawingId) {
+		return this.getDrawingParentGroup(drawingId) !== null;
+	}
+	_applyGroupDrawingOperation(groupParams, type) {
+		if (groupParams.length === 0) return false;
+		const sheetDrawingService = this._injector.get(ISheetDrawingService);
+		const commandService = this._commandService;
+		const undoRedoService = this._injector.get(IUndoRedoService);
+		const { unitId, subUnitId, undo, redo, objects } = type === DrawingApplyType.GROUP ? sheetDrawingService.getGroupDrawingOp(groupParams) : sheetDrawingService.getUngroupDrawingOp(groupParams);
+		if (commandService.syncExecuteCommand(SetDrawingApplyMutation.id, {
+			op: redo,
+			unitId,
+			subUnitId,
+			objects,
+			type
+		})) {
+			const inverseType = type === DrawingApplyType.GROUP ? DrawingApplyType.UNGROUP : DrawingApplyType.GROUP;
+			undoRedoService.pushUndoRedo({
+				unitID: unitId,
+				undoMutations: [{
+					id: SetDrawingApplyMutation.id,
+					params: {
+						op: undo,
+						unitId,
+						subUnitId,
+						objects: this._invertGroupOperationObjects(objects, type),
+						type: inverseType
+					}
+				}],
+				redoMutations: [{
+					id: SetDrawingApplyMutation.id,
+					params: {
+						op: redo,
+						unitId,
+						subUnitId,
+						objects,
+						type
+					}
+				}]
+			});
+			return true;
+		}
+		return false;
+	}
+	_invertGroupOperationObjects(groupParams, type) {
+		return type === DrawingApplyType.GROUP ? groupParams.map((groupParam) => {
+			const { parent, children } = groupParam;
+			const groupTransform = parent.transform || {
+				width: 0,
+				height: 0
+			};
+			return {
+				parent: {
+					...parent,
+					transform: {
+						left: 0,
+						top: 0
+					}
+				},
+				children: children.map((child) => ({
+					...child,
+					transform: transformObjectOutOfGroup(child.transform || {}, groupTransform, groupTransform.width || 0, groupTransform.height || 0, parent.groupBaseBound),
+					groupId: void 0
+				}))
+			};
+		}) : groupParams.map((groupParam) => {
+			const { parent, children } = groupParam;
+			const groupTransform = getGroupState(0, 0, children.map((child) => child.transform || {}));
+			return {
+				parent: {
+					...parent,
+					transform: groupTransform
+				},
+				children: children.map((child) => ({
+					...child,
+					groupId: parent.drawingId
+				}))
+			};
+		});
+	}
 };
 FWorksheet.extend(FWorksheetDrawingMixin);
 

package/lib/es/index.js

@@ -405,7 +405,7 @@ const SetSheetDrawingCommand = {
 };
 
 //#endregion
-//#region \0@oxc-project+runtime@0.129.0/helpers/decorateParam.js
+//#region \0@oxc-project+runtime@0.134.0/helpers/esm/decorateParam.js
 function __decorateParam(paramIndex, decorator) {
 	return function(target, key) {
 		decorator(target, key, paramIndex);
@@ -413,7 +413,7 @@ function __decorateParam(paramIndex, decorator) {
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.129.0/helpers/decorate.js
+//#region \0@oxc-project+runtime@0.134.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);
@@ -583,7 +583,7 @@ SheetsDrawingLoadController = __decorate([
 //#endregion
 //#region package.json
 var name = "@univerjs/sheets-drawing";
-var version = "0.24.0";
+var version = "0.25.0-insiders.20260608-e4336f7";
 
 //#endregion
 //#region src/config/config.ts
@@ -607,7 +607,7 @@ const configSymbol = Symbol(SHEETS_DRAWING_PLUGIN_CONFIG_KEY);
 const defaultPluginConfig = {};
 
 //#endregion
-//#region \0@oxc-project+runtime@0.129.0/helpers/typeof.js
+//#region \0@oxc-project+runtime@0.134.0/helpers/esm/typeof.js
 function _typeof(o) {
 	"@babel/helpers - typeof";
 	return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function(o) {
@@ -618,7 +618,7 @@ function _typeof(o) {
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.129.0/helpers/toPrimitive.js
+//#region \0@oxc-project+runtime@0.134.0/helpers/esm/toPrimitive.js
 function toPrimitive(t, r) {
 	if ("object" != _typeof(t) || !t) return t;
 	var e = t[Symbol.toPrimitive];
@@ -631,14 +631,14 @@ function toPrimitive(t, r) {
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.129.0/helpers/toPropertyKey.js
+//#region \0@oxc-project+runtime@0.134.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.129.0/helpers/defineProperty.js
+//#region \0@oxc-project+runtime@0.134.0/helpers/esm/defineProperty.js
 function _defineProperty(e, r, t) {
 	return (r = toPropertyKey(r)) in e ? Object.defineProperty(e, r, {
 		value: t,