@univerjs/sheets-drawing 0.25.0 → 1.0.0-alpha.0

package/lib/cjs/facade.js

@@ -3,9 +3,10 @@ let _univerjs_core_facade = require("@univerjs/core/facade");
 let _univerjs_drawing = require("@univerjs/drawing");
 let _univerjs_sheets = require("@univerjs/sheets");
 let _univerjs_sheets_drawing = require("@univerjs/sheets-drawing");
+let _univerjs_engine_render = require("@univerjs/engine-render");
 let _univerjs_sheets_facade = require("@univerjs/sheets/facade");
 
-//#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) {
@@ -16,7 +17,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];
@@ -29,14 +30,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,
@@ -47,7 +48,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);
@@ -55,7 +56,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);
@@ -890,6 +891,11 @@ FOverGridImage = __decorate([__decorateParam(1, _univerjs_core.ICommandService),
 
 //#endregion
 //#region src/facade/f-worksheet.ts
+const GROUPABLE_DRAWING_TYPES = /* @__PURE__ */ new Set([
+	_univerjs_core.DrawingTypeEnum.DRAWING_IMAGE,
+	_univerjs_core.DrawingTypeEnum.DRAWING_SHAPE,
+	_univerjs_core.DrawingTypeEnum.DRAWING_GROUP
+]);
 var FWorksheetDrawingMixin = class extends _univerjs_sheets_facade.FWorksheet {
 	async insertImage(url, column, row, offsetX, offsetY) {
 		const imageBuilder = this.newOverGridImage();
@@ -979,6 +985,201 @@ var FWorksheetDrawingMixin = class extends _univerjs_sheets_facade.FWorksheet {
 		const subUnitId = this.getSheetId();
 		return this._injector.createInstance(FOverGridImageBuilder, unitId, subUnitId);
 	}
+	groupDrawings(drawingIds, groupId = (0, _univerjs_core.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(_univerjs_sheets_drawing.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 = (0, _univerjs_engine_render.getGroupState)(0, 0, validDrawings.map((drawing) => drawing.transform || {}));
+		const groupParam = {
+			unitId,
+			subUnitId,
+			drawingId: groupId,
+			drawingType: _univerjs_core.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
+		}], _univerjs_sheets_drawing.DrawingApplyType.GROUP) ? groupId : null;
+	}
+	ungroupDrawings(groupIds) {
+		const unitId = this._fWorkbook.getId();
+		const subUnitId = this.getSheetId();
+		const sheetDrawingService = this._injector.get(_univerjs_sheets_drawing.ISheetDrawingService);
+		const groupParams = [];
+		for (const groupId of groupIds) {
+			const groupDrawing = sheetDrawingService.getDrawingByParam({
+				unitId,
+				subUnitId,
+				drawingId: groupId
+			});
+			if (!groupDrawing || groupDrawing.drawingType !== _univerjs_core.DrawingTypeEnum.DRAWING_GROUP) continue;
+			const groupTransform = groupDrawing.transform || {
+				width: 0,
+				height: 0
+			};
+			const children = sheetDrawingService.getDrawingsByGroup({
+				unitId,
+				subUnitId,
+				drawingId: groupId
+			}).map((drawing) => {
+				const newTransform = (0, _univerjs_engine_render.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, _univerjs_sheets_drawing.DrawingApplyType.UNGROUP);
+	}
+	getDrawingGroupChildren(groupId, recursive = false) {
+		const unitId = this._fWorkbook.getId();
+		const subUnitId = this.getSheetId();
+		const sheetDrawingService = this._injector.get(_univerjs_sheets_drawing.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(_univerjs_sheets_drawing.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 !== _univerjs_core.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(_univerjs_sheets_drawing.ISheetDrawingService);
+		const commandService = this._commandService;
+		const undoRedoService = this._injector.get(_univerjs_core.IUndoRedoService);
+		const { unitId, subUnitId, undo, redo, objects } = type === _univerjs_sheets_drawing.DrawingApplyType.GROUP ? sheetDrawingService.getGroupDrawingOp(groupParams) : sheetDrawingService.getUngroupDrawingOp(groupParams);
+		if (commandService.syncExecuteCommand(_univerjs_sheets_drawing.SetDrawingApplyMutation.id, {
+			op: redo,
+			unitId,
+			subUnitId,
+			objects,
+			type
+		})) {
+			const inverseType = type === _univerjs_sheets_drawing.DrawingApplyType.GROUP ? _univerjs_sheets_drawing.DrawingApplyType.UNGROUP : _univerjs_sheets_drawing.DrawingApplyType.GROUP;
+			undoRedoService.pushUndoRedo({
+				unitID: unitId,
+				undoMutations: [{
+					id: _univerjs_sheets_drawing.SetDrawingApplyMutation.id,
+					params: {
+						op: undo,
+						unitId,
+						subUnitId,
+						objects: this._invertGroupOperationObjects(objects, type),
+						type: inverseType
+					}
+				}],
+				redoMutations: [{
+					id: _univerjs_sheets_drawing.SetDrawingApplyMutation.id,
+					params: {
+						op: redo,
+						unitId,
+						subUnitId,
+						objects,
+						type
+					}
+				}]
+			});
+			return true;
+		}
+		return false;
+	}
+	_invertGroupOperationObjects(groupParams, type) {
+		return type === _univerjs_sheets_drawing.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: (0, _univerjs_engine_render.transformObjectOutOfGroup)(child.transform || {}, groupTransform, groupTransform.width || 0, groupTransform.height || 0, parent.groupBaseBound),
+					groupId: void 0
+				}))
+			};
+		}) : groupParams.map((groupParam) => {
+			const { parent, children } = groupParam;
+			const groupTransform = (0, _univerjs_engine_render.getGroupState)(0, 0, children.map((child) => child.transform || {}));
+			return {
+				parent: {
+					...parent,
+					transform: groupTransform
+				},
+				children: children.map((child) => ({
+					...child,
+					groupId: parent.drawingId
+				}))
+			};
+		});
+	}
 };
 _univerjs_sheets_facade.FWorksheet.extend(FWorksheetDrawingMixin);
 

package/lib/cjs/index.js

@@ -406,7 +406,7 @@ const SetSheetDrawingCommand = {
 };
 
 //#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);
@@ -414,7 +414,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);
@@ -584,7 +584,7 @@ SheetsDrawingLoadController = __decorate([
 //#endregion
 //#region package.json
 var name = "@univerjs/sheets-drawing";
-var version = "0.25.0";
+var version = "1.0.0-alpha.0";
 
 //#endregion
 //#region src/config/config.ts
@@ -608,7 +608,7 @@ const configSymbol = Symbol(SHEETS_DRAWING_PLUGIN_CONFIG_KEY);
 const defaultPluginConfig = {};
 
 //#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) {
@@ -619,7 +619,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];
@@ -632,14 +632,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,

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.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) {
@@ -16,7 +17,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];
@@ -29,14 +30,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,
@@ -47,7 +48,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);
@@ -55,7 +56,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);
@@ -890,6 +891,11 @@ FOverGridImage = __decorate([__decorateParam(1, ICommandService), __decoratePara
 
 //#endregion
 //#region src/facade/f-worksheet.ts
+const GROUPABLE_DRAWING_TYPES = /* @__PURE__ */ 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();
@@ -979,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.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);
@@ -413,7 +413,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);
@@ -583,7 +583,7 @@ SheetsDrawingLoadController = __decorate([
 //#endregion
 //#region package.json
 var name = "@univerjs/sheets-drawing";
-var version = "0.25.0";
+var version = "1.0.0-alpha.0";
 
 //#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.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) {
@@ -618,7 +618,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];
@@ -631,14 +631,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,