@univerjs/sheets-drawing 1.0.0-alpha.8 → 1.0.0-beta.1

package/lib/index.js

@@ -1,4 +1,4 @@
-import { CopySheetCommand, DeleteRangeMoveLeftCommand, DeleteRangeMoveUpCommand, DeltaColumnWidthCommand, DeltaRowHeightCommand, InsertColCommand, InsertRangeMoveDownCommand, InsertRangeMoveRightCommand, InsertRowCommand, MoveColsCommand, MoveRangeCommand, MoveRowsCommand, RemoveColCommand, RemoveRowCommand, RemoveSheetCommand, SetColHiddenCommand, SetColHiddenMutation, SetColVisibleMutation, SetColWidthCommand, SetRowHeightCommand, SetRowHiddenCommand, SetRowHiddenMutation, SetRowVisibleMutation, SetSpecificColsVisibleCommand, SetSpecificRowsVisibleCommand, SetWorksheetColWidthMutation, SetWorksheetRowAutoHeightMutation, SetWorksheetRowHeightMutation, SetWorksheetRowIsAutoHeightMutation, SheetInterceptorService, SheetSkeletonService, SheetsSelectionsService, UniverSheetsPlugin, attachRangeWithCoord, convertPositionSheetOverGridToAbsolute, getSheetCommandTarget } from "@univerjs/sheets";
+import { CopySheetCommand, DeleteRangeMoveLeftCommand, DeleteRangeMoveUpCommand, DeltaColumnWidthCommand, DeltaRowHeightCommand, InsertColCommand, InsertRangeMoveDownCommand, InsertRangeMoveRightCommand, InsertRowCommand, MoveColsCommand, MoveRangeCommand, MoveRowsCommand, RemoveColCommand, RemoveRowCommand, RemoveSheetCommand, SetColHiddenCommand, SetColHiddenMutation, SetColVisibleMutation, SetColWidthCommand, SetRowHeightCommand, SetRowHiddenCommand, SetRowHiddenMutation, SetRowVisibleMutation, SetSpecificColsVisibleCommand, SetSpecificRowsVisibleCommand, SetWorksheetColWidthMutation, SetWorksheetRowAutoHeightMutation, SetWorksheetRowHeightMutation, SetWorksheetRowIsAutoHeightMutation, SheetInterceptorService, SheetSkeletonService, SheetsSelectionsService, UniverSheetsPlugin, attachRangeWithCoord, convertPositionCellToSheetOverGrid, convertPositionSheetOverGridToAbsolute, getSheetCommandTarget } from "@univerjs/sheets";
 import { ArrangeTypeEnum, CommandType, DependentOn, Disposable, DrawingTypeEnum, ICommandService, IConfigService, IResourceManagerService, IUndoRedoService, IUniverInstanceService, Inject, Injector, Plugin, RANGE_TYPE, Rectangle, UniverInstanceType, createIdentifier, merge, sequenceExecute, toDisposable } from "@univerjs/core";
 import { IDrawingManagerService, UnitDrawingService, UniverDrawingPlugin, getOrCreateDrawingCopyPlan, resolveDrawingRotateEnabled } from "@univerjs/drawing";
 import { IRenderManagerService } from "@univerjs/engine-render";
@@ -153,7 +153,6 @@ const InsertSheetDrawingCommand = {
 	id: "sheet.command.insert-sheet-image",
 	type: CommandType.COMMAND,
 	handler: (accessor, params) => {
-		var _intercepted$preRedos, _intercepted$preUndos;
 		if (!params) return false;
 		const commandService = accessor.get(ICommandService);
 		const undoRedoService = accessor.get(IUndoRedoService);
@@ -166,7 +165,7 @@ const InsertSheetDrawingCommand = {
 			params
 		});
 		const redoMutations = [
-			...(_intercepted$preRedos = intercepted.preRedos) !== null && _intercepted$preRedos !== void 0 ? _intercepted$preRedos : [],
+			...intercepted.preRedos ?? [],
 			{
 				id: SetDrawingApplyMutation.id,
 				params: {
@@ -184,7 +183,7 @@ const InsertSheetDrawingCommand = {
 			...intercepted.redos
 		];
 		const undoMutations = [
-			...(_intercepted$preUndos = intercepted.preUndos) !== null && _intercepted$preUndos !== void 0 ? _intercepted$preUndos : [],
+			...intercepted.preUndos ?? [],
 			{
 				id: SetDrawingApplyMutation.id,
 				params: {
@@ -219,7 +218,6 @@ const RemoveSheetDrawingCommand = {
 	id: "sheet.command.remove-sheet-image",
 	type: CommandType.COMMAND,
 	handler: (accessor, params) => {
-		var _intercepted$preRedos, _intercepted$preUndos;
 		if (!params) return false;
 		const commandService = accessor.get(ICommandService);
 		const undoRedoService = accessor.get(IUndoRedoService);
@@ -233,7 +231,7 @@ const RemoveSheetDrawingCommand = {
 			params
 		});
 		const redoMutations = [
-			...(_intercepted$preRedos = intercepted.preRedos) !== null && _intercepted$preRedos !== void 0 ? _intercepted$preRedos : [],
+			...intercepted.preRedos ?? [],
 			{
 				id: SetDrawingApplyMutation.id,
 				params: {
@@ -251,7 +249,7 @@ const RemoveSheetDrawingCommand = {
 			...intercepted.redos
 		];
 		const undoMutations = [
-			...(_intercepted$preUndos = intercepted.preUndos) !== null && _intercepted$preUndos !== void 0 ? _intercepted$preUndos : [],
+			...intercepted.preUndos ?? [],
 			{
 				id: SetDrawingApplyMutation.id,
 				params: {
@@ -290,17 +288,18 @@ const SetDrawingArrangeCommand = {
 		const undoRedoService = accessor.get(IUndoRedoService);
 		if (!params) return false;
 		const sheetDrawingService = accessor.get(ISheetDrawingService);
-		const { unitId, subUnitId, drawingIds, arrangeType } = params;
+		const { unitId, subUnitId, drawingIds } = params;
 		const drawingOrderMapParam = {
 			unitId,
 			subUnitId,
 			drawingIds
 		};
 		let jsonOp;
-		if (arrangeType === ArrangeTypeEnum.forward) jsonOp = sheetDrawingService.getForwardDrawingsOp(drawingOrderMapParam);
-		else if (arrangeType === ArrangeTypeEnum.backward) jsonOp = sheetDrawingService.getBackwardDrawingOp(drawingOrderMapParam);
-		else if (arrangeType === ArrangeTypeEnum.front) jsonOp = sheetDrawingService.getFrontDrawingsOp(drawingOrderMapParam);
-		else if (arrangeType === ArrangeTypeEnum.back) jsonOp = sheetDrawingService.getBackDrawingsOp(drawingOrderMapParam);
+		if (params.zOrder !== void 0) jsonOp = sheetDrawingService.getDrawingOrderOp(drawingOrderMapParam, params.zOrder);
+		else if (params.arrangeType === ArrangeTypeEnum.forward) jsonOp = sheetDrawingService.getForwardDrawingsOp(drawingOrderMapParam);
+		else if (params.arrangeType === ArrangeTypeEnum.backward) jsonOp = sheetDrawingService.getBackwardDrawingOp(drawingOrderMapParam);
+		else if (params.arrangeType === ArrangeTypeEnum.front) jsonOp = sheetDrawingService.getFrontDrawingsOp(drawingOrderMapParam);
+		else if (params.arrangeType === ArrangeTypeEnum.back) jsonOp = sheetDrawingService.getBackDrawingsOp(drawingOrderMapParam);
 		if (jsonOp == null) return false;
 		const { objects, redo, undo } = jsonOp;
 		if (commandService.syncExecuteCommand(SetDrawingApplyMutation.id, {
@@ -339,6 +338,226 @@ const SetDrawingArrangeCommand = {
 	}
 };
 
+//#endregion
+//#region src/services/sheet-drawing-placement.ts
+function getSheetDrawingPlacement(drawing) {
+	var _drawing$transform5, _drawing$transform6;
+	const anchorType = drawing.anchorType ?? "0";
+	if (anchorType === "2") {
+		var _drawing$transform, _drawing$transform2, _drawing$transform3, _drawing$transform4;
+		return {
+			kind: "2",
+			left: ((_drawing$transform = drawing.transform) === null || _drawing$transform === void 0 ? void 0 : _drawing$transform.left) ?? 0,
+			top: ((_drawing$transform2 = drawing.transform) === null || _drawing$transform2 === void 0 ? void 0 : _drawing$transform2.top) ?? 0,
+			width: ((_drawing$transform3 = drawing.transform) === null || _drawing$transform3 === void 0 ? void 0 : _drawing$transform3.width) ?? 0,
+			height: ((_drawing$transform4 = drawing.transform) === null || _drawing$transform4 === void 0 ? void 0 : _drawing$transform4.height) ?? 0
+		};
+	}
+	if (anchorType === "1") return {
+		kind: "1",
+		from: { ...drawing.sheetTransform.from },
+		to: { ...drawing.sheetTransform.to }
+	};
+	return {
+		kind: "0",
+		from: { ...drawing.sheetTransform.from },
+		width: ((_drawing$transform5 = drawing.transform) === null || _drawing$transform5 === void 0 ? void 0 : _drawing$transform5.width) ?? 0,
+		height: ((_drawing$transform6 = drawing.transform) === null || _drawing$transform6 === void 0 ? void 0 : _drawing$transform6.height) ?? 0
+	};
+}
+function applySheetDrawingPlacement(drawing, input, skeleton) {
+	const placement = normalizeSheetDrawingPlacement(input, skeleton);
+	if (placement.kind === "2") {
+		const transform = withExistingTransform(drawing.transform, placement);
+		const sheetTransform = absoluteSheetTransform(placement, drawing.sheetTransform);
+		return {
+			...drawing,
+			anchorType: "2",
+			transform,
+			sheetTransform,
+			axisAlignSheetTransform: sheetTransform
+		};
+	}
+	if (!skeleton) throw new Error("SHEET_DRAWING_PLACEMENT_SKELETON_REQUIRED");
+	if (placement.kind === "0") {
+		const converted = convertPositionCellToSheetOverGrid(drawing.unitId, drawing.subUnitId, placement.from, placement.width, placement.height, skeleton);
+		const sheetTransform = withExistingSheetTransform(drawing.sheetTransform, converted.sheetTransform);
+		const transform = withExistingTransform(drawing.transform, converted.transform);
+		return {
+			...drawing,
+			anchorType: "0",
+			sheetTransform,
+			transform,
+			axisAlignSheetTransform: transformToAxisAlignPosition(transform, skeleton)
+		};
+	}
+	const sheetTransform = withExistingSheetTransform(drawing.sheetTransform, {
+		from: placement.from,
+		to: placement.to
+	});
+	const bounds = convertPositionSheetOverGridToAbsolute(drawing.unitId, drawing.subUnitId, sheetTransform, skeleton);
+	const transform = withExistingTransform(drawing.transform, bounds);
+	return {
+		...drawing,
+		anchorType: "1",
+		sheetTransform,
+		transform,
+		axisAlignSheetTransform: transformToAxisAlignPosition(transform, skeleton)
+	};
+}
+/**
+* Normalize exact markers or model-space bounds to the authoritative
+* Position, Both, or None Placement.
+*/
+function normalizeSheetDrawingPlacement(input, skeleton) {
+	if (!("bounds" in input)) {
+		validatePlacement(input);
+		if (input.kind === "1" && skeleton) validateBounds(convertPositionSheetOverGridToAbsolute(skeleton.worksheet.getUnitId(), skeleton.worksheet.getSheetId(), {
+			from: input.from,
+			to: input.to
+		}, skeleton));
+		return input;
+	}
+	validateBounds(input.bounds);
+	if (input.kind === "2") return {
+		kind: "2",
+		...input.bounds
+	};
+	if (!skeleton) throw new Error("SHEET_DRAWING_PLACEMENT_SKELETON_REQUIRED");
+	const sheetTransform = transformToDrawingPosition(input.bounds, skeleton);
+	if (input.kind === "0") return {
+		kind: "0",
+		from: sheetTransform.from,
+		width: input.bounds.width,
+		height: input.bounds.height
+	};
+	if (input.kind === "1") return {
+		kind: "1",
+		from: sheetTransform.from,
+		to: sheetTransform.to
+	};
+	throw new Error("SHEET_DRAWING_PLACEMENT_KIND_INVALID");
+}
+function withExistingSheetTransform(current, placement) {
+	return {
+		...current,
+		from: { ...placement.from },
+		to: { ...placement.to }
+	};
+}
+function withExistingTransform(current, bounds) {
+	return {
+		...current,
+		left: bounds.left,
+		top: bounds.top,
+		width: bounds.width,
+		height: bounds.height
+	};
+}
+function absoluteSheetTransform(placement, current) {
+	return {
+		...current,
+		from: {
+			column: 0,
+			columnOffset: placement.left,
+			row: 0,
+			rowOffset: placement.top
+		},
+		to: {
+			column: 0,
+			columnOffset: placement.left + placement.width,
+			row: 0,
+			rowOffset: placement.top + placement.height
+		}
+	};
+}
+function validatePlacement(placement) {
+	if (placement.kind === "0") {
+		validateCellPosition(placement.from);
+		validateExtent(placement.width, placement.height);
+		return;
+	}
+	if (placement.kind === "1") {
+		validateCellPosition(placement.from);
+		validateCellPosition(placement.to);
+		return;
+	}
+	if (placement.kind === "2") {
+		if (!Number.isFinite(placement.left) || !Number.isFinite(placement.top)) throw new TypeError("SHEET_DRAWING_PLACEMENT_POSITION_INVALID");
+		validateExtent(placement.width, placement.height);
+		return;
+	}
+	throw new Error("SHEET_DRAWING_PLACEMENT_KIND_INVALID");
+}
+function validateBounds(bounds) {
+	if (!Number.isFinite(bounds.left) || !Number.isFinite(bounds.top)) throw new TypeError("SHEET_DRAWING_PLACEMENT_POSITION_INVALID");
+	validateExtent(bounds.width, bounds.height);
+}
+function validateCellPosition(position) {
+	if (!Number.isInteger(position.row) || !Number.isInteger(position.column) || position.row < 0 || position.column < 0 || !Number.isFinite(position.rowOffset) || !Number.isFinite(position.columnOffset)) throw new Error("SHEET_DRAWING_PLACEMENT_CELL_INVALID");
+}
+function validateExtent(width, height) {
+	if (!Number.isFinite(width) || !Number.isFinite(height) || width <= 0 || height <= 0) throw new Error("SHEET_DRAWING_PLACEMENT_EXTENT_INVALID");
+}
+
+//#endregion
+//#region src/commands/commands/set-sheet-drawing-placement.command.ts
+const SetSheetDrawingPlacementCommand = {
+	id: "sheet.command.set-drawing-placement",
+	type: CommandType.COMMAND,
+	handler: (accessor, params) => {
+		if (!(params === null || params === void 0 ? void 0 : params.drawings.length)) return false;
+		const commandService = accessor.get(ICommandService);
+		const undoRedoService = accessor.get(IUndoRedoService);
+		const drawingService = accessor.get(ISheetDrawingService);
+		const skeleton = params.drawings.every(({ placement }) => placement.kind === "2") ? void 0 : accessor.get(SheetSkeletonService).ensureSkeleton(params.unitId, params.subUnitId);
+		const updatedDrawings = [];
+		for (const { drawingId, placement } of params.drawings) {
+			const drawing = drawingService.getDrawingByParam({
+				unitId: params.unitId,
+				subUnitId: params.subUnitId,
+				drawingId
+			});
+			if (!drawing) return false;
+			updatedDrawings.push(applySheetDrawingPlacement(drawing, placement, skeleton));
+		}
+		const { unitId, subUnitId, undo, redo, objects } = drawingService.getBatchUpdateOp(updatedDrawings);
+		const redoMutations = [{
+			id: SetDrawingApplyMutation.id,
+			params: {
+				unitId,
+				subUnitId,
+				op: redo,
+				objects,
+				type: 2
+			}
+		}, {
+			id: ClearSheetDrawingTransformerOperation.id,
+			params: [unitId]
+		}];
+		const undoMutations = [{
+			id: SetDrawingApplyMutation.id,
+			params: {
+				unitId,
+				subUnitId,
+				op: undo,
+				objects,
+				type: 2
+			}
+		}, {
+			id: ClearSheetDrawingTransformerOperation.id,
+			params: [unitId]
+		}];
+		if (!sequenceExecute(redoMutations, commandService).result) return false;
+		undoRedoService.pushUndoRedo({
+			unitID: unitId,
+			undoMutations,
+			redoMutations
+		});
+		return true;
+	}
+};
+
 //#endregion
 //#region src/common/rotate-enabled.ts
 function isKnownSheetNonRotatableDrawingType(drawingType) {
@@ -346,10 +565,7 @@ function isKnownSheetNonRotatableDrawingType(drawingType) {
 }
 function resolveSheetDrawingRotateEnabled(drawing, drawingService, getChildren) {
 	return resolveDrawingRotateEnabled(drawing, {
-		getChildren: (current) => {
-			var _getChildren;
-			return (_getChildren = getChildren === null || getChildren === void 0 ? void 0 : getChildren(current)) !== null && _getChildren !== void 0 ? _getChildren : drawingService.getDrawingsByGroup(current);
-		},
+		getChildren: (current) => (getChildren === null || getChildren === void 0 ? void 0 : getChildren(current)) ?? drawingService.getDrawingsByGroup(current),
 		isKnownNonRotatableType: isKnownSheetNonRotatableDrawingType
 	});
 }
@@ -363,7 +579,7 @@ function hasIncomingAngle(drawing) {
 function preserveAngle(incoming, current) {
 	const currentAngle = current === null || current === void 0 ? void 0 : current.angle;
 	const next = {
-		...current !== null && current !== void 0 ? current : {},
+		...current ?? {},
 		...incoming
 	};
 	if (currentAngle === void 0) delete next.angle;
@@ -371,7 +587,7 @@ function preserveAngle(incoming, current) {
 	return next;
 }
 function normalizeNonRotatableAngleUpdate(drawing, sheetDrawingService) {
-	var _drawing$drawingType, _drawing$transform2, _drawing$sheetTransfo2, _drawing$axisAlignShe2;
+	var _drawing$transform2, _drawing$sheetTransfo2, _drawing$axisAlignShe2;
 	if (!drawing.drawingId || !drawing.unitId || !drawing.subUnitId || !hasIncomingAngle(drawing)) return drawing;
 	const current = sheetDrawingService.getDrawingByParam({
 		unitId: drawing.unitId,
@@ -382,7 +598,7 @@ function normalizeNonRotatableAngleUpdate(drawing, sheetDrawingService) {
 	if (resolveSheetDrawingRotateEnabled({
 		...current,
 		...drawing,
-		drawingType: (_drawing$drawingType = drawing.drawingType) !== null && _drawing$drawingType !== void 0 ? _drawing$drawingType : current.drawingType,
+		drawingType: drawing.drawingType ?? current.drawingType,
 		transform: {
 			...current.transform,
 			...drawing.transform
@@ -398,7 +614,6 @@ const SetSheetDrawingCommand = {
 	id: "sheet.command.set-sheet-image",
 	type: CommandType.COMMAND,
 	handler: (accessor, params) => {
-		var _intercepted$preRedos, _intercepted$preUndos;
 		if (!params) return false;
 		const commandService = accessor.get(ICommandService);
 		const undoRedoService = accessor.get(IUndoRedoService);
@@ -416,7 +631,7 @@ const SetSheetDrawingCommand = {
 			params: normalizedParams
 		});
 		const redoMutations = [
-			...(_intercepted$preRedos = intercepted.preRedos) !== null && _intercepted$preRedos !== void 0 ? _intercepted$preRedos : [],
+			...intercepted.preRedos ?? [],
 			{
 				id: SetDrawingApplyMutation.id,
 				params: {
@@ -434,7 +649,7 @@ const SetSheetDrawingCommand = {
 			...intercepted.redos
 		];
 		const undoMutations = [
-			...(_intercepted$preUndos = intercepted.preUndos) !== null && _intercepted$preUndos !== void 0 ? _intercepted$preUndos : [],
+			...intercepted.preUndos ?? [],
 			{
 				id: SetDrawingApplyMutation.id,
 				params: {
@@ -518,6 +733,7 @@ let SheetsDrawingLoadController = class SheetsDrawingLoadController extends Disp
 			InsertSheetDrawingCommand,
 			RemoveSheetDrawingCommand,
 			SetDrawingArrangeCommand,
+			SetSheetDrawingPlacementCommand,
 			ClearSheetDrawingTransformerOperation
 		].forEach((command) => this.disposeWithMe(this._commandService.registerCommand(command)));
 	}
@@ -652,7 +868,7 @@ SheetsDrawingLoadController = __decorate([
 //#endregion
 //#region package.json
 var name = "@univerjs/sheets-drawing";
-var version = "1.0.0-alpha.8";
+var version = "1.0.0-beta.1";
 
 //#endregion
 //#region src/config/config.ts
@@ -733,10 +949,7 @@ var SheetDrawingTransformPlanService = class {
 	}
 	register(extension) {
 		this._extensions.push(extension);
-		this._extensions.sort((a, b) => {
-			var _b$priority, _a$priority;
-			return ((_b$priority = b.priority) !== null && _b$priority !== void 0 ? _b$priority : 0) - ((_a$priority = a.priority) !== null && _a$priority !== void 0 ? _a$priority : 0);
-		});
+		this._extensions.sort((a, b) => (b.priority ?? 0) - (a.priority ?? 0));
 		return toDisposable(() => {
 			const index = this._extensions.indexOf(extension);
 			if (index >= 0) this._extensions.splice(index, 1);
@@ -744,13 +957,12 @@ var SheetDrawingTransformPlanService = class {
 	}
 	transform(plan) {
 		return this._extensions.reduce((all, extension) => {
-			var _next$preRedos, _next$redos, _next$preUndos, _next$undos;
 			const next = extension.transform(plan);
 			if (!next) return all;
-			all.preRedos.push(...(_next$preRedos = next.preRedos) !== null && _next$preRedos !== void 0 ? _next$preRedos : []);
-			all.redos.push(...(_next$redos = next.redos) !== null && _next$redos !== void 0 ? _next$redos : []);
-			all.preUndos.push(...(_next$preUndos = next.preUndos) !== null && _next$preUndos !== void 0 ? _next$preUndos : []);
-			all.undos.push(...(_next$undos = next.undos) !== null && _next$undos !== void 0 ? _next$undos : []);
+			all.preRedos.push(...next.preRedos ?? []);
+			all.redos.push(...next.redos ?? []);
+			all.preUndos.push(...next.preUndos ?? []);
+			all.undos.push(...next.undos ?? []);
 			return all;
 		}, createEmptyResult());
 	}
@@ -947,7 +1159,6 @@ let SheetDrawingTransformAffectedController = class SheetDrawingTransformAffecte
 			deletes: new Set(deletes.map(({ drawingId }) => drawingId).filter((drawingId) => Boolean(drawingId)))
 		};
 		updates.forEach((patch) => {
-			var _patch$sheetTransform, _patch$axisAlignSheet;
 			if (!patch.drawingId) return;
 			const original = originals.get(patch.drawingId);
 			if (!original) return;
@@ -958,8 +1169,8 @@ let SheetDrawingTransformAffectedController = class SheetDrawingTransformAffecte
 					...original.transform,
 					...patch.transform
 				},
-				sheetTransform: (_patch$sheetTransform = patch.sheetTransform) !== null && _patch$sheetTransform !== void 0 ? _patch$sheetTransform : original.sheetTransform,
-				axisAlignSheetTransform: (_patch$axisAlignSheet = patch.axisAlignSheetTransform) !== null && _patch$axisAlignSheet !== void 0 ? _patch$axisAlignSheet : original.axisAlignSheetTransform
+				sheetTransform: patch.sheetTransform ?? original.sheetTransform,
+				axisAlignSheetTransform: patch.axisAlignSheetTransform ?? original.axisAlignSheetTransform
 			});
 		});
 		const feature = this._transformPlanService.transform(plan);
@@ -1101,7 +1312,6 @@ let SheetDrawingTransformAffectedController = class SheetDrawingTransformAffecte
 			drawingId
 		});
 		else {
-			var _param$axisAlignSheet;
 			const param = this._shrinkCol(startColumn, endColumn, {
 				sheetSkeletonParam,
 				sheetTransform,
@@ -1110,7 +1320,7 @@ let SheetDrawingTransformAffectedController = class SheetDrawingTransformAffecte
 			});
 			newSheetTransform = param === null || param === void 0 ? void 0 : param.newSheetTransform;
 			newTransform = param === null || param === void 0 ? void 0 : param.newTransform;
-			axisAlignSheetTransform = (_param$axisAlignSheet = param === null || param === void 0 ? void 0 : param.axisAlignSheetTransform) !== null && _param$axisAlignSheet !== void 0 ? _param$axisAlignSheet : void 0;
+			axisAlignSheetTransform = (param === null || param === void 0 ? void 0 : param.axisAlignSheetTransform) ?? void 0;
 		}
 		else if (type === 1 && fromColumn >= startColumn && toColumn <= endColumn) if (fromRow >= startRow && toRow <= endRow) deleteDrawings.push({
 			unitId,
@@ -1118,7 +1328,6 @@ let SheetDrawingTransformAffectedController = class SheetDrawingTransformAffecte
 			drawingId
 		});
 		else {
-			var _param$axisAlignSheet2;
 			const param = this._shrinkRow(startRow, endRow, {
 				sheetSkeletonParam,
 				sheetTransform,
@@ -1127,10 +1336,9 @@ let SheetDrawingTransformAffectedController = class SheetDrawingTransformAffecte
 			});
 			newSheetTransform = param === null || param === void 0 ? void 0 : param.newSheetTransform;
 			newTransform = param === null || param === void 0 ? void 0 : param.newTransform;
-			axisAlignSheetTransform = (_param$axisAlignSheet2 = param === null || param === void 0 ? void 0 : param.axisAlignSheetTransform) !== null && _param$axisAlignSheet2 !== void 0 ? _param$axisAlignSheet2 : void 0;
+			axisAlignSheetTransform = (param === null || param === void 0 ? void 0 : param.axisAlignSheetTransform) ?? void 0;
 		}
 		else if (type === 2) {
-			var _param$axisAlignSheet3;
 			const param = this._expandRow(startRow, endRow, {
 				sheetSkeletonParam,
 				sheetTransform,
@@ -1139,9 +1347,8 @@ let SheetDrawingTransformAffectedController = class SheetDrawingTransformAffecte
 			});
 			newSheetTransform = param === null || param === void 0 ? void 0 : param.newSheetTransform;
 			newTransform = param === null || param === void 0 ? void 0 : param.newTransform;
-			axisAlignSheetTransform = (_param$axisAlignSheet3 = param === null || param === void 0 ? void 0 : param.axisAlignSheetTransform) !== null && _param$axisAlignSheet3 !== void 0 ? _param$axisAlignSheet3 : void 0;
+			axisAlignSheetTransform = (param === null || param === void 0 ? void 0 : param.axisAlignSheetTransform) ?? void 0;
 		} else if (type === 3) {
-			var _param$axisAlignSheet4;
 			const param = this._expandCol(startColumn, endColumn, {
 				sheetSkeletonParam,
 				sheetTransform,
@@ -1150,7 +1357,7 @@ let SheetDrawingTransformAffectedController = class SheetDrawingTransformAffecte
 			});
 			newSheetTransform = param === null || param === void 0 ? void 0 : param.newSheetTransform;
 			newTransform = param === null || param === void 0 ? void 0 : param.newTransform;
-			axisAlignSheetTransform = (_param$axisAlignSheet4 = param === null || param === void 0 ? void 0 : param.axisAlignSheetTransform) !== null && _param$axisAlignSheet4 !== void 0 ? _param$axisAlignSheet4 : void 0;
+			axisAlignSheetTransform = (param === null || param === void 0 ? void 0 : param.axisAlignSheetTransform) ?? void 0;
 		}
 		if (newSheetTransform && newTransform) {
 			const newTransform = drawingPositionToTransform(newSheetTransform, sheetSkeletonParam);
@@ -1547,7 +1754,6 @@ let SheetDrawingTransformAffectedController = class SheetDrawingTransformAffecte
 			let newTransform;
 			let axisAlignSheetTransform;
 			if (type === "insert") {
-				var _param$axisAlignSheet5;
 				const param = this._expandRow(rowStartIndex, rowEndIndex, {
 					sheetSkeletonParam,
 					sheetTransform,
@@ -1556,7 +1762,7 @@ let SheetDrawingTransformAffectedController = class SheetDrawingTransformAffecte
 				});
 				newSheetTransform = param === null || param === void 0 ? void 0 : param.newSheetTransform;
 				newTransform = param === null || param === void 0 ? void 0 : param.newTransform;
-				axisAlignSheetTransform = (_param$axisAlignSheet5 = param === null || param === void 0 ? void 0 : param.axisAlignSheetTransform) !== null && _param$axisAlignSheet5 !== void 0 ? _param$axisAlignSheet5 : void 0;
+				axisAlignSheetTransform = (param === null || param === void 0 ? void 0 : param.axisAlignSheetTransform) ?? void 0;
 			} else {
 				const { from, to } = sheetTransform;
 				const { row: fromRow } = from;
@@ -1567,7 +1773,6 @@ let SheetDrawingTransformAffectedController = class SheetDrawingTransformAffecte
 					drawingId
 				});
 				else {
-					var _param$axisAlignSheet6;
 					const param = this._shrinkRow(rowStartIndex, rowEndIndex, {
 						sheetSkeletonParam,
 						sheetTransform,
@@ -1576,7 +1781,7 @@ let SheetDrawingTransformAffectedController = class SheetDrawingTransformAffecte
 					});
 					newSheetTransform = param === null || param === void 0 ? void 0 : param.newSheetTransform;
 					newTransform = param === null || param === void 0 ? void 0 : param.newTransform;
-					axisAlignSheetTransform = (_param$axisAlignSheet6 = param === null || param === void 0 ? void 0 : param.axisAlignSheetTransform) !== null && _param$axisAlignSheet6 !== void 0 ? _param$axisAlignSheet6 : void 0;
+					axisAlignSheetTransform = (param === null || param === void 0 ? void 0 : param.axisAlignSheetTransform) ?? void 0;
 				}
 			}
 			if (!newSheetTransform || !newTransform) return;
@@ -1617,7 +1822,6 @@ let SheetDrawingTransformAffectedController = class SheetDrawingTransformAffecte
 			let newTransform;
 			let axisAlignSheetTransform;
 			if (type === "insert") {
-				var _param$axisAlignSheet7;
 				const param = this._expandCol(colStartIndex, colEndIndex, {
 					sheetSkeletonParam,
 					sheetTransform,
@@ -1626,7 +1830,7 @@ let SheetDrawingTransformAffectedController = class SheetDrawingTransformAffecte
 				});
 				newSheetTransform = param === null || param === void 0 ? void 0 : param.newSheetTransform;
 				newTransform = param === null || param === void 0 ? void 0 : param.newTransform;
-				axisAlignSheetTransform = (_param$axisAlignSheet7 = param === null || param === void 0 ? void 0 : param.axisAlignSheetTransform) !== null && _param$axisAlignSheet7 !== void 0 ? _param$axisAlignSheet7 : void 0;
+				axisAlignSheetTransform = (param === null || param === void 0 ? void 0 : param.axisAlignSheetTransform) ?? void 0;
 			} else {
 				const { from, to } = sheetTransform;
 				const { column: fromColumn } = from;
@@ -1637,7 +1841,6 @@ let SheetDrawingTransformAffectedController = class SheetDrawingTransformAffecte
 					drawingId
 				});
 				else {
-					var _param$axisAlignSheet8;
 					const param = this._shrinkCol(colStartIndex, colEndIndex, {
 						sheetSkeletonParam,
 						sheetTransform,
@@ -1646,7 +1849,7 @@ let SheetDrawingTransformAffectedController = class SheetDrawingTransformAffecte
 					});
 					newSheetTransform = param === null || param === void 0 ? void 0 : param.newSheetTransform;
 					newTransform = param === null || param === void 0 ? void 0 : param.newTransform;
-					axisAlignSheetTransform = (_param$axisAlignSheet8 = param === null || param === void 0 ? void 0 : param.axisAlignSheetTransform) !== null && _param$axisAlignSheet8 !== void 0 ? _param$axisAlignSheet8 : void 0;
+					axisAlignSheetTransform = (param === null || param === void 0 ? void 0 : param.axisAlignSheetTransform) ?? void 0;
 				}
 			}
 			if (!newSheetTransform || !newTransform) return;
@@ -1983,9 +2186,8 @@ let SheetDrawingTransformAffectedController = class SheetDrawingTransformAffecte
 		}));
 	}
 	_refreshDrawingTransform(command, unitId, subUnitId, ranges) {
-		var _this$_drawingManager;
 		const sheetSkeletonParam = this._getCalculatedSkeletonParam(unitId, subUnitId);
-		const drawingData = (_this$_drawingManager = this._drawingManagerService.getDrawingData(unitId, subUnitId)) !== null && _this$_drawingManager !== void 0 ? _this$_drawingManager : {};
+		const drawingData = this._drawingManagerService.getDrawingData(unitId, subUnitId) ?? {};
 		const updateDrawings = [];
 		Object.keys(drawingData).forEach((drawingId) => {
 			const drawing = drawingData[drawingId];
@@ -2071,4 +2273,4 @@ UniverSheetsDrawingPlugin = __decorate([
 ], UniverSheetsDrawingPlugin);
 
 //#endregion
-export { ClearSheetDrawingTransformerOperation, DrawingApplyType, ISheetDrawingService, InsertSheetDrawingCommand, RemoveSheetDrawingCommand, SHEET_DRAWING_PLUGIN, SetDrawingApplyMutation, SetDrawingArrangeCommand, SetSheetDrawingCommand, SheetDrawingAnchorType, SheetDrawingService, SheetDrawingTransformPlanService, UniverSheetsDrawingPlugin, drawingPositionToTransform, isKnownSheetNonRotatableDrawingType, resolveSheetDrawingRotateEnabled, transformToAxisAlignPosition, transformToDrawingPosition };
+export { ClearSheetDrawingTransformerOperation, DrawingApplyType, ISheetDrawingService, InsertSheetDrawingCommand, RemoveSheetDrawingCommand, SHEET_DRAWING_PLUGIN, SetDrawingApplyMutation, SetDrawingArrangeCommand, SetSheetDrawingCommand, SetSheetDrawingPlacementCommand, SheetDrawingAnchorType, SheetDrawingService, SheetDrawingTransformPlanService, UniverSheetsDrawingPlugin, applySheetDrawingPlacement, drawingPositionToTransform, getSheetDrawingPlacement, isKnownSheetNonRotatableDrawingType, normalizeSheetDrawingPlacement, resolveSheetDrawingRotateEnabled, transformToAxisAlignPosition, transformToDrawingPosition };

package/lib/types/commands/commands/set-drawing-arrange.command.d.ts

@@ -16,7 +16,11 @@
 import type { ICommand } from '@univerjs/core';
 import type { IDrawingOrderMapParam } from '@univerjs/drawing';
 import { ArrangeTypeEnum } from '@univerjs/core';
-export interface ISetDrawingArrangeCommandParams extends IDrawingOrderMapParam {
+export type ISetDrawingArrangeCommandParams = IDrawingOrderMapParam & ({
     arrangeType: ArrangeTypeEnum;
-}
+    zOrder?: never;
+} | {
+    arrangeType?: never;
+    zOrder: number;
+});
 export declare const SetDrawingArrangeCommand: ICommand;

package/lib/types/commands/commands/set-sheet-drawing-placement.command.d.ts

@@ -0,0 +1,26 @@
+/**
+ * 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.
+ */
+import type { ICommand } from '@univerjs/core';
+import type { ISheetDrawingPlacementInput } from '../../services/sheet-drawing-placement';
+export interface ISetSheetDrawingPlacementCommandParams {
+    unitId: string;
+    subUnitId: string;
+    drawings: Array<{
+        drawingId: string;
+        placement: ISheetDrawingPlacementInput;
+    }>;
+}
+export declare const SetSheetDrawingPlacementCommand: ICommand<ISetSheetDrawingPlacementCommandParams>;