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

package/dist/tmagic-editor.umd.cjs

@@ -5112,46 +5112,29 @@
 	};
 	/**
 	* 把单个「按 id 分栈」的历史栈（代码块 / 数据源）拆成若干 group：
-	* - 把"新增/删除"独立成组（语义上属于一次性事件，不应与 update 合并）；
-	* - 连续 'update' 合并到同一组，组内 steps 顺序就是发生顺序。
+	* 每条操作记录独立成组，不做相邻 update 合并（与页面历史的合并策略不同）。
 	*
 	* 代码块与数据源除 `kind` 外结构完全一致，统一由本方法处理；`kind` 决定返回的具体分组类型。
 	*/
 	var mergeStackSteps = (kind, id, list, cursor) => {
-		const groups = [];
-		let current = null;
 		const currentIndex = cursor - 1;
-		list.forEach((step, index) => {
-			const { opType } = step;
+		return list.map((step, index) => {
 			const applied = index < cursor;
 			const isCurrent = index === currentIndex;
-			if (opType === "update" && current?.opType === "update") {
-				current.steps.push({
+			return {
+				kind,
+				id,
+				opType: step.opType,
+				steps: [{
 					step,
 					index,
 					applied,
 					isCurrent
-				});
-				current.applied = applied;
-				if (isCurrent) current.isCurrent = true;
-			} else {
-				current = {
-					kind,
-					id,
-					opType,
-					steps: [{
-						step,
-						index,
-						applied,
-						isCurrent
-					}],
-					applied,
-					isCurrent
-				};
-				groups.push(current);
-			}
+				}],
+				applied,
+				isCurrent
+			};
 		});
-		return groups;
 	};
 	/**
 	* 把页面栈拆成若干 group：
@@ -5232,22 +5215,45 @@
 			return items?.length ? `${items.length} 个节点` : void 0;
 		}
 	};
-	/** 把 `Record<Id, UndoRedo>` 整体序列化为 `Record<Id, SerializedUndoRedo>`。 */
+	/**
+	* 把 `Record<Id, UndoRedo>` 整体序列化为 `Record<Id, SerializedUndoRedo>`。
+	*
+	* 序列化（深克隆）的同一趟里，只把每条 step 中可能含函数的 `diff` 用 serialize-javascript 序列化成字符串，
+	* 其余字段（uuid / opType / timestamp / `modifiedNodeIds` Map 等）原样保留，交给 IndexedDB 结构化克隆。
+	* 这样既能写入函数，又避免序列化整份快照的开销；读取时再由 {@link parseStacksStepDiff} 还原 diff。
+	* 不含 `diff` 的元素（如通用栈）原样透传。
+	*/
 	var serializeStacks = (stacks) => {
 		const result = {};
 		Object.entries(stacks).forEach(([id, undoRedo]) => {
-			if (undoRedo) result[id] = undoRedo.serialize();
+			if (!undoRedo) return;
+			const serialized = undoRedo.serialize();
+			result[id] = {
+				...serialized,
+				elementList: serialized.elementList.map((step) => step.diff === void 0 ? step : Object.assign({}, step, { diff: (0, serialize_javascript.default)(step.diff) }))
+			};
 		});
 		return result;
 	};
 	/**
 	* 把 `Record<Id, SerializedUndoRedo>` 整体还原为 `Record<Id, UndoRedo>`。
 	* 还原时把每个栈的游标定位到最近一条已保存（`saved === true`）记录之后。
+	*
+	* 与 {@link serializeStacks} 相反：当传入 `parse`（parseDSL）时，把每条 step 中以字符串形式存储的 `diff`
+	* 解析回真实对象（含函数）；不含 `diff` 的元素（如通用栈）原样透传。
 	*/
-	var deserializeStacks = (stacks = {}) => {
+	var deserializeStacks = (stacks = {}, parse) => {
 		const result = {};
 		Object.entries(stacks).forEach(([id, serialized]) => {
-			if (serialized) result[id] = UndoRedo.fromSerialized(serialized, { isSavedStep: (element) => element.saved === true });
+			if (!serialized) return;
+			const elementList = parse ? serialized.elementList.map((step) => {
+				const { diff } = step;
+				return typeof diff === "string" ? Object.assign({}, step, { diff: parse(`(${diff})`) }) : step;
+			}) : serialized.elementList;
+			result[id] = UndoRedo.fromSerialized({
+				...serialized,
+				elementList
+			}, { isSavedStep: (element) => element.saved === true });
 		});
 		return result;
 	};
@@ -5265,6 +5271,8 @@
 	var undoFloor = (undoRedo) => {
 		return undoRedo.getElementList()[0]?.opType === "initial" ? 1 : 0;
 	};
+	/** 将单次 push 产生的 history uuid（或 null）转为 *AndGetHistoryId 返回用的 uuid 列表。 */
+	var getLastPushedHistoryIds = (historyId) => historyId ? [historyId] : [];
 	//#endregion
 	//#region packages/editor/src/utils/indexed-db.ts
 	/**
@@ -5356,7 +5364,7 @@
 	var DEFAULT_DB_NAME = "tmagic-editor";
 	var DEFAULT_STORE_NAME = "history";
 	var DEFAULT_KEY = "default";
-	var PERSIST_VERSION = 1;
+	var PERSIST_VERSION = 2;
 	var History = class extends BaseService {
 		state = (0, vue.reactive)({
 			pageSteps: {},
@@ -5679,7 +5687,7 @@
 				dataSourceState: serializeStacks(this.state.dataSourceState),
 				savedAt: Date.now()
 			};
-			await idbSet(this.resolveDbName(dbName, appId), storeName, key, (0, serialize_javascript.default)(snapshot));
+			await idbSet(this.resolveDbName(dbName, appId), storeName, key, snapshot);
 			this.emit("save-to-indexed-db", snapshot);
 			return snapshot;
 		}
@@ -5693,13 +5701,12 @@
 		*/
 		async restoreFromIndexedDB(options = {}) {
 			const { dbName = DEFAULT_DB_NAME, storeName = DEFAULT_STORE_NAME, key = DEFAULT_KEY, appId } = options;
-			const raw = await idbGet(this.resolveDbName(dbName, appId), storeName, key);
-			if (!raw) return null;
-			const snapshot = typeof raw === "string" ? getEditorConfig("parseDSL")(`(${raw})`) : raw;
+			const snapshot = await idbGet(this.resolveDbName(dbName, appId), storeName, key);
 			if (!snapshot) return null;
-			this.state.pageSteps = deserializeStacks(snapshot.pageSteps);
-			this.state.codeBlockState = deserializeStacks(snapshot.codeBlockState);
-			this.state.dataSourceState = deserializeStacks(snapshot.dataSourceState);
+			const parseDSL = getEditorConfig("parseDSL");
+			this.state.pageSteps = deserializeStacks(snapshot.pageSteps, parseDSL);
+			this.state.codeBlockState = deserializeStacks(snapshot.codeBlockState, parseDSL);
+			this.state.dataSourceState = deserializeStacks(snapshot.dataSourceState, parseDSL);
 			this.state.pageId = snapshot.pageId;
 			this.setCanUndoRedo();
 			this.emit("restore-from-indexed-db", snapshot);
@@ -5739,11 +5746,8 @@
 			return mergePageSteps(targetPageId, list, undoRedo.getCursor()).filter((group) => group.opType !== "initial");
 		}
 		/**
-		* 取出全部代码块的历史栈，按 codeBlockId 分组。
-		* 同一栈内相邻、同 opType 且作用于同一 id 的多步会被合并为一个 group：
-		* - 这正是"代码块/数据源各自按 id 分栈"的天然表现，再叠加"连续修改同目标的相邻步骤合并展示"。
-		* - 合并后 group 暴露子步骤数组，UI 可展开查看每一步的 changeRecords。
-		* - applied 字段：组内最后一步是否处于已应用段。
+		* 取出全部代码块的历史栈，按 codeBlockId 分桶展示。
+		* 同一栈内每条操作记录独立成组，不做相邻 update 合并。
 		*/
 		getCodeBlockHistoryGroups() {
 			const groups = [];
@@ -5840,7 +5844,7 @@
 			return null;
 		}
 		/**
-		* 取出全部数据源的历史栈，按 dataSourceId 分组。同上。
+		* 取出全部数据源的历史栈，按 dataSourceId 分桶展示。同上，每条操作独立成组。
 		*/
 		getDataSourceHistoryGroups() {
 			const groups = [];
@@ -6073,12 +6077,26 @@
 		}
 		return (Math.min(parentHeight, wrapperHeightDeal) - height) / 2;
 	};
+	var removeConflictPosition = (style, primary, secondary) => {
+		const isInvalid = (value) => value === "" || value === 0 || value === void 0 || value === null;
+		if (!(primary in style) || !(secondary in style)) return;
+		const primaryValue = style[primary];
+		const secondaryValue = style[secondary];
+		const primaryInvalid = isInvalid(primaryValue);
+		const secondaryInvalid = isInvalid(secondaryValue);
+		if (primaryInvalid && !secondaryInvalid) delete style[primary];
+		else if (secondaryInvalid && !primaryInvalid) delete style[secondary];
+		else if (primaryInvalid && secondaryInvalid) if (secondaryValue === 0 && primaryValue !== 0) delete style[primary];
+		else delete style[secondary];
+	};
 	var getInitPositionStyle = (style = {}, layout) => {
 		if (layout === Layout.ABSOLUTE) {
 			const newStyle = {
 				...style,
 				position: "absolute"
 			};
+			removeConflictPosition(newStyle, "left", "right");
+			removeConflictPosition(newStyle, "top", "bottom");
 			if (typeof newStyle.left === "undefined" && typeof newStyle.right === "undefined") newStyle.left = 0;
 			return newStyle;
 		}
@@ -6103,58 +6121,63 @@
 		}
 		return node;
 	};
-	var change2Fixed = (node, root) => {
-		const style = { ...node.style || {} };
-		const path = (0, _tmagic_utils.getNodePath)(node.id, root.items);
-		const offset = {
-			left: 0,
-			top: 0
-		};
-		if (!node.style?.right && (0, _tmagic_utils.isNumber)(node.style?.left || 0)) for (const value of path) {
-			if (value.style?.right || !(0, _tmagic_utils.isNumber)(value.style?.left || 0)) {
-				offset.left = 0;
-				break;
-			}
-			offset.left = offset.left + Number(value.style?.left || 0);
+	var hasPositionValue = (style, key) => typeof style?.[key] !== "undefined" && style?.[key] !== "";
+	/**
+	* 沿节点路径累加（或抵消）某一方向上的定位偏移量
+	* 当路径上的祖先使用了反方向定位（例如计算 left 时祖先用了 right）或非数值定位时，
+	* 无法简单地通过求和换算坐标，此时返回 0 表示放弃补偿、保持原值
+	* @param path 从根到目标节点的路径（含节点自身）
+	* @param dir 需要累加的定位方向
+	* @param opposite 反方向定位属性
+	* @param sign change2Fixed 取 1（累加祖先偏移），Fixed2Other 取 -1（抵消祖先偏移）
+	* @param init 偏移量初始值
+	*/
+	var accumulatePositionOffset = (path, dir, opposite, sign, init = 0) => {
+		let offset = init;
+		for (const value of path) {
+			if (hasPositionValue(value.style, opposite) || !(0, _tmagic_utils.isNumber)(value.style?.[dir] || 0)) return 0;
+			offset = offset + sign * Number(value.style?.[dir] || 0);
 		}
-		if (!node.style?.bottom && (0, _tmagic_utils.isNumber)(node.style?.top || 0)) for (const value of path) {
-			if (value.style?.bottom || !(0, _tmagic_utils.isNumber)(value.style?.top || 0)) {
-				offset.top = 0;
-				break;
-			}
-			offset.top = offset.top + Number(value.style?.top || 0);
+		return offset;
+	};
+	var change2Fixed = (node, path) => {
+		const style = { ...node.style || {} };
+		if (!hasPositionValue(node.style, "right") && (0, _tmagic_utils.isNumber)(node.style?.left || 0)) {
+			const left = accumulatePositionOffset(path, "left", "right", 1);
+			if (left) style.left = left;
+		} else if (hasPositionValue(node.style, "right") && (0, _tmagic_utils.isNumber)(node.style?.right || 0)) {
+			const right = accumulatePositionOffset(path, "right", "left", 1);
+			if (right) style.right = right;
+		}
+		if (!hasPositionValue(node.style, "bottom") && (0, _tmagic_utils.isNumber)(node.style?.top || 0)) {
+			const top = accumulatePositionOffset(path, "top", "bottom", 1);
+			if (top) style.top = top;
+		} else if (hasPositionValue(node.style, "bottom") && (0, _tmagic_utils.isNumber)(node.style?.bottom || 0)) {
+			const bottom = accumulatePositionOffset(path, "bottom", "top", 1);
+			if (bottom) style.bottom = bottom;
 		}
-		if (offset.left) style.left = offset.left;
-		if (offset.top) style.top = offset.top;
 		return style;
 	};
-	var Fixed2Other = async (node, root, getLayout) => {
-		const path = (0, _tmagic_utils.getNodePath)(node.id, root.items);
+	var Fixed2Other = async (node, path, getLayout) => {
 		const cur = path.pop();
 		const offset = {
-			left: cur?.style?.left || 0,
-			top: cur?.style?.top || 0
+			left: 0,
+			top: 0,
+			right: 0,
+			bottom: 0
 		};
-		if (!node.style?.right && (0, _tmagic_utils.isNumber)(node.style?.left || 0)) for (const value of path) {
-			if (value.style?.right || !(0, _tmagic_utils.isNumber)(value.style?.left || 0)) {
-				offset.left = 0;
-				break;
-			}
-			offset.left = offset.left - Number(value.style?.left || 0);
-		}
-		if (!node.style?.bottom && (0, _tmagic_utils.isNumber)(node.style?.top || 0)) for (const value of path) {
-			if (value.style?.bottom || !(0, _tmagic_utils.isNumber)(value.style?.top || 0)) {
-				offset.top = 0;
-				break;
-			}
-			offset.top = offset.top - Number(value.style?.top || 0);
-		}
+		if (!hasPositionValue(node.style, "right") && (0, _tmagic_utils.isNumber)(node.style?.left || 0)) offset.left = accumulatePositionOffset(path, "left", "right", -1, Number(cur?.style?.left || 0));
+		else if (hasPositionValue(node.style, "right") && (0, _tmagic_utils.isNumber)(node.style?.right || 0)) offset.right = accumulatePositionOffset(path, "right", "left", -1, Number(cur?.style?.right || 0));
+		if (!hasPositionValue(node.style, "bottom") && (0, _tmagic_utils.isNumber)(node.style?.top || 0)) offset.top = accumulatePositionOffset(path, "top", "bottom", -1, Number(cur?.style?.top || 0));
+		else if (hasPositionValue(node.style, "bottom") && (0, _tmagic_utils.isNumber)(node.style?.bottom || 0)) offset.bottom = accumulatePositionOffset(path, "bottom", "top", -1, Number(cur?.style?.bottom || 0));
 		const style = node.style || {};
 		const parent = path.pop();
 		if (!parent) return getRelativeStyle(style);
 		if (await getLayout(parent) !== Layout.RELATIVE) {
 			if (offset.left) style.left = offset.left;
 			if (offset.top) style.top = offset.top;
+			if (offset.right) style.right = offset.right;
+			if (offset.bottom) style.bottom = offset.bottom;
 			return {
 				...style,
 				position: "absolute"
@@ -6186,11 +6209,11 @@
 	};
 	var fixNodePosition = (config, parent, stage) => {
 		if (config.style?.position !== "absolute") return config.style;
-		return {
-			...config.style || {},
-			top: getMiddleTop(config, parent, stage),
-			left: fixNodeLeft(config, parent, stage?.renderer?.contentWindow?.document)
-		};
+		const style = { ...config.style || {} };
+		const baseStyle = config.style || {};
+		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, {
 		space: 2,
@@ -6267,13 +6290,14 @@
 	var resolveSelectedNode = (config, getNodeInfoFn, rootId) => {
 		const id = typeof config === "string" || typeof config === "number" ? config : config.id;
 		if (!id) throw new Error("没有ID，无法选中");
-		const { node, parent, page } = getNodeInfoFn(id);
+		const { node, parent, page, path } = getNodeInfoFn(id);
 		if (!node) throw new Error("获取不到组件信息");
 		if (node.id === rootId) throw new Error("不能选根节点");
 		return {
 			node,
 			parent,
-			page
+			page,
+			path
 		};
 	};
 	/**
@@ -6285,11 +6309,11 @@
 	* @param getLayoutFn 获取父节点布局方式的回调函数
 	* @returns 处理后的节点配置（深拷贝）
 	*/
-	var toggleFixedPosition = async (dist, src, root, getLayoutFn) => {
+	var toggleFixedPosition = async (dist, src, path, getLayoutFn) => {
 		const newConfig = cloneDeep$1(dist);
 		if (!(0, _tmagic_utils.isPop)(src) && newConfig.style?.position) {
-			if ((0, _tmagic_stage.isFixed)(newConfig.style) && !(0, _tmagic_stage.isFixed)(src.style || {})) newConfig.style = change2Fixed(newConfig, root);
-			else if (!(0, _tmagic_stage.isFixed)(newConfig.style) && (0, _tmagic_stage.isFixed)(src.style || {})) newConfig.style = await Fixed2Other(newConfig, root, getLayoutFn);
+			if ((0, _tmagic_stage.isFixed)(newConfig.style) && !(0, _tmagic_stage.isFixed)(src.style || {})) newConfig.style = change2Fixed(newConfig, path);
+			else if (!(0, _tmagic_stage.isFixed)(newConfig.style) && (0, _tmagic_stage.isFixed)(src.style || {})) newConfig.style = await Fixed2Other(newConfig, path, getLayoutFn);
 		}
 		return newConfig;
 	};
@@ -6603,7 +6627,7 @@
 					this.state.pageFragmentLength = 0;
 					this.state.stageLoading = false;
 				}
-				this.emit("root-change", value, preValue);
+				this.emit("root-change", value, preValue, options);
 			}
 		}
 		/**
@@ -6626,12 +6650,14 @@
 			if (!root) return {
 				node: null,
 				parent: null,
-				page: null
+				page: null,
+				path: []
 			};
 			if (id === root.id) return {
 				node: root,
 				parent: null,
-				page: null
+				page: null,
+				path: []
 			};
 			const pageIdStr = `${this.get("page")?.id || ""}`;
 			const currentPageNode = root.items?.find((item) => `${item.id}` === pageIdStr);
@@ -6951,13 +6977,12 @@
 			this.emit("remove", nodes);
 		}
 		async doUpdate(config, { changeRecords = [], historySource } = {}) {
-			const root = this.get("root");
-			if (!root) throw new Error("root为空");
+			if (!this.get("root")) throw new Error("root为空");
 			if (!config?.id) throw new Error("没有配置或者配置缺少id值");
 			const info = this.getNodeInfo(config.id, false);
 			if (!info.node) throw new Error(`获取不到id为${config.id}的节点`);
 			const node = (0, vue.toRaw)(info.node);
-			let newConfig = await toggleFixedPosition((0, vue.toRaw)(config), node, root, this.getLayout);
+			let newConfig = await toggleFixedPosition((0, vue.toRaw)(config), node, info.path, this.getLayout);
 			newConfig = mergeWith(cloneDeep$1(node), newConfig, editorNodeMergeCustomizer);
 			if (!newConfig.type) throw new Error("配置缺少type值");
 			if (newConfig.type === _tmagic_core.NodeType.ROOT) {
@@ -7332,46 +7357,61 @@
 		}
 		/**
 		* 下列 *AndGetHistoryId 方法与对应的普通操作（add / remove / update ...）行为完全一致，
-		* 唯一区别是返回值为本次写入历史栈的历史记录 uuid（{@link StepValue.uuid}），
-		* 而非节点 / 节点数组。可用于精确引用 / 定位该条历史记录（埋点、revert、跨端同步等）。
+		* 返回值在 {@link DslOpWithHistoryIdsResult} 中同时包含原操作结果与本次写入历史栈的 uuid 列表（{@link StepValue.uuid}），
+		* 可用于精确引用 / 定位该条历史记录（埋点、revert、跨端同步等）。
 		*
-		* 当本次操作未写入历史（doNotPushHistory 为 true、或操作无实际变更 / 提前返回）时返回 null。
+		* 当本次操作未写入历史（doNotPushHistory 为 true、或操作无实际变更 / 提前返回）时 historyIds 为 `[]`。
 		*/
-		/** 等价于 {@link add}，但返回本次写入历史记录的 uuid（未入栈时返回 null）。 */
+		/** 等价于 {@link add}，并额外返回本次写入历史记录的 uuid 列表（未入栈时 historyIds 为 `[]`）。 */
 		async addAndGetHistoryId(addNode, parent, options = {}) {
 			this.lastPushedHistoryId = null;
-			await this.add(addNode, parent, options);
-			return this.lastPushedHistoryId;
+			return {
+				result: await this.add(addNode, parent, options),
+				historyIds: getLastPushedHistoryIds(this.lastPushedHistoryId)
+			};
 		}
-		/** 等价于 {@link remove}，但返回本次写入历史记录的 uuid（未入栈时返回 null）。 */
+		/** 等价于 {@link remove}，并额外返回本次写入历史记录的 uuid 列表（未入栈时 historyIds 为 `[]`）。 */
 		async removeAndGetHistoryId(nodeOrNodeList, options = {}) {
 			this.lastPushedHistoryId = null;
 			await this.remove(nodeOrNodeList, options);
-			return this.lastPushedHistoryId;
+			return {
+				result: void 0,
+				historyIds: getLastPushedHistoryIds(this.lastPushedHistoryId)
+			};
 		}
-		/** 等价于 {@link update}，但返回本次写入历史记录的 uuid（未入栈时返回 null）。 */
+		/** 等价于 {@link update}，并额外返回本次写入历史记录的 uuid 列表（未入栈时 historyIds 为 `[]`）。 */
 		async updateAndGetHistoryId(config, data = {}) {
 			this.lastPushedHistoryId = null;
-			await this.update(config, data);
-			return this.lastPushedHistoryId;
+			return {
+				result: await this.update(config, data),
+				historyIds: getLastPushedHistoryIds(this.lastPushedHistoryId)
+			};
 		}
-		/** 等价于 {@link moveLayer}，但返回本次写入历史记录的 uuid（未入栈时返回 null）。 */
+		/** 等价于 {@link moveLayer}，并额外返回本次写入历史记录的 uuid 列表（未入栈时 historyIds 为 `[]`）。 */
 		async moveLayerAndGetHistoryId(offset, options = {}) {
 			this.lastPushedHistoryId = null;
 			await this.moveLayer(offset, options);
-			return this.lastPushedHistoryId;
+			return {
+				result: void 0,
+				historyIds: getLastPushedHistoryIds(this.lastPushedHistoryId)
+			};
 		}
-		/** 等价于 {@link moveToContainer}，但返回本次写入历史记录的 uuid（未入栈时返回 null）。 */
+		/** 等价于 {@link moveToContainer}，并额外返回本次写入历史记录的 uuid 列表（未入栈时 historyIds 为 `[]`）。 */
 		async moveToContainerAndGetHistoryId(config, targetId, options = {}) {
 			this.lastPushedHistoryId = null;
-			await this.moveToContainer(config, targetId, options);
-			return this.lastPushedHistoryId;
+			return {
+				result: await this.moveToContainer(config, targetId, options),
+				historyIds: getLastPushedHistoryIds(this.lastPushedHistoryId)
+			};
 		}
-		/** 等价于 {@link dragTo}，但返回本次写入历史记录的 uuid（未入栈时返回 null）。 */
+		/** 等价于 {@link dragTo}，并额外返回本次写入历史记录的 uuid 列表（未入栈时 historyIds 为 `[]`）。 */
 		async dragToAndGetHistoryId(config, targetParent, targetIndex, options = {}) {
 			this.lastPushedHistoryId = null;
 			await this.dragTo(config, targetParent, targetIndex, options);
-			return this.lastPushedHistoryId;
+			return {
+				result: void 0,
+				historyIds: getLastPushedHistoryIds(this.lastPushedHistoryId)
+			};
 		}
 		/**
 		* 撤销当前操作
@@ -7480,17 +7520,19 @@
 			return revertedStep;
 		}
 		/**
-		* 通过历史记录 uuid 回滚当前页面的某条历史步骤，语义与 {@link revertPageStep} 完全一致，
-		* 仅入参从 index 改为 uuid（{@link StepValue.uuid}）。uuid 不随栈内步骤增删而变化，
-		* 更适合业务侧持有引用后再回滚（埋点、跨端同步等场景）。
+		* 通过历史记录 uuid 回滚当前页面的历史步骤，语义与 {@link revertPageStep} 完全一致，
+		* 仅入参从 index 改为 uuid 列表（{@link StepValue.uuid}）。按数组顺序依次回滚，
+		* 返回与入参同序的结果列表（某项失败时为 `null`）。
 		*
-		* @param uuid 目标历史记录的 uuid，通常由 *AndGetHistoryId 方法返回
-		* @returns 反向后产生的新 step；找不到对应 uuid / 未应用 / 反向失败时返回 null
+		* @param uuids 目标历史记录的 uuid 列表，通常由 *AndGetHistoryId 方法返回的 `historyIds`
 		*/
-		async revertPageStepById(uuid) {
-			const index = history_default.getPageStepIndexByUuid(uuid);
-			if (index < 0) return null;
-			return this.revertPageStep(index);
+		async revertPageStepById(uuids) {
+			const results = [];
+			for (const uuid of uuids) {
+				const index = history_default.getPageStepIndexByUuid(uuid);
+				results.push(index < 0 ? null : await this.revertPageStep(index));
+			}
+			return results;
 		}
 		/**
 		* 跳转当前页面历史栈到指定游标位置。
@@ -8472,6 +8514,7 @@
 		items: [
 			{
 				title: "数据定义",
+				status: "fields",
 				items: [{
 					name: "fields",
 					type: "data-source-fields",
@@ -8480,6 +8523,7 @@
 			},
 			{
 				title: "方法定义",
+				status: "methods",
 				items: [{
 					name: "methods",
 					type: "data-source-methods",
@@ -10131,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),
@@ -10169,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（最近一次的描述更准确）；
@@ -10201,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）：
@@ -10264,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);
@@ -10293,7 +10288,7 @@
 		class: "m-editor-history-list-item-saved",
 		title: "该记录为最近一次保存的状态"
 	};
-	var _hoisted_5$3 = {
+	var _hoisted_5$4 = {
 		key: 1,
 		class: "m-editor-history-list-item-actions"
 	};
@@ -10453,7 +10448,7 @@
 					(0, vue.createElementVNode)("span", { class: (0, vue.normalizeClass)(["m-editor-history-list-item-op", `op-${__props.group.opType}`]) }, (0, vue.toDisplayString)((0, vue.unref)(opLabel)(__props.group.opType)), 3),
 					(0, vue.createElementVNode)("span", _hoisted_3$11, (0, vue.toDisplayString)(__props.group.desc), 1),
 					headSaved.value ? ((0, vue.openBlock)(), (0, vue.createElementBlock)("span", _hoisted_4$8, "已保存")) : (0, vue.createCommentVNode)("v-if", true),
-					!merged.value && (headRevertable.value || headDiffable.value || canHeadGoto.value) ? ((0, vue.openBlock)(), (0, vue.createElementBlock)("span", _hoisted_5$3, [
+					!merged.value && (headRevertable.value || headDiffable.value || canHeadGoto.value) ? ((0, vue.openBlock)(), (0, vue.createElementBlock)("span", _hoisted_5$4, [
 						headRevertable.value ? ((0, vue.openBlock)(), (0, vue.createElementBlock)("span", {
 							key: 0,
 							class: "m-editor-history-list-item-revert",
@@ -10546,9 +10541,14 @@
 	var _hoisted_2$22 = { class: "m-editor-history-list-item-desc" };
 	var _hoisted_3$10 = {
 		key: 0,
+		class: "m-editor-history-list-item-saved",
+		title: "该记录为最近一次保存的状态"
+	};
+	var _hoisted_4$7 = {
+		key: 1,
 		class: "m-editor-history-list-item-actions"
 	};
-	var _hoisted_4$7 = ["title"];
+	var _hoisted_5$3 = ["title"];
 	var InitialRow_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ (0, vue.defineComponent)({
 		name: "MEditorHistoryListInitialRow",
 		__name: "InitialRow",
@@ -10573,6 +10573,8 @@
 			*/
 			const props = __props;
 			const desc = (0, vue.computed)(() => props.marker?.historyDescription || "未修改的初始状态");
+			/** 基线（初始状态）是否为最近一次保存点：仅页面栈的 `initial` 基线 step 会被 markSaved 标记。 */
+			const saved = (0, vue.computed)(() => Boolean(props.marker?.saved));
 			const time = (0, vue.computed)(() => formatHistoryTime(props.marker?.timestamp));
 			const timeTitle = (0, vue.computed)(() => formatHistoryFullTime(props.marker?.timestamp));
 			const rowTitle = (0, vue.computed)(() => {
@@ -10598,16 +10600,17 @@
 					}, "#0", -1)),
 					_cache[1] || (_cache[1] = (0, vue.createElementVNode)("span", { class: "m-editor-history-list-item-op op-initial" }, "初始", -1)),
 					(0, vue.createElementVNode)("span", _hoisted_2$22, (0, vue.toDisplayString)(desc.value), 1),
-					__props.gotoEnabled && !__props.isCurrent ? ((0, vue.openBlock)(), (0, vue.createElementBlock)("span", _hoisted_3$10, [(0, vue.createElementVNode)("span", {
+					saved.value ? ((0, vue.openBlock)(), (0, vue.createElementBlock)("span", _hoisted_3$10, "已保存")) : (0, vue.createCommentVNode)("v-if", true),
+					__props.gotoEnabled && !__props.isCurrent ? ((0, vue.openBlock)(), (0, vue.createElementBlock)("span", _hoisted_4$7, [(0, vue.createElementVNode)("span", {
 						class: "m-editor-history-list-item-goto",
 						title: "回到该记录",
 						onClick: (0, vue.withModifiers)(onClick, ["stop"])
 					}, "回到")])) : (0, vue.createCommentVNode)("v-if", true),
 					time.value ? ((0, vue.openBlock)(), (0, vue.createElementBlock)("span", {
-						key: 1,
+						key: 2,
 						class: "m-editor-history-list-item-time",
 						title: timeTitle.value
-					}, (0, vue.toDisplayString)(time.value), 9, _hoisted_4$7)) : (0, vue.createCommentVNode)("v-if", true)
+					}, (0, vue.toDisplayString)(time.value), 9, _hoisted_5$3)) : (0, vue.createCommentVNode)("v-if", true)
 				], 10, _hoisted_1$60);
 			};
 		}
@@ -11299,8 +11302,8 @@
 			/**
 			* 历史记录面板：在顶部 NavMenu 上点击图标打开 popover，分三个 tab：
 			* - 页面：当前活动页面的历史栈，连续修改同一节点的多步会被合并成一组
-			* - 数据源：以 dataSource.id 分组，每组内部相邻的连续 update 自动合并
-			* - 代码块：同上，按 codeBlock.id 分组并合并相邻 update
+			* - 数据源：以 dataSource.id 分桶，每条操作记录独立展示
+			* - 代码块：同上，按 codeBlock.id 分桶，每条操作记录独立展示
 			*
 			* 数据通过 historyService 暴露的聚合 API 读取，UI 仅用于只读展示，
 			* 同时支持点击任意一条记录跳转至该状态：
@@ -11355,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，组件内部按需读取。
@@ -11366,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;
@@ -13644,7 +13643,9 @@
 		props: /* @__PURE__ */ (0, vue.mergeModels)({
 			title: {},
 			values: {},
-			disabled: { type: Boolean }
+			disabled: { type: Boolean },
+			editMethodName: {},
+			editFieldPath: {}
 		}, {
 			"visible": {
 				type: Boolean,
@@ -13669,9 +13670,20 @@
 			const dataSourceConfig = (0, vue.ref)([]);
 			const { height: editorHeight } = useEditorContentHeight();
 			const { boxPosition, calcBoxPosition } = useNextFloatBoxPosition(uiService, (0, vue.inject)("parentFloating", (0, vue.ref)(null)));
+			/** 供「方法定义」tab 内的字段消费，用于打开数据源详情后自动打开指定方法 */
+			(0, vue.provide)("editingDataSourceMethodName", (0, vue.computed)(() => props.editMethodName));
+			/** 供「数据定义」tab 内的字段消费，用于打开数据源详情后自动打开指定字段 */
+			(0, vue.provide)("editingDataSourceFieldPath", (0, vue.computed)(() => props.editFieldPath || []));
 			(0, vue.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);
@@ -13960,7 +13972,13 @@
 			const eventBus = (0, vue.inject)("eventBus");
 			const { dataSourceService } = useServices();
 			const { editDialog, dataSourceValues, dialogTitle, editable, editHandler, submitDataSourceHandler } = useDataSourceEdit(dataSourceService);
+			/** 打开数据源详情时需要直接定位并打开的方法名，为空则正常展示「数据定义」tab */
+			const editMethodName = (0, vue.ref)("");
+			/** 打开数据源详情时需要直接定位并打开的字段路径，为空则不自动打开字段配置 */
+			const editFieldPath = (0, vue.ref)([]);
 			const editDialogCloseHandler = () => {
+				editMethodName.value = "";
+				editFieldPath.value = [];
 				if (dataSourceListRef.value) for (const [, status] of dataSourceListRef.value.nodeStatusMap.entries()) status.selected = false;
 			};
 			(0, vue.watch)(dataSourceValues, (dataSourceValues) => {
@@ -13998,6 +14016,18 @@
 				dataSourceListRef.value?.filter(val);
 			};
 			eventBus?.on("edit-data-source", (id) => {
+				editMethodName.value = "";
+				editFieldPath.value = [];
+				editHandler(id);
+			});
+			eventBus?.on("edit-data-source-method", (id, methodName) => {
+				editMethodName.value = methodName;
+				editFieldPath.value = [];
+				editHandler(id);
+			});
+			eventBus?.on("edit-data-source-field", (id, fieldPath) => {
+				editMethodName.value = "";
+				editFieldPath.value = fieldPath;
 				editHandler(id);
 			});
 			eventBus?.on("remove-data-source", (id) => {
@@ -14046,12 +14076,16 @@
 						disabled: !(0, vue.unref)(editable),
 						values: (0, vue.unref)(dataSourceValues),
 						title: (0, vue.unref)(dialogTitle),
+						"edit-method-name": editMethodName.value,
+						"edit-field-path": editFieldPath.value,
 						onSubmit: (0, vue.unref)(submitDataSourceHandler),
 						onClose: editDialogCloseHandler
 					}, null, 8, [
 						"disabled",
 						"values",
 						"title",
+						"edit-method-name",
+						"edit-field-path",
 						"onSubmit"
 					]),
 					((0, vue.openBlock)(), (0, vue.createBlock)(vue.Teleport, { to: "body" }, [menuData.value.length ? ((0, vue.openBlock)(), (0, vue.createBlock)(ContentMenu_default, {
@@ -15047,7 +15081,7 @@
 						slots: {}
 					},
 					layer: {
-						$key: "layer",
+						$key: SideItemKey.LAYER,
 						type: "component",
 						icon: _element_plus_icons_vue.List,
 						text: "已选组件",
@@ -15065,7 +15099,7 @@
 						slots: {}
 					},
 					[SideItemKey.CODE_BLOCK]: {
-						$key: "code-block",
+						$key: SideItemKey.CODE_BLOCK,
 						type: "component",
 						icon: _element_plus_icons_vue.EditPen,
 						text: "代码编辑",
@@ -16436,31 +16470,40 @@
 		}
 		/**
 		* 下列 *AndGetHistoryId 方法与对应的写入方法行为完全一致，
-		* 唯一区别是返回值为本次写入历史栈的历史记录 uuid（{@link CodeBlockStepValue.uuid}），
+		* 返回值在 {@link DslOpWithHistoryIdsResult} 中同时包含原操作结果与本次写入的历史 uuid 列表，
 		* 可用于精确引用 / 定位该条历史记录（埋点、revert、跨端同步等）。
 		*
-		* 当本次操作未写入历史（doNotPushHistory 为 true、或无对应记录）时：单条写入返回 null，批量删除返回空数组。
+		* 当本次操作未写入历史（doNotPushHistory 为 true、或无对应记录）时 historyIds 为 `[]`。
 		*/
-		/** 等价于 {@link setCodeDslById}，但返回本次写入历史记录的 uuid（未入栈时返回 null）。 */
+		/** 等价于 {@link setCodeDslById}，并额外返回本次写入历史记录的 uuid 列表（未入栈时 historyIds 为 `[]`）。 */
 		async setCodeDslByIdAndGetHistoryId(id, codeConfig, options = {}) {
 			this.lastPushedHistoryId = null;
 			await this.setCodeDslById(id, codeConfig, options);
-			return this.lastPushedHistoryId;
+			return {
+				result: void 0,
+				historyIds: getLastPushedHistoryIds(this.lastPushedHistoryId)
+			};
 		}
-		/** 等价于 {@link setCodeDslByIdSync}，但返回本次写入历史记录的 uuid（未入栈时返回 null）。 */
+		/** 等价于 {@link setCodeDslByIdSync}，并额外返回本次写入历史记录的 uuid 列表（未入栈时 historyIds 为 `[]`）。 */
 		setCodeDslByIdSyncAndGetHistoryId(id, codeConfig, force = true, options = {}) {
 			this.lastPushedHistoryId = null;
 			this.setCodeDslByIdSync(id, codeConfig, force, options);
-			return this.lastPushedHistoryId;
+			return {
+				result: void 0,
+				historyIds: getLastPushedHistoryIds(this.lastPushedHistoryId)
+			};
 		}
 		/**
-		* 等价于 {@link deleteCodeDslByIds}，但返回本次写入的全部历史记录 uuid（按删除顺序）。
-		* 一次删除多个代码块会产生多条历史记录，因此返回数组；未写入任何历史时返回空数组。
+		* 等价于 {@link deleteCodeDslByIds}，并额外返回本次写入的全部历史记录 uuid（按删除顺序）。
+		* 一次删除多个代码块会产生多条历史记录；未写入任何历史时 historyIds 为 `[]`。
 		*/
 		async deleteCodeDslByIdsAndGetHistoryId(codeIds, options = {}) {
 			this.lastDeletedHistoryIds = [];
 			await this.deleteCodeDslByIds(codeIds, options);
-			return [...this.lastDeletedHistoryIds];
+			return {
+				result: void 0,
+				historyIds: [...this.lastDeletedHistoryIds]
+			};
 		}
 		setParamsColConfig(config) {
 			this.state.paramsColConfig = config;
@@ -16543,17 +16586,19 @@
 			return await this.applyRevertStep(entry.step, description);
 		}
 		/**
-		* 通过历史记录 uuid 回滚某条代码块历史步骤，语义同 {@link revert}，
-		* 仅无需调用方再传 codeBlockId 与 index：内部会按 uuid（{@link CodeBlockStepValue.uuid}）
-		* 在全部代码块栈中定位对应步骤后再回滚。
+		* 通过历史记录 uuid 回滚代码块历史步骤，语义同 {@link revert}，
+		* 仅无需调用方再传 codeBlockId 与 index：内部会按 uuid 在全部代码块栈中定位对应步骤后再回滚。
+		* 按数组顺序依次回滚，返回与入参同序的结果列表（某项失败时为 `null`）。
 		*
-		* @param uuid 目标历史记录的 uuid，通常由 {@link setCodeDslByIdAndGetHistoryId} 等方法返回
-		* @returns 反向后产生的新 step；找不到对应 uuid / 未应用时返回 null
+		* @param uuids 目标历史记录的 uuid 列表，通常由 {@link setCodeDslByIdAndGetHistoryId} 等方法返回的 `historyIds`
 		*/
-		async revertById(uuid) {
-			const location = history_default.findCodeBlockStepLocationByUuid(uuid);
-			if (!location) return null;
-			return await this.revert(location.id, location.index);
+		async revertById(uuids) {
+			const results = [];
+			for (const uuid of uuids) {
+				const location = history_default.findCodeBlockStepLocationByUuid(uuid);
+				results.push(location ? await this.revert(location.id, location.index) : null);
+			}
+			return results;
 		}
 		/**
 		* 生成代码块唯一id
@@ -16883,28 +16928,35 @@
 		}
 		/**
 		* 下列 *AndGetHistoryId 方法与对应的 add / update / remove 行为完全一致，
-		* 唯一区别是返回值为本次写入历史栈的历史记录 uuid（{@link DataSourceStepValue.uuid}），
-		* 而非数据源配置。可用于精确引用 / 定位该条历史记录（埋点、revert、跨端同步等）。
+		* 返回值在 {@link DslOpWithHistoryIdsResult} 中同时包含原操作结果与本次写入历史栈的 uuid 列表（{@link DataSourceStepValue.uuid}），
+		* 可用于精确引用 / 定位该条历史记录（埋点、revert、跨端同步等）。
 		*
-		* 当本次操作未写入历史（doNotPushHistory 为 true、或无对应记录）时返回 null。
+		* 当本次操作未写入历史（doNotPushHistory 为 true、或无对应记录）时 historyIds 为 `[]`。
 		*/
-		/** 等价于 {@link add}，但返回本次写入历史记录的 uuid（未入栈时返回 null）。 */
+		/** 等价于 {@link add}，并额外返回本次写入历史记录的 uuid 列表（未入栈时 historyIds 为 `[]`）。 */
 		addAndGetHistoryId(config, options = {}) {
 			this.lastPushedHistoryId = null;
-			this.add(config, options);
-			return this.lastPushedHistoryId;
+			return {
+				result: this.add(config, options),
+				historyIds: getLastPushedHistoryIds(this.lastPushedHistoryId)
+			};
 		}
-		/** 等价于 {@link update}，但返回本次写入历史记录的 uuid（未入栈时返回 null）。 */
+		/** 等价于 {@link update}，并额外返回本次写入历史记录的 uuid 列表（未入栈时 historyIds 为 `[]`）。 */
 		updateAndGetHistoryId(config, options = {}) {
 			this.lastPushedHistoryId = null;
-			this.update(config, options);
-			return this.lastPushedHistoryId;
+			return {
+				result: this.update(config, options),
+				historyIds: getLastPushedHistoryIds(this.lastPushedHistoryId)
+			};
 		}
-		/** 等价于 {@link remove}，但返回本次写入历史记录的 uuid（未入栈时返回 null）。 */
+		/** 等价于 {@link remove}，并额外返回本次写入历史记录的 uuid 列表（未入栈时 historyIds 为 `[]`）。 */
 		removeAndGetHistoryId(id, options = {}) {
 			this.lastPushedHistoryId = null;
 			this.remove(id, options);
-			return this.lastPushedHistoryId;
+			return {
+				result: void 0,
+				historyIds: getLastPushedHistoryIds(this.lastPushedHistoryId)
+			};
 		}
 		/**
 		* 撤销指定数据源的最近一次变更。
@@ -16980,17 +17032,18 @@
 			return this.applyRevertStep(entry.step, description);
 		}
 		/**
-		* 通过历史记录 uuid 回滚某条数据源历史步骤，语义同 {@link revert}，
-		* 仅无需调用方再传 dataSourceId 与 index：内部会按 uuid（{@link DataSourceStepValue.uuid}）
-		* 在全部数据源栈中定位对应步骤后再回滚。
+		* 通过历史记录 uuid 回滚数据源历史步骤，语义同 {@link revert}，
+		* 仅无需调用方再传 dataSourceId 与 index：内部会按 uuid 在全部数据源栈中定位对应步骤后再回滚。
+		* 按数组顺序依次回滚，返回与入参同序的结果列表（某项失败时为 `null`）。
 		*
-		* @param uuid 目标历史记录的 uuid，通常由 {@link addAndGetHistoryId} 等方法返回
-		* @returns 反向后产生的新 step；找不到对应 uuid / 未应用时返回 null
+		* @param uuids 目标历史记录的 uuid 列表，通常由 {@link addAndGetHistoryId} 等方法返回的 `historyIds`
 		*/
-		revertById(uuid) {
-			const location = history_default.findDataSourceStepLocationByUuid(uuid);
-			if (!location) return null;
-			return this.revert(location.id, location.index);
+		revertById(uuids) {
+			return uuids.map((uuid) => {
+				const location = history_default.findDataSourceStepLocationByUuid(uuid);
+				if (!location) return null;
+				return this.revert(location.id, location.index);
+			});
 		}
 		createId() {
 			return `ds_${(0, _tmagic_utils.guid)()}`;
@@ -18630,7 +18683,8 @@
 			*/
 			const isCompareMode = (0, vue.computed)(() => Boolean(props.isCompare && props.lastValues));
 			const notEditable = (0, vue.computed)(() => (0, _tmagic_form.filterFunction)(mForm, props.config.notEditable, props));
-			const hasCodeBlockSidePanel = (0, vue.computed)(() => (uiService.get("sideBarItems") || []).find((item) => item.$key === SideItemKey.CODE_BLOCK));
+			const codeBlockSidePanel = (0, vue.computed)(() => (uiService.get("sideBarItems") || []).find((item) => item.$key === SideItemKey.CODE_BLOCK));
+			const hasCodeBlockSidePanel = (0, vue.computed)(() => codeBlockSidePanel.value);
 			/**
 			* 根据代码块id获取代码块参数配置
 			* @param codeId 代码块ID
@@ -18685,6 +18739,8 @@
 				emit("change", props.model[props.name], eventData);
 			};
 			const editCode = (id) => {
+				const sideBarItem = codeBlockSidePanel.value;
+				if (sideBarItem) uiService.set("sideBarActiveTabName", sideBarItem.text || sideBarItem.$key || SideItemKey.CODE_BLOCK);
 				eventBus?.emit("edit-code", id);
 			};
 			return (_ctx, _cache) => {
@@ -18817,6 +18873,15 @@
 				calcBoxPosition();
 				addDialogVisible.value = true;
 			};
+			const editField = (row, index) => {
+				fieldValues.value = {
+					...row,
+					index
+				};
+				fieldTitle.value = `编辑${row.title}`;
+				calcBoxPosition();
+				addDialogVisible.value = true;
+			};
 			const fieldChange = ({ index, ...value }, data) => {
 				addDialogVisible.value = false;
 				if (index > -1) emit("change", value, {
@@ -18868,13 +18933,7 @@
 					actions: [{
 						text: "编辑",
 						handler: (row, index) => {
-							fieldValues.value = {
-								...row,
-								index
-							};
-							fieldTitle.value = `编辑${row.title}`;
-							calcBoxPosition();
-							addDialogVisible.value = true;
+							editField(row, index);
 						}
 					}, {
 						text: "删除",
@@ -19061,6 +19120,20 @@
 			const addFromJsonDialogVisible = (0, vue.useModel)(__props, "visible1");
 			const { height: editorHeight } = useEditorContentHeight();
 			const { boxPosition, calcBoxPosition } = useNextFloatBoxPosition(uiService, (0, vue.inject)("parentFloating", (0, vue.ref)(null)));
+			/**
+			* 由 DataSourceConfigPanel 注入：打开数据源详情后需要直接打开的字段路径（字段名数组）。
+			* 当前层消费 path[0]，并把剩余路径下发给嵌套字段，实现逐层打开。
+			*/
+			const editingFieldPath = (0, vue.inject)("editingDataSourceFieldPath", (0, vue.computed)(() => []));
+			(0, vue.provide)("editingDataSourceFieldPath", (0, vue.computed)(() => editingFieldPath.value.slice(1)));
+			(0, vue.onMounted)(() => {
+				const path = editingFieldPath.value;
+				if (!path.length) return;
+				const fields = props.model[props.name] || [];
+				const index = fields.findIndex((field) => field.name === path[0]);
+				if (index === -1) return;
+				editField(fields[index], index);
+			});
 			return (_ctx, _cache) => {
 				return (0, vue.openBlock)(), (0, vue.createElementBlock)("div", _hoisted_1$36, [
 					(0, vue.createVNode)((0, vue.unref)(_tmagic_table.MagicTable), {
@@ -19442,6 +19515,19 @@
 			const codeConfig = (0, vue.ref)();
 			const codeBlockEditorRef = (0, vue.useTemplateRef)("codeBlockEditor");
 			let editIndex = -1;
+			const editMethod = (method, index) => {
+				let codeContent = "({ params, dataSource, app }) => {\n  // place your code here\n}";
+				if (method.content) if (typeof method.content !== "string") codeContent = method.content.toString();
+				else codeContent = method.content;
+				codeConfig.value = {
+					...cloneDeep$1(method),
+					content: codeContent
+				};
+				editIndex = index;
+				(0, vue.nextTick)(() => {
+					codeBlockEditorRef.value?.show();
+				});
+			};
 			const methodColumns = [
 				{
 					label: "名称",
@@ -19466,17 +19552,7 @@
 					actions: [{
 						text: "编辑",
 						handler: (method, index) => {
-							let codeContent = "({ params, dataSource, app }) => {\n  // place your code here\n}";
-							if (method.content) if (typeof method.content !== "string") codeContent = method.content.toString();
-							else codeContent = method.content;
-							codeConfig.value = {
-								...cloneDeep$1(method),
-								content: codeContent
-							};
-							editIndex = index;
-							(0, vue.nextTick)(() => {
-								codeBlockEditorRef.value?.show();
-							});
+							editMethod(method, index);
 						}
 					}, {
 						text: "删除",
@@ -19524,6 +19600,16 @@
 				codeConfig.value = void 0;
 				codeBlockEditorRef.value?.hide();
 			};
+			/** 由 DataSourceConfigPanel 注入：打开数据源详情后需要直接打开的方法名 */
+			const editingMethodName = (0, vue.inject)("editingDataSourceMethodName", (0, vue.computed)(() => ""));
+			(0, vue.onMounted)(() => {
+				const methodName = editingMethodName.value;
+				if (!methodName) return;
+				const methods = props.model[props.name] || [];
+				const index = methods.findIndex((method) => method.name === methodName);
+				if (index === -1) return;
+				editMethod(methods[index], index);
+			});
 			return (_ctx, _cache) => {
 				return (0, vue.openBlock)(), (0, vue.createElementBlock)("div", _hoisted_1$34, [
 					(0, vue.createVNode)((0, vue.unref)(_tmagic_table.MagicTable), {
@@ -19951,7 +20037,7 @@
 			const eventBus = (0, vue.inject)("eventBus");
 			const emit = __emit;
 			const props = __props;
-			const hasDataSourceSidePanel = (0, vue.computed)(() => (uiService.get("sideBarItems") || []).find((item) => item.$key === SideItemKey.DATA_SOURCE));
+			const dataSourceSidePanel = (0, vue.computed)(() => (uiService.get("sideBarItems") || []).find((item) => item.$key === SideItemKey.DATA_SOURCE));
 			const notEditable = (0, vue.computed)(() => (0, _tmagic_form.filterFunction)(mForm, props.config.notEditable, props));
 			/** 对比模式下隐藏查看/编辑操作按钮，仅保留只读展示。 */
 			const isCompare = (0, vue.computed)(() => Boolean(mForm?.isCompare));
@@ -20039,9 +20125,11 @@
 				emit("change", props.model[props.name], eventData);
 			};
 			const editCodeHandler = () => {
-				const [id] = props.model[props.name];
+				const [id, methodName] = props.model[props.name];
 				if (!dataSourceService.getDataSourceById(id)) return;
-				eventBus?.emit("edit-data-source", id);
+				const sideBarItem = dataSourceSidePanel.value;
+				if (sideBarItem) uiService.set("sideBarActiveTabName", sideBarItem.text || sideBarItem.$key || SideItemKey.DATA_SOURCE);
+				eventBus?.emit("edit-data-source-method", id, methodName);
 			};
 			return (_ctx, _cache) => {
 				return (0, vue.openBlock)(), (0, vue.createElementBlock)("div", _hoisted_1$31, [(0, vue.createElementVNode)("div", _hoisted_2$6, [(0, vue.createVNode)((0, vue.unref)(_tmagic_form.MCascader), {
@@ -20060,7 +20148,7 @@
 					"size",
 					"disabled",
 					"prop"
-				]), __props.model[__props.name] && isCustomMethod.value && hasDataSourceSidePanel.value && !isCompare.value ? ((0, vue.openBlock)(), (0, vue.createBlock)((0, vue.unref)(_tmagic_design.TMagicTooltip), {
+				]), __props.model[__props.name] && isCustomMethod.value && dataSourceSidePanel.value && !isCompare.value ? ((0, vue.openBlock)(), (0, vue.createBlock)((0, vue.unref)(_tmagic_design.TMagicTooltip), {
 					key: 0,
 					content: notEditable.value ? "查看" : "编辑"
 				}, {
@@ -20176,9 +20264,15 @@
 				modelValue.value = v;
 				emit("change", v);
 			};
-			const hasDataSourceSidePanel = (0, vue.computed)(() => uiService.get("sideBarItems").find((item) => item.$key === SideItemKey.DATA_SOURCE));
+			const dataSourceSidePanel = (0, vue.computed)(() => uiService.get("sideBarItems").find((item) => item.$key === SideItemKey.DATA_SOURCE));
+			const hasDataSourceSidePanel = (0, vue.computed)(() => dataSourceSidePanel.value);
 			const editHandler = (id) => {
-				eventBus?.emit("edit-data-source", (0, _tmagic_utils.removeDataSourceFieldPrefix)(id));
+				const sideBarItem = dataSourceSidePanel.value;
+				if (sideBarItem) uiService.set("sideBarActiveTabName", sideBarItem.text || sideBarItem.$key || SideItemKey.DATA_SOURCE);
+				const dataSourceId = (0, _tmagic_utils.removeDataSourceFieldPrefix)(id);
+				const fieldPath = selectFieldsId.value;
+				if (fieldPath.length) eventBus?.emit("edit-data-source-field", dataSourceId, [...fieldPath]);
+				else eventBus?.emit("edit-data-source", dataSourceId);
 			};
 			return (_ctx, _cache) => {
 				return (0, vue.openBlock)(), (0, vue.createElementBlock)("div", _hoisted_1$30, [__props.dataSourceId ? ((0, vue.openBlock)(), (0, vue.createBlock)((0, vue.unref)(_tmagic_design.TMagicCascader), {
@@ -22397,6 +22491,13 @@
 			] }));
 			const selectDirection = (d) => direction.value = d || "";
 			const emit = __emit;
+			const props = __props;
+			const hasValue = (value) => value !== void 0 && value !== null && value !== "";
+			const isConfigured = (d) => [
+				"Width",
+				"Color",
+				"Style"
+			].some((key) => hasValue(props.model?.[`border${d}${key}`]));
 			const change = (value, eventData) => {
 				eventData.changeRecords?.forEach((record) => {
 					emit("change", record.value, { modifyKey: record.propPath });
@@ -22406,25 +22507,40 @@
 			return (_ctx, _cache) => {
 				return (0, vue.openBlock)(), (0, vue.createElementBlock)("div", _hoisted_1$1, [(0, vue.createElementVNode)("div", _hoisted_2, [
 					(0, vue.createElementVNode)("div", _hoisted_3, [(0, vue.createElementVNode)("div", {
-						class: (0, vue.normalizeClass)(["border-icon border-icon-top", { active: direction.value === "Top" }]),
+						class: (0, vue.normalizeClass)(["border-icon border-icon-top", {
+							active: direction.value === "Top",
+							configured: isConfigured("Top")
+						}]),
 						onClick: _cache[0] || (_cache[0] = ($event) => selectDirection("Top"))
 					}, null, 2)]),
 					(0, vue.createElementVNode)("div", _hoisted_4, [
 						(0, vue.createElementVNode)("div", {
-							class: (0, vue.normalizeClass)(["border-icon border-icon-left", { active: direction.value === "Left" }]),
+							class: (0, vue.normalizeClass)(["border-icon border-icon-left", {
+								active: direction.value === "Left",
+								configured: isConfigured("Left")
+							}]),
 							onClick: _cache[1] || (_cache[1] = ($event) => selectDirection("Left"))
 						}, null, 2),
 						(0, vue.createElementVNode)("div", {
-							class: (0, vue.normalizeClass)(["border-icon", { active: direction.value === "" }]),
+							class: (0, vue.normalizeClass)(["border-icon", {
+								active: direction.value === "",
+								configured: isConfigured("")
+							}]),
 							onClick: _cache[2] || (_cache[2] = ($event) => selectDirection())
 						}, null, 2),
 						(0, vue.createElementVNode)("div", {
-							class: (0, vue.normalizeClass)(["border-icon border-icon-right", { active: direction.value === "Right" }]),
+							class: (0, vue.normalizeClass)(["border-icon border-icon-right", {
+								active: direction.value === "Right",
+								configured: isConfigured("Right")
+							}]),
 							onClick: _cache[3] || (_cache[3] = ($event) => selectDirection("Right"))
 						}, null, 2)
 					]),
 					(0, vue.createElementVNode)("div", _hoisted_5, [(0, vue.createElementVNode)("div", {
-						class: (0, vue.normalizeClass)(["border-icon border-icon-bottom", { active: direction.value === "Bottom" }]),
+						class: (0, vue.normalizeClass)(["border-icon border-icon-bottom", {
+							active: direction.value === "Bottom",
+							configured: isConfigured("Bottom")
+						}]),
 						onClick: _cache[4] || (_cache[4] = ($event) => selectDirection("Bottom"))
 					}, null, 2)])
 				]), (0, vue.createElementVNode)("div", _hoisted_6, [(0, vue.createVNode)((0, vue.unref)(_tmagic_form.MContainer), {
@@ -23138,6 +23254,7 @@
 	exports.getFormValue = getFormValue;
 	exports.getGuideLineFromCache = getGuideLineFromCache;
 	exports.getInitPositionStyle = getInitPositionStyle;
+	exports.getLastPushedHistoryIds = getLastPushedHistoryIds;
 	exports.getNodeIndex = getNodeIndex;
 	exports.getOrCreateStack = getOrCreateStack;
 	exports.getPageFragmentList = getPageFragmentList;