@tmagic/editor 1.8.0-beta.21 → 1.8.0-beta.23

package/dist/es/components/CodeBlockEditor.vue_vue_type_script_setup_true_lang.js

@@ -119,7 +119,8 @@ var CodeBlockEditor_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/
 		const closedHandler = () => {
 			changedValue.value = void 0;
 		};
-		const { boxPosition, calcBoxPosition } = useNextFloatBoxPosition(uiService, inject("parentFloating", ref(null)));
+		const parentFloating = inject("parentFloating", ref(null));
+		const { boxPosition, calcBoxPosition } = useNextFloatBoxPosition(uiService, parentFloating);
 		const frameworkWidth = computed(() => uiService.get("frameworkRect")?.width || 0);
 		watch(boxVisible, (visible) => {
 			nextTick(() => {

package/dist/es/components/Resizer.vue_vue_type_script_setup_true_lang.js

@@ -7,7 +7,8 @@ var Resizer_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defineCo
 	emits: ["change"],
 	setup(__props, { emit: __emit }) {
 		const emit = __emit;
-		const { isDragging } = useGetSo(useTemplateRef("target"), emit);
+		const targetEl = useTemplateRef("target");
+		const { isDragging } = useGetSo(targetEl, emit);
 		return (_ctx, _cache) => {
 			return openBlock(), createElementBlock("span", {
 				ref: "target",

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

@@ -30,7 +30,9 @@ var CondOpSelect_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ def
 		const optionComponent = getDesignConfig("components")?.option;
 		const options = computed(() => {
 			const [id, ...fieldNames] = [...props.config.parentFields || [], ...props.model.field];
-			return getCondOpOptionsByFieldType(getFieldType(dataSourceService.getDataSourceById(id), fieldNames));
+			const ds = dataSourceService.getDataSourceById(id);
+			const type = getFieldType(ds, fieldNames);
+			return getCondOpOptionsByFieldType(type);
 		});
 		const fieldChangeHandler = (v) => {
 			emit("change", v);

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

@@ -315,7 +315,8 @@ var DataSourceFields_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/
 		const addDialogVisible = useModel(__props, "visible");
 		const addFromJsonDialogVisible = useModel(__props, "visible1");
 		const { height: editorHeight } = useEditorContentHeight();
-		const { boxPosition, calcBoxPosition } = useNextFloatBoxPosition(uiService, inject("parentFloating", ref(null)));
+		const parentFloating = inject("parentFloating", ref(null));
+		const { boxPosition, calcBoxPosition } = useNextFloatBoxPosition(uiService, parentFloating);
 		const frameworkWidth = computed(() => uiService.get("frameworkRect")?.width || 0);
 		/**
 		* 由 DataSourceConfigPanel 注入：打开数据源详情后需要直接打开的字段路径（字段名数组）。

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

@@ -128,7 +128,8 @@ var DataSourceInput_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/
 		*/
 		const fieldQuerySearch = (queryString, leftAngleIndex, dotIndex, cb) => {
 			let result = [];
-			const keys = getKeysArray(queryString.substring(leftAngleIndex + 1, dotIndex));
+			const dsKey = queryString.substring(leftAngleIndex + 1, dotIndex);
+			const keys = getKeysArray(dsKey);
 			const dsId = keys.shift();
 			const ds = dataSources.value.find((ds) => ds.id === dsId);
 			if (!ds) {

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

@@ -215,7 +215,8 @@ var DataSourceMocks_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/
 		};
 		const addDialogVisible = useModel(__props, "visible");
 		const { height: editorHeight } = useEditorContentHeight();
-		const { boxPosition, calcBoxPosition } = useNextFloatBoxPosition(uiService, inject("parentFloating", ref(null)));
+		const parentFloating = inject("parentFloating", ref(null));
+		const { boxPosition, calcBoxPosition } = useNextFloatBoxPosition(uiService, parentFloating);
 		const frameworkWidth = computed(() => uiService.get("frameworkRect")?.width || 0);
 		return (_ctx, _cache) => {
 			return openBlock(), createElementBlock("div", _hoisted_1, [

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

@@ -33,7 +33,8 @@ var DisplayConds_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ def
 		const parentFields = computed(() => filterFunction(mForm, props.config.parentFields, props) || []);
 		const fieldOnChange = (_formState, v, { model }) => {
 			const [id, ...fieldNames] = [...parentFields.value, ...v];
-			const type = getFieldType(dataSourceService.getDataSourceById(id), fieldNames);
+			const ds = dataSourceService.getDataSourceById(id);
+			const type = getFieldType(ds, fieldNames);
 			if (type === "number") model.value = Number(model.value);
 			else if (type === "boolean") model.value = Boolean(model.value);
 			else if (type === "null") model.value = null;
@@ -131,7 +132,8 @@ var DisplayConds_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ def
 							name: "value",
 							type: (_mForm, { model }) => {
 								const [id, ...fieldNames] = [...parentFields.value, ...model.field];
-								const type = getFieldType(dataSourceService.getDataSourceById(id), fieldNames);
+								const ds = dataSourceService.getDataSourceById(id);
+								const type = getFieldType(ds, fieldNames);
 								if (type === "number") return "number";
 								if (type === "boolean") return "select";
 								if (type === "null") return "display";

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/initService.js

@@ -329,7 +329,8 @@ var initServiceEvents = (props, emit, { editorService, codeBlockService, dataSou
 		const root = editorService.get("root");
 		if (!root) return;
 		const handler = async () => {
-			const nodes = getNodes(Object.keys(root.dataSourceDeps?.[id] || {}), root.items);
+			const nodeIds = Object.keys(root.dataSourceDeps?.[id] || {});
+			const nodes = getNodes(nodeIds, root.items);
 			if (!(await Promise.all([
 				collectIdle(nodes, false, DepTargetType.DATA_SOURCE),
 				collectIdle(nodes, false, DepTargetType.DATA_SOURCE_COND),

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/Sidebar.vue_vue_type_script_setup_true_lang.js

@@ -145,7 +145,8 @@ var Sidebar_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defineCo
 		watch(() => props.data.status, (status) => {
 			activeTabName.value = status || "0";
 		});
-		const { dragstartHandler, dragendHandler, floatBoxStates, showingBoxKeys } = useFloatBox(computed(() => sideBarItems.value.map((sideBarItem) => sideBarItem.$key)));
+		const slideKeys = computed(() => sideBarItems.value.map((sideBarItem) => sideBarItem.$key));
+		const { dragstartHandler, dragendHandler, floatBoxStates, showingBoxKeys } = useFloatBox(slideKeys);
 		watch(() => showingBoxKeys.value.length, () => {
 			if (!showingBoxKeys.value.some((key) => activeTabName.value === sideBarItems.value.find((v) => v.$key === key)?.text) && activeTabName.value) return;
 			const nextSlideBarItem = sideBarItems.value.find((sideBarItem) => !showingBoxKeys.value.includes(sideBarItem.$key));

package/dist/es/layouts/sidebar/data-source/DataSourceConfigPanel.vue_vue_type_script_setup_true_lang.js

@@ -38,7 +38,8 @@ var DataSourceConfigPanel_vue_vue_type_script_setup_true_lang_default = /*@__PUR
 		const initValues = ref({});
 		const dataSourceConfig = ref([]);
 		const { height: editorHeight } = useEditorContentHeight();
-		const { boxPosition, calcBoxPosition } = useNextFloatBoxPosition(uiService, inject("parentFloating", ref(null)));
+		const parentFloating = inject("parentFloating", ref(null));
+		const { boxPosition, calcBoxPosition } = useNextFloatBoxPosition(uiService, parentFloating);
 		const frameworkWidth = computed(() => uiService.get("frameworkRect")?.width || 0);
 		/** 供「方法定义」tab 内的字段消费，用于打开数据源详情后自动打开指定方法 */
 		provide("editingDataSourceMethodName", computed(() => props.editMethodName));

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 = () => {
@@ -51,7 +51,8 @@ var LayerPanel_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defin
 			}
 		};
 		const { handleDragStart, handleDragEnd, handleDragLeave, handleDragOver } = useDrag(services, { canDropIn: (sourceIds, targetId) => props.canDropIn?.(sourceIds, targetId, "layer") });
-		const { nodeClickHandler, nodeDblclickHandler, nodeContentMenuHandler, highlightHandler: mouseenterHandler } = useClick(services, isCtrlKeyDown, nodeStatusMap, useTemplateRef("menu"));
+		const menuRef = useTemplateRef("menu");
+		const { nodeClickHandler, nodeDblclickHandler, nodeContentMenuHandler, highlightHandler: mouseenterHandler } = useClick(services, isCtrlKeyDown, nodeStatusMap, menuRef);
 		const dblclickHandler = async (event, data) => {
 			if (props.beforeNodeDblclick) {
 				if (await props.beforeNodeDblclick(event, data) === false) return;

package/dist/es/services/codeBlock.js

@@ -141,7 +141,8 @@ var CodeBlock = class extends BaseService {
 	* @returns {CodeBlockDSL}
 	*/
 	getCodeDslByIds(ids) {
-		return pick(this.getCodeDsl(), ids);
+		const codeDsl = this.getCodeDsl();
+		return pick(codeDsl, ids);
 	}
 	/**
 	* 获取编辑状态
@@ -371,7 +372,8 @@ var CodeBlock = class extends BaseService {
 	*/
 	async getUniqueId() {
 		const newId = `code_${Math.random().toString(10).substring(2).substring(0, 4)}`;
-		if (!keys(await this.getCodeDsl()).includes(newId)) return newId;
+		const dsl = await this.getCodeDsl();
+		if (!keys(dsl).includes(newId)) return newId;
 		return await this.getUniqueId();
 	}
 	/**

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/utils/dep/collect-worker-client.js

@@ -10,11 +10,17 @@ import serialize from "serialize-javascript";
 *
 * 全量收集与增量收集共用一个常驻 worker：增量收集调用频繁（每次节点更新都会触发），
 * 按次创建 worker 的启动开销无法接受，也容易漏掉销毁导致线程泄漏。
+*
+* 请求在主线程侧排队后逐个投递（worker 本身也是串行处理），这样 abort 时能直接丢掉尚未投递的请求，
+* 无需销毁线程：worker 只在真正异常或销毁时才重建。
 */
 var CollectWorkerClient = class {
 	worker = null;
 	seed = 0;
-	pending = /* @__PURE__ */ new Map();
+	/** 等待投递给 worker 的请求 */
+	queue = [];
+	/** 已投递、等待 worker 响应的请求，worker 串行处理，同一时刻最多一个 */
+	inflight = null;
 	get isSupported() {
 		return typeof Worker !== "undefined";
 	}
@@ -44,34 +50,63 @@ var CollectWorkerClient = class {
 	terminate() {
 		this.worker?.terminate();
 		this.worker = null;
-		this.settleAllPending();
+		this.settleAll();
 	}
 	/**
-	* 丢弃在途请求并重建 worker
-	* clearIdleTasks / reset 中断收集时调用，避免已 abort 的长任务继续占着常驻 worker 拖慢后续收集
+	* 丢弃在途请求，但保留常驻 worker
+	*
+	* clearIdleTasks / reset 中断收集时调用。这里不能销毁 worker：worker 重建要重新加载并启动整份收集逻辑，
+	* 而 clearIdleTasks / reset 触发频繁（root 更新、数据源变更、历史回滚等），一旦下一次 abort 落在
+	* 上一个 worker 还没启动完的窗口内，就会陷入「加载中被销毁 → 重建 → 又被销毁」的循环，
+	* 表现为 worker 反复加载且依赖始终收集不完。
+	*
+	* 因此 abort 只做「不要这些结果」：尚未投递的请求直接丢掉，已投递的那一个标记为丢弃，
+	* 结果回来后忽略（不写回主线程），worker 继续复用。
 	*/
 	abort() {
-		this.terminate();
+		const { queue } = this;
+		this.queue = [];
+		for (const task of queue) task.resolve(null);
+		if (this.inflight && !this.inflight.discarded) {
+			this.inflight.discarded = true;
+			this.inflight.resolve(null);
+		}
 	}
-	/**
-	* worker 按收到的顺序逐个处理请求，因此请求间不会互相打断，用 id 把结果分发回各自的调用方
-	*/
 	request(createRequest) {
-		const worker = this.getWorker();
-		if (!worker) return Promise.resolve(null);
+		if (!this.isSupported) return Promise.resolve(null);
 		this.seed += 1;
 		const id = this.seed;
 		return new Promise((resolve) => {
-			this.pending.set(id, resolve);
-			try {
-				worker.postMessage(createRequest(id));
-			} catch (e) {
-				error("magic editor: 依赖收集 worker 通信失败", e);
-				this.pending.delete(id);
-				resolve(null);
-			}
+			this.queue.push({
+				id,
+				createRequest,
+				resolve,
+				discarded: false
+			});
+			this.flush();
 		});
 	}
+	/**
+	* 投递队首请求，worker 串行处理，因此同一时刻只投递一个，用 id 把结果分发回各自的调用方
+	*/
+	flush() {
+		if (this.inflight || !this.queue.length) return;
+		const worker = this.getWorker();
+		if (!worker) {
+			this.settleAll();
+			return;
+		}
+		const task = this.queue.shift();
+		this.inflight = task;
+		try {
+			worker.postMessage(task.createRequest(task.id));
+		} catch (e) {
+			error("magic editor: 依赖收集 worker 通信失败", e);
+			this.inflight = null;
+			if (!task.discarded) task.resolve(null);
+			this.flush();
+		}
+	}
 	getWorker() {
 		if (!this.isSupported) return null;
 		if (this.worker) return this.worker;
@@ -94,20 +129,25 @@ var CollectWorkerClient = class {
 		return this.worker;
 	}
 	handleResponse(response) {
-		const resolve = this.pending.get(response?.id);
-		if (!resolve) return;
-		this.pending.delete(response.id);
-		resolve(response.failed ? null : response);
+		const task = this.inflight;
+		if (task?.id !== response?.id) return;
+		this.inflight = null;
+		if (!task.discarded) task.resolve(response.failed ? null : response);
+		this.flush();
 	}
 	handleFatalError() {
 		this.worker?.terminate();
 		this.worker = null;
-		this.settleAllPending();
+		this.settleAll();
 	}
-	settleAllPending() {
-		const resolvers = [...this.pending.values()];
-		this.pending.clear();
-		for (const resolve of resolvers) resolve(null);
+	settleAll() {
+		const tasks = this.queue;
+		this.queue = [];
+		if (this.inflight) {
+			tasks.push(this.inflight);
+			this.inflight = null;
+		}
+		for (const task of tasks) if (!task.discarded) task.resolve(null);
 	}
 };
 //#endregion