@tmagic/editor 1.8.0-beta.24 → 1.8.0-beta.26

package/dist/es/Editor.vue_vue_type_script_setup_true_lang.js

@@ -1,3 +1,4 @@
+import { useEditorFormContext } from "./hooks/use-form-context.js";
 import props_default from "./services/props.js";
 import history_default from "./services/history.js";
 import storage_default from "./services/storage.js";
@@ -18,8 +19,9 @@ import dep_default from "./services/dep.js";
 import keybinding_default from "./services/keybinding.js";
 import stageOverlay_default from "./services/stageOverlay.js";
 import { initServiceEvents, initServiceState } from "./initService.js";
+import { FORM_CONTEXT_KEY } from "@tmagic/form";
 import { M_THEME_KEY } from "@tmagic/design";
-import { computed, createBlock, createVNode, defineComponent, mergeDefaults, openBlock, provide, ref, renderSlot, unref, withCtx } from "vue";
+import { computed, createBlock, createVNode, defineComponent, mergeDefaults, openBlock, provide, renderSlot, unref, withCtx } from "vue";
 import { EventEmitter } from "events";
 //#region packages/editor/src/Editor.vue?vue&type=script&setup=true&lang.ts
 var Editor_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defineComponent({
@@ -75,7 +77,6 @@ var Editor_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defineCom
 		canDropIn: { type: Function },
 		beforeDblclick: { type: Function },
 		beforeLayerNodeDblclick: { type: Function },
-		extendFormState: { type: Function },
 		historyListExtraTabs: {},
 		pageBarSortOptions: {},
 		pageFilterFunction: { type: Function }
@@ -131,25 +132,21 @@ var Editor_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defineCom
 			beforeDblclick: props.beforeDblclick
 		};
 		stageOverlay_default.set("stageOptions", stageOptions);
-		const propsPanelRef = ref(null);
 		provide("services", services);
 		provide("codeOptions", props.codeOptions);
 		provide("stageOptions", stageOptions);
 		/** 是否启用「属性配置表单校验」联动能力，供 PropsPanel / FormPanel 判断校验失败时是否仍更新节点并记录错误 */
 		provide(ENABLE_PROPS_FORM_VALIDATE, props.enablePropsFormValidate ?? false);
 		/**
-		* 把顶层 `extendFormState` 提供给非 PropsPanel 链路上的组件使用（例如历史差异对话框 HistoryDiffDialog
-		* 内部的 CompareForm）。这样所有依赖业务上下文的表单 filterFunction 都能拿到一致的扩展状态，
-		* 与 PropsPanel 通过 `:extend-state` 显式传入的方式保持等价。
+		* 编辑器注入给整棵表单树的业务上下文（`services` / `stage`），属性面板、对比表单、
+		* 侧边栏里的嵌套 MForm 都通过 inject 自动继承。
+		*
+		* 业务方要追加自己的字段，在 `<MEditor>` 外层再 `provide(FORM_CONTEXT_KEY, computed(...))`
+		* 即可，配置回调统一通过 `mForm.xxx` 读取。
 		*/
-		provide("extendFormState", props.extendFormState);
+		provide(FORM_CONTEXT_KEY, useEditorFormContext(() => services));
 		provide("isLargeStageContainer", computed(() => props.isLargeStageContainer));
 		/**
-		* 提供 PropsPanel 主属性表单的 formState getter，供历史差异弹窗复用，
-		* 让 CompareForm 与 PropsPanel 的 filterFunction 上下文保持一致。
-		*/
-		provide("getPropsPanelFormState", () => propsPanelRef.value?.configForm?.formState);
-		/**
 		* 把历史记录面板的自定义扩展 tab 提供给深层的 HistoryListPanel（它挂在 NavMenu 中，
 		* 以 markRaw component 形式渲染，无法直接通过 props 透传）。业务方可借此在历史记录
 		* 面板内追加自定义模块的历史 tab。
@@ -163,11 +160,9 @@ var Editor_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defineCom
 		*/
 		provide(M_THEME_KEY, computed(() => props.theme ?? ""));
 		const propsPanelMountedHandler = (e) => {
-			propsPanelRef.value = e;
 			emit("props-panel-mounted", e);
 		};
 		const propsPanelUnmountedHandler = () => {
-			propsPanelRef.value = null;
 			emit("props-panel-unmounted");
 		};
 		const propsPanelSubmitErrorHandler = (e) => {
@@ -244,7 +239,6 @@ var Editor_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defineCom
 					"custom-content-menu"
 				])])]),
 				"props-panel": withCtx(() => [renderSlot(_ctx.$slots, "props-panel", {}, () => [createVNode(PropsPanel_default, {
-					"extend-state": __props.extendFormState,
 					"disabled-show-src": __props.disabledShowSrc,
 					onMounted: propsPanelMountedHandler,
 					onUnmounted: propsPanelUnmountedHandler,
@@ -253,7 +247,7 @@ var Editor_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defineCom
 				}, {
 					"props-panel-header": withCtx(() => [renderSlot(_ctx.$slots, "props-panel-header")]),
 					_: 3
-				}, 8, ["extend-state", "disabled-show-src"])])]),
+				}, 8, ["disabled-show-src"])])]),
 				empty: withCtx(() => [renderSlot(_ctx.$slots, "empty", { editorService: unref(editor_default) })]),
 				"content-after": withCtx(() => [renderSlot(_ctx.$slots, "content-after")]),
 				footer: withCtx(() => [renderSlot(_ctx.$slots, "footer")]),

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

@@ -1,5 +1,5 @@
 import { error } from "../utils/logger.js";
-import { MForm } from "@tmagic/form";
+import { MForm, defineFormItem } from "@tmagic/form";
 import { computed, createBlock, defineComponent, openBlock, unref, useTemplateRef } from "vue";
 //#region packages/editor/src/components/CodeParams.vue?vue&type=script&setup=true&lang.ts
 var CodeParams_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defineComponent({
@@ -19,13 +19,13 @@ var CodeParams_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defin
 		const props = __props;
 		const emit = __emit;
 		const formRef = useTemplateRef("form");
-		const getFormConfig = (items = []) => [{
+		const getFormConfig = (items = []) => [defineFormItem({
 			type: "fieldset",
 			items,
 			legend: "参数",
-			labelWidth: "120px",
+			labelPosition: "top",
 			name: props.name
-		}];
+		})];
 		const codeParamsConfig = computed(() => getFormConfig(props.paramsConfig.map(({ name, text, extra, ...config }) => {
 			let { type } = config;
 			if (typeof type === "function") type = type(void 0, { model: props.model[props.name] });

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

@@ -14,8 +14,6 @@ var CompareForm_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defi
 		dataSourceType: {},
 		labelWidth: { default: "120px" },
 		height: {},
-		extendState: {},
-		baseFormState: {},
 		size: {},
 		loadConfig: {},
 		services: {},
@@ -24,7 +22,7 @@ var CompareForm_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defi
 	},
 	setup(__props, { expose: __expose }) {
 		const props = __props;
-		const { config, currentValues, wrapperStyle, mergedExtendState, loadConfig, formRef, normalizeCodeBlockValue } = useCompareForm(props);
+		const { config, currentValues, wrapperStyle, formContext, loadConfig, formRef, normalizeCodeBlockValue } = useCompareForm(props);
 		const lastValuesProcessed = computed(() => {
 			if (props.category === "code-block") return normalizeCodeBlockValue(props.lastValue);
 			return props.lastValue || {};
@@ -32,9 +30,8 @@ var CompareForm_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defi
 		/**
 		* `code-select` 字段在历史数据中存在两种"语义为空"的形态：
 		* - 字符串 `''`（旧数据 / 用户从未配置过钩子）；
-		* - `{ hookType: HookType.CODE, hookData: [] }`（CodeSelect.vue 在挂载时
-		*   写入的默认结构，参见 packages/editor/src/fields/CodeSelect.vue 中
-		*   `props.model[props.name] = { hookType: HookType.CODE, hookData: [] }`）。
+		* - `{ hookType: HookType.CODE, hookData: [] }`（`normalizeCodeSelectValue`
+		*   写入的默认结构）。
 		*
 		* 直接 `isEqual` 会把两者判为不等，从而在历史对比里对每个未配置过钩子的组件
 		* 都展示一份"差异"，体验很糟糕。这里把它们视为相等，跳过对比。
@@ -71,7 +68,7 @@ var CompareForm_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defi
 				"is-compare": true,
 				disabled: true,
 				"label-width": __props.labelWidth,
-				"extend-state": unref(mergedExtendState),
+				context: unref(formContext),
 				"show-diff": showDiff,
 				"self-diff-field-types": __props.selfDiffFieldTypes,
 				size: __props.size
@@ -80,7 +77,7 @@ var CompareForm_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defi
 				"init-values",
 				"last-values",
 				"label-width",
-				"extend-state",
+				"context",
 				"self-diff-field-types",
 				"size"
 			])) : createCommentVNode("v-if", true)], 4);

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

@@ -12,8 +12,6 @@ var ViewForm_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defineC
 		dataSourceType: {},
 		labelWidth: { default: "120px" },
 		height: {},
-		extendState: {},
-		baseFormState: {},
 		size: {},
 		loadConfig: {},
 		services: {},
@@ -23,7 +21,7 @@ var ViewForm_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defineC
 		}
 	},
 	setup(__props, { expose: __expose }) {
-		const { config, currentValues, wrapperStyle, mergedExtendState, loadConfig, formRef } = useCompareForm(__props);
+		const { config, currentValues, wrapperStyle, formContext, loadConfig, formRef } = useCompareForm(__props);
 		__expose({
 			form: formRef,
 			config,
@@ -41,14 +39,14 @@ var ViewForm_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defineC
 				"init-values": unref(currentValues),
 				disabled: __props.disabled,
 				"label-width": __props.labelWidth,
-				"extend-state": unref(mergedExtendState),
+				context: unref(formContext),
 				size: __props.size
 			}, null, 8, [
 				"config",
 				"init-values",
 				"disabled",
 				"label-width",
-				"extend-state",
+				"context",
 				"size"
 			])) : createCommentVNode("v-if", true)], 4);
 		};

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

@@ -1,6 +1,5 @@
 import CodeEditor_default from "../layouts/CodeEditor.js";
-import { FORM_SILENT_MODE_KEY } from "@tmagic/form";
-import { computed, createBlock, createCommentVNode, defineComponent, inject, openBlock, unref } from "vue";
+import { computed, createBlock, defineComponent, openBlock } from "vue";
 //#region packages/editor/src/fields/Code.vue?vue&type=script&setup=true&lang.ts
 var Code_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defineComponent({
 	name: "MFieldsVsCode",
@@ -25,12 +24,6 @@ var Code_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defineCompo
 	},
 	emits: ["change"],
 	setup(__props, { emit: __emit }) {
-		/**
-		* 静默模式（submitForm/validateForm 隐藏挂载）下跳过 monaco 渲染：
-		* 校验由 FormItem 针对 model 中的值完成，与编辑器实例无关；本组件挂载无值副作用
-		* （save 仅由用户操作/编辑器内容变更触发），跳过可省去 monaco worker/model 的无谓实例化。
-		*/
-		const silentMode = inject(FORM_SILENT_MODE_KEY, false);
 		const emit = __emit;
 		const props = __props;
 		/**
@@ -48,8 +41,7 @@ var Code_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defineCompo
 			emit("change", v);
 		};
 		return (_ctx, _cache) => {
-			return !unref(silentMode) ? (openBlock(), createBlock(CodeEditor_default, {
-				key: 0,
+			return openBlock(), createBlock(CodeEditor_default, {
 				height: __props.config.height,
 				type: diffMode.value ? "diff" : void 0,
 				"init-values": diffMode.value ? (__props.lastValues || {})[__props.name] : __props.model[__props.name],
@@ -73,7 +65,7 @@ var Code_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defineCompo
 				"autosize",
 				"parse",
 				"editor-custom-type"
-			])) : createCommentVNode("v-if", true);
+			]);
 		};
 	}
 });

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

@@ -1,10 +1,6 @@
-import { useServices } from "../hooks/use-services.js";
+import { createCodeSelectConfig, normalizeCodeSelectValue } from "./configs/codeSelect.js";
 import { MContainer } from "@tmagic/form";
-import { TMagicButton, TMagicCard } from "@tmagic/design";
-import { HookCodeType, HookType } from "@tmagic/core";
-import { computed, createElementBlock, createTextVNode, createVNode, defineComponent, normalizeClass, openBlock, toDisplayString, unref, watch, withCtx } from "vue";
-import { isEmpty } from "lodash-es";
-import { Plus } from "@element-plus/icons-vue";
+import { computed, createElementBlock, createVNode, defineComponent, normalizeClass, openBlock, unref, watch } from "vue";
 //#region packages/editor/src/fields/CodeSelect.vue?vue&type=script&setup=true&lang.ts
 var CodeSelect_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defineComponent({
 	name: "MFieldsCodeSelect",
@@ -27,7 +23,6 @@ var CodeSelect_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defin
 	emits: ["change"],
 	setup(__props, { emit: __emit }) {
 		const emit = __emit;
-		const { dataSourceService, codeBlockService } = useServices();
 		const props = __props;
 		/**
 		* 对比模式判定：
@@ -43,125 +38,35 @@ var CodeSelect_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defin
 		* 仅当存在历史值时才启用对比，避免 lastValues 缺失时退化为「全部新增」的空对比。
 		*/
 		const isCompareMode = computed(() => Boolean(props.isCompare && props.lastValues));
-		const newHandler = () => {
-			const defaultCode = {
-				codeType: HookCodeType.CODE,
-				codeId: ""
-			};
-			const name = props.config.name || "";
-			const hookData = props.model[name]?.hookData || [];
-			emit("change", defaultCode, { modifyKey: `hookData.${hookData.length}` });
-		};
-		const codeConfig = computed(() => ({
-			type: "group-list",
-			name: "hookData",
-			enableToggleMode: false,
-			expandAll: true,
-			addable: () => false,
-			title: (mForm, { model, index }) => {
-				if (model.codeType === HookCodeType.DATA_SOURCE_METHOD) {
-					if (Array.isArray(model.codeId)) {
-						if (model.codeId.length < 2) return index;
-						return `${dataSourceService.getDataSourceById(model.codeId[0])?.title} / ${model.codeId[1]}`;
-					}
-					return Array.isArray(model.codeId) ? model.codeId.join("/") : index;
-				}
-				const codeContent = codeBlockService.getCodeContentById(model.codeId);
-				if (codeContent) return codeContent.name;
-				return model.codeId || index;
-			},
-			titlePrefix: props.config.name === void 0 ? void 0 : String(props.config.name),
-			items: [
-				{
-					text: "代码类型",
-					type: "select",
-					name: "codeType",
-					labelPosition: "right",
-					rules: [{
-						typeMatch: true,
-						trigger: "change"
-					}],
-					options: [{
-						value: HookCodeType.CODE,
-						text: "代码块"
-					}, {
-						value: HookCodeType.DATA_SOURCE_METHOD,
-						text: "数据源方法"
-					}],
-					defaultValue: HookCodeType.CODE,
-					onChange: (_mForm, v, { setModel }) => {
-						if (v === HookCodeType.DATA_SOURCE_METHOD) setModel("codeId", []);
-						else setModel("codeId", "");
-						return v;
-					}
-				},
-				{
-					type: "code-select-col",
-					name: "codeId",
-					text: "代码块",
-					rules: [{
-						typeMatch: true,
-						trigger: "change"
-					}],
-					display: (_mForm, { model }) => model.codeType !== HookCodeType.DATA_SOURCE_METHOD,
-					notEditable: () => !codeBlockService.getEditStatus()
-				},
-				{
-					type: "data-source-method-select",
-					name: "codeId",
-					text: "数据源字段",
-					rules: [{
-						typeMatch: true,
-						trigger: "change"
-					}],
-					display: (_mForm, { model }) => model.codeType === HookCodeType.DATA_SOURCE_METHOD,
-					notEditable: () => !dataSourceService.get("editable")
-				}
-			]
-		}));
-		watch(() => props.model[props.name], (value) => {
-			if (isEmpty(value)) props.model[props.name] = {
-				hookType: HookType.CODE,
-				hookData: []
-			};
-		}, { immediate: true });
+		const codeConfig = computed(() => createCodeSelectConfig(props.config));
+		watch(() => props.model[props.name], () => {
+			normalizeCodeSelectValue(props.model, props.name);
+		});
 		const changeHandler = (v, eventData) => emit("change", v, eventData);
 		return (_ctx, _cache) => {
-			return openBlock(), createElementBlock("div", { class: normalizeClass(["m-fields-code-select", __props.config.className]) }, [createVNode(unref(TMagicCard), { flat: __props.config.flat }, {
-				default: withCtx(() => [createVNode(unref(MContainer), {
-					config: codeConfig.value,
-					size: __props.size,
-					class: "code-select-content",
-					prop: __props.prop,
-					disabled: __props.disabled,
-					"is-compare": isCompareMode.value,
-					"last-values": __props.lastValues?.[__props.name],
-					model: __props.model[__props.name],
-					onChange: changeHandler
-				}, null, 8, [
-					"config",
-					"size",
-					"prop",
-					"disabled",
-					"is-compare",
-					"last-values",
-					"model"
-				]), createVNode(unref(TMagicButton), {
-					class: "create-button fullWidth",
-					icon: unref(Plus),
-					size: __props.size,
-					disabled: __props.disabled,
-					onClick: _cache[0] || (_cache[0] = ($event) => newHandler())
-				}, {
-					default: withCtx(() => [createTextVNode("添加" + toDisplayString(__props.config.text), 1)]),
-					_: 1
-				}, 8, [
-					"icon",
-					"size",
-					"disabled"
-				])]),
-				_: 1
-			}, 8, ["flat"])], 2);
+			return openBlock(), createElementBlock("div", { class: normalizeClass(["m-fields-code-select", __props.config.className]) }, [createVNode(unref(MContainer), {
+				config: codeConfig.value,
+				size: __props.size,
+				class: "code-select-content",
+				prop: __props.prop,
+				disabled: __props.disabled,
+				"is-compare": isCompareMode.value,
+				"last-values": __props.lastValues?.[__props.name],
+				model: __props.model[__props.name],
+				"label-position": __props.config.labelPosition,
+				"label-width": __props.config.labelWidth,
+				onChange: changeHandler
+			}, null, 8, [
+				"config",
+				"size",
+				"prop",
+				"disabled",
+				"is-compare",
+				"last-values",
+				"model",
+				"label-position",
+				"label-width"
+			])], 2);
 		};
 	}
 });

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

@@ -2,7 +2,7 @@ import { SideItemKey } from "../type.js";
 import { useServices } from "../hooks/use-services.js";
 import Icon_default from "../components/Icon.js";
 import CodeParams_default from "../components/CodeParams.js";
-import { FORM_SILENT_MODE_KEY, MContainer, MSelect, createValues, filterFunction } from "@tmagic/form";
+import { MContainer, MSelect, createValues, filterFunction } from "@tmagic/form";
 import { TMagicButton } from "@tmagic/design";
 import { computed, createBlock, createCommentVNode, createElementBlock, createElementVNode, createVNode, defineComponent, inject, openBlock, ref, unref, watch, withCtx } from "vue";
 import { isEmpty, map } from "lodash-es";
@@ -34,9 +34,8 @@ var CodeSelectCol_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ de
 	emits: ["change"],
 	setup(__props, { emit: __emit }) {
 		const mForm = inject("mForm");
-		const silentMode = inject(FORM_SILENT_MODE_KEY, false);
 		const { codeBlockService, uiService } = useServices();
-		const eventBus = inject("eventBus");
+		const eventBus = inject("eventBus", null);
 		const emit = __emit;
 		const props = __props;
 		/**
@@ -131,7 +130,7 @@ var CodeSelectCol_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ de
 						"last-values",
 						"size",
 						"prop"
-					])) : !unref(silentMode) ? (openBlock(), createBlock(unref(MSelect), {
+					])) : (openBlock(), createBlock(unref(MSelect), {
 						key: 1,
 						class: "select",
 						config: selectConfig,
@@ -145,9 +144,9 @@ var CodeSelectCol_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ de
 						"model",
 						"size",
 						"prop"
-					])) : createCommentVNode("v-if", true),
+					])),
 					createCommentVNode(" 查看/编辑按钮：对比模式为只读，不展示 "),
-					!isCompareMode.value && !unref(silentMode) && __props.model[__props.name] && hasCodeBlockSidePanel.value ? (openBlock(), createBlock(unref(TMagicButton), {
+					!isCompareMode.value && __props.model[__props.name] && hasCodeBlockSidePanel.value ? (openBlock(), createBlock(unref(TMagicButton), {
 						key: 2,
 						class: "m-fields-select-action-button",
 						size: __props.size,

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

@@ -2,6 +2,7 @@ import { getCondOpOptionsByFieldType } from "../utils/props.js";
 import { useServices } from "../hooks/use-services.js";
 import { getFieldType } from "../utils/data-source/index.js";
 import { TMagicSelect, getDesignConfig } from "@tmagic/design";
+import { removeDataSourceFieldPrefix } from "@tmagic/utils";
 import { Fragment, computed, createBlock, createElementBlock, defineComponent, mergeProps, openBlock, renderList, resolveDynamicComponent, unref, withCtx } from "vue";
 //#region packages/editor/src/fields/CondOpSelect.vue?vue&type=script&setup=true&lang.ts
 var CondOpSelect_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defineComponent({
@@ -29,8 +30,8 @@ var CondOpSelect_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ def
 		const props = __props;
 		const optionComponent = getDesignConfig("components")?.option;
 		const options = computed(() => {
-			const [id, ...fieldNames] = [...props.config.parentFields || [], ...props.model.field];
-			const ds = dataSourceService.getDataSourceById(id);
+			const [id, ...fieldNames] = [...props.config.parentFields || [], ...props.model.field || []];
+			const ds = id ? dataSourceService.getDataSourceById(removeDataSourceFieldPrefix(id)) : void 0;
 			const type = getFieldType(ds, fieldNames);
 			return getCondOpOptionsByFieldType(type);
 		});

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

@@ -31,7 +31,7 @@ var FieldSelect_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defi
 		const optionComponent = getDesignConfig("components")?.option;
 		const { dataSourceService, uiService } = useServices();
 		const mForm = inject("mForm");
-		const eventBus = inject("eventBus");
+		const eventBus = inject("eventBus", null);
 		const allDataSources = computed(() => dataSourceService.get("dataSources") || []);
 		const dataSources = computed(() => {
 			if (!props.dataSourceId) return allDataSources.value;

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

@@ -2,7 +2,7 @@ import { useServices } from "../../hooks/use-services.js";
 import Icon_default from "../../components/Icon.js";
 import DatasourceIcon_default from "../../icons/DatasourceIcon.js";
 import FieldSelect_default from "./FieldSelect.js";
-import { FORM_SILENT_MODE_KEY, getFormField } from "@tmagic/form";
+import { getFormField } from "@tmagic/form";
 import { TMagicButton, TMagicTooltip, tMagicMessage } from "@tmagic/design";
 import { DATA_SOURCE_FIELDS_SELECT_VALUE_PREFIX, removeDataSourceFieldPrefix } from "@tmagic/utils";
 import { computed, createBlock, createCommentVNode, createElementBlock, createVNode, defineComponent, inject, normalizeClass, openBlock, ref, resolveComponent, resolveDynamicComponent, unref, watch, withCtx } from "vue";
@@ -40,7 +40,6 @@ var Index_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defineComp
 		}, { immediate: true });
 		const { dataSourceService, propsService } = useServices();
 		const mForm = inject("mForm");
-		const silentMode = inject(FORM_SILENT_MODE_KEY, false);
 		const dataSources = computed(() => dataSourceService.get("dataSources") || []);
 		const disabledDataSource = computed(() => propsService.getDisabledDataSource());
 		const type = computed(() => {
@@ -60,7 +59,9 @@ var Index_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defineComp
 			let value;
 			if (typeof props.config.checkStrictly !== "function") value = props.config.checkStrictly;
 			else {
-				const dsId = removeDataSourceFieldPrefix(props.model[0]);
+				const fieldValue = props.model[props.name];
+				const rawDsId = props.config.dataSourceId ?? (Array.isArray(fieldValue) ? fieldValue[0] : fieldValue);
+				const dsId = removeDataSourceFieldPrefix(`${rawDsId}`);
 				const dataSource = dataSources.value.find((ds) => ds.id === dsId);
 				value = props.config.checkStrictly(mForm, {
 					values: mForm?.initValues || {},
@@ -104,7 +105,7 @@ var Index_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defineComp
 			showDataSourceFieldSelect.value = !showDataSourceFieldSelect.value;
 		};
 		return (_ctx, _cache) => {
-			return openBlock(), createElementBlock("div", { class: normalizeClass(["m-fields-data-source-field-select", { [`data-source-field-${type.value}`]: !isSelectValid.value }]) }, [isSelectValid.value && !unref(silentMode) ? (openBlock(), createBlock(FieldSelect_default, {
+			return openBlock(), createElementBlock("div", { class: normalizeClass(["m-fields-data-source-field-select", { [`data-source-field-${type.value}`]: !isSelectValid.value }]) }, [isSelectValid.value ? (openBlock(), createBlock(FieldSelect_default, {
 				key: 0,
 				"model-value": __props.model[__props.name],
 				disabled: __props.disabled,
@@ -122,7 +123,7 @@ var Index_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defineComp
 				"checkStrictly",
 				"dataSourceFieldType",
 				"dataSourceId"
-			])) : !unref(silentMode) ? (openBlock(), createBlock(resolveDynamicComponent(tagName.value), {
+			])) : (openBlock(), createBlock(resolveDynamicComponent(tagName.value), {
 				key: 1,
 				config: __props.config.fieldConfig,
 				model: __props.model,
@@ -144,7 +145,7 @@ var Index_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defineComp
 				"init-values",
 				"values",
 				"prop"
-			])) : createCommentVNode("v-if", true), !unref(silentMode) && __props.config.fieldConfig && !disabledDataSource.value && !unref(mForm)?.isCompare ? (openBlock(), createBlock(unref(TMagicTooltip), {
+			])), __props.config.fieldConfig && !disabledDataSource.value && !unref(mForm)?.isCompare ? (openBlock(), createBlock(unref(TMagicTooltip), {
 				key: 2,
 				disabled: showDataSourceFieldSelect.value,
 				content: "选择数据源"

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

@@ -3,11 +3,11 @@ import { useEditorContentHeight } from "../hooks/use-editor-content-height.js";
 import { useNextFloatBoxPosition } from "../hooks/use-next-float-box-position.js";
 import { error } from "../utils/logger.js";
 import FloatingBox_default from "../components/FloatingBox.js";
-import { FORM_SILENT_MODE_KEY, MFormBox } from "@tmagic/form";
+import { MFormBox } from "@tmagic/form";
 import { MagicTable } from "@tmagic/table";
 import { TMagicButton, tMagicMessage, tMagicMessageBox } from "@tmagic/design";
 import { getDefaultValueFromFields } from "@tmagic/utils";
-import { computed, createBlock, createCommentVNode, createElementBlock, createTextVNode, createVNode, defineComponent, inject, isRef, mergeModels, onMounted, openBlock, provide, ref, unref, useModel, withCtx } from "vue";
+import { computed, createCommentVNode, createElementBlock, createTextVNode, createVNode, defineComponent, inject, isRef, mergeModels, onMounted, openBlock, provide, ref, unref, useModel, withCtx } from "vue";
 //#region packages/editor/src/fields/DataSourceFields.vue?vue&type=script&setup=true&lang.ts
 var _hoisted_1 = { class: "m-editor-data-source-fields" };
 var _hoisted_2 = {
@@ -58,7 +58,6 @@ var DataSourceFields_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/
 		const emit = __emit;
 		const { uiService } = useServices();
 		const mForm = inject("mForm");
-		const silentMode = inject(FORM_SILENT_MODE_KEY, false);
 		/** 对比模式下隐藏新增/编辑/删除等操作按钮，仅保留只读展示。 */
 		const isCompare = computed(() => Boolean(mForm?.isCompare));
 		const fieldValues = ref({});
@@ -326,7 +325,6 @@ var DataSourceFields_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/
 		const editingFieldPath = inject("editingDataSourceFieldPath", computed(() => []));
 		provide("editingDataSourceFieldPath", computed(() => editingFieldPath.value.slice(1)));
 		onMounted(() => {
-			if (silentMode) return;
 			const path = editingFieldPath.value;
 			if (!path.length) return;
 			const fields = props.model[props.name] || [];
@@ -359,8 +357,7 @@ var DataSourceFields_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/
 					default: withCtx(() => [..._cache[9] || (_cache[9] = [createTextVNode("添加", -1)])]),
 					_: 1
 				}, 8, ["disabled"])])) : createCommentVNode("v-if", true),
-				!unref(silentMode) ? (openBlock(), createBlock(FloatingBox_default, {
-					key: 1,
+				createVNode(FloatingBox_default, {
 					"body-style": { padding: "0 16px" },
 					visible: addDialogVisible.value,
 					"onUpdate:visible": _cache[2] || (_cache[2] = ($event) => addDialogVisible.value = $event),
@@ -394,9 +391,8 @@ var DataSourceFields_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/
 					"title",
 					"framework-width",
 					"position"
-				])) : createCommentVNode("v-if", true),
-				!unref(silentMode) ? (openBlock(), createBlock(FloatingBox_default, {
-					key: 2,
+				]),
+				createVNode(FloatingBox_default, {
 					"body-style": { padding: "0 16px" },
 					visible: addFromJsonDialogVisible.value,
 					"onUpdate:visible": _cache[5] || (_cache[5] = ($event) => addFromJsonDialogVisible.value = $event),
@@ -421,7 +417,7 @@ var DataSourceFields_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/
 					"height",
 					"framework-width",
 					"position"
-				])) : createCommentVNode("v-if", true)
+				])
 			]);
 		};
 	}

package/dist/es/fields/DataSourceMethodSelect.vue_vue_type_script_setup_true_name_true_lang.js

@@ -3,7 +3,7 @@ import { useServices } from "../hooks/use-services.js";
 import { getFieldType } from "../utils/data-source/index.js";
 import Icon_default from "../components/Icon.js";
 import CodeParams_default from "../components/CodeParams.js";
-import { FORM_SILENT_MODE_KEY, MCascader, createValues, filterFunction } from "@tmagic/form";
+import { MCascader, createValues, filterFunction } from "@tmagic/form";
 import { TMagicButton, TMagicTooltip } from "@tmagic/design";
 import { DATA_SOURCE_SET_DATA_METHOD_NAME } from "@tmagic/utils";
 import { computed, createBlock, createCommentVNode, createElementBlock, createElementVNode, createVNode, defineComponent, inject, openBlock, ref, unref, withCtx } from "vue";
@@ -36,8 +36,7 @@ var DataSourceMethodSelect_vue_vue_type_script_setup_true_name_true_lang_default
 	setup(__props, { emit: __emit }) {
 		const { dataSourceService, uiService } = useServices();
 		const mForm = inject("mForm");
-		const silentMode = inject(FORM_SILENT_MODE_KEY, false);
-		const eventBus = inject("eventBus");
+		const eventBus = inject("eventBus", null);
 		const emit = __emit;
 		const props = __props;
 		const dataSourceSidePanel = computed(() => (uiService.get("sideBarItems") || []).find((item) => item.$key === SideItemKey.DATA_SOURCE));
@@ -135,8 +134,7 @@ var DataSourceMethodSelect_vue_vue_type_script_setup_true_name_true_lang_default
 			eventBus?.emit("edit-data-source-method", id, methodName);
 		};
 		return (_ctx, _cache) => {
-			return openBlock(), createElementBlock("div", _hoisted_1, [createElementVNode("div", _hoisted_2, [!unref(silentMode) ? (openBlock(), createBlock(unref(MCascader), {
-				key: 0,
+			return openBlock(), createElementBlock("div", _hoisted_1, [createElementVNode("div", _hoisted_2, [createVNode(unref(MCascader), {
 				class: "select",
 				config: cascaderConfig.value,
 				model: __props.model,
@@ -152,8 +150,8 @@ var DataSourceMethodSelect_vue_vue_type_script_setup_true_name_true_lang_default
 				"size",
 				"disabled",
 				"prop"
-			])) : createCommentVNode("v-if", true), !unref(silentMode) && __props.model[__props.name] && isCustomMethod.value && dataSourceSidePanel.value && !isCompare.value ? (openBlock(), createBlock(unref(TMagicTooltip), {
-				key: 1,
+			]), __props.model[__props.name] && isCustomMethod.value && dataSourceSidePanel.value && !isCompare.value ? (openBlock(), createBlock(unref(TMagicTooltip), {
+				key: 0,
 				content: notEditable.value ? "查看" : "编辑"
 			}, {
 				default: withCtx(() => [createVNode(unref(TMagicButton), {