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

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

@@ -1,27 +1,44 @@
 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, Teleport, 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({
 	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 = ref(false);
 		const payload = ref(null);
 		const mode = ref("before");
@@ -43,6 +60,7 @@ 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 leftValue = computed(() => {
@@ -63,6 +81,11 @@ 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);
 		});
+		const onConfirmClick = () => {
+			const cb = props.onConfirm;
+			cb?.();
+			visible.value = false;
+		};
 		const targetText = computed(() => {
 			if (!payload.value) return "";
 			const prefix = {
@@ -86,6 +109,9 @@ var HistoryDiffDialog_vue_vue_type_script_setup_true_lang_default = /* @__PURE__
 		watch(visible, (v) => {
 			if (!v) payload.value = null;
 		});
+		const onClose = () => {
+			emit("close");
+		};
 		__expose({
 			open,
 			close
@@ -93,33 +119,49 @@ var HistoryDiffDialog_vue_vue_type_script_setup_true_lang_default = /* @__PURE__
 		return (_ctx, _cache) => {
 			return openBlock(), createBlock(Teleport, { to: "body" }, [createVNode(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.onConfirm ? (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
+				})], 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 ? (openBlock(), createElementBlock("div", _hoisted_1, [
-					createElementVNode("div", _hoisted_2, [createElementVNode("span", _hoisted_3, toDisplayString(targetText.value), 1), createElementVNode("div", _hoisted_4, [createVNode(unref(TMagicRadioGroup), {
+					__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
@@ -130,18 +172,18 @@ var HistoryDiffDialog_vue_vue_type_script_setup_true_lang_default = /* @__PURE__
 						class: "m-editor-history-diff-dialog-mode"
 					}, {
 						default: withCtx(() => [createVNode(unref(TMagicRadioButton), { value: "before" }, {
-							default: withCtx(() => [..._cache[6] || (_cache[6] = [createTextVNode("与修改前对比", -1)])]),
+							default: withCtx(() => [..._cache[7] || (_cache[7] = [createTextVNode("与修改前对比", -1)])]),
 							_: 1
 						}), 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 +191,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 +199,18 @@ 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,
 						"extend-state": __props.extendState,
+						"load-config": __props.loadConfig,
+						"self-diff-field-types": __props.selfDiffFieldTypes,
 						height: "70vh"
 					}, null, 8, [
 						"category",
@@ -174,9 +218,11 @@ var HistoryDiffDialog_vue_vue_type_script_setup_true_lang_default = /* @__PURE__
 						"data-source-type",
 						"value",
 						"last-value",
-						"extend-state"
+						"extend-state",
+						"load-config",
+						"self-diff-field-types"
 					])) : (openBlock(), createBlock(CodeEditor_default, {
-						key: 1,
+						key: 2,
 						type: "diff",
 						language: "json",
 						"init-values": leftValue.value,
@@ -187,7 +233,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"
+			])]);
 		};
 	}
 });

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

@@ -1,12 +1,11 @@
 import { useServices } from "../../hooks/use-services.js";
 import Icon_default from "../../components/Icon.js";
-import { useHistoryList } from "./composables.js";
-import CodeBlockTab_default from "./CodeBlockTab.js";
-import DataSourceTab_default from "./DataSourceTab.js";
+import { describeCodeBlockGroup, describeCodeBlockStep, describeDataSourceGroup, describeDataSourceStep, useHistoryList } from "./composables.js";
+import BucketTab_default from "./BucketTab.js";
 import HistoryDiffDialog_default from "./HistoryDiffDialog.js";
 import PageTab_default from "./PageTab.js";
 import { TMagicButton, TMagicPopover, TMagicTabs, TMagicTooltip, getDesignConfig } from "@tmagic/design";
-import { Fragment, createBlock, createElementBlock, createElementVNode, createVNode, defineComponent, guardReactiveProps, inject, markRaw, normalizeProps, openBlock, ref, resolveDynamicComponent, unref, useTemplateRef, withCtx } from "vue";
+import { Fragment, computed, createBlock, createCommentVNode, createElementBlock, createElementVNode, createVNode, defineComponent, guardReactiveProps, inject, markRaw, mergeProps, normalizeProps, openBlock, ref, renderList, resolveDynamicComponent, shallowRef, toHandlers, unref, useTemplateRef, watch, withCtx } from "vue";
 import { Clock, Close } from "@element-plus/icons-vue";
 //#region packages/editor/src/layouts/history-list/HistoryListPanel.vue?vue&type=script&setup=true&lang.ts
 var _hoisted_1 = { class: "m-editor-history-list" };
@@ -31,7 +30,8 @@ var HistoryListPanel_vue_vue_type_script_setup_true_lang_default = /* @__PURE__
 		* 此外每条 step 上提供"查看差异"入口（仅在前后值都存在的 update 步骤显示），
 		* 点击后弹出 HistoryDiffDialog，使用 CompareForm 组件以表单形式展示新旧值差异。
 		*
-		* 各 tab 的内容拆分为独立的 SFC（PageTab / DataSourceTab / CodeBlockTab），
+		* 各 tab 的内容拆分为独立的 SFC：页面用 PageTab，数据源 / 代码块复用通用的 BucketTab
+		* （通过 title / prefix / describe* / isStepDiffable 注入差异）。
 		* 共享的描述生成与折叠状态在 composables.ts 中维护。
 		*/
 		const ClockIcon = markRaw(Clock);
@@ -40,7 +40,23 @@ var HistoryListPanel_vue_vue_type_script_setup_true_lang_default = /* @__PURE__
 		/** 面板显隐受控：reference 图标点击切换，右上角关闭按钮置为 false。 */
 		const visible = ref(false);
 		const tabPaneComponent = getDesignConfig("components")?.tabPane;
-		const { editorService, dataSourceService, codeBlockService, historyService } = useServices();
+		/**
+		* 业务方自定义的扩展 tab，由 Editor 顶层通过 `historyListExtraTabs` 注入。
+		* 追加在内置「页面 / 数据源 / 代码块」三个 tab 之后，未提供时为空数组。
+		*/
+		const extraTabs = 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 = computed(() => propsService.getDisabledDataSource());
+		const disabledCodeBlock = computed(() => propsService.getDisabledCodeBlock());
+		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 能拿到完整的业务上下文。
@@ -48,6 +64,10 @@ var HistoryListPanel_vue_vue_type_script_setup_true_lang_default = /* @__PURE__
 		*/
 		const extendFormState = 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) => {
@@ -72,36 +92,24 @@ var HistoryListPanel_vue_vue_type_script_setup_true_lang_default = /* @__PURE__
 		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 = 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,
@@ -109,50 +117,87 @@ var HistoryListPanel_vue_vue_type_script_setup_true_lang_default = /* @__PURE__
 					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 = 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 openBlock(), createElementBlock(Fragment, null, [createVNode(unref(TMagicPopover), {
@@ -217,13 +262,18 @@ var HistoryListPanel_vue_vue_type_script_setup_true_lang_default = /* @__PURE__
 							])]),
 							_: 1
 						}, 16)),
-						(openBlock(), createBlock(resolveDynamicComponent(unref(tabPaneComponent)?.component || "el-tab-pane"), normalizeProps(guardReactiveProps(unref(tabPaneComponent)?.props({
+						!disabledDataSource.value ? (openBlock(), createBlock(resolveDynamicComponent(unref(tabPaneComponent)?.component || "el-tab-pane"), normalizeProps(mergeProps({ key: 0 }, unref(tabPaneComponent)?.props({
 							name: "data-source",
 							label: `数据源 (${unref(dataSourceGroups).length})`
 						}) || {})), {
-							default: withCtx(() => [createVNode(DataSourceTab_default, {
+							default: withCtx(() => [createVNode(BucketTab_default, {
+								title: "数据源",
+								prefix: "ds",
 								buckets: unref(dataSourceGroupsByTarget),
 								expanded: unref(expanded),
+								"describe-group": unref(describeDataSourceGroup),
+								"describe-step": unref(describeDataSourceStep),
+								"is-step-diffable": isDataSourceStepDiffable,
 								onToggle: unref(toggleGroup),
 								onGoto: onDataSourceGoto,
 								onGotoInitial: onDataSourceGotoInitial,
@@ -232,17 +282,24 @@ var HistoryListPanel_vue_vue_type_script_setup_true_lang_default = /* @__PURE__
 							}, null, 8, [
 								"buckets",
 								"expanded",
+								"describe-group",
+								"describe-step",
 								"onToggle"
 							])]),
 							_: 1
-						}, 16)),
-						(openBlock(), createBlock(resolveDynamicComponent(unref(tabPaneComponent)?.component || "el-tab-pane"), normalizeProps(guardReactiveProps(unref(tabPaneComponent)?.props({
+						}, 16)) : createCommentVNode("v-if", true),
+						!disabledCodeBlock.value ? (openBlock(), createBlock(resolveDynamicComponent(unref(tabPaneComponent)?.component || "el-tab-pane"), normalizeProps(mergeProps({ key: 1 }, unref(tabPaneComponent)?.props({
 							name: "code-block",
 							label: `代码块 (${unref(codeBlockGroups).length})`
 						}) || {})), {
-							default: withCtx(() => [createVNode(CodeBlockTab_default, {
+							default: withCtx(() => [createVNode(BucketTab_default, {
+								title: "代码块",
+								prefix: "cb",
 								buckets: unref(codeBlockGroupsByTarget),
 								expanded: unref(expanded),
+								"describe-group": unref(describeCodeBlockGroup),
+								"describe-step": unref(describeCodeBlockStep),
+								"is-step-diffable": isCodeBlockStepDiffable,
 								onToggle: unref(toggleGroup),
 								onGoto: onCodeBlockGoto,
 								onGotoInitial: onCodeBlockGotoInitial,
@@ -251,18 +308,31 @@ var HistoryListPanel_vue_vue_type_script_setup_true_lang_default = /* @__PURE__
 							}, null, 8, [
 								"buckets",
 								"expanded",
+								"describe-group",
+								"describe-step",
 								"onToggle"
 							])]),
 							_: 1
-						}, 16))
+						}, 16)) : createCommentVNode("v-if", true),
+						(openBlock(true), createElementBlock(Fragment, null, renderList(unref(extraTabs), (tab) => {
+							return openBlock(), createBlock(resolveDynamicComponent(unref(tabPaneComponent)?.component || "el-tab-pane"), mergeProps({ key: tab.name }, { ref_for: true }, unref(tabPaneComponent)?.props({
+								name: tab.name,
+								label: resolveTabLabel(tab)
+							}) || {}), {
+								default: withCtx(() => [(openBlock(), createBlock(resolveDynamicComponent(tab.component), mergeProps({ ref_for: true }, tab.props || {}, toHandlers(tab.listeners || {})), null, 16))]),
+								_: 2
+							}, 1040);
+						}), 128))
 					]),
 					_: 1
 				}, 8, ["modelValue"])])]),
 				_: 1
 			}, 8, ["visible"]), createVNode(HistoryDiffDialog_default, {
 				ref: "diffDialog",
-				"extend-state": unref(extendFormState)
-			}, null, 8, ["extend-state"])], 64);
+				"extend-state": unref(extendFormState),
+				"on-confirm": onConfirmRevert.value,
+				onClose: onDiffDialogClose
+			}, null, 8, ["extend-state", "on-confirm"])], 64);
 		};
 	}
 });

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

@@ -1,14 +1,16 @@
-import { createCommentVNode, createElementBlock, createElementVNode, defineComponent, normalizeClass, openBlock } from "vue";
+import { createCommentVNode, createElementBlock, createElementVNode, defineComponent, normalizeClass, openBlock, 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 = {
-	key: 0,
-	class: "m-editor-history-list-item-current"
-};
 var InitialRow_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ 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 }) {
 		/**
@@ -30,8 +32,7 @@ var InitialRow_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ def
 					"is-current": __props.isCurrent,
 					"is-clickable": !__props.isCurrent
 				}]),
-				title: __props.isCurrent ? "当前已回到未修改的初始状态" : "点击回到未修改的初始状态",
-				onClick
+				title: __props.isCurrent ? "当前已回到未修改的初始状态" : "点击回到未修改的初始状态"
 			}, [
 				_cache[0] || (_cache[0] = createElementVNode("span", {
 					class: "m-editor-history-list-item-index",
@@ -39,7 +40,12 @@ var InitialRow_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ def
 				}, "#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.isCurrent ? (openBlock(), createElementBlock("span", _hoisted_2, "当前")) : createCommentVNode("v-if", true)
+				__props.gotoEnabled && !__props.isCurrent ? (openBlock(), createElementBlock("span", {
+					key: 0,
+					class: "m-editor-history-list-item-goto",
+					title: "回到该记录",
+					onClick: withModifiers(onClick, ["stop"])
+				}, "回到")) : 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 } from "./composables.js";
+import { describePageGroup, describePageStep, formatHistoryFullTime, formatHistoryTime, groupTimestamp } from "./composables.js";
 import GroupRow_default from "./GroupRow.js";
 import InitialRow_default from "./InitialRow.js";
 import { TMagicScrollbar } from "@tmagic/design";
@@ -49,14 +49,16 @@ var PageTab_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ define
 				"max-height": "360px"
 			}, {
 				default: withCtx(() => [createElementVNode("ul", _hoisted_2, [
-					(openBlock(true), createElementBlock(Fragment, null, renderList(__props.list, (group, gIdx) => {
+					(openBlock(true), createElementBlock(Fragment, null, renderList(__props.list, (group) => {
 						return openBlock(), 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: unref(describePageGroup)(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,
@@ -64,10 +66,12 @@ var PageTab_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ define
 								isCurrent: s.isCurrent,
 								desc: unref(describePageStep)(s.step),
 								diffable: isPageStepDiffable(s.step),
-								revertable: s.applied
+								revertable: s.applied,
+								time: unref(formatHistoryTime)(s.step.timestamp),
+								timeTitle: 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)),
@@ -78,6 +82,8 @@ var PageTab_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ define
 							"merged",
 							"op-type",
 							"desc",
+							"time",
+							"time-title",
 							"step-count",
 							"sub-steps",
 							"is-current",