@tmagic/editor 1.8.0-beta.1 → 1.8.0-beta.11

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

@@ -0,0 +1,313 @@
+import { confirmHistoryAction } from "./composables.js";
+import { tMagicMessage } from "@tmagic/design";
+import { createApp, getCurrentInstance } from "vue";
+//#region packages/editor/src/layouts/history-list/useHistoryRevert.ts
+/**
+* 构造差异弹窗入参：仅 update（前后值都存在）可对比。
+* - 页面（无 id）：在全部分组中按 index 定位 step，目标 id 取自快照；
+* - 数据源 / 代码块（带 id）：先匹配分组 id 再按 index 定位。
+* 无可对比内容（多节点 / add / remove）或定位不到时返回 null。
+*/
+var buildDiffPayload = (source, index, id) => {
+	for (const group of source.groups()) {
+		if (id !== void 0 && group.id !== id) continue;
+		const step = group.steps.find((s) => s.index === index)?.step;
+		if (!step) continue;
+		const oldSchema = step.diff?.[0]?.oldSchema;
+		const newSchema = step.diff?.[0]?.newSchema;
+		if (!oldSchema || !newSchema) return null;
+		const targetId = id ?? newSchema.id ?? oldSchema.id;
+		const type = source.resolveType?.(newSchema, oldSchema);
+		return {
+			category: source.category,
+			...type !== void 0 ? { type } : {},
+			lastValue: oldSchema,
+			value: newSchema,
+			currentValue: (targetId !== void 0 ? source.getCurrent(targetId) : null) || null,
+			targetLabel: source.resolveLabel(newSchema, oldSchema, targetId),
+			id: targetId
+		};
+	}
+	return null;
+};
+/**
+* 按需动态 import 并挂载一个游离的 HistoryDiffDialog，返回其实例与清理函数。
+* 通过继承 appContext 复用全局组件 / 指令 / provide / 插件（Element Plus、@tmagic/form 字段组件等），
+* 弹窗组件动态 import，避免拖累其它消费者。供「确认回滚」与「查看差异」两种交互共用。
+*/
+var mountHistoryDiffDialog = async (options) => {
+	const { default: historyDiffDialog } = await import("./HistoryDiffDialog.js");
+	const container = document.createElement("div");
+	container.style.display = "none";
+	document.body.appendChild(container);
+	const app = createApp(historyDiffDialog, {
+		services: options.services,
+		isConfirm: options.isConfirm,
+		extendState: options.extendState,
+		loadConfig: options.loadConfig,
+		selfDiffFieldTypes: options.selfDiffFieldTypes,
+		compareFormState: options.compareFormState,
+		width: options.width,
+		onClose: options.onClose
+	});
+	if (options.appContext) Object.assign(app._context, options.appContext);
+	const instance = app.mount(container);
+	const destroy = () => {
+		setTimeout(() => {
+			try {
+				app.unmount();
+			} catch {}
+			container.parentNode?.removeChild(container);
+		}, 300);
+	};
+	return {
+		app,
+		instance,
+		destroy
+	};
+};
+/**
+* 动态挂载一个「确认回滚」模式的 HistoryDiffDialog，等待用户确认：
+* - 用户点「确定回滚」resolve(true)，取消 / 关闭 resolve(false)；
+* - 确认流程结束后自动卸载。
+*/
+var confirmRevertWithDiffDialog = async (payload, options) => {
+	const { instance, destroy } = await mountHistoryDiffDialog({
+		...options,
+		isConfirm: true
+	});
+	try {
+		return await instance.confirm(payload);
+	} finally {
+		destroy();
+	}
+};
+/**
+* 动态挂载一个「查看差异」模式（只读）的 HistoryDiffDialog 并打开：
+* 弹窗保持打开直到用户关闭，关闭（close 事件）后自动卸载并清理容器。
+*/
+var viewHistoryDiffDialog = async (payload, options) => {
+	const handle = {};
+	const { instance, destroy } = await mountHistoryDiffDialog({
+		...options,
+		isConfirm: false,
+		onClose: () => handle.destroy?.()
+	});
+	handle.destroy = destroy;
+	instance.open(payload);
+};
+/**
+* 历史记录「单步回滚」与「查看差异」的完整交互流程，供历史面板与业务方共用。
+*
+* 单步回滚（类 git revert）：
+* 1. 前置校验：目标数据已被删除（update 写回目标 / 页面 remove 的原父容器缺失）时给出「回滚失败」提示并中止；
+* 2. 二次确认：可差异对比的步骤（单实体 update）弹出差异确认弹窗，其余步骤弹普通二次确认框；
+* 3. 用户确认后执行对应 service 的 revert（页面 / 数据源 / 代码块）。
+*
+* 查看差异：可差异对比的步骤动态挂载只读 HistoryDiffDialog 展示前后值差异。
+*
+* 上述弹窗均按需动态挂载 HistoryDiffDialog 实现，业务方无需自行挂载任何弹窗。
+*
+* 返回的能力分三组：
+* - 内置三类（页面 / 数据源 / 代码块）：`onPageRevert` / `onDataSourceRevert` / `onCodeBlockRevert` 单步回滚，
+*   `onPageDiff` / `onDataSourceDiff` / `onCodeBlockDiff` 查看差异，及配套的 `buildXxxDiffPayload` / `isXxxRevertTargetMissing`；
+* - 业务自有历史（如管理台「模块」）：`confirmAndRevert` / `viewDiff` 复用同一套交互流程，由业务方自行构造差异入参；
+*   即上述内置三类本质上是它们各自预置好 payload 构造与 service.revert 的特例。
+*
+* 业务方可在拿到 Editor 实例暴露的 `services` 后直接 import 调用：
+*
+* ```ts
+* import { useHistoryRevert } from '@tmagic/editor';
+*
+* const { onPageRevert, onPageDiff } = useHistoryRevert({}, editorRef.value); // editorRef.value 即 Editor 暴露的 services
+* await onPageRevert(index); // 弹出差异 / 二次确认弹窗后回滚
+* onPageDiff(index); // 弹出只读差异弹窗查看前后值差异
+* ```
+*/
+var useHistoryRevert = (options = {}, services) => {
+	const appContext = options.appContext ?? getCurrentInstance()?.appContext ?? null;
+	const { extendState, getPropsPanelFormState, dialogWidth } = options;
+	/** 目标数据已被删除、无法回滚时的统一提示。 */
+	const showRevertTargetMissing = () => {
+		tMagicMessage.error("回滚失败：该记录对应的数据已被删除");
+	};
+	/**
+	* 「回滚」二次确认：新增 / 删除 / 多节点更新等无法做差异对比的步骤，
+	* 不弹差异弹窗，改用一个普通确认框替代「确定回滚」按钮，避免点击后无任何提示直接执行。
+	* 用户取消时返回 false，调用方据此中止回滚。
+	*/
+	const confirmRevert = () => confirmHistoryAction("确定回滚该步骤吗？回滚会将该操作作为一条新记录反向应用（新增将被删除、删除将被还原），不影响后续历史记录。");
+	/**
+	* 「回滚」统一确认入口：可差异对比的步骤动态挂载 HistoryDiffDialog 走差异确认弹窗，
+	* 无法对比的步骤（add / remove / 多节点更新）回退到普通二次确认框。
+	* `extra` 供业务自有历史（如模块）透传自定义表单配置加载等渲染入参。
+	*/
+	const runRevert = (payload, extra) => {
+		if (payload) return confirmRevertWithDiffDialog(payload, {
+			appContext,
+			extendState,
+			services,
+			...extra,
+			width: extra?.width ?? dialogWidth
+		});
+		return confirmRevert();
+	};
+	const buildPageDiffPayload = (index) => buildDiffPayload({
+		category: "node",
+		groups: () => services?.historyService.getHistoryGroups("page", services?.editorService.get("page")?.id) ?? [],
+		getCurrent: (id) => services?.editorService.getNodeById(id),
+		resolveType: (n, o) => n.type || o.type || "",
+		resolveLabel: (n, o) => n.name || o.name || n.type || o.type || ""
+	}, index);
+	const buildDataSourceDiffPayload = (id, index) => buildDiffPayload({
+		category: "data-source",
+		groups: () => services?.historyService.getHistoryGroups("dataSource") ?? [],
+		getCurrent: (id) => services?.dataSourceService.getDataSourceById(`${id}`),
+		resolveType: (n, o) => n.type || o.type || "base",
+		resolveLabel: (n, o, id) => n.title || o.title || `${id}`
+	}, index, id);
+	const buildCodeBlockDiffPayload = (id, index) => buildDiffPayload({
+		category: "code-block",
+		groups: () => services?.historyService.getHistoryGroups("codeBlock") ?? [],
+		getCurrent: (id) => services?.codeBlockService.getCodeContentById(id),
+		resolveLabel: (n, o, id) => n.name || o.name || `${id}`
+	}, index, id);
+	/**
+	* 回滚前置校验：若该历史步骤回滚所依赖的目标数据已被删除，则无法回滚。
+	* - update（把旧值写回）：被修改的目标必须仍存在；
+	* - 页面 remove（还原被删节点）：被删节点的原父容器必须仍存在，否则无处插回；
+	* add（回滚即删除）即使目标已不在，也已达成「删除」目的，不视为失败。
+	*/
+	const isPageRevertTargetMissing = (index) => {
+		const step = services?.historyService.getStepList("page", services?.editorService.get("page")?.id)[index]?.step;
+		if (!step) return false;
+		if (step.opType === "update") return (step.diff ?? []).some((item) => {
+			const id = item.newSchema?.id ?? item.oldSchema?.id;
+			return id !== void 0 && !services?.editorService.getNodeById(id, false);
+		});
+		if (step.opType === "remove") return (step.diff ?? []).some((item) => item.parentId !== void 0 && !services?.editorService.getNodeById(item.parentId, false));
+		return false;
+	};
+	/** 数据源 update 步骤回滚时，对应数据源必须仍存在（已删除则无处写回旧值）。 */
+	const isDataSourceRevertTargetMissing = (id, index) => {
+		const step = services?.historyService.getStepList("dataSource", id)[index]?.step;
+		return Boolean(step?.opType === "update" && !services?.dataSourceService.getDataSourceById(`${id}`));
+	};
+	/** 代码块 update 步骤回滚时，对应代码块必须仍存在（已删除则无处写回旧值）。 */
+	const isCodeBlockRevertTargetMissing = (id, index) => {
+		const step = services?.historyService.getStepList("codeBlock", id)[index]?.step;
+		return Boolean(step?.opType === "update" && !services?.codeBlockService.getCodeContentById(id));
+	};
+	const onPageRevert = (index) => {
+		if (isPageRevertTargetMissing(index)) {
+			showRevertTargetMissing();
+			return Promise.resolve(null);
+		}
+		return runRevert(buildPageDiffPayload(index), { compareFormState: getPropsPanelFormState?.() }).then((result) => result ? services?.editorService.revertPageStep(index) : null);
+	};
+	const onDataSourceRevert = (id, index) => {
+		if (isDataSourceRevertTargetMissing(id, index)) {
+			showRevertTargetMissing();
+			return Promise.resolve(null);
+		}
+		return runRevert(buildDataSourceDiffPayload(id, index)).then((result) => result ? services?.dataSourceService.revert(id, index) : null);
+	};
+	const onCodeBlockRevert = (id, index) => {
+		if (isCodeBlockRevertTargetMissing(id, index)) {
+			showRevertTargetMissing();
+			return Promise.resolve(null);
+		}
+		return runRevert(buildCodeBlockDiffPayload(id, index)).then((result) => result ? services?.codeBlockService.revert(id, index) : null);
+	};
+	/**
+	* 「查看差异」：可差异对比的步骤（单实体 update）动态挂载只读 HistoryDiffDialog 展示前后值差异，
+	* 无可对比内容（add / remove / 多节点更新）时不弹窗、静默返回。
+	*/
+	const onPageDiff = (index) => {
+		const payload = buildPageDiffPayload(index);
+		if (payload) return viewHistoryDiffDialog(payload, {
+			appContext,
+			extendState,
+			services,
+			width: dialogWidth,
+			compareFormState: getPropsPanelFormState?.()
+		});
+	};
+	const onDataSourceDiff = (id, index) => {
+		const payload = buildDataSourceDiffPayload(id, index);
+		if (payload) return viewHistoryDiffDialog(payload, {
+			appContext,
+			extendState,
+			services,
+			width: dialogWidth
+		});
+	};
+	const onCodeBlockDiff = (id, index) => {
+		const payload = buildCodeBlockDiffPayload(id, index);
+		if (payload) return viewHistoryDiffDialog(payload, {
+			appContext,
+			extendState,
+			services,
+			width: dialogWidth
+		});
+	};
+	/**
+	* 业务自有历史（如管理台「模块」）的「单步回滚」统一入口：
+	* 复用与页面/数据源/代码块一致的「目标校验 → 差异/二次确认弹窗 → 反向回滚」流程，
+	* 内置三类只是它的特例（各自预置了 buildXxxDiffPayload + service.revert）。
+	*
+	* 用户取消或前置校验未过时返回 null，确认并执行回滚后返回 `revert()` 的结果。
+	*
+	* ```ts
+	* await confirmAndRevert({
+	*   diffPayload: oldSchema && newSchema ? { category: 'module', lastValue: oldSchema, value: newSchema, ... } : null,
+	*   loadConfig: (ctx) => loadModFormConfig(modTypeId, values),
+	*   selfDiffFieldTypes: ['mod-cond'],
+	*   revert: () => moduleHistoryStore.revert(id, index),
+	* });
+	* ```
+	*/
+	const confirmAndRevert = async (revertOptions) => {
+		if (revertOptions.isTargetMissing?.()) {
+			showRevertTargetMissing();
+			return null;
+		}
+		if (!await runRevert(revertOptions.diffPayload ?? null, {
+			loadConfig: revertOptions.loadConfig,
+			selfDiffFieldTypes: revertOptions.selfDiffFieldTypes,
+			width: revertOptions.width
+		})) return null;
+		return await revertOptions.revert();
+	};
+	/**
+	* 业务自有历史的「查看差异」统一入口：传入自行构造的差异入参即弹出只读差异弹窗，
+	* 可透传 `loadConfig` / `selfDiffFieldTypes`。payload 为 null（不可对比）时静默返回。
+	*/
+	const viewDiff = (payload, extra) => {
+		if (payload) return viewHistoryDiffDialog(payload, {
+			appContext,
+			extendState,
+			services,
+			...extra,
+			width: extra?.width ?? dialogWidth
+		});
+	};
+	return {
+		onPageRevert,
+		onDataSourceRevert,
+		onCodeBlockRevert,
+		onPageDiff,
+		onDataSourceDiff,
+		onCodeBlockDiff,
+		buildPageDiffPayload,
+		buildDataSourceDiffPayload,
+		buildCodeBlockDiffPayload,
+		isPageRevertTargetMissing,
+		isDataSourceRevertTargetMissing,
+		isCodeBlockRevertTargetMissing,
+		confirmAndRevert,
+		viewDiff
+	};
+};
+//#endregion
+export { useHistoryRevert };

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

@@ -16,7 +16,7 @@ var _hoisted_2 = {
 	key: 1,
 	style: { "width": "21px" }
 };
-var AddButton_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ defineComponent({
+var AddButton_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defineComponent({
 	name: "MEditorPageBarAddButton",
 	__name: "AddButton",
 	setup(__props) {

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";
@@ -13,7 +13,7 @@ var _hoisted_1 = { class: "m-editor-page-bar-tabs" };
 var _hoisted_2 = ["data-page-id", "onClick"];
 var _hoisted_3 = { class: "m-editor-page-bar-title" };
 var _hoisted_4 = ["title"];
-var PageBar_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ defineComponent({
+var PageBar_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defineComponent({
 	name: "MEditorPageBar",
 	__name: "PageBar",
 	props: {
@@ -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/page-bar/PageBarScrollContainer.vue_vue_type_script_setup_true_lang.js

@@ -13,7 +13,7 @@ var _hoisted_2 = {
 	class: "m-editor-page-bar-items",
 	ref: "itemsContainer"
 };
-var PageBarScrollContainer_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ defineComponent({
+var PageBarScrollContainer_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defineComponent({
 	name: "MEditorPageBarScrollContainer",
 	__name: "PageBarScrollContainer",
 	props: {

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

@@ -11,7 +11,7 @@ var _hoisted_1 = {
 };
 var _hoisted_2 = { class: "page-bar-popover-wrapper" };
 var _hoisted_3 = { class: "page-bar-popover-inner" };
-var PageList_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ defineComponent({
+var PageList_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defineComponent({
 	name: "MEditorPageList",
 	__name: "PageList",
 	props: { list: {} },

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

@@ -5,13 +5,13 @@ import { Teleport, createBlock, createCommentVNode, createElementBlock, createVN
 import { Search } from "@element-plus/icons-vue";
 //#region packages/editor/src/layouts/page-bar/Search.vue?vue&type=script&setup=true&lang.ts
 var _hoisted_1 = { 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__ */ defineComponent({
+var Search_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defineComponent({
 	__name: "Search",
 	props: {
 		"query": {},
 		"queryModifiers": {}
 	},
-	emits: /* @__PURE__ */ mergeModels(["search"], ["update:query"]),
+	emits: /*@__PURE__*/ mergeModels(["search"], ["update:query"]),
 	setup(__props, { emit: __emit }) {
 		const emit = __emit;
 		const query = useModel(__props, "query");

package/dist/es/layouts/props-panel/FormPanel.vue_vue_type_script_setup_true_lang.js

@@ -8,7 +8,7 @@ import { computed, createBlock, createCommentVNode, createElementBlock, createVN
 import { Document } from "@element-plus/icons-vue";
 //#region packages/editor/src/layouts/props-panel/FormPanel.vue?vue&type=script&setup=true&lang.ts
 var _hoisted_1 = { class: "m-editor-props-form-panel" };
-var FormPanel_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ defineComponent({
+var FormPanel_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defineComponent({
 	name: "MEditorFormPanel",
 	__name: "FormPanel",
 	props: {

package/dist/es/layouts/props-panel/PropsPanel.vue_vue_type_script_setup_true_lang.js

@@ -16,7 +16,7 @@ var _hoisted_1 = {
 	class: "m-editor-props-panel"
 };
 var _hoisted_2 = { class: "m-editor-props-style-panel-title" };
-var PropsPanel_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ defineComponent({
+var PropsPanel_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defineComponent({
 	name: "MEditorPropsPanel",
 	__name: "PropsPanel",
 	props: {
@@ -69,7 +69,11 @@ var PropsPanel_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ def
 						if (record.propPath?.startsWith("style") && record.value === "") 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);
 			}

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

@@ -10,7 +10,7 @@ import { Grid } from "@element-plus/icons-vue";
 //#region packages/editor/src/layouts/sidebar/ComponentListPanel.vue?vue&type=script&setup=true&lang.ts
 var _hoisted_1 = ["onClick", "onDragstart"];
 var _hoisted_2 = ["title"];
-var ComponentListPanel_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ defineComponent({
+var ComponentListPanel_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defineComponent({
 	name: "MEditorComponentListPanel",
 	__name: "ComponentListPanel",
 	setup(__props) {
@@ -37,7 +37,7 @@ var ComponentListPanel_vue_vue_type_script_setup_true_lang_default = /* @__PURE_
 				name: text,
 				type,
 				...data
-			});
+			}, void 0, { historySource: "component-panel" });
 		};
 		const dragstartHandler = ({ text, type, data = {} }, e) => {
 			e.dataTransfer?.setData("text/json", serialize({

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

@@ -30,7 +30,7 @@ var _hoisted_5 = {
 	class: "m-editor-sidebar-tips"
 };
 var _hoisted_6 = { class: "m-editor-slide-list-box" };
-var Sidebar_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ defineComponent({
+var Sidebar_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defineComponent({
 	name: "MEditorSidebar",
 	__name: "Sidebar",
 	props: {
@@ -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]: {
@@ -83,7 +87,7 @@ var Sidebar_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ define
 					slots: {}
 				},
 				layer: {
-					$key: "layer",
+					$key: SideItemKey.LAYER,
 					type: "component",
 					icon: List,
 					text: "已选组件",
@@ -101,7 +105,7 @@ var Sidebar_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ define
 					slots: {}
 				},
 				[SideItemKey.CODE_BLOCK]: {
-					$key: "code-block",
+					$key: SideItemKey.CODE_BLOCK,
 					type: "component",
 					icon: EditPen,
 					text: "代码编辑",

package/dist/es/layouts/sidebar/code-block/CodeBlockList.vue_vue_type_script_setup_true_lang.js

@@ -9,7 +9,7 @@ import { DepTargetType } from "@tmagic/core";
 import { computed, createBlock, createCommentVNode, createElementVNode, createVNode, defineComponent, normalizeClass, openBlock, renderSlot, toDisplayString, unref, withCtx, withModifiers } from "vue";
 import { Close, Edit, View } from "@element-plus/icons-vue";
 //#region packages/editor/src/layouts/sidebar/code-block/CodeBlockList.vue?vue&type=script&setup=true&lang.ts
-var CodeBlockList_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ defineComponent({
+var CodeBlockList_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defineComponent({
 	name: "MEditorCodeBlockList",
 	__name: "CodeBlockList",
 	props: {
@@ -78,7 +78,7 @@ var CodeBlockList_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */
 		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() || [];
@@ -88,7 +88,7 @@ var CodeBlockList_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */
 					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) tMagicMessage.error("代码块存在绑定关系，不可删除");
 			else tMagicMessage.error("代码块不可删除");
@@ -138,7 +138,7 @@ var CodeBlockList_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */
 						default: withCtx(() => [createVNode(Icon_default, {
 							icon: unref(Close),
 							class: "edit-icon",
-							onClick: withModifiers(($event) => deleteCode(`${data.key}`), ["stop"])
+							onClick: withModifiers(($event) => deleteCode(`${data.key}`, { historySource: "tree" }), ["stop"])
 						}, null, 8, ["icon", "onClick"])]),
 						_: 2
 					}, 1024)) : createCommentVNode("v-if", true),

package/dist/es/layouts/sidebar/code-block/CodeBlockListPanel.vue_vue_type_script_setup_true_lang.js

@@ -9,7 +9,7 @@ import { TMagicButton, TMagicScrollbar } from "@tmagic/design";
 import { Fragment, Teleport, computed, createBlock, createCommentVNode, createElementBlock, createElementVNode, createTextVNode, createVNode, defineComponent, inject, openBlock, renderSlot, unref, useTemplateRef, watch, withCtx } from "vue";
 //#region packages/editor/src/layouts/sidebar/code-block/CodeBlockListPanel.vue?vue&type=script&setup=true&lang.ts
 var _hoisted_1 = { class: "search-wrapper" };
-var CodeBlockListPanel_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ defineComponent({
+var CodeBlockListPanel_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defineComponent({
 	name: "MEditorCodeBlockListPanel",
 	__name: "CodeBlockListPanel",
 	props: {
@@ -38,7 +38,7 @@ var CodeBlockListPanel_vue_vue_type_script_setup_true_lang_default = /* @__PURE_
 			if (codeBlockListRef.value) for (const [, status] of codeBlockListRef.value.nodeStatusMap.entries()) status.selected = false;
 		};
 		const { nodeContentMenuHandler, menuData: contentMenuData, contentMenuHideHandler } = useContentMenu((id) => {
-			codeBlockListRef.value?.deleteCode(id);
+			codeBlockListRef.value?.deleteCode(id, { historySource: "tree-contextmenu" });
 		});
 		const menuData = computed(() => props.customContentMenu(contentMenuData, "code-block"));
 		return (_ctx, _cache) => {

package/dist/es/layouts/sidebar/code-block/useContentMenu.js

@@ -26,7 +26,7 @@ var useContentMenu = (deleteCode) => {
 				const codeBlock = codeBlockService.getCodeContentById(selectId);
 				if (!codeBlock) return;
 				const newCodeId = await codeBlockService.getUniqueId();
-				codeBlockService.setCodeDslById(newCodeId, cloneDeep(codeBlock));
+				codeBlockService.setCodeDslById(newCodeId, cloneDeep(codeBlock), { historySource: "tree-contextmenu" });
 			}
 		},
 		{

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

@@ -2,7 +2,7 @@ import ToolButton_default from "../../../components/ToolButton.js";
 import { TMagicButton, TMagicPopover } from "@tmagic/design";
 import { Fragment, createBlock, createElementBlock, createTextVNode, createVNode, defineComponent, guardReactiveProps, normalizeProps, openBlock, renderList, toDisplayString, unref, withCtx } from "vue";
 //#region packages/editor/src/layouts/sidebar/data-source/DataSourceAddButton.vue?vue&type=script&setup=true&lang.ts
-var DataSourceAddButton_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ defineComponent({
+var DataSourceAddButton_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defineComponent({
 	name: "MEditorDataSourceAddButton",
 	__name: "DataSourceAddButton",
 	props: {

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

@@ -4,15 +4,17 @@ 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({
+var DataSourceConfigPanel_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defineComponent({
 	name: "MEditorDataSourceConfigPanel",
 	__name: "DataSourceConfigPanel",
-	props: /* @__PURE__ */ mergeModels({
+	props: /*@__PURE__*/ mergeModels({
 		title: {},
 		values: {},
-		disabled: { type: Boolean }
+		disabled: { type: Boolean },
+		editMethodName: {},
+		editFieldPath: {}
 	}, {
 		"visible": {
 			type: Boolean,
@@ -22,7 +24,7 @@ var DataSourceConfigPanel_vue_vue_type_script_setup_true_lang_default = /* @__PU
 		"width": { default: 670 },
 		"widthModifiers": {}
 	}),
-	emits: /* @__PURE__ */ mergeModels([
+	emits: /*@__PURE__*/ mergeModels([
 		"submit",
 		"close",
 		"open"
@@ -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 = "fields";
+			if (props.editMethodName) activeTab = "methods";
+			else if (props.editFieldPath?.length) activeTab = "fields";
+			dataSourceConfig.value = config.map((item) => item.type === "tab" ? {
+				...item,
+				active: activeTab
+			} : item);
 		});
 		const submitHandler = (values, data) => {
 			emit("submit", values, data);

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

@@ -8,7 +8,7 @@ import { DepTargetType } from "@tmagic/core";
 import { computed, createBlock, createCommentVNode, createElementVNode, createVNode, defineComponent, normalizeClass, openBlock, renderSlot, toDisplayString, unref, withCtx, withModifiers } from "vue";
 import { Close, Edit, View } from "@element-plus/icons-vue";
 //#region packages/editor/src/layouts/sidebar/data-source/DataSourceList.vue?vue&type=script&setup=true&lang.ts
-var DataSourceList_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ defineComponent({
+var DataSourceList_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defineComponent({
 	name: "MEditorDataSourceList",
 	__name: "DataSourceList",
 	props: {