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

package/dist/es/layouts/history-list/InitialRow.vue_vue_type_script_setup_true_lang.js

@@ -1,6 +1,18 @@
-import { createCommentVNode, createElementBlock, createElementVNode, defineComponent, normalizeClass, openBlock, withModifiers } from "vue";
+import { formatHistoryFullTime, formatHistoryTime } from "./composables.js";
+import { computed, createCommentVNode, createElementBlock, createElementVNode, defineComponent, normalizeClass, openBlock, toDisplayString, withModifiers } from "vue";
 //#region packages/editor/src/layouts/history-list/InitialRow.vue?vue&type=script&setup=true&lang.ts
 var _hoisted_1 = ["title"];
+var _hoisted_2 = { class: "m-editor-history-list-item-desc" };
+var _hoisted_3 = {
+	key: 0,
+	class: "m-editor-history-list-item-saved",
+	title: "该记录为最近一次保存的状态"
+};
+var _hoisted_4 = {
+	key: 1,
+	class: "m-editor-history-list-item-actions"
+};
+var _hoisted_5 = ["title"];
 var InitialRow_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ defineComponent({
 	name: "MEditorHistoryListInitialRow",
 	__name: "InitialRow",
@@ -9,7 +21,8 @@ var InitialRow_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ def
 		gotoEnabled: {
 			type: Boolean,
 			default: true
-		}
+		},
+		marker: { default: void 0 }
 	},
 	emits: ["goto-initial"],
 	setup(__props, { emit: __emit }) {
@@ -17,10 +30,21 @@ var InitialRow_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ def
 		* 「初始状态」记录行：渲染于历史列表底部，作为整个栈的"零点"。
 		* - 点击该行会把对应栈撤销到 cursor === 0（即没有任何已应用步骤），等同于回到所有修改之前。
 		* - 当对应栈本身已处于 cursor === 0 时（isCurrent=true），用户已在初始状态，点击不再触发动作。
+		* - 当上层传入 `marker`（设置 root 时为该页生成的「未修改的初始状态」标记）时，
+		*   用标记的文案与时间渲染本行；标记不进入撤销/重做栈，仅作为该页基线展示。
 		*
 		* 该行不是真实 step，仅作为 UI 入口；上层负责把"点击"翻译为 `service.goto*(0)`。
 		*/
 		const props = __props;
+		const desc = computed(() => props.marker?.historyDescription || "未修改的初始状态");
+		/** 基线（初始状态）是否为最近一次保存点：仅页面栈的 `initial` 基线 step 会被 markSaved 标记。 */
+		const saved = computed(() => Boolean(props.marker?.saved));
+		const time = computed(() => formatHistoryTime(props.marker?.timestamp));
+		const timeTitle = computed(() => formatHistoryFullTime(props.marker?.timestamp));
+		const rowTitle = computed(() => {
+			const base = props.marker?.historyDescription || "未修改的初始状态";
+			return props.isCurrent ? `当前已回到${base}` : `点击回到${base}`;
+		});
 		const emit = __emit;
 		const onClick = () => {
 			if (props.isCurrent) return;
@@ -32,20 +56,25 @@ var InitialRow_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ def
 					"is-current": __props.isCurrent,
 					"is-clickable": !__props.isCurrent
 				}]),
-				title: __props.isCurrent ? "当前已回到未修改的初始状态" : "点击回到未修改的初始状态"
+				title: rowTitle.value
 			}, [
 				_cache[0] || (_cache[0] = createElementVNode("span", {
 					class: "m-editor-history-list-item-index",
 					title: "历史步骤编号 #0（未修改的初始状态）"
 				}, "#0", -1)),
 				_cache[1] || (_cache[1] = createElementVNode("span", { class: "m-editor-history-list-item-op op-initial" }, "初始", -1)),
-				_cache[2] || (_cache[2] = createElementVNode("span", { class: "m-editor-history-list-item-desc" }, "未修改的初始状态", -1)),
-				__props.gotoEnabled && !__props.isCurrent ? (openBlock(), createElementBlock("span", {
-					key: 0,
+				createElementVNode("span", _hoisted_2, toDisplayString(desc.value), 1),
+				saved.value ? (openBlock(), createElementBlock("span", _hoisted_3, "已保存")) : createCommentVNode("v-if", true),
+				__props.gotoEnabled && !__props.isCurrent ? (openBlock(), createElementBlock("span", _hoisted_4, [createElementVNode("span", {
 					class: "m-editor-history-list-item-goto",
 					title: "回到该记录",
 					onClick: withModifiers(onClick, ["stop"])
-				}, "回到")) : createCommentVNode("v-if", true)
+				}, "回到")])) : createCommentVNode("v-if", true),
+				time.value ? (openBlock(), createElementBlock("span", {
+					key: 2,
+					class: "m-editor-history-list-item-time",
+					title: timeTitle.value
+				}, toDisplayString(time.value), 9, _hoisted_5)) : createCommentVNode("v-if", true)
 			], 10, _hoisted_1);
 		};
 	}

package/dist/es/layouts/history-list/PageTab.vue_vue_type_script_setup_true_lang.js

@@ -1,4 +1,4 @@
-import { describePageGroup, describePageStep, formatHistoryFullTime, formatHistoryTime, groupSource, groupTimestamp, isPageStepRevertable } from "./composables.js";
+import { describePageGroup, describePageStep, isHistoryGroupExpanded, isPageStepRevertable, toRowGroup } from "./composables.js";
 import GroupRow_default from "./GroupRow.js";
 import InitialRow_default from "./InitialRow.js";
 import { TMagicScrollbar } from "@tmagic/design";
@@ -8,99 +8,86 @@ var _hoisted_1 = {
 	key: 0,
 	class: "m-editor-history-list-empty"
 };
-var _hoisted_2 = { class: "m-editor-history-list-ul" };
+var _hoisted_2 = {
+	key: 0,
+	class: "m-editor-history-list-toolbar"
+};
+var _hoisted_3 = { class: "m-editor-history-list-ul" };
 var PageTab_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ defineComponent({
 	name: "MEditorHistoryListPageTab",
 	__name: "PageTab",
 	props: {
 		list: {},
-		expanded: {}
+		expanded: {},
+		marker: {}
 	},
 	emits: [
 		"toggle",
 		"goto",
 		"goto-initial",
 		"diff-step",
-		"revert-step"
+		"revert-step",
+		"select",
+		"clear"
 	],
 	setup(__props) {
 		const props = __props;
 		/**
 		* 当前 step 是否可查看差异：
 		* - 仅 update 操作；
-		* - 单节点更新（updatedItems.length === 1），且 oldNode / newNode 都存在。
+		* - 单节点更新（diff.length === 1），且 oldSchema / newSchema 都存在。
 		* 多节点更新难以选定单一对比目标，统一不展示差异入口。
 		*/
 		const isPageStepDiffable = (step) => {
 			if (step.opType !== "update") return false;
-			const items = step.updatedItems ?? [];
+			const items = step.diff ?? [];
 			if (items.length !== 1) return false;
-			return Boolean(items[0]?.oldNode && items[0]?.newNode);
+			return Boolean(items[0]?.oldSchema && items[0]?.newSchema);
+		};
+		/** 页面历史的描述 / 可操作性判定集合，注入给统一的 `toRowGroup`。 */
+		const descriptor = {
+			describeGroup: describePageGroup,
+			describeStep: describePageStep,
+			isStepDiffable: isPageStepDiffable,
+			isStepRevertable: isPageStepRevertable
 		};
+		const rowKey = (group) => `pg-${group.steps[0]?.index}`;
+		const toRow = (group) => toRowGroup(group, rowKey(group), descriptor);
 		/**
 		* 是否处于"初始状态"——即对应页面历史栈 cursor===0：
-		* 当 list 中所有 group 的 applied 都为 false 时即为该状态。
-		* 没有任何 group 的情况由外层"暂无操作记录"分支兜底，本计算可以不考虑。
+		* 当 list 中所有 group 的 applied 都为 false 时即为该状态（空列表 `every` 返回 true，
+		* 即仅有 marker、无任何操作记录时也视为处于初始状态）。
 		*/
-		const isInitial = computed(() => props.list.length > 0 && props.list.every((g) => !g.applied));
+		const isInitial = computed(() => props.list.every((g) => !g.applied));
 		return (_ctx, _cache) => {
-			return !__props.list.length ? (openBlock(), createElementBlock("div", _hoisted_1, "暂无操作记录")) : (openBlock(), createBlock(unref(TMagicScrollbar), {
-				key: 1,
-				"max-height": "360px"
-			}, {
-				default: withCtx(() => [createElementVNode("ul", _hoisted_2, [
+			return !__props.list.length && !__props.marker ? (openBlock(), createElementBlock("div", _hoisted_1, "暂无操作记录")) : (openBlock(), createElementBlock(Fragment, { key: 1 }, [__props.list.length ? (openBlock(), createElementBlock("div", _hoisted_2, [createElementVNode("span", {
+				class: "m-editor-history-list-clear",
+				title: "清空当前页面的历史记录",
+				onClick: _cache[0] || (_cache[0] = ($event) => _ctx.$emit("clear"))
+			}, "清空")])) : createCommentVNode("v-if", true), createVNode(unref(TMagicScrollbar), { "max-height": "360px" }, {
+				default: withCtx(() => [createElementVNode("ul", _hoisted_3, [
 					(openBlock(true), createElementBlock(Fragment, null, renderList(__props.list, (group) => {
 						return openBlock(), createBlock(GroupRow_default, {
-							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: unref(describePageGroup)(group),
-							source: unref(groupSource)(group),
-							time: unref(formatHistoryTime)(unref(groupTimestamp)(group)),
-							"time-title": unref(formatHistoryFullTime)(unref(groupTimestamp)(group)),
-							"step-count": group.steps.length,
-							"sub-steps": group.steps.map((s) => ({
-								index: s.index,
-								applied: s.applied,
-								isCurrent: s.isCurrent,
-								desc: unref(describePageStep)(s.step),
-								diffable: isPageStepDiffable(s.step),
-								revertable: s.applied && unref(isPageStepRevertable)(s.step),
-								source: s.step.source,
-								time: unref(formatHistoryTime)(s.step.timestamp),
-								timeTitle: unref(formatHistoryFullTime)(s.step.timestamp)
-							})),
-							"is-current": group.isCurrent,
-							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)),
-							onRevertStep: _cache[3] || (_cache[3] = (index) => _ctx.$emit("revert-step", index))
-						}, null, 8, [
-							"group-key",
-							"applied",
-							"merged",
-							"op-type",
-							"desc",
-							"source",
-							"time",
-							"time-title",
-							"step-count",
-							"sub-steps",
-							"is-current",
-							"expanded"
-						]);
+							key: rowKey(group),
+							group: toRow(group),
+							expanded: unref(isHistoryGroupExpanded)(__props.expanded, rowKey(group)),
+							"select-enabled": true,
+							onToggle: _cache[1] || (_cache[1] = (key) => _ctx.$emit("toggle", key)),
+							onGoto: _cache[2] || (_cache[2] = (index) => _ctx.$emit("goto", index)),
+							onDiffStep: _cache[3] || (_cache[3] = (index) => _ctx.$emit("diff-step", index)),
+							onRevertStep: _cache[4] || (_cache[4] = (index) => _ctx.$emit("revert-step", index)),
+							onSelect: _cache[5] || (_cache[5] = (index) => _ctx.$emit("select", index))
+						}, null, 8, ["group", "expanded"]);
 					}), 128)),
-					createCommentVNode("\n        初始状态项：永远位于列表底部（页面 tab 倒序展示，最底部=最早），\n        作为\"未修改\"零点。当所有 group 都未 applied 时它即为当前位置。\n      "),
+					createCommentVNode("\n        初始状态项：永远位于列表底部（页面 tab 倒序展示，最底部=最早），\n        作为\"未修改\"零点。当所有 group 都未 applied 时它即为当前位置。\n        设置 root 时生成的「未修改的初始状态」标记（marker）会作为该行的文案与时间来源。\n      "),
 					createVNode(InitialRow_default, {
 						"is-current": isInitial.value,
-						onGotoInitial: _cache[4] || (_cache[4] = ($event) => _ctx.$emit("goto-initial"))
-					}, null, 8, ["is-current"])
+						marker: __props.marker,
+						onGotoInitial: _cache[6] || (_cache[6] = ($event) => _ctx.$emit("goto-initial"))
+					}, null, 8, ["is-current", "marker"])
 				])]),
 				_: 1
-			}));
+			})], 64));
 		};
 	}
 });

package/dist/es/layouts/history-list/composables.js

@@ -2,6 +2,8 @@ import { useServices } from "../../hooks/use-services.js";
 import { datetimeFormatter } from "@tmagic/form";
 import { computed, reactive } from "vue";
 //#region packages/editor/src/layouts/history-list/composables.ts
+/** 合并组默认展开；仅当 expanded[key] === false 时为收起。 */
+var isHistoryGroupExpanded = (expanded, key) => expanded[key] !== false;
 /**
 * 历史记录面板共享逻辑：
 * - 暴露三类历史的聚合数据（页面 / 数据源 / 代码块）；
@@ -15,10 +17,11 @@ var useHistoryList = () => {
 	/**
 	* 折叠状态：key 形如 `pg-${组内首步 index}` / `ds-${id}-${组内首步 index}` / `cb-${id}-${组内首步 index}`。
 	* 用组内首步的稳定 index（而非展示位置）作为 key，确保历史数据更新后已展开的分组状态保持不变。
+	* 合并组默认展开；仅当值为 `false` 时表示收起。
 	*/
 	const expanded = reactive({});
 	const toggleGroup = (key) => {
-		expanded[key] = !expanded[key];
+		expanded[key] = expanded[key] === false;
 	};
 	const pageGroups = computed(() => historyService.getPageHistoryGroups());
 	const dataSourceGroups = computed(() => historyService.getDataSourceHistoryGroups());
@@ -80,6 +83,7 @@ var HISTORY_SOURCE_LABELS = {
 	"component-panel": "组件面板",
 	props: "配置面板",
 	code: "源码",
+	"root-code": "DSL源码",
 	"stage-contextmenu": "画布菜单",
 	"tree-contextmenu": "树菜单",
 	toolbar: "工具栏",
@@ -87,6 +91,8 @@ var HISTORY_SOURCE_LABELS = {
 	rollback: "回滚",
 	api: "接口",
 	ai: "AI",
+	initial: "初始值",
+	sync: "同步",
 	unknown: "未知"
 };
 /** 操作途径文案：用于历史面板展示「画布 / 树面板 / 配置面板…」标签。 */
@@ -95,6 +101,37 @@ var sourceLabel = (source = "unknown") => {
 };
 /** 取一组历史步骤里最后一步（最近一次）的操作途径，用于组头部展示。 */
 var groupSource = (group) => group.steps[group.steps.length - 1]?.step.source;
+/**
+* 把一个历史分组（页面 / bucket）派生为 GroupRow 直接消费的视图模型 {@link HistoryRowGroup}。
+* 统一了原先 PageTab / Bucket 各自内联的 sub-steps 映射逻辑：描述、可差异、可回滚、时间、途径
+* 全部在此一次性算好，组件层只负责渲染。
+*/
+var toRowGroup = (group, key, descriptor) => {
+	const { describeGroup, describeStep, isStepDiffable, isStepRevertable } = descriptor;
+	const timestamp = groupTimestamp(group);
+	return {
+		key,
+		applied: group.applied,
+		isCurrent: Boolean(group.isCurrent),
+		opType: group.opType,
+		desc: describeGroup(group),
+		source: groupSource(group),
+		time: formatHistoryTime(timestamp),
+		timeTitle: formatHistoryFullTime(timestamp),
+		subSteps: group.steps.map((s) => ({
+			index: s.index,
+			applied: s.applied,
+			isCurrent: s.isCurrent,
+			saved: s.step.saved,
+			desc: describeStep(s.step),
+			diffable: isStepDiffable ? isStepDiffable(s.step) : false,
+			revertable: s.applied && (isStepRevertable ? isStepRevertable(s.step) : true),
+			source: s.step.source,
+			time: formatHistoryTime(s.step.timestamp),
+			timeTitle: formatHistoryFullTime(s.step.timestamp)
+		}))
+	};
+};
 var nameOf = (node) => node?.name || node?.type || `${node?.id ?? ""}`;
 /**
 * 默认描述里展示「名称 (id: xxx)」，便于区分同名实体。
@@ -113,24 +150,24 @@ var pickLastDescription = (descs) => {
 var describePageStep = (step) => {
 	if (step.historyDescription) return step.historyDescription;
 	const { opType } = step;
+	const items = step.diff ?? [];
 	if (opType === "add") {
-		const count = step.nodes?.length ?? 0;
-		const node = step.nodes?.[0];
+		const count = items.length;
+		const node = items[0]?.newSchema;
 		return `新增 ${count} 个节点${count === 1 && node ? `（${labelWithId(nameOf(node), node.id)}）` : ""}`;
 	}
 	if (opType === "remove") {
-		const count = step.removedItems?.length ?? 0;
-		const node = step.removedItems?.[0]?.node;
+		const count = items.length;
+		const node = items[0]?.oldSchema;
 		return `删除 ${count} 个节点${count === 1 && node ? `（${labelWithId(nameOf(node), node.id)}）` : ""}`;
 	}
-	const updated = step.updatedItems ?? [];
-	if (!updated.length) return "修改节点";
-	if (updated.length === 1) {
-		const { newNode, changeRecords } = updated[0];
+	if (!items.length) return "修改节点";
+	if (items.length === 1) {
+		const { newSchema, changeRecords } = items[0];
 		const propPath = changeRecords?.[0]?.propPath;
-		return `修改 ${labelWithId(nameOf(newNode), newNode?.id)}${propPath ? ` · ${propPath}` : ""}`;
+		return `修改 ${labelWithId(nameOf(newSchema), newSchema?.id)}${propPath ? ` · ${propPath}` : ""}`;
 	}
-	return `修改 ${updated.length} 个节点`;
+	return `修改 ${items.length} 个节点`;
 };
 /**
 * 合并组的展示文案：
@@ -144,7 +181,7 @@ var describePageGroup = (group) => {
 	if (group.steps.length === 1) return describePageStep(group.steps[0].step);
 	const paths = /* @__PURE__ */ new Set();
 	group.steps.forEach((s) => {
-		s.step.updatedItems?.[0]?.changeRecords?.forEach((r) => r.propPath && paths.add(r.propPath));
+		s.step.diff?.[0]?.changeRecords?.forEach((r) => r.propPath && paths.add(r.propPath));
 	});
 	const pathList = Array.from(paths).slice(0, 3).join(", ");
 	const target = labelWithId(group.targetName ?? (group.targetId !== void 0 ? `${group.targetId}` : "节点"), group.targetId);
@@ -152,10 +189,11 @@ var describePageGroup = (group) => {
 };
 var describeDataSourceStep = (step) => {
 	if (step.historyDescription) return step.historyDescription;
-	if (step.oldSchema === null && step.newSchema) return `创建 ${labelWithId(step.newSchema.title, step.newSchema.id ?? step.id)}`;
-	if (step.newSchema === null && step.oldSchema) return `删除 ${labelWithId(step.oldSchema.title, step.oldSchema.id ?? step.id)}`;
-	const propPath = step.changeRecords?.[0]?.propPath;
-	const title = labelWithId(step.newSchema?.title || step.oldSchema?.title, step.id);
+	const { oldSchema, newSchema, changeRecords } = step.diff?.[0] ?? {};
+	if (!oldSchema && newSchema) return `创建 ${labelWithId(newSchema.title, newSchema.id ?? step.id)}`;
+	if (!newSchema && oldSchema) return `删除 ${labelWithId(oldSchema.title, oldSchema.id ?? step.id)}`;
+	const propPath = changeRecords?.[0]?.propPath;
+	const title = labelWithId(newSchema?.title || oldSchema?.title, step.id);
 	return propPath ? `修改 ${title} · ${propPath}` : `修改 ${title}`;
 };
 var describeDataSourceGroup = (group) => {
@@ -164,18 +202,19 @@ var describeDataSourceGroup = (group) => {
 	if (group.steps.length === 1) return describeDataSourceStep(group.steps[0].step);
 	const paths = /* @__PURE__ */ new Set();
 	group.steps.forEach((s) => {
-		s.step.changeRecords?.forEach((r) => r.propPath && paths.add(r.propPath));
+		s.step.diff?.[0]?.changeRecords?.forEach((r) => r.propPath && paths.add(r.propPath));
 	});
 	const pathList = Array.from(paths).slice(0, 3).join(", ");
-	const target = labelWithId(group.steps[group.steps.length - 1].step.newSchema?.title || group.steps[0].step.oldSchema?.title, group.id);
+	const target = labelWithId(group.steps[group.steps.length - 1].step.diff?.[0]?.newSchema?.title || group.steps[0].step.diff?.[0]?.oldSchema?.title, group.id);
 	return pathList ? `修改 ${target} · ${pathList}${paths.size > 3 ? "…" : ""}` : `修改 ${target}`;
 };
 var describeCodeBlockStep = (step) => {
 	if (step.historyDescription) return step.historyDescription;
-	if (step.oldContent === null && step.newContent) return `创建 ${labelWithId(step.newContent.name, step.newContent.id ?? step.id)}`;
-	if (step.newContent === null && step.oldContent) return `删除 ${labelWithId(step.oldContent.name, step.oldContent.id ?? step.id)}`;
-	const propPath = step.changeRecords?.[0]?.propPath;
-	const title = labelWithId(step.newContent?.name || step.oldContent?.name, step.id);
+	const { oldSchema: oldContent, newSchema: newContent, changeRecords } = step.diff?.[0] ?? {};
+	if (!oldContent && newContent) return `创建 ${labelWithId(newContent.name, newContent.id ?? step.id)}`;
+	if (!newContent && oldContent) return `删除 ${labelWithId(oldContent.name, oldContent.id ?? step.id)}`;
+	const propPath = changeRecords?.[0]?.propPath;
+	const title = labelWithId(newContent?.name || oldContent?.name, step.id);
 	return propPath ? `修改 ${title} · ${propPath}` : `修改 ${title}`;
 };
 var describeCodeBlockGroup = (group) => {
@@ -184,10 +223,10 @@ var describeCodeBlockGroup = (group) => {
 	if (group.steps.length === 1) return describeCodeBlockStep(group.steps[0].step);
 	const paths = /* @__PURE__ */ new Set();
 	group.steps.forEach((s) => {
-		s.step.changeRecords?.forEach((r) => r.propPath && paths.add(r.propPath));
+		s.step.diff?.[0]?.changeRecords?.forEach((r) => r.propPath && paths.add(r.propPath));
 	});
 	const pathList = Array.from(paths).slice(0, 3).join(", ");
-	const target = labelWithId(group.steps[group.steps.length - 1].step.newContent?.name || group.steps[0].step.oldContent?.name, group.id);
+	const target = labelWithId(group.steps[group.steps.length - 1].step.diff?.[0]?.newSchema?.name || group.steps[0].step.diff?.[0]?.oldSchema?.name, group.id);
 	return pathList ? `修改 ${target} · ${pathList}${paths.size > 3 ? "…" : ""}` : `修改 ${target}`;
 };
 /**
@@ -198,27 +237,29 @@ var describeCodeBlockGroup = (group) => {
 */
 var isPageStepRevertable = (step) => {
 	if (step.opType !== "update") return true;
-	const items = step.updatedItems ?? [];
+	const items = step.diff ?? [];
 	if (!items.length) return false;
 	return items.every((item) => Boolean(item.changeRecords?.length));
 };
 /**
 * 数据源 step 是否支持「回滚」：
-* - 新增（oldSchema=null）/ 删除（newSchema=null）：不依赖 changeRecords，始终可回滚；
+* - 新增（无 oldSchema）/ 删除（无 newSchema）：不依赖 changeRecords，始终可回滚；
 * - 更新（前后 schema 都存在）：必须有 changeRecords 才支持局部反向 patch，否则不支持回滚。
 */
 var isDataSourceStepRevertable = (step) => {
-	if (step.oldSchema === null || step.newSchema === null) return true;
-	return Boolean(step.changeRecords?.length);
+	const item = step.diff?.[0];
+	if (!item?.oldSchema || !item?.newSchema) return true;
+	return Boolean(item.changeRecords?.length);
 };
 /**
 * 代码块 step 是否支持「回滚」：
-* - 新增（oldContent=null）/ 删除（newContent=null）：不依赖 changeRecords，始终可回滚；
+* - 新增（无 oldSchema）/ 删除（无 newSchema）：不依赖 changeRecords，始终可回滚；
 * - 更新（前后 content 都存在）：必须有 changeRecords 才支持局部反向 patch，否则不支持回滚。
 */
 var isCodeBlockStepRevertable = (step) => {
-	if (step.oldContent === null || step.newContent === null) return true;
-	return Boolean(step.changeRecords?.length);
+	const item = step.diff?.[0];
+	if (!item?.oldSchema || !item?.newSchema) return true;
+	return Boolean(item.changeRecords?.length);
 };
 //#endregion
-export { describeCodeBlockGroup, describeCodeBlockStep, describeDataSourceGroup, describeDataSourceStep, describePageGroup, describePageStep, formatHistoryFullTime, formatHistoryTime, groupSource, groupTimestamp, isCodeBlockStepRevertable, isDataSourceStepRevertable, isPageStepRevertable, opLabel, sourceLabel, useHistoryList };
+export { describeCodeBlockGroup, describeCodeBlockStep, describeDataSourceGroup, describeDataSourceStep, describePageGroup, describePageStep, formatHistoryFullTime, formatHistoryTime, isCodeBlockStepRevertable, isDataSourceStepRevertable, isHistoryGroupExpanded, isPageStepRevertable, opLabel, sourceLabel, toRowGroup, useHistoryList };

package/dist/es/layouts/page-bar/PageBar.vue_vue_type_script_setup_true_lang.js

@@ -4,7 +4,7 @@ import AddButton_default from "./AddButton.js";
 import PageBarScrollContainer_default from "./PageBarScrollContainer.js";
 import PageList_default from "./PageList.js";
 import Search_default from "./Search.js";
-import { TMagicIcon, TMagicPopover } from "@tmagic/design";
+import { TMagicIcon, TMagicPopover, tMagicMessageBox } from "@tmagic/design";
 import { NodeType } from "@tmagic/core";
 import { Fragment, computed, createElementBlock, createElementVNode, createVNode, defineComponent, normalizeClass, openBlock, ref, renderList, renderSlot, toDisplayString, unref, useTemplateRef, watch, withCtx } from "vue";
 import { CaretBottom, Delete, DocumentCopy } from "@element-plus/icons-vue";
@@ -54,7 +54,8 @@ var PageBar_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ define
 				top: 0
 			});
 		};
-		const remove = (node) => {
+		const remove = async (node) => {
+			await tMagicMessageBox.confirm("确定删除该页面吗？");
 			editorService.remove(node);
 		};
 		const pageBarScrollContainerRef = useTemplateRef("pageBarScrollContainer");
@@ -121,6 +122,7 @@ var PageBar_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ define
 							type: "button",
 							text: "删除",
 							icon: unref(Delete),
+							buttonProps: { type: "danger" },
 							handler: () => remove(item)
 						} }, null, 8, ["data"])])])]),
 						_: 2

package/dist/es/layouts/sidebar/Sidebar.vue_vue_type_script_setup_true_lang.js

@@ -71,7 +71,11 @@ var Sidebar_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ define
 				});
 			}
 		}, { immediate: true });
-		const activeTabName = ref(props.data?.status);
+		const activeTabName = computed({
+			get: () => uiService.get("sideBarActiveTabName"),
+			set: (value) => uiService.set("sideBarActiveTabName", value)
+		});
+		uiService.set("sideBarActiveTabName", props.data?.status || "");
 		const getItemConfig = (data) => {
 			const map = {
 				[SideItemKey.COMPONENT_LIST]: {

package/dist/es/layouts/sidebar/data-source/DataSourceConfigPanel.vue_vue_type_script_setup_true_lang.js

@@ -4,7 +4,7 @@ import { useNextFloatBoxPosition } from "../../../hooks/use-next-float-box-posit
 import FloatingBox_default from "../../../components/FloatingBox.js";
 import { MFormBox } from "@tmagic/form";
 import { tMagicMessage } from "@tmagic/design";
-import { createBlock, createVNode, defineComponent, inject, isRef, mergeModels, nextTick, openBlock, ref, unref, useModel, watch, watchEffect, withCtx } from "vue";
+import { computed, createBlock, createVNode, defineComponent, inject, isRef, mergeModels, nextTick, openBlock, provide, ref, unref, useModel, watch, watchEffect, withCtx } from "vue";
 //#region packages/editor/src/layouts/sidebar/data-source/DataSourceConfigPanel.vue?vue&type=script&setup=true&lang.ts
 var DataSourceConfigPanel_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ defineComponent({
 	name: "MEditorDataSourceConfigPanel",
@@ -12,7 +12,9 @@ var DataSourceConfigPanel_vue_vue_type_script_setup_true_lang_default = /* @__PU
 	props: /* @__PURE__ */ mergeModels({
 		title: {},
 		values: {},
-		disabled: { type: Boolean }
+		disabled: { type: Boolean },
+		editMethodName: {},
+		editFieldPath: {}
 	}, {
 		"visible": {
 			type: Boolean,
@@ -37,9 +39,20 @@ var DataSourceConfigPanel_vue_vue_type_script_setup_true_lang_default = /* @__PU
 		const dataSourceConfig = ref([]);
 		const { height: editorHeight } = useEditorContentHeight();
 		const { boxPosition, calcBoxPosition } = useNextFloatBoxPosition(uiService, inject("parentFloating", ref(null)));
+		/** 供「方法定义」tab 内的字段消费，用于打开数据源详情后自动打开指定方法 */
+		provide("editingDataSourceMethodName", computed(() => props.editMethodName));
+		/** 供「数据定义」tab 内的字段消费，用于打开数据源详情后自动打开指定字段 */
+		provide("editingDataSourceFieldPath", computed(() => props.editFieldPath || []));
 		watchEffect(() => {
 			initValues.value = props.values;
-			dataSourceConfig.value = dataSourceService.getFormConfig(initValues.value.type);
+			const config = dataSourceService.getFormConfig(initValues.value.type);
+			let activeTab = "";
+			if (props.editMethodName) activeTab = "methods";
+			else if (props.editFieldPath?.length) activeTab = "fields";
+			dataSourceConfig.value = activeTab ? config.map((item) => item.type === "tab" ? {
+				...item,
+				active: activeTab
+			} : item) : config;
 		});
 		const submitHandler = (values, data) => {
 			emit("submit", values, data);

package/dist/es/layouts/sidebar/data-source/DataSourceListPanel.vue_vue_type_script_setup_true_lang.js

@@ -7,7 +7,7 @@ import DataSourceConfigPanel_default from "./DataSourceConfigPanel.js";
 import DataSourceList_default from "./DataSourceList.js";
 import { useContentMenu } from "./useContentMenu.js";
 import { TMagicScrollbar, tMagicMessageBox } from "@tmagic/design";
-import { Fragment, Teleport, computed, createBlock, createCommentVNode, createElementBlock, createElementVNode, createVNode, defineComponent, inject, openBlock, renderSlot, unref, useTemplateRef, watch, withCtx } from "vue";
+import { Fragment, Teleport, computed, createBlock, createCommentVNode, createElementBlock, createElementVNode, createVNode, defineComponent, inject, openBlock, ref, renderSlot, unref, useTemplateRef, watch, withCtx } from "vue";
 import { mergeWith } from "lodash-es";
 //#region packages/editor/src/layouts/sidebar/data-source/DataSourceListPanel.vue?vue&type=script&setup=true&lang.ts
 var _hoisted_1 = { class: "search-wrapper" };
@@ -24,7 +24,13 @@ var DataSourceListPanel_vue_vue_type_script_setup_true_lang_default = /* @__PURE
 		const eventBus = inject("eventBus");
 		const { dataSourceService } = useServices();
 		const { editDialog, dataSourceValues, dialogTitle, editable, editHandler, submitDataSourceHandler } = useDataSourceEdit(dataSourceService);
+		/** 打开数据源详情时需要直接定位并打开的方法名，为空则正常展示「数据定义」tab */
+		const editMethodName = ref("");
+		/** 打开数据源详情时需要直接定位并打开的字段路径，为空则不自动打开字段配置 */
+		const editFieldPath = ref([]);
 		const editDialogCloseHandler = () => {
+			editMethodName.value = "";
+			editFieldPath.value = [];
 			if (dataSourceListRef.value) for (const [, status] of dataSourceListRef.value.nodeStatusMap.entries()) status.selected = false;
 		};
 		watch(dataSourceValues, (dataSourceValues) => {
@@ -62,6 +68,18 @@ var DataSourceListPanel_vue_vue_type_script_setup_true_lang_default = /* @__PURE
 			dataSourceListRef.value?.filter(val);
 		};
 		eventBus?.on("edit-data-source", (id) => {
+			editMethodName.value = "";
+			editFieldPath.value = [];
+			editHandler(id);
+		});
+		eventBus?.on("edit-data-source-method", (id, methodName) => {
+			editMethodName.value = methodName;
+			editFieldPath.value = [];
+			editHandler(id);
+		});
+		eventBus?.on("edit-data-source-field", (id, fieldPath) => {
+			editMethodName.value = "";
+			editFieldPath.value = fieldPath;
 			editHandler(id);
 		});
 		eventBus?.on("remove-data-source", (id) => {
@@ -110,12 +128,16 @@ var DataSourceListPanel_vue_vue_type_script_setup_true_lang_default = /* @__PURE
 					disabled: !unref(editable),
 					values: unref(dataSourceValues),
 					title: unref(dialogTitle),
+					"edit-method-name": editMethodName.value,
+					"edit-field-path": editFieldPath.value,
 					onSubmit: unref(submitDataSourceHandler),
 					onClose: editDialogCloseHandler
 				}, null, 8, [
 					"disabled",
 					"values",
 					"title",
+					"edit-method-name",
+					"edit-field-path",
 					"onSubmit"
 				]),
 				(openBlock(), createBlock(Teleport, { to: "body" }, [menuData.value.length ? (openBlock(), createBlock(ContentMenu_default, {