@tmagic/form 1.8.0-beta.2 → 1.8.0-beta.20

package/dist/es/Form.vue_vue_type_script_setup_true_lang.js

@@ -1,13 +1,13 @@
-import { FORM_DIFF_CONFIG_KEY } from "./schema.js";
+import { FORM_DIFF_CONFIG_KEY, FORM_TYPE_MATCH_VALID_KEY } from "./schema.js";
+import { applyExtendState, initValue } from "./utils/form.js";
 import { getConfig } from "./utils/config.js";
-import { initValue } from "./utils/form.js";
 import Container_default from "./containers/Container.js";
-import { Fragment, createBlock, createCommentVNode, createElementBlock, createSlots, defineComponent, mergeProps, normalizeStyle, openBlock, provide, reactive, ref, renderList, renderSlot, shallowRef, toRaw, unref, useTemplateRef, watch, watchEffect, withCtx } from "vue";
+import { Fragment, computed, createBlock, createCommentVNode, createElementBlock, createSlots, defineComponent, inject, mergeProps, nextTick, normalizeClass, normalizeStyle, openBlock, provide, reactive, ref, renderList, renderSlot, shallowRef, toRaw, unref, useTemplateRef, watch, watchEffect, withCtx } from "vue";
 import { cloneDeep, isEqual } from "lodash-es";
-import { TMagicForm, tMagicMessage, tMagicMessageBox } from "@tmagic/design";
+import { M_THEME_KEY, TMagicForm, tMagicMessage, tMagicMessageBox } from "@tmagic/design";
 import { setValueByKeyPath } from "@tmagic/utils";
 //#region packages/form/src/Form.vue?vue&type=script&setup=true&lang.ts
-var Form_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ defineComponent({
+var Form_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defineComponent({
 	name: "MForm",
 	__name: "Form",
 	props: {
@@ -20,6 +20,11 @@ var Form_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ defineCom
 		},
 		parentValues: { default: () => ({}) },
 		labelWidth: { default: "200px" },
+		typeMatchValid: { type: Boolean },
+		validateOnInit: {
+			type: Boolean,
+			default: false
+		},
 		disabled: {
 			type: Boolean,
 			default: false
@@ -35,9 +40,14 @@ var Form_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ defineCom
 		keyProp: { default: "__key" },
 		popperClass: {},
 		preventSubmitDefault: { type: Boolean },
+		useFieldTextInError: {
+			type: Boolean,
+			default: true
+		},
 		extendState: {},
 		showDiff: {},
-		selfDiffFieldTypes: {}
+		selfDiffFieldTypes: {},
+		theme: {}
 	},
 	emits: [
 		"change",
@@ -49,6 +59,7 @@ var Form_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ defineCom
 	setup(__props, { expose: __expose, emit: __emit }) {
 		const props = __props;
 		const emit = __emit;
+		provide(FORM_TYPE_MATCH_VALID_KEY, computed(() => props.typeMatchValid));
 		const tMagicFormRef = useTemplateRef("tMagicForm");
 		const initialized = ref(false);
 		const values = ref({});
@@ -56,6 +67,25 @@ var Form_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ defineCom
 		const fields = /* @__PURE__ */ new Map();
 		const requestFuc = getConfig("request");
 		/**
+		* 当前表单生效的主题名称：
+		* - 优先用本组件自己的 `props.theme`；
+		* - 没设置时回退到最近祖先 `<MEditor>` / `<MForm>` provide 的主题，便于内嵌于编辑器
+		*   时自动跟随外层主题，无需在每个 `MForm` 上重复传 `theme`。
+		*
+		* 同时把合并后的值再 provide 出去（见下方 `provide(M_THEME_KEY, ...)`），让 form 子树
+		* 里再嵌套的 portal 组件（`TMagicPopover` 等）依然能拿到非空主题。
+		*/
+		const ancestorTheme = inject(M_THEME_KEY, null);
+		const effectiveTheme = computed(() => props.theme || ancestorTheme?.value || "");
+		/**
+		* 拼到 `formState.popperClass` 上的主题修饰类（仅 `m-theme--<theme>`，
+		* 不带 `m-form` / `m-editor` 前缀，因为 Element Plus 弹层节点本身既不是 form 也不是 editor）。
+		*
+		* 这条类会随所有读 `mForm.popperClass` 的字段（Select / DateTime / Cascader 等）下发到
+		* Element Plus 的 `popper-class`，让 portal 节点也命中 `m-theme--<theme>` 上的 CSS 变量。
+		*/
+		const themeClass = computed(() => effectiveTheme.value ? `m-theme--${effectiveTheme.value}` : "");
+		/**
 		* formState 实现说明：
 		*
 		* 1. 与 props 直接对应的字段（config / initValues / lastValues / isCompare / parentValues /
@@ -71,13 +101,21 @@ var Form_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ defineCom
 		*      把最新值刷进 formState。
 		*    - accessor 描述符（`{ get stage() { return ... } }`）按原样写入，调用方可以控制
 		*      读时求值，每次读取都会重新执行 getter。
+		*
+		* 4. `popperClass` 会自动拼接 `themeClass`：调用方传入的 `popperClass` + 当前主题
+		*    修饰类（含祖先 `<MEditor>` provide 的主题）。这样所有透传到 Element Plus 弹层
+		*    `popper-class` 的字段（Select / DateTime / Cascader 等）能自带主题作用域。
 		*/
 		const formState = reactive({
 			get keyProp() {
 				return props.keyProp;
 			},
 			get popperClass() {
-				return props.popperClass;
+				const userClass = props.popperClass ?? "";
+				const tc = themeClass.value;
+				if (!userClass) return tc;
+				if (!tc) return userClass;
+				return `${userClass} ${tc}`;
 			},
 			get config() {
 				return props.config;
@@ -111,6 +149,17 @@ var Form_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ defineCom
 			}
 		});
 		/**
+		* formState 的内置 key 快照（keyProp / values / $emit / fields / post 等）。
+		*
+		* 在 `extendState` 首次合并前捕获，`applyExtendState` 会据此禁止 `extendState`
+		* 覆盖这些已有字段（只能新增字段），避免表单核心状态被外部意外改写。
+		*
+		* 之所以在此处（effect 之外）捕获而不是在 `applyExtendState` 内动态取：
+		* `watchEffect` 会在依赖变化时重跑，若动态取，`extendState` 自己新增的字段在第二次
+		* 合并时也会被当成「已有 key」而拒绝刷新；这里只锁定内置字段即可规避该问题。
+		*/
+		const reservedStateKeys = new Set(Reflect.ownKeys(formState));
+		/**
 		* `extendState` 的同步段（直到第一个 `await` 之前）所访问的任何响应式数据，
 		* 都会被 `watchEffect` 自动跟踪。这样可以兼容历史用法 ——
 		*
@@ -125,11 +174,10 @@ var Form_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ defineCom
 		* 这里不再重复同步；因此 `props.initValues` 这类高频变化也不会再触发
 		* `extendState` 重跑（旧版的性能问题修复点）。
 		*
-		* 实现细节：
-		* - data 描述符：通过 `formState[key] = value` 走 reactive proxy 的 set，
-		*   触发依赖通知；与旧版「逐项赋值」语义完全等价。
-		* - accessor 描述符（`{ get stage() {...} }`）按原样写入 formState，调用方
-		*   可以自行控制读时求值；强制 `configurable: true` 以便下一次重跑可再 define。
+		* 实现细节：合并逻辑统一收口在 `applyExtendState`（utils/form）——
+		* data 描述符走 reactive proxy 的 set 触发依赖通知（与旧版「逐项赋值」语义等价），
+		* accessor 描述符按原样 defineProperty 支持读时求值；
+		* props 派生的只读 getter 字段（keyProp 等）以普通字段形式返回时会被跳过并告警。
 		*/
 		watchEffect(async (onCleanup) => {
 			const { extendState } = props;
@@ -146,13 +194,16 @@ var Form_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ defineCom
 				return;
 			}
 			if (stale) return;
-			for (const [key, descriptor] of Object.entries(Object.getOwnPropertyDescriptors(state))) if ("value" in descriptor) formState[key] = state[key];
-			else {
-				descriptor.configurable = true;
-				Object.defineProperty(formState, key, descriptor);
-			}
+			applyExtendState(formState, state, reservedStateKeys);
 		});
 		provide("mForm", formState);
+		/**
+		* 把生效主题（自身或祖先）再 provide 出去，供 form 子树内含 `Teleport` 的组件
+		* （如 `TMagicPopover`）在传送目标上挂 `m-theme--<theme>` 类。
+		* 详见 `@tmagic/design/theme.ts`。
+		*/
+		provide(M_THEME_KEY, effectiveTheme);
+		provide("formInline", props.inline);
 		provide(FORM_DIFF_CONFIG_KEY, {
 			get showDiff() {
 				return props.showDiff;
@@ -171,6 +222,9 @@ var Form_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ defineCom
 			}).then((value) => {
 				values.value = value;
 				initialized.value = !props.isCompare;
+				if (props.validateOnInit) nextTick(() => {
+					tMagicFormRef.value?.validate();
+				});
 			});
 			if (props.isCompare) initValue(formState, {
 				initValues: props.lastValues,
@@ -222,6 +276,23 @@ var Form_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ defineCom
 			};
 			return findInConfig(config, nameParts);
 		};
+		/**
+		* 将校验返回的 invalidFields 汇总为可读的错误文案（多条以 `<br>` 拼接）。
+		*
+		* 抽离为独立方法，供 `submitForm`（提交校验）与 `validate`（返回错误文案的校验）复用，
+		* 保证两种校验入口产出的错误文案格式完全一致。
+		*/
+		const formatValidateError = (invalidFields) => {
+			const error = [];
+			Object.entries(invalidFields).forEach(([prop, validateError]) => {
+				validateError.forEach(({ field, message }) => {
+					const name = field || prop;
+					const text = (props.useFieldTextInError ? getTextByName(name, props.config) : void 0) || name;
+					error.push(`${text} -> ${message}`);
+				});
+			});
+			return error.join("<br>");
+		};
 		__expose({
 			values,
 			lastValuesProcessed,
@@ -241,22 +312,43 @@ var Form_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ defineCom
 					return native ? values.value : cloneDeep(toRaw(values.value));
 				} catch (invalidFields) {
 					emit("error", invalidFields);
-					const error = [];
-					Object.entries(invalidFields).forEach(([prop, ValidateError]) => {
-						ValidateError.forEach(({ field, message }) => {
-							const name = field || prop;
-							const text = getTextByName(name, props.config) || name;
-							error.push(`${text} -> ${message}`);
-						});
-					});
-					throw new Error(error.join("<br>"));
+					throw new Error(formatValidateError(invalidFields));
+				}
+			},
+			/**
+			* 校验：对表单当前值执行校验，返回汇总后的错误文案。
+			*
+			* 与 `submitForm` 的区别：
+			* - 校验失败时不抛异常、不触发 `error` 事件，而是以返回值形式给出错误文案；
+			* - 不重置 `changeRecords`，不改变提交语义，仅用于「探测」当前配置是否合法。
+			*
+			* 注意：本方法只改变「校验结果的返回方式」，并不负责「不污染页面表单状态」——
+			* 若需对一份独立的「配置 + 值」做完全不影响页面上已渲染表单的校验，请使用 `validateForm`
+			* （内部会新建一个隐藏的 MForm 实例，通过 `initValues` 传入待校验值，用完即卸载）。
+			*
+			* 典型用途：作为 `validateForm` 内部复用的校验实现；也可在已渲染的表单实例上主动调用，
+			* 根据返回的错误文案自行决定后续处理（如记录节点错误状态）。
+			*
+			* @returns 校验通过返回空字符串 `''`，否则返回以 `<br>` 拼接的错误文案。
+			*/
+			validate: async () => {
+				try {
+					const result = await tMagicFormRef.value?.validate();
+					if (result !== true) throw result;
+					return "";
+				} catch (invalidFields) {
+					return formatValidateError(invalidFields);
 				}
 			},
 			getTextByName
 		});
 		return (_ctx, _cache) => {
 			return openBlock(), createBlock(unref(TMagicForm), {
-				class: "m-form",
+				class: normalizeClass([
+					"m-form",
+					effectiveTheme.value ? `m-form--${effectiveTheme.value}` : "",
+					effectiveTheme.value ? `m-theme--${effectiveTheme.value}` : ""
+				]),
 				ref: "tMagicForm",
 				model: values.value,
 				"label-width": __props.labelWidth,
@@ -294,6 +386,7 @@ var Form_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ defineCom
 				}), 128)) : createCommentVNode("v-if", true)]),
 				_: 3
 			}, 8, [
+				"class",
 				"model",
 				"label-width",
 				"style",

package/dist/es/FormBox.vue_vue_type_script_setup_true_lang.js

@@ -3,7 +3,7 @@ import { computed, createElementBlock, createElementVNode, createTextVNode, crea
 import { TMagicButton, TMagicScrollbar } from "@tmagic/design";
 //#region packages/form/src/FormBox.vue?vue&type=script&setup=true&lang.ts
 var footerHeight = 60;
-var FormBox_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ defineComponent({
+var FormBox_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defineComponent({
 	name: "MFormBox",
 	__name: "FormBox",
 	props: {
@@ -13,12 +13,21 @@ var FormBox_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ define
 		width: {},
 		height: {},
 		labelWidth: {},
+		typeMatchValid: { type: Boolean },
+		validateOnInit: {
+			type: Boolean,
+			default: false
+		},
 		disabled: { type: Boolean },
 		size: {},
 		confirmText: { default: "确定" },
 		inline: { type: Boolean },
 		labelPosition: {},
 		preventSubmitDefault: { type: Boolean },
+		useFieldTextInError: {
+			type: Boolean,
+			default: true
+		},
 		extendState: {}
 	},
 	emits: [
@@ -45,7 +54,8 @@ var FormBox_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ define
 		const submitHandler = async () => {
 			try {
 				const changeRecords = form.value?.changeRecords;
-				emit("submit", await form.value?.submitForm(), { changeRecords });
+				const values = await form.value?.submitForm();
+				emit("submit", values, { changeRecords });
 			} catch (e) {
 				emit("error", e);
 			}
@@ -81,7 +91,10 @@ var FormBox_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ define
 					"label-position": __props.labelPosition,
 					inline: __props.inline,
 					"prevent-submit-default": __props.preventSubmitDefault,
+					"use-field-text-in-error": __props.useFieldTextInError,
 					"extend-state": __props.extendState,
+					"type-match-valid": __props.typeMatchValid,
+					"validate-on-init": __props.validateOnInit,
 					onChange: changeHandler
 				}, null, 8, [
 					"size",
@@ -93,7 +106,10 @@ var FormBox_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ define
 					"label-position",
 					"inline",
 					"prevent-submit-default",
-					"extend-state"
+					"use-field-text-in-error",
+					"extend-state",
+					"type-match-valid",
+					"validate-on-init"
 				]), renderSlot(_ctx.$slots, "default")]),
 				_: 3
 			})], 4), createElementVNode("div", {

package/dist/es/FormDialog.vue_vue_type_script_setup_true_lang.js

@@ -1,9 +1,9 @@
 import Form_default from "./Form.js";
-import { computed, createBlock, createCommentVNode, createElementBlock, createElementVNode, createTextVNode, createVNode, defineComponent, normalizeStyle, openBlock, ref, renderSlot, toDisplayString, unref, withCtx } from "vue";
-import { TMagicButton, TMagicCol, TMagicDialog, TMagicRow } from "@tmagic/design";
+import { computed, createBlock, createCommentVNode, createElementBlock, createElementVNode, createTextVNode, createVNode, defineComponent, inject, normalizeClass, normalizeStyle, openBlock, provide, ref, renderSlot, toDisplayString, unref, withCtx } from "vue";
+import { M_THEME_KEY, TMagicButton, TMagicCol, TMagicDialog, TMagicRow } from "@tmagic/design";
 //#region packages/form/src/FormDialog.vue?vue&type=script&setup=true&lang.ts
 var _hoisted_1 = { style: { "min-height": "1px" } };
-var FormDialog_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ defineComponent({
+var FormDialog_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defineComponent({
 	name: "MFormDialog",
 	__name: "FormDialog",
 	props: {
@@ -12,6 +12,11 @@ var FormDialog_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ def
 		parentValues: {},
 		width: {},
 		labelWidth: {},
+		typeMatchValid: { type: Boolean },
+		validateOnInit: {
+			type: Boolean,
+			default: false
+		},
 		fullscreen: { type: Boolean },
 		disabled: { type: Boolean },
 		title: {},
@@ -41,7 +46,12 @@ var FormDialog_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ def
 			type: Boolean,
 			default: true
 		},
-		extendState: {}
+		useFieldTextInError: {
+			type: Boolean,
+			default: true
+		},
+		extendState: {},
+		theme: {}
 	},
 	emits: [
 		"close",
@@ -51,6 +61,9 @@ var FormDialog_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ def
 	],
 	setup(__props, { expose: __expose, emit: __emit }) {
 		const props = __props;
+		const ancestorTheme = inject(M_THEME_KEY, null);
+		const effectiveTheme = computed(() => props.theme || ancestorTheme?.value || "");
+		provide(M_THEME_KEY, effectiveTheme);
 		const emit = __emit;
 		const form = ref();
 		const dialogVisible = ref(false);
@@ -74,7 +87,8 @@ var FormDialog_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ def
 		const save = async () => {
 			try {
 				const changeRecords = [...form.value?.changeRecords || []];
-				emit("submit", await form.value?.submitForm(), { changeRecords });
+				const values = await form.value?.submitForm();
+				emit("submit", values, { changeRecords });
 			} catch (e) {
 				emit("error", e);
 			}
@@ -110,7 +124,7 @@ var FormDialog_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ def
 			return openBlock(), createBlock(unref(TMagicDialog), {
 				modelValue: dialogVisible.value,
 				"onUpdate:modelValue": _cache[1] || (_cache[1] = ($event) => dialogVisible.value = $event),
-				class: "m-form-dialog",
+				class: normalizeClass(["m-form-dialog", effectiveTheme.value ? `m-theme--${effectiveTheme.value}` : ""]),
 				top: "20px",
 				"append-to-body": "",
 				title: __props.title,
@@ -191,7 +205,11 @@ var FormDialog_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ def
 					"label-position": __props.labelPosition,
 					inline: __props.inline,
 					"prevent-submit-default": __props.preventSubmitDefault,
+					"use-field-text-in-error": __props.useFieldTextInError,
+					"type-match-valid": __props.typeMatchValid,
+					"validate-on-init": __props.validateOnInit,
 					"extend-state": __props.extendState,
+					theme: effectiveTheme.value,
 					onChange: changeHandler
 				}, null, 8, [
 					"modelValue",
@@ -204,11 +222,16 @@ var FormDialog_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ def
 					"label-position",
 					"inline",
 					"prevent-submit-default",
-					"extend-state"
+					"use-field-text-in-error",
+					"type-match-valid",
+					"validate-on-init",
+					"extend-state",
+					"theme"
 				]), renderSlot(_ctx.$slots, "default")], 4)) : createCommentVNode("v-if", true)]),
 				_: 3
 			}, 8, [
 				"modelValue",
+				"class",
 				"title",
 				"width",
 				"zIndex",

package/dist/es/FormDrawer.vue_vue_type_script_setup_true_lang.js

@@ -1,10 +1,10 @@
 import Form_default from "./Form.js";
-import { createBlock, createCommentVNode, createElementBlock, createElementVNode, createTextVNode, createVNode, defineComponent, openBlock, ref, renderSlot, toDisplayString, unref, watchEffect, withCtx } from "vue";
-import { TMagicButton, TMagicCol, TMagicDrawer, TMagicRow } from "@tmagic/design";
+import { computed, createBlock, createCommentVNode, createElementBlock, createElementVNode, createTextVNode, createVNode, defineComponent, inject, normalizeClass, openBlock, provide, ref, renderSlot, toDisplayString, unref, watchEffect, withCtx } from "vue";
+import { M_THEME_KEY, TMagicButton, TMagicCol, TMagicDrawer, TMagicRow } from "@tmagic/design";
 //#region packages/form/src/FormDrawer.vue?vue&type=script&setup=true&lang.ts
 var _hoisted_1 = { style: { "min-height": "1px" } };
-var FormDrawer_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ defineComponent({
-	name: "MFormDialog",
+var FormDrawer_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defineComponent({
+	name: "MFormDrawer",
 	__name: "FormDrawer",
 	props: {
 		config: { default: () => [] },
@@ -12,6 +12,11 @@ var FormDrawer_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ def
 		parentValues: {},
 		width: {},
 		labelWidth: {},
+		typeMatchValid: { type: Boolean },
+		validateOnInit: {
+			type: Boolean,
+			default: false
+		},
 		disabled: { type: Boolean },
 		closeOnPressEscape: {
 			type: Boolean,
@@ -24,8 +29,13 @@ var FormDrawer_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ def
 		inline: { type: Boolean },
 		labelPosition: {},
 		preventSubmitDefault: { type: Boolean },
+		useFieldTextInError: {
+			type: Boolean,
+			default: true
+		},
 		beforeClose: {},
-		extendState: {}
+		extendState: {},
+		theme: {}
 	},
 	emits: [
 		"close",
@@ -37,11 +47,15 @@ var FormDrawer_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ def
 		"opened"
 	],
 	setup(__props, { expose: __expose, emit: __emit }) {
+		const props = __props;
+		const ancestorTheme = inject(M_THEME_KEY, null);
+		const effectiveTheme = computed(() => props.theme || ancestorTheme?.value || "");
+		provide(M_THEME_KEY, effectiveTheme);
 		const emit = __emit;
 		const drawer = ref();
 		const form = ref();
 		const drawerBody = ref();
-		const visible = ref(false);
+		const dialogVisible = ref(false);
 		const saveFetch = ref(false);
 		const bodyHeight = ref(0);
 		watchEffect(() => {
@@ -50,7 +64,8 @@ var FormDrawer_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ def
 		const submitHandler = async () => {
 			try {
 				const changeRecords = form.value?.changeRecords;
-				emit("submit", await form.value?.submitForm(), { changeRecords });
+				const values = await form.value?.submitForm();
+				emit("submit", values, { changeRecords });
 			} catch (e) {
 				emit("error", e);
 			}
@@ -71,30 +86,48 @@ var FormDrawer_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ def
 			emit("closed");
 		};
 		const show = () => {
-			visible.value = true;
+			dialogVisible.value = true;
 		};
 		const hide = () => {
-			visible.value = false;
+			dialogVisible.value = false;
+		};
+		const close = () => {
+			dialogVisible.value = false;
+		};
+		const cancel = () => {
+			hide();
 		};
 		/** 用于关闭 Drawer, 该方法会调用传入的 before-close 方法 */
 		const handleClose = () => {
 			drawer.value?.handleClose();
 		};
+		const save = async () => {
+			try {
+				const changeRecords = [...form.value?.changeRecords || []];
+				const values = await form.value?.submitForm();
+				emit("submit", values, { changeRecords });
+			} catch (e) {
+				emit("error", e);
+			}
+		};
 		__expose({
 			form,
 			saveFetch,
 			bodyHeight,
+			close,
 			show,
 			hide,
+			save,
+			cancel,
 			handleClose
 		});
 		return (_ctx, _cache) => {
 			return openBlock(), createBlock(unref(TMagicDrawer), {
-				class: "m-form-drawer",
+				class: normalizeClass(["m-form-drawer", effectiveTheme.value ? `m-theme--${effectiveTheme.value}` : ""]),
 				ref_key: "drawer",
 				ref: drawer,
-				modelValue: visible.value,
-				"onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => visible.value = $event),
+				modelValue: dialogVisible.value,
+				"onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => dialogVisible.value = $event),
 				title: __props.title,
 				"close-on-press-escape": __props.closeOnPressEscape,
 				"append-to-body": true,
@@ -132,7 +165,7 @@ var FormDrawer_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ def
 					})]),
 					_: 3
 				})]),
-				default: withCtx(() => [visible.value ? (openBlock(), createElementBlock("div", {
+				default: withCtx(() => [dialogVisible.value ? (openBlock(), createElementBlock("div", {
 					key: 0,
 					ref_key: "drawerBody",
 					ref: drawerBody,
@@ -149,7 +182,11 @@ var FormDrawer_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ def
 					"label-position": __props.labelPosition,
 					inline: __props.inline,
 					"prevent-submit-default": __props.preventSubmitDefault,
+					"use-field-text-in-error": __props.useFieldTextInError,
+					"type-match-valid": __props.typeMatchValid,
+					"validate-on-init": __props.validateOnInit,
 					"extend-state": __props.extendState,
+					theme: effectiveTheme.value,
 					onChange: changeHandler
 				}, null, 8, [
 					"size",
@@ -161,10 +198,15 @@ var FormDrawer_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ def
 					"label-position",
 					"inline",
 					"prevent-submit-default",
-					"extend-state"
+					"use-field-text-in-error",
+					"type-match-valid",
+					"validate-on-init",
+					"extend-state",
+					"theme"
 				]), renderSlot(_ctx.$slots, "default")], 512)) : createCommentVNode("v-if", true)]),
 				_: 3
 			}, 8, [
+				"class",
 				"modelValue",
 				"title",
 				"close-on-press-escape",

package/dist/es/containers/Col.vue_vue_type_script_setup_true_lang.js

@@ -3,7 +3,7 @@ import Container_default from "./Container.js";
 import { computed, createBlock, createVNode, defineComponent, inject, openBlock, unref, vShow, withCtx, withDirectives } from "vue";
 import { TMagicCol } from "@tmagic/design";
 //#region packages/form/src/containers/Col.vue?vue&type=script&setup=true&lang.ts
-var Col_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ defineComponent({
+var Col_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defineComponent({
 	name: "MFormCol",
 	__name: "Col",
 	props: {
@@ -40,7 +40,8 @@ var Col_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ defineComp
 					size: __props.size,
 					disabled: __props.disabled,
 					onChange: changeHandler,
-					onAddDiffCount
+					onAddDiffCount,
+					"is-in-row": true
 				}, null, 8, [
 					"model",
 					"lastValues",