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

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

@@ -1,4 +1,4 @@
-import { opLabel } from "./composables.js";
+import { opLabel, sourceLabel } from "./composables.js";
 import { Fragment, computed, createCommentVNode, createElementBlock, createElementVNode, defineComponent, normalizeClass, openBlock, renderList, toDisplayString, unref, withModifiers } from "vue";
 //#region packages/editor/src/layouts/history-list/GroupRow.vue?vue&type=script&setup=true&lang.ts
 var _hoisted_1 = ["title"];
@@ -6,104 +6,147 @@ var _hoisted_2 = ["title"];
 var _hoisted_3 = { class: "m-editor-history-list-item-desc" };
 var _hoisted_4 = {
 	key: 0,
-	class: "m-editor-history-list-item-current"
+	class: "m-editor-history-list-item-saved",
+	title: "该记录为最近一次保存的状态"
 };
 var _hoisted_5 = {
-	key: 2,
+	key: 1,
+	class: "m-editor-history-list-item-actions"
+};
+var _hoisted_6 = ["title"];
+var _hoisted_7 = ["title"];
+var _hoisted_8 = ["title"];
+var _hoisted_9 = {
+	key: 5,
 	class: "m-editor-history-list-item-merge"
 };
-var _hoisted_6 = {
+var _hoisted_10 = {
 	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 = {
+var _hoisted_11 = ["title", "onClick"];
+var _hoisted_12 = { class: "m-editor-history-list-item-index" };
+var _hoisted_13 = { class: "m-editor-history-list-substep-desc" };
+var _hoisted_14 = {
 	key: 0,
-	class: "m-editor-history-list-item-current"
+	class: "m-editor-history-list-item-saved",
+	title: "该记录为最近一次保存的状态"
 };
-var _hoisted_11 = ["onClick"];
-var _hoisted_12 = ["onClick"];
-var GroupRow_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ defineComponent({
+var _hoisted_15 = {
+	key: 1,
+	class: "m-editor-history-list-item-actions"
+};
+var _hoisted_16 = ["onClick"];
+var _hoisted_17 = ["onClick"];
+var _hoisted_18 = ["onClick"];
+var _hoisted_19 = ["title"];
+var _hoisted_20 = ["title"];
+var _hoisted_21 = ["title"];
+var GroupRow_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defineComponent({
 	name: "MEditorHistoryListGroupRow",
 	__name: "GroupRow",
 	props: {
-		groupKey: {},
-		applied: { type: Boolean },
-		merged: { type: Boolean },
-		opType: {},
-		desc: {},
-		stepCount: {},
-		subSteps: {},
+		group: {},
 		expanded: { type: Boolean },
-		isCurrent: { type: Boolean }
+		gotoEnabled: {
+			type: Boolean,
+			default: true
+		},
+		selectEnabled: {
+			type: Boolean,
+			default: false
+		}
 	},
 	emits: [
 		"toggle",
 		"goto",
 		"diff-step",
-		"revert-step"
+		"revert-step",
+		"select"
 	],
 	setup(__props, { emit: __emit }) {
 		const props = __props;
 		const emit = __emit;
-		/** 单步组：头部可点击 goto；合并组：头部可点击切换展开。当前组（isCurrent）的单步组头部不可点击。 */
-		const isHeadClickable = computed(() => {
-			if (props.merged) return true;
-			return !props.isCurrent;
-		});
+		/** 子步数大于 1 即为合并组：决定是否展示合并标记与可展开的子步列表。 */
+		const merged = computed(() => props.group.subSteps.length > 1);
+		/** 组内 step 总数，仅在合并组时显示为 "合并 N 步"。 */
+		const stepCount = computed(() => props.group.subSteps.length);
+		/**
+		* 头部可点击的场景：
+		* - 合并组：点击切换展开 / 收起；
+		* - 开启 `selectEnabled`（页面 tab）：点击选中对应节点。
+		* 单步组的跳转仍由头部的「回到」按钮触发。
+		*/
+		const isHeadClickable = computed(() => merged.value || props.selectEnabled);
 		const headTitle = computed(() => {
-			if (props.merged) return props.expanded ? "点击收起子步" : "点击展开子步";
-			if (props.isCurrent) return "当前所在记录";
-			return "点击跳转到该记录";
+			if (merged.value) {
+				const expandHint = props.expanded ? "点击收起子步" : "点击展开子步";
+				return props.selectEnabled ? `${expandHint}（并选中该节点）` : expandHint;
+			}
+			if (props.selectEnabled) return "点击选中该节点";
+			if (props.group.isCurrent) return "当前所在记录";
+			return "";
 		});
 		/**
-		* 头部点击行为分流：
-		* - 合并组：仅切换展开 / 收起，不触发 goto；
-		* - 单步组：跳转到该唯一步骤；当前组忽略点击。
+		* 头部点击行为：
+		* - 开启 selectEnabled 时，发出 select（携带组内首步 index，上层据此选中节点）；
+		* - 合并组同时切换展开 / 收起。
 		*/
 		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.selectEnabled && props.group.subSteps.length) emit("select", props.group.subSteps[0].index);
+			if (merged.value) emit("toggle", props.group.key);
 		};
-		const onSubStepClick = (s) => {
-			if (s.isCurrent) return;
-			emit("goto", s.index);
+		const onGotoClick = (index) => {
+			if (!props.gotoEnabled) return;
+			emit("goto", index);
 		};
+		/** 点击子步行：开启 selectEnabled 时选中该子步对应的节点。 */
+		const onSubStepClick = (index) => {
+			if (!props.selectEnabled) return;
+			emit("select", index);
+		};
+		const subStepTitle = (s) => {
+			if (props.selectEnabled) return "点击选中该节点";
+			if (s.isCurrent) return "当前所在记录";
+			return "";
+		};
+		/**
+		* 头部是否展示「已保存」标记：
+		* - 单步组：取该唯一子步的 saved；
+		* - 合并组：组内任一子步为已保存即在头部提示（具体落在哪一步可展开查看）。
+		*/
+		const headSaved = computed(() => merged.value ? props.group.subSteps.some((s) => s.saved) : Boolean(props.group.subSteps[0]?.saved));
 		/** 单步组头部是否展示"查看差异"入口：要求该唯一子步本身可对比。 */
-		const headDiffable = computed(() => !props.merged && Boolean(props.subSteps[0]?.diffable));
+		const headDiffable = computed(() => !merged.value && Boolean(props.group.subSteps[0]?.diffable));
 		/** 单步组头部是否展示"回滚"入口：要求该唯一子步本身可回滚（已应用）。 */
-		const headRevertable = computed(() => !props.merged && Boolean(props.subSteps[0]?.revertable));
+		const headRevertable = computed(() => !merged.value && Boolean(props.group.subSteps[0]?.revertable));
+		/** 单步组头部是否展示"回到"入口：可跳转、非当前、且存在唯一子步。 */
+		const canHeadGoto = computed(() => !merged.value && props.gotoEnabled && !props.group.isCurrent && props.group.subSteps.length > 0);
 		/**
 		* 合并组展开后的子步渲染顺序：与外层分组列表保持一致——倒序展示（最新的子步在最上方）。
 		* 外层 page tab / bucket 都已对 groups 做了 reverse，子步沿用同样的视觉规则更直观。
 		* 注意：仅用于渲染，原 `subSteps` 保持时间正序，`headIndexLabel` 等基于首尾索引的展示语义不变。
 		*/
-		const subStepsDisplay = computed(() => props.subSteps.slice().reverse());
+		const subStepsDisplay = computed(() => props.group.subSteps.slice().reverse());
 		/**
 		* 头部索引展示：
-		* - 单步组（merged=false）：显示该唯一 step 的编号，如 `#5`；
+		* - 单步组（非合并）：显示该唯一 step 的编号，如 `#5`；
 		* - 合并组：显示组内 step 的编号范围，如 `#3-#7`（首尾相同则退化为 `#5`）。
 		*
 		* 这里展示的是 step.index + 1（与子步列表 `#{{ s.index + 1 }}` 保持一致），从 1 起编号更符合直觉。
 		*/
 		const headIndexLabel = computed(() => {
-			const list = props.subSteps;
+			const list = props.group.subSteps;
 			if (!list.length) return "";
 			const first = list[0].index + 1;
 			const last = list[list.length - 1].index + 1;
-			if (!props.merged || first === last) return `#${first}`;
+			if (!merged.value || first === last) return `#${first}`;
 			return `#${first}-#${last}`;
 		});
 		const headIndexTitle = computed(() => {
-			if (!props.merged) return `历史步骤编号 #${props.subSteps[0]?.index + 1}`;
-			return `合并了第 ${props.subSteps[0]?.index + 1} 至第 ${props.subSteps[props.subSteps.length - 1]?.index + 1} 共 ${props.subSteps.length} 条历史步骤`;
+			const list = props.group.subSteps;
+			if (!merged.value) return `历史步骤编号 #${list[0]?.index + 1}`;
+			return `合并了第 ${list[0]?.index + 1} 至第 ${list[list.length - 1]?.index + 1} 共 ${list.length} 条历史步骤`;
 		});
 		const onDiffClick = (index) => {
 			emit("diff-step", index);
@@ -113,9 +156,9 @@ var GroupRow_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ defin
 		};
 		return (_ctx, _cache) => {
 			return openBlock(), createElementBlock("li", { class: normalizeClass(["m-editor-history-list-item m-editor-history-list-group", {
-				"is-undone": !__props.applied,
-				"is-merged": __props.merged,
-				"is-current": __props.isCurrent
+				"is-undone": !__props.group.applied,
+				"is-merged": merged.value,
+				"is-current": __props.group.isCurrent
 			}]) }, [createElementVNode("div", {
 				class: normalizeClass(["m-editor-history-list-group-head", { "is-clickable": isHeadClickable.value }]),
 				title: headTitle.value,
@@ -125,53 +168,99 @@ var GroupRow_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ defin
 					class: "m-editor-history-list-item-index",
 					title: headIndexTitle.value
 				}, toDisplayString(headIndexLabel.value), 9, _hoisted_2),
-				createElementVNode("span", { class: normalizeClass(["m-editor-history-list-item-op", `op-${__props.opType}`]) }, toDisplayString(unref(opLabel)(__props.opType)), 3),
-				createElementVNode("span", _hoisted_3, toDisplayString(__props.desc), 1),
-				__props.isCurrent ? (openBlock(), createElementBlock("span", _hoisted_4, "当前")) : createCommentVNode("v-if", true),
-				!__props.merged && headDiffable.value ? (openBlock(), createElementBlock("span", {
-					key: 1,
-					class: "m-editor-history-list-item-diff",
-					title: "查看修改差异",
-					onClick: _cache[0] || (_cache[0] = withModifiers(($event) => onDiffClick(__props.subSteps[0].index), ["stop"]))
-				}, "查看差异")) : createCommentVNode("v-if", true),
-				__props.merged ? (openBlock(), createElementBlock("span", _hoisted_5, "合并 " + toDisplayString(__props.stepCount) + " 步", 1)) : createCommentVNode("v-if", true),
-				!__props.merged && headRevertable.value ? (openBlock(), createElementBlock("span", {
+				createElementVNode("span", { class: normalizeClass(["m-editor-history-list-item-op", `op-${__props.group.opType}`]) }, toDisplayString(unref(opLabel)(__props.group.opType)), 3),
+				createElementVNode("span", _hoisted_3, toDisplayString(__props.group.desc), 1),
+				headSaved.value ? (openBlock(), createElementBlock("span", _hoisted_4, "已保存")) : createCommentVNode("v-if", true),
+				!merged.value && (headRevertable.value || headDiffable.value || canHeadGoto.value) ? (openBlock(), createElementBlock("span", _hoisted_5, [
+					headRevertable.value ? (openBlock(), createElementBlock("span", {
+						key: 0,
+						class: "m-editor-history-list-item-revert",
+						title: "将该步骤的修改作为一次新操作反向应用（不影响后续历史）",
+						onClick: _cache[0] || (_cache[0] = withModifiers(($event) => onRevertClick(__props.group.subSteps[0].index), ["stop"]))
+					}, "回滚")) : createCommentVNode("v-if", true),
+					canHeadGoto.value ? (openBlock(), createElementBlock("span", {
+						key: 1,
+						class: "m-editor-history-list-item-goto",
+						title: "回到该记录",
+						onClick: _cache[1] || (_cache[1] = withModifiers(($event) => onGotoClick(__props.group.subSteps[0].index), ["stop"]))
+					}, "回到")) : createCommentVNode("v-if", true),
+					headDiffable.value ? (openBlock(), createElementBlock("span", {
+						key: 2,
+						class: "m-editor-history-list-item-diff",
+						title: "查看修改差异",
+						onClick: _cache[2] || (_cache[2] = withModifiers(($event) => onDiffClick(__props.group.subSteps[0].index), ["stop"]))
+					}, "查看差异")) : createCommentVNode("v-if", true)
+				])) : createCommentVNode("v-if", true),
+				!merged.value && unref(sourceLabel)(__props.group.source) ? (openBlock(), createElementBlock("span", {
+					key: 2,
+					class: "m-editor-history-list-item-source",
+					title: `操作途径：${unref(sourceLabel)(__props.group.source)}`
+				}, toDisplayString(unref(sourceLabel)(__props.group.source)), 9, _hoisted_6)) : createCommentVNode("v-if", true),
+				!merged.value && __props.group.operator ? (openBlock(), createElementBlock("span", {
 					key: 3,
-					class: "m-editor-history-list-item-revert",
-					title: "将该步骤的修改作为一次新操作反向应用（不影响后续历史）",
-					onClick: _cache[1] || (_cache[1] = withModifiers(($event) => onRevertClick(__props.subSteps[0].index), ["stop"]))
-				}, "回滚")) : createCommentVNode("v-if", true),
-				__props.merged ? (openBlock(), createElementBlock("span", {
+					class: "m-editor-history-list-item-operator",
+					title: `操作人：${__props.group.operator}`
+				}, toDisplayString(__props.group.operator), 9, _hoisted_7)) : createCommentVNode("v-if", true),
+				!merged.value && __props.group.time ? (openBlock(), createElementBlock("span", {
 					key: 4,
+					class: "m-editor-history-list-item-time",
+					title: __props.group.timeTitle || __props.group.time
+				}, toDisplayString(__props.group.time), 9, _hoisted_8)) : createCommentVNode("v-if", true),
+				merged.value ? (openBlock(), createElementBlock("span", _hoisted_9, "合并 " + toDisplayString(stepCount.value) + " 步", 1)) : createCommentVNode("v-if", true),
+				merged.value ? (openBlock(), createElementBlock("span", {
+					key: 6,
 					class: normalizeClass(["m-editor-history-list-group-toggle", { "is-expanded": __props.expanded }])
 				}, "▾", 2)) : createCommentVNode("v-if", true)
-			], 10, _hoisted_1), __props.merged && __props.expanded ? (openBlock(), createElementBlock("ul", _hoisted_6, [(openBlock(true), createElementBlock(Fragment, null, renderList(subStepsDisplay.value, (s) => {
+			], 10, _hoisted_1), merged.value && __props.expanded ? (openBlock(), createElementBlock("ul", _hoisted_10, [(openBlock(true), createElementBlock(Fragment, null, renderList(subStepsDisplay.value, (s) => {
 				return openBlock(), createElementBlock("li", {
 					key: s.index,
 					class: normalizeClass({
 						"is-undone": !s.applied,
 						"is-current": s.isCurrent,
-						"is-clickable": !s.isCurrent
+						"is-clickable": __props.selectEnabled
 					}),
-					title: s.isCurrent ? "当前所在记录" : "点击跳转到该记录",
-					onClick: ($event) => onSubStepClick(s)
+					title: subStepTitle(s),
+					onClick: ($event) => onSubStepClick(s.index)
 				}, [
-					createElementVNode("span", _hoisted_8, "#" + toDisplayString(s.index + 1), 1),
-					createElementVNode("span", _hoisted_9, toDisplayString(s.desc), 1),
-					s.isCurrent ? (openBlock(), createElementBlock("span", _hoisted_10, "当前")) : createCommentVNode("v-if", true),
-					s.diffable ? (openBlock(), createElementBlock("span", {
-						key: 1,
-						class: "m-editor-history-list-item-diff",
-						title: "查看修改差异",
-						onClick: withModifiers(($event) => onDiffClick(s.index), ["stop"])
-					}, "查看差异", 8, _hoisted_11)) : createCommentVNode("v-if", true),
-					s.revertable ? (openBlock(), createElementBlock("span", {
+					createElementVNode("span", _hoisted_12, "#" + toDisplayString(s.index + 1), 1),
+					createElementVNode("span", _hoisted_13, toDisplayString(s.desc), 1),
+					s.saved ? (openBlock(), createElementBlock("span", _hoisted_14, "已保存")) : createCommentVNode("v-if", true),
+					s.revertable || s.diffable || __props.gotoEnabled && !s.isCurrent ? (openBlock(), createElementBlock("span", _hoisted_15, [
+						s.revertable ? (openBlock(), createElementBlock("span", {
+							key: 0,
+							class: "m-editor-history-list-item-revert",
+							title: "将该步骤的修改作为一次新操作反向应用（不影响后续历史）",
+							onClick: withModifiers(($event) => onRevertClick(s.index), ["stop"])
+						}, "回滚", 8, _hoisted_16)) : createCommentVNode("v-if", true),
+						__props.gotoEnabled && !s.isCurrent ? (openBlock(), createElementBlock("span", {
+							key: 1,
+							class: "m-editor-history-list-item-goto",
+							title: "回到该记录",
+							onClick: withModifiers(($event) => onGotoClick(s.index), ["stop"])
+						}, "回到", 8, _hoisted_17)) : createCommentVNode("v-if", true),
+						s.diffable ? (openBlock(), createElementBlock("span", {
+							key: 2,
+							class: "m-editor-history-list-item-diff",
+							title: "查看修改差异",
+							onClick: withModifiers(($event) => onDiffClick(s.index), ["stop"])
+						}, "查看差异", 8, _hoisted_18)) : createCommentVNode("v-if", true)
+					])) : createCommentVNode("v-if", true),
+					unref(sourceLabel)(s.source) ? (openBlock(), createElementBlock("span", {
 						key: 2,
-						class: "m-editor-history-list-item-revert",
-						title: "将该步骤的修改作为一次新操作反向应用（不影响后续历史）",
-						onClick: withModifiers(($event) => onRevertClick(s.index), ["stop"])
-					}, "回滚", 8, _hoisted_12)) : createCommentVNode("v-if", true)
-				], 10, _hoisted_7);
+						class: "m-editor-history-list-item-source",
+						title: `操作途径：${unref(sourceLabel)(s.source)}`
+					}, toDisplayString(unref(sourceLabel)(s.source)), 9, _hoisted_19)) : createCommentVNode("v-if", true),
+					s.operator ? (openBlock(), createElementBlock("span", {
+						key: 3,
+						class: "m-editor-history-list-item-operator",
+						title: `操作人：${s.operator}`
+					}, toDisplayString(s.operator), 9, _hoisted_20)) : createCommentVNode("v-if", true),
+					s.time ? (openBlock(), createElementBlock("span", {
+						key: 4,
+						class: "m-editor-history-list-item-time",
+						title: s.timeTitle || s.time
+					}, toDisplayString(s.time), 9, _hoisted_21)) : createCommentVNode("v-if", true)
+				], 10, _hoisted_11);
 			}), 128))])) : createCommentVNode("v-if", true)], 2);
 		};
 	}

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

@@ -1,27 +1,48 @@
 import CodeEditor_default from "../CodeEditor.js";
 import CompareForm_default from "../../components/CompareForm.js";
 import { TMagicButton, TMagicDialog, TMagicRadioButton, TMagicRadioGroup, TMagicTag } from "@tmagic/design";
-import { Teleport, computed, createBlock, createCommentVNode, createElementBlock, createElementVNode, createTextVNode, createVNode, defineComponent, openBlock, ref, toDisplayString, unref, watch, withCtx } from "vue";
+import { Fragment, computed, createBlock, createCommentVNode, createElementBlock, createElementVNode, createTextVNode, createVNode, defineComponent, openBlock, ref, toDisplayString, unref, watch, withCtx } from "vue";
 import { isEqual } from "lodash-es";
 //#region packages/editor/src/layouts/history-list/HistoryDiffDialog.vue?vue&type=script&setup=true&lang.ts
 var _hoisted_1 = {
 	key: 0,
 	class: "m-editor-history-diff-dialog-body"
 };
-var _hoisted_2 = { class: "m-editor-history-diff-dialog-header" };
-var _hoisted_3 = { class: "m-editor-history-diff-dialog-target" };
-var _hoisted_4 = { class: "m-editor-history-diff-dialog-controls" };
-var _hoisted_5 = { class: "m-editor-history-diff-dialog-legend" };
-var _hoisted_6 = {
+var _hoisted_2 = {
+	key: 0,
+	class: "m-editor-history-diff-dialog-notice"
+};
+var _hoisted_3 = { class: "m-editor-history-diff-dialog-header" };
+var _hoisted_4 = { class: "m-editor-history-diff-dialog-target" };
+var _hoisted_5 = { class: "m-editor-history-diff-dialog-controls" };
+var _hoisted_6 = { 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__ */ defineComponent({
+var HistoryDiffDialog_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defineComponent({
 	name: "MEditorHistoryDiffDialog",
 	__name: "HistoryDiffDialog",
-	props: { extendState: { type: Function } },
-	setup(__props, { expose: __expose }) {
-		/** 差异对话框的入参 */
+	props: {
+		services: {},
+		extendState: {},
+		loadConfig: {},
+		width: { default: "900px" },
+		size: {},
+		isConfirm: { type: Boolean },
+		onConfirm: {},
+		selfDiffFieldTypes: {},
+		compareFormState: {}
+	},
+	emits: ["close"],
+	setup(__props, { expose: __expose, emit: __emit }) {
+		const props = __props;
+		const emit = __emit;
+		/**
+		* 差异对比模式：
+		* - before：该步骤修改前 vs 该步骤修改后（默认行为，体现这一步带来的变化）
+		* - current：该步骤修改后 vs 当前最新值（用于查看「该步骤之后是否还被改过」）
+		*/
 		const visible = ref(false);
 		const payload = ref(null);
 		const mode = ref("before");
@@ -43,7 +64,22 @@ var HistoryDiffDialog_vue_vue_type_script_setup_true_lang_default = /* @__PURE__
 			scrollBeyondLastLine: false,
 			hideUnchangedRegions: { enabled: true }
 		};
+		const dialogTitle = computed(() => props.onConfirm ? "确认回滚" : "查看修改差异");
 		const hasCurrent = computed(() => payload.value?.currentValue !== void 0 && payload.value?.currentValue !== null);
+		/** 是否存在该步「修改后的值」：不存在（如仅删除）时「与修改前对比」无意义，置灰禁用。 */
+		const hasValue = computed(() => payload.value?.value !== void 0 && payload.value?.value !== null);
+		/** 指定模式当前是否可用：before 依赖「修改后的值」，current 依赖「当前值」。 */
+		const isModeAvailable = (m) => m === "current" ? hasCurrent.value : hasValue.value;
+		/**
+		* 计算 open 时的初始对比模式：
+		* - 调用方通过 payload.mode 指定且该模式可用时，优先使用指定模式；
+		* - 否则没有「修改后的值」但有当前值时（「与修改前对比」不可用），默认进入「与当前对比」；
+		* - 其余情况默认「与修改前对比」。
+		*/
+		const resolveInitialMode = (specified) => {
+			if (specified && isModeAvailable(specified)) return specified;
+			return !hasValue.value && hasCurrent.value ? "current" : "before";
+		};
 		/** 左侧（旧/参照）值 */
 		const leftValue = computed(() => {
 			if (!payload.value) return {};
@@ -63,63 +99,112 @@ var HistoryDiffDialog_vue_vue_type_script_setup_true_lang_default = /* @__PURE__
 			if (mode.value !== "current" || !payload.value) return false;
 			return isEqual(payload.value.value, payload.value.currentValue);
 		});
+		/** confirm() 的 resolve，仅在「等待用户确认回滚」期间存在 */
+		let confirmResolve = null;
+		const onConfirmClick = () => {
+			props.onConfirm?.();
+			confirmResolve?.(true);
+			confirmResolve = null;
+			visible.value = false;
+		};
 		const targetText = 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("：");
 		});
 		const open = (p) => {
 			payload.value = p;
-			mode.value = "before";
+			mode.value = resolveInitialMode(p.mode);
 			viewMode.value = "form";
 			visible.value = true;
 		};
+		/**
+		* 以 Promise 形式打开确认回滚弹窗：
+		* - 用户点击「确定回滚」时 resolve(true)；
+		* - 取消 / 关闭 / 按 Esc 等其他方式关闭弹窗时 resolve(false)。
+		*
+		* 同一时刻只允许一个待确认流程，重复调用会先 resolve(false) 掉上一个。
+		*/
+		const confirm = (p) => {
+			confirmResolve?.(false);
+			confirmResolve = null;
+			return new Promise((resolve) => {
+				confirmResolve = resolve;
+				open(p);
+			});
+		};
 		const close = () => {
 			visible.value = false;
 		};
 		watch(visible, (v) => {
-			if (!v) payload.value = null;
+			if (!v) {
+				payload.value = null;
+				confirmResolve?.(false);
+				confirmResolve = null;
+			}
 		});
+		const onClose = () => {
+			emit("close");
+		};
 		__expose({
 			open,
+			confirm,
 			close
 		});
 		return (_ctx, _cache) => {
-			return openBlock(), createBlock(Teleport, { to: "body" }, [createVNode(unref(TMagicDialog), {
+			return openBlock(), createBlock(unref(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: withCtx(() => [createVNode(unref(TMagicButton), {
+				footer: withCtx(() => [__props.isConfirm ? (openBlock(), createElementBlock(Fragment, { key: 0 }, [createVNode(unref(TMagicButton), {
 					size: "small",
 					onClick: _cache[2] || (_cache[2] = ($event) => visible.value = false)
 				}, {
-					default: withCtx(() => [..._cache[9] || (_cache[9] = [createTextVNode("关闭", -1)])]),
+					default: withCtx(() => [..._cache[10] || (_cache[10] = [createTextVNode("取消", -1)])]),
+					_: 1
+				}), createVNode(unref(TMagicButton), {
+					size: "small",
+					type: "primary",
+					onClick: onConfirmClick
+				}, {
+					default: withCtx(() => [..._cache[11] || (_cache[11] = [createTextVNode("确定回滚", -1)])]),
 					_: 1
-				})]),
-				default: withCtx(() => [payload.value ? (openBlock(), createElementBlock("div", _hoisted_1, [
-					createElementVNode("div", _hoisted_2, [createElementVNode("span", _hoisted_3, toDisplayString(targetText.value), 1), createElementVNode("div", _hoisted_4, [createVNode(unref(TMagicRadioGroup), {
+				})], 64)) : (openBlock(), createBlock(unref(TMagicButton), {
+					key: 1,
+					size: "small",
+					onClick: _cache[3] || (_cache[3] = ($event) => visible.value = false)
+				}, {
+					default: withCtx(() => [..._cache[12] || (_cache[12] = [createTextVNode("关闭", -1)])]),
+					_: 1
+				}))]),
+				default: withCtx(() => [payload.value && visible.value ? (openBlock(), createElementBlock("div", _hoisted_1, [
+					__props.onConfirm ? (openBlock(), createElementBlock("div", _hoisted_2, "仅回滚有差异的字段")) : createCommentVNode("v-if", true),
+					createElementVNode("div", _hoisted_3, [createElementVNode("span", _hoisted_4, toDisplayString(targetText.value), 1), createElementVNode("div", _hoisted_5, [createVNode(unref(TMagicRadioGroup), {
 						modelValue: viewMode.value,
 						"onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => viewMode.value = $event),
 						size: "small",
 						class: "m-editor-history-diff-dialog-view"
 					}, {
 						default: withCtx(() => [createVNode(unref(TMagicRadioButton), { value: "form" }, {
-							default: withCtx(() => [..._cache[4] || (_cache[4] = [createTextVNode("表单对比", -1)])]),
+							default: withCtx(() => [..._cache[5] || (_cache[5] = [createTextVNode("表单对比", -1)])]),
 							_: 1
 						}), createVNode(unref(TMagicRadioButton), { value: "code" }, {
-							default: withCtx(() => [..._cache[5] || (_cache[5] = [createTextVNode("源码对比", -1)])]),
+							default: withCtx(() => [..._cache[6] || (_cache[6] = [createTextVNode("源码对比", -1)])]),
 							_: 1
 						})]),
 						_: 1
@@ -129,19 +214,22 @@ var HistoryDiffDialog_vue_vue_type_script_setup_true_lang_default = /* @__PURE__
 						size: "small",
 						class: "m-editor-history-diff-dialog-mode"
 					}, {
-						default: withCtx(() => [createVNode(unref(TMagicRadioButton), { value: "before" }, {
-							default: withCtx(() => [..._cache[6] || (_cache[6] = [createTextVNode("与修改前对比", -1)])]),
+						default: withCtx(() => [createVNode(unref(TMagicRadioButton), {
+							value: "before",
+							disabled: !hasValue.value
+						}, {
+							default: withCtx(() => [..._cache[7] || (_cache[7] = [createTextVNode("与修改前对比", -1)])]),
 							_: 1
-						}), createVNode(unref(TMagicRadioButton), {
+						}, 8, ["disabled"]), createVNode(unref(TMagicRadioButton), {
 							value: "current",
 							disabled: !hasCurrent.value
 						}, {
-							default: withCtx(() => [..._cache[7] || (_cache[7] = [createTextVNode("与当前对比", -1)])]),
+							default: withCtx(() => [..._cache[8] || (_cache[8] = [createTextVNode("与当前对比", -1)])]),
 							_: 1
 						}, 8, ["disabled"])]),
 						_: 1
 					}, 8, ["modelValue"])])]),
-					createElementVNode("div", _hoisted_5, [
+					createElementVNode("div", _hoisted_6, [
 						createVNode(unref(TMagicTag), {
 							size: "small",
 							type: "danger"
@@ -149,7 +237,7 @@ var HistoryDiffDialog_vue_vue_type_script_setup_true_lang_default = /* @__PURE__
 							default: withCtx(() => [createTextVNode(toDisplayString(leftLabel.value), 1)]),
 							_: 1
 						}),
-						_cache[8] || (_cache[8] = createElementVNode("span", { class: "m-editor-history-diff-dialog-arrow" }, "→", -1)),
+						_cache[9] || (_cache[9] = createElementVNode("span", { class: "m-editor-history-diff-dialog-arrow" }, "→", -1)),
 						createVNode(unref(TMagicTag), {
 							size: "small",
 							type: "success"
@@ -157,16 +245,21 @@ var HistoryDiffDialog_vue_vue_type_script_setup_true_lang_default = /* @__PURE__
 							default: withCtx(() => [createTextVNode(toDisplayString(rightLabel.value), 1)]),
 							_: 1
 						}),
-						mode.value === "current" && isSameAsCurrent.value ? (openBlock(), createElementBlock("span", _hoisted_6, " 当前值与该步修改后一致，无差异 ")) : createCommentVNode("v-if", true)
+						mode.value === "current" && isSameAsCurrent.value ? (openBlock(), createElementBlock("span", _hoisted_7, " 当前值与该步修改后一致，无差异 ")) : createCommentVNode("v-if", true)
 					]),
 					viewMode.value === "form" ? (openBlock(), 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,
+						"base-form-state": __props.compareFormState,
 						"extend-state": __props.extendState,
+						"load-config": __props.loadConfig,
+						"self-diff-field-types": __props.selfDiffFieldTypes,
+						services: props.services,
+						size: props.size,
 						height: "70vh"
 					}, null, 8, [
 						"category",
@@ -174,9 +267,14 @@ var HistoryDiffDialog_vue_vue_type_script_setup_true_lang_default = /* @__PURE__
 						"data-source-type",
 						"value",
 						"last-value",
-						"extend-state"
+						"base-form-state",
+						"extend-state",
+						"load-config",
+						"self-diff-field-types",
+						"services",
+						"size"
 					])) : (openBlock(), createBlock(CodeEditor_default, {
-						key: 1,
+						key: 2,
 						type: "diff",
 						language: "json",
 						"init-values": leftValue.value,
@@ -187,7 +285,11 @@ var HistoryDiffDialog_vue_vue_type_script_setup_true_lang_default = /* @__PURE__
 					}, null, 8, ["init-values", "modified-values"]))
 				])) : createCommentVNode("v-if", true)]),
 				_: 1
-			}, 8, ["modelValue"])]);
+			}, 8, [
+				"modelValue",
+				"title",
+				"width"
+			]);
 		};
 	}
 });