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

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

@@ -1,6 +1,6 @@
 import { useServices } from "../../hooks/use-services.js";
 import Icon_default from "../../components/Icon.js";
-import { describeCodeBlockGroup, describeCodeBlockStep, describeDataSourceGroup, describeDataSourceStep, isCodeBlockStepRevertable, isDataSourceStepRevertable, useHistoryList } from "./composables.js";
+import { describeStep, isSingleDiffStepRevertable, useHistoryList } from "./composables.js";
 import BucketTab_default from "./BucketTab.js";
 import HistoryDiffDialog_default from "./HistoryDiffDialog.js";
 import PageTab_default from "./PageTab.js";
@@ -78,10 +78,8 @@ var HistoryListPanel_vue_vue_type_script_setup_true_lang_default = /* @__PURE__
 		* 基于 historyService 的 reactive state 派生，活动页切换或标记写入后自动刷新。
 		*/
 		const pageMarker = computed(() => historyService.getPageMarker());
-		/** 数据源 step 仅 update（前后 schema 都存在）时可查看差异。 */
-		const isDataSourceStepDiffable = (step) => Boolean(step.diff?.[0]?.oldSchema && step.diff?.[0]?.newSchema);
 		/** 代码块 step 仅 update（前后 content 都存在）时可查看差异。 */
-		const isCodeBlockStepDiffable = (step) => Boolean(step.diff?.[0]?.oldSchema && step.diff?.[0]?.newSchema);
+		const isStepDiffable = (step) => Boolean(step.diff?.[0]?.oldSchema && step.diff?.[0]?.newSchema);
 		/**
 		* 数据源 / 代码块两类 bucket 历史的整体渲染配置：把 title / prefix 与各自的描述、
 		* 可差异、可回滚判定收敛为单一对象整体注入 BucketTab，组件内部按需读取。
@@ -89,18 +87,16 @@ var HistoryListPanel_vue_vue_type_script_setup_true_lang_default = /* @__PURE__
 		const dataSourceConfig = {
 			title: "数据源",
 			prefix: "ds",
-			describeGroup: describeDataSourceGroup,
-			describeStep: describeDataSourceStep,
-			isStepDiffable: isDataSourceStepDiffable,
-			isStepRevertable: isDataSourceStepRevertable
+			describeStep: (step) => describeStep(step, (schema) => schema?.title, "数据源"),
+			isStepDiffable,
+			isStepRevertable: isSingleDiffStepRevertable
 		};
 		const codeBlockConfig = {
 			title: "代码块",
 			prefix: "cb",
-			describeGroup: describeCodeBlockGroup,
-			describeStep: describeCodeBlockStep,
-			isStepDiffable: isCodeBlockStepDiffable,
-			isStepRevertable: isCodeBlockStepRevertable
+			describeStep: (step) => describeStep(step, (content) => content?.name, "代码块"),
+			isStepDiffable,
+			isStepRevertable: isSingleDiffStepRevertable
 		};
 		/** 把"目标 step 索引"翻译成"目标 cursor"（已应用步骤数量）。 */
 		const indexToCursor = (index) => index + 1;

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

@@ -109,12 +109,13 @@ var groupSource = (group) => group.steps[group.steps.length - 1]?.step.source;
 var toRowGroup = (group, key, descriptor) => {
 	const { describeGroup, describeStep, isStepDiffable, isStepRevertable } = descriptor;
 	const timestamp = groupTimestamp(group);
+	const lastStep = group.steps[group.steps.length - 1]?.step;
 	return {
 		key,
 		applied: group.applied,
 		isCurrent: Boolean(group.isCurrent),
 		opType: group.opType,
-		desc: describeGroup(group),
+		desc: describeGroup ? describeGroup(group) : describeStep(lastStep),
 		source: groupSource(group),
 		time: formatHistoryTime(timestamp),
 		timeTitle: formatHistoryFullTime(timestamp),
@@ -147,28 +148,36 @@ var labelWithId = (label, id) => {
 var pickLastDescription = (descs) => {
 	for (let i = descs.length - 1; i >= 0; i--) if (descs[i]) return descs[i];
 };
-var describePageStep = (step) => {
+/**
+* 页面 / 数据源 / 代码块三类历史共用的单步描述核心。
+* 各类型只在「取展示名」与「实体单位名」上有差异，通过参数注入，文案模板完全一致：
+* - 新增 / 删除：单实体展示「label」，多实体（仅页面可能出现）退化为「N 个X」；
+* - 修改：展示「label · propPath」，无 diff 时兜底「X」，多实体退化为「N 个X」。
+* 操作类型（新增 / 删除 / 修改）已由列表行的 op 徽标单独展示，故描述文案不再重复动词。
+* 展示 id 统一取 schema.id；调用方显式传入的 historyDescription 永远优先。
+*/
+var describeStep = (step, getLabel, unit) => {
 	if (step.historyDescription) return step.historyDescription;
-	const { opType } = step;
 	const items = step.diff ?? [];
-	if (opType === "add") {
-		const count = items.length;
+	const label = (schema) => labelWithId(getLabel(schema), schema?.id);
+	if (step.opType === "add") {
 		const node = items[0]?.newSchema;
-		return `新增 ${count} 个节点${count === 1 && node ? `（${labelWithId(nameOf(node), node.id)}）` : ""}`;
+		return items.length === 1 && node ? label(node) : `${items.length} 个${unit}`;
 	}
-	if (opType === "remove") {
-		const count = items.length;
+	if (step.opType === "remove") {
 		const node = items[0]?.oldSchema;
-		return `删除 ${count} 个节点${count === 1 && node ? `（${labelWithId(nameOf(node), node.id)}）` : ""}`;
+		return items.length === 1 && node ? label(node) : `${items.length} 个${unit}`;
 	}
-	if (!items.length) return "修改节点";
+	if (!items.length) return unit;
 	if (items.length === 1) {
-		const { newSchema, changeRecords } = items[0];
-		const propPath = changeRecords?.[0]?.propPath;
-		return `修改 ${labelWithId(nameOf(newSchema), newSchema?.id)}${propPath ? ` · ${propPath}` : ""}`;
+		const { newSchema, oldSchema, changeRecords } = items[0];
+		const propPath = changeRecords?.map((changeRecord) => changeRecord.propPath).join(",");
+		const target = label(newSchema ?? oldSchema);
+		return propPath ? `${target} · ${propPath}` : target;
 	}
-	return `修改 ${items.length} 个节点`;
+	return `${items.length} 个${unit}`;
 };
+var describePageStep = (step) => describeStep(step, (node) => nameOf(node), "节点");
 /**
 * 合并组的展示文案：
 * - 若组内任一步显式提供了 historyDescription：取最后一条非空 historyDescription（最近一次的描述更准确）；
@@ -179,55 +188,7 @@ var describePageGroup = (group) => {
 	const lastDesc = pickLastDescription(group.steps.map((s) => s.step.historyDescription));
 	if (lastDesc) return lastDesc;
 	if (group.steps.length === 1) return describePageStep(group.steps[0].step);
-	const paths = /* @__PURE__ */ new Set();
-	group.steps.forEach((s) => {
-		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);
-	return pathList ? `修改 ${target} · ${pathList}${paths.size > 3 ? "…" : ""}` : `修改 ${target}`;
-};
-var describeDataSourceStep = (step) => {
-	if (step.historyDescription) return step.historyDescription;
-	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) => {
-	const lastDesc = pickLastDescription(group.steps.map((s) => s.step.historyDescription));
-	if (lastDesc) return lastDesc;
-	if (group.steps.length === 1) return describeDataSourceStep(group.steps[0].step);
-	const paths = /* @__PURE__ */ new Set();
-	group.steps.forEach((s) => {
-		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.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;
-	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) => {
-	const lastDesc = pickLastDescription(group.steps.map((s) => s.step.historyDescription));
-	if (lastDesc) return lastDesc;
-	if (group.steps.length === 1) return describeCodeBlockStep(group.steps[0].step);
-	const paths = /* @__PURE__ */ new Set();
-	group.steps.forEach((s) => {
-		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.diff?.[0]?.newSchema?.name || group.steps[0].step.diff?.[0]?.oldSchema?.name, group.id);
-	return pathList ? `修改 ${target} · ${pathList}${paths.size > 3 ? "…" : ""}` : `修改 ${target}`;
+	return labelWithId(group.targetName ?? (group.targetId !== void 0 ? `${group.targetId}` : "节点"), group.targetId);
 };
 /**
 * 页面 step 是否支持「回滚」（类 git revert）：
@@ -242,24 +203,14 @@ var isPageStepRevertable = (step) => {
 	return items.every((item) => Boolean(item.changeRecords?.length));
 };
 /**
-* 数据源 step 是否支持「回滚」：
-* - 新增（无 oldSchema）/ 删除（无 newSchema）：不依赖 changeRecords，始终可回滚；
-* - 更新（前后 schema 都存在）：必须有 changeRecords 才支持局部反向 patch，否则不支持回滚。
-*/
-var isDataSourceStepRevertable = (step) => {
-	const item = step.diff?.[0];
-	if (!item?.oldSchema || !item?.newSchema) return true;
-	return Boolean(item.changeRecords?.length);
-};
-/**
-* 代码块 step 是否支持「回滚」：
+* 单 diff 项历史（数据源 / 代码块）是否支持「回滚」：
 * - 新增（无 oldSchema）/ 删除（无 newSchema）：不依赖 changeRecords，始终可回滚；
-* - 更新（前后 content 都存在）：必须有 changeRecords 才支持局部反向 patch，否则不支持回滚。
+* - 更新（前后内容都存在）：必须有 changeRecords 才支持局部反向 patch，否则不支持回滚。
 */
-var isCodeBlockStepRevertable = (step) => {
+var isSingleDiffStepRevertable = (step) => {
 	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, isCodeBlockStepRevertable, isDataSourceStepRevertable, isHistoryGroupExpanded, isPageStepRevertable, opLabel, sourceLabel, toRowGroup, useHistoryList };
+export { describePageGroup, describePageStep, describeStep, formatHistoryFullTime, formatHistoryTime, isHistoryGroupExpanded, isPageStepRevertable, isSingleDiffStepRevertable, opLabel, sourceLabel, toRowGroup, useHistoryList };

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

@@ -87,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: "已选组件",
@@ -105,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/data-source/DataSourceConfigPanel.vue_vue_type_script_setup_true_lang.js

@@ -46,13 +46,13 @@ var DataSourceConfigPanel_vue_vue_type_script_setup_true_lang_default = /* @__PU
 		watchEffect(() => {
 			initValues.value = props.values;
 			const config = dataSourceService.getFormConfig(initValues.value.type);
-			let activeTab = "";
+			let activeTab = "fields";
 			if (props.editMethodName) activeTab = "methods";
 			else if (props.editFieldPath?.length) activeTab = "fields";
-			dataSourceConfig.value = activeTab ? config.map((item) => item.type === "tab" ? {
+			dataSourceConfig.value = config.map((item) => item.type === "tab" ? {
 				...item,
 				active: activeTab
-			} : item) : config;
+			} : item);
 		});
 		const submitHandler = (values, data) => {
 			emit("submit", values, data);

package/dist/es/utils/editor.js

@@ -208,8 +208,8 @@ var fixNodePosition = (config, parent, stage) => {
 	if (config.style?.position !== "absolute") return config.style;
 	const style = { ...config.style || {} };
 	const baseStyle = config.style || {};
-	if ("left" in baseStyle && !("right" in baseStyle)) style.left = fixNodeLeft(config, parent, stage?.renderer?.contentWindow?.document);
-	if ("top" in baseStyle && !("bottom" in baseStyle)) style.top = getMiddleTop(config, parent, stage);
+	if (!("right" in baseStyle)) style.left = fixNodeLeft(config, parent, stage?.renderer?.contentWindow?.document);
+	if (!("top" in baseStyle) && !("bottom" in baseStyle)) style.top = getMiddleTop(config, parent, stage);
 	return style;
 };
 var serializeConfig = (config) => serialize(config, {

package/dist/tmagic-editor.umd.cjs

@@ -6211,8 +6211,8 @@
 		if (config.style?.position !== "absolute") return config.style;
 		const style = { ...config.style || {} };
 		const baseStyle = config.style || {};
-		if ("left" in baseStyle && !("right" in baseStyle)) style.left = fixNodeLeft(config, parent, stage?.renderer?.contentWindow?.document);
-		if ("top" in baseStyle && !("bottom" in baseStyle)) style.top = getMiddleTop(config, parent, stage);
+		if (!("right" in baseStyle)) style.left = fixNodeLeft(config, parent, stage?.renderer?.contentWindow?.document);
+		if (!("top" in baseStyle) && !("bottom" in baseStyle)) style.top = getMiddleTop(config, parent, stage);
 		return style;
 	};
 	var serializeConfig = (config) => (0, serialize_javascript.default)(config, {
@@ -10175,12 +10175,13 @@
 	var toRowGroup = (group, key, descriptor) => {
 		const { describeGroup, describeStep, isStepDiffable, isStepRevertable } = descriptor;
 		const timestamp = groupTimestamp(group);
+		const lastStep = group.steps[group.steps.length - 1]?.step;
 		return {
 			key,
 			applied: group.applied,
 			isCurrent: Boolean(group.isCurrent),
 			opType: group.opType,
-			desc: describeGroup(group),
+			desc: describeGroup ? describeGroup(group) : describeStep(lastStep),
 			source: groupSource(group),
 			time: formatHistoryTime(timestamp),
 			timeTitle: formatHistoryFullTime(timestamp),
@@ -10213,28 +10214,36 @@
 	var pickLastDescription = (descs) => {
 		for (let i = descs.length - 1; i >= 0; i--) if (descs[i]) return descs[i];
 	};
-	var describePageStep = (step) => {
+	/**
+	* 页面 / 数据源 / 代码块三类历史共用的单步描述核心。
+	* 各类型只在「取展示名」与「实体单位名」上有差异，通过参数注入，文案模板完全一致：
+	* - 新增 / 删除：单实体展示「label」，多实体（仅页面可能出现）退化为「N 个X」；
+	* - 修改：展示「label · propPath」，无 diff 时兜底「X」，多实体退化为「N 个X」。
+	* 操作类型（新增 / 删除 / 修改）已由列表行的 op 徽标单独展示，故描述文案不再重复动词。
+	* 展示 id 统一取 schema.id；调用方显式传入的 historyDescription 永远优先。
+	*/
+	var describeStep = (step, getLabel, unit) => {
 		if (step.historyDescription) return step.historyDescription;
-		const { opType } = step;
 		const items = step.diff ?? [];
-		if (opType === "add") {
-			const count = items.length;
+		const label = (schema) => labelWithId(getLabel(schema), schema?.id);
+		if (step.opType === "add") {
 			const node = items[0]?.newSchema;
-			return `新增 ${count} 个节点${count === 1 && node ? `（${labelWithId(nameOf(node), node.id)}）` : ""}`;
+			return items.length === 1 && node ? label(node) : `${items.length} 个${unit}`;
 		}
-		if (opType === "remove") {
-			const count = items.length;
+		if (step.opType === "remove") {
 			const node = items[0]?.oldSchema;
-			return `删除 ${count} 个节点${count === 1 && node ? `（${labelWithId(nameOf(node), node.id)}）` : ""}`;
+			return items.length === 1 && node ? label(node) : `${items.length} 个${unit}`;
 		}
-		if (!items.length) return "修改节点";
+		if (!items.length) return unit;
 		if (items.length === 1) {
-			const { newSchema, changeRecords } = items[0];
-			const propPath = changeRecords?.[0]?.propPath;
-			return `修改 ${labelWithId(nameOf(newSchema), newSchema?.id)}${propPath ? ` · ${propPath}` : ""}`;
+			const { newSchema, oldSchema, changeRecords } = items[0];
+			const propPath = changeRecords?.map((changeRecord) => changeRecord.propPath).join(",");
+			const target = label(newSchema ?? oldSchema);
+			return propPath ? `${target} · ${propPath}` : target;
 		}
-		return `修改 ${items.length} 个节点`;
+		return `${items.length} 个${unit}`;
 	};
+	var describePageStep = (step) => describeStep(step, (node) => nameOf(node), "节点");
 	/**
 	* 合并组的展示文案：
 	* - 若组内任一步显式提供了 historyDescription：取最后一条非空 historyDescription（最近一次的描述更准确）；
@@ -10245,55 +10254,7 @@
 		const lastDesc = pickLastDescription(group.steps.map((s) => s.step.historyDescription));
 		if (lastDesc) return lastDesc;
 		if (group.steps.length === 1) return describePageStep(group.steps[0].step);
-		const paths = /* @__PURE__ */ new Set();
-		group.steps.forEach((s) => {
-			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);
-		return pathList ? `修改 ${target} · ${pathList}${paths.size > 3 ? "…" : ""}` : `修改 ${target}`;
-	};
-	var describeDataSourceStep = (step) => {
-		if (step.historyDescription) return step.historyDescription;
-		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) => {
-		const lastDesc = pickLastDescription(group.steps.map((s) => s.step.historyDescription));
-		if (lastDesc) return lastDesc;
-		if (group.steps.length === 1) return describeDataSourceStep(group.steps[0].step);
-		const paths = /* @__PURE__ */ new Set();
-		group.steps.forEach((s) => {
-			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.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;
-		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) => {
-		const lastDesc = pickLastDescription(group.steps.map((s) => s.step.historyDescription));
-		if (lastDesc) return lastDesc;
-		if (group.steps.length === 1) return describeCodeBlockStep(group.steps[0].step);
-		const paths = /* @__PURE__ */ new Set();
-		group.steps.forEach((s) => {
-			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.diff?.[0]?.newSchema?.name || group.steps[0].step.diff?.[0]?.oldSchema?.name, group.id);
-		return pathList ? `修改 ${target} · ${pathList}${paths.size > 3 ? "…" : ""}` : `修改 ${target}`;
+		return labelWithId(group.targetName ?? (group.targetId !== void 0 ? `${group.targetId}` : "节点"), group.targetId);
 	};
 	/**
 	* 页面 step 是否支持「回滚」（类 git revert）：
@@ -10308,21 +10269,11 @@
 		return items.every((item) => Boolean(item.changeRecords?.length));
 	};
 	/**
-	* 数据源 step 是否支持「回滚」：
-	* - 新增（无 oldSchema）/ 删除（无 newSchema）：不依赖 changeRecords，始终可回滚；
-	* - 更新（前后 schema 都存在）：必须有 changeRecords 才支持局部反向 patch，否则不支持回滚。
-	*/
-	var isDataSourceStepRevertable = (step) => {
-		const item = step.diff?.[0];
-		if (!item?.oldSchema || !item?.newSchema) return true;
-		return Boolean(item.changeRecords?.length);
-	};
-	/**
-	* 代码块 step 是否支持「回滚」：
+	* 单 diff 项历史（数据源 / 代码块）是否支持「回滚」：
 	* - 新增（无 oldSchema）/ 删除（无 newSchema）：不依赖 changeRecords，始终可回滚；
-	* - 更新（前后 content 都存在）：必须有 changeRecords 才支持局部反向 patch，否则不支持回滚。
+	* - 更新（前后内容都存在）：必须有 changeRecords 才支持局部反向 patch，否则不支持回滚。
 	*/
-	var isCodeBlockStepRevertable = (step) => {
+	var isSingleDiffStepRevertable = (step) => {
 		const item = step.diff?.[0];
 		if (!item?.oldSchema || !item?.newSchema) return true;
 		return Boolean(item.changeRecords?.length);
@@ -11407,10 +11358,8 @@
 			* 基于 historyService 的 reactive state 派生，活动页切换或标记写入后自动刷新。
 			*/
 			const pageMarker = (0, vue.computed)(() => historyService.getPageMarker());
-			/** 数据源 step 仅 update（前后 schema 都存在）时可查看差异。 */
-			const isDataSourceStepDiffable = (step) => Boolean(step.diff?.[0]?.oldSchema && step.diff?.[0]?.newSchema);
 			/** 代码块 step 仅 update（前后 content 都存在）时可查看差异。 */
-			const isCodeBlockStepDiffable = (step) => Boolean(step.diff?.[0]?.oldSchema && step.diff?.[0]?.newSchema);
+			const isStepDiffable = (step) => Boolean(step.diff?.[0]?.oldSchema && step.diff?.[0]?.newSchema);
 			/**
 			* 数据源 / 代码块两类 bucket 历史的整体渲染配置：把 title / prefix 与各自的描述、
 			* 可差异、可回滚判定收敛为单一对象整体注入 BucketTab，组件内部按需读取。
@@ -11418,18 +11367,16 @@
 			const dataSourceConfig = {
 				title: "数据源",
 				prefix: "ds",
-				describeGroup: describeDataSourceGroup,
-				describeStep: describeDataSourceStep,
-				isStepDiffable: isDataSourceStepDiffable,
-				isStepRevertable: isDataSourceStepRevertable
+				describeStep: (step) => describeStep(step, (schema) => schema?.title, "数据源"),
+				isStepDiffable,
+				isStepRevertable: isSingleDiffStepRevertable
 			};
 			const codeBlockConfig = {
 				title: "代码块",
 				prefix: "cb",
-				describeGroup: describeCodeBlockGroup,
-				describeStep: describeCodeBlockStep,
-				isStepDiffable: isCodeBlockStepDiffable,
-				isStepRevertable: isCodeBlockStepRevertable
+				describeStep: (step) => describeStep(step, (content) => content?.name, "代码块"),
+				isStepDiffable,
+				isStepRevertable: isSingleDiffStepRevertable
 			};
 			/** 把"目标 step 索引"翻译成"目标 cursor"（已应用步骤数量）。 */
 			const indexToCursor = (index) => index + 1;
@@ -13730,13 +13677,13 @@
 			(0, vue.watchEffect)(() => {
 				initValues.value = props.values;
 				const config = dataSourceService.getFormConfig(initValues.value.type);
-				let activeTab = "";
+				let activeTab = "fields";
 				if (props.editMethodName) activeTab = "methods";
 				else if (props.editFieldPath?.length) activeTab = "fields";
-				dataSourceConfig.value = activeTab ? config.map((item) => item.type === "tab" ? {
+				dataSourceConfig.value = config.map((item) => item.type === "tab" ? {
 					...item,
 					active: activeTab
-				} : item) : config;
+				} : item);
 			});
 			const submitHandler = (values, data) => {
 				emit("submit", values, data);
@@ -15134,7 +15081,7 @@
 						slots: {}
 					},
 					layer: {
-						$key: "layer",
+						$key: SideItemKey.LAYER,
 						type: "component",
 						icon: _element_plus_icons_vue.List,
 						text: "已选组件",
@@ -15152,7 +15099,7 @@
 						slots: {}
 					},
 					[SideItemKey.CODE_BLOCK]: {
-						$key: "code-block",
+						$key: SideItemKey.CODE_BLOCK,
 						type: "component",
 						icon: _element_plus_icons_vue.EditPen,
 						text: "代码编辑",

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.8.0-beta.6",
+  "version": "1.8.0-beta.7",
   "name": "@tmagic/editor",
   "type": "module",
   "sideEffects": [
@@ -58,11 +58,11 @@
     "moveable": "^0.53.0",
     "serialize-javascript": "^7.0.0",
     "sortablejs": "^1.15.6",
-    "@tmagic/design": "1.8.0-beta.6",
-    "@tmagic/stage": "1.8.0-beta.6",
-    "@tmagic/form": "1.8.0-beta.6",
-    "@tmagic/table": "1.8.0-beta.6",
-    "@tmagic/utils": "1.8.0-beta.6"
+    "@tmagic/form": "1.8.0-beta.7",
+    "@tmagic/design": "1.8.0-beta.7",
+    "@tmagic/table": "1.8.0-beta.7",
+    "@tmagic/utils": "1.8.0-beta.7",
+    "@tmagic/stage": "1.8.0-beta.7"
   },
   "devDependencies": {
     "@types/events": "^3.0.3",
@@ -76,7 +76,7 @@
     "type-fest": "^5.2.0",
     "typescript": "^6.0.3",
     "vue": "^3.5.34",
-    "@tmagic/core": "1.8.0-beta.6"
+    "@tmagic/core": "1.8.0-beta.7"
   },
   "peerDependenciesMeta": {
     "typescript": {

package/src/layouts/history-list/HistoryListPanel.vue

@@ -135,6 +135,7 @@ import type { FormState } from '@tmagic/form';
 import MIcon from '@editor/components/Icon.vue';
 import { useServices } from '@editor/hooks/use-services';
 import type {
+  BaseStepValue,
   CodeBlockStepValue,
   DataSourceStepValue,
   DiffDialogPayload,
@@ -143,15 +144,7 @@ import type {
 } from '@editor/type';
 
 import BucketTab from './BucketTab.vue';
-import {
-  describeCodeBlockGroup,
-  describeCodeBlockStep,
-  describeDataSourceGroup,
-  describeDataSourceStep,
-  isCodeBlockStepRevertable,
-  isDataSourceStepRevertable,
-  useHistoryList,
-} from './composables';
+import { describeStep, isSingleDiffStepRevertable, useHistoryList } from './composables';
 import HistoryDiffDialog from './HistoryDiffDialog.vue';
 import PageTab from './PageTab.vue';
 
@@ -223,34 +216,28 @@ const {
  */
 const pageMarker = computed(() => historyService.getPageMarker());
 
-/** 数据源 step 仅 update（前后 schema 都存在）时可查看差异。 */
-const isDataSourceStepDiffable = (step: DataSourceStepValue) =>
-  Boolean(step.diff?.[0]?.oldSchema && step.diff?.[0]?.newSchema);
-
 /** 代码块 step 仅 update（前后 content 都存在）时可查看差异。 */
-const isCodeBlockStepDiffable = (step: CodeBlockStepValue) =>
-  Boolean(step.diff?.[0]?.oldSchema && step.diff?.[0]?.newSchema);
+const isStepDiffable = (step: BaseStepValue) => Boolean(step.diff?.[0]?.oldSchema && step.diff?.[0]?.newSchema);
 
 /**
  * 数据源 / 代码块两类 bucket 历史的整体渲染配置：把 title / prefix 与各自的描述、
  * 可差异、可回滚判定收敛为单一对象整体注入 BucketTab，组件内部按需读取。
  */
+// 数据源/代码块不做相邻合并，每组恒为单步，省略 describeGroup，由 toRowGroup 回退到 describeStep。
 const dataSourceConfig: HistoryBucketConfig<DataSourceStepValue> = {
   title: '数据源',
   prefix: 'ds',
-  describeGroup: describeDataSourceGroup,
-  describeStep: describeDataSourceStep,
-  isStepDiffable: isDataSourceStepDiffable,
-  isStepRevertable: isDataSourceStepRevertable,
+  describeStep: (step: DataSourceStepValue): string => describeStep(step, (schema) => schema?.title, '数据源'),
+  isStepDiffable,
+  isStepRevertable: isSingleDiffStepRevertable,
 };
 
 const codeBlockConfig: HistoryBucketConfig<CodeBlockStepValue> = {
   title: '代码块',
   prefix: 'cb',
-  describeGroup: describeCodeBlockGroup,
-  describeStep: describeCodeBlockStep,
-  isStepDiffable: isCodeBlockStepDiffable,
-  isStepRevertable: isCodeBlockStepRevertable,
+  describeStep: (step: CodeBlockStepValue): string => describeStep(step, (content) => content?.name, '代码块'),
+  isStepDiffable,
+  isStepRevertable: isSingleDiffStepRevertable,
 };
 
 /** 把"目标 step 索引"翻译成"目标 cursor"（已应用步骤数量）。 */

package/src/layouts/history-list/composables.ts

@@ -5,10 +5,6 @@ import { datetimeFormatter } from '@tmagic/form';
 import { useServices } from '@editor/hooks/use-services';
 import type {
   BaseStepValue,
-  CodeBlockHistoryGroup,
-  CodeBlockStepValue,
-  DataSourceHistoryGroup,
-  DataSourceStepValue,
   HistoryOpSource,
   HistoryOpType,
   HistoryRowDescriptor,
@@ -227,12 +223,14 @@ export const toRowGroup = <T extends BaseStepValue = BaseStepValue>(
 ): HistoryRowGroup => {
   const { describeGroup, describeStep, isStepDiffable, isStepRevertable } = descriptor;
   const timestamp = groupTimestamp(group);
+  // 无 describeGroup 时回退到组内最后一步的 describeStep：数据源/代码块不做相邻合并，每组恒为单步，二者等价。
+  const lastStep = group.steps[group.steps.length - 1]?.step;
   return {
     key,
     applied: group.applied,
     isCurrent: Boolean(group.isCurrent),
     opType: group.opType,
-    desc: describeGroup(group),
+    desc: describeGroup ? describeGroup(group) : describeStep(lastStep),
     source: groupSource(group),
     time: formatHistoryTime(timestamp),
     timeTitle: formatHistoryFullTime(timestamp),
@@ -273,30 +271,43 @@ const pickLastDescription = (descs: (string | undefined)[]): string | undefined
   return undefined;
 };
 
-export const describePageStep = (step: StepValue) => {
+/**
+ * 页面 / 数据源 / 代码块三类历史共用的单步描述核心。
+ * 各类型只在「取展示名」与「实体单位名」上有差异，通过参数注入，文案模板完全一致：
+ * - 新增 / 删除：单实体展示「label」，多实体（仅页面可能出现）退化为「N 个X」；
+ * - 修改：展示「label · propPath」，无 diff 时兜底「X」，多实体退化为「N 个X」。
+ * 操作类型（新增 / 删除 / 修改）已由列表行的 op 徽标单独展示，故描述文案不再重复动词。
+ * 展示 id 统一取 schema.id；调用方显式传入的 historyDescription 永远优先。
+ */
+export const describeStep = <T>(
+  step: BaseStepValue<T>,
+  getLabel: (_schema?: T) => string | number | undefined,
+  unit: string,
+): string => {
   if (step.historyDescription) return step.historyDescription;
-  const { opType } = step;
   const items = step.diff ?? [];
-  if (opType === 'add') {
-    const count = items.length;
+  const label = (schema?: T) => labelWithId(getLabel(schema), (schema as { id?: string | number } | undefined)?.id);
+
+  if (step.opType === 'add') {
     const node = items[0]?.newSchema;
-    return `新增 ${count} 个节点${count === 1 && node ? `（${labelWithId(nameOf(node), node.id)}）` : ''}`;
+    return items.length === 1 && node ? label(node) : `${items.length} 个${unit}`;
   }
-  if (opType === 'remove') {
-    const count = items.length;
+  if (step.opType === 'remove') {
     const node = items[0]?.oldSchema;
-    return `删除 ${count} 个节点${count === 1 && node ? `（${labelWithId(nameOf(node), node.id)}）` : ''}`;
+    return items.length === 1 && node ? label(node) : `${items.length} 个${unit}`;
   }
-  if (!items.length) return '修改节点';
+  if (!items.length) return unit;
   if (items.length === 1) {
-    const { newSchema, changeRecords } = items[0];
-    const propPath = changeRecords?.[0]?.propPath;
-    const target = labelWithId(nameOf(newSchema), newSchema?.id);
-    return `修改 ${target}${propPath ? ` · ${propPath}` : ''}`;
+    const { newSchema, oldSchema, changeRecords } = items[0];
+    const propPath = changeRecords?.map((changeRecord) => changeRecord.propPath).join(',');
+    const target = label(newSchema ?? oldSchema);
+    return propPath ? `${target} · ${propPath}` : target;
   }
-  return `修改 ${items.length} 个节点`;
+  return `${items.length} 个${unit}`;
 };
 
+export const describePageStep = (step: StepValue): string => describeStep(step, (node) => nameOf(node), '节点');
+
 /**
  * 合并组的展示文案：
  * - 若组内任一步显式提供了 historyDescription：取最后一条非空 historyDescription（最近一次的描述更准确）；
@@ -307,68 +318,8 @@ export const describePageGroup = (group: PageHistoryGroup) => {
   const lastDesc = pickLastDescription(group.steps.map((s) => s.step.historyDescription));
   if (lastDesc) return lastDesc;
   if (group.steps.length === 1) return describePageStep(group.steps[0].step);
-  const paths = new Set<string>();
-  group.steps.forEach((s) => {
-    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 !== undefined ? `${group.targetId}` : '节点'),
-    group.targetId,
-  );
-  return pathList ? `修改 ${target} · ${pathList}${paths.size > 3 ? '…' : ''}` : `修改 ${target}`;
-};
 
-export const describeDataSourceStep = (step: DataSourceStepValue) => {
-  if (step.historyDescription) return step.historyDescription;
-  const { oldSchema: oldSchema, newSchema: 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}`;
-};
-
-export const describeDataSourceGroup = (group: DataSourceHistoryGroup) => {
-  const lastDesc = pickLastDescription(group.steps.map((s) => s.step.historyDescription));
-  if (lastDesc) return lastDesc;
-  if (group.steps.length === 1) return describeDataSourceStep(group.steps[0].step);
-  const paths = new Set<string>();
-  group.steps.forEach((s) => {
-    s.step.diff?.[0]?.changeRecords?.forEach((r) => r.propPath && paths.add(r.propPath));
-  });
-  const pathList = Array.from(paths).slice(0, 3).join(', ');
-  const rawTitle =
-    group.steps[group.steps.length - 1].step.diff?.[0]?.newSchema?.title ||
-    group.steps[0].step.diff?.[0]?.oldSchema?.title;
-  const target = labelWithId(rawTitle, group.id);
-  return pathList ? `修改 ${target} · ${pathList}${paths.size > 3 ? '…' : ''}` : `修改 ${target}`;
-};
-
-export const describeCodeBlockStep = (step: CodeBlockStepValue) => {
-  if (step.historyDescription) return step.historyDescription;
-  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}`;
-};
-
-export const describeCodeBlockGroup = (group: CodeBlockHistoryGroup) => {
-  const lastDesc = pickLastDescription(group.steps.map((s) => s.step.historyDescription));
-  if (lastDesc) return lastDesc;
-  if (group.steps.length === 1) return describeCodeBlockStep(group.steps[0].step);
-  const paths = new Set<string>();
-  group.steps.forEach((s) => {
-    s.step.diff?.[0]?.changeRecords?.forEach((r) => r.propPath && paths.add(r.propPath));
-  });
-  const pathList = Array.from(paths).slice(0, 3).join(', ');
-  const rawName =
-    group.steps[group.steps.length - 1].step.diff?.[0]?.newSchema?.name ||
-    group.steps[0].step.diff?.[0]?.oldSchema?.name;
-  const target = labelWithId(rawName, group.id);
-  return pathList ? `修改 ${target} · ${pathList}${paths.size > 3 ? '…' : ''}` : `修改 ${target}`;
+  return labelWithId(group.targetName ?? (group.targetId !== undefined ? `${group.targetId}` : '节点'), group.targetId);
 };
 
 /**
@@ -385,22 +336,11 @@ export const isPageStepRevertable = (step: StepValue): boolean => {
 };
 
 /**
- * 数据源 step 是否支持「回滚」：
- * - 新增（无 oldSchema）/ 删除（无 newSchema）：不依赖 changeRecords，始终可回滚；
- * - 更新（前后 schema 都存在）：必须有 changeRecords 才支持局部反向 patch，否则不支持回滚。
- */
-export const isDataSourceStepRevertable = (step: DataSourceStepValue): boolean => {
-  const item = step.diff?.[0];
-  if (!item?.oldSchema || !item?.newSchema) return true;
-  return Boolean(item.changeRecords?.length);
-};
-
-/**
- * 代码块 step 是否支持「回滚」：
+ * 单 diff 项历史（数据源 / 代码块）是否支持「回滚」：
  * - 新增（无 oldSchema）/ 删除（无 newSchema）：不依赖 changeRecords，始终可回滚；
- * - 更新（前后 content 都存在）：必须有 changeRecords 才支持局部反向 patch，否则不支持回滚。
+ * - 更新（前后内容都存在）：必须有 changeRecords 才支持局部反向 patch，否则不支持回滚。
  */
-export const isCodeBlockStepRevertable = (step: CodeBlockStepValue): boolean => {
+export const isSingleDiffStepRevertable = (step: BaseStepValue): boolean => {
   const item = step.diff?.[0];
   if (!item?.oldSchema || !item?.newSchema) return true;
   return Boolean(item.changeRecords?.length);

package/src/layouts/sidebar/Sidebar.vue

@@ -257,7 +257,7 @@ const getItemConfig = (data: SideItem): SideComponent => {
       slots: {},
     },
     layer: {
-      $key: 'layer',
+      $key: SideItemKey.LAYER,
       type: 'component',
       icon: List,
       text: '已选组件',
@@ -277,7 +277,7 @@ const getItemConfig = (data: SideItem): SideComponent => {
       slots: {},
     },
     [SideItemKey.CODE_BLOCK]: {
-      $key: 'code-block',
+      $key: SideItemKey.CODE_BLOCK,
       type: 'component',
       icon: EditPen,
       text: '代码编辑',

package/src/layouts/sidebar/data-source/DataSourceConfigPanel.vue

@@ -83,16 +83,17 @@ watchEffect(() => {
   const config = dataSourceService.getFormConfig(initValues.value.type);
 
   // 传入方法名/字段路径时，将外层 tab 容器默认激活到对应 tab（status: methods / fields）
-  let activeTab = '';
+  // 未传入时默认激活「数据定义」tab（fields）
+  let activeTab = 'fields';
   if (props.editMethodName) {
     activeTab = 'methods';
   } else if (props.editFieldPath?.length) {
     activeTab = 'fields';
   }
 
-  dataSourceConfig.value = activeTab
-    ? config.map((item) => ((item as { type?: string }).type === 'tab' ? { ...item, active: activeTab } : item))
-    : config;
+  dataSourceConfig.value = config.map((item) =>
+    (item as { type?: string }).type === 'tab' ? { ...item, active: activeTab } : item,
+  );
 });
 
 const submitHandler = (values: any, data: ContainerChangeEventData) => {

package/src/services/history.ts

@@ -23,9 +23,7 @@ import type { ChangeRecord } from '@tmagic/form';
 import { guid } from '@tmagic/utils';
 
 import type {
-  CodeBlockHistoryGroup,
   CodeBlockStepValue,
-  DataSourceHistoryGroup,
   DataSourceStepValue,
   HistoryOpSource,
   HistoryPersistOptions,
@@ -33,6 +31,7 @@ import type {
   PageHistoryGroup,
   PageHistoryStepEntry,
   PersistedHistoryState,
+  StackHistoryGroup,
   StepValue,
 } from '@editor/type';
 import { getEditorConfig } from '@editor/utils/config';
@@ -527,8 +526,8 @@ class History extends BaseService {
    * 取出全部代码块的历史栈，按 codeBlockId 分桶展示。
    * 同一栈内每条操作记录独立成组，不做相邻 update 合并。
    */
-  public getCodeBlockHistoryGroups(): CodeBlockHistoryGroup[] {
-    const groups: CodeBlockHistoryGroup[] = [];
+  public getCodeBlockHistoryGroups(): StackHistoryGroup<CodeBlockStepValue, 'code-block'>[] {
+    const groups: StackHistoryGroup<CodeBlockStepValue, 'code-block'>[] = [];
     Object.entries(this.state.codeBlockState).forEach(([id, undoRedo]) => {
       if (!undoRedo) return;
       const list = undoRedo.getElementList();
@@ -619,8 +618,8 @@ class History extends BaseService {
   /**
    * 取出全部数据源的历史栈，按 dataSourceId 分桶展示。同上，每条操作独立成组。
    */
-  public getDataSourceHistoryGroups(): DataSourceHistoryGroup[] {
-    const groups: DataSourceHistoryGroup[] = [];
+  public getDataSourceHistoryGroups(): StackHistoryGroup<DataSourceStepValue, 'data-source'>[] {
+    const groups: StackHistoryGroup<DataSourceStepValue, 'data-source'>[] = [];
     Object.entries(this.state.dataSourceState).forEach(([id, undoRedo]) => {
       if (!undoRedo) return;
       const list = undoRedo.getElementList();

package/src/type.ts

@@ -962,32 +962,26 @@ export interface PageHistoryGroup {
 }
 
 /**
- * 代码块历史面板分组。
- * - 同一 codeBlockId 的栈内，相邻的 'update' 操作会合并成一个 group；
- * - 'add' / 'remove' 始终独立成组（语义上是一次性事件）。
- */
-export interface CodeBlockHistoryGroup {
-  kind: 'code-block';
-  /** 关联的 codeBlock id */
-  id: Id;
-  /** 该分组的操作类型 */
-  opType: HistoryOpType;
-  /** 组内所有步骤，按时间正序 */
-  steps: { step: CodeBlockStepValue; index: number; applied: boolean; isCurrent?: boolean }[];
-  /** 组内最后一步是否已应用，用于整组的状态展示 */
-  applied: boolean;
-  /** 是否为当前所在的分组（包含该栈最近一次已应用步骤的那一组）。 */
-  isCurrent?: boolean;
-}
-
-/**
- * 数据源历史面板分组，结构同 CodeBlockHistoryGroup。
+ * 数据源 / 代码块历史面板分组（按 id 分栈展示）。
+ * 二者结构完全一致，仅 `kind` 与 step 类型不同，统一由该泛型描述：
+ * - 数据源：`StackHistoryGroup<DataSourceStepValue, 'data-source'>`；
+ * - 代码块：`StackHistoryGroup<CodeBlockStepValue, 'code-block'>`。
+ *
+ * 每条操作记录独立成组，不做相邻合并（与页面历史 {@link PageHistoryGroup} 不同），故 `steps` 恒为单元素。
  */
-export interface DataSourceHistoryGroup {
-  kind: 'data-source';
+export interface StackHistoryGroup<
+  T extends BaseStepValue = BaseStepValue,
+  K extends 'code-block' | 'data-source' = 'code-block' | 'data-source',
+> {
+  /** 区分代码块 / 数据源。 */
+  kind: K;
+  /** 关联的代码块 / 数据源 id。 */
   id: Id;
+  /** 该分组的操作类型。 */
   opType: HistoryOpType;
-  steps: { step: DataSourceStepValue; index: number; applied: boolean; isCurrent?: boolean }[];
+  /** 组内所有步骤，按时间正序（不做相邻合并，恒为单元素）。 */
+  steps: { step: T; index: number; applied: boolean; isCurrent?: boolean }[];
+  /** 组内最后一步是否已应用，用于整组的状态展示。 */
   applied: boolean;
   /** 是否为当前所在的分组（包含该栈最近一次已应用步骤的那一组）。 */
   isCurrent?: boolean;
@@ -1296,8 +1290,11 @@ export interface DiffDialogPayload {
  * 各自实现一份，作为整体注入，避免把 describe* / isStep* 拆成多个独立 props 反复透传。
  */
 export interface HistoryRowDescriptor<T extends BaseStepValue = BaseStepValue> {
-  /** 组级描述文案生成器，接收一个 group，返回展示文本。 */
-  describeGroup: (_group: any) => string;
+  /**
+   * 组级描述文案生成器，接收一个 group，返回展示文本。
+   * 不传时回退到对组内最后一步调用 {@link describeStep}（适用于不做相邻合并、每组恒为单步的历史，如数据源/代码块）。
+   */
+  describeGroup?: (_group: any) => string;
   /** 单步描述文案生成器，接收一个 step，返回展示文本（合并组展开后的子步列表用）。 */
   describeStep: (_step: T) => string;
   /** 判断某个 step 是否可查看差异（前后值都存在）。不传则一律不展示差异入口。 */

package/src/utils/editor.ts

@@ -378,11 +378,11 @@ export const fixNodePosition = (config: MNode, parent: MContainer, stage: StageC
   const style = { ...(config.style || {}) };
   const baseStyle = config.style || {};
 
-  if ('left' in baseStyle && !('right' in baseStyle)) {
+  if (!('right' in baseStyle)) {
     style.left = fixNodeLeft(config, parent, stage?.renderer?.contentWindow?.document);
   }
 
-  if ('top' in baseStyle && !('bottom' in baseStyle)) {
+  if (!('top' in baseStyle) && !('bottom' in baseStyle)) {
     style.top = getMiddleTop(config, parent, stage);
   }
 

package/src/utils/history.ts

@@ -26,9 +26,9 @@ import { guid } from '@tmagic/utils';
 import type {
   BaseStepValue,
   HistoryOpSource,
-  HistoryOpType,
   PageHistoryGroup,
   PageHistoryStepEntry,
+  StackHistoryGroup,
   StepDiffItem,
   StepValue,
 } from '@editor/type';
@@ -131,14 +131,7 @@ export const mergeStackSteps = <S extends BaseStepValue, K extends 'code-block'
   id: Id,
   list: S[],
   cursor: number,
-): {
-  kind: K;
-  id: Id;
-  opType: HistoryOpType;
-  steps: { step: S; index: number; applied: boolean; isCurrent?: boolean }[];
-  applied: boolean;
-  isCurrent?: boolean;
-}[] => {
+): StackHistoryGroup<S, K>[] => {
   const currentIndex = cursor - 1;
   return list.map((step, index) => {
     const applied = index < cursor;

package/types/index.d.ts

@@ -1170,7 +1170,7 @@ declare class History extends BaseService {
    * 取出全部代码块的历史栈，按 codeBlockId 分桶展示。
    * 同一栈内每条操作记录独立成组，不做相邻 update 合并。
    */
-  getCodeBlockHistoryGroups(): CodeBlockHistoryGroup[];
+  getCodeBlockHistoryGroups(): StackHistoryGroup<CodeBlockStepValue, 'code-block'>[];
   /**
    * 读取指定页面历史栈的当前游标（已应用步骤数量）。不传则取当前活动页。
    * 没有对应栈时返回 0。
@@ -1220,7 +1220,7 @@ declare class History extends BaseService {
   /**
    * 取出全部数据源的历史栈，按 dataSourceId 分桶展示。同上，每条操作独立成组。
    */
-  getDataSourceHistoryGroups(): DataSourceHistoryGroup[];
+  getDataSourceHistoryGroups(): StackHistoryGroup<DataSourceStepValue, 'data-source'>[];
   /**
    * 取出指定页面的栈；不传 pageId 时按当前活动页取。
    *
@@ -2244,41 +2244,28 @@ interface PageHistoryGroup {
   isCurrent?: boolean;
 }
 /**
- * 代码块历史面板分组。
- * - 同一 codeBlockId 的栈内，相邻的 'update' 操作会合并成一个 group；
- * - 'add' / 'remove' 始终独立成组（语义上是一次性事件）。
- */
-interface CodeBlockHistoryGroup {
-  kind: 'code-block';
-  /** 关联的 codeBlock id */
-  id: Id;
-  /** 该分组的操作类型 */
-  opType: HistoryOpType;
-  /** 组内所有步骤，按时间正序 */
-  steps: {
-    step: CodeBlockStepValue;
-    index: number;
-    applied: boolean;
-    isCurrent?: boolean;
-  }[];
-  /** 组内最后一步是否已应用，用于整组的状态展示 */
-  applied: boolean;
-  /** 是否为当前所在的分组（包含该栈最近一次已应用步骤的那一组）。 */
-  isCurrent?: boolean;
-}
-/**
- * 数据源历史面板分组，结构同 CodeBlockHistoryGroup。
+ * 数据源 / 代码块历史面板分组（按 id 分栈展示）。
+ * 二者结构完全一致，仅 `kind` 与 step 类型不同，统一由该泛型描述：
+ * - 数据源：`StackHistoryGroup<DataSourceStepValue, 'data-source'>`；
+ * - 代码块：`StackHistoryGroup<CodeBlockStepValue, 'code-block'>`。
+ *
+ * 每条操作记录独立成组，不做相邻合并（与页面历史 {@link PageHistoryGroup} 不同），故 `steps` 恒为单元素。
  */
-interface DataSourceHistoryGroup {
-  kind: 'data-source';
+interface StackHistoryGroup<T extends BaseStepValue = BaseStepValue, K extends 'code-block' | 'data-source' = 'code-block' | 'data-source'> {
+  /** 区分代码块 / 数据源。 */
+  kind: K;
+  /** 关联的代码块 / 数据源 id。 */
   id: Id;
+  /** 该分组的操作类型。 */
   opType: HistoryOpType;
+  /** 组内所有步骤，按时间正序（不做相邻合并，恒为单元素）。 */
   steps: {
-    step: DataSourceStepValue;
+    step: T;
     index: number;
     applied: boolean;
     isCurrent?: boolean;
   }[];
+  /** 组内最后一步是否已应用，用于整组的状态展示。 */
   applied: boolean;
   /** 是否为当前所在的分组（包含该栈最近一次已应用步骤的那一组）。 */
   isCurrent?: boolean;
@@ -2496,8 +2483,11 @@ interface DiffDialogPayload {
  * 各自实现一份，作为整体注入，避免把 describe* / isStep* 拆成多个独立 props 反复透传。
  */
 interface HistoryRowDescriptor<T extends BaseStepValue = BaseStepValue> {
-  /** 组级描述文案生成器，接收一个 group，返回展示文本。 */
-  describeGroup: (_group: any) => string;
+  /**
+   * 组级描述文案生成器，接收一个 group，返回展示文本。
+   * 不传时回退到对组内最后一步调用 {@link describeStep}（适用于不做相邻合并、每组恒为单步的历史，如数据源/代码块）。
+   */
+  describeGroup?: (_group: any) => string;
   /** 单步描述文案生成器，接收一个 step，返回展示文本（合并组展开后的子步列表用）。 */
   describeStep: (_step: T) => string;
   /** 判断某个 step 是否可查看差异（前后值都存在）。不传则一律不展示差异入口。 */
@@ -3050,19 +3040,7 @@ declare const markStackSaved: <S extends {
  *
  * 代码块与数据源除 `kind` 外结构完全一致，统一由本方法处理；`kind` 决定返回的具体分组类型。
  */
-declare const mergeStackSteps: <S extends BaseStepValue, K extends "code-block" | "data-source">(kind: K, id: Id, list: S[], cursor: number) => {
-  kind: K;
-  id: Id;
-  opType: HistoryOpType;
-  steps: {
-    step: S;
-    index: number;
-    applied: boolean;
-    isCurrent?: boolean;
-  }[];
-  applied: boolean;
-  isCurrent?: boolean;
-}[];
+declare const mergeStackSteps: <S extends BaseStepValue, K extends "code-block" | "data-source">(kind: K, id: Id, list: S[], cursor: number) => StackHistoryGroup<S, K>[];
 /**
  * 把页面栈拆成若干 group：
  * - 单节点的 'update' 按 targetId 与相邻同 targetId 的 update 合并到一个 group；
@@ -6218,4 +6196,4 @@ declare const _default$40: {
   install: (app: App, opt?: Partial<EditorInstallOptions | DesignPluginOptions | FormInstallOptions>) => void;
 };
 //#endregion
-export { AddMNode, AddPrefixToObject, AsyncAfterHook, AsyncBeforeHook, AsyncHookPlugin, AsyncMethodName, BaseStepValue, BeforeAdd, CODE_DRAFT_STORAGE_KEY, COPY_CODE_STORAGE_KEY, COPY_DS_STORAGE_KEY, COPY_STORAGE_KEY, CanDropInFunction, CanDropInScene, _default as CodeBlockEditor, CodeBlockHistoryGroup, _default$1 as CodeBlockList, _default$2 as CodeBlockListPanel, CodeBlockListPanelSlots, CodeBlockListSlots, CodeBlockStepValue, CodeDeleteErrorType, CodeDslItem, CodeParamStatement, CodeRelation, _default$3 as CodeSelect, _default$4 as CodeSelectCol, CodeState, ColumnLayout, CombineInfo, CompareCategory, _default$5 as CompareForm, CompareFormLoadConfig, CompareFormLoadConfigContext, ComponentGroup, ComponentGroupState, ComponentItem, _default$6 as ComponentListPanel, ComponentListPanelSlots, _default$7 as CondOpSelect, _default$8 as ContentMenu, CustomContentMenuFunction, DEFAULT_LEFT_COLUMN_WIDTH, DEFAULT_RIGHT_COLUMN_WIDTH, _default$9 as DataSourceAddButton, _default$10 as DataSourceConfigPanel, _default$11 as DataSourceFieldSelect, _default$12 as DataSourceFields, DataSourceHistoryGroup, _default$13 as DataSourceInput, DataSourceListSlots, _default$14 as DataSourceMethodSelect, _default$15 as DataSourceMethods, _default$16 as DataSourceMocks, _default$17 as DataSourceSelect, DataSourceStepValue, DatasourceTypeOption, DepTargetType, DiffDialogPayload, _default$18 as DisplayConds, DragClassification, DragType, DslOpOptions, DslOpWithHistoryIdsResult, EditorEvents, EditorInstallOptions, EditorNodeInfo, EditorSlots, EventBus, EventBusEvent, _default$19 as EventSelect, Fixed2Other, _default$20 as FloatingBox, FrameworkSlots, GetCodeBlockFormConfigOptions, GetColumnWidth, GetConfig, H_GUIDE_LINE_STORAGE_KEY, HistoryBucketConfig, _default$21 as HistoryDiffDialog, _default$22 as HistoryListBucket, _default$23 as HistoryListBucketTab, HistoryListExtraTab, HistoryOpOptions, HistoryOpOptionsWithChangeRecords, HistoryOpSource, HistoryOpType, HistoryPersistOptions, HistoryRowDescriptor, HistoryState, _default$24 as Icon, IdleTask, IdleTaskEvents, IsExpandableFunction, KeyBindingCacheItem, KeyBindingCommand, KeyBindingItem, _default$25 as KeyValue, Keys, LEFT_COLUMN_WIDTH_STORAGE_KEY, LayerNodeSlots, LayerNodeStatus, LayerOffset, _default$26 as LayerPanel, LayerPanelSlots, Layout, _default$27 as LayoutContainer, _default$27 as SplitView, ListState, MIN_CENTER_COLUMN_WIDTH, MIN_LEFT_COLUMN_WIDTH, MIN_RIGHT_COLUMN_WIDTH, MenuBarData, MenuButton, MenuComponent, MenuItem, type OnDrag, PROPS_PANEL_WIDTH_STORAGE_KEY, PageBarSortOptions, _default$28 as PageFragmentSelect, PageHistoryGroup, PageHistoryStepEntry, PartSortableOptions, PastePosition, PersistedHistoryState, PropsFormConfigFunction, _default$29 as PropsFormPanel, PropsFormValueFunction, _default$30 as PropsPanel, PropsPanelSlots, PropsState, RIGHT_COLUMN_WIDTH_STORAGE_KEY, _default$31 as Resizer, ScrollViewer, ScrollViewerEvent, ScrollViewerSlots, SerializedUndoRedo, Services, SetColumnWidth, SideBarData, SideComponent, SideItem, SideItemKey, SidebarSlots, StageCore, StageOptions, StageOverlayState, StageRect, StageSlots, StepDiffItem, StepValue, StoreState, StoreStateKey, _default$32 as StyleSetter, SyncAfterHook, SyncBeforeHook, SyncHookPlugin, _default$33 as TMagicCodeEditor, _default$34 as TMagicEditor, _default$35 as ToolButton, _default$36 as Tree, _default$37 as TreeNode, TreeNodeData, UI_SELECT_MODE_EVENT_NAME, UiState, UndoRedo, V_GUIDE_LINE_STORAGE_KEY, WorkspaceSlots, advancedTabConfig, arrayOptions, beforePaste, buildChangeRecords, calcAlignCenterStyle, calcLayerTargetIndex, calcMoveStyle, canUsePluginMethods, change2Fixed, classifyDragSources, _default$38 as codeBlockService, collectRelatedNodes, createStackStep, _default$39 as dataSourceService, debug, _default$40 as default, defaultIsExpandable, _default$41 as depService, describeRevertStep, describeStepForRevert, deserializeStacks, designPlugin, detectPageTargetId, detectPageTargetName, detectStackOpType, displayTabConfig, editorNodeMergeCustomizer, _default$42 as editorService, eqOptions, error, eventTabConfig, _default$43 as eventsService, fillConfig, fixNodeLeft, fixNodePosition, formPlugin, generatePageName, generatePageNameByApp, getAddParent, getCascaderOptionsFromFields, getCodeBlockFormConfig, getDefaultConfig, getDisplayField, getEditorConfig, getFieldType, getFormConfig, getFormValue, getGuideLineFromCache, getInitPositionStyle, getLastPushedHistoryIds, getNodeIndex, getOrCreateStack, getPageFragmentList, getPageList, getPageNameList, getPositionInContainer, getRelativeStyle, _default$44 as historyService, idbDelete, idbGet, idbSet, info, isIncludeDataSource, isIndexedDBSupported, _default$45 as loadMonaco, log, markStackSaved, mergePageSteps, mergeStackSteps, moveItemsInContainer, numberOptions, openIndexedDB, _default$46 as propsService, resolveSelectedNode, serializeConfig, serializeStacks, setChildrenLayout, setEditorConfig, setLayout, _default$47 as stageOverlayService, _default$48 as storageService, styleTabConfig, tablePlugin, toggleFixedPosition, _default$49 as uiService, undoFloor, updateStatus, useCodeBlockEdit, useEditorContentHeight, useFilter, useFloatBox, useGetSo, useNextFloatBoxPosition, useNodeStatus, useServices, useStage, useWindowRect, warn };
+export { AddMNode, AddPrefixToObject, AsyncAfterHook, AsyncBeforeHook, AsyncHookPlugin, AsyncMethodName, BaseStepValue, BeforeAdd, CODE_DRAFT_STORAGE_KEY, COPY_CODE_STORAGE_KEY, COPY_DS_STORAGE_KEY, COPY_STORAGE_KEY, CanDropInFunction, CanDropInScene, _default as CodeBlockEditor, _default$1 as CodeBlockList, _default$2 as CodeBlockListPanel, CodeBlockListPanelSlots, CodeBlockListSlots, CodeBlockStepValue, CodeDeleteErrorType, CodeDslItem, CodeParamStatement, CodeRelation, _default$3 as CodeSelect, _default$4 as CodeSelectCol, CodeState, ColumnLayout, CombineInfo, CompareCategory, _default$5 as CompareForm, CompareFormLoadConfig, CompareFormLoadConfigContext, ComponentGroup, ComponentGroupState, ComponentItem, _default$6 as ComponentListPanel, ComponentListPanelSlots, _default$7 as CondOpSelect, _default$8 as ContentMenu, CustomContentMenuFunction, DEFAULT_LEFT_COLUMN_WIDTH, DEFAULT_RIGHT_COLUMN_WIDTH, _default$9 as DataSourceAddButton, _default$10 as DataSourceConfigPanel, _default$11 as DataSourceFieldSelect, _default$12 as DataSourceFields, _default$13 as DataSourceInput, DataSourceListSlots, _default$14 as DataSourceMethodSelect, _default$15 as DataSourceMethods, _default$16 as DataSourceMocks, _default$17 as DataSourceSelect, DataSourceStepValue, DatasourceTypeOption, DepTargetType, DiffDialogPayload, _default$18 as DisplayConds, DragClassification, DragType, DslOpOptions, DslOpWithHistoryIdsResult, EditorEvents, EditorInstallOptions, EditorNodeInfo, EditorSlots, EventBus, EventBusEvent, _default$19 as EventSelect, Fixed2Other, _default$20 as FloatingBox, FrameworkSlots, GetCodeBlockFormConfigOptions, GetColumnWidth, GetConfig, H_GUIDE_LINE_STORAGE_KEY, HistoryBucketConfig, _default$21 as HistoryDiffDialog, _default$22 as HistoryListBucket, _default$23 as HistoryListBucketTab, HistoryListExtraTab, HistoryOpOptions, HistoryOpOptionsWithChangeRecords, HistoryOpSource, HistoryOpType, HistoryPersistOptions, HistoryRowDescriptor, HistoryState, _default$24 as Icon, IdleTask, IdleTaskEvents, IsExpandableFunction, KeyBindingCacheItem, KeyBindingCommand, KeyBindingItem, _default$25 as KeyValue, Keys, LEFT_COLUMN_WIDTH_STORAGE_KEY, LayerNodeSlots, LayerNodeStatus, LayerOffset, _default$26 as LayerPanel, LayerPanelSlots, Layout, _default$27 as LayoutContainer, _default$27 as SplitView, ListState, MIN_CENTER_COLUMN_WIDTH, MIN_LEFT_COLUMN_WIDTH, MIN_RIGHT_COLUMN_WIDTH, MenuBarData, MenuButton, MenuComponent, MenuItem, type OnDrag, PROPS_PANEL_WIDTH_STORAGE_KEY, PageBarSortOptions, _default$28 as PageFragmentSelect, PageHistoryGroup, PageHistoryStepEntry, PartSortableOptions, PastePosition, PersistedHistoryState, PropsFormConfigFunction, _default$29 as PropsFormPanel, PropsFormValueFunction, _default$30 as PropsPanel, PropsPanelSlots, PropsState, RIGHT_COLUMN_WIDTH_STORAGE_KEY, _default$31 as Resizer, ScrollViewer, ScrollViewerEvent, ScrollViewerSlots, SerializedUndoRedo, Services, SetColumnWidth, SideBarData, SideComponent, SideItem, SideItemKey, SidebarSlots, StackHistoryGroup, StageCore, StageOptions, StageOverlayState, StageRect, StageSlots, StepDiffItem, StepValue, StoreState, StoreStateKey, _default$32 as StyleSetter, SyncAfterHook, SyncBeforeHook, SyncHookPlugin, _default$33 as TMagicCodeEditor, _default$34 as TMagicEditor, _default$35 as ToolButton, _default$36 as Tree, _default$37 as TreeNode, TreeNodeData, UI_SELECT_MODE_EVENT_NAME, UiState, UndoRedo, V_GUIDE_LINE_STORAGE_KEY, WorkspaceSlots, advancedTabConfig, arrayOptions, beforePaste, buildChangeRecords, calcAlignCenterStyle, calcLayerTargetIndex, calcMoveStyle, canUsePluginMethods, change2Fixed, classifyDragSources, _default$38 as codeBlockService, collectRelatedNodes, createStackStep, _default$39 as dataSourceService, debug, _default$40 as default, defaultIsExpandable, _default$41 as depService, describeRevertStep, describeStepForRevert, deserializeStacks, designPlugin, detectPageTargetId, detectPageTargetName, detectStackOpType, displayTabConfig, editorNodeMergeCustomizer, _default$42 as editorService, eqOptions, error, eventTabConfig, _default$43 as eventsService, fillConfig, fixNodeLeft, fixNodePosition, formPlugin, generatePageName, generatePageNameByApp, getAddParent, getCascaderOptionsFromFields, getCodeBlockFormConfig, getDefaultConfig, getDisplayField, getEditorConfig, getFieldType, getFormConfig, getFormValue, getGuideLineFromCache, getInitPositionStyle, getLastPushedHistoryIds, getNodeIndex, getOrCreateStack, getPageFragmentList, getPageList, getPageNameList, getPositionInContainer, getRelativeStyle, _default$44 as historyService, idbDelete, idbGet, idbSet, info, isIncludeDataSource, isIndexedDBSupported, _default$45 as loadMonaco, log, markStackSaved, mergePageSteps, mergeStackSteps, moveItemsInContainer, numberOptions, openIndexedDB, _default$46 as propsService, resolveSelectedNode, serializeConfig, serializeStacks, setChildrenLayout, setEditorConfig, setLayout, _default$47 as stageOverlayService, _default$48 as storageService, styleTabConfig, tablePlugin, toggleFixedPosition, _default$49 as uiService, undoFloor, updateStatus, useCodeBlockEdit, useEditorContentHeight, useFilter, useFloatBox, useGetSo, useNextFloatBoxPosition, useNodeStatus, useServices, useStage, useWindowRect, warn };