@tmagic/editor 1.8.0-manmanyu.8 → 1.8.0

package/dist/es/services/editor.js

@@ -7,11 +7,13 @@ import storage_default, { Protocol } from "./storage.js";
 import { COPY_STORAGE_KEY, calcAlignCenterStyle, calcLayerTargetIndex, calcMoveStyle, classifyDragSources, collectRelatedNodes, describeStepForRevert, editorNodeMergeCustomizer, fixNodePosition, getInitPositionStyle, getNodeIndex, getPageFragmentList, getPageList, moveItemsInContainer, resolveSelectedNode, setChildrenLayout, setLayout, toggleFixedPosition } from "../utils/editor.js";
 import { beforePaste, getAddParent } from "../utils/operator.js";
 import { isFixed } from "@tmagic/stage";
-import { getNodeInfo, getNodePath, getValueByKeyPath, guid, isPage, isPageFragment, setValueByKeyPath } from "@tmagic/utils";
+import { getNodeInfo, getNodePath, getValueByKeyPath, guid, isPage, isPageFragment, isPageOrFragment, setValueByKeyPath, traverseNode } from "@tmagic/utils";
 import { NodeType } from "@tmagic/core";
-import { reactive, toRaw } from "vue";
+import { nextTick, reactive, toRaw } from "vue";
 import { cloneDeep as cloneDeep$1, isEmpty, isEqual, isObject, mergeWith, uniq } from "lodash-es";
 //#region packages/editor/src/services/editor.ts
+/** 历史插回时把记录的下标收敛到 [0, length]，越界（含未记录）一律追加到末尾 */
+var clampIndex = (index, length) => typeof index === "number" && index >= 0 && index <= length ? index : length;
 /**
 * 把「变更前后节点快照」列表归一成 update 类型的 {@link StepDiffItem} 列表，供 {@link StepValue.diff} 使用。
 * `changeRecords` 来自 form 端的 propPath/value 列表，撤销/重做时只对这些 propPath 做局部更新；
@@ -33,6 +35,7 @@ var Editor = class extends BaseService {
 		stageLoading: true,
 		highlightNode: null,
 		modifiedNodeIds: /* @__PURE__ */ new Map(),
+		invalidNodeIds: /* @__PURE__ */ new Map(),
 		pageLength: 0,
 		pageFragmentLength: 0,
 		disabledMultiSelect: false,
@@ -40,11 +43,21 @@ var Editor = class extends BaseService {
 	});
 	selectionBeforeOp = null;
 	/**
+	* 操作前的节点校验错误快照，与 selectionBeforeOp 同时在 captureSelectionBeforeOp 中捕获，
+	* 供 pushOpHistory 写入 step.extra.invalidNodeIdsBefore，用于撤销时还原到「操作前」的错误状态。
+	*/
+	invalidNodeIdsBeforeOp = null;
+	/**
 	* 最近一次 pushOpHistory 写入的历史记录 uuid。
 	* 供 *AndGetHistoryId 系列方法在调用普通操作后取回本次产生的历史记录 id；
 	* 普通操作不会读取它，调用前由 *AndGetHistoryId 重置为 null。
 	*/
 	lastPushedHistoryId = null;
+	/**
+	* 上一次 doAdd 的插入记忆：nodeId 为插入的节点，selectedId 为当时的选中节点。
+	* 仅在选中节点未变化时复用（连续 add / doNotSelect / 批量粘贴），选中变化后自动失效，无需手动清理。
+	*/
+	lastAdded = null;
 	constructor() {
 		super(canUsePluginMethods.async.map((methodName) => ({
 			name: methodName,
@@ -57,7 +70,7 @@ var Editor = class extends BaseService {
 	}
 	/**
 	* 设置当前指点节点配置
-	* @param name 'root' | 'page' | 'parent' | 'node' | 'highlightNode' | 'nodes' | 'stage' | 'modifiedNodeIds' | 'pageLength' | 'pageFragmentLength
+	* @param name 'root' | 'page' | 'parent' | 'node' | 'highlightNode' | 'nodes' | 'stage' | 'modifiedNodeIds' | 'invalidNodeIds' | 'pageLength' | 'pageFragmentLength
 	* @param value MNode
 	* @param options.historySource 设置 root 时，本次变更写入历史记录的「操作来源」（仅 name === 'root' 时生效）
 	*/
@@ -74,7 +87,7 @@ var Editor = class extends BaseService {
 				this.state.stageLoading = this.state.pageLength !== 0;
 				if (preValue && !isEmpty(preValue)) this.pushRootDiffHistory(preValue, app, options.historySource);
 				else app.items?.forEach((pageNode) => {
-					if (pageNode?.id !== void 0 && !history_default.getPageMarker(pageNode.id)) history_default.setPageMarker(pageNode.id, {
+					if (pageNode?.id !== void 0 && !history_default.getMarker("page", pageNode.id)) history_default.setMarker("page", pageNode.id, {
 						name: pageNode.name,
 						source: options.historySource
 					});
@@ -85,11 +98,12 @@ var Editor = class extends BaseService {
 				this.state.stageLoading = false;
 			}
 			this.emit("root-change", value, preValue, options);
+			this.pruneInvalidNodeIds();
 		}
 	}
 	/**
 	* 获取当前指点节点配置
-	* @param name  'root' | 'page' | 'parent' | 'node' | 'highlightNode' | 'nodes' | 'stage' | 'modifiedNodeIds' | 'pageLength' | 'pageFragmentLength'
+	* @param name  'root' | 'page' | 'parent' | 'node' | 'highlightNode' | 'nodes' | 'stage' | 'modifiedNodeIds' | 'invalidNodeIds' | 'pageLength' | 'pageFragmentLength'
 	* @returns MNode
 	*/
 	get(name) {
@@ -152,7 +166,7 @@ var Editor = class extends BaseService {
 	isOnDifferentPage(node) {
 		const currentPageId = this.get("page")?.id;
 		if (currentPageId === void 0 || currentPageId === null) return false;
-		if (isPage(node) || isPageFragment(node)) return `${node.id}` !== `${currentPageId}`;
+		if (isPageOrFragment(node)) return `${node.id}` !== `${currentPageId}`;
 		const nodePage = this.getNodeInfo(node.id, false).page;
 		if (!nodePage) return false;
 		return `${nodePage.id}` !== `${currentPageId}`;
@@ -176,8 +190,6 @@ var Editor = class extends BaseService {
 		this.set("nodes", node ? [node] : []);
 		this.set("page", page);
 		this.set("parent", parent);
-		if (page) history_default.changePage(toRaw(page));
-		else history_default.resetState();
 		if (node?.id) this.get("stage")?.renderer?.runtime?.getApp?.()?.page?.emit("editor:select", {
 			node,
 			page,
@@ -241,24 +253,29 @@ var Editor = class extends BaseService {
 		this.set("stage", null);
 		this.set("highlightNode", null);
 	}
-	async doAdd(node, parent) {
+	async doAdd(node, parent, _options = {}) {
 		const root = this.get("root");
 		if (!root) throw new Error("root为空");
 		const curNode = this.get("node");
 		const stage = this.get("stage");
 		if (!curNode) throw new Error("当前选中节点为空");
-		if ((parent.type === NodeType.ROOT || curNode?.type === NodeType.ROOT) && !(isPage(node) || isPageFragment(node))) throw new Error("app下不能添加组件");
-		if (parent.id !== curNode.id && !(isPage(node) || isPageFragment(node))) {
-			const index = parent.items.indexOf(curNode);
-			parent.items?.splice(index + 1, 0, node);
-		} else parent.items?.push(node);
+		if ((parent.type === NodeType.ROOT || curNode?.type === NodeType.ROOT) && !isPageOrFragment(node)) throw new Error("app下不能添加组件");
+		const anchorId = this.lastAdded?.selectedId === curNode.id ? this.lastAdded.nodeId : curNode.id;
+		const anchorIndex = isPageOrFragment(node) ? -1 : Math.max(getNodeIndex(anchorId, parent), getNodeIndex(curNode.id, parent));
+		const insertIndex = anchorIndex < 0 ? parent.items.length : anchorIndex + 1;
+		parent.items.splice(insertIndex, 0, node);
+		this.lastAdded = {
+			selectedId: curNode.id,
+			nodeId: node.id
+		};
 		const layout = await this.getLayout(toRaw(parent), node);
 		node.style = getInitPositionStyle(node.style, layout);
 		await stage?.add({
 			config: cloneDeep$1(node),
 			parent: cloneDeep$1(parent),
 			parentId: parent.id,
-			root: cloneDeep$1(root)
+			root: cloneDeep$1(root),
+			index: insertIndex
 		});
 		const newStyle = fixNodePosition(node, parent, stage);
 		if (newStyle && (newStyle.top !== node.style.top || newStyle.left !== node.style.left)) {
@@ -276,14 +293,12 @@ var Editor = class extends BaseService {
 	* 向指点容器添加组件节点
 	* @param addConfig 将要添加的组件节点配置
 	* @param parent 要添加到的容器组件节点配置，如果不设置，默认为当前选中的组件的父节点
-	* @param options 可选配置
-	* @param options.doNotSelect 添加后是否不更新当前选中节点（默认 false，添加后会选中新增的节点）
-	* @param options.doNotSwitchPage 添加后是否不切换当前页面（默认 false；新增页面 / 跨页新增时为 true 会跳过会引发页面切换的选中操作）
-	* @param options.doNotPushHistory 是否不写入历史记录（默认 false）
+	* @param options 可选配置，见 {@link DslOpOptions}
 	* @returns 添加后的节点
 	*/
-	async add(addNode, parent, { doNotSelect = false, doNotSwitchPage = false, doNotPushHistory = false, historyDescription, historySource } = {}) {
+	async add(addNode, parent, options = {}) {
 		this.captureSelectionBeforeOp();
+		const { doNotSelect = false, doNotSwitchPage = false, doNotPushHistory = false, historyDescription, historySource } = options;
 		const stage = this.get("stage");
 		const addNodes = [];
 		if (!Array.isArray(addNode)) {
@@ -291,13 +306,13 @@ var Editor = class extends BaseService {
 			if (!type) throw new Error("组件类型不能为空");
 			addNodes.push({ ...toRaw(await props_default.getPropsValue(type, config)) });
 		} else addNodes.push(...addNode);
-		const newNodes = await Promise.all(addNodes.map((node) => {
+		const newNodes = [];
+		for (const node of addNodes) {
 			const root = this.get("root");
-			if ((isPage(node) || isPageFragment(node)) && root) return this.doAdd(node, root);
-			const parentNode = parent ?? getAddParent(node);
+			const parentNode = isPageOrFragment(node) && root ? root : parent ?? getAddParent(node);
 			if (!parentNode) throw new Error("未找到父元素");
-			return this.doAdd(node, parentNode);
-		}));
+			newNodes.push(await this.doAdd(node, parentNode, options));
+		}
 		if (newNodes.length > 1) {
 			const wouldSwitchPage = newNodes.some((n) => this.isOnDifferentPage(n));
 			if (!doNotSelect && !(doNotSwitchPage && wouldSwitchPage)) {
@@ -313,7 +328,7 @@ var Editor = class extends BaseService {
 			else if (isPageFragment(newNodes[0])) this.state.pageFragmentLength += 1;
 			else if (!skipSelect) stage?.select(newNodes[0].id);
 		}
-		if (!(isPage(newNodes[0]) || isPageFragment(newNodes[0]))) {
+		if (!isPageOrFragment(newNodes[0])) {
 			const pageForOp = this.getNodeInfo(newNodes[0].id, false).page;
 			if (!doNotPushHistory) {
 				const parentId = (this.getParentById(newNodes[0].id, false) ?? this.get("root")).id;
@@ -337,6 +352,20 @@ var Editor = class extends BaseService {
 			} else this.selectionBeforeOp = null;
 		}
 		this.emit("add", newNodes);
+		this.emit("change", {
+			type: "add",
+			data: newNodes.map((node) => ({
+				node,
+				page: this.getPageOfNode(node.id)
+			})),
+			historySource,
+			doNotPushHistory
+		});
+		const addedPages = newNodes.filter((node) => isPageOrFragment(node));
+		if (addedPages.length) history_default.notifyPageStructureChange({
+			add: addedPages,
+			remove: []
+		});
 		return Array.isArray(addNode) ? newNodes : newNodes[0];
 	}
 	async doRemove(node, { doNotSelect = false, doNotSwitchPage = false } = {}) {
@@ -346,13 +375,10 @@ var Editor = class extends BaseService {
 		if (!parent || !curNode) throw new Error("找不要删除的节点");
 		const index = getNodeIndex(curNode.id, parent);
 		if (typeof index !== "number" || index === -1) throw new Error("找不要删除的节点");
-		parent.items?.splice(index, 1);
 		const stage = this.get("stage");
-		stage?.remove({
-			id: node.id,
-			parentId: parent.id,
-			root: cloneDeep$1(root)
-		});
+		const currentPage = this.get("page");
+		const isDeletingCurrentPage = isPageOrFragment(node) && !!currentPage && `${currentPage.id}` === `${node.id}`;
+		parent.items?.splice(index, 1);
 		const selectedNodes = this.get("nodes");
 		const removedSelectedIndex = selectedNodes.findIndex((n) => `${n.id}` === `${node.id}`);
 		if (removedSelectedIndex !== -1) {
@@ -360,27 +386,29 @@ var Editor = class extends BaseService {
 			nextSelected.splice(removedSelectedIndex, 1);
 			this.set("nodes", nextSelected);
 		}
-		if (isPage(node) || isPageFragment(node)) {
-			const currentPage = this.get("page");
-			if (currentPage && `${currentPage.id}` === `${node.id}`) this.set("page", null);
-		}
-		const selectDefault = async (pages) => {
-			if (pages[0]) {
-				await this.select(pages[0]);
-				stage?.select(pages[0].id);
-			} else {
-				this.selectRoot();
-				history_default.resetPage();
-			}
+		const removeData = {
+			id: node.id,
+			parentId: parent.id,
+			root: cloneDeep$1(root)
 		};
 		const rootItems = root.items || [];
-		if (isPage(node)) {
-			this.state.pageLength -= 1;
-			if (!doNotSelect && !doNotSwitchPage) await selectDefault(rootItems);
-		} else if (isPageFragment(node)) {
-			this.state.pageFragmentLength -= 1;
-			if (!doNotSelect && !doNotSwitchPage) await selectDefault(rootItems);
+		const shouldReselect = isDeletingCurrentPage && !doNotSelect && !doNotSwitchPage;
+		const shouldSwitchPage = shouldReselect && rootItems.length > 0;
+		if (isPageOrFragment(node)) {
+			if (isPage(node)) this.state.pageLength -= 1;
+			else this.state.pageFragmentLength -= 1;
+			if (shouldSwitchPage) {
+				await this.select(rootItems[0]);
+				stage?.select(rootItems[0].id);
+				await nextTick();
+				stage?.remove(removeData);
+			} else {
+				stage?.remove(removeData);
+				if (shouldReselect) this.selectRoot();
+				else if (isDeletingCurrentPage) this.set("page", null);
+			}
 		} else {
+			stage?.remove(removeData);
 			if (!doNotSelect) {
 				await this.select(parent);
 				stage?.select(parent.id);
@@ -400,12 +428,17 @@ var Editor = class extends BaseService {
 	* @param options.doNotSwitchPage 删除后是否不切换当前页面（默认 false；删除页面 / 页面片段时为 true 会跳过自动切换到首个剩余页面）
 	* @param options.doNotPushHistory 是否不写入历史记录（默认 false）
 	*/
-	async remove(nodeOrNodeList, { doNotSelect = false, doNotSwitchPage = false, doNotPushHistory = false, historyDescription, historySource } = {}) {
+	async remove(nodeOrNodeList, options = {}) {
+		const { doNotPushHistory = false, historyDescription, historySource } = options;
 		this.captureSelectionBeforeOp();
 		const nodes = Array.isArray(nodeOrNodeList) ? nodeOrNodeList : [nodeOrNodeList];
+		const changeItems = nodes.map((node) => ({
+			node,
+			page: this.getPageOfNode(node.id)
+		}));
 		const removedItems = [];
 		let pageForOp = null;
-		if (!(isPage(nodes[0]) || isPageFragment(nodes[0]))) for (const n of nodes) {
+		if (!isPageOrFragment(nodes[0])) for (const n of nodes) {
 			const { parent, node: curNode, page } = this.getNodeInfo(n.id, false);
 			if (parent && curNode) {
 				if (!pageForOp && page) pageForOp = {
@@ -420,27 +453,39 @@ var Editor = class extends BaseService {
 				});
 			}
 		}
-		await Promise.all(nodes.map((node) => this.doRemove(node, {
-			doNotSelect,
-			doNotSwitchPage
-		})));
-		if (removedItems.length > 0 && pageForOp) if (!doNotPushHistory) this.pushOpHistory("remove", {
-			diff: removedItems,
-			pageData: pageForOp,
-			historyDescription,
-			source: historySource
-		});
-		else this.selectionBeforeOp = null;
+		await Promise.all(nodes.map((node) => this.doRemove(node, options)));
+		this.removeInvalidNodesBySubtree(nodes);
+		if (removedItems.length > 0 && pageForOp) {
+			if (!doNotPushHistory) this.pushOpHistory("remove", {
+				diff: removedItems,
+				pageData: pageForOp,
+				historyDescription,
+				source: historySource
+			});
+			else this.selectionBeforeOp = null;
+		}
 		this.emit("remove", nodes);
+		this.emit("change", {
+			type: "remove",
+			data: changeItems,
+			historySource,
+			doNotPushHistory
+		});
+		const removedPages = nodes.filter((node) => isPageOrFragment(node));
+		if (removedPages.length) history_default.notifyPageStructureChange({
+			add: [],
+			remove: removedPages
+		});
 	}
-	async doUpdate(config, { changeRecords = [], historySource } = {}) {
+	async doUpdate(config, data = {}) {
+		const { changeRecords = [], historySource, replace = false } = data;
 		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 = toRaw(info.node);
-		let newConfig = await toggleFixedPosition(toRaw(config), node, info.path, this.getLayout);
-		newConfig = mergeWith(cloneDeep$1(node), newConfig, editorNodeMergeCustomizer);
+		let newConfig = replace ? cloneDeep$1(toRaw(config)) : await toggleFixedPosition(toRaw(config), node, info.path, this.getLayout);
+		if (!replace) newConfig = mergeWith(cloneDeep$1(node), newConfig, editorNodeMergeCustomizer);
 		if (!newConfig.type) throw new Error("配置缺少type值");
 		if (newConfig.type === NodeType.ROOT) {
 			this.set("root", newConfig, { historySource });
@@ -455,9 +500,11 @@ var Editor = class extends BaseService {
 		const parentNodeItems = parent.items;
 		const index = getNodeIndex(newConfig.id, parent);
 		if (!parentNodeItems || typeof index === "undefined" || index === -1) throw new Error("更新的节点未找到");
-		const newLayout = await this.getLayout(newConfig);
-		const layout = await this.getLayout(node);
-		if (Array.isArray(newConfig.items) && newLayout !== layout) newConfig = setChildrenLayout(newConfig, newLayout);
+		if (!replace) {
+			const newLayout = await this.getLayout(newConfig);
+			const layout = await this.getLayout(node);
+			if (Array.isArray(newConfig.items) && newLayout !== layout) newConfig = setChildrenLayout(newConfig, newLayout);
+		}
 		parentNodeItems[index] = newConfig;
 		const selectedNodes = this.get("nodes");
 		const targetIndex = selectedNodes.findIndex((nodeItem) => `${nodeItem.id}` === `${newConfig.id}`);
@@ -465,7 +512,7 @@ var Editor = class extends BaseService {
 			selectedNodes.splice(targetIndex, 1, newConfig);
 			this.set("nodes", [...selectedNodes]);
 		}
-		if (isPage(newConfig) || isPageFragment(newConfig)) {
+		if (isPageOrFragment(newConfig)) {
 			const currentPage = this.get("page");
 			if (currentPage && `${currentPage.id}` === `${newConfig.id}`) this.set("page", newConfig);
 		}
@@ -480,43 +527,51 @@ var Editor = class extends BaseService {
 	* 更新节点
 	* update后会触发依赖收集，收集完后会掉stage.update方法
 	* @param config 新的节点配置，配置中需要有id信息
-	* @param data 额外数据
-	* @param data.changeRecords 单节点 form 端变更记录（多节点场景下被忽略，使用 changeRecordList）
-	* @param data.changeRecordList 多节点 form 端变更记录列表，按 config 数组同序对应每个节点；优先级高于 changeRecords
-	* @param data.doNotPushHistory 是否不写入历史记录（默认 false）
-	* @param data.historyDescription 入栈时附带的人类可读描述，用于历史面板展示（不影响 undo/redo 行为）
+	* @param data 额外数据，见 {@link UpdateOptions}
 	* @returns 更新后的节点配置
 	*/
 	async update(config, data = {}) {
 		this.captureSelectionBeforeOp();
-		const { doNotPushHistory = false, changeRecordList, changeRecords, historyDescription, historySource } = data;
+		const { doNotPushHistory = false, changeRecordList, changeRecords, historyDescription, historySource, invalidInfo } = data;
 		const nodes = Array.isArray(config) ? config : [config];
 		const updateData = await Promise.all(nodes.map((node, index) => {
 			const recordsForNode = changeRecordList ? changeRecordList[index] ?? [] : changeRecords ?? [];
 			return this.doUpdate(node, {
-				changeRecords: recordsForNode,
-				historySource
+				...data,
+				changeRecords: recordsForNode
 			});
 		}));
+		this.applyInvalidInfo(config, invalidInfo);
 		if (updateData[0].oldNode?.type !== NodeType.ROOT) {
-			if (this.get("nodes").length) if (!doNotPushHistory) {
-				const pageForOp = this.getNodeInfo(nodes[0].id, false).page;
-				this.pushOpHistory("update", {
-					diff: buildUpdateDiff(updateData.map((d) => ({
-						oldNode: cloneDeep$1(d.oldNode),
-						newNode: cloneDeep$1(d.newNode),
-						changeRecords: d.changeRecords?.length ? cloneDeep$1(d.changeRecords) : void 0
-					}))),
-					pageData: {
-						name: pageForOp?.name || "",
-						id: pageForOp.id
-					},
-					historyDescription,
-					source: historySource
-				});
-			} else this.selectionBeforeOp = null;
+			if (this.get("nodes").length) {
+				if (!doNotPushHistory) {
+					const pageForOp = this.getNodeInfo(nodes[0].id, false).page;
+					this.pushOpHistory("update", {
+						diff: buildUpdateDiff(updateData.map((d) => ({
+							oldNode: cloneDeep$1(d.oldNode),
+							newNode: cloneDeep$1(d.newNode),
+							changeRecords: d.changeRecords?.length ? cloneDeep$1(d.changeRecords) : void 0
+						}))),
+						pageData: {
+							name: pageForOp?.name || "",
+							id: pageForOp.id
+						},
+						historyDescription,
+						source: historySource
+					});
+				} else this.selectionBeforeOp = null;
+			}
 		}
 		this.emit("update", updateData);
+		this.emit("change", {
+			type: "update",
+			data: updateData.map((node) => ({
+				node,
+				page: this.getPageOfNode(node.newNode.id)
+			})),
+			historySource,
+			doNotPushHistory
+		});
 		return Array.isArray(config) ? updateData.map((item) => item.newNode) : updateData[0].newNode;
 	}
 	/**
@@ -633,8 +688,10 @@ var Editor = class extends BaseService {
 			historyDescription,
 			historySource
 		});
-		if (!doNotSelect) if (newNodes.length > 1) await stage?.multiSelect(newNodes.map((node) => node.id));
-		else await stage?.select(newNodes[0].id);
+		if (!doNotSelect) {
+			if (newNodes.length > 1) await stage?.multiSelect(newNodes.map((node) => node.id));
+			else await stage?.select(newNodes[0].id);
+		}
 		return newNode;
 	}
 	/**
@@ -682,6 +739,16 @@ var Editor = class extends BaseService {
 			});
 		} else this.selectionBeforeOp = null;
 		this.emit("move-layer", offset);
+		this.emit("change", {
+			type: "move-layer",
+			data: [{
+				node,
+				page: this.getPageOfNode(node.id)
+			}],
+			offset,
+			historySource,
+			doNotPushHistory
+		});
 	}
 	/**
 	* 移动一个或多个节点到指定容器中。
@@ -699,7 +766,7 @@ var Editor = class extends BaseService {
 	*/
 	async moveToContainer(config, targetId, { doNotSelect = false, doNotSwitchPage = false, doNotPushHistory = false, historyDescription, historySource } = {}) {
 		const isBatch = Array.isArray(config);
-		const configs = (isBatch ? config : [config]).filter((item) => !(isPage(item) || isPageFragment(item)));
+		const configs = (isBatch ? config : [config]).filter((item) => !isPageOrFragment(item));
 		if (configs.length === 0) throw new Error("没有可移动的节点");
 		this.captureSelectionBeforeOp();
 		const target = this.getNodeById(targetId, false);
@@ -811,6 +878,17 @@ var Editor = class extends BaseService {
 			configs,
 			targetParent
 		});
+		this.emit("change", {
+			type: "drag-to",
+			data: configs.map((node) => ({
+				node,
+				page: this.getPageOfNode(node.id)
+			})),
+			targetIndex,
+			targetParent,
+			historySource,
+			doNotPushHistory
+		});
 	}
 	/**
 	* 下列 *AndGetHistoryId 方法与对应的普通操作（add / remove / update ...）行为完全一致，
@@ -875,7 +953,9 @@ var Editor = class extends BaseService {
 	* @returns 被撤销的操作
 	*/
 	async undo() {
-		const value = history_default.undo();
+		const pageId = this.get("page")?.id;
+		if (pageId === void 0) return null;
+		const value = history_default.undo("page", pageId);
 		if (value) await this.applyHistoryOp(value, true);
 		return value;
 	}
@@ -884,7 +964,9 @@ var Editor = class extends BaseService {
 	* @returns 被恢复的操作
 	*/
 	async redo() {
-		const value = history_default.redo();
+		const pageId = this.get("page")?.id;
+		if (pageId === void 0) return null;
+		const value = history_default.redo("page", pageId);
 		if (value) await this.applyHistoryOp(value, false);
 		return value;
 	}
@@ -905,7 +987,7 @@ var Editor = class extends BaseService {
 	* @returns 反向后产生的新 step；目标不存在 / 未应用 / 反向失败时返回 null
 	*/
 	async revertPageStep(index) {
-		const entry = history_default.getPageStepList()[index];
+		const entry = history_default.getStepList("page", this.get("page")?.id)[index];
 		if (!entry?.applied) return null;
 		const { step } = entry;
 		if (step.opType === "initial") return null;
@@ -915,7 +997,7 @@ var Editor = class extends BaseService {
 			if (!items.length || !items.every((item) => item.changeRecords?.length)) return null;
 		}
 		let revertedStep = null;
-		const captureRevert = (s) => {
+		const captureRevert = (_pageId, s) => {
 			revertedStep = s;
 		};
 		history_default.once("change", captureRevert);
@@ -985,9 +1067,10 @@ var Editor = class extends BaseService {
 	*/
 	async revertPageStepById(uuids) {
 		const results = [];
+		const pageId = this.get("page")?.id;
 		for (const uuid of uuids) {
-			const index = history_default.getPageStepIndexByUuid(uuid);
-			results.push(index < 0 ? null : await this.revertPageStep(index));
+			const location = history_default.findStepLocationByUuid("page", uuid, pageId);
+			results.push(!location ? null : await this.revertPageStep(location.index));
 		}
 		return results;
 	}
@@ -1001,8 +1084,9 @@ var Editor = class extends BaseService {
 	* @returns 实际移动到的最终游标位置
 	*/
 	async gotoPageStep(targetCursor) {
-		let cursor = history_default.getPageCursor();
-		const { length } = history_default.getPageStepList();
+		const pageId = this.get("page")?.id;
+		let cursor = history_default.getCursor("page", pageId);
+		const { length } = history_default.getStepList("page", pageId);
 		const target = Math.max(0, Math.min(targetCursor, length));
 		while (cursor > target) {
 			if (!await this.undo()) break;
@@ -1038,6 +1122,7 @@ var Editor = class extends BaseService {
 		this.set("stage", null);
 		this.set("highlightNode", null);
 		this.set("modifiedNodeIds", /* @__PURE__ */ new Map());
+		this.set("invalidNodeIds", /* @__PURE__ */ new Map());
 		this.set("pageLength", 0);
 	}
 	destroy() {
@@ -1048,6 +1133,51 @@ var Editor = class extends BaseService {
 	resetModifiedNodeId() {
 		this.get("modifiedNodeIds").clear();
 	}
+	/**
+	* 记录（或覆盖）某个节点在指定来源（属性表单 / 样式表单）上的校验错误信息。
+	* @param id 节点 id
+	* @param source 错误来源：'props'（属性表单）| 'style'（样式表单）
+	* @param message 错误文案（可能是包含 <br> 的 HTML）
+	*/
+	setInvalidNode(id, source, message) {
+		const map = this.get("invalidNodeIds");
+		const info = { ...map.get(id) || {} };
+		info[source] = message;
+		map.set(id, info);
+		this.emit("invalid-node-change", map);
+	}
+	/**
+	* 删除节点的校验错误记录。
+	* @param id 节点 id
+	* @param source 指定来源则仅删除该来源；不传则删除该节点全部来源的错误
+	*/
+	deleteInvalidNode(id, source) {
+		const map = this.get("invalidNodeIds");
+		if (!map.has(id)) return;
+		if (!source) map.delete(id);
+		else {
+			const info = { ...map.get(id) || {} };
+			delete info[source];
+			if (info.props || info.style) map.set(id, info);
+			else map.delete(id);
+		}
+		this.emit("invalid-node-change", map);
+	}
+	/** 获取当前存在校验错误的节点错误 Map（key 为节点 id） */
+	getInvalidNodeIds() {
+		return this.get("invalidNodeIds");
+	}
+	/** 获取指定节点的校验错误信息 */
+	getInvalidNodeInfo(id) {
+		return this.get("invalidNodeIds").get(id);
+	}
+	/** 清空全部校验错误记录 */
+	resetInvalidNodeId() {
+		const map = this.get("invalidNodeIds");
+		if (map.size === 0) return;
+		map.clear();
+		this.emit("invalid-node-change", map);
+	}
 	usePlugin(options) {
 		super.usePlugin(options);
 	}
@@ -1060,12 +1190,63 @@ var Editor = class extends BaseService {
 	emit(eventName, ...args) {
 		return super.emit(eventName, ...args);
 	}
+	/**
+	* 应用一次属性面板提交携带的校验错误信息（在写入历史记录之前调用，使历史快照与本次变更对齐）。
+	* - invalidInfo 为空（调用方未携带）：认为本次更新对应的节点已无校验错误，清除其全部来源的错误；
+	* - error 非空则记录错误，为空则清除对应来源的错误。
+	*/
+	applyInvalidInfo(config, invalidInfo) {
+		if (!invalidInfo) {
+			(Array.isArray(config) ? config : [config]).map((node) => node.id).filter((id) => id !== void 0).forEach((id) => this.deleteInvalidNode(id));
+			return;
+		}
+		const { id, source, error } = invalidInfo;
+		if (error) this.setInvalidNode(id, source, error);
+		else this.deleteInvalidNode(id, source);
+	}
+	/** 删除被移除节点（含其子树）的校验错误记录，避免残留误报 */
+	removeInvalidNodesBySubtree(nodes) {
+		const map = this.get("invalidNodeIds");
+		if (map.size === 0) return;
+		let changed = false;
+		nodes.forEach((node) => {
+			traverseNode(node, (n) => {
+				if (n.id !== void 0 && map.delete(n.id)) changed = true;
+			});
+		});
+		if (changed) this.emit("invalid-node-change", map);
+	}
+	/** 清理不在当前 DSL 中的失效节点错误记录（用于整体替换 root 后） */
+	pruneInvalidNodeIds() {
+		const map = this.get("invalidNodeIds");
+		if (map.size === 0) return;
+		let changed = false;
+		for (const id of [...map.keys()]) if (!this.getNodeById(id, false)) {
+			map.delete(id);
+			changed = true;
+		}
+		if (changed) this.emit("invalid-node-change", map);
+	}
 	addModifiedNodeId(id) {
 		this.get("modifiedNodeIds").set(id, id);
 	}
+	/**
+	* 获取指定节点所属的页面 / 页面片：
+	* - 普通节点返回其所在的 page；
+	* - 节点本身就是 page / pageFragment 时返回它自己；
+	* - 找不到时返回 null。
+	* 供 `change` 事件携带「变更节点对应的 page」（而非编辑器当前选中页）。
+	*/
+	getPageOfNode(id) {
+		const { node, page } = this.getNodeInfo(id, false);
+		if (page) return page;
+		if (node && isPageOrFragment(node)) return node;
+		return null;
+	}
 	captureSelectionBeforeOp() {
 		if (this.selectionBeforeOp) return;
 		this.selectionBeforeOp = this.get("nodes").map((n) => n.id);
+		this.invalidNodeIdsBeforeOp = new Map(this.get("invalidNodeIds"));
 	}
 	/**
 	* 比较「上一次 root」与「新 root」的页面 / 页面片，按页面粒度把整体替换拆成历史记录：
@@ -1082,24 +1263,35 @@ var Editor = class extends BaseService {
 		const prevMap = new Map(prevPages.map((p) => [`${p.id}`, p]));
 		const nextMap = new Map(nextPages.map((p) => [`${p.id}`, p]));
 		const indexInItems = (root, id) => (root.items ?? []).findIndex((item) => `${item.id}` === `${id}`);
+		const addedPages = [];
+		const removedPages = [];
 		nextPages.forEach((nextPage) => {
 			const prevPage = prevMap.get(`${nextPage.id}`);
-			if (!prevPage) this.pushPageDiffStep("add", nextPage, {
-				newSchema: cloneDeep$1(toRaw(nextPage)),
-				parentId: nextRoot.id,
-				index: indexInItems(nextRoot, nextPage.id)
-			}, source);
-			else if (!isEqual(toRaw(prevPage), toRaw(nextPage))) this.pushPageDiffStep("update", nextPage, {
+			if (!prevPage) {
+				this.pushPageDiffStep("add", nextPage, {
+					newSchema: cloneDeep$1(toRaw(nextPage)),
+					parentId: nextRoot.id,
+					index: indexInItems(nextRoot, nextPage.id)
+				}, source);
+				addedPages.push(nextPage);
+			} else if (!isEqual(toRaw(prevPage), toRaw(nextPage))) this.pushPageDiffStep("update", nextPage, {
 				oldSchema: cloneDeep$1(toRaw(prevPage)),
 				newSchema: cloneDeep$1(toRaw(nextPage))
 			}, source);
 		});
 		prevPages.forEach((prevPage) => {
-			if (!nextMap.has(`${prevPage.id}`)) this.pushPageDiffStep("remove", prevPage, {
-				oldSchema: cloneDeep$1(toRaw(prevPage)),
-				parentId: preRoot.id,
-				index: indexInItems(preRoot, prevPage.id)
-			}, source);
+			if (!nextMap.has(`${prevPage.id}`)) {
+				this.pushPageDiffStep("remove", prevPage, {
+					oldSchema: cloneDeep$1(toRaw(prevPage)),
+					parentId: preRoot.id,
+					index: indexInItems(preRoot, prevPage.id)
+				}, source);
+				removedPages.push(prevPage);
+			}
+		});
+		if (addedPages.length || removedPages.length) history_default.notifyPageStructureChange({
+			add: addedPages,
+			remove: removedPages
 		});
 	}
 	/**
@@ -1117,41 +1309,50 @@ var Editor = class extends BaseService {
 				id: page.id
 			},
 			opType,
-			selectedBefore: [],
-			selectedAfter: [],
-			modifiedNodeIds: /* @__PURE__ */ new Map(),
+			extra: {
+				selectedBefore: [],
+				selectedAfter: [],
+				modifiedNodeIds: /* @__PURE__ */ new Map()
+			},
 			diff: [diffItem],
 			rootStep: true
 		};
 		if (source) step.source = source;
 		const top = history_default.getCurrentPageStep(page.id);
-		if (top?.rootStep && top.source === source) history_default.replaceCurrentPageStep(step, page.id);
-		else history_default.push(step, page.id);
+		if (top?.rootStep && top.source === source) history_default.replaceCurrentStep("page", step, page.id);
+		else history_default.push("page", step, page.id);
 	}
 	pushOpHistory(opType, { diff, pageData, historyDescription, source }) {
 		const step = {
 			uuid: guid(),
 			data: pageData,
 			opType,
-			selectedBefore: this.selectionBeforeOp ?? [],
-			selectedAfter: this.get("nodes").map((n) => n.id),
-			modifiedNodeIds: new Map(this.get("modifiedNodeIds")),
+			extra: {
+				selectedBefore: this.selectionBeforeOp ?? [],
+				selectedAfter: this.get("nodes").map((n) => n.id),
+				modifiedNodeIds: new Map(this.get("modifiedNodeIds")),
+				invalidNodeIdsBefore: new Map(this.invalidNodeIdsBeforeOp ?? this.get("invalidNodeIds")),
+				invalidNodeIdsAfter: new Map(this.get("invalidNodeIds"))
+			},
 			diff
 		};
 		if (historyDescription) step.historyDescription = historyDescription;
 		if (source) step.source = source;
-		const historyId = history_default.push(step, pageData.id) ? step.uuid : null;
+		const historyId = history_default.push("page", step, pageData.id) ? step.uuid : null;
 		this.lastPushedHistoryId = historyId;
 		this.selectionBeforeOp = null;
+		this.invalidNodeIdsBeforeOp = null;
 		return historyId;
 	}
 	/**
 	* 应用历史操作（撤销 / 重做）
 	*
-	* 所有 DSL 修改都走 `editor.add / remove / update`，并通过 `doNotPushHistory` 阻止再次入栈、
-	* `doNotSelect / doNotSwitchPage` 让选区由方法末尾的统一逻辑兜底。
+	* 删除 / 更新类修改走 `editor.remove / update`，并通过 `doNotPushHistory` 阻止再次入栈、
+	* `doNotSelect / doNotSwitchPage` 让选区由方法末尾的统一逻辑兜底；
+	* 「重新插回节点」（撤销 remove / 重做 add）需按 step 记录的 parentId / index 精确还原，
+	* 不走 this.add，由手工 splice + stage.add 完成后补发等价的 add / change 事件（见 emitHistoryInsertEvents）。
 	*
-	* 注意：这些公开方法会发出 add / remove / update 事件，业务侧若需要区分"用户操作"与"撤销重做触发"，
+	* 注意：这些路径都会发出 add / remove / update / change 事件，业务侧若需要区分"用户操作"与"撤销重做触发"，
 	* 请监听 `history-change` 事件配合判断。
 	*
 	* @param step 操作记录
@@ -1165,7 +1366,8 @@ var Editor = class extends BaseService {
 		const commonOpts = {
 			doNotSelect: true,
 			doNotSwitchPage: true,
-			doNotPushHistory: true
+			doNotPushHistory: true,
+			historySource: step.source
 		};
 		switch (step.opType) {
 			case "add": {
@@ -1177,20 +1379,25 @@ var Editor = class extends BaseService {
 				}
 				else {
 					const sorted = [...items].sort((a, b) => (a.index ?? 0) - (b.index ?? 0));
+					const addedNodes = [];
 					for (const { newSchema, parentId, index } of sorted) {
 						if (!newSchema || parentId === void 0) continue;
 						const parent = this.getNodeById(parentId, false);
 						if (parent?.items) {
-							if (typeof index === "number" && index >= 0 && index < parent.items.length) parent.items.splice(index, 0, cloneDeep$1(newSchema));
-							else parent.items.push(cloneDeep$1(newSchema));
+							const addedNode = cloneDeep$1(newSchema);
+							const insertIndex = clampIndex(index, parent.items.length);
+							parent.items.splice(insertIndex, 0, addedNode);
+							addedNodes.push(addedNode);
 							await stage?.add({
 								config: cloneDeep$1(newSchema),
 								parent: cloneDeep$1(parent),
 								parentId: parent.id,
-								root: cloneDeep$1(root)
+								root: cloneDeep$1(root),
+								index: insertIndex
 							});
 						}
 					}
+					this.emitHistoryInsertEvents(addedNodes, step.source);
 				}
 				break;
 			}
@@ -1198,19 +1405,25 @@ var Editor = class extends BaseService {
 				const items = step.diff ?? [];
 				if (reverse) {
 					const sorted = [...items].sort((a, b) => (a.index ?? 0) - (b.index ?? 0));
+					const addedNodes = [];
 					for (const { oldSchema, parentId, index } of sorted) {
 						if (!oldSchema || parentId === void 0) continue;
 						const parent = this.getNodeById(parentId, false);
 						if (parent?.items) {
-							parent.items.splice(index ?? parent.items.length, 0, cloneDeep$1(oldSchema));
+							const addedNode = cloneDeep$1(oldSchema);
+							const insertIndex = clampIndex(index, parent.items.length);
+							parent.items.splice(insertIndex, 0, addedNode);
+							addedNodes.push(addedNode);
 							await stage?.add({
 								config: cloneDeep$1(oldSchema),
 								parent: cloneDeep$1(parent),
 								parentId,
-								root: cloneDeep$1(root)
+								root: cloneDeep$1(root),
+								index: insertIndex
 							});
 						}
 					}
+					this.emitHistoryInsertEvents(addedNodes, step.source);
 				} else for (const { oldSchema } of items) {
 					if (!oldSchema) continue;
 					const existing = this.getNodeById(oldSchema.id, false);
@@ -1237,14 +1450,20 @@ var Editor = class extends BaseService {
 					}
 					return cloneDeep$1(reverse ? oldNode : newNode);
 				});
-				if (configs.length) await this.update(configs, { doNotPushHistory: true });
+				if (configs.length) await this.update(configs, {
+					doNotPushHistory: true,
+					historySource: step.source
+				});
 				break;
 			}
 		}
-		this.set("modifiedNodeIds", step.modifiedNodeIds);
+		this.set("modifiedNodeIds", step.extra?.modifiedNodeIds ?? /* @__PURE__ */ new Map());
+		const invalidToRestore = (reverse ? step.extra?.invalidNodeIdsBefore : step.extra?.invalidNodeIdsAfter) ?? /* @__PURE__ */ new Map();
+		this.set("invalidNodeIds", new Map(invalidToRestore));
+		this.emit("invalid-node-change", this.get("invalidNodeIds"));
 		const page = toRaw(this.get("page"));
 		if (page) {
-			const selectIds = reverse ? step.selectedBefore : step.selectedAfter;
+			const selectIds = (reverse ? step.extra?.selectedBefore : step.extra?.selectedAfter) ?? [];
 			setTimeout(() => {
 				if (!selectIds.length) return;
 				if (selectIds.length > 1) {
@@ -1258,6 +1477,23 @@ var Editor = class extends BaseService {
 	selectedConfigExceptionHandler(config) {
 		return resolveSelectedNode(config, (id) => this.getNodeInfo(id), this.state.root?.id);
 	}
+	/**
+	* 撤销 remove / 重做 add 通过手工 splice 按 step 记录的 parentId / index 精确还原节点（不走 this.add，原因见调用处注释），
+	* 这里补齐与 this.add 等价的 add / change 事件，保证撤销/重做路径的事件行为与正向操作一致。
+	*/
+	emitHistoryInsertEvents(nodes, source) {
+		if (!nodes.length) return;
+		this.emit("add", nodes);
+		this.emit("change", {
+			type: "add",
+			data: nodes.map((node) => ({
+				node,
+				page: this.getPageOfNode(node.id)
+			})),
+			historySource: source,
+			doNotPushHistory: true
+		});
+	}
 };
 var editor_default = new Editor();
 //#endregion