@tmagic/editor 1.8.0-beta.20 → 1.8.0-beta.22

package/dist/es/fields/EventSelect.vue_vue_type_script_setup_true_lang.js

@@ -173,7 +173,7 @@ var EventSelect_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defi
 					name: "name",
 					label: "事件名",
 					type: eventNameConfig.value.type,
-					options: (mForm, { formValue }) => eventsService.getEvent(formValue.type).map((option) => ({
+					options: (mForm, { formValue }) => eventsService.getEvent(formValue.type, { node: editorService.getNodeById(formValue.id) }).map((option) => ({
 						text: option.label,
 						value: option.value
 					}))
@@ -190,7 +190,10 @@ var EventSelect_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defi
 					options: (mForm, { model }) => {
 						const node = editorService.getNodeById(model.to);
 						if (!node?.type) return [];
-						return eventsService.getMethod(node.type, model.to).map((option) => ({
+						return eventsService.getMethod(node.type, {
+							targetId: model.to,
+							node
+						}).map((option) => ({
 							text: option.label,
 							value: option.value
 						}));

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

@@ -7,7 +7,7 @@ var _hoisted_2 = {
 };
 var _hoisted_3 = { class: "next-input" };
 var _hoisted_4 = [
-	"model-value",
+	"value",
 	"title",
 	"disabled",
 	"onChange"
@@ -69,7 +69,7 @@ var Box_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defineCompon
 					key: index,
 					class: normalizeClass(item.class)
 				}, [item.text ? (openBlock(), createElementBlock("span", _hoisted_2, toDisplayString(item.text), 1)) : createCommentVNode("v-if", true), createElementVNode("span", _hoisted_3, [createElementVNode("input", {
-					"model-value": __props.model[item.name],
+					value: __props.model[item.name],
 					placeholder: "0",
 					title: __props.model[item.name],
 					disabled: __props.disabled,

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

@@ -4,6 +4,7 @@ import RepeatX_default from "../icons/background-repeat/RepeatX.js";
 import RepeatY_default from "../icons/background-repeat/RepeatY.js";
 import NoRepeat_default from "../icons/background-repeat/NoRepeat.js";
 import { MContainer, defineFormConfig } from "@tmagic/form";
+import { appendValidateSuggestion } from "@tmagic/design";
 import { Fragment, createBlock, createElementBlock, defineComponent, markRaw, openBlock, renderList, unref } from "vue";
 //#region packages/editor/src/fields/StyleSetter/pro/Background.vue?vue&type=script&setup=true&lang.ts
 var Background_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defineComponent({
@@ -26,7 +27,11 @@ var Background_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defin
 				text: "背景色",
 				labelWidth: "68px",
 				type: "data-source-field-select",
-				fieldConfig: { type: "colorPicker" }
+				fieldConfig: { type: "colorPicker" },
+				rules: [{
+					typeMatch: true,
+					message: appendValidateSuggestion("背景色应为字符串", "请参考以下示例值：\"#000000\"")
+				}]
 			},
 			{
 				name: "backgroundImage",

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

@@ -1,7 +1,9 @@
+import { validateDataSourceFieldSelectValue } from "../../../utils/type-match-rules.js";
 import Left_default from "../icons/text-align/Left.js";
 import Center_default from "../icons/text-align/Center.js";
 import Right_default from "../icons/text-align/Right.js";
 import { MContainer, defineFormConfig } from "@tmagic/form";
+import { appendValidateSuggestion } from "@tmagic/design";
 import { Fragment, createBlock, createElementBlock, defineComponent, markRaw, openBlock, renderList, unref } from "vue";
 //#region packages/editor/src/fields/StyleSetter/pro/Font.vue?vue&type=script&setup=true&lang.ts
 var Font_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defineComponent({
@@ -25,7 +27,11 @@ var Font_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defineCompo
 					name: "fontSize",
 					text: "字号",
 					type: "data-source-field-select",
-					fieldConfig: { type: "text" }
+					fieldConfig: { type: "text" },
+					rules: [{
+						typeMatch: true,
+						message: appendValidateSuggestion("字号应为字符串或数字", "请参考以下示例值：24 或 \"24\"")
+					}]
 				}, {
 					labelWidth: "68px",
 					name: "lineHeight",
@@ -39,20 +45,46 @@ var Font_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defineCompo
 				text: "字重",
 				labelWidth: "68px",
 				type: "data-source-field-select",
+				dataSourceFieldType: ["string", "number"],
 				fieldConfig: {
 					type: "select",
+					allowCreate: true,
 					options: ["normal", "bold"].concat(Array(7).fill(1).map((x, i) => `${i + 1}00`)).map((item) => ({
 						value: item,
 						text: item
 					}))
-				}
+				},
+				rules: [{ typeMatch: false }, { validator: ({ value, callback }, { config, model, prop }, mForm) => {
+					if (value === "" || value === null || value === void 0) return callback();
+					const result = validateDataSourceFieldSelectValue(value, {
+						fieldType: "data-source-field-select",
+						mForm,
+						props: {
+							config,
+							model,
+							prop
+						}
+					}, { validatePlainValue: (plainValue) => {
+						if (typeof plainValue === "string" || typeof plainValue === "number" && !Number.isNaN(plainValue)) return;
+						return "字重应为字符串或数字";
+					} });
+					if (result && typeof result.then === "function") {
+						result.then((error) => callback(error), (error) => callback(error));
+						return;
+					}
+					return callback(result);
+				} }]
 			},
 			{
 				labelWidth: "68px",
 				name: "color",
 				text: "颜色",
 				type: "data-source-field-select",
-				fieldConfig: { type: "colorPicker" }
+				fieldConfig: { type: "colorPicker" },
+				rules: [{
+					typeMatch: true,
+					message: appendValidateSuggestion("颜色应为字符串", "请参考以下示例值：\"#000000\"")
+				}]
 			},
 			{
 				name: "textAlign",

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

@@ -1,4 +1,5 @@
 import { MContainer, defineFormConfig } from "@tmagic/form";
+import { appendValidateSuggestion } from "@tmagic/design";
 import { Fragment, createBlock, createElementBlock, defineComponent, openBlock, renderList, unref } from "vue";
 //#region packages/editor/src/fields/StyleSetter/pro/Position.vue?vue&type=script&setup=true&lang.ts
 var Position_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defineComponent({
@@ -44,12 +45,20 @@ var Position_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defineC
 					name: "left",
 					type: "data-source-field-select",
 					text: "left",
-					fieldConfig: { type: "text" }
+					fieldConfig: { type: "text" },
+					rules: [{
+						typeMatch: true,
+						message: appendValidateSuggestion("left 应为字符串", "请参考以下示例值：\"10\"")
+					}]
 				}, {
 					name: "top",
 					type: "data-source-field-select",
 					text: "top",
-					fieldConfig: { type: "text" }
+					fieldConfig: { type: "text" },
+					rules: [{
+						typeMatch: true,
+						message: appendValidateSuggestion("top 应为字符串", "请参考以下示例值：\"10\"")
+					}]
 				}]
 			},
 			{
@@ -60,12 +69,20 @@ var Position_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defineC
 					name: "right",
 					type: "data-source-field-select",
 					text: "right",
-					fieldConfig: { type: "text" }
+					fieldConfig: { type: "text" },
+					rules: [{
+						typeMatch: true,
+						message: appendValidateSuggestion("right 应为字符串", "请参考以下示例值：\"10\"")
+					}]
 				}, {
 					name: "bottom",
 					type: "data-source-field-select",
 					text: "bottom",
-					fieldConfig: { type: "text" }
+					fieldConfig: { type: "text" },
+					rules: [{
+						typeMatch: true,
+						message: appendValidateSuggestion("bottom 应为字符串", "请参考以下示例值：\"10\"")
+					}]
 				}]
 			},
 			{
@@ -73,7 +90,11 @@ var Position_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defineC
 				name: "zIndex",
 				text: "zIndex",
 				type: "data-source-field-select",
-				fieldConfig: { type: "text" }
+				fieldConfig: { type: "text" },
+				rules: [{
+					typeMatch: true,
+					message: appendValidateSuggestion("zIndex 应为数字", "请参考以下示例值：10")
+				}]
 			}
 		]);
 		const change = (value, eventData) => {

package/dist/es/index.js

@@ -31,7 +31,7 @@ import { IdleTask } from "./utils/dep/idle-task.js";
 import { ScrollViewer } from "./utils/scroll-viewer.js";
 import codeBlock_default from "./services/codeBlock.js";
 import dataSource_default from "./services/dataSource.js";
-import { ALL_COND_OPS, editorTypeMatchRules } from "./utils/type-match-rules.js";
+import { ALL_COND_OPS, editorTypeMatchRules, validateDataSourceFieldSelectValue } from "./utils/type-match-rules.js";
 import events_default from "./services/events.js";
 import { EVENT_NAME_VALUE_SEPARATOR, collectEventNameOptionValues, getCompActionAllowedValues, getCompActionOptions, getEventNameAllowedValues, getEventNameOptions, isEventNameCheckStrictly, normalizeCompActionValue } from "./utils/event.js";
 import monaco_editor_default from "./utils/monaco-editor.js";
@@ -92,4 +92,4 @@ export * from "@tmagic/table";
 export * from "@tmagic/stage";
 export * from "@tmagic/design";
 export * from "@tmagic/utils";
-export { ALL_COND_OPS, CODE_DRAFT_STORAGE_KEY, COPY_CODE_STORAGE_KEY, COPY_DS_STORAGE_KEY, COPY_STORAGE_KEY, CodeBlockEditor_default as CodeBlockEditor, CodeBlockList_default as CodeBlockList, CodeBlockListPanel_default as CodeBlockListPanel, CodeDeleteErrorType, CodeSelect_default as CodeSelect, CodeSelectCol_default as CodeSelectCol, ColumnLayout, CompareForm_default as CompareForm, ComponentListPanel_default as ComponentListPanel, CondOpSelect_default as CondOpSelect, ContentMenu_default as ContentMenu, DEFAULT_LEFT_COLUMN_WIDTH, DEFAULT_RIGHT_COLUMN_WIDTH, DataSourceAddButton_default as DataSourceAddButton, DataSourceConfigPanel_default as DataSourceConfigPanel, Index_default as DataSourceFieldSelect, DataSourceFields_default as DataSourceFields, DataSourceInput_default as DataSourceInput, DataSourceMethodSelect_default as DataSourceMethodSelect, DataSourceMethods_default as DataSourceMethods, DataSourceMocks_default as DataSourceMocks, DataSourceSelect_default as DataSourceSelect, DepTargetType, DisplayConds_default as DisplayConds, DragType, EVENT_NAME_VALUE_SEPARATOR, EventSelect_default as EventSelect, Fixed2Other, FloatingBox_default as FloatingBox, H_GUIDE_LINE_STORAGE_KEY, HistoryDiffDialog_default as HistoryDiffDialog, Bucket_default as HistoryListBucket, BucketTab_default as HistoryListBucketTab, Icon_default as Icon, IdleTask, KeyBindingCommand, KeyValue_default as KeyValue, Keys, LEFT_COLUMN_WIDTH_STORAGE_KEY, LayerNodeContent_default as LayerNodeContent, LayerOffset, LayerPanel_default as LayerPanel, Layout, SplitView_default as LayoutContainer, MIN_CENTER_COLUMN_WIDTH, MIN_LEFT_COLUMN_WIDTH, MIN_RIGHT_COLUMN_WIDTH, PROPS_PANEL_WIDTH_STORAGE_KEY, PageFragmentSelect_default as PageFragmentSelect, FormPanel_default as PropsFormPanel, PropsPanel_default as PropsPanel, RIGHT_COLUMN_WIDTH_STORAGE_KEY, Resizer_default as Resizer, ScrollViewer, SideItemKey, SplitView_default as SplitView, StageCore, Index_default$1 as StyleSetter, CodeEditor_default as TMagicCodeEditor, Editor_default as TMagicEditor, ToolButton_default as ToolButton, Tree_default as Tree, TreeNode_default as TreeNode, UI_SELECT_MODE_EVENT_NAME, UndoRedo, V_GUIDE_LINE_STORAGE_KEY, ViewForm_default as ViewForm, advancedTabConfig, arrayOptions, beforePaste, booleanOptions, buildChangeRecords, calcAlignCenterStyle, calcLayerTargetIndex, calcMoveStyle, canUsePluginMethods, change2Fixed, classifyDragSources, codeBlock_default as codeBlockService, collectEventNameOptionValues, collectRelatedNodes, componentList_default as componentListService, confirmHistoryAction, createStackStep, dataSource_default as dataSourceService, debug, plugin_default as default, defaultIsExpandable, dep_default as depService, describeRevertStep, describeStepForRevert, deserializeStacks, designPlugin, detectStackOpType, detectTargetId, detectTargetName, displayTabConfig, editorNodeMergeCustomizer, editor_default as editorService, editorTypeMatchRules, eqOptions, error, eventTabConfig, events_default as eventsService, fillConfig, fixNodeLeft, fixNodePosition, formPlugin, generatePageName, generatePageNameByApp, getAddParent, getCascaderOptionsFromFields, getCodeBlockFormConfig, getCompActionAllowedValues, getCompActionOptions, getCondOpOptionsByFieldType, getDefaultConfig, getDisplayField, getEditorConfig, getEventNameAllowedValues, getEventNameOptions, getFieldType, getFormConfig, getFormValue, getGuideLineFromCache, getInitPositionStyle, getLastPushedHistoryIds, getNodeIndex, getOrCreateStack, getPageFragmentList, getPageList, getPageNameList, getPositionInContainer, getRelativeStyle, history_default as historyService, idbDelete, idbGet, idbSet, info, isEventNameCheckStrictly, isGlobalFlat, isIncludeDataSource, isIndexedDBSupported, keybinding_default as keybindingService, monaco_editor_default as loadMonaco, log, markStackSaved, mergeSteps, moveItemsInContainer, normalizeCompActionValue, numberOptions, openIndexedDB, props_default as propsService, removeStyleDisplayConfig, resolveFieldByPath, resolveSelectedNode, serializeConfig, serializeStacks, setChildrenLayout, setEditorConfig, setLayout, stageOverlay_default as stageOverlayService, storage_default as storageService, styleTabConfig, tablePlugin, toggleFixedPosition, ui_default as uiService, undoFloor, updateStatus, useCodeBlockEdit, useCompareForm, useEditorContentHeight, useFilter, useFloatBox, useGetSo, useHistoryRevert, useNextFloatBoxPosition, useNodeStatus, useServices, useStage, useWindowRect, warn };
+export { ALL_COND_OPS, CODE_DRAFT_STORAGE_KEY, COPY_CODE_STORAGE_KEY, COPY_DS_STORAGE_KEY, COPY_STORAGE_KEY, CodeBlockEditor_default as CodeBlockEditor, CodeBlockList_default as CodeBlockList, CodeBlockListPanel_default as CodeBlockListPanel, CodeDeleteErrorType, CodeSelect_default as CodeSelect, CodeSelectCol_default as CodeSelectCol, ColumnLayout, CompareForm_default as CompareForm, ComponentListPanel_default as ComponentListPanel, CondOpSelect_default as CondOpSelect, ContentMenu_default as ContentMenu, DEFAULT_LEFT_COLUMN_WIDTH, DEFAULT_RIGHT_COLUMN_WIDTH, DataSourceAddButton_default as DataSourceAddButton, DataSourceConfigPanel_default as DataSourceConfigPanel, Index_default as DataSourceFieldSelect, DataSourceFields_default as DataSourceFields, DataSourceInput_default as DataSourceInput, DataSourceMethodSelect_default as DataSourceMethodSelect, DataSourceMethods_default as DataSourceMethods, DataSourceMocks_default as DataSourceMocks, DataSourceSelect_default as DataSourceSelect, DepTargetType, DisplayConds_default as DisplayConds, DragType, EVENT_NAME_VALUE_SEPARATOR, EventSelect_default as EventSelect, Fixed2Other, FloatingBox_default as FloatingBox, H_GUIDE_LINE_STORAGE_KEY, HistoryDiffDialog_default as HistoryDiffDialog, Bucket_default as HistoryListBucket, BucketTab_default as HistoryListBucketTab, Icon_default as Icon, IdleTask, KeyBindingCommand, KeyValue_default as KeyValue, Keys, LEFT_COLUMN_WIDTH_STORAGE_KEY, LayerNodeContent_default as LayerNodeContent, LayerOffset, LayerPanel_default as LayerPanel, Layout, SplitView_default as LayoutContainer, MIN_CENTER_COLUMN_WIDTH, MIN_LEFT_COLUMN_WIDTH, MIN_RIGHT_COLUMN_WIDTH, PROPS_PANEL_WIDTH_STORAGE_KEY, PageFragmentSelect_default as PageFragmentSelect, FormPanel_default as PropsFormPanel, PropsPanel_default as PropsPanel, RIGHT_COLUMN_WIDTH_STORAGE_KEY, Resizer_default as Resizer, ScrollViewer, SideItemKey, SplitView_default as SplitView, StageCore, Index_default$1 as StyleSetter, CodeEditor_default as TMagicCodeEditor, Editor_default as TMagicEditor, ToolButton_default as ToolButton, Tree_default as Tree, TreeNode_default as TreeNode, UI_SELECT_MODE_EVENT_NAME, UndoRedo, V_GUIDE_LINE_STORAGE_KEY, ViewForm_default as ViewForm, advancedTabConfig, arrayOptions, beforePaste, booleanOptions, buildChangeRecords, calcAlignCenterStyle, calcLayerTargetIndex, calcMoveStyle, canUsePluginMethods, change2Fixed, classifyDragSources, codeBlock_default as codeBlockService, collectEventNameOptionValues, collectRelatedNodes, componentList_default as componentListService, confirmHistoryAction, createStackStep, dataSource_default as dataSourceService, debug, plugin_default as default, defaultIsExpandable, dep_default as depService, describeRevertStep, describeStepForRevert, deserializeStacks, designPlugin, detectStackOpType, detectTargetId, detectTargetName, displayTabConfig, editorNodeMergeCustomizer, editor_default as editorService, editorTypeMatchRules, eqOptions, error, eventTabConfig, events_default as eventsService, fillConfig, fixNodeLeft, fixNodePosition, formPlugin, generatePageName, generatePageNameByApp, getAddParent, getCascaderOptionsFromFields, getCodeBlockFormConfig, getCompActionAllowedValues, getCompActionOptions, getCondOpOptionsByFieldType, getDefaultConfig, getDisplayField, getEditorConfig, getEventNameAllowedValues, getEventNameOptions, getFieldType, getFormConfig, getFormValue, getGuideLineFromCache, getInitPositionStyle, getLastPushedHistoryIds, getNodeIndex, getOrCreateStack, getPageFragmentList, getPageList, getPageNameList, getPositionInContainer, getRelativeStyle, history_default as historyService, idbDelete, idbGet, idbSet, info, isEventNameCheckStrictly, isGlobalFlat, isIncludeDataSource, isIndexedDBSupported, keybinding_default as keybindingService, monaco_editor_default as loadMonaco, log, markStackSaved, mergeSteps, moveItemsInContainer, normalizeCompActionValue, numberOptions, openIndexedDB, props_default as propsService, removeStyleDisplayConfig, resolveFieldByPath, resolveSelectedNode, serializeConfig, serializeStacks, setChildrenLayout, setEditorConfig, setLayout, stageOverlay_default as stageOverlayService, storage_default as storageService, styleTabConfig, tablePlugin, toggleFixedPosition, ui_default as uiService, undoFloor, updateStatus, useCodeBlockEdit, useCompareForm, useEditorContentHeight, useFilter, useFloatBox, useGetSo, useHistoryRevert, useNextFloatBoxPosition, useNodeStatus, useServices, useStage, useWindowRect, validateDataSourceFieldSelectValue, warn };

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

@@ -68,22 +68,33 @@ var PropsPanel_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defin
 		const submit = async (v, eventData, error, source = "props") => {
 			try {
 				if (!v.id) v.id = values.value.id;
-				const newValue = {
-					...v,
-					style: {}
-				};
-				if (v.style) if (eventData) {
-					Object.entries(v.style).forEach(([key, value]) => {
-						if (value !== "" && newValue.style) newValue.style[key] = value;
-					});
-					eventData.changeRecords?.forEach((record) => {
-						if (record.propPath?.startsWith("style") && record.value === "") setValueByKeyPath(record.propPath, record.value, newValue);
-					});
-				} else newValue.style = { ...v.style };
 				const historySource = eventData ? "props" : "code";
+				const replace = historySource === "code";
+				let newValue;
+				if (replace) if (source === "style") newValue = {
+					...values.value,
+					id: v.id || values.value.id,
+					style: { ...v.style || {} }
+				};
+				else newValue = { ...v };
+				else {
+					newValue = {
+						...v,
+						style: {}
+					};
+					if (v.style) {
+						Object.entries(v.style).forEach(([key, value]) => {
+							if (value !== "" && newValue.style) newValue.style[key] = value;
+						});
+						eventData?.changeRecords?.forEach((record) => {
+							if (record.propPath?.startsWith("style") && record.value === "") setValueByKeyPath(record.propPath, record.value, newValue);
+						});
+					}
+				}
 				editorService.update(newValue, {
 					changeRecords: eventData?.changeRecords,
 					historySource,
+					replace,
 					...enablePropsFormValidate && error ? { invalidInfo: {
 						id: newValue.id,
 						source,

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

@@ -23,7 +23,7 @@ var ComponentListPanel_vue_vue_type_script_setup_true_lang_default = /*@__PURE__
 		const stage = computed(() => editorService.get("stage"));
 		const list = computed(() => componentListService.getList().map((group) => ({
 			...group,
-			items: group.items.filter((item) => item.text.includes(searchText.value))
+			items: group.items.filter((item) => `${item.text || ""}${item.desc || ""}${item.type}`.toLocaleLowerCase().includes(searchText.value.toLocaleLowerCase()))
 		})));
 		const collapseValue = ref();
 		watch(list, () => {

package/dist/es/layouts/sidebar/layer/LayerPanel.vue_vue_type_script_setup_true_lang.js

@@ -39,7 +39,7 @@ var LayerPanel_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defin
 			let name = "";
 			if (data.name) name = data.name;
 			else if (data.items) name = "container";
-			return `${data.id}${name}${data.type}`.includes(v);
+			return `${data.id}${name}${data.type || ""}`.toLocaleLowerCase().includes(v.toLocaleLowerCase());
 		};
 		const { filterTextChangeHandler } = useFilter(nodeData, nodeStatusMap, filterNodeMethod);
 		const collapseAllHandler = () => {

package/dist/es/services/editor.js

@@ -467,14 +467,14 @@ var Editor = class extends BaseService {
 			remove: removedPages
 		});
 	}
-	async doUpdate(config, { changeRecords = [], historySource } = {}) {
+	async doUpdate(config, { changeRecords = [], historySource, replace = false } = {}) {
 		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 });
@@ -489,9 +489,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}`);
@@ -519,17 +521,19 @@ var Editor = class extends BaseService {
 	* @param data.changeRecordList 多节点 form 端变更记录列表，按 config 数组同序对应每个节点；优先级高于 changeRecords
 	* @param data.doNotPushHistory 是否不写入历史记录（默认 false）
 	* @param data.historyDescription 入栈时附带的人类可读描述，用于历史面板展示（不影响 undo/redo 行为）
+	* @param data.replace 是否整节点替换：为 true 时跳过 mergeWith / toggleFixedPosition / setChildrenLayout，直接用传入配置覆盖（默认 false）
 	* @returns 更新后的节点配置
 	*/
 	async update(config, data = {}) {
 		this.captureSelectionBeforeOp();
-		const { doNotPushHistory = false, changeRecordList, changeRecords, historyDescription, historySource, invalidInfo } = data;
+		const { doNotPushHistory = false, changeRecordList, changeRecords, historyDescription, historySource, replace = false, 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
+				historySource,
+				replace
 			});
 		}));
 		this.applyInvalidInfo(config, invalidInfo);

package/dist/es/services/events.js

@@ -32,7 +32,7 @@ var Events = class extends BaseService {
 	setEvent(type, events) {
 		eventMap[toLine(type)] = [...events];
 	}
-	getEvent(type) {
+	getEvent(type, _data = {}) {
 		return cloneDeep(eventMap[toLine(type)]) || [];
 	}
 	setMethods(methods) {
@@ -43,7 +43,7 @@ var Events = class extends BaseService {
 	setMethod(type, method) {
 		methodMap[toLine(type)] = [...method];
 	}
-	getMethod(type, _targetId) {
+	getMethod(type, _data = {}) {
 		return cloneDeep(methodMap[toLine(type)]) || [];
 	}
 	resetState() {

package/dist/es/utils/dep/idle-task.js

@@ -1,6 +1,16 @@
 import { error } from "../logger.js";
 import { EventEmitter } from "events";
 //#region packages/editor/src/utils/dep/idle-task.ts
+/**
+* 回调因 timeout 触发（主线程一直没有空闲）时，单次回调执行任务的时间预算，单位 ms
+* 参考一帧内可让出的余量：既保证队列有进展，又不长时间阻塞主线程
+*/
+var TIMEOUT_RUN_BUDGET = 5;
+/**
+* 回调因 timeout 触发时，每两次读取时钟之间执行的任务数
+* 与空闲时间 <=5ms 时的批量保持一致，避免每个任务都读一次时钟
+*/
+var TIMEOUT_BATCH_SIZE = 10;
 globalThis.requestIdleCallback = globalThis.requestIdleCallback || function(cb) {
 	const start = Date.now();
 	return setTimeout(() => {
@@ -52,6 +62,13 @@ var IdleTask = class extends EventEmitter {
 	runTaskQueue(deadline) {
 		this.taskHandle = null;
 		try {
+			if (deadline.didTimeout) {
+				const start = Date.now();
+				do
+					this.runTaskBatch(TIMEOUT_BATCH_SIZE);
+				while (this.getTaskLength() && Date.now() - start < TIMEOUT_RUN_BUDGET);
+				return;
+			}
 			while (deadline.timeRemaining() > 0 && this.getTaskLength()) {
 				const timeRemaining = deadline.timeRemaining();
 				let times = 0;
@@ -59,17 +76,23 @@ var IdleTask = class extends EventEmitter {
 				else if (timeRemaining <= 10) times = 100;
 				else if (timeRemaining <= 15) times = 300;
 				else times = 600;
-				for (let i = 0; i < times; i++) {
-					const task = this.hightLevelTaskList.length > 0 ? this.hightLevelTaskList.shift() : this.taskList.shift();
-					if (task) this.runTask(task);
-					if (!this.getTaskLength()) break;
-				}
+				this.runTaskBatch(times);
 			}
 		} finally {
 			this.finishRun();
 		}
 	}
 	/**
+	* 执行一批任务，队列被清空时提前结束
+	*/
+	runTaskBatch(times) {
+		for (let i = 0; i < times; i++) {
+			const task = this.hightLevelTaskList.length > 0 ? this.hightLevelTaskList.shift() : this.taskList.shift();
+			if (task) this.runTask(task);
+			if (!this.getTaskLength()) break;
+		}
+	}
+	/**
 	* 单个任务失败不能中断整个队列，否则后续任务永远不会被执行，
 	* 依赖收集会停在半路（收集中状态与剩余任务数都不再变化）
 	*/

package/dist/es/utils/event.js

@@ -19,7 +19,8 @@ var normalizeCompActionValue = (value) => {
 var getEventNameOptions = (src, formValue = {}) => {
 	if (!formValue.type) return [];
 	if (src === "component") {
-		let events = events_default.getEvent(formValue.type) || [];
+		const sourceNode = editor_default.getNodeById(formValue.id);
+		let events = events_default.getEvent(formValue.type, { node: sourceNode }) || [];
 		if (formValue.type === "page-fragment-container" && formValue.pageFragmentId) {
 			const pageFragment = editor_default.get("root")?.items?.find((page) => page.id === formValue.pageFragmentId);
 			if (!pageFragment) return [];
@@ -28,9 +29,11 @@ var getEventNameOptions = (src, formValue = {}) => {
 				value: pageFragment.id,
 				children: events
 			}];
-			(pageFragment.items || []).forEach((node) => {
-				traverseNode(node, (current) => {
-					const nodeEvents = current.type && events_default.getEvent(current.type) || [];
+			(pageFragment.items || []).forEach((item) => {
+				traverseNode(item, (current) => {
+					if (!current.type) return;
+					const node = editor_default.getNodeById(current.id) || current;
+					const nodeEvents = events_default.getEvent(current.type, { node }) || [];
 					events.push({
 						label: `${current.name}_${current.id}`,
 						value: `${current.id}`,
@@ -89,15 +92,24 @@ var getCompActionOptions = (toId) => {
 	if (typeof toId === "undefined" || toId === null || toId === "") return [];
 	const node = editor_default.getNodeById(toId);
 	if (!node?.type) return [];
-	let methods = events_default.getMethod(node.type, toId) || [];
+	let methods = events_default.getMethod(node.type, {
+		targetId: toId,
+		node
+	}) || [];
 	if (node.type === "page-fragment-container" && node.pageFragmentId) {
 		const pageFragment = editor_default.get("root")?.items?.find((page) => page.id === node.pageFragmentId);
 		if (!pageFragment) return [];
 		methods = [];
 		(pageFragment.items || []).forEach((item) => {
 			traverseNode(item, (current) => {
-				const nodeMethods = current.type && events_default.getMethod(current.type, current.id) || [];
-				if (nodeMethods.length) methods.push({
+				const node = editor_default.getNodeById(current.id) || current;
+				if (!current.type) return;
+				const nodeMethods = events_default.getMethod(current.type, {
+					targetId: current.id,
+					node
+				}) || [];
+				if (!nodeMethods.length) return;
+				methods.push({
 					label: `${current.name}_${current.id}`,
 					value: `${current.id}`,
 					children: nodeMethods

package/dist/es/utils/type-match-rules.js

@@ -268,15 +268,22 @@ var isDataSourceFieldPathValue = (value, config) => {
 	if (config.value === "key") return true;
 	return `${value[0]}`.startsWith(DATA_SOURCE_FIELDS_SELECT_VALUE_PREFIX);
 };
-var validateDataSourceFieldSelect = (value, { mForm, message, props }) => {
+/**
+* data-source-field-select 的 typeMatch 校验逻辑，可供自定义 rules.validator 复用。
+*/
+var validateDataSourceFieldSelectValue = (value, context, options) => {
+	const { mForm, message, props } = context;
 	const config = props.config || {};
-	if (config.fieldConfig && !isDataSourceFieldPathValue(value, config)) return validateTypeMatch(value, mForm, {
-		...props,
-		config: {
-			name: config.name,
-			...config.fieldConfig
-		}
-	}, message);
+	if (!isDataSourceFieldPathValue(value, config)) {
+		if (options?.validatePlainValue) return options.validatePlainValue(value, context);
+		if (config.fieldConfig) return validateTypeMatch(value, mForm, {
+			...props,
+			config: {
+				name: config.name,
+				...config.fieldConfig
+			}
+		}, message);
+	}
 	if (!Array.isArray(value) || value.some((item) => typeof item !== "string")) return defaultMessage(message, `${value}类型应为字符串数组`, dataSourceFieldPathSuggestion());
 	return validateDataSourceFieldPath(value, {
 		dataSourceId: config.dataSourceId,
@@ -285,6 +292,7 @@ var validateDataSourceFieldSelect = (value, { mForm, message, props }) => {
 		message
 	});
 };
+var validateDataSourceFieldSelect = (value, context) => validateDataSourceFieldSelectValue(value, context);
 var validateDataSourceSelect = (value, { message, props }) => {
 	const config = props.config || {};
 	const dataSources = getDataSources();
@@ -364,4 +372,4 @@ var editorTypeMatchRules = {
 	"display-conds": validateDisplayConds
 };
 //#endregion
-export { ALL_COND_OPS, editorTypeMatchRules };
+export { ALL_COND_OPS, editorTypeMatchRules, validateDataSourceFieldSelectValue };