@tmagic/editor 1.7.14-beta.3 → 1.8.0-beta.1

package/dist/es/fields/DataSourceFieldSelect/Index.vue_vue_type_script_setup_true_lang.js

@@ -95,6 +95,10 @@ var Index_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ defineCo
 				emit("change", [dsId], eventData);
 			}
 		};
+		const onToggleDataSourceFieldSelectHandler = () => {
+			if (props.disabled || mForm?.isCompare) return;
+			showDataSourceFieldSelect.value = !showDataSourceFieldSelect.value;
+		};
 		return (_ctx, _cache) => {
 			return openBlock(), createElementBlock("div", _hoisted_1, [!disabledDataSource.value && (showDataSourceFieldSelect.value || !__props.config.fieldConfig) ? (openBlock(), createBlock(FieldSelect_default, {
 				key: 0,
@@ -144,11 +148,16 @@ var Index_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ defineCo
 				default: withCtx(() => [createVNode(unref(TMagicButton), {
 					type: showDataSourceFieldSelect.value ? "primary" : "default",
 					size: __props.size,
-					onClick: _cache[0] || (_cache[0] = ($event) => showDataSourceFieldSelect.value = !showDataSourceFieldSelect.value)
+					disabled: __props.disabled || unref(mForm)?.isCompare,
+					onClick: onToggleDataSourceFieldSelectHandler
 				}, {
 					default: withCtx(() => [createVNode(Icon_default, { icon: unref(Coin) }, null, 8, ["icon"])]),
 					_: 1
-				}, 8, ["type", "size"])]),
+				}, 8, [
+					"type",
+					"size",
+					"disabled"
+				])]),
 				_: 1
 			}, 8, ["disabled"])) : createCommentVNode("v-if", true)]);
 		};

package/dist/es/fields/StyleSetter/Index.vue_vue_type_script_setup_true_lang.js

@@ -24,7 +24,7 @@ var Index_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ defineCo
 		lastValues: {},
 		isCompare: { type: Boolean }
 	},
-	emits: ["change"],
+	emits: ["change", "addDiffCount"],
 	setup(__props, { emit: __emit }) {
 		const props = __props;
 		const emit = __emit;
@@ -63,6 +63,7 @@ var Index_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ defineCo
 			});
 			emit("change", v, eventData);
 		};
+		const onAddDiffCount = () => emit("addDiffCount");
 		return (_ctx, _cache) => {
 			return openBlock(), createBlock(unref(TMagicCollapse), {
 				class: "m-fields-style-setter",
@@ -78,11 +79,16 @@ var Index_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ defineCo
 						default: withCtx(() => [item.component ? (openBlock(), createBlock(resolveDynamicComponent(item.component), {
 							key: 0,
 							values: __props.model[__props.name],
+							"last-values": __props.lastValues?.[__props.name],
+							"is-compare": __props.isCompare,
 							size: __props.size,
 							disabled: __props.disabled,
-							onChange: change
+							onChange: change,
+							onAddDiffCount
 						}, null, 40, [
 							"values",
+							"last-values",
+							"is-compare",
 							"size",
 							"disabled"
 						])) : createCommentVNode("v-if", true)]),

package/dist/es/fields/StyleSetter/components/Border.vue_vue_type_script_setup_true_lang.js

@@ -11,10 +11,12 @@ var Border_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ defineC
 	__name: "Border",
 	props: {
 		model: {},
+		lastValues: {},
+		isCompare: { type: Boolean },
 		disabled: { type: Boolean },
 		size: {}
 	},
-	emits: ["change"],
+	emits: ["change", "addDiffCount"],
 	setup(__props, { emit: __emit }) {
 		const direction = ref("");
 		const config = computed(() => defineFormItem({ items: [
@@ -57,6 +59,7 @@ var Border_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ defineC
 				emit("change", record.value, { modifyKey: record.propPath });
 			});
 		};
+		const onAddDiffCount = () => emit("addDiffCount");
 		return (_ctx, _cache) => {
 			return openBlock(), createElementBlock("div", _hoisted_1, [createElementVNode("div", _hoisted_2, [
 				createElementVNode("div", _hoisted_3, [createElementVNode("div", {
@@ -84,12 +87,17 @@ var Border_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ defineC
 			]), createElementVNode("div", _hoisted_6, [createVNode(unref(MContainer), {
 				config: config.value,
 				model: __props.model,
+				"last-values": __props.lastValues,
+				"is-compare": __props.isCompare,
 				size: __props.size,
 				disabled: __props.disabled,
-				onChange: change
+				onChange: change,
+				onAddDiffCount
 			}, null, 8, [
 				"config",
 				"model",
+				"last-values",
+				"is-compare",
 				"size",
 				"disabled"
 			])])]);

package/dist/es/fields/StyleSetter/components/Box.vue_vue_type_script_setup_true_lang.js

@@ -17,7 +17,9 @@ var Box_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ defineComp
 	props: {
 		disabled: { type: Boolean },
 		size: {},
-		model: {}
+		model: {},
+		lastValues: {},
+		isCompare: { type: Boolean }
 	},
 	emits: ["change"],
 	setup(__props, { emit: __emit }) {

package/dist/es/fields/StyleSetter/pro/Background.vue_vue_type_script_setup_true_lang.js

@@ -10,10 +10,12 @@ var Background_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ def
 	__name: "Background",
 	props: {
 		values: {},
+		lastValues: {},
+		isCompare: { type: Boolean },
 		disabled: { type: Boolean },
 		size: {}
 	},
-	emits: ["change"],
+	emits: ["change", "addDiffCount"],
 	setup(__props, { emit: __emit }) {
 		const emit = __emit;
 		const config = defineFormItem({ items: [
@@ -95,16 +97,22 @@ var Background_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ def
 		const change = (value, eventData) => {
 			emit("change", value, eventData);
 		};
+		const onAddDiffCount = () => emit("addDiffCount");
 		return (_ctx, _cache) => {
 			return openBlock(), createBlock(unref(MContainer), {
 				config: unref(config),
 				model: __props.values,
+				"last-values": __props.lastValues,
+				"is-compare": __props.isCompare,
 				size: __props.size,
 				disabled: __props.disabled,
-				onChange: change
+				onChange: change,
+				onAddDiffCount
 			}, null, 8, [
 				"config",
 				"model",
+				"last-values",
+				"is-compare",
 				"size",
 				"disabled"
 			]);

package/dist/es/fields/StyleSetter/pro/Border.vue_vue_type_script_setup_true_lang.js

@@ -6,10 +6,12 @@ var Border_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ defineC
 	__name: "Border",
 	props: {
 		values: {},
+		lastValues: {},
+		isCompare: { type: Boolean },
 		disabled: { type: Boolean },
 		size: {}
 	},
-	emits: ["change"],
+	emits: ["change", "addDiffCount"],
 	setup(__props, { emit: __emit }) {
 		const emit = __emit;
 		const config = defineFormItem({ items: [{
@@ -22,25 +24,36 @@ var Border_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ defineC
 		const change = (value, eventData) => {
 			emit("change", value, eventData);
 		};
+		const onAddDiffCount = () => emit("addDiffCount");
 		return (_ctx, _cache) => {
 			return openBlock(), createElementBlock(Fragment, null, [createVNode(unref(MContainer), {
 				config: unref(config),
 				model: __props.values,
+				"last-values": __props.lastValues,
+				"is-compare": __props.isCompare,
 				size: __props.size,
 				disabled: __props.disabled,
-				onChange: change
+				onChange: change,
+				onAddDiffCount
 			}, null, 8, [
 				"config",
 				"model",
+				"last-values",
+				"is-compare",
 				"size",
 				"disabled"
 			]), createVNode(Border_default, {
 				model: __props.values,
+				"last-values": __props.lastValues,
+				"is-compare": __props.isCompare,
 				size: __props.size,
 				disabled: __props.disabled,
-				onChange: change
+				onChange: change,
+				onAddDiffCount
 			}, null, 8, [
 				"model",
+				"last-values",
+				"is-compare",
 				"size",
 				"disabled"
 			])], 64);

package/dist/es/fields/StyleSetter/pro/Font.vue_vue_type_script_setup_true_lang.js

@@ -8,10 +8,12 @@ var Font_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ defineCom
 	__name: "Font",
 	props: {
 		values: {},
+		lastValues: {},
+		isCompare: { type: Boolean },
 		disabled: { type: Boolean },
 		size: {}
 	},
-	emits: ["change"],
+	emits: ["change", "addDiffCount"],
 	setup(__props, { emit: __emit }) {
 		const emit = __emit;
 		const config = defineFormItem({ items: [
@@ -79,16 +81,22 @@ var Font_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ defineCom
 		const change = (value, eventData) => {
 			emit("change", value, eventData);
 		};
+		const onAddDiffCount = () => emit("addDiffCount");
 		return (_ctx, _cache) => {
 			return openBlock(), createBlock(unref(MContainer), {
 				config: unref(config),
 				model: __props.values,
+				"last-values": __props.lastValues,
+				"is-compare": __props.isCompare,
 				size: __props.size,
 				disabled: __props.disabled,
-				onChange: change
+				onChange: change,
+				onAddDiffCount
 			}, null, 8, [
 				"config",
 				"model",
+				"last-values",
+				"is-compare",
 				"size",
 				"disabled"
 			]);

package/dist/es/fields/StyleSetter/pro/Layout.vue_vue_type_script_setup_true_lang.js

@@ -20,10 +20,12 @@ var Layout_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ defineC
 	__name: "Layout",
 	props: {
 		values: {},
+		lastValues: {},
+		isCompare: { type: Boolean },
 		disabled: { type: Boolean },
 		size: {}
 	},
-	emits: ["change"],
+	emits: ["change", "addDiffCount"],
 	setup(__props, { emit: __emit }) {
 		const emit = __emit;
 		const config = defineFormItem({ items: [
@@ -259,25 +261,35 @@ var Layout_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ defineC
 		const change = (value, eventData) => {
 			emit("change", value, eventData);
 		};
+		const onAddDiffCount = () => emit("addDiffCount");
 		return (_ctx, _cache) => {
 			return openBlock(), createElementBlock(Fragment, null, [createVNode(unref(MContainer), {
 				config: unref(config),
 				model: __props.values,
+				"last-values": __props.lastValues,
+				"is-compare": __props.isCompare,
 				size: __props.size,
 				disabled: __props.disabled,
-				onChange: change
+				onChange: change,
+				onAddDiffCount
 			}, null, 8, [
 				"config",
 				"model",
+				"last-values",
+				"is-compare",
 				"size",
 				"disabled"
 			]), withDirectives(createVNode(Box_default, {
 				model: __props.values,
+				"last-values": __props.lastValues,
+				"is-compare": __props.isCompare,
 				size: __props.size,
 				disabled: __props.disabled,
 				onChange: change
 			}, null, 8, [
 				"model",
+				"last-values",
+				"is-compare",
 				"size",
 				"disabled"
 			]), [[vShow, !["fixed", "absolute"].includes(__props.values.position)]])], 64);

package/dist/es/fields/StyleSetter/pro/Position.vue_vue_type_script_setup_true_lang.js

@@ -5,10 +5,12 @@ var Position_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ defin
 	__name: "Position",
 	props: {
 		values: {},
+		lastValues: {},
+		isCompare: { type: Boolean },
 		disabled: { type: Boolean },
 		size: {}
 	},
-	emits: ["change"],
+	emits: ["change", "addDiffCount"],
 	setup(__props, { emit: __emit }) {
 		const props = __props;
 		const emit = __emit;
@@ -76,16 +78,22 @@ var Position_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ defin
 		const change = (value, eventData) => {
 			emit("change", value, eventData);
 		};
+		const onAddDiffCount = () => emit("addDiffCount");
 		return (_ctx, _cache) => {
 			return openBlock(), createBlock(unref(MContainer), {
 				config: unref(config),
 				model: __props.values,
+				"last-values": __props.lastValues,
+				"is-compare": __props.isCompare,
 				size: __props.size,
 				disabled: __props.disabled,
-				onChange: change
+				onChange: change,
+				onAddDiffCount
 			}, null, 8, [
 				"config",
 				"model",
+				"last-values",
+				"is-compare",
 				"size",
 				"disabled"
 			]);

package/dist/es/fields/StyleSetter/pro/Transform.vue_vue_type_script_setup_true_lang.js

@@ -5,10 +5,12 @@ var Transform_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ defi
 	__name: "Transform",
 	props: {
 		values: {},
+		lastValues: {},
+		isCompare: { type: Boolean },
 		disabled: { type: Boolean },
 		size: {}
 	},
-	emits: ["change"],
+	emits: ["change", "addDiffCount"],
 	setup(__props, { emit: __emit }) {
 		const emit = __emit;
 		const config = defineFormItem({ items: [{
@@ -34,16 +36,22 @@ var Transform_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ defi
 		const change = (value, eventData) => {
 			emit("change", value, eventData);
 		};
+		const onAddDiffCount = () => emit("addDiffCount");
 		return (_ctx, _cache) => {
 			return openBlock(), createBlock(unref(MContainer), {
 				config: unref(config),
 				model: __props.values,
+				"last-values": __props.lastValues,
+				"is-compare": __props.isCompare,
 				size: __props.size,
 				disabled: __props.disabled,
-				onChange: change
+				onChange: change,
+				onAddDiffCount
 			}, null, 8, [
 				"config",
 				"model",
+				"last-values",
+				"is-compare",
 				"size",
 				"disabled"
 			]);

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

@@ -74,7 +74,7 @@ var FormPanel_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ defi
 				createVNode(unref(TMagicScrollbar), null, {
 					default: withCtx(() => [createVNode(unref(MForm), {
 						ref: "configForm",
-						class: normalizeClass(propsPanelSize.value),
+						class: normalizeClass([propsPanelSize.value, "m-editor-props-form-panel-form"]),
 						"popper-class": `m-editor-props-panel-popper ${propsPanelSize.value}`,
 						"label-width": __props.labelWidth,
 						"label-position": __props.labelPosition,

package/dist/es/layouts/sidebar/layer/use-node-status.js

@@ -27,10 +27,43 @@ var useNodeStatus = ({ editorService }) => {
 	const nodeStatusMaps = ref(/* @__PURE__ */ new Map());
 	/** 当前页面的节点状态 */
 	const nodeStatusMap = computed(() => page.value ? nodeStatusMaps.value.get(page.value.id) : /* @__PURE__ */ new Map());
-	watch(() => page.value?.id, (pageId) => {
-		if (!pageId) return;
-		nodeStatusMaps.value.set(pageId, createPageNodeStatus(page.value, nodeStatusMaps.value.get(pageId)));
+	watch(page, (newPage) => {
+		if (!newPage?.id) return;
+		nodeStatusMaps.value.set(newPage.id, createPageNodeStatus(newPage, nodeStatusMaps.value.get(newPage.id)));
 	}, { immediate: true });
+	/**
+	* root 整体被替换时（外部 modelValue 变化、历史版本恢复、套件编辑模式进入/退出等）：
+	* - 仅 watch page 引用还不够，因为 root-change 同步触发时 page 还是旧引用，
+	*   等 initService 的异步 IIFE 跑完 editorService.select(...) 后 page 才会
+	*   被替换为新 dsl 中的 page；此时上面的 page watch 才会触发重建。
+	* - 但若直接同步清空 nodeStatusMaps，会让 nodeStatusMap (computed) 立刻变
+	*   undefined。上层 LayerPanel 用 `v-if="page && nodeStatusMap"` 渲染组件树，
+	*   会瞬间销毁整个面板；若紧接着的异步 select 链路（套件退出等场景）发生
+	*   竞态、page 引用未变 / 解析失败，watch(page) 不触发重建，组件树就再也回
+	*   不来。
+	* - 此外「污染」问题本质来自 createPageNodeStatus 用旧 status 作为新节点
+	*   initial 值：只要新 root 的 page 是新引用，watch(page) 会触发重建，重建
+	*   时基于新 page.items 生成的 map 只会包含新节点 id；旧节点 id 即便残留在
+	*   initialLayerNodeStatus 中也不会被写入新 map。真正的风险只有「同一 page
+	*   id 下，新旧 dsl 都存在同一节点 id 但其实是不同节点」这种极端情况——这
+	*   在常规业务中不会发生（id 是 uuid）。
+	*
+	* 综合：root-change 时仅清理「在新 root 中已不存在的 page id」对应缓存，
+	* 保留仍然有效的 page status 不动；既避免 v-if 闪断，也不会保留无关 page 的
+	* 死缓存。同 page id 的重建交给下方 watch(page) 触发。
+	*/
+	const rootChangeHandler = (value) => {
+		if (!value) {
+			nodeStatusMaps.value = /* @__PURE__ */ new Map();
+			return;
+		}
+		const validPageIds = /* @__PURE__ */ new Set();
+		(value.items || []).forEach((p) => {
+			if (p?.id !== void 0) validPageIds.add(p.id);
+		});
+		for (const cachedPageId of Array.from(nodeStatusMaps.value.keys())) if (!validPageIds.has(cachedPageId)) nodeStatusMaps.value.delete(cachedPageId);
+	};
+	editorService.on("root-change", rootChangeHandler);
 	watch(nodes, (nodes) => {
 		if (!nodeStatusMap.value) return;
 		for (const [id, status] of nodeStatusMap.value.entries()) {
@@ -63,6 +96,7 @@ var useNodeStatus = ({ editorService }) => {
 	};
 	editorService.on("remove", removeHandler);
 	onBeforeUnmount(() => {
+		editorService.off("root-change", rootChangeHandler);
 		editorService.off("remove", removeHandler);
 		editorService.off("add", addHandler);
 	});

package/dist/es/services/editor.js

@@ -121,6 +121,19 @@ var Editor = class extends BaseService_default {
 		return parent;
 	}
 	/**
+	* 判断给定节点是否位于非当前页面（即选中该节点将会引起当前页面切换）
+	* @param node 节点
+	* @returns true 表示该节点位于非当前页面
+	*/
+	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}`;
+		const nodePage = this.getNodeInfo(node.id, false).page;
+		if (!nodePage) return false;
+		return `${nodePage.id}` !== `${currentPageId}`;
+	}
+	/**
 	* 只有容器拥有布局
 	*/
 	async getLayout(parent, node) {
@@ -241,11 +254,12 @@ var Editor = class extends BaseService_default {
 	* @param parent 要添加到的容器组件节点配置，如果不设置，默认为当前选中的组件的父节点
 	* @param options 可选配置
 	* @param options.doNotSelect 添加后是否不更新当前选中节点（默认 false，添加后会选中新增的节点）
+	* @param options.doNotSwitchPage 添加后是否不切换当前页面（默认 false；新增页面 / 跨页新增时为 true 会跳过会引发页面切换的选中操作）
 	* @returns 添加后的节点
 	*/
 	async add(addNode, parent, options) {
 		const safeParentNode = safeParent(parent);
-		const { doNotSelect = false } = safeOptions(options);
+		const { doNotSelect = false, doNotSwitchPage = false } = safeOptions(options);
 		this.captureSelectionBeforeOp();
 		const stage = this.get("stage");
 		const addNodes = [];
@@ -262,16 +276,19 @@ var Editor = class extends BaseService_default {
 			return this.doAdd(node, parentNode);
 		}));
 		if (newNodes.length > 1) {
-			if (!doNotSelect) {
+			const wouldSwitchPage = newNodes.some((n) => this.isOnDifferentPage(n));
+			if (!doNotSelect && !(doNotSwitchPage && wouldSwitchPage)) {
 				const newNodeIds = newNodes.map((node) => node.id);
 				stage?.multiSelect(newNodeIds);
 				await this.multiSelect(newNodeIds);
 			}
 		} else {
-			if (!doNotSelect) await this.select(newNodes[0]);
+			const wouldSwitchPage = this.isOnDifferentPage(newNodes[0]);
+			const skipSelect = doNotSelect || doNotSwitchPage && wouldSwitchPage;
+			if (!skipSelect) await this.select(newNodes[0]);
 			if (isPage(newNodes[0])) this.state.pageLength += 1;
 			else if (isPageFragment(newNodes[0])) this.state.pageFragmentLength += 1;
-			else if (!doNotSelect) stage?.select(newNodes[0].id);
+			else if (!skipSelect) stage?.select(newNodes[0].id);
 		}
 		if (!(isPage(newNodes[0]) || isPageFragment(newNodes[0]))) {
 			const pageForOp = this.getNodeInfo(newNodes[0].id, false).page;
@@ -291,7 +308,7 @@ var Editor = class extends BaseService_default {
 		return Array.isArray(addNode) ? newNodes : newNodes[0];
 	}
 	async doRemove(node, options) {
-		const { doNotSelect = false } = safeOptions(options);
+		const { doNotSelect = false, doNotSwitchPage = false } = safeOptions(options);
 		const root = this.get("root");
 		if (!root) throw new Error("root不能为空");
 		const { parent, node: curNode } = this.getNodeInfo(node.id, false);
@@ -305,18 +322,16 @@ var Editor = class extends BaseService_default {
 			parentId: parent.id,
 			root: cloneDeep(root)
 		});
-		if (doNotSelect) {
-			const selectedNodes = this.get("nodes");
-			const removedSelectedIndex = selectedNodes.findIndex((n) => `${n.id}` === `${node.id}`);
-			if (removedSelectedIndex !== -1) {
-				const nextSelected = [...selectedNodes];
-				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 selectedNodes = this.get("nodes");
+		const removedSelectedIndex = selectedNodes.findIndex((n) => `${n.id}` === `${node.id}`);
+		if (removedSelectedIndex !== -1) {
+			const nextSelected = [...selectedNodes];
+			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]) {
@@ -330,10 +345,10 @@ var Editor = class extends BaseService_default {
 		const rootItems = root.items || [];
 		if (isPage(node)) {
 			this.state.pageLength -= 1;
-			if (!doNotSelect) await selectDefault(rootItems);
+			if (!doNotSelect && !doNotSwitchPage) await selectDefault(rootItems);
 		} else if (isPageFragment(node)) {
 			this.state.pageFragmentLength -= 1;
-			if (!doNotSelect) await selectDefault(rootItems);
+			if (!doNotSelect && !doNotSwitchPage) await selectDefault(rootItems);
 		} else {
 			if (!doNotSelect) {
 				await this.select(parent);
@@ -351,9 +366,10 @@ var Editor = class extends BaseService_default {
 	* @param {Object} node 要删除的节点或节点集合
 	* @param options 可选配置
 	* @param options.doNotSelect 删除后是否不更新当前选中节点（默认 false，删除后会选中父节点或首个页面）
+	* @param options.doNotSwitchPage 删除后是否不切换当前页面（默认 false；删除页面 / 页面片段时为 true 会跳过自动切换到首个剩余页面）
 	*/
 	async remove(nodeOrNodeList, options) {
-		const { doNotSelect = false } = safeOptions(options);
+		const { doNotSelect = false, doNotSwitchPage = false } = safeOptions(options);
 		this.captureSelectionBeforeOp();
 		const nodes = Array.isArray(nodeOrNodeList) ? nodeOrNodeList : [nodeOrNodeList];
 		const removedItems = [];
@@ -373,7 +389,10 @@ var Editor = class extends BaseService_default {
 				});
 			}
 		}
-		await Promise.all(nodes.map((node) => this.doRemove(node, { doNotSelect })));
+		await Promise.all(nodes.map((node) => this.doRemove(node, {
+			doNotSelect,
+			doNotSwitchPage
+		})));
 		if (removedItems.length > 0 && pageForOp) this.pushOpHistory("remove", { removedItems }, pageForOp);
 		this.emit("remove", nodes);
 	}
@@ -410,7 +429,10 @@ var Editor = class extends BaseService_default {
 			selectedNodes.splice(targetIndex, 1, newConfig);
 			this.set("nodes", [...selectedNodes]);
 		}
-		if (isPage(newConfig) || isPageFragment(newConfig)) this.set("page", newConfig);
+		if (isPage(newConfig) || isPageFragment(newConfig)) {
+			const currentPage = this.get("page");
+			if (currentPage && `${currentPage.id}` === `${newConfig.id}`) this.set("page", newConfig);
+		}
 		this.addModifiedNodeId(newConfig.id);
 		return {
 			oldNode: node,
@@ -451,6 +473,7 @@ var Editor = class extends BaseService_default {
 	* @param id2 组件ID
 	* @param options 可选配置
 	* @param options.doNotSelect 排序后是否不更新当前选中节点（默认 false）
+	* @param options.doNotSwitchPage 排序后是否不切换当前页面（排序只发生在同一父节点内，方法内为空操作；保留以与其它 DSL 操作 API 一致）
 	* @returns void
 	*/
 	async sort(id1, id2, options) {
@@ -498,10 +521,11 @@ var Editor = class extends BaseService_default {
 	* @param collectorOptions 可选的依赖收集器配置
 	* @param options 可选配置
 	* @param options.doNotSelect 粘贴后是否不更新当前选中节点（默认 false）
+	* @param options.doNotSwitchPage 粘贴后是否不切换当前页面（默认 false；跨页粘贴时为 true 会跳过页面切换）
 	* @returns 添加后的组件节点配置
 	*/
 	async paste(position = {}, collectorOptions, options) {
-		const { doNotSelect = false } = safeOptions(options);
+		const { doNotSelect = false, doNotSwitchPage = false } = safeOptions(options);
 		const config = storage_default.getItem(COPY_STORAGE_KEY);
 		if (!Array.isArray(config)) return;
 		const node = this.get("node");
@@ -512,7 +536,10 @@ var Editor = class extends BaseService_default {
 		}
 		const pasteConfigs = await this.doPaste(config, position);
 		if (collectorOptions && typeof collectorOptions.isTarget === "function") props_default.replaceRelateId(config, pasteConfigs, collectorOptions);
-		return this.add(pasteConfigs, parent, { doNotSelect });
+		return this.add(pasteConfigs, parent, {
+			doNotSelect,
+			doNotSwitchPage
+		});
 	}
 	async doPaste(config, position = {}) {
 		props_default.clearRelateId();
@@ -535,6 +562,7 @@ var Editor = class extends BaseService_default {
 	* @param config 组件节点配置
 	* @param options 可选配置
 	* @param options.doNotSelect 居中后是否不更新当前选中节点（默认 false）
+	* @param options.doNotSwitchPage 居中后是否不切换当前页面（居中只更新节点 style，方法内为空操作；保留以与其它 DSL 操作 API 一致）
 	* @returns 当前组件节点配置
 	*/
 	async alignCenter(config, options) {
@@ -590,9 +618,10 @@ var Editor = class extends BaseService_default {
 	* @param targetId 容器ID
 	* @param options 可选配置
 	* @param options.doNotSelect 移动后是否不更新当前选中节点（默认 false）
+	* @param options.doNotSwitchPage 移动后是否不切换当前页面（默认 false；目标容器位于其它页面时为 true 会跳过自动选中以避免页面切换）
 	*/
 	async moveToContainer(config, targetId, options) {
-		const { doNotSelect = false } = safeOptions(options);
+		const { doNotSelect = false, doNotSwitchPage = false } = safeOptions(options);
 		this.captureSelectionBeforeOp();
 		const root = this.get("root");
 		const { node, parent, page: pageForOp } = this.getNodeInfo(config.id, false);
@@ -614,14 +643,16 @@ var Editor = class extends BaseService_default {
 			});
 			newConfig.style = getInitPositionStyle(newConfig.style, layout);
 			target.items.push(newConfig);
-			if (!doNotSelect) await stage.select(targetId);
+			const targetWouldSwitchPage = this.isOnDifferentPage(target);
+			const skipSelect = doNotSelect || doNotSwitchPage && targetWouldSwitchPage;
+			if (!skipSelect) await stage.select(targetId);
 			const targetParent = this.getParentById(target.id);
 			await stage.update({
 				config: cloneDeep(target),
 				parentId: targetParent?.id,
 				root: cloneDeep(root)
 			});
-			if (!doNotSelect) {
+			if (!skipSelect) {
 				await this.select(newConfig);
 				stage.select(newConfig.id);
 			}