@tmagic/editor 1.8.0-beta.3 → 1.8.0-beta.4

package/dist/es/layouts/workspace/viewer/ViewerMenu.vue_vue_type_script_setup_true_lang.js

@@ -36,11 +36,11 @@ var ViewerMenu_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ def
 				display: () => canCenter.value,
 				handler: () => {
 					if (!nodes.value) return;
-					editorService.alignCenter(nodes.value);
+					editorService.alignCenter(nodes.value, { historySource: "stage-contextmenu" });
 				}
 			},
 			useCopyMenu(),
-			usePasteMenu(menuRef),
+			usePasteMenu("stage-contextmenu", menuRef),
 			{
 				type: "divider",
 				direction: "horizontal",
@@ -55,7 +55,7 @@ var ViewerMenu_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ def
 				icon: markRaw(Top),
 				display: () => !isPage(node.value) && !isPageFragment(node.value) && !props.isMultiSelect,
 				handler: () => {
-					editorService.moveLayer(1);
+					editorService.moveLayer(1, { historySource: "stage-contextmenu" });
 				}
 			},
 			{
@@ -64,7 +64,7 @@ var ViewerMenu_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ def
 				icon: markRaw(Bottom),
 				display: () => !isPage(node.value) && !isPageFragment(node.value) && !props.isMultiSelect,
 				handler: () => {
-					editorService.moveLayer(-1);
+					editorService.moveLayer(-1, { historySource: "stage-contextmenu" });
 				}
 			},
 			{
@@ -73,7 +73,7 @@ var ViewerMenu_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ def
 				icon: markRaw(Top),
 				display: () => !isPage(node.value) && !isPageFragment(node.value) && !props.isMultiSelect,
 				handler: () => {
-					editorService.moveLayer(LayerOffset.TOP);
+					editorService.moveLayer(LayerOffset.TOP, { historySource: "stage-contextmenu" });
 				}
 			},
 			{
@@ -82,16 +82,16 @@ var ViewerMenu_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ def
 				icon: markRaw(Bottom),
 				display: () => !isPage(node.value) && !isPageFragment(node.value) && !props.isMultiSelect,
 				handler: () => {
-					editorService.moveLayer(LayerOffset.BOTTOM);
+					editorService.moveLayer(LayerOffset.BOTTOM, { historySource: "stage-contextmenu" });
 				}
 			},
-			useMoveToMenu(services),
+			useMoveToMenu(services, "stage-contextmenu"),
 			{
 				type: "divider",
 				direction: "horizontal",
 				display: () => !isPage(node.value) && !isPageFragment(node.value) && !props.isMultiSelect
 			},
-			useDeleteMenu(),
+			useDeleteMenu("stage-contextmenu"),
 			{
 				type: "divider",
 				direction: "horizontal"

package/dist/es/services/codeBlock.js

@@ -86,10 +86,12 @@ var CodeBlock = class extends BaseService {
 	* @param options.doNotPushHistory 是否不写入历史记录（默认 false）
 	* @returns {void}
 	*/
-	async setCodeDslById(id, codeConfig, { changeRecords, doNotPushHistory = false } = {}) {
+	async setCodeDslById(id, codeConfig, { changeRecords, doNotPushHistory = false, historyDescription, historySource } = {}) {
 		this.setCodeDslByIdSync(id, codeConfig, true, {
 			changeRecords,
-			doNotPushHistory
+			doNotPushHistory,
+			historyDescription,
+			historySource
 		});
 	}
 	/**
@@ -104,7 +106,7 @@ var CodeBlock = class extends BaseService {
 	* @param options.historyDescription 入栈时附带的人类可读描述，用于历史面板展示
 	* @returns {void}
 	*/
-	setCodeDslByIdSync(id, codeConfig, force = true, { changeRecords, doNotPushHistory = false, historyDescription } = {}) {
+	setCodeDslByIdSync(id, codeConfig, force = true, { changeRecords, doNotPushHistory = false, historyDescription, historySource } = {}) {
 		const codeDsl = this.getCodeDsl();
 		if (!codeDsl) throw new Error("dsl中没有codeBlocks");
 		if (codeDsl[id] && !force) return;
@@ -123,7 +125,8 @@ var CodeBlock = class extends BaseService {
 			oldContent,
 			newContent,
 			changeRecords,
-			historyDescription
+			historyDescription,
+			source: historySource
 		});
 		this.emit("addOrUpdate", id, codeDsl[id]);
 	}
@@ -204,7 +207,7 @@ var CodeBlock = class extends BaseService {
 	* @param options 可选配置
 	* @param options.doNotPushHistory 是否不写入历史记录（默认 false）
 	*/
-	async deleteCodeDslByIds(codeIds, { doNotPushHistory = false, historyDescription } = {}) {
+	async deleteCodeDslByIds(codeIds, { doNotPushHistory = false, historyDescription, historySource } = {}) {
 		const currentDsl = await this.getCodeDsl();
 		if (!currentDsl) return;
 		codeIds.forEach((id) => {
@@ -213,7 +216,8 @@ var CodeBlock = class extends BaseService {
 			if (oldContent && !doNotPushHistory) history_default.pushCodeBlock(id, {
 				oldContent,
 				newContent: null,
-				historyDescription
+				historyDescription,
+				source: historySource
 			});
 			this.emit("remove", id);
 		});
@@ -293,6 +297,7 @@ var CodeBlock = class extends BaseService {
 	async revert(id, index) {
 		const entry = history_default.getCodeBlockStepList(id)[index];
 		if (!entry?.applied) return null;
+		if (entry.step.oldContent && entry.step.newContent && !entry.step.changeRecords?.length) return null;
 		const description = `回滚 #${index + 1}: ${describeRevertCodeBlockStep(entry.step)}`;
 		return await this.applyRevertStep(entry.step, description);
 	}
@@ -363,11 +368,17 @@ var CodeBlock = class extends BaseService {
 	async applyRevertStep(step, historyDescription) {
 		const { id, oldContent, newContent, changeRecords } = step;
 		if (oldContent === null && newContent) {
-			await this.deleteCodeDslByIds([id], { historyDescription });
+			await this.deleteCodeDslByIds([id], {
+				historyDescription,
+				historySource: "rollback"
+			});
 			return history_default.getCodeBlockStepList(id).slice(-1)[0]?.step ?? null;
 		}
 		if (oldContent && newContent === null) {
-			this.setCodeDslByIdSync(id, cloneDeep$1(oldContent), true, { historyDescription });
+			this.setCodeDslByIdSync(id, cloneDeep$1(oldContent), true, {
+				historyDescription,
+				historySource: "rollback"
+			});
 			return history_default.getCodeBlockStepList(id).slice(-1)[0]?.step ?? null;
 		}
 		if (!oldContent || !newContent) return null;
@@ -386,11 +397,15 @@ var CodeBlock = class extends BaseService {
 			}
 			this.setCodeDslByIdSync(id, fallbackToFullReplace ? cloneDeep$1(oldContent) : patched, true, {
 				changeRecords,
-				historyDescription
+				historyDescription,
+				historySource: "rollback"
 			});
 			return history_default.getCodeBlockStepList(id).slice(-1)[0]?.step ?? null;
 		}
-		this.setCodeDslByIdSync(id, cloneDeep$1(oldContent), true, { historyDescription });
+		this.setCodeDslByIdSync(id, cloneDeep$1(oldContent), true, {
+			historyDescription,
+			historySource: "rollback"
+		});
 		return history_default.getCodeBlockStepList(id).slice(-1)[0]?.step ?? null;
 	}
 	/**

package/dist/es/services/dataSource.js

@@ -91,7 +91,7 @@ var DataSource = class extends BaseService {
 	* @param options.doNotPushHistory 是否不写入历史记录（默认 false）
 	* @param options.historyDescription 入栈时附带的人类可读描述，用于历史面板展示
 	*/
-	add(config, { doNotPushHistory = false, historyDescription } = {}) {
+	add(config, { doNotPushHistory = false, historyDescription, historySource } = {}) {
 		const newConfig = {
 			...config,
 			id: config.id && !this.getDataSourceById(config.id) ? config.id : this.createId()
@@ -100,7 +100,8 @@ var DataSource = class extends BaseService {
 		if (!doNotPushHistory) history_default.pushDataSource(newConfig.id, {
 			oldSchema: null,
 			newSchema: newConfig,
-			historyDescription
+			historyDescription,
+			source: historySource
 		});
 		this.emit("add", newConfig);
 		return newConfig;
@@ -113,7 +114,7 @@ var DataSource = class extends BaseService {
 	* @param data.doNotPushHistory 是否不写入历史记录（默认 false）
 	* @param data.historyDescription 入栈时附带的人类可读描述，用于历史面板展示
 	*/
-	update(config, { changeRecords = [], doNotPushHistory = false, historyDescription } = {}) {
+	update(config, { changeRecords = [], doNotPushHistory = false, historyDescription, historySource } = {}) {
 		const dataSources = this.get("dataSources");
 		const index = dataSources.findIndex((ds) => ds.id === config.id);
 		const oldConfig = dataSources[index];
@@ -123,7 +124,8 @@ var DataSource = class extends BaseService {
 			oldSchema: oldConfig ? cloneDeep$1(oldConfig) : null,
 			newSchema: newConfig,
 			changeRecords,
-			historyDescription
+			historyDescription,
+			source: historySource
 		});
 		this.emit("update", newConfig, {
 			oldConfig,
@@ -138,7 +140,7 @@ var DataSource = class extends BaseService {
 	* @param options.doNotPushHistory 是否不写入历史记录（默认 false）
 	* @param options.historyDescription 入栈时附带的人类可读描述，用于历史面板展示
 	*/
-	remove(id, { doNotPushHistory = false, historyDescription } = {}) {
+	remove(id, { doNotPushHistory = false, historyDescription, historySource } = {}) {
 		const dataSources = this.get("dataSources");
 		const index = dataSources.findIndex((ds) => ds.id === id);
 		const oldConfig = index !== -1 ? dataSources[index] : null;
@@ -146,7 +148,8 @@ var DataSource = class extends BaseService {
 		if (oldConfig && !doNotPushHistory) history_default.pushDataSource(id, {
 			oldSchema: cloneDeep$1(oldConfig),
 			newSchema: null,
-			historyDescription
+			historyDescription,
+			source: historySource
 		});
 		this.emit("remove", id);
 	}
@@ -218,6 +221,7 @@ var DataSource = class extends BaseService {
 	revert(id, index) {
 		const entry = history_default.getDataSourceStepList(id)[index];
 		if (!entry?.applied) return null;
+		if (entry.step.oldSchema && entry.step.newSchema && !entry.step.changeRecords?.length) return null;
 		const description = `回滚 #${index + 1}: ${describeRevertDataSourceStep(entry.step)}`;
 		return this.applyRevertStep(entry.step, description);
 	}
@@ -281,11 +285,17 @@ var DataSource = class extends BaseService {
 	applyRevertStep(step, historyDescription) {
 		const { id, oldSchema, newSchema, changeRecords } = step;
 		if (oldSchema === null && newSchema) {
-			this.remove(`${id}`, { historyDescription });
+			this.remove(`${id}`, {
+				historyDescription,
+				historySource: "rollback"
+			});
 			return history_default.getDataSourceStepList(id).slice(-1)[0]?.step ?? null;
 		}
 		if (oldSchema && newSchema === null) {
-			this.add(cloneDeep$1(oldSchema), { historyDescription });
+			this.add(cloneDeep$1(oldSchema), {
+				historyDescription,
+				historySource: "rollback"
+			});
 			return history_default.getDataSourceStepList(id).slice(-1)[0]?.step ?? null;
 		}
 		if (!oldSchema || !newSchema) return null;
@@ -304,11 +314,15 @@ var DataSource = class extends BaseService {
 			}
 			this.update(fallbackToFullReplace ? cloneDeep$1(oldSchema) : patched, {
 				changeRecords,
-				historyDescription
+				historyDescription,
+				historySource: "rollback"
 			});
 			return history_default.getDataSourceStepList(id).slice(-1)[0]?.step ?? null;
 		}
-		this.update(cloneDeep$1(oldSchema), { historyDescription });
+		this.update(cloneDeep$1(oldSchema), {
+			historyDescription,
+			historySource: "rollback"
+		});
 		return history_default.getDataSourceStepList(id).slice(-1)[0]?.step ?? null;
 	}
 	/**

package/dist/es/services/editor.js

@@ -269,7 +269,7 @@ var Editor = class extends BaseService {
 	* @param options.doNotPushHistory 是否不写入历史记录（默认 false）
 	* @returns 添加后的节点
 	*/
-	async add(addNode, parent, { doNotSelect = false, doNotSwitchPage = false, doNotPushHistory = false, historyDescription } = {}) {
+	async add(addNode, parent, { doNotSelect = false, doNotSwitchPage = false, doNotPushHistory = false, historyDescription, historySource } = {}) {
 		this.captureSelectionBeforeOp();
 		const stage = this.get("stage");
 		const addNodes = [];
@@ -303,16 +303,21 @@ var Editor = class extends BaseService {
 		if (!(isPage(newNodes[0]) || isPageFragment(newNodes[0]))) {
 			const pageForOp = this.getNodeInfo(newNodes[0].id, false).page;
 			if (!doNotPushHistory) this.pushOpHistory("add", {
-				nodes: newNodes.map((n) => cloneDeep$1(toRaw(n))),
-				parentId: (this.getParentById(newNodes[0].id, false) ?? this.get("root")).id,
-				indexMap: Object.fromEntries(newNodes.map((n) => {
-					const p = this.getParentById(n.id, false);
-					return [n.id, p ? getNodeIndex(n.id, p) : -1];
-				}))
-			}, {
-				name: pageForOp?.name || "",
-				id: pageForOp.id
-			}, historyDescription);
+				extra: {
+					nodes: newNodes.map((n) => cloneDeep$1(toRaw(n))),
+					parentId: (this.getParentById(newNodes[0].id, false) ?? this.get("root")).id,
+					indexMap: Object.fromEntries(newNodes.map((n) => {
+						const p = this.getParentById(n.id, false);
+						return [n.id, p ? getNodeIndex(n.id, p) : -1];
+					}))
+				},
+				pageData: {
+					name: pageForOp?.name || "",
+					id: pageForOp.id
+				},
+				historyDescription,
+				source: historySource
+			});
 			else this.selectionBeforeOp = null;
 		}
 		this.emit("add", newNodes);
@@ -379,7 +384,7 @@ var Editor = class extends BaseService {
 	* @param options.doNotSwitchPage 删除后是否不切换当前页面（默认 false；删除页面 / 页面片段时为 true 会跳过自动切换到首个剩余页面）
 	* @param options.doNotPushHistory 是否不写入历史记录（默认 false）
 	*/
-	async remove(nodeOrNodeList, { doNotSelect = false, doNotSwitchPage = false, doNotPushHistory = false, historyDescription } = {}) {
+	async remove(nodeOrNodeList, { doNotSelect = false, doNotSwitchPage = false, doNotPushHistory = false, historyDescription, historySource } = {}) {
 		this.captureSelectionBeforeOp();
 		const nodes = Array.isArray(nodeOrNodeList) ? nodeOrNodeList : [nodeOrNodeList];
 		const removedItems = [];
@@ -403,7 +408,12 @@ var Editor = class extends BaseService {
 			doNotSelect,
 			doNotSwitchPage
 		})));
-		if (removedItems.length > 0 && pageForOp) if (!doNotPushHistory) this.pushOpHistory("remove", { removedItems }, pageForOp, historyDescription);
+		if (removedItems.length > 0 && pageForOp) if (!doNotPushHistory) this.pushOpHistory("remove", {
+			extra: { removedItems },
+			pageData: pageForOp,
+			historyDescription,
+			source: historySource
+		});
 		else this.selectionBeforeOp = null;
 		this.emit("remove", nodes);
 	}
@@ -464,7 +474,7 @@ var Editor = class extends BaseService {
 	*/
 	async update(config, data = {}) {
 		this.captureSelectionBeforeOp();
-		const { doNotPushHistory = false, changeRecordList, changeRecords, historyDescription } = data;
+		const { doNotPushHistory = false, changeRecordList, changeRecords, historyDescription, historySource } = data;
 		const nodes = Array.isArray(config) ? config : [config];
 		const updateData = await Promise.all(nodes.map((node, index) => {
 			const recordsForNode = changeRecordList ? changeRecordList[index] ?? [] : changeRecords ?? [];
@@ -473,14 +483,19 @@ var Editor = class extends BaseService {
 		if (updateData[0].oldNode?.type !== NodeType.ROOT) {
 			if (this.get("nodes").length) if (!doNotPushHistory) {
 				const pageForOp = this.getNodeInfo(nodes[0].id, false).page;
-				this.pushOpHistory("update", { updatedItems: updateData.map((d) => ({
-					oldNode: cloneDeep$1(d.oldNode),
-					newNode: cloneDeep$1(toRaw(d.newNode)),
-					changeRecords: d.changeRecords?.length ? cloneDeep$1(d.changeRecords) : void 0
-				})) }, {
-					name: pageForOp?.name || "",
-					id: pageForOp.id
-				}, historyDescription);
+				this.pushOpHistory("update", {
+					extra: { updatedItems: updateData.map((d) => ({
+						oldNode: cloneDeep$1(d.oldNode),
+						newNode: cloneDeep$1(toRaw(d.newNode)),
+						changeRecords: d.changeRecords?.length ? cloneDeep$1(d.changeRecords) : void 0
+					})) },
+					pageData: {
+						name: pageForOp?.name || "",
+						id: pageForOp.id
+					},
+					historyDescription,
+					source: historySource
+				});
 			} else this.selectionBeforeOp = null;
 		}
 		this.emit("update", updateData);
@@ -496,7 +511,7 @@ var Editor = class extends BaseService {
 	* @param options.doNotPushHistory 是否不写入历史记录（默认 false）
 	* @returns void
 	*/
-	async sort(id1, id2, { doNotSelect = false, doNotPushHistory = false } = {}) {
+	async sort(id1, id2, { doNotSelect = false, doNotPushHistory = false, historySource } = {}) {
 		this.captureSelectionBeforeOp();
 		const root = this.get("root");
 		if (!root) throw new Error("root为空");
@@ -508,7 +523,10 @@ var Editor = class extends BaseService {
 		if (index2 < 0) return;
 		const index1 = parent.items.findIndex((node) => `${node.id}` === `${id1}`);
 		parent.items.splice(index2, 0, ...parent.items.splice(index1, 1));
-		await this.update(parent, { doNotPushHistory });
+		await this.update(parent, {
+			doNotPushHistory,
+			historySource
+		});
 		if (!doNotSelect) await this.select(node);
 		this.get("stage")?.update({
 			config: cloneDeep$1(node),
@@ -544,7 +562,7 @@ var Editor = class extends BaseService {
 	* @param options.doNotPushHistory 是否不写入历史记录（默认 false）
 	* @returns 添加后的组件节点配置
 	*/
-	async paste(position = {}, collectorOptions, { doNotSelect = false, doNotSwitchPage = false, doNotPushHistory = false } = {}) {
+	async paste(position = {}, collectorOptions, { doNotSelect = false, doNotSwitchPage = false, doNotPushHistory = false, historyDescription, historySource } = {}) {
 		const config = storage_default.getItem(COPY_STORAGE_KEY);
 		if (!Array.isArray(config)) return;
 		const node = this.get("node");
@@ -558,7 +576,9 @@ var Editor = class extends BaseService {
 		return this.add(pasteConfigs, parent, {
 			doNotSelect,
 			doNotSwitchPage,
-			doNotPushHistory
+			doNotPushHistory,
+			historyDescription,
+			historySource
 		});
 	}
 	async doPaste(config, position = {}) {
@@ -586,11 +606,15 @@ var Editor = class extends BaseService {
 	* @param options.doNotPushHistory 是否不写入历史记录（默认 false）
 	* @returns 当前组件节点配置
 	*/
-	async alignCenter(config, { doNotSelect = false, doNotPushHistory = false } = {}) {
+	async alignCenter(config, { doNotSelect = false, doNotPushHistory = false, historyDescription, historySource } = {}) {
 		const nodes = Array.isArray(config) ? config : [config];
 		const stage = this.get("stage");
 		const newNodes = await Promise.all(nodes.map((node) => this.doAlignCenter(node)));
-		const newNode = await this.update(newNodes, { doNotPushHistory });
+		const newNode = await this.update(newNodes, {
+			doNotPushHistory,
+			historyDescription,
+			historySource
+		});
 		if (!doNotSelect) if (newNodes.length > 1) await stage?.multiSelect(newNodes.map((node) => node.id));
 		else await stage?.select(newNodes[0].id);
 		return newNode;
@@ -601,7 +625,7 @@ var Editor = class extends BaseService {
 	* @param options 可选配置
 	* @param options.doNotPushHistory 是否不写入历史记录（默认 false）
 	*/
-	async moveLayer(offset, { doNotPushHistory = false } = {}) {
+	async moveLayer(offset, { doNotPushHistory = false, historyDescription, historySource } = {}) {
 		this.captureSelectionBeforeOp();
 		const root = this.get("root");
 		if (!root) throw new Error("root为空");
@@ -626,12 +650,17 @@ var Editor = class extends BaseService {
 		this.addModifiedNodeId(parent.id);
 		if (!doNotPushHistory) {
 			const pageForOp = this.getNodeInfo(node.id, false).page;
-			this.pushOpHistory("update", { updatedItems: [{
-				oldNode: oldParent,
-				newNode: cloneDeep$1(toRaw(parent))
-			}] }, {
-				name: pageForOp?.name || "",
-				id: pageForOp.id
+			this.pushOpHistory("update", {
+				extra: { updatedItems: [{
+					oldNode: oldParent,
+					newNode: cloneDeep$1(toRaw(parent))
+				}] },
+				pageData: {
+					name: pageForOp?.name || "",
+					id: pageForOp.id
+				},
+				historyDescription,
+				source: historySource
 			});
 		} else this.selectionBeforeOp = null;
 		this.emit("move-layer", offset);
@@ -650,7 +679,7 @@ var Editor = class extends BaseService {
 	* @param options.doNotSwitchPage 移动后是否不切换当前页面（默认 false；目标容器位于其它页面时为 true 会跳过自动选中以避免页面切换）
 	* @param options.doNotPushHistory 是否不写入历史记录（默认 false）
 	*/
-	async moveToContainer(config, targetId, { doNotSelect = false, doNotSwitchPage = false, doNotPushHistory = false } = {}) {
+	async moveToContainer(config, targetId, { doNotSelect = false, doNotSwitchPage = false, doNotPushHistory = false, historyDescription, historySource } = {}) {
 		const isBatch = Array.isArray(config);
 		const configs = (isBatch ? config : [config]).filter((item) => !(isPage(item) || isPageFragment(item)));
 		if (configs.length === 0) throw new Error("没有可移动的节点");
@@ -698,11 +727,16 @@ var Editor = class extends BaseService {
 				name: "",
 				id: target.id
 			};
-			this.pushOpHistory("update", { updatedItems }, historyPage);
+			this.pushOpHistory("update", {
+				extra: { updatedItems },
+				pageData: historyPage,
+				historyDescription,
+				source: historySource
+			});
 		} else this.selectionBeforeOp = null;
 		return isBatch ? newConfigs : newConfigs[0];
 	}
-	async dragTo(config, targetParent, targetIndex, { doNotPushHistory = false } = {}) {
+	async dragTo(config, targetParent, targetIndex, { doNotPushHistory = false, historyDescription, historySource } = {}) {
 		this.captureSelectionBeforeOp();
 		if (!targetParent || !Array.isArray(targetParent.items)) return;
 		const configs = Array.isArray(config) ? config : [config];
@@ -744,9 +778,14 @@ var Editor = class extends BaseService {
 		}
 		if (!doNotPushHistory) {
 			const pageForOp = this.getNodeInfo(configs[0].id, false).page;
-			this.pushOpHistory("update", { updatedItems }, {
-				name: pageForOp?.name || "",
-				id: pageForOp.id
+			this.pushOpHistory("update", {
+				extra: { updatedItems },
+				pageData: {
+					name: pageForOp?.name || "",
+					id: pageForOp.id
+				},
+				historyDescription,
+				source: historySource
 			});
 		} else this.selectionBeforeOp = null;
 		this.emit("drag-to", {
@@ -794,6 +833,10 @@ var Editor = class extends BaseService {
 		if (!entry?.applied) return null;
 		const { step } = entry;
 		if (!this.get("root")) return null;
+		if (step.opType === "update") {
+			const items = step.updatedItems ?? [];
+			if (!items.length || !items.every((item) => item.changeRecords?.length)) return null;
+		}
 		let revertedStep = null;
 		const captureRevert = (s) => {
 			revertedStep = s;
@@ -803,7 +846,8 @@ var Editor = class extends BaseService {
 		const opts = {
 			doNotSelect: true,
 			doNotSwitchPage: true,
-			historyDescription
+			historyDescription,
+			historySource: "rollback"
 		};
 		try {
 			switch (step.opType) {
@@ -839,7 +883,10 @@ var Editor = class extends BaseService {
 						}
 						return cloneDeep$1(oldNode);
 					});
-					if (configs.length) await this.update(configs, { historyDescription });
+					if (configs.length) await this.update(configs, {
+						historyDescription,
+						historySource: "rollback"
+					});
 					break;
 				}
 			}
@@ -873,7 +920,7 @@ var Editor = class extends BaseService {
 		}
 		return cursor;
 	}
-	async move(left, top, { doNotPushHistory = false } = {}) {
+	async move(left, top, { doNotPushHistory = false, historyDescription, historySource } = {}) {
 		const node = toRaw(this.get("node"));
 		if (!node || isPage(node)) return;
 		const newStyle = calcMoveStyle(node.style || {}, left, top);
@@ -882,7 +929,11 @@ var Editor = class extends BaseService {
 			id: node.id,
 			type: node.type,
 			style: newStyle
-		}, { doNotPushHistory });
+		}, {
+			doNotPushHistory,
+			historyDescription,
+			historySource
+		});
 	}
 	resetState() {
 		this.set("root", null);
@@ -922,7 +973,7 @@ var Editor = class extends BaseService {
 		if (this.selectionBeforeOp) return;
 		this.selectionBeforeOp = this.get("nodes").map((n) => n.id);
 	}
-	pushOpHistory(opType, extra, pageData, historyDescription) {
+	pushOpHistory(opType, { extra, pageData, historyDescription, source }) {
 		const step = {
 			data: pageData,
 			opType,
@@ -932,6 +983,7 @@ var Editor = class extends BaseService {
 			...extra
 		};
 		if (historyDescription) step.historyDescription = historyDescription;
+		if (source) step.source = source;
 		history_default.push(step, pageData.id);
 		this.selectionBeforeOp = null;
 	}

package/dist/es/services/history.js

@@ -236,6 +236,7 @@ var history_default = new class History extends BaseService {
 			newContent: payload.newContent ? cloneDeep(payload.newContent) : null,
 			changeRecords: payload.changeRecords?.length ? cloneDeep(payload.changeRecords) : void 0,
 			historyDescription: payload.historyDescription,
+			source: payload.source,
 			timestamp: Date.now()
 		};
 		this.getCodeBlockUndoRedo(codeBlockId).pushElement(step);
@@ -254,6 +255,7 @@ var history_default = new class History extends BaseService {
 			newSchema: payload.newSchema ? cloneDeep(payload.newSchema) : null,
 			changeRecords: payload.changeRecords?.length ? cloneDeep(payload.changeRecords) : void 0,
 			historyDescription: payload.historyDescription,
+			source: payload.source,
 			timestamp: Date.now()
 		};
 		this.getDataSourceUndoRedo(dataSourceId).pushElement(step);

package/dist/es/services/keybinding.js

@@ -13,7 +13,7 @@ var Keybinding = class extends BaseService {
 		[KeyBindingCommand.DELETE_NODE]: () => {
 			const nodes = editor_default.get("nodes");
 			if (!nodes || isPage(nodes[0]) || isPageFragment(nodes[0])) return;
-			editor_default.remove(nodes);
+			editor_default.remove(nodes, { historySource: "shortcut" });
 		},
 		[KeyBindingCommand.COPY_NODE]: () => {
 			const nodes = editor_default.get("nodes");
@@ -23,13 +23,13 @@ var Keybinding = class extends BaseService {
 			const nodes = editor_default.get("nodes");
 			if (!nodes || isPage(nodes[0]) || isPageFragment(nodes[0])) return;
 			editor_default.copy(nodes);
-			editor_default.remove(nodes);
+			editor_default.remove(nodes, { historySource: "shortcut" });
 		},
 		[KeyBindingCommand.PASTE_NODE]: () => {
 			editor_default.get("nodes") && editor_default.paste({
 				offsetX: 10,
 				offsetY: 10
-			});
+			}, void 0, { historySource: "shortcut" });
 		},
 		[KeyBindingCommand.UNDO]: () => {
 			editor_default.undo();

package/dist/es/style.css

@@ -592,7 +592,7 @@ fieldset.m-fieldset .m-form-tip {
   position: absolute;
   top: 4px;
   right: 4px;
-  z-index: 1;
+  z-index: 2;
   display: flex;
   align-items: center;
   height: 40px;
@@ -804,6 +804,18 @@ fieldset.m-fieldset .m-form-tip {
   text-overflow: ellipsis;
   white-space: nowrap;
 }
+.m-editor-history-list-popover .m-editor-history-list-item-source {
+  flex: 0 0 auto;
+  padding: 0 6px;
+  border: 1px solid #dcdfe6;
+  border-radius: 8px;
+  font-size: 10px;
+  line-height: 14px;
+  color: #909399;
+  background-color: #f4f4f5;
+  white-space: nowrap;
+  font-weight: 400;
+}
 .m-editor-history-list-popover .m-editor-history-list-item-merge {
   flex: 0 0 auto;
   padding: 0 8px;
@@ -1452,7 +1464,7 @@ fieldset.m-fieldset .m-form-tip {
   position: absolute;
   right: 15px;
   bottom: 15px;
-  z-index: 30;
+  z-index: 32;
   opacity: 0.5;
 }
 .m-editor-props-panel .m-editor-props-panel-src-icon:hover {
@@ -1462,7 +1474,7 @@ fieldset.m-fieldset .m-form-tip {
   position: absolute;
   right: 15px;
   bottom: 60px;
-  z-index: 30;
+  z-index: 31;
   opacity: 0.5;
 }
 .m-editor-props-panel .m-editor-props-panel-style-icon:hover {
@@ -1472,7 +1484,7 @@ fieldset.m-fieldset .m-form-tip {
   position: absolute;
   left: 0;
   top: 0;
-  z-index: 10;
+  z-index: 31;
 }
 .m-editor-props-panel .m-editor-resizer {
   position: absolute;