npm - @tmagic/editor - Versions diffs - 1.8.0-beta.2 → 1.8.0-beta.4 - Mend

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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (84) hide show

package/dist/tmagic-editor.umd.cjs CHANGED Viewed

@@ -4331,12 +4331,15 @@
 			await (0, vue.nextTick)();
 			codeBlockEditorRef.value?.show();
 		};
-		const deleteCode = async (key) => {
-			codeBlockService.deleteCodeDslByIds([key]);
+		const deleteCode = async (key, { historySource } = {}) => {
+			codeBlockService.deleteCodeDslByIds([key], { historySource });
 		};
 		const submitCodeBlockHandler = async (values, eventData) => {
 			if (!codeId.value) return;
-			await codeBlockService.setCodeDslById(codeId.value, values, { changeRecords: eventData?.changeRecords });
+			await codeBlockService.setCodeDslById(codeId.value, values, {
+				changeRecords: eventData?.changeRecords,
+				historySource: "props"
+			});
 			codeBlockEditorRef.value?.hide();
 		};
 		return {
@@ -5191,6 +5194,7 @@
 		push(state, pageId) {
 			const undoRedo = this.getUndoRedo(pageId);
 			if (!undoRedo) return null;
+			if (state.timestamp === void 0) state.timestamp = Date.now();
 			undoRedo.pushElement(state);
 			if (pageId === void 0 || `${pageId}` === `${this.state.pageId}`) this.emit("change", state);
 			return state;
@@ -5211,7 +5215,9 @@
 				oldContent: payload.oldContent ? cloneDeep$1(payload.oldContent) : null,
 				newContent: payload.newContent ? cloneDeep$1(payload.newContent) : null,
 				changeRecords: payload.changeRecords?.length ? cloneDeep$1(payload.changeRecords) : void 0,
-				historyDescription: payload.historyDescription
+				historyDescription: payload.historyDescription,
+				source: payload.source,
+				timestamp: Date.now()
 			};
 			this.getCodeBlockUndoRedo(codeBlockId).pushElement(step);
 			this.emit("code-block-history-change", codeBlockId, step);
@@ -5228,7 +5234,9 @@
 				oldSchema: payload.oldSchema ? cloneDeep$1(payload.oldSchema) : null,
 				newSchema: payload.newSchema ? cloneDeep$1(payload.newSchema) : null,
 				changeRecords: payload.changeRecords?.length ? cloneDeep$1(payload.changeRecords) : void 0,
-				historyDescription: payload.historyDescription
+				historyDescription: payload.historyDescription,
+				source: payload.source,
+				timestamp: Date.now()
 			};
 			this.getDataSourceUndoRedo(dataSourceId).pushElement(step);
 			this.emit("data-source-history-change", dataSourceId, step);
@@ -6327,7 +6335,7 @@
 		* @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 = [];
@@ -6361,16 +6369,21 @@
 			if (!((0, _tmagic_utils.isPage)(newNodes[0]) || (0, _tmagic_utils.isPageFragment)(newNodes[0]))) {
 				const pageForOp = this.getNodeInfo(newNodes[0].id, false).page;
 				if (!doNotPushHistory) this.pushOpHistory("add", {
-					nodes: newNodes.map((n) => cloneDeep$1((0, vue.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((0, vue.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);
@@ -6437,7 +6450,7 @@
 		* @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 = [];
@@ -6461,7 +6474,12 @@
 				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);
 		}
@@ -6522,7 +6540,7 @@
 		*/
 		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 ?? [];
@@ -6531,14 +6549,19 @@
 			if (updateData[0].oldNode?.type !== _tmagic_core.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((0, vue.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((0, vue.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);
@@ -6554,7 +6577,7 @@
 		* @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为空");
@@ -6566,7 +6589,10 @@
 			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),
@@ -6602,7 +6628,7 @@
 		* @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");
@@ -6616,7 +6642,9 @@
 			return this.add(pasteConfigs, parent, {
 				doNotSelect,
 				doNotSwitchPage,
-				doNotPushHistory
+				doNotPushHistory,
+				historyDescription,
+				historySource
 			});
 		}
 		async doPaste(config, position = {}) {
@@ -6644,11 +6672,15 @@
 		* @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;
@@ -6659,7 +6691,7 @@
 		* @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为空");
@@ -6684,12 +6716,17 @@
 			this.addModifiedNodeId(parent.id);
 			if (!doNotPushHistory) {
 				const pageForOp = this.getNodeInfo(node.id, false).page;
-				this.pushOpHistory("update", { updatedItems: [{
-					oldNode: oldParent,
-					newNode: cloneDeep$1((0, vue.toRaw)(parent))
-				}] }, {
-					name: pageForOp?.name || "",
-					id: pageForOp.id
+				this.pushOpHistory("update", {
+					extra: { updatedItems: [{
+						oldNode: oldParent,
+						newNode: cloneDeep$1((0, vue.toRaw)(parent))
+					}] },
+					pageData: {
+						name: pageForOp?.name || "",
+						id: pageForOp.id
+					},
+					historyDescription,
+					source: historySource
 				});
 			} else this.selectionBeforeOp = null;
 			this.emit("move-layer", offset);
@@ -6708,7 +6745,7 @@
 		* @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) => !((0, _tmagic_utils.isPage)(item) || (0, _tmagic_utils.isPageFragment)(item)));
 			if (configs.length === 0) throw new Error("没有可移动的节点");
@@ -6756,11 +6793,16 @@
 					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];
@@ -6802,9 +6844,14 @@
 			}
 			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", {
@@ -6852,6 +6899,10 @@
 			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;
@@ -6861,7 +6912,8 @@
 			const opts = {
 				doNotSelect: true,
 				doNotSwitchPage: true,
-				historyDescription
+				historyDescription,
+				historySource: "rollback"
 			};
 			try {
 				switch (step.opType) {
@@ -6897,7 +6949,10 @@
 							}
 							return cloneDeep$1(oldNode);
 						});
-						if (configs.length) await this.update(configs, { historyDescription });
+						if (configs.length) await this.update(configs, {
+							historyDescription,
+							historySource: "rollback"
+						});
 						break;
 					}
 				}
@@ -6931,7 +6986,7 @@
 			}
 			return cursor;
 		}
-		async move(left, top, { doNotPushHistory = false } = {}) {
+		async move(left, top, { doNotPushHistory = false, historyDescription, historySource } = {}) {
 			const node = (0, vue.toRaw)(this.get("node"));
 			if (!node || (0, _tmagic_utils.isPage)(node)) return;
 			const newStyle = calcMoveStyle(node.style || {}, left, top);
@@ -6940,7 +6995,11 @@
 				id: node.id,
 				type: node.type,
 				style: newStyle
-			}, { doNotPushHistory });
+			}, {
+				doNotPushHistory,
+				historyDescription,
+				historySource
+			});
 		}
 		resetState() {
 			this.set("root", null);
@@ -6980,7 +7039,7 @@
 			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,
@@ -6990,6 +7049,7 @@
 				...extra
 			};
 			if (historyDescription) step.historyDescription = historyDescription;
+			if (source) step.source = source;
 			history_default.push(step, pageData.id);
 			this.selectionBeforeOp = null;
 		}
@@ -7258,7 +7318,8 @@
 			guidesOptions: stageOptions.guidesOptions,
 			disabledMultiSelect: stageOptions.disabledMultiSelect,
 			alwaysMultiSelect: stageOptions.alwaysMultiSelect,
-			disabledRule: stageOptions.disabledRule
+			disabledRule: stageOptions.disabledRule,
+			disabledFlashTip: stageOptions.disabledFlashTip
 		});
 		(0, vue.watch)(() => editor_default.get("disabledMultiSelect"), (disabledMultiSelect) => {
 			if (disabledMultiSelect) stage.disableMultiSelect();
@@ -7315,14 +7376,17 @@
 				changeRecordList.push(buildChangeRecords(style, "style"));
 			});
 			if (configs.length === 0) return;
-			editor_default.update(configs, { changeRecordList });
+			editor_default.update(configs, {
+				changeRecordList,
+				historySource: "stage"
+			});
 		});
 		stage.on("sort", (ev) => {
-			editor_default.sort(ev.src, ev.dist);
+			editor_default.sort(ev.src, ev.dist, { historySource: "stage" });
 		});
 		stage.on("remove", (ev) => {
 			const nodes = ev.data.map(({ el }) => editor_default.getNodeById((0, _tmagic_utils.getIdFromEl)()(el) || ""));
-			editor_default.remove(nodes.filter((node) => Boolean(node)));
+			editor_default.remove(nodes.filter((node) => Boolean(node)), { historySource: "stage" });
 		});
 		stage.on("select-parent", () => {
 			const parent = editor_default.get("parent");
@@ -8355,7 +8419,7 @@
 	var SplitView_default = SplitView_vue_vue_type_script_setup_true_lang_default;
 	//#endregion
 	//#region packages/editor/src/components/Icon.vue?vue&type=script&setup=true&lang.ts
-	var _hoisted_1$72 = ["src"];
+	var _hoisted_1$71 = ["src"];
 	var Icon_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ (0, vue.defineComponent)({
 		name: "MEditorIcon",
 		__name: "Icon",
@@ -8373,7 +8437,7 @@
 					key: 1,
 					class: "magic-editor-icon"
 				}, {
-					default: (0, vue.withCtx)(() => [(0, vue.createElementVNode)("img", { src: __props.icon }, null, 8, _hoisted_1$72)]),
+					default: (0, vue.withCtx)(() => [(0, vue.createElementVNode)("img", { src: __props.icon }, null, 8, _hoisted_1$71)]),
 					_: 1
 				})) : typeof __props.icon === "string" ? ((0, vue.openBlock)(), (0, vue.createElementBlock)("i", {
 					key: 2,
@@ -8393,11 +8457,11 @@
 	var Icon_default = Icon_vue_vue_type_script_setup_true_lang_default;
 	//#endregion
 	//#region packages/editor/src/components/ToolButton.vue?vue&type=script&setup=true&lang.ts
-	var _hoisted_1$71 = {
+	var _hoisted_1$70 = {
 		key: 1,
 		class: "menu-item-text"
 	};
-	var _hoisted_2$29 = { class: "el-dropdown-link menubar-menu-button" };
+	var _hoisted_2$28 = { class: "el-dropdown-link menubar-menu-button" };
 	var ToolButton_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ (0, vue.defineComponent)({
 		name: "MEditorToolButton",
 		__name: "ToolButton",
@@ -8456,7 +8520,7 @@
 				}, [__props.data.type === "divider" ? ((0, vue.openBlock)(), (0, vue.createBlock)((0, vue.unref)(_tmagic_design.TMagicDivider), {
 					key: 0,
 					direction: __props.data.direction || "vertical"
-				}, null, 8, ["direction"])) : __props.data.type === "text" ? ((0, vue.openBlock)(), (0, vue.createElementBlock)("div", _hoisted_1$71, (0, vue.toDisplayString)(__props.data.text), 1)) : __props.data.type === "button" ? ((0, vue.openBlock)(), (0, vue.createElementBlock)(vue.Fragment, { key: 2 }, [__props.data.tooltip ? ((0, vue.openBlock)(), (0, vue.createBlock)((0, vue.unref)(_tmagic_design.TMagicTooltip), {
+				}, null, 8, ["direction"])) : __props.data.type === "text" ? ((0, vue.openBlock)(), (0, vue.createElementBlock)("div", _hoisted_1$70, (0, vue.toDisplayString)(__props.data.text), 1)) : __props.data.type === "button" ? ((0, vue.openBlock)(), (0, vue.createElementBlock)(vue.Fragment, { key: 2 }, [__props.data.tooltip ? ((0, vue.openBlock)(), (0, vue.createBlock)((0, vue.unref)(_tmagic_design.TMagicTooltip), {
 					key: 0,
 					effect: "dark",
 					placement: "bottom-start",
@@ -8511,7 +8575,7 @@
 						}), 128))]),
 						_: 1
 					})) : (0, vue.createCommentVNode)("v-if", true)]),
-					default: (0, vue.withCtx)(() => [(0, vue.createElementVNode)("span", _hoisted_2$29, [(0, vue.createTextVNode)((0, vue.toDisplayString)(__props.data.text), 1), (0, vue.createVNode)((0, vue.unref)(_tmagic_design.TMagicIcon), { class: "el-icon--right" }, {
+					default: (0, vue.withCtx)(() => [(0, vue.createElementVNode)("span", _hoisted_2$28, [(0, vue.createTextVNode)((0, vue.toDisplayString)(__props.data.text), 1), (0, vue.createVNode)((0, vue.unref)(_tmagic_design.TMagicIcon), { class: "el-icon--right" }, {
 						default: (0, vue.withCtx)(() => [(0, vue.createVNode)((0, vue.unref)(_element_plus_icons_vue.ArrowDown))]),
 						_: 1
 					})])]),
@@ -8525,12 +8589,12 @@
 	var ToolButton_default = ToolButton_vue_vue_type_script_setup_true_lang_default;
 	//#endregion
 	//#region packages/editor/src/layouts/page-bar/AddButton.vue?vue&type=script&setup=true&lang.ts
-	var _hoisted_1$70 = {
+	var _hoisted_1$69 = {
 		key: 0,
 		id: "m-editor-page-bar-add-icon",
 		class: "m-editor-page-bar-item m-editor-page-bar-item-icon"
 	};
-	var _hoisted_2$28 = {
+	var _hoisted_2$27 = {
 		key: 1,
 		style: { "width": "21px" }
 	};
@@ -8551,7 +8615,7 @@
 				editorService.add(pageConfig);
 			};
 			return (_ctx, _cache) => {
-				return showAddPageButton.value ? ((0, vue.openBlock)(), (0, vue.createElementBlock)("div", _hoisted_1$70, [(0, vue.createVNode)((0, vue.unref)(_tmagic_design.TMagicPopover), { "popper-class": "data-source-list-panel-add-menu" }, {
+				return showAddPageButton.value ? ((0, vue.openBlock)(), (0, vue.createElementBlock)("div", _hoisted_1$69, [(0, vue.createVNode)((0, vue.unref)(_tmagic_design.TMagicPopover), { "popper-class": "data-source-list-panel-add-menu" }, {
 					reference: (0, vue.withCtx)(() => [(0, vue.createVNode)(Icon_default, { icon: (0, vue.unref)(_element_plus_icons_vue.Plus) }, null, 8, ["icon"])]),
 					default: (0, vue.withCtx)(() => [(0, vue.createVNode)(ToolButton_default, { data: {
 						type: "button",
@@ -8567,7 +8631,7 @@
 						}
 					} }, null, 8, ["data"])]),
 					_: 1
-				})])) : ((0, vue.openBlock)(), (0, vue.createElementBlock)("div", _hoisted_2$28));
+				})])) : ((0, vue.openBlock)(), (0, vue.createElementBlock)("div", _hoisted_2$27));
 			};
 		}
 	});
@@ -8576,11 +8640,11 @@
 	var AddButton_default = AddButton_vue_vue_type_script_setup_true_lang_default;
 	//#endregion
 	//#region packages/editor/src/layouts/page-bar/PageBarScrollContainer.vue?vue&type=script&setup=true&lang.ts
-	var _hoisted_1$69 = {
+	var _hoisted_1$68 = {
 		class: "m-editor-page-bar",
 		ref: "pageBar"
 	};
-	var _hoisted_2$27 = {
+	var _hoisted_2$26 = {
 		key: 0,
 		class: "m-editor-page-bar-items",
 		ref: "itemsContainer"
@@ -8670,9 +8734,9 @@
 				}
 			});
 			return (_ctx, _cache) => {
-				return (0, vue.openBlock)(), (0, vue.createElementBlock)("div", _hoisted_1$69, [
+				return (0, vue.openBlock)(), (0, vue.createElementBlock)("div", _hoisted_1$68, [
 					(0, vue.renderSlot)(_ctx.$slots, "prepend"),
-					__props.length ? ((0, vue.openBlock)(), (0, vue.createElementBlock)("div", _hoisted_2$27, [(0, vue.renderSlot)(_ctx.$slots, "default")], 512)) : (0, vue.createCommentVNode)("v-if", true),
+					__props.length ? ((0, vue.openBlock)(), (0, vue.createElementBlock)("div", _hoisted_2$26, [(0, vue.renderSlot)(_ctx.$slots, "default")], 512)) : (0, vue.createCommentVNode)("v-if", true),
 					canScroll.value ? ((0, vue.openBlock)(), (0, vue.createElementBlock)("div", {
 						key: 1,
 						class: "m-editor-page-bar-item m-editor-page-bar-item-icon m-editor-page-bar-item-left-icon",
@@ -8692,12 +8756,12 @@
 	var PageBarScrollContainer_default = PageBarScrollContainer_vue_vue_type_script_setup_true_lang_default;
 	//#endregion
 	//#region packages/editor/src/layouts/page-bar/PageList.vue?vue&type=script&setup=true&lang.ts
-	var _hoisted_1$68 = {
+	var _hoisted_1$67 = {
 		key: 0,
 		id: "m-editor-page-bar-list-icon",
 		class: "m-editor-page-bar-item m-editor-page-bar-item-icon"
 	};
-	var _hoisted_2$26 = { class: "page-bar-popover-wrapper" };
+	var _hoisted_2$25 = { class: "page-bar-popover-wrapper" };
 	var _hoisted_3$10 = { class: "page-bar-popover-inner" };
 	var PageList_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ (0, vue.defineComponent)({
 		name: "MEditorPageList",
@@ -8711,7 +8775,7 @@
 				await editorService.select(id);
 			};
 			return (_ctx, _cache) => {
-				return showPageListButton.value ? ((0, vue.openBlock)(), (0, vue.createElementBlock)("div", _hoisted_1$68, [(0, vue.createVNode)((0, vue.unref)(_tmagic_design.TMagicPopover), {
+				return showPageListButton.value ? ((0, vue.openBlock)(), (0, vue.createElementBlock)("div", _hoisted_1$67, [(0, vue.createVNode)((0, vue.unref)(_tmagic_design.TMagicPopover), {
 					"popper-class": "page-bar-popover",
 					placement: "top",
 					trigger: "hover",
@@ -8722,7 +8786,7 @@
 						default: (0, vue.withCtx)(() => [(0, vue.createVNode)((0, vue.unref)(_element_plus_icons_vue.Files))]),
 						_: 1
 					})]),
-					default: (0, vue.withCtx)(() => [(0, vue.createElementVNode)("div", _hoisted_2$26, [(0, vue.createElementVNode)("div", _hoisted_3$10, [(0, vue.renderSlot)(_ctx.$slots, "page-list-popover", { list: __props.list }, () => [((0, vue.openBlock)(true), (0, vue.createElementBlock)(vue.Fragment, null, (0, vue.renderList)(__props.list, (item, index) => {
+					default: (0, vue.withCtx)(() => [(0, vue.createElementVNode)("div", _hoisted_2$25, [(0, vue.createElementVNode)("div", _hoisted_3$10, [(0, vue.renderSlot)(_ctx.$slots, "page-list-popover", { list: __props.list }, () => [((0, vue.openBlock)(true), (0, vue.createElementBlock)(vue.Fragment, null, (0, vue.renderList)(__props.list, (item, index) => {
 						return (0, vue.openBlock)(), (0, vue.createBlock)(ToolButton_default, {
 							data: {
 								type: "button",
@@ -8743,7 +8807,7 @@
 	var PageList_default = PageList_vue_vue_type_script_setup_true_lang_default;
 	//#endregion
 	//#region packages/editor/src/layouts/page-bar/Search.vue?vue&type=script&setup=true&lang.ts
-	var _hoisted_1$67 = { class: "m-editor-page-bar-item m-editor-page-bar-item-icon m-editor-page-bar-search" };
+	var _hoisted_1$66 = { class: "m-editor-page-bar-item m-editor-page-bar-item-icon m-editor-page-bar-search" };
 	var Search_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ (0, vue.defineComponent)({
 		__name: "Search",
 		props: {
@@ -8776,7 +8840,7 @@
 				emit("search", values);
 			};
 			return (_ctx, _cache) => {
-				return (0, vue.openBlock)(), (0, vue.createElementBlock)("div", _hoisted_1$67, [(0, vue.createVNode)(Icon_default, {
+				return (0, vue.openBlock)(), (0, vue.createElementBlock)("div", _hoisted_1$66, [(0, vue.createVNode)(Icon_default, {
 					icon: (0, vue.unref)(_element_plus_icons_vue.Search),
 					onClick: _cache[0] || (_cache[0] = ($event) => visible.value = !visible.value),
 					class: (0, vue.normalizeClass)({ "icon-active": visible.value })
@@ -8800,8 +8864,8 @@
 	var Search_default = Search_vue_vue_type_script_setup_true_lang_default;
 	//#endregion
 	//#region packages/editor/src/layouts/page-bar/PageBar.vue?vue&type=script&setup=true&lang.ts
-	var _hoisted_1$66 = { class: "m-editor-page-bar-tabs" };
-	var _hoisted_2$25 = ["data-page-id", "onClick"];
+	var _hoisted_1$65 = { class: "m-editor-page-bar-tabs" };
+	var _hoisted_2$24 = ["data-page-id", "onClick"];
 	var _hoisted_3$9 = { class: "m-editor-page-bar-title" };
 	var _hoisted_4$8 = ["title"];
 	var PageBar_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ (0, vue.defineComponent)({
@@ -8868,7 +8932,7 @@
 				}
 			});
 			return (_ctx, _cache) => {
-				return (0, vue.openBlock)(), (0, vue.createElementBlock)("div", _hoisted_1$66, [(0, vue.createVNode)(PageBarScrollContainer_default, {
+				return (0, vue.openBlock)(), (0, vue.createElementBlock)("div", _hoisted_1$65, [(0, vue.createVNode)(PageBarScrollContainer_default, {
 					ref: "pageBarScrollContainer",
 					"page-bar-sort-options": __props.pageBarSortOptions,
 					length: list.value.length
@@ -8915,7 +8979,7 @@
 								handler: () => remove(item)
 							} }, null, 8, ["data"])])])]),
 							_: 2
-						}, 1024)], 10, _hoisted_2$25);
+						}, 1024)], 10, _hoisted_2$24);
 					}), 128))]),
 					_: 3
 				}, 8, ["page-bar-sort-options", "length"])]);
@@ -8927,8 +8991,8 @@
 	var PageBar_default = PageBar_vue_vue_type_script_setup_true_lang_default;
 	//#endregion
 	//#region packages/editor/src/layouts/AddPageBox.vue?vue&type=script&setup=true&lang.ts
-	var _hoisted_1$65 = { class: "m-editor-empty-panel" };
-	var _hoisted_2$24 = { class: "m-editor-empty-content" };
+	var _hoisted_1$64 = { class: "m-editor-empty-panel" };
+	var _hoisted_2$23 = { class: "m-editor-empty-content" };
 	var AddPageBox_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ (0, vue.defineComponent)({
 		name: "MEditorAddPageBox",
 		__name: "AddPageBox",
@@ -8945,7 +9009,7 @@
 				});
 			};
 			return (_ctx, _cache) => {
-				return (0, vue.openBlock)(), (0, vue.createElementBlock)("div", _hoisted_1$65, [(0, vue.createElementVNode)("div", _hoisted_2$24, [(0, vue.createElementVNode)("div", {
+				return (0, vue.openBlock)(), (0, vue.createElementBlock)("div", _hoisted_1$64, [(0, vue.createElementVNode)("div", _hoisted_2$23, [(0, vue.createElementVNode)("div", {
 					class: "m-editor-empty-button",
 					onClick: _cache[0] || (_cache[0] = ($event) => clickHandler((0, vue.unref)(_tmagic_core.NodeType).PAGE))
 				}, [(0, vue.createElementVNode)("div", null, [(0, vue.createVNode)(Icon_default, { icon: (0, vue.unref)(_element_plus_icons_vue.Plus) }, null, 8, ["icon"])]), _cache[2] || (_cache[2] = (0, vue.createElementVNode)("p", null, "新增页面", -1))]), !__props.disabledPageFragment ? ((0, vue.openBlock)(), (0, vue.createElementBlock)("div", {
@@ -8961,8 +9025,8 @@
 	var AddPageBox_default = AddPageBox_vue_vue_type_script_setup_true_lang_default;
 	//#endregion
 	//#region packages/editor/src/layouts/CodeEditor.vue?vue&type=script&setup=true&lang.ts
-	var _hoisted_1$64 = { class: "magic-code-editor" };
-	var _hoisted_2$23 = {
+	var _hoisted_1$63 = { class: "magic-code-editor" };
+	var _hoisted_2$22 = {
 		ref: "codeEditor",
 		class: "magic-code-editor-content"
 	};
@@ -9048,10 +9112,7 @@
 			const toString = (v, language) => {
 				let value;
 				if (typeof v !== "string") if (language === "json") value = JSON.stringify(v, null, 2);
-				else value = (0, serialize_javascript.default)(v, {
-					space: 2,
-					unsafe: true
-				}).replace(/"(\w+)":\s/g, "$1: ");
+				else value = serializeConfig(v);
 				else value = v;
 				if (language === "javascript" && value.startsWith("{") && value.endsWith("}")) value = `(${value})`;
 				return value;
@@ -9202,7 +9263,7 @@
 				}
 			});
 			return (_ctx, _cache) => {
-				return (0, vue.openBlock)(), (0, vue.createElementBlock)("div", _hoisted_1$64, [((0, vue.openBlock)(), (0, vue.createBlock)(vue.Teleport, {
+				return (0, vue.openBlock)(), (0, vue.createElementBlock)("div", _hoisted_1$63, [((0, vue.openBlock)(), (0, vue.createBlock)(vue.Teleport, {
 					to: "body",
 					disabled: !fullScreen.value
 				}, [(0, vue.createElementVNode)("div", {
@@ -9220,7 +9281,7 @@
 				}, {
 					default: (0, vue.withCtx)(() => [(0, vue.createVNode)(Icon_default, { icon: (0, vue.unref)(_element_plus_icons_vue.FullScreen) }, null, 8, ["icon"])]),
 					_: 1
-				})) : (0, vue.createCommentVNode)("v-if", true), (0, vue.createElementVNode)("div", _hoisted_2$23, null, 512)], 6)], 8, ["disabled"]))]);
+				})) : (0, vue.createCommentVNode)("v-if", true), (0, vue.createElementVNode)("div", _hoisted_2$22, null, 512)], 6)], 8, ["disabled"]))]);
 			};
 		}
 	});
@@ -9229,7 +9290,7 @@
 	var CodeEditor_default = CodeEditor_vue_vue_type_script_setup_true_lang_default;
 	//#endregion
 	//#region packages/editor/src/layouts/Framework.vue?vue&type=script&setup=true&lang.ts
-	var _hoisted_1$63 = {
+	var _hoisted_1$62 = {
 		class: "m-editor",
 		ref: "content",
 		style: { "min-width": "900px" }
@@ -9293,7 +9354,7 @@
 				}
 			};
 			return (_ctx, _cache) => {
-				return (0, vue.openBlock)(), (0, vue.createElementBlock)("div", _hoisted_1$63, [
+				return (0, vue.openBlock)(), (0, vue.createElementBlock)("div", _hoisted_1$62, [
 					(0, vue.renderSlot)(_ctx.$slots, "header"),
 					(0, vue.renderSlot)(_ctx.$slots, "nav"),
 					(0, vue.renderSlot)(_ctx.$slots, "content-before"),
@@ -9371,7 +9432,10 @@
 	*/
 	var useHistoryList = () => {
 		const { historyService } = useServices();
-		/** 折叠状态：key 形如 `pg-${groupIdx}` / `ds-${id}-${groupIdx}` / `cb-${id}-${groupIdx}`。 */
+		/**
+		* 折叠状态：key 形如 `pg-${组内首步 index}` / `ds-${id}-${组内首步 index}` / `cb-${id}-${组内首步 index}`。
+		* 用组内首步的稳定 index（而非展示位置）作为 key，确保历史数据更新后已展开的分组状态保持不变。
+		*/
 		const expanded = (0, vue.reactive)({});
 		const toggleGroup = (key) => {
 			expanded[key] = !expanded[key];
@@ -9408,6 +9472,20 @@
 			codeBlockGroupsByTarget: (0, vue.computed)(() => groupByTarget(codeBlockGroups.value))
 		};
 	};
+	/**
+	* 历史面板的时间展示：
+	* - 当天的记录只显示 `HH:mm:ss`；
+	* - 跨天的记录显示 `MM-DD HH:mm:ss`。
+	* 无时间戳（旧数据 / 未写入）时返回空串，UI 据此不渲染时间。
+	*/
+	var formatHistoryTime = (timestamp) => {
+		if (!timestamp) return "";
+		return `${(0, _tmagic_form.datetimeFormatter)(new Date(timestamp), "", "YYYY-MM-DD") === (0, _tmagic_form.datetimeFormatter)(/* @__PURE__ */ new Date(), "", "YYYY-MM-DD") ? (0, _tmagic_form.datetimeFormatter)(new Date(timestamp), "", "HH:mm:ss") : (0, _tmagic_form.datetimeFormatter)(new Date(timestamp), "", "MM-DD HH:mm:ss")}`;
+	};
+	/** 完整时间（含年份与秒），用于 title 悬浮提示。无时间戳时返回空串。 */
+	var formatHistoryFullTime = (timestamp) => timestamp ? `${(0, _tmagic_form.datetimeFormatter)(new Date(timestamp), "", "YYYY-MM-DD HH:mm:ss")}` : "";
+	/** 取一组历史步骤里最后一步（最近一次）的时间戳，用于组头部展示。 */
+	var groupTimestamp = (group) => group.steps[group.steps.length - 1]?.step.timestamp;
 	var opLabel = (op) => {
 		switch (op) {
 			case "add": return "新增";
@@ -9415,6 +9493,28 @@
 			default: return "修改";
 		}
 	};
+	/** 内置操作途径的中文文案；自定义来源直接回显原值，未知 / 缺省返回空串（UI 据此不渲染）。 */
+	var HISTORY_SOURCE_LABELS = {
+		stage: "画布",
+		tree: "树面板",
+		"component-panel": "组件面板",
+		props: "配置面板",
+		code: "源码",
+		"stage-contextmenu": "画布菜单",
+		"tree-contextmenu": "树菜单",
+		toolbar: "工具栏",
+		shortcut: "快捷键",
+		rollback: "回滚",
+		api: "接口",
+		ai: "AI",
+		unknown: "未知"
+	};
+	/** 操作途径文案：用于历史面板展示「画布 / 树面板 / 配置面板…」标签。 */
+	var sourceLabel = (source = "unknown") => {
+		return HISTORY_SOURCE_LABELS[source] ?? `${source}`;
+	};
+	/** 取一组历史步骤里最后一步（最近一次）的操作途径，用于组头部展示。 */
+	var groupSource = (group) => group.steps[group.steps.length - 1]?.step.source;
 	var nameOf = (node) => node?.name || node?.type || `${node?.id ?? ""}`;
 	/**
 	* 默认描述里展示「名称 (id: xxx)」，便于区分同名实体。
@@ -9510,32 +9610,59 @@
 		const target = labelWithId(group.steps[group.steps.length - 1].step.newContent?.name || group.steps[0].step.oldContent?.name, group.id);
 		return pathList ? `修改 ${target} · ${pathList}${paths.size > 3 ? "…" : ""}` : `修改 ${target}`;
 	};
+	/**
+	* 页面 step 是否支持「回滚」（类 git revert）：
+	* - 新增 / 删除：不依赖 changeRecords，反向应用即删除 / 加回，始终可回滚；
+	* - 更新：必须每个被更新节点都带有 changeRecords，才支持按 propPath 局部反向 patch。
+	*   缺失 changeRecords 的更新只能整节点替换，会冲掉该节点后续的无关变更，因此不支持回滚。
+	*/
+	var isPageStepRevertable = (step) => {
+		if (step.opType !== "update") return true;
+		const items = step.updatedItems ?? [];
+		if (!items.length) return false;
+		return items.every((item) => Boolean(item.changeRecords?.length));
+	};
+	/**
+	* 数据源 step 是否支持「回滚」：
+	* - 新增（oldSchema=null）/ 删除（newSchema=null）：不依赖 changeRecords，始终可回滚；
+	* - 更新（前后 schema 都存在）：必须有 changeRecords 才支持局部反向 patch，否则不支持回滚。
+	*/
+	var isDataSourceStepRevertable = (step) => {
+		if (step.oldSchema === null || step.newSchema === null) return true;
+		return Boolean(step.changeRecords?.length);
+	};
+	/**
+	* 代码块 step 是否支持「回滚」：
+	* - 新增（oldContent=null）/ 删除（newContent=null）：不依赖 changeRecords，始终可回滚；
+	* - 更新（前后 content 都存在）：必须有 changeRecords 才支持局部反向 patch，否则不支持回滚。
+	*/
+	var isCodeBlockStepRevertable = (step) => {
+		if (step.oldContent === null || step.newContent === null) return true;
+		return Boolean(step.changeRecords?.length);
+	};
 	//#endregion
 	//#region packages/editor/src/layouts/history-list/GroupRow.vue?vue&type=script&setup=true&lang.ts
-	var _hoisted_1$62 = ["title"];
-	var _hoisted_2$22 = ["title"];
+	var _hoisted_1$61 = ["title"];
+	var _hoisted_2$21 = ["title"];
 	var _hoisted_3$8 = { class: "m-editor-history-list-item-desc" };
-	var _hoisted_4$7 = {
-		key: 0,
-		class: "m-editor-history-list-item-current"
-	};
-	var _hoisted_5$3 = {
+	var _hoisted_4$7 = ["title"];
+	var _hoisted_5$3 = ["title"];
+	var _hoisted_6$3 = {
 		key: 2,
 		class: "m-editor-history-list-item-merge"
 	};
-	var _hoisted_6$3 = {
+	var _hoisted_7$1 = {
 		key: 0,
 		class: "m-editor-history-list-substeps"
 	};
-	var _hoisted_7 = ["title", "onClick"];
-	var _hoisted_8 = { class: "m-editor-history-list-item-index" };
-	var _hoisted_9 = { class: "m-editor-history-list-substep-desc" };
-	var _hoisted_10 = {
-		key: 0,
-		class: "m-editor-history-list-item-current"
-	};
-	var _hoisted_11 = ["onClick"];
-	var _hoisted_12 = ["onClick"];
+	var _hoisted_8 = ["title"];
+	var _hoisted_9 = { class: "m-editor-history-list-item-index" };
+	var _hoisted_10 = { class: "m-editor-history-list-substep-desc" };
+	var _hoisted_11 = ["title"];
+	var _hoisted_12 = ["title"];
+	var _hoisted_13 = ["onClick"];
+	var _hoisted_14 = ["onClick"];
+	var _hoisted_15 = ["onClick"];
 	var GroupRow_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ (0, vue.defineComponent)({
 		name: "MEditorHistoryListGroupRow",
 		__name: "GroupRow",
@@ -9545,10 +9672,20 @@
 			merged: { type: Boolean },
 			opType: {},
 			desc: {},
+			source: {},
+			time: {},
+			timeTitle: {},
 			stepCount: {},
 			subSteps: {},
 			expanded: { type: Boolean },
-			isCurrent: { type: Boolean }
+			isCurrent: {
+				type: Boolean,
+				default: false
+			},
+			gotoEnabled: {
+				type: Boolean,
+				default: true
+			}
 		},
 		emits: [
 			"toggle",
@@ -9559,33 +9696,29 @@
 		setup(__props, { emit: __emit }) {
 			const props = __props;
 			const emit = __emit;
-			/** 单步组：头部可点击 goto；合并组：头部可点击切换展开。当前组（isCurrent）的单步组头部不可点击。 */
-			const isHeadClickable = (0, vue.computed)(() => {
-				if (props.merged) return true;
-				return !props.isCurrent;
-			});
+			/**
+			* 仅合并组头部可点击（切换展开 / 收起）；
+			* 单步组的跳转改由头部的「回退」按钮触发，整行不再可点击。
+			*/
+			const isHeadClickable = (0, vue.computed)(() => props.merged);
 			const headTitle = (0, vue.computed)(() => {
 				if (props.merged) return props.expanded ? "点击收起子步" : "点击展开子步";
 				if (props.isCurrent) return "当前所在记录";
-				return "点击跳转到该记录";
+				return "";
 			});
 			/**
-			* 头部点击行为分流：
-			* - 合并组：仅切换展开 / 收起，不触发 goto；
-			* - 单步组：跳转到该唯一步骤；当前组忽略点击。
+			* 头部点击行为：仅合并组切换展开 / 收起；单步组不再响应整行点击。
 			*/
 			const onHeadClick = () => {
-				if (props.merged) {
-					emit("toggle", props.groupKey);
-					return;
-				}
-				if (props.isCurrent) return;
-				if (!props.subSteps.length) return;
-				emit("goto", props.subSteps[0].index);
+				if (props.merged) emit("toggle", props.groupKey);
 			};
-			const onSubStepClick = (s) => {
-				if (s.isCurrent) return;
-				emit("goto", s.index);
+			const onGotoClick = (index) => {
+				if (!props.gotoEnabled) return;
+				emit("goto", index);
+			};
+			const subStepTitle = (s) => {
+				if (s.isCurrent) return "当前所在记录";
+				return "";
 			};
 			/** 单步组头部是否展示"查看差异"入口：要求该唯一子步本身可对比。 */
 			const headDiffable = (0, vue.computed)(() => !props.merged && Boolean(props.subSteps[0]?.diffable));
@@ -9635,54 +9768,82 @@
 					(0, vue.createElementVNode)("span", {
 						class: "m-editor-history-list-item-index",
 						title: headIndexTitle.value
-					}, (0, vue.toDisplayString)(headIndexLabel.value), 9, _hoisted_2$22),
+					}, (0, vue.toDisplayString)(headIndexLabel.value), 9, _hoisted_2$21),
 					(0, vue.createElementVNode)("span", { class: (0, vue.normalizeClass)(["m-editor-history-list-item-op", `op-${__props.opType}`]) }, (0, vue.toDisplayString)((0, vue.unref)(opLabel)(__props.opType)), 3),
 					(0, vue.createElementVNode)("span", _hoisted_3$8, (0, vue.toDisplayString)(__props.desc), 1),
-					__props.isCurrent ? ((0, vue.openBlock)(), (0, vue.createElementBlock)("span", _hoisted_4$7, "当前")) : (0, vue.createCommentVNode)("v-if", true),
-					!__props.merged && headDiffable.value ? ((0, vue.openBlock)(), (0, vue.createElementBlock)("span", {
+					!__props.merged && (0, vue.unref)(sourceLabel)(__props.source) ? ((0, vue.openBlock)(), (0, vue.createElementBlock)("span", {
+						key: 0,
+						class: "m-editor-history-list-item-source",
+						title: `操作途径：${(0, vue.unref)(sourceLabel)(__props.source)}`
+					}, (0, vue.toDisplayString)((0, vue.unref)(sourceLabel)(__props.source)), 9, _hoisted_4$7)) : (0, vue.createCommentVNode)("v-if", true),
+					!__props.merged && __props.time ? ((0, vue.openBlock)(), (0, vue.createElementBlock)("span", {
 						key: 1,
-						class: "m-editor-history-list-item-diff",
-						title: "查看修改差异",
-						onClick: _cache[0] || (_cache[0] = (0, vue.withModifiers)(($event) => onDiffClick(__props.subSteps[0].index), ["stop"]))
-					}, "查看差异")) : (0, vue.createCommentVNode)("v-if", true),
-					__props.merged ? ((0, vue.openBlock)(), (0, vue.createElementBlock)("span", _hoisted_5$3, "合并 " + (0, vue.toDisplayString)(__props.stepCount) + " 步", 1)) : (0, vue.createCommentVNode)("v-if", true),
+						class: "m-editor-history-list-item-time",
+						title: __props.timeTitle || __props.time
+					}, (0, vue.toDisplayString)(__props.time), 9, _hoisted_5$3)) : (0, vue.createCommentVNode)("v-if", true),
+					__props.merged ? ((0, vue.openBlock)(), (0, vue.createElementBlock)("span", _hoisted_6$3, "合并 " + (0, vue.toDisplayString)(__props.stepCount) + " 步", 1)) : (0, vue.createCommentVNode)("v-if", true),
 					!__props.merged && headRevertable.value ? ((0, vue.openBlock)(), (0, vue.createElementBlock)("span", {
 						key: 3,
 						class: "m-editor-history-list-item-revert",
 						title: "将该步骤的修改作为一次新操作反向应用（不影响后续历史）",
-						onClick: _cache[1] || (_cache[1] = (0, vue.withModifiers)(($event) => onRevertClick(__props.subSteps[0].index), ["stop"]))
+						onClick: _cache[0] || (_cache[0] = (0, vue.withModifiers)(($event) => onRevertClick(__props.subSteps[0].index), ["stop"]))
 					}, "回滚")) : (0, vue.createCommentVNode)("v-if", true),
-					__props.merged ? ((0, vue.openBlock)(), (0, vue.createElementBlock)("span", {
+					!__props.merged && __props.gotoEnabled && !__props.isCurrent && __props.subSteps.length ? ((0, vue.openBlock)(), (0, vue.createElementBlock)("span", {
 						key: 4,
+						class: "m-editor-history-list-item-goto",
+						title: "回到该记录",
+						onClick: _cache[1] || (_cache[1] = (0, vue.withModifiers)(($event) => onGotoClick(__props.subSteps[0].index), ["stop"]))
+					}, "回到")) : (0, vue.createCommentVNode)("v-if", true),
+					!__props.merged && headDiffable.value ? ((0, vue.openBlock)(), (0, vue.createElementBlock)("span", {
+						key: 5,
+						class: "m-editor-history-list-item-diff",
+						title: "查看修改差异",
+						onClick: _cache[2] || (_cache[2] = (0, vue.withModifiers)(($event) => onDiffClick(__props.subSteps[0].index), ["stop"]))
+					}, "查看差异")) : (0, vue.createCommentVNode)("v-if", true),
+					__props.merged ? ((0, vue.openBlock)(), (0, vue.createElementBlock)("span", {
+						key: 6,
 						class: (0, vue.normalizeClass)(["m-editor-history-list-group-toggle", { "is-expanded": __props.expanded }])
 					}, "▾", 2)) : (0, vue.createCommentVNode)("v-if", true)
-				], 10, _hoisted_1$62), __props.merged && __props.expanded ? ((0, vue.openBlock)(), (0, vue.createElementBlock)("ul", _hoisted_6$3, [((0, vue.openBlock)(true), (0, vue.createElementBlock)(vue.Fragment, null, (0, vue.renderList)(subStepsDisplay.value, (s) => {
+				], 10, _hoisted_1$61), __props.merged && __props.expanded ? ((0, vue.openBlock)(), (0, vue.createElementBlock)("ul", _hoisted_7$1, [((0, vue.openBlock)(true), (0, vue.createElementBlock)(vue.Fragment, null, (0, vue.renderList)(subStepsDisplay.value, (s) => {
 					return (0, vue.openBlock)(), (0, vue.createElementBlock)("li", {
 						key: s.index,
 						class: (0, vue.normalizeClass)({
 							"is-undone": !s.applied,
-							"is-current": s.isCurrent,
-							"is-clickable": !s.isCurrent
+							"is-current": s.isCurrent
 						}),
-						title: s.isCurrent ? "当前所在记录" : "点击跳转到该记录",
-						onClick: ($event) => onSubStepClick(s)
+						title: subStepTitle(s)
 					}, [
-						(0, vue.createElementVNode)("span", _hoisted_8, "#" + (0, vue.toDisplayString)(s.index + 1), 1),
-						(0, vue.createElementVNode)("span", _hoisted_9, (0, vue.toDisplayString)(s.desc), 1),
-						s.isCurrent ? ((0, vue.openBlock)(), (0, vue.createElementBlock)("span", _hoisted_10, "当前")) : (0, vue.createCommentVNode)("v-if", true),
-						s.diffable ? ((0, vue.openBlock)(), (0, vue.createElementBlock)("span", {
+						(0, vue.createElementVNode)("span", _hoisted_9, "#" + (0, vue.toDisplayString)(s.index + 1), 1),
+						(0, vue.createElementVNode)("span", _hoisted_10, (0, vue.toDisplayString)(s.desc), 1),
+						(0, vue.unref)(sourceLabel)(s.source) ? ((0, vue.openBlock)(), (0, vue.createElementBlock)("span", {
+							key: 0,
+							class: "m-editor-history-list-item-source",
+							title: `操作途径：${(0, vue.unref)(sourceLabel)(s.source)}`
+						}, (0, vue.toDisplayString)((0, vue.unref)(sourceLabel)(s.source)), 9, _hoisted_11)) : (0, vue.createCommentVNode)("v-if", true),
+						s.time ? ((0, vue.openBlock)(), (0, vue.createElementBlock)("span", {
 							key: 1,
-							class: "m-editor-history-list-item-diff",
-							title: "查看修改差异",
-							onClick: (0, vue.withModifiers)(($event) => onDiffClick(s.index), ["stop"])
-						}, "查看差异", 8, _hoisted_11)) : (0, vue.createCommentVNode)("v-if", true),
+							class: "m-editor-history-list-item-time",
+							title: s.timeTitle || s.time
+						}, (0, vue.toDisplayString)(s.time), 9, _hoisted_12)) : (0, vue.createCommentVNode)("v-if", true),
 						s.revertable ? ((0, vue.openBlock)(), (0, vue.createElementBlock)("span", {
 							key: 2,
 							class: "m-editor-history-list-item-revert",
 							title: "将该步骤的修改作为一次新操作反向应用（不影响后续历史）",
 							onClick: (0, vue.withModifiers)(($event) => onRevertClick(s.index), ["stop"])
-						}, "回滚", 8, _hoisted_12)) : (0, vue.createCommentVNode)("v-if", true)
-					], 10, _hoisted_7);
+						}, "回滚", 8, _hoisted_13)) : (0, vue.createCommentVNode)("v-if", true),
+						__props.gotoEnabled && !s.isCurrent ? ((0, vue.openBlock)(), (0, vue.createElementBlock)("span", {
+							key: 3,
+							class: "m-editor-history-list-item-goto",
+							title: "回到该记录",
+							onClick: (0, vue.withModifiers)(($event) => onGotoClick(s.index), ["stop"])
+						}, "回到", 8, _hoisted_14)) : (0, vue.createCommentVNode)("v-if", true),
+						s.diffable ? ((0, vue.openBlock)(), (0, vue.createElementBlock)("span", {
+							key: 4,
+							class: "m-editor-history-list-item-diff",
+							title: "查看修改差异",
+							onClick: (0, vue.withModifiers)(($event) => onDiffClick(s.index), ["stop"])
+						}, "查看差异", 8, _hoisted_15)) : (0, vue.createCommentVNode)("v-if", true)
+					], 10, _hoisted_8);
 				}), 128))])) : (0, vue.createCommentVNode)("v-if", true)], 2);
 			};
 		}
@@ -9692,15 +9853,17 @@
 	var GroupRow_default = GroupRow_vue_vue_type_script_setup_true_lang_default;
 	//#endregion
 	//#region packages/editor/src/layouts/history-list/InitialRow.vue?vue&type=script&setup=true&lang.ts
-	var _hoisted_1$61 = ["title"];
-	var _hoisted_2$21 = {
-		key: 0,
-		class: "m-editor-history-list-item-current"
-	};
+	var _hoisted_1$60 = ["title"];
 	var InitialRow_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ (0, vue.defineComponent)({
 		name: "MEditorHistoryListInitialRow",
 		__name: "InitialRow",
-		props: { isCurrent: { type: Boolean } },
+		props: {
+			isCurrent: { type: Boolean },
+			gotoEnabled: {
+				type: Boolean,
+				default: true
+			}
+		},
 		emits: ["goto-initial"],
 		setup(__props, { emit: __emit }) {
 			/**
@@ -9722,8 +9885,7 @@
 						"is-current": __props.isCurrent,
 						"is-clickable": !__props.isCurrent
 					}]),
-					title: __props.isCurrent ? "当前已回到未修改的初始状态" : "点击回到未修改的初始状态",
-					onClick
+					title: __props.isCurrent ? "当前已回到未修改的初始状态" : "点击回到未修改的初始状态"
 				}, [
 					_cache[0] || (_cache[0] = (0, vue.createElementVNode)("span", {
 						class: "m-editor-history-list-item-index",
@@ -9731,8 +9893,13 @@
 					}, "#0", -1)),
 					_cache[1] || (_cache[1] = (0, vue.createElementVNode)("span", { class: "m-editor-history-list-item-op op-initial" }, "初始", -1)),
 					_cache[2] || (_cache[2] = (0, vue.createElementVNode)("span", { class: "m-editor-history-list-item-desc" }, "未修改的初始状态", -1)),
-					__props.isCurrent ? ((0, vue.openBlock)(), (0, vue.createElementBlock)("span", _hoisted_2$21, "当前")) : (0, vue.createCommentVNode)("v-if", true)
-				], 10, _hoisted_1$61);
+					__props.gotoEnabled && !__props.isCurrent ? ((0, vue.openBlock)(), (0, vue.createElementBlock)("span", {
+						key: 0,
+						class: "m-editor-history-list-item-goto",
+						title: "回到该记录",
+						onClick: (0, vue.withModifiers)(onClick, ["stop"])
+					}, "回到")) : (0, vue.createCommentVNode)("v-if", true)
+				], 10, _hoisted_1$60);
 			};
 		}
 	});
@@ -9741,7 +9908,7 @@
 	var InitialRow_default = InitialRow_vue_vue_type_script_setup_true_lang_default;
 	//#endregion
 	//#region packages/editor/src/layouts/history-list/Bucket.vue?vue&type=script&setup=true&lang.ts
-	var _hoisted_1$60 = { class: "m-editor-history-list-bucket" };
+	var _hoisted_1$59 = { class: "m-editor-history-list-bucket" };
 	var _hoisted_2$20 = { class: "m-editor-history-list-bucket-title" };
 	var _hoisted_3$7 = { class: "m-editor-history-list-bucket-count" };
 	var _hoisted_4$6 = { class: "m-editor-history-list-ul" };
@@ -9752,11 +9919,20 @@
 			title: {},
 			bucketId: {},
 			prefix: {},
+			showInitial: {
+				type: Boolean,
+				default: true
+			},
 			groups: {},
-			describeGroup: { type: Function },
-			describeStep: { type: Function },
-			isStepDiffable: { type: Function },
-			expanded: {}
+			describeGroup: {},
+			describeStep: {},
+			isStepDiffable: {},
+			isStepRevertable: {},
+			expanded: {},
+			gotoEnabled: {
+				type: Boolean,
+				default: true
+			}
 		},
 		emits: [
 			"toggle",
@@ -9770,19 +9946,22 @@
 			/** 该 bucket 是否处于初始状态（栈 cursor=0），等价于全部 group 都未 applied。 */
 			const isInitial = (0, vue.computed)(() => props.groups.length > 0 && props.groups.every((g) => !g.applied));
 			return (_ctx, _cache) => {
-				return (0, vue.openBlock)(), (0, vue.createElementBlock)("div", _hoisted_1$60, [(0, vue.createElementVNode)("div", _hoisted_2$20, [
+				return (0, vue.openBlock)(), (0, vue.createElementBlock)("div", _hoisted_1$59, [(0, vue.createElementVNode)("div", _hoisted_2$20, [
 					(0, vue.createElementVNode)("span", null, (0, vue.toDisplayString)(__props.title), 1),
 					(0, vue.createElementVNode)("code", null, (0, vue.toDisplayString)(String(__props.bucketId)), 1),
 					(0, vue.createElementVNode)("span", _hoisted_3$7, (0, vue.toDisplayString)(__props.groups.length) + " 组", 1)
 				]), (0, vue.createElementVNode)("ul", _hoisted_4$6, [
-					((0, vue.openBlock)(true), (0, vue.createElementBlock)(vue.Fragment, null, (0, vue.renderList)(__props.groups, (group, gIdx) => {
+					((0, vue.openBlock)(true), (0, vue.createElementBlock)(vue.Fragment, null, (0, vue.renderList)(__props.groups, (group) => {
 						return (0, vue.openBlock)(), (0, vue.createBlock)(GroupRow_default, {
-							key: `${__props.prefix}-${__props.bucketId}-${gIdx}`,
-							"group-key": `${__props.prefix}-${__props.bucketId}-${gIdx}`,
+							key: `${__props.prefix}-${__props.bucketId}-${group.steps[0]?.index}`,
+							"group-key": `${__props.prefix}-${__props.bucketId}-${group.steps[0]?.index}`,
 							applied: group.applied,
 							merged: group.steps.length > 1,
 							"op-type": group.opType,
 							desc: __props.describeGroup(group),
+							source: (0, vue.unref)(groupSource)(group),
+							time: (0, vue.unref)(formatHistoryTime)((0, vue.unref)(groupTimestamp)(group)),
+							"time-title": (0, vue.unref)(formatHistoryFullTime)((0, vue.unref)(groupTimestamp)(group)),
 							"step-count": group.steps.length,
 							"sub-steps": group.steps.map((s) => ({
 								index: s.index,
@@ -9790,10 +9969,14 @@
 								isCurrent: s.isCurrent,
 								desc: __props.describeStep(s.step),
 								diffable: __props.isStepDiffable ? __props.isStepDiffable(s.step) : false,
-								revertable: s.applied
+								revertable: s.applied && (__props.isStepRevertable ? __props.isStepRevertable(s.step) : true),
+								source: s.step.source,
+								time: (0, vue.unref)(formatHistoryTime)(s.step.timestamp),
+								timeTitle: (0, vue.unref)(formatHistoryFullTime)(s.step.timestamp)
 							})),
 							"is-current": group.isCurrent,
-							expanded: !!__props.expanded[`${__props.prefix}-${__props.bucketId}-${gIdx}`],
+							expanded: !!__props.expanded[`${__props.prefix}-${__props.bucketId}-${group.steps[0]?.index}`],
+							"goto-enabled": __props.gotoEnabled,
 							onToggle: _cache[0] || (_cache[0] = (key) => _ctx.$emit("toggle", key)),
 							onGoto: _cache[1] || (_cache[1] = (index) => _ctx.$emit("goto", __props.bucketId, index)),
 							onDiffStep: _cache[2] || (_cache[2] = (index) => _ctx.$emit("diff-step", __props.bucketId, index)),
@@ -9804,17 +9987,23 @@
 							"merged",
 							"op-type",
 							"desc",
+							"source",
+							"time",
+							"time-title",
 							"step-count",
 							"sub-steps",
 							"is-current",
-							"expanded"
+							"expanded",
+							"goto-enabled"
 						]);
 					}), 128)),
-					(0, vue.createCommentVNode)("\n        初始状态项：永远位于该 bucket 列表底部（同样按倒序展示，最底部 = 最早状态）。\n        当 bucket 内所有 group 都未 applied 时即为当前位置。\n      "),
-					(0, vue.createVNode)(InitialRow_default, {
+					(0, vue.createCommentVNode)("\n        初始状态项：永远位于该 bucket 列表底部（同样按倒序展示，最底部 = 最早状态）。\n        当 bucket 内所有 group 都未 applied 时即为当前位置。\n        showInitial=false 时不展示（用于没有\"撤销到初始状态\"语义的自定义历史，如业务模块历史）。\n      "),
+					__props.showInitial !== false ? ((0, vue.openBlock)(), (0, vue.createBlock)(InitialRow_default, {
+						key: 0,
 						"is-current": isInitial.value,
+						"goto-enabled": __props.gotoEnabled,
 						onGotoInitial: _cache[4] || (_cache[4] = ($event) => _ctx.$emit("goto-initial", __props.bucketId))
-					}, null, 8, ["is-current"])
+					}, null, 8, ["is-current", "goto-enabled"])) : (0, vue.createCommentVNode)("v-if", true)
 				])]);
 			};
 		}
@@ -9823,77 +10012,27 @@
 	//#region packages/editor/src/layouts/history-list/Bucket.vue
 	var Bucket_default = Bucket_vue_vue_type_script_setup_true_lang_default;
 	//#endregion
-	//#region packages/editor/src/layouts/history-list/CodeBlockTab.vue?vue&type=script&setup=true&lang.ts
-	var _hoisted_1$59 = {
-		key: 0,
-		class: "m-editor-history-list-empty"
-	};
-	var CodeBlockTab_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ (0, vue.defineComponent)({
-		name: "MEditorHistoryListCodeBlockTab",
-		__name: "CodeBlockTab",
-		props: {
-			buckets: {},
-			expanded: {}
-		},
-		emits: [
-			"toggle",
-			"goto",
-			"goto-initial",
-			"diff-step",
-			"revert-step"
-		],
-		setup(__props) {
-			/** 仅 update（前后 content 都存在）时可查看差异。 */
-			const isCodeBlockStepDiffable = (step) => Boolean(step.oldContent && step.newContent);
-			return (_ctx, _cache) => {
-				return !__props.buckets.length ? ((0, vue.openBlock)(), (0, vue.createElementBlock)("div", _hoisted_1$59, "暂无操作记录")) : ((0, vue.openBlock)(), (0, vue.createBlock)((0, vue.unref)(_tmagic_design.TMagicScrollbar), {
-					key: 1,
-					"max-height": "360px"
-				}, {
-					default: (0, vue.withCtx)(() => [((0, vue.openBlock)(true), (0, vue.createElementBlock)(vue.Fragment, null, (0, vue.renderList)(__props.buckets, (bucket) => {
-						return (0, vue.openBlock)(), (0, vue.createBlock)(Bucket_default, {
-							key: `cb-${bucket.id}`,
-							title: "代码块",
-							"bucket-id": bucket.id,
-							prefix: "cb",
-							groups: bucket.groups,
-							"describe-group": (0, vue.unref)(describeCodeBlockGroup),
-							"describe-step": (0, vue.unref)(describeCodeBlockStep),
-							"is-step-diffable": isCodeBlockStepDiffable,
-							expanded: __props.expanded,
-							onToggle: _cache[0] || (_cache[0] = (key) => _ctx.$emit("toggle", key)),
-							onGoto: _cache[1] || (_cache[1] = (id, index) => _ctx.$emit("goto", id, index)),
-							onGotoInitial: _cache[2] || (_cache[2] = (id) => _ctx.$emit("goto-initial", id)),
-							onDiffStep: _cache[3] || (_cache[3] = (id, index) => _ctx.$emit("diff-step", id, index)),
-							onRevertStep: _cache[4] || (_cache[4] = (id, index) => _ctx.$emit("revert-step", id, index))
-						}, null, 8, [
-							"bucket-id",
-							"groups",
-							"describe-group",
-							"describe-step",
-							"expanded"
-						]);
-					}), 128))]),
-					_: 1
-				}));
-			};
-		}
-	});
-	//#endregion
-	//#region packages/editor/src/layouts/history-list/CodeBlockTab.vue
-	var CodeBlockTab_default = CodeBlockTab_vue_vue_type_script_setup_true_lang_default;
-	//#endregion
-	//#region packages/editor/src/layouts/history-list/DataSourceTab.vue?vue&type=script&setup=true&lang.ts
+	//#region packages/editor/src/layouts/history-list/BucketTab.vue?vue&type=script&setup=true&lang.ts
 	var _hoisted_1$58 = {
 		key: 0,
 		class: "m-editor-history-list-empty"
 	};
-	var DataSourceTab_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ (0, vue.defineComponent)({
-		name: "MEditorHistoryListDataSourceTab",
-		__name: "DataSourceTab",
+	var BucketTab_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ (0, vue.defineComponent)({
+		name: "MEditorHistoryListBucketTab",
+		__name: "BucketTab",
 		props: {
+			title: {},
+			prefix: {},
 			buckets: {},
-			expanded: {}
+			describeGroup: {},
+			describeStep: {},
+			isStepDiffable: {},
+			isStepRevertable: {},
+			expanded: {},
+			gotoEnabled: {
+				type: Boolean,
+				default: true
+			}
 		},
 		emits: [
 			"toggle",
@@ -9903,8 +10042,6 @@
 			"revert-step"
 		],
 		setup(__props) {
-			/** 仅 update（前后 schema 都存在）时可查看差异。 */
-			const isDataSourceStepDiffable = (step) => Boolean(step.oldSchema && step.newSchema);
 			return (_ctx, _cache) => {
 				return !__props.buckets.length ? ((0, vue.openBlock)(), (0, vue.createElementBlock)("div", _hoisted_1$58, "暂无操作记录")) : ((0, vue.openBlock)(), (0, vue.createBlock)((0, vue.unref)(_tmagic_design.TMagicScrollbar), {
 					key: 1,
@@ -9912,26 +10049,33 @@
 				}, {
 					default: (0, vue.withCtx)(() => [((0, vue.openBlock)(true), (0, vue.createElementBlock)(vue.Fragment, null, (0, vue.renderList)(__props.buckets, (bucket) => {
 						return (0, vue.openBlock)(), (0, vue.createBlock)(Bucket_default, {
-							key: `ds-${bucket.id}`,
-							title: "数据源",
+							key: `${__props.prefix}-${bucket.id}`,
+							title: __props.title,
 							"bucket-id": bucket.id,
-							prefix: "ds",
+							prefix: __props.prefix,
 							groups: bucket.groups,
-							"describe-group": (0, vue.unref)(describeDataSourceGroup),
-							"describe-step": (0, vue.unref)(describeDataSourceStep),
-							"is-step-diffable": isDataSourceStepDiffable,
+							"describe-group": __props.describeGroup,
+							"describe-step": __props.describeStep,
+							"is-step-diffable": __props.isStepDiffable,
+							"is-step-revertable": __props.isStepRevertable,
 							expanded: __props.expanded,
+							"goto-enabled": __props.gotoEnabled,
 							onToggle: _cache[0] || (_cache[0] = (key) => _ctx.$emit("toggle", key)),
 							onGoto: _cache[1] || (_cache[1] = (id, index) => _ctx.$emit("goto", id, index)),
 							onGotoInitial: _cache[2] || (_cache[2] = (id) => _ctx.$emit("goto-initial", id)),
 							onDiffStep: _cache[3] || (_cache[3] = (id, index) => _ctx.$emit("diff-step", id, index)),
 							onRevertStep: _cache[4] || (_cache[4] = (id, index) => _ctx.$emit("revert-step", id, index))
 						}, null, 8, [
+							"title",
 							"bucket-id",
+							"prefix",
 							"groups",
 							"describe-group",
 							"describe-step",
-							"expanded"
+							"is-step-diffable",
+							"is-step-revertable",
+							"expanded",
+							"goto-enabled"
 						]);
 					}), 128))]),
 					_: 1
@@ -9940,8 +10084,8 @@
 		}
 	});
 	//#endregion
-	//#region packages/editor/src/layouts/history-list/DataSourceTab.vue
-	var DataSourceTab_default = DataSourceTab_vue_vue_type_script_setup_true_lang_default;
+	//#region packages/editor/src/layouts/history-list/BucketTab.vue
+	var BucketTab_default = BucketTab_vue_vue_type_script_setup_true_lang_default;
 	//#endregion
 	//#region packages/editor/src/components/CompareForm.vue?vue&type=script&setup=true&lang.ts
 	var CompareForm_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ (0, vue.defineComponent)({
@@ -9955,15 +10099,10 @@
 			dataSourceType: {},
 			labelWidth: { default: "120px" },
 			height: {},
-			extendState: {}
+			extendState: {},
+			loadConfig: {}
 		},
 		setup(__props, { expose: __expose }) {
-			/**
-			* 对比类型：
-			* - node: 节点组件，按 `type` 从 propsService 获取属性表单配置
-			* - data-source: 数据源，按 `type`(base/http/...) 从 dataSourceService 获取数据源表单配置
-			* - code-block: 数据源代码块，使用内置的代码块表单配置
-			*/
 			const props = __props;
 			const { propsService, dataSourceService, codeBlockService, editorService } = useServices();
 			const services = useServices();
@@ -10023,34 +10162,57 @@
 				}
 				return !isEqual(curValue, lastValue);
 			};
-			const loadConfig = async () => {
+			const removeStyleDisplayConfig = (formConfig) => formConfig.map((item) => {
+				if (!("type" in item)) return item;
+				if (item?.type !== "tab" || !Array.isArray(item.items)) return item;
+				return {
+					...item,
+					items: item.items.map((tabPane) => {
+						if (tabPane?.title !== "样式" || !Array.isArray(tabPane.items)) return tabPane;
+						return {
+							...tabPane,
+							display: true
+						};
+					})
+				};
+			});
+			/**
+			* 内置的默认 FormConfig 加载逻辑：按 `category` 从对应 service / 工具取配置。
+			* 作为 ctx.defaultLoadConfig 透传给自定义 `loadConfig`，方便复用与二次加工。
+			*/
+			const defaultLoadConfig = async () => {
 				switch (props.category) {
 					case "node":
-						if (!props.type) {
-							config.value = [];
-							return;
-						}
-						config.value = await propsService.getPropsConfig(props.type);
-						break;
-					case "data-source":
-						config.value = dataSourceService.getFormConfig(props.type || "base");
-						break;
-					case "code-block":
-						config.value = getCodeBlockFormConfig({
-							paramColConfig: codeBlockService.getParamsColConfig(),
-							isDataSource: () => Boolean(props.dataSourceType),
-							dataSourceType: () => props.dataSourceType,
-							codeOptions,
-							editable: false
-						});
-						break;
-					default: config.value = [];
+						if (!props.type) return [];
+						return removeStyleDisplayConfig(await propsService.getPropsConfig(props.type));
+					case "data-source": return dataSourceService.getFormConfig(props.type || "base");
+					case "code-block": return getCodeBlockFormConfig({
+						paramColConfig: codeBlockService.getParamsColConfig(),
+						isDataSource: () => Boolean(props.dataSourceType),
+						dataSourceType: () => props.dataSourceType,
+						codeOptions,
+						editable: false
+					});
+					default: return [];
+				}
+			};
+			const loadConfig = async () => {
+				if (props.loadConfig) {
+					config.value = await props.loadConfig({
+						category: props.category,
+						type: props.type,
+						dataSourceType: props.dataSourceType,
+						defaultLoadConfig
+					});
+					return;
 				}
+				config.value = await defaultLoadConfig();
 			};
 			(0, vue.watch)([
 				() => props.category,
 				() => props.type,
-				() => props.dataSourceType
+				() => props.dataSourceType,
+				() => props.loadConfig
 			], () => {
 				loadConfig();
 			}, { immediate: true });
@@ -10111,20 +10273,37 @@
 		key: 0,
 		class: "m-editor-history-diff-dialog-body"
 	};
-	var _hoisted_2$19 = { class: "m-editor-history-diff-dialog-header" };
-	var _hoisted_3$6 = { class: "m-editor-history-diff-dialog-target" };
-	var _hoisted_4$5 = { class: "m-editor-history-diff-dialog-controls" };
-	var _hoisted_5$2 = { class: "m-editor-history-diff-dialog-legend" };
-	var _hoisted_6$2 = {
+	var _hoisted_2$19 = {
+		key: 0,
+		class: "m-editor-history-diff-dialog-notice"
+	};
+	var _hoisted_3$6 = { class: "m-editor-history-diff-dialog-header" };
+	var _hoisted_4$5 = { class: "m-editor-history-diff-dialog-target" };
+	var _hoisted_5$2 = { class: "m-editor-history-diff-dialog-controls" };
+	var _hoisted_6$2 = { class: "m-editor-history-diff-dialog-legend" };
+	var _hoisted_7 = {
 		key: 0,
 		class: "m-editor-history-diff-dialog-tip"
 	};
 	var HistoryDiffDialog_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ (0, vue.defineComponent)({
 		name: "MEditorHistoryDiffDialog",
 		__name: "HistoryDiffDialog",
-		props: { extendState: { type: Function } },
-		setup(__props, { expose: __expose }) {
-			/** 差异对话框的入参 */
+		props: {
+			extendState: {},
+			loadConfig: {},
+			width: { default: "900px" },
+			onConfirm: {},
+			selfDiffFieldTypes: {}
+		},
+		emits: ["close"],
+		setup(__props, { expose: __expose, emit: __emit }) {
+			const props = __props;
+			const emit = __emit;
+			/**
+			* 差异对比模式：
+			* - before：该步骤修改前 vs 该步骤修改后（默认行为，体现这一步带来的变化）
+			* - current：该步骤修改后 vs 当前最新值（用于查看「该步骤之后是否还被改过」）
+			*/
 			const visible = (0, vue.ref)(false);
 			const payload = (0, vue.ref)(null);
 			const mode = (0, vue.ref)("before");
@@ -10146,6 +10325,7 @@
 				scrollBeyondLastLine: false,
 				hideUnchangedRegions: { enabled: true }
 			};
+			const dialogTitle = (0, vue.computed)(() => props.onConfirm ? "确认回滚" : "查看修改差异");
 			const hasCurrent = (0, vue.computed)(() => payload.value?.currentValue !== void 0 && payload.value?.currentValue !== null);
 			/** 左侧（旧/参照）值 */
 			const leftValue = (0, vue.computed)(() => {
@@ -10166,13 +10346,20 @@
 				if (mode.value !== "current" || !payload.value) return false;
 				return isEqual(payload.value.value, payload.value.currentValue);
 			});
+			const onConfirmClick = () => {
+				const cb = props.onConfirm;
+				cb?.();
+				visible.value = false;
+			};
 			const targetText = (0, vue.computed)(() => {
 				if (!payload.value) return "";
-				const prefix = {
+				const categoryText = {
 					node: "节点",
 					"data-source": "数据源",
 					"code-block": "代码块"
-				}[payload.value.category] || "";
+				};
+				const { category } = payload.value;
+				const prefix = category ? categoryText[category] : "";
 				const label = payload.value.targetLabel || payload.value.type || "";
 				const { id } = payload.value;
 				return [prefix, id !== void 0 && id !== "" ? `${label}（${id}）` : label].filter(Boolean).join("：");
@@ -10189,6 +10376,9 @@
 			(0, vue.watch)(visible, (v) => {
 				if (!v) payload.value = null;
 			});
+			const onClose = () => {
+				emit("close");
+			};
 			__expose({
 				open,
 				close
@@ -10196,33 +10386,49 @@
 			return (_ctx, _cache) => {
 				return (0, vue.openBlock)(), (0, vue.createBlock)(vue.Teleport, { to: "body" }, [(0, vue.createVNode)((0, vue.unref)(_tmagic_design.TMagicDialog), {
 					modelValue: visible.value,
-					"onUpdate:modelValue": _cache[3] || (_cache[3] = ($event) => visible.value = $event),
+					"onUpdate:modelValue": _cache[4] || (_cache[4] = ($event) => visible.value = $event),
 					class: "m-editor-history-diff-dialog",
-					title: "查看修改差异",
-					width: "900px",
+					title: dialogTitle.value,
 					top: "5vh",
 					"destroy-on-close": "",
-					"append-to-body": ""
+					"append-to-body": "",
+					width: __props.width,
+					onClose
 				}, {
-					footer: (0, vue.withCtx)(() => [(0, vue.createVNode)((0, vue.unref)(_tmagic_design.TMagicButton), {
+					footer: (0, vue.withCtx)(() => [__props.onConfirm ? ((0, vue.openBlock)(), (0, vue.createElementBlock)(vue.Fragment, { key: 0 }, [(0, vue.createVNode)((0, vue.unref)(_tmagic_design.TMagicButton), {
 						size: "small",
 						onClick: _cache[2] || (_cache[2] = ($event) => visible.value = false)
 					}, {
-						default: (0, vue.withCtx)(() => [..._cache[9] || (_cache[9] = [(0, vue.createTextVNode)("关闭", -1)])]),
+						default: (0, vue.withCtx)(() => [..._cache[10] || (_cache[10] = [(0, vue.createTextVNode)("取消", -1)])]),
 						_: 1
-					})]),
+					}), (0, vue.createVNode)((0, vue.unref)(_tmagic_design.TMagicButton), {
+						size: "small",
+						type: "primary",
+						onClick: onConfirmClick
+					}, {
+						default: (0, vue.withCtx)(() => [..._cache[11] || (_cache[11] = [(0, vue.createTextVNode)("确定回滚", -1)])]),
+						_: 1
+					})], 64)) : ((0, vue.openBlock)(), (0, vue.createBlock)((0, vue.unref)(_tmagic_design.TMagicButton), {
+						key: 1,
+						size: "small",
+						onClick: _cache[3] || (_cache[3] = ($event) => visible.value = false)
+					}, {
+						default: (0, vue.withCtx)(() => [..._cache[12] || (_cache[12] = [(0, vue.createTextVNode)("关闭", -1)])]),
+						_: 1
+					}))]),
 					default: (0, vue.withCtx)(() => [payload.value ? ((0, vue.openBlock)(), (0, vue.createElementBlock)("div", _hoisted_1$57, [
-						(0, vue.createElementVNode)("div", _hoisted_2$19, [(0, vue.createElementVNode)("span", _hoisted_3$6, (0, vue.toDisplayString)(targetText.value), 1), (0, vue.createElementVNode)("div", _hoisted_4$5, [(0, vue.createVNode)((0, vue.unref)(_tmagic_design.TMagicRadioGroup), {
+						__props.onConfirm ? ((0, vue.openBlock)(), (0, vue.createElementBlock)("div", _hoisted_2$19, "仅回滚有差异的字段")) : (0, vue.createCommentVNode)("v-if", true),
+						(0, vue.createElementVNode)("div", _hoisted_3$6, [(0, vue.createElementVNode)("span", _hoisted_4$5, (0, vue.toDisplayString)(targetText.value), 1), (0, vue.createElementVNode)("div", _hoisted_5$2, [(0, vue.createVNode)((0, vue.unref)(_tmagic_design.TMagicRadioGroup), {
 							modelValue: viewMode.value,
 							"onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => viewMode.value = $event),
 							size: "small",
 							class: "m-editor-history-diff-dialog-view"
 						}, {
 							default: (0, vue.withCtx)(() => [(0, vue.createVNode)((0, vue.unref)(_tmagic_design.TMagicRadioButton), { value: "form" }, {
-								default: (0, vue.withCtx)(() => [..._cache[4] || (_cache[4] = [(0, vue.createTextVNode)("表单对比", -1)])]),
+								default: (0, vue.withCtx)(() => [..._cache[5] || (_cache[5] = [(0, vue.createTextVNode)("表单对比", -1)])]),
 								_: 1
 							}), (0, vue.createVNode)((0, vue.unref)(_tmagic_design.TMagicRadioButton), { value: "code" }, {
-								default: (0, vue.withCtx)(() => [..._cache[5] || (_cache[5] = [(0, vue.createTextVNode)("源码对比", -1)])]),
+								default: (0, vue.withCtx)(() => [..._cache[6] || (_cache[6] = [(0, vue.createTextVNode)("源码对比", -1)])]),
 								_: 1
 							})]),
 							_: 1
@@ -10233,18 +10439,18 @@
 							class: "m-editor-history-diff-dialog-mode"
 						}, {
 							default: (0, vue.withCtx)(() => [(0, vue.createVNode)((0, vue.unref)(_tmagic_design.TMagicRadioButton), { value: "before" }, {
-								default: (0, vue.withCtx)(() => [..._cache[6] || (_cache[6] = [(0, vue.createTextVNode)("与修改前对比", -1)])]),
+								default: (0, vue.withCtx)(() => [..._cache[7] || (_cache[7] = [(0, vue.createTextVNode)("与修改前对比", -1)])]),
 								_: 1
 							}), (0, vue.createVNode)((0, vue.unref)(_tmagic_design.TMagicRadioButton), {
 								value: "current",
 								disabled: !hasCurrent.value
 							}, {
-								default: (0, vue.withCtx)(() => [..._cache[7] || (_cache[7] = [(0, vue.createTextVNode)("与当前对比", -1)])]),
+								default: (0, vue.withCtx)(() => [..._cache[8] || (_cache[8] = [(0, vue.createTextVNode)("与当前对比", -1)])]),
 								_: 1
 							}, 8, ["disabled"])]),
 							_: 1
 						}, 8, ["modelValue"])])]),
-						(0, vue.createElementVNode)("div", _hoisted_5$2, [
+						(0, vue.createElementVNode)("div", _hoisted_6$2, [
 							(0, vue.createVNode)((0, vue.unref)(_tmagic_design.TMagicTag), {
 								size: "small",
 								type: "danger"
@@ -10252,7 +10458,7 @@
 								default: (0, vue.withCtx)(() => [(0, vue.createTextVNode)((0, vue.toDisplayString)(leftLabel.value), 1)]),
 								_: 1
 							}),
-							_cache[8] || (_cache[8] = (0, vue.createElementVNode)("span", { class: "m-editor-history-diff-dialog-arrow" }, "→", -1)),
+							_cache[9] || (_cache[9] = (0, vue.createElementVNode)("span", { class: "m-editor-history-diff-dialog-arrow" }, "→", -1)),
 							(0, vue.createVNode)((0, vue.unref)(_tmagic_design.TMagicTag), {
 								size: "small",
 								type: "success"
@@ -10260,16 +10466,18 @@
 								default: (0, vue.withCtx)(() => [(0, vue.createTextVNode)((0, vue.toDisplayString)(rightLabel.value), 1)]),
 								_: 1
 							}),
-							mode.value === "current" && isSameAsCurrent.value ? ((0, vue.openBlock)(), (0, vue.createElementBlock)("span", _hoisted_6$2, " 当前值与该步修改后一致，无差异 ")) : (0, vue.createCommentVNode)("v-if", true)
+							mode.value === "current" && isSameAsCurrent.value ? ((0, vue.openBlock)(), (0, vue.createElementBlock)("span", _hoisted_7, " 当前值与该步修改后一致，无差异 ")) : (0, vue.createCommentVNode)("v-if", true)
 						]),
 						viewMode.value === "form" ? ((0, vue.openBlock)(), (0, vue.createBlock)(CompareForm_default, {
-							key: 0,
+							key: 1,
 							category: payload.value.category,
 							type: payload.value.type,
 							"data-source-type": payload.value.dataSourceType,
 							value: rightValue.value,
 							"last-value": leftValue.value,
 							"extend-state": __props.extendState,
+							"load-config": __props.loadConfig,
+							"self-diff-field-types": __props.selfDiffFieldTypes,
 							height: "70vh"
 						}, null, 8, [
 							"category",
@@ -10277,9 +10485,11 @@
 							"data-source-type",
 							"value",
 							"last-value",
-							"extend-state"
+							"extend-state",
+							"load-config",
+							"self-diff-field-types"
 						])) : ((0, vue.openBlock)(), (0, vue.createBlock)(CodeEditor_default, {
-							key: 1,
+							key: 2,
 							type: "diff",
 							language: "json",
 							"init-values": leftValue.value,
@@ -10290,7 +10500,11 @@
 						}, null, 8, ["init-values", "modified-values"]))
 					])) : (0, vue.createCommentVNode)("v-if", true)]),
 					_: 1
-				}, 8, ["modelValue"])]);
+				}, 8, [
+					"modelValue",
+					"title",
+					"width"
+				])]);
 			};
 		}
 	});
@@ -10344,14 +10558,17 @@
 					"max-height": "360px"
 				}, {
 					default: (0, vue.withCtx)(() => [(0, vue.createElementVNode)("ul", _hoisted_2$18, [
-						((0, vue.openBlock)(true), (0, vue.createElementBlock)(vue.Fragment, null, (0, vue.renderList)(__props.list, (group, gIdx) => {
+						((0, vue.openBlock)(true), (0, vue.createElementBlock)(vue.Fragment, null, (0, vue.renderList)(__props.list, (group) => {
 							return (0, vue.openBlock)(), (0, vue.createBlock)(GroupRow_default, {
-								key: `pg-${gIdx}`,
-								"group-key": `pg-${gIdx}`,
+								key: `pg-${group.steps[0]?.index}`,
+								"group-key": `pg-${group.steps[0]?.index}`,
 								applied: group.applied,
 								merged: group.steps.length > 1,
 								"op-type": group.opType,
 								desc: (0, vue.unref)(describePageGroup)(group),
+								source: (0, vue.unref)(groupSource)(group),
+								time: (0, vue.unref)(formatHistoryTime)((0, vue.unref)(groupTimestamp)(group)),
+								"time-title": (0, vue.unref)(formatHistoryFullTime)((0, vue.unref)(groupTimestamp)(group)),
 								"step-count": group.steps.length,
 								"sub-steps": group.steps.map((s) => ({
 									index: s.index,
@@ -10359,10 +10576,13 @@
 									isCurrent: s.isCurrent,
 									desc: (0, vue.unref)(describePageStep)(s.step),
 									diffable: isPageStepDiffable(s.step),
-									revertable: s.applied
+									revertable: s.applied && (0, vue.unref)(isPageStepRevertable)(s.step),
+									source: s.step.source,
+									time: (0, vue.unref)(formatHistoryTime)(s.step.timestamp),
+									timeTitle: (0, vue.unref)(formatHistoryFullTime)(s.step.timestamp)
 								})),
 								"is-current": group.isCurrent,
-								expanded: !!__props.expanded[`pg-${gIdx}`],
+								expanded: !!__props.expanded[`pg-${group.steps[0]?.index}`],
 								onToggle: _cache[0] || (_cache[0] = (key) => _ctx.$emit("toggle", key)),
 								onGoto: _cache[1] || (_cache[1] = (index) => _ctx.$emit("goto", index)),
 								onDiffStep: _cache[2] || (_cache[2] = (index) => _ctx.$emit("diff-step", index)),
@@ -10373,6 +10593,9 @@
 								"merged",
 								"op-type",
 								"desc",
+								"source",
+								"time",
+								"time-title",
 								"step-count",
 								"sub-steps",
 								"is-current",
@@ -10417,7 +10640,8 @@
 			* 此外每条 step 上提供"查看差异"入口（仅在前后值都存在的 update 步骤显示），
 			* 点击后弹出 HistoryDiffDialog，使用 CompareForm 组件以表单形式展示新旧值差异。
 			*
-			* 各 tab 的内容拆分为独立的 SFC（PageTab / DataSourceTab / CodeBlockTab），
+			* 各 tab 的内容拆分为独立的 SFC：页面用 PageTab，数据源 / 代码块复用通用的 BucketTab
+			* （通过 title / prefix / describe* / isStepDiffable 注入差异）。
 			* 共享的描述生成与折叠状态在 composables.ts 中维护。
 			*/
 			const ClockIcon = (0, vue.markRaw)(_element_plus_icons_vue.Clock);
@@ -10426,7 +10650,23 @@
 			/** 面板显隐受控：reference 图标点击切换，右上角关闭按钮置为 false。 */
 			const visible = (0, vue.ref)(false);
 			const tabPaneComponent = (0, _tmagic_design.getDesignConfig)("components")?.tabPane;
-			const { editorService, dataSourceService, codeBlockService, historyService } = useServices();
+			/**
+			* 业务方自定义的扩展 tab，由 Editor 顶层通过 `historyListExtraTabs` 注入。
+			* 追加在内置「页面 / 数据源 / 代码块」三个 tab 之后，未提供时为空数组。
+			*/
+			const extraTabs = (0, vue.inject)("historyListExtraTabs", []);
+			/** label 支持字符串或函数，函数形式便于展示动态数量等内容。 */
+			const resolveTabLabel = (tab) => typeof tab.label === "function" ? tab.label() : tab.label;
+			const { editorService, dataSourceService, codeBlockService, historyService, propsService } = useServices();
+			/**
+			* 数据源 / 代码块功能可被业务方通过 `disabledDataSource` / `disabledCodeBlock` 禁用，
+			* 禁用后对应的历史记录 tab 不再展示。若当前激活的 tab 恰好被禁用，则回退到「页面」tab。
+			*/
+			const disabledDataSource = (0, vue.computed)(() => propsService.getDisabledDataSource());
+			const disabledCodeBlock = (0, vue.computed)(() => propsService.getDisabledCodeBlock());
+			(0, vue.watch)([disabledDataSource, disabledCodeBlock], ([dsDisabled, cbDisabled]) => {
+				if (activeTab.value === "data-source" && dsDisabled || activeTab.value === "code-block" && cbDisabled) activeTab.value = "page";
+			});
 			/**
 			* 通过 inject 拿到 Editor 顶层注入的 `extendFormState`，转交给 HistoryDiffDialog
 			* 内部的 CompareForm，使差异对比表单的 filterFunction 能拿到完整的业务上下文。
@@ -10434,6 +10674,10 @@
 			*/
 			const extendFormState = (0, vue.inject)("extendFormState", void 0);
 			const { expanded, toggleGroup, pageGroups, dataSourceGroups, codeBlockGroups, pageGroupsDisplay, dataSourceGroupsByTarget, codeBlockGroupsByTarget } = useHistoryList();
+			/** 数据源 step 仅 update（前后 schema 都存在）时可查看差异。 */
+			const isDataSourceStepDiffable = (step) => Boolean(step.oldSchema && step.newSchema);
+			/** 代码块 step 仅 update（前后 content 都存在）时可查看差异。 */
+			const isCodeBlockStepDiffable = (step) => Boolean(step.oldContent && step.newContent);
 			/** 把"目标 step 索引"翻译成"目标 cursor"（已应用步骤数量）。 */
 			const indexToCursor = (index) => index + 1;
 			const onPageGoto = (index) => {
@@ -10458,36 +10702,24 @@
 			const onCodeBlockGotoInitial = (id) => {
 				codeBlockService.goto(id, 0);
 			};
-			/**
-			* 「回滚」入口：把目标历史步骤的修改作为一次新操作反向应用（类 git revert），
-			* 不破坏原有栈结构。各 service 内部完成反向 + 入栈，并自带描述用于面板展示。
-			*/
-			const onPageRevert = (index) => {
-				editorService.revertPageStep(index);
-			};
-			const onDataSourceRevert = (id, index) => {
-				dataSourceService.revert(id, index);
-			};
-			const onCodeBlockRevert = (id, index) => {
-				codeBlockService.revert(id, index);
-			};
 			const diffDialogRef = (0, vue.useTemplateRef)("diffDialog");
 			/**
-			* 页面 step 差异：仅 update 单节点修改可对比，传入旧/新节点。
+			* 构造页面 step 的差异弹窗入参：仅 update 单节点修改可对比，传入旧/新节点。
 			* 节点类型 `type` 优先取 newNode.type，再回退 oldNode.type。
 			* `currentValue` 取自 editorService 中该节点当前实际值，用于支持「与当前对比」。
+			* 无可对比内容（如多节点 / add / remove）时返回 null。
 			*/
-			const onPageDiff = (index) => {
+			const buildPageDiffPayload = (index) => {
 				const groups = historyService.getPageHistoryGroups();
 				for (const group of groups) {
 					const entry = group.steps.find((s) => s.index === index);
 					if (!entry) continue;
 					const item = entry.step.updatedItems?.[0];
-					if (!item?.oldNode || !item?.newNode) return;
+					if (!item?.oldNode || !item?.newNode) return null;
 					const type = item.newNode.type || item.oldNode.type || "";
 					const nodeId = item.newNode.id ?? item.oldNode.id;
 					const currentNode = nodeId !== void 0 ? editorService.getNodeById(nodeId) : null;
-					diffDialogRef.value?.open({
+					return {
 						category: "node",
 						type,
 						lastValue: item.oldNode,
@@ -10495,50 +10727,87 @@
 						currentValue: currentNode || null,
 						targetLabel: item.newNode.name || item.oldNode.name || type,
 						id: nodeId
-					});
-					return;
+					};
 				}
+				return null;
 			};
-			const onDataSourceDiff = (id, index) => {
-				const groups = historyService.getDataSourceHistoryGroups();
+			/**
+			* 在指定分组列表中按 id / index 查找命中的 step，命中后交由 build 构造差异弹窗入参。
+			* 用于统一数据源、代码块两类历史的查找逻辑。
+			*/
+			const findGroupStep = (groups, id, index, build) => {
 				for (const group of groups) {
 					if (group.id !== id) continue;
 					const entry = group.steps.find((s) => s.index === index);
 					if (!entry) continue;
-					const { oldSchema, newSchema } = entry.step;
-					if (!oldSchema || !newSchema) return;
-					const currentSchema = dataSourceService.getDataSourceById(`${id}`);
-					diffDialogRef.value?.open({
-						category: "data-source",
-						type: newSchema.type || oldSchema.type || "base",
-						lastValue: oldSchema,
-						value: newSchema,
-						currentValue: currentSchema || null,
-						targetLabel: newSchema.title || oldSchema.title || `${id}`,
-						id
-					});
-					return;
+					return build(entry.step);
 				}
+				return null;
+			};
+			const buildDataSourceDiffPayload = (id, index) => findGroupStep(historyService.getDataSourceHistoryGroups(), id, index, ({ oldSchema, newSchema }) => {
+				if (!oldSchema || !newSchema) return null;
+				const currentSchema = dataSourceService.getDataSourceById(`${id}`);
+				return {
+					category: "data-source",
+					type: newSchema.type || oldSchema.type || "base",
+					lastValue: oldSchema,
+					value: newSchema,
+					currentValue: currentSchema || null,
+					targetLabel: newSchema.title || oldSchema.title || `${id}`,
+					id
+				};
+			});
+			const buildCodeBlockDiffPayload = (id, index) => findGroupStep(historyService.getCodeBlockHistoryGroups(), id, index, ({ oldContent, newContent }) => {
+				if (!oldContent || !newContent) return null;
+				return {
+					category: "code-block",
+					lastValue: oldContent,
+					value: newContent,
+					currentValue: codeBlockService.getCodeContentById(id) || null,
+					targetLabel: newContent.name || oldContent.name || `${id}`,
+					id
+				};
+			});
+			const onPageDiff = (index) => {
+				const payload = buildPageDiffPayload(index);
+				if (payload) diffDialogRef.value?.open(payload);
+			};
+			const onDataSourceDiff = (id, index) => {
+				const payload = buildDataSourceDiffPayload(id, index);
+				if (payload) diffDialogRef.value?.open(payload);
 			};
 			const onCodeBlockDiff = (id, index) => {
-				const groups = historyService.getCodeBlockHistoryGroups();
-				for (const group of groups) {
-					if (group.id !== id) continue;
-					const entry = group.steps.find((s) => s.index === index);
-					if (!entry) continue;
-					const { oldContent, newContent } = entry.step;
-					if (!oldContent || !newContent) return;
-					const currentContent = codeBlockService.getCodeContentById(id);
-					diffDialogRef.value?.open({
-						category: "code-block",
-						lastValue: oldContent,
-						value: newContent,
-						currentValue: currentContent || null,
-						targetLabel: newContent.name || oldContent.name || `${id}`,
-						id
-					});
-					return;
-				}
+				const payload = buildCodeBlockDiffPayload(id, index);
+				if (payload) diffDialogRef.value?.open(payload);
+			};
+			const onConfirmRevert = (0, vue.shallowRef)();
+			/**
+			* 「回滚」入口：把目标历史步骤的修改作为一次新操作反向应用（类 git revert），
+			* 不破坏原有栈结构。各 service 内部完成反向 + 入栈，并自带描述用于面板展示。
+			*
+			* 交互：先弹出该步骤的差异弹窗供用户确认，点击「确定回滚」后再真正执行回滚；
+			* 对没有可对比内容的步骤（如 add / remove / 多节点更新）则直接回滚。
+			*/
+			const onPageRevert = (index) => {
+				const payload = buildPageDiffPayload(index);
+				onConfirmRevert.value = () => editorService.revertPageStep(index);
+				if (payload) diffDialogRef.value?.open({ ...payload });
+				else onConfirmRevert.value();
+			};
+			const onDataSourceRevert = (id, index) => {
+				const payload = buildDataSourceDiffPayload(id, index);
+				onConfirmRevert.value = () => dataSourceService.revert(id, index);
+				if (payload) diffDialogRef.value?.open({ ...payload });
+				else onConfirmRevert.value();
+			};
+			const onCodeBlockRevert = (id, index) => {
+				const payload = buildCodeBlockDiffPayload(id, index);
+				onConfirmRevert.value = () => codeBlockService.revert(id, index);
+				if (payload) diffDialogRef.value?.open({ ...payload });
+				else onConfirmRevert.value();
+			};
+			const onDiffDialogClose = () => {
+				onConfirmRevert.value = void 0;
 			};
 			return (_ctx, _cache) => {
 				return (0, vue.openBlock)(), (0, vue.createElementBlock)(vue.Fragment, null, [(0, vue.createVNode)((0, vue.unref)(_tmagic_design.TMagicPopover), {
@@ -10603,13 +10872,19 @@
 								])]),
 								_: 1
 							}, 16)),
-							((0, vue.openBlock)(), (0, vue.createBlock)((0, vue.resolveDynamicComponent)((0, vue.unref)(tabPaneComponent)?.component || "el-tab-pane"), (0, vue.normalizeProps)((0, vue.guardReactiveProps)((0, vue.unref)(tabPaneComponent)?.props({
+							!disabledDataSource.value ? ((0, vue.openBlock)(), (0, vue.createBlock)((0, vue.resolveDynamicComponent)((0, vue.unref)(tabPaneComponent)?.component || "el-tab-pane"), (0, vue.normalizeProps)((0, vue.mergeProps)({ key: 0 }, (0, vue.unref)(tabPaneComponent)?.props({
 								name: "data-source",
 								label: `数据源 (${(0, vue.unref)(dataSourceGroups).length})`
 							}) || {})), {
-								default: (0, vue.withCtx)(() => [(0, vue.createVNode)(DataSourceTab_default, {
+								default: (0, vue.withCtx)(() => [(0, vue.createVNode)(BucketTab_default, {
+									title: "数据源",
+									prefix: "ds",
 									buckets: (0, vue.unref)(dataSourceGroupsByTarget),
 									expanded: (0, vue.unref)(expanded),
+									"describe-group": (0, vue.unref)(describeDataSourceGroup),
+									"describe-step": (0, vue.unref)(describeDataSourceStep),
+									"is-step-diffable": isDataSourceStepDiffable,
+									"is-step-revertable": (0, vue.unref)(isDataSourceStepRevertable),
 									onToggle: (0, vue.unref)(toggleGroup),
 									onGoto: onDataSourceGoto,
 									onGotoInitial: onDataSourceGotoInitial,
@@ -10618,17 +10893,26 @@
 								}, null, 8, [
 									"buckets",
 									"expanded",
+									"describe-group",
+									"describe-step",
+									"is-step-revertable",
 									"onToggle"
 								])]),
 								_: 1
-							}, 16)),
-							((0, vue.openBlock)(), (0, vue.createBlock)((0, vue.resolveDynamicComponent)((0, vue.unref)(tabPaneComponent)?.component || "el-tab-pane"), (0, vue.normalizeProps)((0, vue.guardReactiveProps)((0, vue.unref)(tabPaneComponent)?.props({
+							}, 16)) : (0, vue.createCommentVNode)("v-if", true),
+							!disabledCodeBlock.value ? ((0, vue.openBlock)(), (0, vue.createBlock)((0, vue.resolveDynamicComponent)((0, vue.unref)(tabPaneComponent)?.component || "el-tab-pane"), (0, vue.normalizeProps)((0, vue.mergeProps)({ key: 1 }, (0, vue.unref)(tabPaneComponent)?.props({
 								name: "code-block",
 								label: `代码块 (${(0, vue.unref)(codeBlockGroups).length})`
 							}) || {})), {
-								default: (0, vue.withCtx)(() => [(0, vue.createVNode)(CodeBlockTab_default, {
+								default: (0, vue.withCtx)(() => [(0, vue.createVNode)(BucketTab_default, {
+									title: "代码块",
+									prefix: "cb",
 									buckets: (0, vue.unref)(codeBlockGroupsByTarget),
 									expanded: (0, vue.unref)(expanded),
+									"describe-group": (0, vue.unref)(describeCodeBlockGroup),
+									"describe-step": (0, vue.unref)(describeCodeBlockStep),
+									"is-step-diffable": isCodeBlockStepDiffable,
+									"is-step-revertable": (0, vue.unref)(isCodeBlockStepRevertable),
 									onToggle: (0, vue.unref)(toggleGroup),
 									onGoto: onCodeBlockGoto,
 									onGotoInitial: onCodeBlockGotoInitial,
@@ -10637,18 +10921,32 @@
 								}, null, 8, [
 									"buckets",
 									"expanded",
+									"describe-group",
+									"describe-step",
+									"is-step-revertable",
 									"onToggle"
 								])]),
 								_: 1
-							}, 16))
+							}, 16)) : (0, vue.createCommentVNode)("v-if", true),
+							((0, vue.openBlock)(true), (0, vue.createElementBlock)(vue.Fragment, null, (0, vue.renderList)((0, vue.unref)(extraTabs), (tab) => {
+								return (0, vue.openBlock)(), (0, vue.createBlock)((0, vue.resolveDynamicComponent)((0, vue.unref)(tabPaneComponent)?.component || "el-tab-pane"), (0, vue.mergeProps)({ key: tab.name }, { ref_for: true }, (0, vue.unref)(tabPaneComponent)?.props({
+									name: tab.name,
+									label: resolveTabLabel(tab)
+								}) || {}), {
+									default: (0, vue.withCtx)(() => [((0, vue.openBlock)(), (0, vue.createBlock)((0, vue.resolveDynamicComponent)(tab.component), (0, vue.mergeProps)({ ref_for: true }, tab.props || {}, (0, vue.toHandlers)(tab.listeners || {})), null, 16))]),
+									_: 2
+								}, 1040);
+							}), 128))
 						]),
 						_: 1
 					}, 8, ["modelValue"])])]),
 					_: 1
 				}, 8, ["visible"]), (0, vue.createVNode)(HistoryDiffDialog_default, {
 					ref: "diffDialog",
-					"extend-state": (0, vue.unref)(extendFormState)
-				}, null, 8, ["extend-state"])], 64);
+					"extend-state": (0, vue.unref)(extendFormState),
+					"on-confirm": onConfirmRevert.value,
+					onClose: onDiffDialogClose
+				}, null, 8, ["extend-state", "on-confirm"])], 64);
 			};
 		}
 	});
@@ -10895,7 +11193,7 @@
 							disabled: () => editorService.get("node")?.type === _tmagic_core.NodeType.PAGE,
 							handler: () => {
 								const node = editorService.get("node");
-								node && editorService.remove(node);
+								node && editorService.remove(node, { historySource: "toolbar" });
 							}
 						});
 						break;
@@ -11259,7 +11557,11 @@
 							if (record.propPath?.startsWith("style") && record.value === "") (0, _tmagic_utils.setValueByKeyPath)(record.propPath, record.value, newValue);
 						});
 					}
-					editorService.update(newValue, { changeRecords: eventData?.changeRecords });
+					const historySource = eventData ? "props" : "code";
+					editorService.update(newValue, {
+						changeRecords: eventData?.changeRecords,
+						historySource
+					});
 				} catch (e) {
 					emit("submit-error", e);
 				}
@@ -12228,7 +12530,7 @@
 			const editCode = (id) => {
 				emit("edit", id);
 			};
-			const deleteCode = async (id) => {
+			const deleteCode = async (id, { historySource } = {}) => {
 				const currentCode = codeList.value.find((codeItem) => codeItem.id === id);
 				const existBinds = Boolean(currentCode?.items?.length);
 				const undeleteableList = codeBlockService.getUndeletableList() || [];
@@ -12238,7 +12540,7 @@
 						cancelButtonText: "取消",
 						type: "warning"
 					});
-					emit("remove", id);
+					emit("remove", id, { historySource });
 				} else if (typeof props.customError === "function") props.customError(id, existBinds ? CodeDeleteErrorType.BIND : CodeDeleteErrorType.UNDELETEABLE);
 				else if (existBinds) _tmagic_design.tMagicMessage.error("代码块存在绑定关系，不可删除");
 				else _tmagic_design.tMagicMessage.error("代码块不可删除");
@@ -12288,7 +12590,7 @@
 							default: (0, vue.withCtx)(() => [(0, vue.createVNode)(Icon_default, {
 								icon: (0, vue.unref)(_element_plus_icons_vue.Close),
 								class: "edit-icon",
-								onClick: (0, vue.withModifiers)(($event) => deleteCode(`${data.key}`), ["stop"])
+								onClick: (0, vue.withModifiers)(($event) => deleteCode(`${data.key}`, { historySource: "tree" }), ["stop"])
 							}, null, 8, ["icon", "onClick"])]),
 							_: 2
 						}, 1024)) : (0, vue.createCommentVNode)("v-if", true),
@@ -12336,7 +12638,7 @@
 					const codeBlock = codeBlockService.getCodeContentById(selectId);
 					if (!codeBlock) return;
 					const newCodeId = await codeBlockService.getUniqueId();
-					codeBlockService.setCodeDslById(newCodeId, cloneDeep$1(codeBlock));
+					codeBlockService.setCodeDslById(newCodeId, cloneDeep$1(codeBlock), { historySource: "tree-contextmenu" });
 				}
 			},
 			{
@@ -12398,7 +12700,7 @@
 				if (codeBlockListRef.value) for (const [, status] of codeBlockListRef.value.nodeStatusMap.entries()) status.selected = false;
 			};
 			const { nodeContentMenuHandler, menuData: contentMenuData, contentMenuHideHandler } = useContentMenu$1((id) => {
-				codeBlockListRef.value?.deleteCode(id);
+				codeBlockListRef.value?.deleteCode(id, { historySource: "tree-contextmenu" });
 			});
 			const menuData = (0, vue.computed)(() => props.customContentMenu(contentMenuData, "code-block"));
 			return (_ctx, _cache) => {
@@ -12486,8 +12788,11 @@
 			editDialog.value.show();
 		};
 		const submitDataSourceHandler = (value, eventData) => {
-			if (value.id) dataSourceService.update(value, { changeRecords: eventData.changeRecords });
-			else dataSourceService.add(value);
+			if (value.id) dataSourceService.update(value, {
+				changeRecords: eventData.changeRecords,
+				historySource: "props"
+			});
+			else dataSourceService.add(value, { historySource: "props" });
 			editDialog.value?.hide();
 		};
 		return {
@@ -12820,7 +13125,7 @@
 					if (!selectId) return;
 					const ds = dataSourceService.getDataSourceById(selectId);
 					if (!ds) return;
-					dataSourceService.add(cloneDeep$1(ds));
+					dataSourceService.add(cloneDeep$1(ds), { historySource: "tree-contextmenu" });
 				}
 			},
 			{
@@ -12897,7 +13202,7 @@
 					cancelButtonText: "取消",
 					type: "warning"
 				});
-				dataSourceService.remove(id);
+				dataSourceService.remove(id, { historySource: "tree-contextmenu" });
 			};
 			const dataSourceListRef = (0, vue.useTemplateRef)("dataSourceList");
 			const filterTextChangeHandler = (val) => {
@@ -13004,7 +13309,12 @@
 	var FolderMinusIcon_default = FolderMinusIcon_vue_vue_type_script_setup_true_lang_default;
 	//#endregion
 	//#region packages/editor/src/utils/content-menu.ts
-	var useDeleteMenu = () => ({
+	/**
+	* 共享的右键菜单项构造器（画布 ViewerMenu 与图层树 LayerMenu 共用）。
+	* `historySource` 用于标记本次操作的途径，调用方按所在面板传入：
+	* 画布传 `'stage-contextmenu'`，树形面板传 `'tree-contextmenu'`。
+	*/
+	var useDeleteMenu = (historySource) => ({
 		type: "button",
 		text: "删除",
 		icon: _element_plus_icons_vue.Delete,
@@ -13014,7 +13324,7 @@
 		},
 		handler: ({ editorService }) => {
 			const nodes = editorService.get("nodes");
-			nodes && editorService.remove(nodes);
+			nodes && editorService.remove(nodes, { historySource });
 		}
 	});
 	var useCopyMenu = () => ({
@@ -13026,7 +13336,7 @@
 			nodes && editorService?.copy(nodes);
 		}
 	});
-	var usePasteMenu = (menu) => ({
+	var usePasteMenu = (historySource, menu) => ({
 		type: "button",
 		text: "粘贴",
 		icon: (0, vue.markRaw)(_element_plus_icons_vue.DocumentCopy),
@@ -13043,17 +13353,20 @@
 				editorService.paste({
 					left: initialLeft,
 					top: initialTop
-				});
-			} else editorService.paste();
+				}, void 0, { historySource });
+			} else editorService.paste(void 0, void 0, { historySource });
 		}
 	});
-	var moveTo = async (id, { editorService }) => {
+	var moveTo = async (id, { editorService }, historySource) => {
 		const nodes = editorService.get("nodes") || [];
 		const parent = editorService.getNodeById(id);
 		if (!parent || nodes.length === 0) return;
-		await editorService.moveToContainer((0, _tmagic_core.cloneDeep)(nodes), parent.id, { doNotSwitchPage: true });
+		await editorService.moveToContainer((0, _tmagic_core.cloneDeep)(nodes), parent.id, {
+			doNotSwitchPage: true,
+			historySource
+		});
 	};
-	var useMoveToMenu = ({ editorService }) => {
+	var useMoveToMenu = ({ editorService }, historySource) => {
 		return {
 			type: "button",
 			text: "移动至",
@@ -13066,7 +13379,7 @@
 				text: `${page.name}(${page.id})`,
 				type: "button",
 				handler: (services) => {
-					moveTo(page.id, services);
+					moveTo(page.id, services, historySource);
 				}
 			}))
 		};
@@ -13099,7 +13412,7 @@
 						name: component.text,
 						type: component.type,
 						...component.data || {}
-					});
+					}, void 0, { historySource: "tree-contextmenu" });
 				}
 			}));
 			const getSubMenuData = (0, vue.computed)(() => {
@@ -13108,7 +13421,7 @@
 					type: "button",
 					icon: _element_plus_icons_vue.Files,
 					handler: () => {
-						editorService.add({ type: "tab-pane" });
+						editorService.add({ type: "tab-pane" }, void 0, { historySource: "tree-contextmenu" });
 					}
 				}];
 				if (node.value?.items) return componentList.value.reduce((subMenuData, group, index) => subMenuData.concat(createMenuItems(group), index < componentList.value.length - 1 ? [{
@@ -13135,9 +13448,9 @@
 					items: getSubMenuData.value
 				},
 				useCopyMenu(),
-				usePasteMenu(),
-				useDeleteMenu(),
-				useMoveToMenu(services),
+				usePasteMenu("tree-contextmenu"),
+				useDeleteMenu("tree-contextmenu"),
+				useMoveToMenu(services, "tree-contextmenu"),
 				...props.layerContentMenu
 			], "layer"));
 			const show = (e) => {
@@ -13168,7 +13481,7 @@
 				editorService.update({
 					id: props.data.id,
 					visible
-				});
+				}, { historySource: "tree" });
 			};
 			return (_ctx, _cache) => {
 				return __props.data.type !== "page" ? ((0, vue.openBlock)(), (0, vue.createBlock)((0, vue.unref)(_tmagic_design.TMagicButton), {
@@ -13784,7 +14097,7 @@
 					name: text,
 					type,
 					...data
-				});
+				}, void 0, { historySource: "component-panel" });
 			};
 			const dragstartHandler = ({ text, type, data = {} }, e) => {
 				e.dataTransfer?.setData("text/json", (0, serialize_javascript.default)({
@@ -14589,11 +14902,11 @@
 					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",
@@ -14608,7 +14921,7 @@
 					icon: (0, vue.markRaw)(_element_plus_icons_vue.Top),
 					display: () => !(0, _tmagic_utils.isPage)(node.value) && !(0, _tmagic_utils.isPageFragment)(node.value) && !props.isMultiSelect,
 					handler: () => {
-						editorService.moveLayer(1);
+						editorService.moveLayer(1, { historySource: "stage-contextmenu" });
 					}
 				},
 				{
@@ -14617,7 +14930,7 @@
 					icon: (0, vue.markRaw)(_element_plus_icons_vue.Bottom),
 					display: () => !(0, _tmagic_utils.isPage)(node.value) && !(0, _tmagic_utils.isPageFragment)(node.value) && !props.isMultiSelect,
 					handler: () => {
-						editorService.moveLayer(-1);
+						editorService.moveLayer(-1, { historySource: "stage-contextmenu" });
 					}
 				},
 				{
@@ -14626,7 +14939,7 @@
 					icon: (0, vue.markRaw)(_element_plus_icons_vue.Top),
 					display: () => !(0, _tmagic_utils.isPage)(node.value) && !(0, _tmagic_utils.isPageFragment)(node.value) && !props.isMultiSelect,
 					handler: () => {
-						editorService.moveLayer(LayerOffset.TOP);
+						editorService.moveLayer(LayerOffset.TOP, { historySource: "stage-contextmenu" });
 					}
 				},
 				{
@@ -14635,16 +14948,16 @@
 					icon: (0, vue.markRaw)(_element_plus_icons_vue.Bottom),
 					display: () => !(0, _tmagic_utils.isPage)(node.value) && !(0, _tmagic_utils.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: () => !(0, _tmagic_utils.isPage)(node.value) && !(0, _tmagic_utils.isPageFragment)(node.value) && !props.isMultiSelect
 				},
-				useDeleteMenu(),
+				useDeleteMenu("stage-contextmenu"),
 				{
 					type: "divider",
 					direction: "horizontal"
@@ -14901,7 +15214,7 @@
 						left: (0, _tmagic_utils.calcValueByFontsize)(doc, left / zoom.value)
 					};
 					config.data.inputEvent = e;
-					editorService.add(config.data, parent);
+					editorService.add(config.data, parent, { historySource: "component-panel" });
 				}
 			};
 			return (_ctx, _cache) => {
@@ -15189,10 +15502,12 @@
 		* @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
 			});
 		}
 		/**
@@ -15207,7 +15522,7 @@
 		* @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;
@@ -15226,7 +15541,8 @@
 				oldContent,
 				newContent,
 				changeRecords,
-				historyDescription
+				historyDescription,
+				source: historySource
 			});
 			this.emit("addOrUpdate", id, codeDsl[id]);
 		}
@@ -15307,7 +15623,7 @@
 		* @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) => {
@@ -15316,7 +15632,8 @@
 				if (oldContent && !doNotPushHistory) history_default.pushCodeBlock(id, {
 					oldContent,
 					newContent: null,
-					historyDescription
+					historyDescription,
+					source: historySource
 				});
 				this.emit("remove", id);
 			});
@@ -15396,6 +15713,7 @@
 		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);
 		}
@@ -15466,11 +15784,17 @@
 		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;
@@ -15489,11 +15813,15 @@
 				}
 				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;
 		}
 		/**
@@ -15657,7 +15985,7 @@
 		* @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()
@@ -15666,7 +15994,8 @@
 			if (!doNotPushHistory) history_default.pushDataSource(newConfig.id, {
 				oldSchema: null,
 				newSchema: newConfig,
-				historyDescription
+				historyDescription,
+				source: historySource
 			});
 			this.emit("add", newConfig);
 			return newConfig;
@@ -15679,7 +16008,7 @@
 		* @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];
@@ -15689,7 +16018,8 @@
 				oldSchema: oldConfig ? cloneDeep$1(oldConfig) : null,
 				newSchema: newConfig,
 				changeRecords,
-				historyDescription
+				historyDescription,
+				source: historySource
 			});
 			this.emit("update", newConfig, {
 				oldConfig,
@@ -15704,7 +16034,7 @@
 		* @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;
@@ -15712,7 +16042,8 @@
 			if (oldConfig && !doNotPushHistory) history_default.pushDataSource(id, {
 				oldSchema: cloneDeep$1(oldConfig),
 				newSchema: null,
-				historyDescription
+				historyDescription,
+				source: historySource
 			});
 			this.emit("remove", id);
 		}
@@ -15784,6 +16115,7 @@
 		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);
 		}
@@ -15847,11 +16179,17 @@
 		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;
@@ -15870,11 +16208,15 @@
 				}
 				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;
 		}
 		/**
@@ -16191,7 +16533,7 @@
 			[KeyBindingCommand.DELETE_NODE]: () => {
 				const nodes = editor_default.get("nodes");
 				if (!nodes || (0, _tmagic_utils.isPage)(nodes[0]) || (0, _tmagic_utils.isPageFragment)(nodes[0])) return;
-				editor_default.remove(nodes);
+				editor_default.remove(nodes, { historySource: "shortcut" });
 			},
 			[KeyBindingCommand.COPY_NODE]: () => {
 				const nodes = editor_default.get("nodes");
@@ -16201,13 +16543,13 @@
 				const nodes = editor_default.get("nodes");
 				if (!nodes || (0, _tmagic_utils.isPage)(nodes[0]) || (0, _tmagic_utils.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();
@@ -16518,6 +16860,7 @@
 		disabledMultiSelect: false,
 		alwaysMultiSelect: false,
 		disabledPageFragment: false,
+		disabledFlashTip: false,
 		disabledStageOverlay: false,
 		containerHighlightClassName: _tmagic_stage.CONTAINER_HIGHLIGHT_CLASS_NAME,
 		containerHighlightDuration: 800,
@@ -16527,6 +16870,7 @@
 		disabledCodeBlock: false,
 		componentGroupList: () => [],
 		datasourceList: () => [],
+		historyListExtraTabs: () => [],
 		menu: () => ({
 			left: [],
 			right: []
@@ -16967,6 +17311,7 @@
 			disabledMultiSelect: { type: Boolean },
 			alwaysMultiSelect: { type: Boolean },
 			disabledPageFragment: { type: Boolean },
+			disabledFlashTip: { type: Boolean },
 			disabledStageOverlay: { type: Boolean },
 			disabledShowSrc: { type: Boolean },
 			disabledDataSource: { type: Boolean },
@@ -16983,6 +17328,7 @@
 			beforeDblclick: { type: Function },
 			beforeLayerNodeDblclick: { type: Function },
 			extendFormState: { type: Function },
+			historyListExtraTabs: {},
 			pageBarSortOptions: {},
 			pageFilterFunction: { type: Function }
 		}, defaultEditorProps),
@@ -17032,6 +17378,7 @@
 				guidesOptions: props.guidesOptions,
 				disabledMultiSelect: props.disabledMultiSelect,
 				alwaysMultiSelect: props.alwaysMultiSelect,
+				disabledFlashTip: props.disabledFlashTip,
 				beforeDblclick: props.beforeDblclick
 			};
 			stageOverlay_default.set("stageOptions", stageOptions);
@@ -17044,6 +17391,12 @@
 			* 与 PropsPanel 通过 `:extend-state` 显式传入的方式保持等价。
 			*/
 			(0, vue.provide)("extendFormState", props.extendFormState);
+			/**
+			* 把历史记录面板的自定义扩展 tab 提供给深层的 HistoryListPanel（它挂在 NavMenu 中，
+			* 以 markRaw component 形式渲染，无法直接通过 props 透传）。业务方可借此在历史记录
+			* 面板内追加自定义模块的历史 tab。
+			*/
+			(0, vue.provide)("historyListExtraTabs", props.historyListExtraTabs);
 			(0, vue.provide)("eventBus", new events.EventEmitter());
 			const propsPanelMountedHandler = (e) => {
 				emit("props-panel-mounted", e);
@@ -21552,10 +21905,7 @@
 			});
 			const modelValue = (0, vue.reactive)({ form: { [props.name]: "" } });
 			(0, vue.watch)(() => props.model[props.name], (value) => {
-				modelValue.form = { [props.name]: (0, serialize_javascript.default)(value, {
-					space: 2,
-					unsafe: true
-				}).replace(/"(\w+)":\s/g, "$1: ") };
+				modelValue.form = { [props.name]: serializeConfig(value) };
 			}, { immediate: true });
 			const changeHandler = (v) => {
 				if (!props.name || !props.model) return;
@@ -21814,6 +22164,8 @@
 	exports.Fixed2Other = Fixed2Other;
 	exports.FloatingBox = FloatingBox_default;
 	exports.H_GUIDE_LINE_STORAGE_KEY = H_GUIDE_LINE_STORAGE_KEY;
+	exports.HistoryDiffDialog = HistoryDiffDialog_default;
+	exports.HistoryListBucket = Bucket_default;
 	exports.Icon = Icon_default;
 	exports.IdleTask = IdleTask;
 	exports.KeyBindingCommand = KeyBindingCommand;