@univerjs/drawing 1.0.0-rc.0 → 1.0.0

package/lib/index.js

@@ -1,5 +1,4 @@
-import { CommandType, Disposable, DrawingTypeEnum, ICommandService, IConfigService, IImageIoService, IURLImageService, ImageSourceType, ImageUploadStatusType, Inject, Injector, Plugin, createIdentifier, generateRandomId, merge, mergeOverrideWithDependencies, normalizeDrawingOrderIndex, sortRules, sortRulesByDesc, toDisposable } from "@univerjs/core";
-import * as json1 from "ot-json1";
+import { CommandType, Disposable, DrawingTypeEnum, ICommandService, IConfigService, IImageIoService, IURLImageService, ImageSourceType, ImageUploadStatusType, Inject, Injector, JSON1, Plugin, createIdentifier, generateRandomId, merge, mergeOverrideWithDependencies, normalizeDrawingOrderIndex, sortRules, sortRulesByDesc, toDisposable } from "@univerjs/core";
 import { Subject } from "rxjs";
 
 //#region src/basics/config.ts
@@ -21,7 +20,7 @@ import { Subject } from "rxjs";
 const DRAWING_IMAGE_WIDTH_LIMIT = 500;
 const DRAWING_IMAGE_HEIGHT_LIMIT = 500;
 const DRAWING_IMAGE_COUNT_LIMIT = 10;
-let DRAWING_IMAGE_ALLOW_SIZE = 5 * 1024 * 1024;
+let DRAWING_IMAGE_ALLOW_SIZE = 5242880;
 function setDrawingImageAllowSize(size) {
 	DRAWING_IMAGE_ALLOW_SIZE = size;
 }
@@ -56,7 +55,7 @@ const SetDrawingSelectedOperation = {
 //#endregion
 //#region package.json
 var name = "@univerjs/drawing";
-var version = "1.0.0-rc.0";
+var version = "1.0.0";
 
 //#endregion
 //#region src/config/config.ts
@@ -65,7 +64,7 @@ const configSymbol = Symbol(DRAWING_PLUGIN_CONFIG_KEY);
 const defaultPluginConfig = {};
 
 //#endregion
-//#region \0@oxc-project+runtime@0.140.0/helpers/esm/typeof.js
+//#region \0@oxc-project+runtime@0.149.0/helpers/esm/typeof.js
 function _typeof(o) {
 	"@babel/helpers - typeof";
 	return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function(o) {
@@ -76,7 +75,7 @@ function _typeof(o) {
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.140.0/helpers/esm/toPrimitive.js
+//#region \0@oxc-project+runtime@0.149.0/helpers/esm/toPrimitive.js
 function toPrimitive(t, r) {
 	if ("object" != _typeof(t) || !t) return t;
 	var e = t[Symbol.toPrimitive];
@@ -89,14 +88,14 @@ function toPrimitive(t, r) {
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.140.0/helpers/esm/toPropertyKey.js
+//#region \0@oxc-project+runtime@0.149.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.140.0/helpers/esm/defineProperty.js
+//#region \0@oxc-project+runtime@0.149.0/helpers/esm/defineProperty.js
 function _defineProperty(e, r, t) {
 	return (r = toPropertyKey(r)) in e ? Object.defineProperty(e, r, {
 		value: t,
@@ -130,7 +129,7 @@ function hasOnlyEnumerableOwnProperties(value) {
 	return Object.getOwnPropertyNames(value).every((key) => Object.prototype.propertyIsEnumerable.call(value, key));
 }
 function createJsonRemoveOp(path, value) {
-	return json1.type.writeCursor().writeAtPath(path, "r", value).get();
+	return JSON1.type.writeCursor().writeAtPath(path, "r", value).get();
 }
 function normalizeJsonDocument(value) {
 	if (value === void 0) return;
@@ -150,12 +149,26 @@ function appendJsonUpdateOps(ops, path, newValue, oldValue, hasOldValue) {
 	const hasNormalizedOldValue = hasOldValue && normalizedOldValue !== void 0;
 	if (hasNormalizedOldValue && isJsonValueEqual(normalizedOldValue, normalizedNewValue)) return;
 	if (hasNormalizedOldValue && isPlainObject(oldValue) && isPlainObject(newValue) && hasOnlyEnumerableOwnProperties(oldValue) && hasOnlyEnumerableOwnProperties(newValue)) {
-		(/* @__PURE__ */ new Set([...Object.keys(oldValue), ...Object.keys(newValue)])).forEach((key) => appendJsonUpdateOps(ops, [...path, key], newValue[key], oldValue[key], Object.prototype.hasOwnProperty.call(oldValue, key) && oldValue[key] !== void 0));
+		for (const key of /* @__PURE__ */ new Set([...Object.keys(oldValue), ...Object.keys(newValue)])) appendJsonUpdateOps(ops, [...path, key], newValue[key], oldValue[key], Object.prototype.hasOwnProperty.call(oldValue, key) && oldValue[key] !== void 0);
 		return;
 	}
-	const op = !hasNormalizedOldValue ? normalizedNewValue === void 0 ? null : json1.insertOp(path, normalizedNewValue) : normalizedNewValue === void 0 ? createJsonRemoveOp(path, normalizedOldValue) : json1.replaceOp(path, normalizedOldValue, normalizedNewValue);
+	const op = !hasNormalizedOldValue ? normalizedNewValue === void 0 ? null : JSON1.insertOp(path, normalizedNewValue) : normalizedNewValue === void 0 ? createJsonRemoveOp(path, normalizedOldValue) : JSON1.replaceOp(path, normalizedOldValue, normalizedNewValue);
 	if (op && isNonEmptyOp(op)) ops.push(op);
 }
+function assertSafeDrawingKeys(...keys) {
+	for (const key of keys) if (key === "__proto__" || key === "constructor" || key === "prototype") throw new Error("Invalid drawing key");
+}
+function getOwn(record, key) {
+	return record != null && Object.prototype.hasOwnProperty.call(record, key) ? record[key] : void 0;
+}
+function validateDrawingData(data) {
+	for (const subUnitId of Object.keys(data)) {
+		assertSafeDrawingKeys(subUnitId);
+		const subUnit = data[subUnitId];
+		if (subUnit === null || subUnit === void 0 ? void 0 : subUnit.data) Object.keys(subUnit.data).forEach((key) => assertSafeDrawingKeys(key));
+		if (subUnit === null || subUnit === void 0 ? void 0 : subUnit.order) subUnit.order.forEach((key) => assertSafeDrawingKeys(key));
+	}
+}
 /**
 * unitId -> subUnitId -> drawingId -> drawingParam
 */
@@ -226,10 +239,10 @@ var UnitDrawingService = class {
 		this.refreshTransformNotification(updateParams);
 	}
 	getDrawingDataForUnit(unitId) {
-		return this.drawingManagerData[unitId] || {};
+		return getOwn(this.drawingManagerData, unitId) || {};
 	}
 	removeDrawingDataForUnit(unitId) {
-		const subUnits = this.drawingManagerData[unitId];
+		const subUnits = getOwn(this.drawingManagerData, unitId);
 		if (subUnits == null) return;
 		delete this.drawingManagerData[unitId];
 		const drawings = [];
@@ -247,11 +260,13 @@ var UnitDrawingService = class {
 		if (drawings.length > 0) this.removeNotification(drawings);
 	}
 	registerDrawingData(unitId, data) {
+		assertSafeDrawingKeys(unitId);
+		validateDrawingData(data);
 		this.drawingManagerData[unitId] = data;
 	}
 	initializeNotification(unitId) {
 		const drawings = [];
-		const data = this.drawingManagerData[unitId];
+		const data = getOwn(this.drawingManagerData, unitId);
 		if (data == null) return;
 		Object.keys(data).forEach((subUnitId) => {
 			this._establishDrawingMap(unitId, subUnitId);
@@ -270,6 +285,9 @@ var UnitDrawingService = class {
 		return this._getDrawingData(unitId, subUnitId);
 	}
 	setDrawingData(unitId, subUnitId, data) {
+		assertSafeDrawingKeys(unitId, subUnitId);
+		Object.keys(data).forEach((key) => assertSafeDrawingKeys(key));
+		this._establishDrawingMap(unitId, subUnitId);
 		const unitData = this.drawingManagerData[unitId];
 		const subUnitData = unitData[subUnitId];
 		this._oldDrawingManagerData = {
@@ -295,8 +313,8 @@ var UnitDrawingService = class {
 			ops.push(op);
 			invertOps.push(invertOp);
 		});
-		const op = ops.reduce(json1.type.compose, null);
-		const invertOp = invertOps.reduce(json1.type.compose, null);
+		const op = ops.reduce(JSON1.type.compose, null);
+		const invertOp = invertOps.reduce(JSON1.type.compose, null);
 		const { unitId, subUnitId } = insertParams[0];
 		return {
 			undo: invertOp,
@@ -391,9 +409,9 @@ var UnitDrawingService = class {
 			ops.unshift(op);
 			invertOps.push(invertOp);
 		});
-		const op = ops.reduce(json1.type.compose, null);
+		const op = ops.reduce(JSON1.type.compose, null);
 		return {
-			undo: invertOps.reduce(json1.type.compose, null),
+			undo: invertOps.reduce(JSON1.type.compose, null),
 			redo: op,
 			unitId,
 			subUnitId,
@@ -425,8 +443,8 @@ var UnitDrawingService = class {
 				objects
 			};
 		}
-		const op = ops.reduce(json1.type.compose, null);
-		const invertOp = invertOps.reduce(json1.type.compose, null);
+		const op = ops.reduce(JSON1.type.compose, null);
+		const invertOp = invertOps.reduce(JSON1.type.compose, null);
 		const { unitId, subUnitId } = updateParams[0];
 		return {
 			undo: invertOp,
@@ -463,9 +481,9 @@ var UnitDrawingService = class {
 		groupParams.forEach((groupParam) => {
 			ops.push(this._getGroupDrawingOp(groupParam));
 		});
-		const op = ops.reduce(json1.type.compose, null);
+		const op = ops.reduce(JSON1.type.compose, null);
 		return {
-			undo: json1.type.invertWithDoc(op, this.drawingManagerData),
+			undo: JSON1.type.invertWithDoc(op, this.drawingManagerData),
 			redo: op,
 			unitId,
 			subUnitId,
@@ -478,9 +496,9 @@ var UnitDrawingService = class {
 		groupParams.forEach((groupParam) => {
 			ops.push(this._getUngroupDrawingOp(groupParam));
 		});
-		const op = ops.reduce(json1.type.compose, null);
+		const op = ops.reduce(JSON1.type.compose, null);
 		return {
-			undo: json1.type.invertWithDoc(op, this.drawingManagerData),
+			undo: JSON1.type.invertWithDoc(op, this.drawingManagerData),
 			redo: op,
 			unitId,
 			subUnitId,
@@ -545,7 +563,7 @@ var UnitDrawingService = class {
 		const { parent, children } = groupParam;
 		const { unitId: groupUnitId, subUnitId: groupSubUnitId, drawingId: groupDrawingId } = parent;
 		const ops = [];
-		ops.push(json1.insertOp([
+		ops.push(JSON1.insertOp([
 			groupUnitId,
 			groupSubUnitId,
 			"data",
@@ -567,13 +585,13 @@ var UnitDrawingService = class {
 			})));
 		});
 		if (maxChildIndex === Number.NEGATIVE_INFINITY) maxChildIndex = this._getDrawingOrder(groupUnitId, groupSubUnitId).length;
-		ops.push(json1.insertOp([
+		ops.push(JSON1.insertOp([
 			groupUnitId,
 			groupSubUnitId,
 			"order",
 			maxChildIndex
 		], groupDrawingId));
-		return ops.reduce(json1.type.compose, null);
+		return ops.reduce(JSON1.type.compose, null);
 	}
 	_getUngroupDrawingOp(groupParam) {
 		const { parent, children } = groupParam;
@@ -587,24 +605,41 @@ var UnitDrawingService = class {
 				drawingId
 			})));
 		});
-		ops.push(json1.removeOp([
+		ops.push(JSON1.removeOp([
 			groupUnitId,
 			groupSubUnitId,
 			"data",
 			groupDrawingId
 		], true));
-		ops.push(json1.removeOp([
+		ops.push(JSON1.removeOp([
 			groupUnitId,
 			groupSubUnitId,
 			"order",
 			this._getDrawingOrder(groupUnitId, groupSubUnitId).indexOf(groupDrawingId)
 		], true));
-		return ops.reduce(json1.type.compose, null);
+		return ops.reduce(JSON1.type.compose, null);
 	}
 	applyJson1(unitId, subUnitId, jsonOp) {
-		this._establishDrawingMap(unitId, subUnitId);
-		this._oldDrawingManagerData = { ...this.drawingManagerData };
-		this.drawingManagerData = json1.type.apply(this.drawingManagerData, jsonOp);
+		assertSafeDrawingKeys(unitId, subUnitId);
+		JSON1.type.checkValidOp(jsonOp);
+		const unitData = getOwn(this.drawingManagerData, unitId);
+		const data = {
+			...this.drawingManagerData,
+			[unitId]: {
+				...unitData,
+				[subUnitId]: getOwn(unitData, subUnitId) ?? {
+					data: {},
+					order: []
+				}
+			}
+		};
+		const nextData = JSON1.type.apply(data, jsonOp);
+		for (const id of Object.keys(nextData)) {
+			assertSafeDrawingKeys(id);
+			validateDrawingData(nextData[id]);
+		}
+		this._oldDrawingManagerData = this.drawingManagerData;
+		this.drawingManagerData = nextData;
 	}
 	featurePluginUpdateNotification(updateParams) {
 		this._featurePluginUpdate$.next(updateParams);
@@ -670,6 +705,9 @@ var UnitDrawingService = class {
 		return this._getDrawingOrder(unitId, subUnitId);
 	}
 	setDrawingOrder(unitId, subUnitId, order) {
+		assertSafeDrawingKeys(unitId, subUnitId);
+		order.forEach((key) => assertSafeDrawingKeys(key));
+		this._establishDrawingMap(unitId, subUnitId);
 		this.drawingManagerData[unitId][subUnitId].order = order;
 	}
 	orderUpdateNotification(orderParams) {
@@ -687,7 +725,7 @@ var UnitDrawingService = class {
 				drawingId
 			});
 			if (index === -1 || index === orders.length - 1) return;
-			const op = json1.moveOp([
+			const op = JSON1.moveOp([
 				unitId,
 				subUnitId,
 				"order",
@@ -701,9 +739,9 @@ var UnitDrawingService = class {
 			ops.push(op);
 			if (!newIds.includes(orders[index + 1])) newIds.push(orders[index + 1]);
 		});
-		const op = ops.reduce(json1.type.compose, null);
+		const op = ops.reduce(JSON1.type.compose, null);
 		return {
-			undo: json1.type.invertWithDoc(op, this.drawingManagerData),
+			undo: JSON1.type.invertWithDoc(op, this.drawingManagerData),
 			redo: op,
 			unitId,
 			subUnitId,
@@ -725,7 +763,7 @@ var UnitDrawingService = class {
 				drawingId
 			});
 			if (index === -1 || index === 0) return;
-			const op = json1.moveOp([
+			const op = JSON1.moveOp([
 				unitId,
 				subUnitId,
 				"order",
@@ -739,9 +777,9 @@ var UnitDrawingService = class {
 			ops.push(op);
 			if (!newIds.includes(orders[index - 1])) newIds.push(orders[index - 1]);
 		});
-		const op = ops.reduce(json1.type.compose, null);
+		const op = ops.reduce(JSON1.type.compose, null);
 		return {
-			undo: json1.type.invertWithDoc(op, this.drawingManagerData),
+			undo: JSON1.type.invertWithDoc(op, this.drawingManagerData),
 			redo: op,
 			unitId,
 			subUnitId,
@@ -760,7 +798,7 @@ var UnitDrawingService = class {
 		orderDrawingIds.forEach((orderDrawingId) => {
 			const { drawingId } = orderDrawingId;
 			const index = this._getDrawingCount(unitId, subUnitId) - 1;
-			const op = json1.moveOp([
+			const op = JSON1.moveOp([
 				unitId,
 				subUnitId,
 				"order",
@@ -774,9 +812,9 @@ var UnitDrawingService = class {
 			ops.push(op);
 			if (!newIds.includes(orders[index])) newIds.push(orders[index]);
 		});
-		const op = ops.reduce(json1.type.compose, null);
+		const op = ops.reduce(JSON1.type.compose, null);
 		return {
-			undo: json1.type.invertWithDoc(op, this.drawingManagerData),
+			undo: JSON1.type.invertWithDoc(op, this.drawingManagerData),
 			redo: op,
 			unitId,
 			subUnitId,
@@ -794,7 +832,7 @@ var UnitDrawingService = class {
 		const ops = [];
 		orderSearchParams.forEach((orderSearchParam) => {
 			const { drawingId } = orderSearchParam;
-			const op = json1.moveOp([
+			const op = JSON1.moveOp([
 				unitId,
 				subUnitId,
 				"order",
@@ -808,9 +846,9 @@ var UnitDrawingService = class {
 			ops.push(op);
 			if (!newIds.includes(orders[0])) newIds.push(orders[0]);
 		});
-		const op = ops.reduce(json1.type.compose, null);
+		const op = ops.reduce(JSON1.type.compose, null);
 		return {
-			undo: json1.type.invertWithDoc(op, this.drawingManagerData),
+			undo: JSON1.type.invertWithDoc(op, this.drawingManagerData),
 			redo: op,
 			unitId,
 			subUnitId,
@@ -828,7 +866,7 @@ var UnitDrawingService = class {
 		const currentIndex = orders.indexOf(drawingId);
 		const targetIndex = normalizeDrawingOrderIndex(zOrder, orders.length);
 		if (currentIndex < 0 || currentIndex === targetIndex) return null;
-		const op = json1.moveOp([
+		const op = JSON1.moveOp([
 			unitId,
 			subUnitId,
 			"order",
@@ -839,7 +877,7 @@ var UnitDrawingService = class {
 			"order",
 			targetIndex
 		]);
-		const invertOp = json1.type.invertWithDoc(op, this.drawingManagerData);
+		const invertOp = JSON1.type.invertWithDoc(op, this.drawingManagerData);
 		const affectedDrawingIds = orders.slice(Math.min(currentIndex, targetIndex), Math.max(currentIndex, targetIndex) + 1);
 		return {
 			undo: invertOp,
@@ -874,44 +912,45 @@ var UnitDrawingService = class {
 		return this._getDrawingOrder(unitId, subUnitId).indexOf(drawingId);
 	}
 	_getCurrentBySearch(searchParam) {
-		var _this$drawingManagerD;
+		var _getOwn;
 		if (searchParam == null) return;
 		const { unitId, subUnitId, drawingId } = searchParam;
-		return (_this$drawingManagerD = this.drawingManagerData[unitId]) === null || _this$drawingManagerD === void 0 || (_this$drawingManagerD = _this$drawingManagerD[subUnitId]) === null || _this$drawingManagerD === void 0 || (_this$drawingManagerD = _this$drawingManagerD.data) === null || _this$drawingManagerD === void 0 ? void 0 : _this$drawingManagerD[drawingId];
+		return getOwn((_getOwn = getOwn(getOwn(this.drawingManagerData, unitId), subUnitId)) === null || _getOwn === void 0 ? void 0 : _getOwn.data, drawingId);
 	}
 	_getOldBySearch(searchParam) {
-		var _this$_oldDrawingMana;
+		var _getOwn2;
 		if (searchParam == null) return;
 		const { unitId, subUnitId, drawingId } = searchParam;
-		return (_this$_oldDrawingMana = this._oldDrawingManagerData[unitId]) === null || _this$_oldDrawingMana === void 0 || (_this$_oldDrawingMana = _this$_oldDrawingMana[subUnitId]) === null || _this$_oldDrawingMana === void 0 || (_this$_oldDrawingMana = _this$_oldDrawingMana.data) === null || _this$_oldDrawingMana === void 0 ? void 0 : _this$_oldDrawingMana[drawingId];
+		return getOwn((_getOwn2 = getOwn(getOwn(this._oldDrawingManagerData, unitId), subUnitId)) === null || _getOwn2 === void 0 ? void 0 : _getOwn2.data, drawingId);
 	}
 	_establishDrawingMap(unitId, subUnitId, drawingId) {
-		var _this$drawingManagerD2;
-		if (!this.drawingManagerData[unitId]) this.drawingManagerData[unitId] = {};
-		if (!this.drawingManagerData[unitId][subUnitId]) this.drawingManagerData[unitId][subUnitId] = {
+		assertSafeDrawingKeys(unitId, subUnitId);
+		if (drawingId != null) assertSafeDrawingKeys(drawingId);
+		if (!getOwn(this.drawingManagerData, unitId)) this.drawingManagerData[unitId] = {};
+		if (!getOwn(this.drawingManagerData[unitId], subUnitId)) this.drawingManagerData[unitId][subUnitId] = {
 			data: {},
 			order: []
 		};
 		if (drawingId == null) return null;
-		return (_this$drawingManagerD2 = this.drawingManagerData[unitId][subUnitId].data) === null || _this$drawingManagerD2 === void 0 ? void 0 : _this$drawingManagerD2[drawingId];
+		return getOwn(this.drawingManagerData[unitId][subUnitId].data, drawingId);
 	}
 	_addByParam(insertParam) {
 		const { unitId, subUnitId, drawingId } = insertParam;
 		this._establishDrawingMap(unitId, subUnitId, drawingId);
-		const op = [json1.insertOp([
+		const op = [JSON1.insertOp([
 			unitId,
 			subUnitId,
 			"data",
 			drawingId
-		], insertParam), json1.insertOp([
+		], insertParam), JSON1.insertOp([
 			unitId,
 			subUnitId,
 			"order",
 			this._getDrawingOrder(unitId, subUnitId).length
-		], drawingId)].reduce(json1.type.compose, null);
+		], drawingId)].reduce(JSON1.type.compose, null);
 		return {
 			op,
-			invertOp: json1.type.invertWithDoc(op, this.drawingManagerData)
+			invertOp: JSON1.type.invertWithDoc(op, this.drawingManagerData)
 		};
 	}
 	_removeByParam(searchParam) {
@@ -924,20 +963,20 @@ var UnitDrawingService = class {
 			op: [],
 			invertOp: []
 		};
-		const op = [json1.removeOp([
+		const op = [JSON1.removeOp([
 			unitId,
 			subUnitId,
 			"data",
 			drawingId
-		], true), json1.removeOp([
+		], true), JSON1.removeOp([
 			unitId,
 			subUnitId,
 			"order",
 			this._getDrawingOrder(unitId, subUnitId).indexOf(drawingId)
-		], true)].reduce(json1.type.compose, null);
+		], true)].reduce(JSON1.type.compose, null);
 		return {
 			op,
-			invertOp: json1.type.invertWithDoc(op, this.drawingManagerData)
+			invertOp: JSON1.type.invertWithDoc(op, this.drawingManagerData)
 		};
 	}
 	_updateByParam(updateParam) {
@@ -952,10 +991,10 @@ var UnitDrawingService = class {
 			op: [],
 			invertOp: []
 		};
-		const op = ops.reduce(json1.type.compose, null);
+		const op = ops.reduce(JSON1.type.compose, null);
 		return {
 			op,
-			invertOp: json1.type.invert(op)
+			invertOp: JSON1.type.invert(op)
 		};
 	}
 	_getUpdateParamCompareOp(newParam, oldParam) {
@@ -976,12 +1015,12 @@ var UnitDrawingService = class {
 		return ops;
 	}
 	_getDrawingData(unitId, subUnitId) {
-		var _this$drawingManagerD3;
-		return ((_this$drawingManagerD3 = this.drawingManagerData[unitId]) === null || _this$drawingManagerD3 === void 0 || (_this$drawingManagerD3 = _this$drawingManagerD3[subUnitId]) === null || _this$drawingManagerD3 === void 0 ? void 0 : _this$drawingManagerD3.data) || {};
+		var _getOwn3;
+		return ((_getOwn3 = getOwn(getOwn(this.drawingManagerData, unitId), subUnitId)) === null || _getOwn3 === void 0 ? void 0 : _getOwn3.data) || {};
 	}
 	_getDrawingOrder(unitId, subUnitId) {
-		var _this$drawingManagerD4;
-		return ((_this$drawingManagerD4 = this.drawingManagerData[unitId]) === null || _this$drawingManagerD4 === void 0 || (_this$drawingManagerD4 = _this$drawingManagerD4[subUnitId]) === null || _this$drawingManagerD4 === void 0 ? void 0 : _this$drawingManagerD4.order) || [];
+		var _getOwn4;
+		return ((_getOwn4 = getOwn(getOwn(this.drawingManagerData, unitId), subUnitId)) === null || _getOwn4 === void 0 ? void 0 : _getOwn4.order) || [];
 	}
 	getDrawingVisible() {
 		return this._visible;
@@ -1102,7 +1141,7 @@ var URLImageService = class extends Disposable {
 };
 
 //#endregion
-//#region \0@oxc-project+runtime@0.140.0/helpers/esm/decorateParam.js
+//#region \0@oxc-project+runtime@0.149.0/helpers/esm/decorateParam.js
 function __decorateParam(paramIndex, decorator) {
 	return function(target, key) {
 		decorator(target, key, paramIndex);
@@ -1110,7 +1149,7 @@ function __decorateParam(paramIndex, decorator) {
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.140.0/helpers/esm/decorate.js
+//#region \0@oxc-project+runtime@0.149.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);
@@ -1220,6 +1259,8 @@ const DRAWING_GROUPABLE_TYPES = [
 	DrawingTypeEnum.DRAWING_IMAGE,
 	DrawingTypeEnum.DRAWING_SHAPE,
 	DrawingTypeEnum.DRAWING_CHART,
+	DrawingTypeEnum.DRAWING_SLICER,
+	DrawingTypeEnum.DRAWING_TIMELINE,
 	DrawingTypeEnum.DRAWING_GROUP
 ];
 function isGroupableDrawingType(type) {

package/lib/types/services/drawing-manager-impl.service.d.ts

@@ -16,9 +16,9 @@
 import type { IDrawingGroupNestedParam, IDrawingParam, IDrawingSearch, Nullable } from '@univerjs/core';
 import type { Observable } from 'rxjs';
 import type { IDrawingGroupUpdateParam, IDrawingMap, IDrawingMapItemData, IDrawingOrderMapParam, IDrawingOrderUpdateParam, IDrawingSubunitMap, IDrawingVisibleParam, IUnitDrawingService } from './drawing-manager.service';
-import * as json1 from 'ot-json1';
-type JSONOp = json1.JSONOp;
-type JSONOpList = json1.JSONOpList;
+import { JSON1 } from '@univerjs/core';
+type JSONOp = JSON1.JSONOp;
+type JSONOpList = JSON1.JSONOpList;
 export interface IDrawingJsonUndo1<TObjects = IDrawingSearch[] | IDrawingOrderMapParam | IDrawingGroupUpdateParam | IDrawingGroupUpdateParam[]> {
     undo: JSONOp;
     redo: JSONOp;

package/lib/types/utils/drawing-group.d.ts

@@ -15,5 +15,5 @@
  */
 import type { DrawingType } from '@univerjs/core';
 import { DrawingTypeEnum } from '@univerjs/core';
-export declare const DRAWING_GROUPABLE_TYPES: readonly [DrawingTypeEnum.DRAWING_IMAGE, DrawingTypeEnum.DRAWING_SHAPE, DrawingTypeEnum.DRAWING_CHART, DrawingTypeEnum.DRAWING_GROUP];
+export declare const DRAWING_GROUPABLE_TYPES: readonly [DrawingTypeEnum.DRAWING_IMAGE, DrawingTypeEnum.DRAWING_SHAPE, DrawingTypeEnum.DRAWING_CHART, DrawingTypeEnum.DRAWING_SLICER, DrawingTypeEnum.DRAWING_TIMELINE, DrawingTypeEnum.DRAWING_GROUP];
 export declare function isGroupableDrawingType(type: DrawingType): boolean;