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

package/dist/tmagic-form.umd.cjs

@@ -1,15 +1,16 @@
 (function(global, factory) {
-	typeof exports === "object" && typeof module !== "undefined" ? factory(exports, require("vue"), require("@tmagic/design"), require("@tmagic/utils"), require("@element-plus/icons-vue"), require("dayjs"), require("dayjs/plugin/utc"), require("@popperjs/core")) : typeof define === "function" && define.amd ? define([
+	typeof exports === "object" && typeof module !== "undefined" ? factory(exports, require("vue"), require("dayjs"), require("dayjs/plugin/utc"), require("@tmagic/design"), require("@tmagic/utils"), require("dayjs/plugin/customParseFormat"), require("@element-plus/icons-vue"), require("@popperjs/core")) : typeof define === "function" && define.amd ? define([
 		"exports",
 		"vue",
+		"dayjs",
+		"dayjs/plugin/utc",
 		"@tmagic/design",
 		"@tmagic/utils",
+		"dayjs/plugin/customParseFormat",
 		"@element-plus/icons-vue",
-		"dayjs",
-		"dayjs/plugin/utc",
 		"@popperjs/core"
-	], factory) : (global = typeof globalThis !== "undefined" ? globalThis : global || self, factory(global.TMagicForm = {}, global.Vue, global._tmagic_design, global._tmagic_utils, global._element_plus_icons_vue, global.dayjs, global.dayjs_plugin_utc, global._popperjs_core));
-})(this, function(exports, vue, _tmagic_design, _tmagic_utils, _element_plus_icons_vue, dayjs, dayjs_plugin_utc, _popperjs_core) {
+	], factory) : (global = typeof globalThis !== "undefined" ? globalThis : global || self, factory(global.TMagicForm = {}, global.Vue, global.dayjs, global.dayjs_plugin_utc, global._tmagic_design, global._tmagic_utils, global.dayjs_plugin_customParseFormat, global._element_plus_icons_vue, global._popperjs_core));
+})(this, function(exports, vue, dayjs, dayjs_plugin_utc, _tmagic_design, _tmagic_utils, dayjs_plugin_customParseFormat, _element_plus_icons_vue, _popperjs_core) {
 	Object.defineProperties(exports, {
 		__esModule: { value: true },
 		[Symbol.toStringTag]: { value: "Module" }
@@ -38,8 +39,20 @@
 	//#endregion
 	dayjs = __toESM(dayjs, 1);
 	dayjs_plugin_utc = __toESM(dayjs_plugin_utc, 1);
+	dayjs_plugin_customParseFormat = __toESM(dayjs_plugin_customParseFormat, 1);
 	//#region packages/form/src/schema.ts
 	var FORM_DIFF_CONFIG_KEY = Symbol("mFormDiffConfig");
+	var FORM_TYPE_MATCH_VALID_KEY = Symbol("mFormTypeMatchValid");
+	/**
+	* 静默模式标记，由 `submitForm` / `validateForm` 以隐藏方式挂载临时表单时 provide（debug 弹层模式不提供）。
+	*
+	* 重型字段组件（如 vs-code）可 inject 该标记并跳过自身渲染：字段校验由 FormItem 基于 model 值完成，
+	* 与叶子 UI 组件实例无关，跳过可省去无谓的实例化开销（如 monaco worker / model 的创建）。
+	*
+	* 注意：仅「挂载无值副作用」（不在 onMounted/watch immediate 中 emit change、不依赖 DOM 计算值）的
+	* 字段组件可以安全跳过，接入前需逐一审计。
+	*/
+	var FORM_SILENT_MODE_KEY = Symbol("mFormSilentMode");
 	//#endregion
 	//#region node_modules/.pnpm/lodash-es@4.17.21/node_modules/lodash-es/_freeGlobal.js
 	/** Detect free variable `global` from Node.js. */
@@ -107,7 +120,8 @@
 	//#endregion
 	//#region node_modules/.pnpm/lodash-es@4.17.21/node_modules/lodash-es/_baseGetTag.js
 	/** `Object#toString` result references. */
-	var nullTag = "[object Null]", undefinedTag = "[object Undefined]";
+	var nullTag = "[object Null]";
+	var undefinedTag = "[object Undefined]";
 	/** Built-in value references. */
 	var symToStringTag = Symbol$1 ? Symbol$1.toStringTag : void 0;
 	/**
@@ -312,7 +326,10 @@
 	//#endregion
 	//#region node_modules/.pnpm/lodash-es@4.17.21/node_modules/lodash-es/isFunction.js
 	/** `Object#toString` result references. */
-	var asyncTag = "[object AsyncFunction]", funcTag$2 = "[object Function]", genTag$1 = "[object GeneratorFunction]", proxyTag = "[object Proxy]";
+	var asyncTag = "[object AsyncFunction]";
+	var funcTag$2 = "[object Function]";
+	var genTag$1 = "[object GeneratorFunction]";
+	var proxyTag = "[object Proxy]";
 	/**
 	* Checks if `value` is classified as a `Function` object.
 	*
@@ -388,7 +405,8 @@
 	/** Used to detect host constructors (Safari). */
 	var reIsHostCtor = /^\[object .+?Constructor\]$/;
 	/** Used for built-in method references. */
-	var funcProto = Function.prototype, objectProto$2 = Object.prototype;
+	var funcProto = Function.prototype;
+	var objectProto$2 = Object.prototype;
 	/** Used to resolve the decompiled source of functions. */
 	var funcToString = funcProto.toString;
 	/** Used to check objects for own properties. */
@@ -806,8 +824,30 @@
 	//#endregion
 	//#region node_modules/.pnpm/lodash-es@4.17.21/node_modules/lodash-es/_baseIsTypedArray.js
 	/** `Object#toString` result references. */
-	var argsTag$2 = "[object Arguments]", arrayTag$2 = "[object Array]", boolTag$3 = "[object Boolean]", dateTag$3 = "[object Date]", errorTag$2 = "[object Error]", funcTag$1 = "[object Function]", mapTag$6 = "[object Map]", numberTag$3 = "[object Number]", objectTag$3 = "[object Object]", regexpTag$3 = "[object RegExp]", setTag$6 = "[object Set]", stringTag$3 = "[object String]", weakMapTag$2 = "[object WeakMap]";
-	var arrayBufferTag$3 = "[object ArrayBuffer]", dataViewTag$4 = "[object DataView]", float32Tag$2 = "[object Float32Array]", float64Tag$2 = "[object Float64Array]", int8Tag$2 = "[object Int8Array]", int16Tag$2 = "[object Int16Array]", int32Tag$2 = "[object Int32Array]", uint8Tag$2 = "[object Uint8Array]", uint8ClampedTag$2 = "[object Uint8ClampedArray]", uint16Tag$2 = "[object Uint16Array]", uint32Tag$2 = "[object Uint32Array]";
+	var argsTag$2 = "[object Arguments]";
+	var arrayTag$2 = "[object Array]";
+	var boolTag$3 = "[object Boolean]";
+	var dateTag$3 = "[object Date]";
+	var errorTag$2 = "[object Error]";
+	var funcTag$1 = "[object Function]";
+	var mapTag$6 = "[object Map]";
+	var numberTag$3 = "[object Number]";
+	var objectTag$3 = "[object Object]";
+	var regexpTag$3 = "[object RegExp]";
+	var setTag$6 = "[object Set]";
+	var stringTag$3 = "[object String]";
+	var weakMapTag$2 = "[object WeakMap]";
+	var arrayBufferTag$3 = "[object ArrayBuffer]";
+	var dataViewTag$4 = "[object DataView]";
+	var float32Tag$2 = "[object Float32Array]";
+	var float64Tag$2 = "[object Float64Array]";
+	var int8Tag$2 = "[object Int8Array]";
+	var int16Tag$2 = "[object Int16Array]";
+	var int32Tag$2 = "[object Int32Array]";
+	var uint8Tag$2 = "[object Uint8Array]";
+	var uint8ClampedTag$2 = "[object Uint8ClampedArray]";
+	var uint16Tag$2 = "[object Uint16Array]";
+	var uint32Tag$2 = "[object Uint32Array]";
 	/** Used to identify `toStringTag` values of typed arrays. */
 	var typedArrayTags = {};
 	typedArrayTags[float32Tag$2] = typedArrayTags[float64Tag$2] = typedArrayTags[int8Tag$2] = typedArrayTags[int16Tag$2] = typedArrayTags[int32Tag$2] = typedArrayTags[uint8Tag$2] = typedArrayTags[uint8ClampedTag$2] = typedArrayTags[uint16Tag$2] = typedArrayTags[uint32Tag$2] = true;
@@ -1543,7 +1583,8 @@
 	/** Detect free variable `module`. */
 	var freeModule = freeExports && typeof module == "object" && module && !module.nodeType && module;
 	/** Built-in value references. */
-	var Buffer$1 = freeModule && freeModule.exports === freeExports ? root.Buffer : void 0, allocUnsafe = Buffer$1 ? Buffer$1.allocUnsafe : void 0;
+	var Buffer$1 = freeModule && freeModule.exports === freeExports ? root.Buffer : void 0;
+	var allocUnsafe = Buffer$1 ? Buffer$1.allocUnsafe : void 0;
 	/**
 	* Creates a clone of  `buffer`.
 	*
@@ -1716,10 +1757,18 @@
 	//#endregion
 	//#region node_modules/.pnpm/lodash-es@4.17.21/node_modules/lodash-es/_getTag.js
 	/** `Object#toString` result references. */
-	var mapTag$5 = "[object Map]", objectTag$2 = "[object Object]", promiseTag = "[object Promise]", setTag$5 = "[object Set]", weakMapTag$1 = "[object WeakMap]";
+	var mapTag$5 = "[object Map]";
+	var objectTag$2 = "[object Object]";
+	var promiseTag = "[object Promise]";
+	var setTag$5 = "[object Set]";
+	var weakMapTag$1 = "[object WeakMap]";
 	var dataViewTag$3 = "[object DataView]";
 	/** Used to detect maps, sets, and weakmaps. */
-	var dataViewCtorString = toSource(DataView), mapCtorString = toSource(Map$1), promiseCtorString = toSource(Promise$1), setCtorString = toSource(Set$1), weakMapCtorString = toSource(WeakMap);
+	var dataViewCtorString = toSource(DataView);
+	var mapCtorString = toSource(Map$1);
+	var promiseCtorString = toSource(Promise$1);
+	var setCtorString = toSource(Set$1);
+	var weakMapCtorString = toSource(WeakMap);
 	/**
 	* Gets the `toStringTag` of `value`.
 	*
@@ -1810,7 +1859,8 @@
 	//#endregion
 	//#region node_modules/.pnpm/lodash-es@4.17.21/node_modules/lodash-es/_cloneSymbol.js
 	/** Used to convert symbols to primitives and strings. */
-	var symbolProto$1 = Symbol$1 ? Symbol$1.prototype : void 0, symbolValueOf$1 = symbolProto$1 ? symbolProto$1.valueOf : void 0;
+	var symbolProto$1 = Symbol$1 ? Symbol$1.prototype : void 0;
+	var symbolValueOf$1 = symbolProto$1 ? symbolProto$1.valueOf : void 0;
 	/**
 	* Creates a clone of the `symbol` object.
 	*
@@ -1838,8 +1888,25 @@
 	//#endregion
 	//#region node_modules/.pnpm/lodash-es@4.17.21/node_modules/lodash-es/_initCloneByTag.js
 	/** `Object#toString` result references. */
-	var boolTag$2 = "[object Boolean]", dateTag$2 = "[object Date]", mapTag$4 = "[object Map]", numberTag$2 = "[object Number]", regexpTag$2 = "[object RegExp]", setTag$4 = "[object Set]", stringTag$2 = "[object String]", symbolTag$2 = "[object Symbol]";
-	var arrayBufferTag$2 = "[object ArrayBuffer]", dataViewTag$2 = "[object DataView]", float32Tag$1 = "[object Float32Array]", float64Tag$1 = "[object Float64Array]", int8Tag$1 = "[object Int8Array]", int16Tag$1 = "[object Int16Array]", int32Tag$1 = "[object Int32Array]", uint8Tag$1 = "[object Uint8Array]", uint8ClampedTag$1 = "[object Uint8ClampedArray]", uint16Tag$1 = "[object Uint16Array]", uint32Tag$1 = "[object Uint32Array]";
+	var boolTag$2 = "[object Boolean]";
+	var dateTag$2 = "[object Date]";
+	var mapTag$4 = "[object Map]";
+	var numberTag$2 = "[object Number]";
+	var regexpTag$2 = "[object RegExp]";
+	var setTag$4 = "[object Set]";
+	var stringTag$2 = "[object String]";
+	var symbolTag$2 = "[object Symbol]";
+	var arrayBufferTag$2 = "[object ArrayBuffer]";
+	var dataViewTag$2 = "[object DataView]";
+	var float32Tag$1 = "[object Float32Array]";
+	var float64Tag$1 = "[object Float64Array]";
+	var int8Tag$1 = "[object Int8Array]";
+	var int16Tag$1 = "[object Int16Array]";
+	var int32Tag$1 = "[object Int32Array]";
+	var uint8Tag$1 = "[object Uint8Array]";
+	var uint8ClampedTag$1 = "[object Uint8ClampedArray]";
+	var uint16Tag$1 = "[object Uint16Array]";
+	var uint32Tag$1 = "[object Uint32Array]";
 	/**
 	* Initializes an object clone based on its `toStringTag`.
 	*
@@ -1961,10 +2028,36 @@
 	//#endregion
 	//#region node_modules/.pnpm/lodash-es@4.17.21/node_modules/lodash-es/_baseClone.js
 	/** Used to compose bitmasks for cloning. */
-	var CLONE_DEEP_FLAG$1 = 1, CLONE_FLAT_FLAG = 2, CLONE_SYMBOLS_FLAG$1 = 4;
+	var CLONE_DEEP_FLAG$1 = 1;
+	var CLONE_FLAT_FLAG = 2;
+	var CLONE_SYMBOLS_FLAG$1 = 4;
 	/** `Object#toString` result references. */
-	var argsTag$1 = "[object Arguments]", arrayTag$1 = "[object Array]", boolTag$1 = "[object Boolean]", dateTag$1 = "[object Date]", errorTag$1 = "[object Error]", funcTag = "[object Function]", genTag = "[object GeneratorFunction]", mapTag$2 = "[object Map]", numberTag$1 = "[object Number]", objectTag$1 = "[object Object]", regexpTag$1 = "[object RegExp]", setTag$2 = "[object Set]", stringTag$1 = "[object String]", symbolTag$1 = "[object Symbol]", weakMapTag = "[object WeakMap]";
-	var arrayBufferTag$1 = "[object ArrayBuffer]", dataViewTag$1 = "[object DataView]", float32Tag = "[object Float32Array]", float64Tag = "[object Float64Array]", int8Tag = "[object Int8Array]", int16Tag = "[object Int16Array]", int32Tag = "[object Int32Array]", uint8Tag = "[object Uint8Array]", uint8ClampedTag = "[object Uint8ClampedArray]", uint16Tag = "[object Uint16Array]", uint32Tag = "[object Uint32Array]";
+	var argsTag$1 = "[object Arguments]";
+	var arrayTag$1 = "[object Array]";
+	var boolTag$1 = "[object Boolean]";
+	var dateTag$1 = "[object Date]";
+	var errorTag$1 = "[object Error]";
+	var funcTag = "[object Function]";
+	var genTag = "[object GeneratorFunction]";
+	var mapTag$2 = "[object Map]";
+	var numberTag$1 = "[object Number]";
+	var objectTag$1 = "[object Object]";
+	var regexpTag$1 = "[object RegExp]";
+	var setTag$2 = "[object Set]";
+	var stringTag$1 = "[object String]";
+	var symbolTag$1 = "[object Symbol]";
+	var weakMapTag = "[object WeakMap]";
+	var arrayBufferTag$1 = "[object ArrayBuffer]";
+	var dataViewTag$1 = "[object DataView]";
+	var float32Tag = "[object Float32Array]";
+	var float64Tag = "[object Float64Array]";
+	var int8Tag = "[object Int8Array]";
+	var int16Tag = "[object Int16Array]";
+	var int32Tag = "[object Int32Array]";
+	var uint8Tag = "[object Uint8Array]";
+	var uint8ClampedTag = "[object Uint8ClampedArray]";
+	var uint16Tag = "[object Uint16Array]";
+	var uint32Tag = "[object Uint32Array]";
 	/** Used to identify `toStringTag` values supported by `_.clone`. */
 	var cloneableTags = {};
 	cloneableTags[argsTag$1] = cloneableTags[arrayTag$1] = cloneableTags[arrayBufferTag$1] = cloneableTags[dataViewTag$1] = cloneableTags[boolTag$1] = cloneableTags[dateTag$1] = cloneableTags[float32Tag] = cloneableTags[float64Tag] = cloneableTags[int8Tag] = cloneableTags[int16Tag] = cloneableTags[int32Tag] = cloneableTags[mapTag$2] = cloneableTags[numberTag$1] = cloneableTags[objectTag$1] = cloneableTags[regexpTag$1] = cloneableTags[setTag$2] = cloneableTags[stringTag$1] = cloneableTags[symbolTag$1] = cloneableTags[uint8Tag] = cloneableTags[uint8ClampedTag] = cloneableTags[uint16Tag] = cloneableTags[uint32Tag] = true;
@@ -2028,7 +2121,8 @@
 	//#endregion
 	//#region node_modules/.pnpm/lodash-es@4.17.21/node_modules/lodash-es/cloneDeep.js
 	/** Used to compose bitmasks for cloning. */
-	var CLONE_DEEP_FLAG = 1, CLONE_SYMBOLS_FLAG = 4;
+	var CLONE_DEEP_FLAG = 1;
+	var CLONE_SYMBOLS_FLAG = 4;
 	/**
 	* This method is like `_.clone` except that it recursively clones `value`.
 	*
@@ -2132,7 +2226,8 @@
 	//#endregion
 	//#region node_modules/.pnpm/lodash-es@4.17.21/node_modules/lodash-es/_equalArrays.js
 	/** Used to compose bitmasks for value comparisons. */
-	var COMPARE_PARTIAL_FLAG$3 = 1, COMPARE_UNORDERED_FLAG$1 = 2;
+	var COMPARE_PARTIAL_FLAG$3 = 1;
+	var COMPARE_UNORDERED_FLAG$1 = 2;
 	/**
 	* A specialized version of `baseIsEqualDeep` for arrays with support for
 	* partial deep comparisons.
@@ -2214,12 +2309,23 @@
 	//#endregion
 	//#region node_modules/.pnpm/lodash-es@4.17.21/node_modules/lodash-es/_equalByTag.js
 	/** Used to compose bitmasks for value comparisons. */
-	var COMPARE_PARTIAL_FLAG$2 = 1, COMPARE_UNORDERED_FLAG = 2;
+	var COMPARE_PARTIAL_FLAG$2 = 1;
+	var COMPARE_UNORDERED_FLAG = 2;
 	/** `Object#toString` result references. */
-	var boolTag = "[object Boolean]", dateTag = "[object Date]", errorTag = "[object Error]", mapTag$1 = "[object Map]", numberTag = "[object Number]", regexpTag = "[object RegExp]", setTag$1 = "[object Set]", stringTag = "[object String]", symbolTag = "[object Symbol]";
-	var arrayBufferTag = "[object ArrayBuffer]", dataViewTag = "[object DataView]";
+	var boolTag = "[object Boolean]";
+	var dateTag = "[object Date]";
+	var errorTag = "[object Error]";
+	var mapTag$1 = "[object Map]";
+	var numberTag = "[object Number]";
+	var regexpTag = "[object RegExp]";
+	var setTag$1 = "[object Set]";
+	var stringTag = "[object String]";
+	var symbolTag = "[object Symbol]";
+	var arrayBufferTag = "[object ArrayBuffer]";
+	var dataViewTag = "[object DataView]";
 	/** Used to convert symbols to primitives and strings. */
-	var symbolProto = Symbol$1 ? Symbol$1.prototype : void 0, symbolValueOf = symbolProto ? symbolProto.valueOf : void 0;
+	var symbolProto = Symbol$1 ? Symbol$1.prototype : void 0;
+	var symbolValueOf = symbolProto ? symbolProto.valueOf : void 0;
 	/**
 	* A specialized version of `baseIsEqualDeep` for comparing objects of
 	* the same `toStringTag`.
@@ -2325,7 +2431,9 @@
 	/** Used to compose bitmasks for value comparisons. */
 	var COMPARE_PARTIAL_FLAG = 1;
 	/** `Object#toString` result references. */
-	var argsTag = "[object Arguments]", arrayTag = "[object Array]", objectTag = "[object Object]";
+	var argsTag = "[object Arguments]";
+	var arrayTag = "[object Array]";
+	var objectTag = "[object Object]";
 	/** Used to check objects for own properties. */
 	var hasOwnProperty$1 = Object.prototype.hasOwnProperty;
 	/**
@@ -2414,7 +2522,8 @@
 	//#region node_modules/.pnpm/lodash-es@4.17.21/node_modules/lodash-es/debounce.js
 	/** Error message constants. */
 	var FUNC_ERROR_TEXT = "Expected a function";
-	var nativeMax = Math.max, nativeMin = Math.min;
+	var nativeMax = Math.max;
+	var nativeMin = Math.min;
 	/**
 	* Creates a debounced function that delays invoking `func` until after `wait`
 	* milliseconds have elapsed since the last time the debounced function was
@@ -2541,7 +2650,8 @@
 	//#endregion
 	//#region node_modules/.pnpm/lodash-es@4.17.21/node_modules/lodash-es/isEmpty.js
 	/** `Object#toString` result references. */
-	var mapTag = "[object Map]", setTag = "[object Set]";
+	var mapTag = "[object Map]";
+	var setTag = "[object Set]";
 	/** Used to check objects for own properties. */
 	var hasOwnProperty = Object.prototype.hasOwnProperty;
 	/**
@@ -2620,54 +2730,523 @@
 		return baseIsEqual(value, other);
 	}
 	//#endregion
-	//#region packages/form/src/utils/useAddField.ts
-	var useAddField = (prop) => {
-		if (!prop) return;
-		const mForm = (0, vue.inject)("mForm");
-		const instance = (0, vue.getCurrentInstance)();
-		(0, vue.watch)(() => instance?.proxy, (vm) => {
-			if (vm) mForm?.setField(prop, vm);
-			else mForm?.deleteField(prop);
-		}, { immediate: true });
+	//#region packages/form/src/utils/typeMatch.ts
+	dayjs.default.extend(dayjs_plugin_customParseFormat.default);
+	var typeMatchRuleRegistry = /* @__PURE__ */ new Map();
+	var isPromise = (value) => typeof value === "object" && value !== null && typeof value.then === "function";
+	/** 注册或覆盖某个字段 type 的 typeMatch 校验规则 */
+	var registerTypeMatchRule = (type, validator) => {
+		typeMatchRuleRegistry.set((0, _tmagic_utils.toLine)(type), validator);
 	};
-	//#endregion
-	//#region packages/form/src/fields/Hidden.vue
-	var Hidden_default = /* @__PURE__ */ (0, vue.defineComponent)({
-		name: "MFormHidden",
-		__name: "Hidden",
-		props: {
-			model: {},
-			name: {},
-			prop: {}
-		},
-		setup(__props) {
-			useAddField(__props.prop);
-			return (_ctx, _cache) => {
-				return __props.model ? (0, vue.withDirectives)(((0, vue.openBlock)(), (0, vue.createElementBlock)("input", {
-					key: 0,
-					"onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => __props.model[__props.name] = $event),
-					type: "hidden"
-				}, null, 512)), [[vue.vModelText, __props.model[__props.name]]]) : (0, vue.createCommentVNode)("v-if", true);
-			};
+	/** 批量注册 typeMatch 校验规则 */
+	var registerTypeMatchRules = (rules) => {
+		Object.entries(rules).forEach(([type, validator]) => {
+			registerTypeMatchRule(type, validator);
+		});
+	};
+	/** 获取某个字段 type 的自定义 typeMatch 校验规则 */
+	var getTypeMatchRule = (type) => typeMatchRuleRegistry.get((0, _tmagic_utils.toLine)(type));
+	/** 删除某个字段 type 的自定义 typeMatch 校验规则 */
+	var deleteTypeMatchRule = (type) => typeMatchRuleRegistry.delete((0, _tmagic_utils.toLine)(type));
+	/** 清空所有自定义 typeMatch 校验规则 */
+	var clearTypeMatchRules = () => {
+		typeMatchRuleRegistry.clear();
+	};
+	/** 本地解析配置函数，避免与 form.ts 循环依赖 */
+	var resolveConfig = (mForm, config, props) => {
+		if (typeof config === "function") return config(mForm, {
+			values: (0, vue.readonly)(mForm?.initValues || {}),
+			model: (0, vue.readonly)(props.model),
+			parent: (0, vue.readonly)(mForm?.parentValues || {}),
+			formValue: (0, vue.readonly)(mForm?.values || props.model),
+			prop: props.prop,
+			config: props.config,
+			index: props.index,
+			getFormValue: (prop) => (0, _tmagic_utils.getValueByKeyPath)(prop, mForm?.values || props.model)
+		});
+		return config;
+	};
+	var SKIP_TYPES = /* @__PURE__ */ new Set([
+		"display",
+		"hidden",
+		"row",
+		"tab",
+		"dynamic-tab",
+		"fieldset",
+		"panel",
+		"step",
+		"flex-layout",
+		"link",
+		"component",
+		"dynamic-field",
+		"dynamicfield",
+		"form",
+		"container"
+	]);
+	var STRING_TYPES = /* @__PURE__ */ new Set([
+		"text",
+		"textarea",
+		"color-picker",
+		"html",
+		""
+	]);
+	var DATE_LIKE_TYPES = /* @__PURE__ */ new Set([
+		"date",
+		"datetime",
+		"time"
+	]);
+	var DATE_LIKE_DEFAULT_VALUE_FORMAT = {
+		date: "YYYY/MM/DD",
+		datetime: "YYYY/MM/DD HH:mm:ss",
+		time: "HH:mm:ss",
+		daterange: "YYYY/MM/DD HH:mm:ss",
+		timerange: "HH:mm:ss"
+	};
+	var TIMESTAMP_VALUE_FORMATS = /* @__PURE__ */ new Set(["x", "timestamp"]);
+	/**
+	* 将值格式化为可读的参考示例字符串。
+	*/
+	var stringifyExampleValue = (value) => {
+		if (typeof value === "string") return `"${value}"`;
+		if (value === null || value === void 0) return String(value);
+		if (typeof value === "object") try {
+			return JSON.stringify(value);
+		} catch {
+			return String(value);
 		}
-	});
-	//#endregion
-	//#region packages/form/src/utils/config.ts
-	var $MAGIC_FORM = {};
-	var setConfig = (option) => {
-		$MAGIC_FORM = option;
+		return String(value);
 	};
-	var getConfig = (key) => $MAGIC_FORM[key];
-	var fieldRegistry = /* @__PURE__ */ new Map();
-	var registerField = (tagName, component) => {
-		if (fieldRegistry.has(tagName)) return;
-		fieldRegistry.set(tagName, component);
+	var MAX_SUGGESTION_OPTIONS = 20;
+	/**
+	* 生成「请使用以下某一个值：xxx；xxx」形式的参考建议；无可选值时返回空字符串（不追加建议）。
+	* 可选值超过 MAX_SUGGESTION_OPTIONS 个时仅展示前若干个并以「等」省略。
+	*/
+	var optionSuggestion = (optionValues) => {
+		const values = optionValues.filter((item) => typeof item !== "undefined");
+		if (!values.length) return "";
+		const shown = values.slice(0, MAX_SUGGESTION_OPTIONS).map(stringifyExampleValue);
+		const suffix = values.length > MAX_SUGGESTION_OPTIONS ? " 等" : "";
+		return `请使用以下某一个值：${shown.join("；")}${suffix}`;
+	};
+	/**
+	* 基于真实 options 生成类型不匹配场景的「参考示例值」。
+	*
+	* - expectArray 为 true 时，取前若干个真实可选值组成数组示例；
+	* - 否则取第一个真实可选值作为标量示例。
+	* 无可用 options 时回退到通用示例。
+	*/
+	var optionExampleSuggestion = (optionValues, fallbackExample, expectArray) => {
+		const values = optionValues.filter((item) => typeof item !== "undefined");
+		if (!values.length) return `请参考以下示例值：${fallbackExample}`;
+		return `请参考以下示例值：${expectArray ? stringifyExampleValue(values.slice(0, 2)) : stringifyExampleValue(values[0])}`;
+	};
+	/**
+	* 生成开关类字段的参考建议，列出合法的开关值。
+	*/
+	var toggleSuggestion = (activeValue, inactiveValue) => `请使用以下某一个值：${stringifyExampleValue(activeValue)}；${stringifyExampleValue(inactiveValue)}`;
+	/**
+	* 解析字段配置中的真实默认值（defaultValue），用于生成「真实」的参考示例值。
+	* defaultValue 可能是函数，交由 resolveConfig 处理；未配置时返回 undefined。
+	*/
+	var resolveFieldDefaultValue = (mForm, props) => {
+		const { defaultValue } = props.config || {};
+		if (typeof defaultValue === "undefined" || defaultValue === "undefined") return void 0;
+		const resolvedDefaultValue = resolveConfig(mForm, defaultValue, props);
+		if (isPromise(resolvedDefaultValue)) return;
+		return resolvedDefaultValue;
+	};
+	var isNumberValue = (value) => typeof value === "number" && !Number.isNaN(value);
+	var isStringValue = (value) => typeof value === "string";
+	var isObjectValue = (value) => typeof value === "object" && value !== null && !Array.isArray(value);
+	var isObjectArrayValue = (value) => Array.isArray(value) && value.every((item) => isObjectValue(item));
+	var isNumberRangeValue = (value) => Array.isArray(value) && value.length === 2 && value.every((item) => isNumberValue(item));
+	/**
+	* 生成类型不匹配场景的「参考示例值」。
+	*
+	* 优先使用字段配置的真实默认值（defaultValue，需符合期望类型）；无可用默认值时回退到通用示例。
+	*/
+	var typeExampleSuggestion = (mForm, props, fallbackExample, isValid) => {
+		const defaultValue = resolveFieldDefaultValue(mForm, props);
+		return `请参考以下示例值：${typeof defaultValue !== "undefined" && isValid(defaultValue) ? stringifyExampleValue(defaultValue) : fallbackExample}`;
+	};
+	/**
+	* 返回最终错误文案。
+	*
+	* - 传入了自定义 `message` 时，直接使用自定义文案（不追加建议）；
+	* - 否则使用默认文案 `fallback`，并在其后拼接「参考建议」。
+	*   参考建议给出一个可参考的示例值（如可选项列表、示例数据），仅用于错误汇总展示；
+	*   form-item 行内错误不展示建议（由 @tmagic/design FormItem 在渲染时截断建议）。
+	*   主文案与建议的拼接/截断统一复用 @tmagic/design 的 `appendValidateSuggestion`。
+	*/
+	var defaultMessage = (message, fallback, suggestion) => {
+		if (message) return message;
+		return (0, _tmagic_design.appendValidateSuggestion)(fallback, suggestion);
+	};
+	var isEmptyValue = (value) => value === void 0 || value === null || value === "";
+	var isEmptyArray = (value) => Array.isArray(value) && value.length === 0;
+	var resolveDateValueFormat = (fieldType, config) => config.valueFormat || DATE_LIKE_DEFAULT_VALUE_FORMAT[fieldType] || "YYYY/MM/DD HH:mm:ss";
+	var isTimestampValueFormat = (valueFormat) => TIMESTAMP_VALUE_FORMATS.has(valueFormat);
+	var isValidDateValueByFormat = (value, valueFormat) => {
+		if (isTimestampValueFormat(valueFormat)) return typeof value === "number" && !Number.isNaN(value);
+		if (typeof value !== "string") return false;
+		return (0, dayjs.default)(value, valueFormat, true).isValid();
+	};
+	/**
+	* 生成单个日期类字段的参考示例值：时间戳格式给出当前时间戳，其余按 valueFormat 格式化当前时间。
+	*/
+	var dateSuggestion = (valueFormat) => isTimestampValueFormat(valueFormat) ? `请参考以下示例值：${Date.now()}` : `请参考以下示例值："${(0, dayjs.default)().format(valueFormat)}"`;
+	/**
+	* 生成日期范围类字段的参考示例值（长度为 2 的数组）。
+	*/
+	var dateRangeSuggestion = (valueFormat) => {
+		if (isTimestampValueFormat(valueFormat)) return `请参考以下示例值：[${Date.now()}, ${Date.now()}]`;
+		const example = (0, dayjs.default)().format(valueFormat);
+		return `请参考以下示例值：["${example}", "${example}"]`;
+	};
+	var dateValueFormatErrorMessage = (message, valueFormat) => defaultMessage(message, isTimestampValueFormat(valueFormat) ? "值类型应为时间戳数字" : `值格式应为 ${valueFormat}`, dateSuggestion(valueFormat));
+	var resolveToggleValues = (config) => {
+		const filterIsNumber = config.filter === "number";
+		const { activeValue: configActiveValue, inactiveValue: configInactiveValue } = config;
+		let activeValue = configActiveValue;
+		let inactiveValue = configInactiveValue;
+		if (typeof activeValue === "undefined") activeValue = filterIsNumber ? 1 : true;
+		if (typeof inactiveValue === "undefined") inactiveValue = filterIsNumber ? 0 : false;
+		return {
+			activeValue,
+			inactiveValue
+		};
+	};
+	var flattenSelectOptions = (options) => {
+		const values = [];
+		options.forEach((option) => {
+			if (Array.isArray(option?.options)) {
+				option.options.forEach((child) => {
+					if (typeof child?.value !== "undefined") values.push(child.value);
+				});
+				return;
+			}
+			if (typeof option?.value !== "undefined") values.push(option.value);
+		});
+		return values;
+	};
+	var resolveOptions = (props) => {
+		const { options } = props.config || {};
+		return Array.isArray(options) ? options : [];
+	};
+	var includesOptionValue = (optionValues, value) => optionValues.some((item) => Object.is(item, value));
+	var collectCascaderLeafValues = (options, result = []) => {
+		options.forEach((option) => {
+			if (option.children?.length) collectCascaderLeafValues(option.children, result);
+			else if (typeof option.value !== "undefined") result.push(option.value);
+		});
+		return result;
+	};
+	var isValidCascaderPath = (options, path) => {
+		if (!path.length) return false;
+		let currentOptions = options;
+		for (let i = 0; i < path.length; i++) {
+			const node = currentOptions.find((option) => Object.is(option.value, path[i]));
+			if (!node) return false;
+			if (i === path.length - 1) return true;
+			currentOptions = node.children || [];
+		}
+		return false;
+	};
+	/**
+	* 取 cascader options 的第一条完整路径（从顶层到叶子的 value 数组）。
+	*/
+	var firstCascaderPath = (options) => {
+		const path = [];
+		let current = options;
+		while (current?.length) {
+			const node = current[0];
+			if (typeof node.value === "undefined") break;
+			path.push(node.value);
+			current = node.children;
+		}
+		return path;
+	};
+	/**
+	* 基于真实 cascader options 生成类型不匹配场景的「参考示例值」。
+	*
+	* 依据 valueSeparator / multiple / emitPath 组织真实选中值的形态；无可用 options 时回退到通用示例。
+	*/
+	var cascaderExampleSuggestion = (options, config, valueSeparator, fallbackExample) => {
+		const path = firstCascaderPath(options);
+		if (!path.length) return `请参考以下示例值：${fallbackExample}`;
+		const emitPath = config.emitPath !== false;
+		const multiple = Boolean(config.multiple);
+		const single = emitPath ? path : path[path.length - 1];
+		let example;
+		if (valueSeparator) example = path.join(valueSeparator);
+		else if (multiple) example = [single];
+		else example = single;
+		return `请参考以下示例值：${stringifyExampleValue(example)}`;
+	};
+	var validateSelectValue = (value, config, optionValues, message) => {
+		if (optionValues.length === 0) return;
+		if (config.allowCreate || config.remote) {
+			if (config.multiple) {
+				if (!Array.isArray(value)) return defaultMessage(message, `${value} 类型应为数组`, optionExampleSuggestion(optionValues, "[\"选项1\", \"选项2\"]", true));
+				return;
+			}
+			if (typeof value === "object") return defaultMessage(message, `${value} 类型不合法`, optionExampleSuggestion(optionValues, "\"文本内容\" 或 123", false));
+			return;
+		}
+		const isStaticOptions = Array.isArray(config.options);
+		if (config.multiple) {
+			if (!Array.isArray(value)) return defaultMessage(message, `${value} 类型应为数组`, optionExampleSuggestion(optionValues, "[\"选项1\", \"选项2\"]", true));
+			if (isStaticOptions && value.some((item) => !includesOptionValue(optionValues, item))) return defaultMessage(message, `${value} 不在可选项中`, optionSuggestion(optionValues));
+			return;
+		}
+		if (isStaticOptions && !includesOptionValue(optionValues, value)) return defaultMessage(message, `${value} 不在可选项中`, optionSuggestion(optionValues));
+	};
+	var validateCascaderValue = (value, config, props, mForm, message) => {
+		const options = resolveOptions(props);
+		if (!options.length) return;
+		const valueSeparator = resolveConfig(mForm, config.valueSeparator, props);
+		if (isPromise(valueSeparator)) return;
+		const emitPath = config.emitPath !== false;
+		const multiple = Boolean(config.multiple);
+		const cascaderExample = (fallbackExample) => cascaderExampleSuggestion(options, config, valueSeparator, fallbackExample);
+		if (valueSeparator) {
+			if (typeof value !== "string" && !Array.isArray(value)) return defaultMessage(message, `${value} 类型应为字符串或数组`, cascaderExample("\"选项1,选项2\" 或 [\"选项1\", \"选项2\"]"));
+		} else if (multiple) {
+			if (!Array.isArray(value)) return defaultMessage(message, `${value} 类型应为数组`, cascaderExample("[\"选项1\", \"选项2\"]"));
+		} else if (emitPath && !Array.isArray(value)) return defaultMessage(message, `${value} 类型应为数组`, cascaderExample("[\"选项1\", \"选项2\"]"));
+		if (config.remote) return;
+		if (!options.length) return;
+		const normalizedValue = typeof value === "string" && valueSeparator ? value.split(valueSeparator) : value;
+		if (multiple) {
+			if (!Array.isArray(normalizedValue)) return defaultMessage(message, `${value} 类型应为数组`, cascaderExample("[\"选项1\", \"选项2\"]"));
+			if (normalizedValue.some((item) => {
+				if (emitPath) return !Array.isArray(item) || !isValidCascaderPath(options, item);
+				return !includesOptionValue(collectCascaderLeafValues(options), item);
+			})) return defaultMessage(message, `${value} 不在可选项中`, optionSuggestion(collectCascaderLeafValues(options)));
+			return;
+		}
+		if (emitPath) {
+			if (!Array.isArray(normalizedValue) || !isValidCascaderPath(options, normalizedValue)) return defaultMessage(message, `${value} 不在可选项中`, optionSuggestion(collectCascaderLeafValues(options)));
+			return;
+		}
+		if (!includesOptionValue(collectCascaderLeafValues(options), normalizedValue)) return defaultMessage(message, `${value} 不在可选项中`, optionSuggestion(collectCascaderLeafValues(options)));
+	};
+	var validateBuiltinTypeMatch = (value, fieldType, mForm, props, message) => {
+		if (SKIP_TYPES.has(fieldType)) return;
+		const config = props.config || {};
+		if (STRING_TYPES.has(fieldType)) {
+			if (config.filter === "number") {
+				if (typeof value !== "number" || Number.isNaN(value)) return defaultMessage(message, `${value} 类型应为数字`, typeExampleSuggestion(mForm, props, "123", isNumberValue));
+				return;
+			}
+			if (typeof config.filter === "function") return;
+			if (fieldType === "text" && isNumberValue(value)) return;
+			if (typeof value !== "string") return defaultMessage(message, `${value} 类型应为字符串`, typeExampleSuggestion(mForm, props, "\"文本内容\"", isStringValue));
+			return;
+		}
+		if (DATE_LIKE_TYPES.has(fieldType)) {
+			const valueFormat = resolveDateValueFormat(fieldType, config);
+			if (!isValidDateValueByFormat(value, valueFormat)) return dateValueFormatErrorMessage(message, valueFormat);
+			return;
+		}
+		if (fieldType === "number") {
+			if (typeof value !== "number" || Number.isNaN(value)) return defaultMessage(message, `${value} 类型应为数字`, typeExampleSuggestion(mForm, props, "123", isNumberValue));
+			return;
+		}
+		if (fieldType === "number-range") {
+			if (!Array.isArray(value) || value.length !== 2 || value.some((item) => typeof item !== "number" || Number.isNaN(item))) return defaultMessage(message, `${value} 类型应为长度为 2 的数字数组`, typeExampleSuggestion(mForm, props, "[0, 100]", isNumberRangeValue));
+			return;
+		}
+		if (fieldType === "switch" || fieldType === "checkbox") {
+			const { activeValue, inactiveValue } = resolveToggleValues(config);
+			if (!Object.is(value, activeValue) && !Object.is(value, inactiveValue)) return defaultMessage(message, `${value} 不在合法开关值中`, toggleSuggestion(activeValue, inactiveValue));
+			return;
+		}
+		if (fieldType === "select") return validateSelectValue(value, config, flattenSelectOptions(resolveOptions(props)), message);
+		if (fieldType === "radio-group") {
+			const optionValues = flattenSelectOptions(resolveOptions(props));
+			if (optionValues.length === 0) return;
+			if (!includesOptionValue(optionValues, value)) return defaultMessage(message, `${value} 不在可选项中`, optionSuggestion(optionValues));
+			return;
+		}
+		if (fieldType === "checkbox-group") {
+			const optionValues = flattenSelectOptions(resolveOptions(props));
+			if (optionValues.length === 0) return;
+			if (!Array.isArray(value)) return defaultMessage(message, `${value} 类型应为数组`, optionExampleSuggestion(optionValues, "[\"选项1\", \"选项2\"]", true));
+			if (value.some((item) => !includesOptionValue(optionValues, item))) return defaultMessage(message, `${value} 不在可选项中`, optionSuggestion(optionValues));
+			return;
+		}
+		if (fieldType === "cascader") return validateCascaderValue(value, config, props, mForm, message);
+		if (fieldType === "daterange" || fieldType === "timerange") {
+			if (config.names) return;
+			const valueFormat = resolveDateValueFormat(fieldType, config);
+			if (!Array.isArray(value) || value.length !== 2 || value.some((item) => !isValidDateValueByFormat(item, valueFormat))) return defaultMessage(message, isTimestampValueFormat(valueFormat) ? `${value} 类型应为长度为 2 的时间戳数字数组` : `${value} 格式应为长度为 2 的 ${valueFormat} 数组`, dateRangeSuggestion(valueFormat));
+			return;
+		}
+		if (fieldType === "table" || fieldType === "group-list" || fieldType === "grouplist") {
+			if (!Array.isArray(value) || value.some((item) => !isObjectValue(item))) return defaultMessage(message, `${value} 类型应为对象数组`, typeExampleSuggestion(mForm, props, "[{}]", isObjectArrayValue));
+			return;
+		}
+	};
+	/**
+	* 校验取值与字段 type 是否匹配；通过返回 undefined，否则返回错误文案。
+	*
+	* 命中的自定义规则是异步校验器时返回 Promise，内置规则始终同步返回。
+	*/
+	var validateTypeMatch = (value, mForm, props, message) => {
+		if (isEmptyValue(value) || isEmptyArray(value)) return;
+		if (!props.config?.name) return;
+		const rawFieldType = "type" in (props.config || {}) ? props.config.type : "";
+		if (typeof rawFieldType !== "string" || !rawFieldType) return;
+		const fieldType = (0, _tmagic_utils.toLine)(rawFieldType);
+		const customValidator = getTypeMatchRule(fieldType);
+		if (customValidator) return customValidator(value, {
+			fieldType,
+			mForm,
+			props,
+			message
+		});
+		return validateBuiltinTypeMatch(value, fieldType, mForm, props, message);
+	};
+	var toError = (error) => error instanceof Error ? error : /* @__PURE__ */ new Error(`${error}`);
+	var createTypeMatchValidator = (mForm, props, rule) => {
+		const originalValidator = typeof rule.validator === "function" ? rule.validator : void 0;
+		/**
+		* 每次校验取一个自增序号，只有最新一轮的结论会被采用。
+		*
+		* 旧值的在途校验不能用自己的结论结算：它可能晚于新校验结束，用过期结论覆盖新结论
+		* （表单取最后结束的那次结果）；也不能在新校验开始时无条件按通过结算，否则
+		* `form.validate()` 会对一个还没校验过的值返回成功。因此所有尚未结算的调用都登记在
+		* pendingSettlers 中，等最新一轮出结论后用同一个结论一起结算。
+		*
+		* 不比较取值本身：配了 names 或取值为对象/数组时拿到的是同一个引用，就地修改后比较不出变化。
+		*/
+		let generation = 0;
+		let pendingSettlers = [];
+		return (asyncValidatorRule, value, callback, source, options) => {
+			const actualValue = props.config?.names ? props.model : value;
+			generation += 1;
+			const currentGeneration = generation;
+			/** 已有更新的一轮校验开始，本轮结论作废 */
+			const isStale = () => currentGeneration !== generation;
+			pendingSettlers.push((args) => callback(...args));
+			/**
+			* 结算本轮与被本轮取代的所有在途校验。
+			*
+			* async-validator 的 callback 不幂等：重复调用会让它的内部计数提前满足、错误信息重复；
+			* 原始 validator 写成 async 时很容易既调 callback 又返回 Promise，故所有回调都收敛到这里，
+			* 由「取出即出队」保证每个调用的 callback 只会被调用一次。
+			*/
+			const conclude = (...args) => {
+				if (isStale()) return;
+				const settlers = pendingSettlers;
+				pendingSettlers = [];
+				for (const settle of settlers) settle(args);
+			};
+			/**
+			* 执行原始 validator 并把结果统一转成 callback。
+			*
+			* async-validator 只解析同步返回给它的返回值（true / false / Error / 错误数组 / Promise，
+			* 抛错转成错误信息），异步路径已脱离它的调用栈，这些约定会失效导致校验永不结束，故复刻一份。
+			*/
+			const settleWithOriginalValidator = () => {
+				if (isStale()) return;
+				if (!originalValidator) {
+					conclude();
+					return;
+				}
+				let result;
+				try {
+					result = originalValidator({
+						rule: asyncValidatorRule,
+						value: actualValue,
+						callback: conclude,
+						source,
+						options
+					}, {
+						values: mForm?.initValues || {},
+						model: props.model,
+						parent: mForm?.parentValues || {},
+						formValue: mForm?.values || props.model,
+						prop: props.prop,
+						config: props.config
+					}, mForm);
+				} catch (err) {
+					conclude(toError(err));
+					return;
+				}
+				if (isPromise(result)) result.then(() => conclude(), (err) => conclude(toError(err)));
+				else if (result === true) conclude();
+				else if (result === false) {
+					const field = asyncValidatorRule?.fullField || asyncValidatorRule?.field || props.prop;
+					conclude(new Error(rule.message || `${field} fails`));
+				} else if (result instanceof Error || Array.isArray(result)) conclude(result);
+			};
+			const skipFailedTypeMatch = (err) => {
+				console.error(err);
+				settleWithOriginalValidator();
+			};
+			let error;
+			try {
+				error = validateTypeMatch(actualValue, mForm, props, rule.message);
+			} catch (err) {
+				skipFailedTypeMatch(err);
+				return;
+			}
+			if (isPromise(error)) {
+				error.then((asyncMessage) => {
+					if (asyncMessage) {
+						conclude(new Error(asyncMessage));
+						return;
+					}
+					settleWithOriginalValidator();
+				}, skipFailedTypeMatch);
+				return;
+			}
+			if (error) {
+				conclude(new Error(error));
+				return;
+			}
+			settleWithOriginalValidator();
+		};
 	};
-	var getField = (tagName) => fieldRegistry.get(tagName);
-	var deleteField = (tagName) => fieldRegistry.delete(tagName);
 	//#endregion
 	//#region packages/form/src/utils/form.ts
-	var TABLE_SELECT_TYPES = new Set(["table-select", "tableSelect"]);
+	var isTDesignAdapter = () => (0, _tmagic_design.getDesignConfig)("adapterType") === "tdesign-vue-next";
+	/**
+	* 将 async-validator（Element Plus）风格的 validator 适配到当前 UI 库。
+	* TDesign 调用签名为 `(val) => boolean | CustomValidateObj | Promise`，无 callback。
+	*/
+	var adaptFormValidator = (validator) => {
+		return (arg1, arg2, arg3, arg4, arg5) => {
+			if (!isTDesignAdapter()) return validator(arg1, arg2, arg3, arg4, arg5);
+			const value = arg1;
+			return new Promise((resolve) => {
+				let settled = false;
+				const callback = (error) => {
+					if (settled) return;
+					settled = true;
+					const first = Array.isArray(error) ? error[0] : error;
+					if (first) resolve({
+						result: false,
+						message: typeof first === "string" ? first : first.message
+					});
+					else resolve(true);
+				};
+				try {
+					const result = validator(void 0, value, callback);
+					if (result && typeof result.then === "function") Promise.resolve(result).then(() => {
+						if (!settled) callback();
+					}, (err) => {
+						callback(err instanceof Error ? err : new Error(String(err)));
+					});
+				} catch (e) {
+					callback(e instanceof Error ? e : new Error(String(e)));
+				}
+			});
+		};
+	};
+	var TABLE_SELECT_TYPES = /* @__PURE__ */ new Set(["table-select", "tableSelect"]);
 	var isTableSelect = (type) => typeof type === "string" && TABLE_SELECT_TYPES.has(type);
 	var asyncLoadConfig = (value, initValue, { asyncLoad, name, type }) => {
 		if (type === "html" && typeof asyncLoad === "object" && typeof name !== "undefined") {
@@ -2675,7 +3254,7 @@
 			value.asyncLoad = typeof initValue.asyncLoad === "object" ? initValue.asyncLoad : asyncLoad;
 		}
 	};
-	var MULTIPLE_VALUE_TYPES = new Set([
+	var MULTIPLE_VALUE_TYPES = /* @__PURE__ */ new Set([
 		"checkbox-group",
 		"checkboxGroup",
 		"table",
@@ -2762,13 +3341,18 @@
 		if (config === false) return false;
 		return true;
 	};
-	var getRules = function(mForm, rules = [], props) {
-		rules = cloneDeep(rules);
+	var getRules = function(mForm, r = [], props, typeMatchValid) {
+		let rules = cloneDeep(r);
 		if (typeof rules === "object" && !Array.isArray(rules)) rules = [rules];
+		if (typeMatchValid?.value && !rules.some((r) => typeof r.typeMatch !== "undefined")) rules.push({ typeMatch: true });
 		return rules.map((item) => {
+			if (item.typeMatch) {
+				item.validator = adaptFormValidator(createTypeMatchValidator(mForm, props, item));
+				return item;
+			}
 			if (typeof item.validator === "function") {
 				const fnc = item.validator;
-				item.validator = (rule, value, callback, source, options) => fnc({
+				item.validator = adaptFormValidator((rule, value, callback, source, options) => fnc({
 					rule,
 					value: props.config.names ? props.model : value,
 					callback,
@@ -2781,7 +3365,7 @@
 					formValue: mForm?.values || props.model,
 					prop: props.prop,
 					config: props.config
-				}, mForm);
+				}, mForm));
 			}
 			return item;
 		});
@@ -2826,6 +3410,40 @@
 		if (order === "ascending") data.sort((a, b) => a[prop] - b[prop]);
 		else if (order === "descending") data.sort((a, b) => b[prop] - a[prop]);
 	};
+	/**
+	* 将 extendState 返回的扩展字段合并进 formState。
+	*
+	* - data 描述符（普通字段）通过 `formState[key] = value` 写入，走 reactive proxy 的 set，
+	*   触发依赖通知；
+	* - accessor 描述符（`{ get stage() { return ... } }`）按原样 defineProperty，调用方
+	*   可控制读时求值；强制 `configurable: true` 以便下一次合并可再 define。
+	*
+	* 注意：extendState 只能向 formState「新增」字段，不允许覆盖其已有 key。
+	* 调用方可通过 `reservedKeys` 传入合并前已存在的内置 key 快照（keyProp / popperClass /
+	* config / initValues / isCompare / lastValues / parentValues / values / $emit / fields /
+	* post 等），命中这些 key 时统一跳过并告警。
+	*
+	* 兜底：未传 `reservedKeys` 时，仍会拦截 props 派生的只读 getter 字段（无 setter），
+	* 否则以普通字段形式赋值会让 proxy 的 set trap 抛出
+	* `TypeError: 'set' on proxy: trap returned falsish`。
+	*/
+	var applyExtendState = (formState, state, reservedKeys) => {
+		if (!state) return;
+		for (const [key, descriptor] of Object.entries(Object.getOwnPropertyDescriptors(state))) {
+			if (reservedKeys?.has(key)) continue;
+			if (!("value" in descriptor)) {
+				descriptor.configurable = true;
+				Object.defineProperty(formState, key, descriptor);
+				continue;
+			}
+			const targetDescriptor = Object.getOwnPropertyDescriptor(formState, key);
+			if (targetDescriptor && !("value" in targetDescriptor) && typeof targetDescriptor.set !== "function") {
+				console.warn(`[MForm] extendState: "${key}" is a read-only field derived from props and cannot be assigned a plain value. Return it as a getter accessor if you really need to override it.`);
+				continue;
+			}
+			formState[key] = state[key];
+		}
+	};
 	var createObjectProp = (prop, key, name) => {
 		if (prop === "") return key;
 		const itemPath = `${prop}`.split(".");
@@ -2835,6 +3453,54 @@
 		return `${[...itemPath, key].join(".")}`;
 	};
 	//#endregion
+	//#region packages/form/src/utils/useAddField.ts
+	var useAddField = (prop) => {
+		if (!prop) return;
+		const mForm = (0, vue.inject)("mForm");
+		const instance = (0, vue.getCurrentInstance)();
+		(0, vue.watch)(() => instance?.proxy, (vm) => {
+			if (vm) mForm?.setField(prop, vm);
+			else mForm?.deleteField(prop);
+		}, { immediate: true });
+	};
+	//#endregion
+	//#region packages/form/src/fields/Hidden.vue
+	var Hidden_default = /* @__PURE__ */ (0, vue.defineComponent)({
+		name: "MFormHidden",
+		__name: "Hidden",
+		props: {
+			model: {},
+			name: {},
+			prop: {}
+		},
+		setup(__props) {
+			useAddField(__props.prop);
+			return (_ctx, _cache) => {
+				return __props.model ? (0, vue.withDirectives)(((0, vue.openBlock)(), (0, vue.createElementBlock)("input", {
+					key: 0,
+					"onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => __props.model[__props.name] = $event),
+					type: "hidden"
+				}, null, 512)), [[vue.vModelText, __props.model[__props.name]]]) : (0, vue.createCommentVNode)("v-if", true);
+			};
+		}
+	});
+	//#endregion
+	//#region packages/form/src/utils/config.ts
+	var $MAGIC_FORM = {};
+	var isGlobalFlat = (0, vue.ref)(false);
+	var setConfig = (option) => {
+		$MAGIC_FORM = option;
+		isGlobalFlat.value = option.flat ?? false;
+	};
+	var getConfig = (key) => $MAGIC_FORM[key];
+	var fieldRegistry = /* @__PURE__ */ new Map();
+	var registerField = (tagName, component) => {
+		if (fieldRegistry.has(tagName)) return;
+		fieldRegistry.set(tagName, component);
+	};
+	var getField = (tagName) => fieldRegistry.get(tagName);
+	var deleteField = (tagName) => fieldRegistry.delete(tagName);
+	//#endregion
 	//#region packages/form/src/containers/FormLabel.vue?vue&type=script&setup=true&lang.ts
 	var _hoisted_1$15 = {
 		key: 0,
@@ -2843,9 +3509,9 @@
 			"align-items": "center"
 		}
 	};
-	var _hoisted_2$8 = ["innerHTML", "title"];
-	var _hoisted_3$7 = ["innerHTML"];
-	var _hoisted_4$5 = ["innerHTML", "title"];
+	var _hoisted_2$9 = ["innerHTML", "title"];
+	var _hoisted_3$8 = ["innerHTML"];
+	var _hoisted_4$7 = ["innerHTML", "title"];
 	//#endregion
 	//#region packages/form/src/containers/FormLabel.vue
 	var FormLabel_default = /* @__PURE__ */ (0, vue.defineComponent)({
@@ -2862,11 +3528,11 @@
 				return __props.tip ? ((0, vue.openBlock)(), (0, vue.createElementBlock)("span", _hoisted_1$15, [(0, vue.createElementVNode)("span", {
 					innerHTML: __props.type === "checkbox" && !__props.useLabel ? "" : __props.text,
 					title: __props.labelTitle
-				}, null, 8, _hoisted_2$8), __props.tip && (__props.type !== "checkbox" || __props.useLabel) ? ((0, vue.openBlock)(), (0, vue.createBlock)((0, vue.unref)(_tmagic_design.TMagicTooltip), {
+				}, null, 8, _hoisted_2$9), __props.tip && (__props.type !== "checkbox" || __props.useLabel) ? ((0, vue.openBlock)(), (0, vue.createBlock)((0, vue.unref)(_tmagic_design.TMagicTooltip), {
 					key: 0,
 					placement: "top"
 				}, {
-					content: (0, vue.withCtx)(() => [(0, vue.createElementVNode)("div", { innerHTML: __props.tip }, null, 8, _hoisted_3$7)]),
+					content: (0, vue.withCtx)(() => [(0, vue.createElementVNode)("div", { innerHTML: __props.tip }, null, 8, _hoisted_3$8)]),
 					default: (0, vue.withCtx)(() => [(0, vue.createVNode)((0, vue.unref)(_tmagic_design.TMagicIcon), { style: {
 						"margin-left": "5px",
 						"display": "flex"
@@ -2879,23 +3545,27 @@
 					key: 1,
 					innerHTML: __props.type === "checkbox" && !__props.useLabel ? "" : __props.text,
 					title: __props.labelTitle
-				}, null, 8, _hoisted_4$5));
+				}, null, 8, _hoisted_4$7));
 			};
 		}
 	});
 	//#endregion
 	//#region packages/form/src/containers/Container.vue?vue&type=script&setup=true&lang.ts
 	var _hoisted_1$14 = ["data-tmagic-id", "data-tmagic-form-item-prop"];
-	var _hoisted_2$7 = ["innerHTML"];
-	var _hoisted_3$6 = ["innerHTML"];
-	var _hoisted_4$4 = ["innerHTML"];
-	var _hoisted_5$3 = ["innerHTML"];
-	var _hoisted_6$1 = ["innerHTML"];
-	var _hoisted_7$1 = ["innerHTML"];
-	var _hoisted_8$1 = ["innerHTML"];
-	var _hoisted_9 = {
+	var _hoisted_2$8 = {
+		key: 0,
+		class: "m-form-tip m-form-title-extra"
+	};
+	var _hoisted_3$7 = ["innerHTML"];
+	var _hoisted_4$6 = ["innerHTML"];
+	var _hoisted_5$4 = ["innerHTML"];
+	var _hoisted_6$3 = ["innerHTML"];
+	var _hoisted_7$2 = ["innerHTML"];
+	var _hoisted_8$2 = ["innerHTML"];
+	var _hoisted_9 = ["innerHTML"];
+	var _hoisted_10 = {
 		key: 5,
-		style: { "text-align": "center" }
+		class: "m-form-container-expand"
 	};
 	//#endregion
 	//#region packages/form/src/containers/Container.vue
@@ -2918,7 +3588,8 @@
 			isCompare: {
 				type: Boolean,
 				default: false
-			}
+			},
+			isInRow: { type: Boolean }
 		},
 		emits: ["change", "addDiffCount"],
 		setup(__props, { emit: __emit }) {
@@ -2926,12 +3597,14 @@
 			const emit = __emit;
 			const mForm = (0, vue.inject)("mForm");
 			const diffConfig = (0, vue.inject)(FORM_DIFF_CONFIG_KEY, {});
+			const typeMatchValid = (0, vue.inject)(FORM_TYPE_MATCH_VALID_KEY);
 			const expand = (0, vue.ref)(false);
 			const name = (0, vue.computed)(() => props.config.name || "");
 			const showDiff = (0, vue.computed)(() => {
 				if (!props.isCompare) return false;
-				const curValue = name.value ? props.model[name.value] : props.model;
-				const lastValue = name.value ? props.lastValues[name.value] : props.lastValues;
+				if (!name.value) return false;
+				const curValue = props.model[name.value];
+				const lastValue = props.lastValues[name.value];
 				const customShowDiff = diffConfig.showDiff;
 				if (typeof customShowDiff === "function") return Boolean(customShowDiff({
 					curValue,
@@ -2984,7 +3657,7 @@
 			const effectiveSelfDiffFieldTypes = (0, vue.computed)(() => {
 				const custom = diffConfig.selfDiffFieldTypes;
 				if (typeof custom === "function") return new Set(custom([...DEFAULT_SELF_DIFF_FIELD_TYPES]));
-				if (Array.isArray(custom)) return new Set([...DEFAULT_SELF_DIFF_FIELD_TYPES, ...custom]);
+				if (Array.isArray(custom)) return /* @__PURE__ */ new Set([...DEFAULT_SELF_DIFF_FIELD_TYPES, ...custom]);
 				return new Set(DEFAULT_SELF_DIFF_FIELD_TYPES);
 			});
 			const isSelfDiffField = (0, vue.computed)(() => effectiveSelfDiffFieldTypes.value.has(type.value));
@@ -3001,7 +3674,7 @@
 					placement: config?.placement || "top"
 				};
 			});
-			const rule = (0, vue.computed)(() => getRules(mForm, props.config.rules, props));
+			const rule = (0, vue.computed)(() => getRules(mForm, props.config.rules, props, typeMatchValid));
 			const display$3 = (0, vue.computed)(() => {
 				const value = display(mForm, props.config.display, props);
 				if (value === "expand") return expand.value;
@@ -3021,7 +3694,8 @@
 				labelWidth: itemLabelWidth.value,
 				labelPosition: props.config.labelPosition,
 				rules: rule.value,
-				extra: filterFunction(mForm, props.config.extra, props)
+				extra: filterFunction(mForm, props.config.extra, props),
+				extraTips: props.config.extraTips
 			}));
 			const itemLabelWidth = (0, vue.computed)(() => props.config.labelWidth ?? props.labelWidth);
 			(0, vue.watchEffect)(() => {
@@ -3032,6 +3706,7 @@
 				if (items.value && !text.value && type.value && display$3.value) return;
 				if (display$3.value && showDiff && type.value) emit("addDiffCount");
 			}, { immediate: true });
+			(0, vue.provide)("isInRow", props.isInRow ?? false);
 			const expandHandler = () => expand.value = !expand.value;
 			const key = (config) => config[mForm?.keyProps];
 			const filterHandler = (filter, value) => {
@@ -3062,7 +3737,10 @@
 				return new Proxy(target, {
 					get: (obj, key) => {
 						const value = obj[key];
-						if (value && typeof value === "object") return createModelProxy(value, setModelFn, pathPrefix ? `${pathPrefix}.${key}` : key);
+						if (value && typeof value === "object") {
+							const newPath = pathPrefix ? `${pathPrefix}.${key}` : key;
+							return createModelProxy(value, setModelFn, newPath);
+						}
 						return value;
 					},
 					set: (obj, key, value) => {
@@ -3128,16 +3806,18 @@
 					"data-tmagic-form-item-prop": itemProp.value,
 					class: (0, vue.normalizeClass)(`m-form-container m-container-${type.value || ""} ${__props.config.className || ""}${__props.config.tip ? " has-tip" : ""}`),
 					style: (0, vue.normalizeStyle)(__props.config.style)
-				}, [type.value === "hidden" ? ((0, vue.openBlock)(), (0, vue.createBlock)(Hidden_default, {
-					key: 0,
-					name: `${name.value}`,
-					prop: itemProp.value,
-					model: __props.model
-				}, null, 8, [
-					"name",
-					"prop",
-					"model"
-				])) : items.value && !text.value && type.value && display$3.value ? ((0, vue.openBlock)(), (0, vue.createBlock)((0, vue.resolveDynamicComponent)(tagName.value), (0, vue.mergeProps)({ key: 1 }, fieldsProps.value, {
+				}, [type.value === "hidden" ? ((0, vue.openBlock)(), (0, vue.createBlock)((0, vue.unref)(_tmagic_design.TMagicFormItem), (0, vue.mergeProps)({ key: 0 }, formItemProps.value, { style: { "display": "none" } }), {
+					default: (0, vue.withCtx)(() => [(0, vue.createVNode)(Hidden_default, {
+						name: `${name.value}`,
+						prop: itemProp.value,
+						model: __props.model
+					}, null, 8, [
+						"name",
+						"prop",
+						"model"
+					])]),
+					_: 1
+				}, 16)) : items.value && !text.value && type.value && display$3.value ? ((0, vue.openBlock)(), (0, vue.createBlock)((0, vue.resolveDynamicComponent)(tagName.value), (0, vue.mergeProps)({ key: 1 }, fieldsProps.value, {
 					model: __props.model,
 					"last-values": __props.lastValues,
 					"is-compare": __props.isCompare,
@@ -3174,12 +3854,12 @@
 						"use-label",
 						"label-title",
 						"text"
-					])])]),
+					]), __props.config.titleExtra && __props.config.labelPosition === "top" ? ((0, vue.openBlock)(), (0, vue.createElementBlock)("span", _hoisted_2$8, (0, vue.toDisplayString)(__props.config.titleExtra), 1)) : (0, vue.createCommentVNode)("v-if", true)])]),
 					default: (0, vue.withCtx)(() => [tooltip.value.text ? ((0, vue.openBlock)(), (0, vue.createBlock)((0, vue.unref)(_tmagic_design.TMagicTooltip), {
 						key: 0,
 						placement: tooltip.value.placement
 					}, {
-						content: (0, vue.withCtx)(() => [(0, vue.createElementVNode)("div", { innerHTML: tooltip.value.text }, null, 8, _hoisted_2$7)]),
+						content: (0, vue.withCtx)(() => [(0, vue.createElementVNode)("div", { innerHTML: tooltip.value.text }, null, 8, _hoisted_3$7)]),
 						default: (0, vue.withCtx)(() => [((0, vue.openBlock)(), (0, vue.createBlock)((0, vue.resolveDynamicComponent)(tagName.value), (0, vue.mergeProps)(fieldsProps.value, {
 							model: __props.model,
 							"last-values": __props.lastValues,
@@ -3208,7 +3888,7 @@
 					key: 0,
 					placement: "top"
 				}, {
-					content: (0, vue.withCtx)(() => [(0, vue.createElementVNode)("div", { innerHTML: __props.config.tip }, null, 8, _hoisted_3$6)]),
+					content: (0, vue.withCtx)(() => [(0, vue.createElementVNode)("div", { innerHTML: __props.config.tip }, null, 8, _hoisted_4$6)]),
 					default: (0, vue.withCtx)(() => [(0, vue.createVNode)((0, vue.unref)(_tmagic_design.TMagicIcon), { style: {
 						"line-height": "40px",
 						"margin-left": "5px"
@@ -3247,7 +3927,7 @@
 							key: 0,
 							placement: tooltip.value.placement
 						}, {
-							content: (0, vue.withCtx)(() => [(0, vue.createElementVNode)("div", { innerHTML: tooltip.value.text }, null, 8, _hoisted_4$4)]),
+							content: (0, vue.withCtx)(() => [(0, vue.createElementVNode)("div", { innerHTML: tooltip.value.text }, null, 8, _hoisted_5$4)]),
 							default: (0, vue.withCtx)(() => [((0, vue.openBlock)(), (0, vue.createBlock)((0, vue.resolveDynamicComponent)(tagName.value), (0, vue.mergeProps)(fieldsProps.value, {
 								model: __props.model,
 								"last-values": __props.lastValues,
@@ -3300,7 +3980,7 @@
 								key: 0,
 								placement: tooltip.value.placement
 							}, {
-								content: (0, vue.withCtx)(() => [(0, vue.createElementVNode)("div", { innerHTML: tooltip.value.text }, null, 8, _hoisted_5$3)]),
+								content: (0, vue.withCtx)(() => [(0, vue.createElementVNode)("div", { innerHTML: tooltip.value.text }, null, 8, _hoisted_6$3)]),
 								default: (0, vue.withCtx)(() => [((0, vue.openBlock)(), (0, vue.createBlock)((0, vue.resolveDynamicComponent)(tagName.value), (0, vue.mergeProps)(fieldsProps.value, {
 									model: __props.lastValues,
 									onChange: onChangeHandler
@@ -3316,7 +3996,7 @@
 							key: 0,
 							placement: "top"
 						}, {
-							content: (0, vue.withCtx)(() => [(0, vue.createElementVNode)("div", { innerHTML: __props.config.tip }, null, 8, _hoisted_6$1)]),
+							content: (0, vue.withCtx)(() => [(0, vue.createElementVNode)("div", { innerHTML: __props.config.tip }, null, 8, _hoisted_7$2)]),
 							default: (0, vue.withCtx)(() => [(0, vue.createVNode)((0, vue.unref)(_tmagic_design.TMagicIcon), { style: {
 								"line-height": "40px",
 								"margin-left": "5px"
@@ -3357,7 +4037,7 @@
 								key: 0,
 								placement: tooltip.value.placement
 							}, {
-								content: (0, vue.withCtx)(() => [(0, vue.createElementVNode)("div", { innerHTML: tooltip.value.text }, null, 8, _hoisted_7$1)]),
+								content: (0, vue.withCtx)(() => [(0, vue.createElementVNode)("div", { innerHTML: tooltip.value.text }, null, 8, _hoisted_8$2)]),
 								default: (0, vue.withCtx)(() => [((0, vue.openBlock)(), (0, vue.createBlock)((0, vue.resolveDynamicComponent)(tagName.value), (0, vue.mergeProps)(fieldsProps.value, {
 									model: __props.model,
 									onChange: onChangeHandler
@@ -3373,7 +4053,7 @@
 							key: 1,
 							placement: "top"
 						}, {
-							content: (0, vue.withCtx)(() => [(0, vue.createElementVNode)("div", { innerHTML: __props.config.tip }, null, 8, _hoisted_8$1)]),
+							content: (0, vue.withCtx)(() => [(0, vue.createElementVNode)("div", { innerHTML: __props.config.tip }, null, 8, _hoisted_9)]),
 							default: (0, vue.withCtx)(() => [(0, vue.createVNode)((0, vue.unref)(_tmagic_design.TMagicIcon), { style: {
 								"line-height": "40px",
 								"margin-left": "5px"
@@ -3415,16 +4095,17 @@
 						"label-width",
 						"prop"
 					]);
-				}), 128)) : (0, vue.createCommentVNode)("v-if", true)], 64)) : (0, vue.createCommentVNode)("v-if", true), __props.config.expand && type.value !== "fieldset" ? ((0, vue.openBlock)(), (0, vue.createElementBlock)("div", _hoisted_9, [(0, vue.createVNode)((0, vue.unref)(_tmagic_design.TMagicButton), {
+				}), 128)) : (0, vue.createCommentVNode)("v-if", true)], 64)) : (0, vue.createCommentVNode)("v-if", true), __props.config.expand && type.value !== "fieldset" ? ((0, vue.openBlock)(), (0, vue.createElementBlock)("div", _hoisted_10, [(0, vue.createVNode)((0, vue.unref)(_tmagic_design.TMagicButton), {
 					type: "primary",
 					size: "small",
 					disabled: false,
 					link: "",
-					onClick: expandHandler
+					onClick: expandHandler,
+					icon: expand.value ? (0, vue.unref)(_element_plus_icons_vue.ArrowUp) : (0, vue.unref)(_element_plus_icons_vue.ArrowDown)
 				}, {
 					default: (0, vue.withCtx)(() => [(0, vue.createTextVNode)((0, vue.toDisplayString)(expand.value ? "收起配置" : "展开更多配置"), 1)]),
 					_: 1
-				})])) : (0, vue.createCommentVNode)("v-if", true)], 14, _hoisted_1$14);
+				}, 8, ["icon"])])) : (0, vue.createCommentVNode)("v-if", true)], 14, _hoisted_1$14);
 			};
 		}
 	});
@@ -3443,6 +4124,11 @@
 			},
 			parentValues: { default: () => ({}) },
 			labelWidth: { default: "200px" },
+			typeMatchValid: { type: Boolean },
+			validateOnInit: {
+				type: Boolean,
+				default: false
+			},
 			disabled: {
 				type: Boolean,
 				default: false
@@ -3458,9 +4144,14 @@
 			keyProp: { default: "__key" },
 			popperClass: {},
 			preventSubmitDefault: { type: Boolean },
+			useFieldTextInError: {
+				type: Boolean,
+				default: true
+			},
 			extendState: {},
 			showDiff: {},
-			selfDiffFieldTypes: {}
+			selfDiffFieldTypes: {},
+			theme: {}
 		},
 		emits: [
 			"change",
@@ -3472,6 +4163,7 @@
 		setup(__props, { expose: __expose, emit: __emit }) {
 			const props = __props;
 			const emit = __emit;
+			(0, vue.provide)(FORM_TYPE_MATCH_VALID_KEY, (0, vue.computed)(() => props.typeMatchValid));
 			const tMagicFormRef = (0, vue.useTemplateRef)("tMagicForm");
 			const initialized = (0, vue.ref)(false);
 			const values = (0, vue.ref)({});
@@ -3479,6 +4171,25 @@
 			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 = (0, vue.inject)(_tmagic_design.M_THEME_KEY, null);
+			const effectiveTheme = (0, vue.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 = (0, vue.computed)(() => effectiveTheme.value ? `m-theme--${effectiveTheme.value}` : "");
+			/**
 			* formState 实现说明：
 			*
 			* 1. 与 props 直接对应的字段（config / initValues / lastValues / isCompare / parentValues /
@@ -3494,13 +4205,21 @@
 			*      把最新值刷进 formState。
 			*    - accessor 描述符（`{ get stage() { return ... } }`）按原样写入，调用方可以控制
 			*      读时求值，每次读取都会重新执行 getter。
+			*
+			* 4. `popperClass` 会自动拼接 `themeClass`：调用方传入的 `popperClass` + 当前主题
+			*    修饰类（含祖先 `<MEditor>` provide 的主题）。这样所有透传到 Element Plus 弹层
+			*    `popper-class` 的字段（Select / DateTime / Cascader 等）能自带主题作用域。
 			*/
 			const formState = (0, vue.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;
@@ -3534,6 +4253,17 @@
 				}
 			});
 			/**
+			* 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` 自动跟踪。这样可以兼容历史用法 ——
 			*
@@ -3548,11 +4278,10 @@
 			* 这里不再重复同步；因此 `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 等）以普通字段形式返回时会被跳过并告警。
 			*/
 			(0, vue.watchEffect)(async (onCleanup) => {
 				const { extendState } = props;
@@ -3569,13 +4298,16 @@
 					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);
 			});
 			(0, vue.provide)("mForm", formState);
+			/**
+			* 把生效主题（自身或祖先）再 provide 出去，供 form 子树内含 `Teleport` 的组件
+			* （如 `TMagicPopover`）在传送目标上挂 `m-theme--<theme>` 类。
+			* 详见 `@tmagic/design/theme.ts`。
+			*/
+			(0, vue.provide)(_tmagic_design.M_THEME_KEY, effectiveTheme);
+			(0, vue.provide)("formInline", props.inline);
 			(0, vue.provide)(FORM_DIFF_CONFIG_KEY, {
 				get showDiff() {
 					return props.showDiff;
@@ -3594,6 +4326,9 @@
 				}).then((value) => {
 					values.value = value;
 					initialized.value = !props.isCompare;
+					if (props.validateOnInit) (0, vue.nextTick)(() => {
+						tMagicFormRef.value?.validate();
+					});
 				});
 				if (props.isCompare) initValue(formState, {
 					initValues: props.lastValues,
@@ -3645,6 +4380,23 @@
 				};
 				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,
@@ -3664,22 +4416,43 @@
 						return native ? values.value : cloneDeep((0, vue.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 (0, vue.openBlock)(), (0, vue.createBlock)((0, vue.unref)(_tmagic_design.TMagicForm), {
-					class: "m-form",
+					class: (0, vue.normalizeClass)([
+						"m-form",
+						effectiveTheme.value ? `m-form--${effectiveTheme.value}` : "",
+						effectiveTheme.value ? `m-theme--${effectiveTheme.value}` : ""
+					]),
 					ref: "tMagicForm",
 					model: values.value,
 					"label-width": __props.labelWidth,
@@ -3717,6 +4490,7 @@
 					}), 128)) : (0, vue.createCommentVNode)("v-if", true)]),
 					_: 3
 				}, 8, [
+					"class",
 					"model",
 					"label-width",
 					"style",
@@ -3728,6 +4502,198 @@
 	});
 	//#endregion
 	//#region packages/form/src/submitForm.ts
+	/** 未指定或传入非正数 timeout 时的兜底超时（毫秒），保证非 debug 挂载始终能被清理 */
+	var DEFAULT_MOUNT_TIMEOUT = 1e4;
+	/**
+	* submitForm / validateForm 的公共脚手架：
+	*
+	* 创建临时容器 → 挂载一个 wrapper 组件（内含 MForm）→ 提供统一的 cleanup / timeout / appContext 继承 →
+	* 由 `createWrapper` 决定「何时调用 MForm 的哪个方法、如何 resolve/reject」。
+	*
+	* 调用方只需关注差异逻辑（调用 `submitForm` 还是 `validate`、结果如何包装、是否需要调试弹层），
+	* 容器创建、卸载、超时、上下文注入等模板代码在此统一收口。
+	*/
+	var mountFormInstance = (options) => {
+		const { formProps, appContext, timeout, timeoutMessage, hidden = true, skipTimeout = false, signal, createWrapper } = options;
+		return new Promise((resolve, reject) => {
+			if (signal?.aborted) {
+				reject(signal.reason ?? /* @__PURE__ */ new Error("mountFormInstance aborted"));
+				return;
+			}
+			let cleaned = false;
+			let timer = null;
+			let onAbort = null;
+			const instance = { app: null };
+			const container = document.createElement("div");
+			if (hidden) container.style.display = "none";
+			document.body.appendChild(container);
+			const cleanup = () => {
+				if (cleaned) return;
+				cleaned = true;
+				if (timer) {
+					clearTimeout(timer);
+					timer = null;
+				}
+				if (signal && onAbort) {
+					signal.removeEventListener("abort", onAbort);
+					onAbort = null;
+				}
+				try {
+					instance.app?.unmount();
+				} catch {}
+				container.parentNode?.removeChild(container);
+			};
+			if (signal) {
+				onAbort = () => {
+					if (cleaned) return;
+					reject(signal.reason ?? /* @__PURE__ */ new Error("mountFormInstance aborted"));
+					cleanup();
+				};
+				signal.addEventListener("abort", onAbort);
+			}
+			try {
+				const formRef = (0, vue.ref)(null);
+				const { extendState, ...restFormProps } = formProps;
+				const userWrapper = createWrapper({
+					formRef,
+					formProps: restFormProps,
+					cleanup,
+					resolve,
+					reject
+				});
+				const wrapperComponent = typeof extendState === "function" ? (0, vue.defineComponent)({
+					name: "MFormExtendStateInjector",
+					setup() {
+						(0, vue.watch)(() => formRef.value, (form) => {
+							if (!form) return;
+							let result;
+							try {
+								result = extendState(form.formState);
+							} catch (e) {
+								console.error("[MForm] extendState failed:", e);
+								return;
+							}
+							const reservedStateKeys = new Set(Reflect.ownKeys(form.formState));
+							const apply = (state) => applyExtendState(form.formState, state, reservedStateKeys);
+							if (result && typeof result.then === "function") result.then(apply, (e) => console.error("[MForm] extendState failed:", e));
+							else apply(result);
+						}, {
+							flush: "sync",
+							immediate: true
+						});
+						return () => (0, vue.h)(userWrapper);
+					}
+				}) : userWrapper;
+				const app = (0, vue.createApp)(hidden ? (0, vue.defineComponent)({
+					name: "MFormSilentProvider",
+					setup() {
+						(0, vue.provide)(FORM_SILENT_MODE_KEY, true);
+						return () => (0, vue.h)(wrapperComponent);
+					}
+				}) : wrapperComponent);
+				instance.app = app;
+				if (appContext) Object.assign(app._context, appContext);
+				if (!skipTimeout) timer = setTimeout(() => {
+					if (!cleaned) {
+						reject(new Error(timeoutMessage));
+						cleanup();
+					}
+				}, timeout > 0 ? timeout : DEFAULT_MOUNT_TIMEOUT);
+				app.mount(container);
+			} catch (err) {
+				reject(err);
+				cleanup();
+			}
+		});
+	};
+	/**
+	* 构造调试模式下的可见弹层 wrapper：以 fixed 遮罩居中渲染 MForm，提供「确定 / 取消」按钮与错误展示区。
+	*
+	* submitForm 与 validateForm 的调试弹层 UI 完全一致，仅「确定」时调用的实例方法、错误处理与取消文案不同，
+	* 这些差异通过 `onConfirm` / `onCancel` 注入，弹层结构在此统一收口。
+	*/
+	var createDebugWrapper = (options) => {
+		const { formRef, formProps, title, name, onConfirm, onCancel } = options;
+		const btnBase = {
+			padding: "8px 20px",
+			fontSize: "14px",
+			lineHeight: "1",
+			border: "1px solid #dcdfe6",
+			borderRadius: "4px",
+			cursor: "pointer"
+		};
+		return (0, vue.defineComponent)({
+			name,
+			setup() {
+				const errorMsg = (0, vue.ref)("");
+				const setError = (msg) => {
+					errorMsg.value = msg;
+				};
+				return () => (0, vue.h)("div", { style: {
+					position: "fixed",
+					inset: "0",
+					zIndex: "10000",
+					display: "flex",
+					alignItems: "center",
+					justifyContent: "center",
+					background: "rgba(0, 0, 0, 0.5)"
+				} }, [(0, vue.h)("div", { style: {
+					display: "flex",
+					flexDirection: "column",
+					width: "600px",
+					maxWidth: "90vw",
+					maxHeight: "85vh",
+					background: "#fff",
+					borderRadius: "8px",
+					boxShadow: "0 8px 24px rgba(0, 0, 0, 0.2)",
+					overflow: "hidden"
+				} }, [
+					(0, vue.h)("div", { style: {
+						padding: "16px 20px",
+						fontSize: "16px",
+						fontWeight: "600",
+						borderBottom: "1px solid #ebeef5"
+					} }, title),
+					(0, vue.h)("div", { style: {
+						flex: "1",
+						padding: "20px",
+						overflow: "auto"
+					} }, [(0, vue.h)(Form_default, {
+						...formProps,
+						ref: formRef
+					}), errorMsg.value ? (0, vue.h)("div", {
+						style: {
+							marginTop: "12px",
+							color: "#f56c6c",
+							fontSize: "13px",
+							lineHeight: "1.5"
+						},
+						innerHTML: errorMsg.value
+					}) : null]),
+					(0, vue.h)("div", { style: {
+						display: "flex",
+						justifyContent: "flex-end",
+						gap: "12px",
+						padding: "12px 20px",
+						borderTop: "1px solid #ebeef5"
+					} }, [(0, vue.h)("button", {
+						type: "button",
+						onClick: onCancel,
+						style: { ...btnBase }
+					}, "取消"), (0, vue.h)("button", {
+						type: "button",
+						onClick: () => onConfirm(setError),
+						style: {
+							...btnBase,
+							color: "#fff",
+							background: "#409eff",
+							borderColor: "#409eff"
+						}
+					}, "确定")])
+				])]);
+			}
+		});
+	};
 	/**
 	* 以命令式方式调用 Form.vue 完成一次表单校验/提交。
 	*
@@ -3748,65 +4714,230 @@
 	* } catch (e) {
 	*   console.error(e);
 	* }
+	*
+	* // 需要同时获取变更记录时：
+	* const { values, changeRecords } = await submitForm({
+	*   config: [...],
+	*   initValues: { name: 'foo' },
+	*   returnChangeRecords: true,
+	* });
+	*
+	* // 调试模式：可见地渲染表单，点击「确定」才提交：
+	* const values = await submitForm({
+	*   config: [...],
+	*   initValues: { name: 'foo' },
+	*   debug: true,
+	* });
 	* ```
 	*/
 	var submitForm = (options) => {
-		const { native, appContext, timeout = 1e4, ...formProps } = options;
-		return new Promise((resolve, reject) => {
-			const container = document.createElement("div");
-			container.style.display = "none";
-			document.body.appendChild(container);
-			let cleaned = false;
-			let timer = null;
-			const app = (0, vue.createApp)((0, vue.defineComponent)({
-				name: "MFormSubmitWrapper",
-				setup() {
-					const formRef = (0, vue.ref)(null);
-					const stop = (0, vue.watch)(() => formRef.value?.initialized, async (initialized) => {
-						if (!initialized) return;
-						stop();
-						try {
-							await (0, vue.nextTick)();
-							resolve(await formRef.value.submitForm(native));
-						} catch (err) {
-							reject(err);
-						} finally {
+		const { native, appContext, timeout = 1e4, returnChangeRecords, debug = false, signal, ...formProps } = options;
+		return mountFormInstance({
+			formProps,
+			appContext,
+			timeout,
+			signal,
+			hidden: !debug,
+			skipTimeout: debug,
+			timeoutMessage: `submitForm timeout after ${timeout}ms: form is not initialized.`,
+			createWrapper: ({ formRef, formProps, cleanup, resolve, reject }) => {
+				/**
+				* 执行一次提交：nextTick 等待子组件渲染 → 快照 changeRecords → 调用实例 submitForm → resolve。
+				* 校验失败时交给 `onValidateError` 决定「保留弹层展示错误（debug）」还是「reject 并清理（普通）」，
+				* 从而让 debug 与普通模式共享同一份提交逻辑。
+				*/
+				const doSubmit = async (onValidateError) => {
+					try {
+						await (0, vue.nextTick)();
+						const changeRecords = [...formRef.value?.changeRecords ?? []];
+						const result = await formRef.value.submitForm(native);
+						resolve(returnChangeRecords ? {
+							values: result,
+							changeRecords
+						} : result);
+						cleanup();
+					} catch (err) {
+						onValidateError(err);
+					}
+				};
+				if (debug) return createDebugWrapper({
+					formRef,
+					formProps,
+					name: "MFormSubmitWrapper",
+					title: "submitForm 调试",
+					onConfirm: (setError) => doSubmit((err) => {
+						setError(err instanceof Error ? err.message : String(err));
+					}),
+					onCancel: () => {
+						reject(/* @__PURE__ */ new Error("submitForm canceled in debug mode."));
+						cleanup();
+					}
+				});
+				return (0, vue.defineComponent)({
+					name: "MFormSubmitWrapper",
+					setup() {
+						const stop = (0, vue.watch)(() => formRef.value?.initialized, (initialized) => {
+							if (!initialized) return;
+							stop();
+							doSubmit((err) => {
+								reject(err);
+								cleanup();
+							});
+						}, {
+							flush: "post",
+							immediate: true
+						});
+						return () => (0, vue.h)(Form_default, {
+							...formProps,
+							ref: formRef
+						});
+					}
+				});
+			}
+		});
+	};
+	/**
+	* 深拷贝配置值，保留函数（display / onTabClick 等回调）引用，避免破坏配置中的回调。
+	*/
+	var cloneConfigValue = (value) => {
+		if (Array.isArray(value)) return value.map(cloneConfigValue);
+		if (value && typeof value === "object") return Object.keys(value).reduce((acc, key) => {
+			acc[key] = cloneConfigValue(value[key]);
+			return acc;
+		}, {});
+		return value;
+	};
+	/**
+	* 深度遍历配置，去掉所有 type 为 'tab' 的容器中各标签页（items）的 lazy 配置。
+	*/
+	var removeTabItemsLazy = (node) => {
+		if (Array.isArray(node)) {
+			node.forEach(removeTabItemsLazy);
+			return;
+		}
+		if (!node || typeof node !== "object") return;
+		if (node.type === "tab" && Array.isArray(node.items)) node.items.forEach((pane) => {
+			if (pane && typeof pane === "object") delete pane.lazy;
+		});
+		Object.keys(node).forEach((key) => {
+			removeTabItemsLazy(node[key]);
+		});
+	};
+	/**
+	* 返回一份去除了 tab 标签页 lazy 的配置副本。
+	*
+	* tab 容器开启 lazy 时，非激活标签页的内容不会渲染，导致 validateForm 静默挂载后
+	* 无法校验到这些标签页内的字段。校验场景需要一次性渲染全部字段，故在此统一去除 lazy。
+	* 处理基于深拷贝，不会污染调用方传入的原始 config。
+	*/
+	var stripTabItemsLazy = (config) => {
+		const cloned = cloneConfigValue(config);
+		removeTabItemsLazy(cloned);
+		return cloned;
+	};
+	/**
+	* 以命令式方式对一份「表单配置 + 值」做一次静默校验，**不依赖也不影响任何已渲染的表单**。
+	*
+	* 与 `submitForm` 类似，内部会临时挂载一个不可见的 MForm 实例，等待其初始化完成后调用
+	* 实例的 `validate` 方法，返回汇总后的错误文案，随后自动卸载实例。
+	*
+	* 与 `submitForm` 的区别：
+	* - 「静默」：校验失败不抛异常、不触发 `error` 事件、不返回表单值；
+	* - 仅用于「探测」配置是否合法，适合源码保存后校验、批量校验组件配置等场景。
+	*
+	* 由于每次都新建一个独立的 MForm 实例，调用方无需持有任何表单 ref，也不会污染
+	* 页面上正在展示的表单状态。
+	*
+	* @returns 校验通过返回空字符串 `''`，否则返回以 `<br>` 拼接的错误文案。
+	*   仅在初始化超时或挂载失败等异常情况下才会 reject。
+	*
+	* @example
+	* ```ts
+	* import { validateForm } from '@tmagic/form';
+	*
+	* const error = await validateForm({
+	*   config: [...],
+	*   initValues: { name: 'foo' },
+	*   appContext: getCurrentInstance()?.appContext,
+	* });
+	* if (error) {
+	*   // 配置不合法，error 为错误文案
+	* }
+	*
+	* // 调试模式：可见地渲染表单，点击「确定」才校验，校验失败保留弹层可修正重试：
+	* const error = await validateForm({
+	*   config: [...],
+	*   initValues: { name: 'foo' },
+	*   debug: true,
+	* });
+	* ```
+	*/
+	var validateForm = (options) => {
+		const { appContext, timeout = 1e4, debug = false, config, signal, ...rest } = options;
+		return mountFormInstance({
+			formProps: {
+				...rest,
+				config: stripTabItemsLazy(config)
+			},
+			appContext,
+			timeout,
+			signal,
+			hidden: !debug,
+			skipTimeout: debug,
+			timeoutMessage: `validateForm timeout after ${timeout}ms: form is not initialized.`,
+			createWrapper: ({ formRef, formProps, cleanup, resolve, reject }) => {
+				/**
+				* 执行一次校验：nextTick 等待子组件渲染 → 调用实例 validate → 通过则 resolve ''。
+				* 校验失败（返回非空错误文案）时交给 `onInvalid` 决定「静默 resolve 错误文案（普通）」
+				* 还是「在弹层展示错误并保留供重试（debug）」，从而让两种模式共享同一份校验逻辑。
+				*/
+				const doValidate = async (onInvalid) => {
+					try {
+						await (0, vue.nextTick)();
+						const error = await formRef.value.validate();
+						if (error) onInvalid(error);
+						else {
+							resolve("");
 							cleanup();
 						}
-					}, {
-						flush: "post",
-						immediate: true
-					});
-					return () => (0, vue.h)(Form_default, {
-						...formProps,
-						ref: formRef
-					});
-				}
-			}));
-			if (appContext) Object.assign(app._context, appContext);
-			const cleanup = () => {
-				if (cleaned) return;
-				cleaned = true;
-				if (timer) {
-					clearTimeout(timer);
-					timer = null;
-				}
-				try {
-					app.unmount();
-				} catch {}
-				container.parentNode?.removeChild(container);
-			};
-			if (timeout > 0) timer = setTimeout(() => {
-				if (!cleaned) {
-					reject(/* @__PURE__ */ new Error(`submitForm timeout after ${timeout}ms: form is not initialized.`));
-					cleanup();
-				}
-			}, timeout);
-			try {
-				app.mount(container);
-			} catch (err) {
-				reject(err);
-				cleanup();
+					} catch (err) {
+						reject(err);
+						cleanup();
+					}
+				};
+				if (debug) return createDebugWrapper({
+					formRef,
+					formProps,
+					name: "MFormValidateWrapper",
+					title: "validateForm 调试",
+					onConfirm: (setError) => doValidate((error) => {
+						setError(error);
+					}),
+					onCancel: () => {
+						reject(/* @__PURE__ */ new Error("validateForm canceled in debug mode."));
+						cleanup();
+					}
+				});
+				return (0, vue.defineComponent)({
+					name: "MFormValidateWrapper",
+					setup() {
+						const stop = (0, vue.watch)(() => formRef.value?.initialized, (initialized) => {
+							if (!initialized) return;
+							stop();
+							doValidate((error) => {
+								resolve(error);
+								cleanup();
+							});
+						}, {
+							flush: "post",
+							immediate: true
+						});
+						return () => (0, vue.h)(Form_default, {
+							...formProps,
+							ref: formRef
+						});
+					}
+				});
 			}
 		});
 	};
@@ -3824,6 +4955,11 @@
 			parentValues: {},
 			width: {},
 			labelWidth: {},
+			typeMatchValid: { type: Boolean },
+			validateOnInit: {
+				type: Boolean,
+				default: false
+			},
 			fullscreen: { type: Boolean },
 			disabled: { type: Boolean },
 			title: {},
@@ -3853,7 +4989,12 @@
 				type: Boolean,
 				default: true
 			},
-			extendState: {}
+			useFieldTextInError: {
+				type: Boolean,
+				default: true
+			},
+			extendState: {},
+			theme: {}
 		},
 		emits: [
 			"close",
@@ -3863,6 +5004,9 @@
 		],
 		setup(__props, { expose: __expose, emit: __emit }) {
 			const props = __props;
+			const ancestorTheme = (0, vue.inject)(_tmagic_design.M_THEME_KEY, null);
+			const effectiveTheme = (0, vue.computed)(() => props.theme || ancestorTheme?.value || "");
+			(0, vue.provide)(_tmagic_design.M_THEME_KEY, effectiveTheme);
 			const emit = __emit;
 			const form = (0, vue.ref)();
 			const dialogVisible = (0, vue.ref)(false);
@@ -3886,7 +5030,8 @@
 			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);
 				}
@@ -3922,7 +5067,7 @@
 				return (0, vue.openBlock)(), (0, vue.createBlock)((0, vue.unref)(_tmagic_design.TMagicDialog), {
 					modelValue: dialogVisible.value,
 					"onUpdate:modelValue": _cache[1] || (_cache[1] = ($event) => dialogVisible.value = $event),
-					class: "m-form-dialog",
+					class: (0, vue.normalizeClass)(["m-form-dialog", effectiveTheme.value ? `m-theme--${effectiveTheme.value}` : ""]),
 					top: "20px",
 					"append-to-body": "",
 					title: __props.title,
@@ -4003,7 +5148,11 @@
 						"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",
@@ -4016,11 +5165,16 @@
 						"label-position",
 						"inline",
 						"prevent-submit-default",
-						"extend-state"
+						"use-field-text-in-error",
+						"type-match-valid",
+						"validate-on-init",
+						"extend-state",
+						"theme"
 					]), (0, vue.renderSlot)(_ctx.$slots, "default")], 4)) : (0, vue.createCommentVNode)("v-if", true)]),
 					_: 3
 				}, 8, [
 					"modelValue",
+					"class",
 					"title",
 					"width",
 					"zIndex",
@@ -4039,7 +5193,7 @@
 	//#endregion
 	//#region packages/form/src/FormDrawer.vue
 	var FormDrawer_default = /* @__PURE__ */ (0, vue.defineComponent)({
-		name: "MFormDialog",
+		name: "MFormDrawer",
 		__name: "FormDrawer",
 		props: {
 			config: { default: () => [] },
@@ -4047,6 +5201,11 @@
 			parentValues: {},
 			width: {},
 			labelWidth: {},
+			typeMatchValid: { type: Boolean },
+			validateOnInit: {
+				type: Boolean,
+				default: false
+			},
 			disabled: { type: Boolean },
 			closeOnPressEscape: {
 				type: Boolean,
@@ -4059,8 +5218,13 @@
 			inline: { type: Boolean },
 			labelPosition: {},
 			preventSubmitDefault: { type: Boolean },
+			useFieldTextInError: {
+				type: Boolean,
+				default: true
+			},
 			beforeClose: {},
-			extendState: {}
+			extendState: {},
+			theme: {}
 		},
 		emits: [
 			"close",
@@ -4072,11 +5236,15 @@
 			"opened"
 		],
 		setup(__props, { expose: __expose, emit: __emit }) {
+			const props = __props;
+			const ancestorTheme = (0, vue.inject)(_tmagic_design.M_THEME_KEY, null);
+			const effectiveTheme = (0, vue.computed)(() => props.theme || ancestorTheme?.value || "");
+			(0, vue.provide)(_tmagic_design.M_THEME_KEY, effectiveTheme);
 			const emit = __emit;
 			const drawer = (0, vue.ref)();
 			const form = (0, vue.ref)();
 			const drawerBody = (0, vue.ref)();
-			const visible = (0, vue.ref)(false);
+			const dialogVisible = (0, vue.ref)(false);
 			const saveFetch = (0, vue.ref)(false);
 			const bodyHeight = (0, vue.ref)(0);
 			(0, vue.watchEffect)(() => {
@@ -4085,7 +5253,8 @@
 			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);
 				}
@@ -4106,30 +5275,48 @@
 				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 (0, vue.openBlock)(), (0, vue.createBlock)((0, vue.unref)(_tmagic_design.TMagicDrawer), {
-					class: "m-form-drawer",
+					class: (0, vue.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,
@@ -4167,7 +5354,7 @@
 						})]),
 						_: 3
 					})]),
-					default: (0, vue.withCtx)(() => [visible.value ? ((0, vue.openBlock)(), (0, vue.createElementBlock)("div", {
+					default: (0, vue.withCtx)(() => [dialogVisible.value ? ((0, vue.openBlock)(), (0, vue.createElementBlock)("div", {
 						key: 0,
 						ref_key: "drawerBody",
 						ref: drawerBody,
@@ -4184,7 +5371,11 @@
 						"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",
@@ -4196,10 +5387,15 @@
 						"label-position",
 						"inline",
 						"prevent-submit-default",
-						"extend-state"
+						"use-field-text-in-error",
+						"type-match-valid",
+						"validate-on-init",
+						"extend-state",
+						"theme"
 					]), (0, vue.renderSlot)(_ctx.$slots, "default")], 512)) : (0, vue.createCommentVNode)("v-if", true)]),
 					_: 3
 				}, 8, [
+					"class",
 					"modelValue",
 					"title",
 					"close-on-press-escape",
@@ -4225,12 +5421,21 @@
 			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: [
@@ -4257,7 +5462,8 @@
 			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);
 				}
@@ -4293,7 +5499,10 @@
 						"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",
@@ -4305,7 +5514,10 @@
 						"label-position",
 						"inline",
 						"prevent-submit-default",
-						"extend-state"
+						"use-field-text-in-error",
+						"extend-state",
+						"type-match-valid",
+						"validate-on-init"
 					]), (0, vue.renderSlot)(_ctx.$slots, "default")]),
 					_: 3
 				})], 4), (0, vue.createElementVNode)("div", {
@@ -4331,16 +5543,16 @@
 	//#endregion
 	//#region packages/form/src/containers/Fieldset.vue?vue&type=script&setup=true&lang.ts
 	var _hoisted_1$11 = ["innerHTML"];
-	var _hoisted_2$6 = ["innerHTML"];
-	var _hoisted_3$5 = { key: 1 };
-	var _hoisted_4$3 = ["innerHTML"];
-	var _hoisted_5$2 = ["innerHTML"];
-	var _hoisted_6 = {
+	var _hoisted_2$7 = ["innerHTML"];
+	var _hoisted_3$6 = { key: 1 };
+	var _hoisted_4$5 = ["innerHTML"];
+	var _hoisted_5$3 = ["innerHTML"];
+	var _hoisted_6$2 = {
 		key: 2,
 		style: { "display": "flex" }
 	};
-	var _hoisted_7 = { style: { "flex": "1" } };
-	var _hoisted_8 = ["src"];
+	var _hoisted_7$1 = { style: { "flex": "1" } };
+	var _hoisted_8$1 = ["src"];
 	//#endregion
 	//#region packages/form/src/containers/Fieldset.vue
 	var Fieldset_default = /* @__PURE__ */ (0, vue.defineComponent)({
@@ -4366,6 +5578,7 @@
 			const emit = __emit;
 			const mForm = (0, vue.inject)("mForm");
 			const name = (0, vue.computed)(() => props.config.name || "");
+			const legend = (0, vue.computed)(() => filterFunction(mForm, props.config.legend, props));
 			const checkboxName = (0, vue.computed)(() => {
 				if (typeof props.config.checkbox === "object" && typeof props.config.checkbox.name === "string") return props.config.checkbox.name;
 				return "value";
@@ -4405,11 +5618,11 @@
 						"false-value": checkboxFalseValue.value,
 						"onUpdate:modelValue": valueChangeHandler
 					}, {
-						default: (0, vue.withCtx)(() => [(0, vue.createElementVNode)("span", { innerHTML: __props.config.legend }, null, 8, _hoisted_1$11), __props.config.extra ? ((0, vue.openBlock)(), (0, vue.createElementBlock)("span", {
+						default: (0, vue.withCtx)(() => [(0, vue.createElementVNode)("span", { innerHTML: legend.value }, null, 8, _hoisted_1$11), __props.config.extra ? ((0, vue.openBlock)(), (0, vue.createElementBlock)("span", {
 							key: 0,
 							innerHTML: __props.config.extra,
 							class: "m-form-tip"
-						}, null, 8, _hoisted_2$6)) : (0, vue.createCommentVNode)("v-if", true)]),
+						}, null, 8, _hoisted_2$7)) : (0, vue.createCommentVNode)("v-if", true)]),
 						_: 1
 					}, 8, [
 						"model-value",
@@ -4418,11 +5631,11 @@
 						"false-value"
 					])]),
 					_: 1
-				})) : ((0, vue.openBlock)(), (0, vue.createElementBlock)("legend", _hoisted_3$5, [(0, vue.createElementVNode)("span", { innerHTML: __props.config.legend }, null, 8, _hoisted_4$3), __props.config.extra ? ((0, vue.openBlock)(), (0, vue.createElementBlock)("span", {
+				})) : ((0, vue.openBlock)(), (0, vue.createElementBlock)("legend", _hoisted_3$6, [(0, vue.createElementVNode)("span", { innerHTML: legend.value }, null, 8, _hoisted_4$5), __props.config.extra ? ((0, vue.openBlock)(), (0, vue.createElementBlock)("span", {
 					key: 0,
 					innerHTML: __props.config.extra,
 					class: "m-form-tip"
-				}, null, 8, _hoisted_5$2)) : (0, vue.createCommentVNode)("v-if", true)])), __props.config.schematic && show.value ? ((0, vue.openBlock)(), (0, vue.createElementBlock)("div", _hoisted_6, [(0, vue.createElementVNode)("div", _hoisted_7, [((0, vue.openBlock)(true), (0, vue.createElementBlock)(vue.Fragment, null, (0, vue.renderList)(__props.config.items, (item, index) => {
+				}, null, 8, _hoisted_5$3)) : (0, vue.createCommentVNode)("v-if", true)])), __props.config.schematic && show.value ? ((0, vue.openBlock)(), (0, vue.createElementBlock)("div", _hoisted_6$2, [(0, vue.createElementVNode)("div", _hoisted_7$1, [((0, vue.openBlock)(true), (0, vue.createElementBlock)(vue.Fragment, null, (0, vue.renderList)(__props.config.items, (item, index) => {
 					return (0, vue.openBlock)(), (0, vue.createBlock)(Container_default, {
 						key: key(item, index),
 						model: name.value ? __props.model[name.value] : __props.model,
@@ -4450,7 +5663,7 @@
 				}), 128))]), (0, vue.createElementVNode)("img", {
 					class: "m-form-schematic",
 					src: __props.config.schematic
-				}, null, 8, _hoisted_8)])) : show.value ? ((0, vue.openBlock)(true), (0, vue.createElementBlock)(vue.Fragment, { key: 3 }, (0, vue.renderList)(__props.config.items, (item, index) => {
+				}, null, 8, _hoisted_8$1)])) : show.value ? ((0, vue.openBlock)(true), (0, vue.createElementBlock)(vue.Fragment, { key: 3 }, (0, vue.renderList)(__props.config.items, (item, index) => {
 					return (0, vue.openBlock)(), (0, vue.createBlock)(Container_default, {
 						key: key(item, index),
 						model: name.value ? __props.model[name.value] : __props.model,
@@ -4547,13 +5760,13 @@
 		"display": "flex",
 		"align-items": "center"
 	} };
-	var _hoisted_2$5 = ["innerHTML"];
-	var _hoisted_3$4 = {
+	var _hoisted_2$6 = ["innerHTML"];
+	var _hoisted_3$5 = {
 		key: 0,
 		style: { "display": "flex" }
 	};
-	var _hoisted_4$2 = { style: { "flex": "1" } };
-	var _hoisted_5$1 = ["src"];
+	var _hoisted_4$4 = { style: { "flex": "1" } };
+	var _hoisted_5$2 = ["src"];
 	//#endregion
 	//#region packages/form/src/containers/Panel.vue
 	var Panel_default = /* @__PURE__ */ (0, vue.defineComponent)({
@@ -4568,7 +5781,8 @@
 			labelWidth: {},
 			prop: {},
 			size: {},
-			disabled: { type: Boolean }
+			disabled: { type: Boolean },
+			hideExpand: { type: Boolean }
 		},
 		emits: ["change", "addDiffCount"],
 		setup(__props, { expose: __expose, emit: __emit }) {
@@ -4592,26 +5806,31 @@
 				return items.value && items.value.length ? ((0, vue.openBlock)(), (0, vue.createBlock)((0, vue.unref)(_tmagic_design.TMagicCard), {
 					key: 0,
 					class: "box-card m-form-panel",
-					"body-style": { display: expand.value ? "block" : "none" }
+					"body-style": { display: expand.value ? "block" : "none" },
+					flat: __props.config.flat
 				}, {
 					header: (0, vue.withCtx)(() => [(0, vue.createElementVNode)("div", _hoisted_1$10, [
-						(0, vue.createVNode)((0, vue.unref)(_tmagic_design.TMagicButton), {
-							style: { "padding": "0" },
+						!__props.hideExpand ? ((0, vue.openBlock)(), (0, vue.createBlock)((0, vue.unref)(_tmagic_design.TMagicButton), {
+							key: 0,
+							style: {
+								"padding": "0",
+								"margin-right": "10px"
+							},
 							link: "",
-							icon: expand.value ? (0, vue.unref)(_element_plus_icons_vue.CaretBottom) : (0, vue.unref)(_element_plus_icons_vue.CaretRight),
+							icon: expand.value ? (0, vue.unref)(_element_plus_icons_vue.ArrowDown) : (0, vue.unref)(_element_plus_icons_vue.ArrowRight),
 							onClick: _cache[0] || (_cache[0] = ($event) => expand.value = !expand.value)
-						}, null, 8, ["icon"]),
+						}, null, 8, ["icon"])) : (0, vue.createCommentVNode)("v-if", true),
 						(0, vue.renderSlot)(_ctx.$slots, "header", {}, () => [(0, vue.createElementVNode)("span", {
 							style: { "cursor": "pointer" },
 							onClick: _cache[1] || (_cache[1] = ($event) => expand.value = !expand.value)
 						}, (0, vue.toDisplayString)(filter(__props.config.title)), 1)]),
 						__props.config && __props.config.extra ? ((0, vue.openBlock)(), (0, vue.createElementBlock)("span", {
-							key: 0,
+							key: 1,
 							innerHTML: __props.config.extra,
 							class: "m-form-tip"
-						}, null, 8, _hoisted_2$5)) : (0, vue.createCommentVNode)("v-if", true)
+						}, null, 8, _hoisted_2$6)) : (0, vue.createCommentVNode)("v-if", true)
 					])]),
-					default: (0, vue.withCtx)(() => [(0, vue.createElementVNode)("div", null, [(0, vue.renderSlot)(_ctx.$slots, "default"), __props.config.schematic ? ((0, vue.openBlock)(), (0, vue.createElementBlock)("div", _hoisted_3$4, [(0, vue.createElementVNode)("div", _hoisted_4$2, [((0, vue.openBlock)(true), (0, vue.createElementBlock)(vue.Fragment, null, (0, vue.renderList)(items.value, (item, index) => {
+					default: (0, vue.withCtx)(() => [(0, vue.createElementVNode)("div", null, [(0, vue.renderSlot)(_ctx.$slots, "default"), __props.config.schematic ? ((0, vue.openBlock)(), (0, vue.createElementBlock)("div", _hoisted_3$5, [(0, vue.createElementVNode)("div", _hoisted_4$4, [((0, vue.openBlock)(true), (0, vue.createElementBlock)(vue.Fragment, null, (0, vue.renderList)(items.value, (item, index) => {
 						return (0, vue.openBlock)(), (0, vue.createBlock)(Container_default, {
 							key: item[(0, vue.unref)(mForm)?.keyProp || "__key"] ?? index,
 							config: item,
@@ -4637,7 +5856,7 @@
 					}), 128))]), (0, vue.createElementVNode)("img", {
 						class: "m-form-schematic",
 						src: __props.config.schematic
-					}, null, 8, _hoisted_5$1)])) : ((0, vue.openBlock)(true), (0, vue.createElementBlock)(vue.Fragment, { key: 1 }, (0, vue.renderList)(items.value, (item, index) => {
+					}, null, 8, _hoisted_5$2)])) : ((0, vue.openBlock)(true), (0, vue.createElementBlock)(vue.Fragment, { key: 1 }, (0, vue.renderList)(items.value, (item, index) => {
 						return (0, vue.openBlock)(), (0, vue.createBlock)(Container_default, {
 							key: item[(0, vue.unref)(mForm)?.keyProp || "__key"] ?? index,
 							config: item,
@@ -4662,7 +5881,7 @@
 						]);
 					}), 128))])]),
 					_: 3
-				}, 8, ["body-style"])) : (0, vue.createCommentVNode)("v-if", true);
+				}, 8, ["body-style", "flat"])) : (0, vue.createCommentVNode)("v-if", true);
 			};
 		}
 	});
@@ -4705,7 +5924,8 @@
 						size: __props.size,
 						disabled: __props.disabled,
 						onChange: changeHandler,
-						onAddDiffCount
+						onAddDiffCount,
+						"is-in-row": true
 					}, null, 8, [
 						"model",
 						"lastValues",
@@ -4976,12 +6196,13 @@
 	});
 	//#endregion
 	//#region packages/form/src/containers/GroupListItem.vue?vue&type=script&setup=true&lang.ts
-	var _hoisted_1$9 = ["innerHTML"];
-	var _hoisted_2$4 = { style: {
+	var _hoisted_1$9 = { class: "m-fields-group-list-item-header" };
+	var _hoisted_2$5 = ["innerHTML"];
+	var _hoisted_3$4 = { style: {
 		"text-align": "right",
 		"margin-top": "20px"
 	} };
-	var _hoisted_3$3 = ["innerHTML"];
+	var _hoisted_4$3 = ["innerHTML"];
 	//#endregion
 	//#region packages/form/src/containers/GroupListItem.vue
 	var GroupListItem_default = /* @__PURE__ */ (0, vue.defineComponent)({
@@ -5020,7 +6241,10 @@
 				[mForm?.keyProp || "__key"]: `${props.config[mForm?.keyProp || "__key"]}${String(props.index)}`
 			}));
 			const title = (0, vue.computed)(() => {
-				if (props.config.titleKey && props.model[props.config.titleKey]) return props.model[props.config.titleKey];
+				if (props.config.titleKey && props.model[props.config.titleKey]) {
+					const { titlePrefix } = props.config;
+					return titlePrefix ? `${titlePrefix} ${String(props.index + 1)}: ${props.model[props.config.titleKey]}` : `${props.model[props.config.titleKey]}`;
+				}
 				if (props.config.title) return filterFunction(mForm, props.config.title, props);
 				return `${props.config.titlePrefix || "组"} ${String(props.index + 1)}`;
 			});
@@ -5059,33 +6283,39 @@
 			return (_ctx, _cache) => {
 				return (0, vue.openBlock)(), (0, vue.createBlock)((0, vue.unref)(_tmagic_design.TMagicCard), {
 					class: "m-fields-group-list-item",
+					flat: __props.config.flat,
 					"body-style": { display: expand.value ? "block" : "none" }
 				}, {
-					header: (0, vue.withCtx)(() => [(0, vue.createElementVNode)("div", null, [
+					header: (0, vue.withCtx)(() => [(0, vue.createElementVNode)("div", _hoisted_1$9, [
 						(0, vue.createVNode)((0, vue.unref)(_tmagic_design.TMagicButton), {
 							link: "",
 							disabled: __props.disabled,
-							onClick: expandHandler
+							onClick: expandHandler,
+							class: "expand-button"
 						}, {
 							default: (0, vue.withCtx)(() => [(0, vue.createVNode)((0, vue.unref)(_tmagic_design.TMagicIcon), null, {
-								default: (0, vue.withCtx)(() => [expand.value ? ((0, vue.openBlock)(), (0, vue.createBlock)((0, vue.unref)(_element_plus_icons_vue.CaretBottom), { key: 0 })) : ((0, vue.openBlock)(), (0, vue.createBlock)((0, vue.unref)(_element_plus_icons_vue.CaretRight), { key: 1 }))]),
+								default: (0, vue.withCtx)(() => [expand.value ? ((0, vue.openBlock)(), (0, vue.createBlock)((0, vue.unref)(_element_plus_icons_vue.ArrowDown), { key: 0 })) : ((0, vue.openBlock)(), (0, vue.createBlock)((0, vue.unref)(_element_plus_icons_vue.ArrowRight), { key: 1 }))]),
 								_: 1
-							}), (0, vue.createElementVNode)("span", { innerHTML: title.value }, null, 8, _hoisted_1$9)]),
+							})]),
 							_: 1
 						}, 8, ["disabled"]),
-						!__props.isCompare ? (0, vue.withDirectives)(((0, vue.openBlock)(), (0, vue.createBlock)((0, vue.unref)(_tmagic_design.TMagicButton), {
-							key: 0,
-							type: "danger",
-							size: "small",
-							link: "",
-							icon: (0, vue.unref)(_element_plus_icons_vue.Delete),
-							disabled: __props.disabled,
-							onClick: removeHandler
-						}, null, 8, ["icon", "disabled"])), [[vue.vShow, showDelete.value]]) : (0, vue.createCommentVNode)("v-if", true),
+						(0, vue.createElementVNode)("span", { innerHTML: title.value }, null, 8, _hoisted_2$5),
+						(0, vue.createVNode)((0, vue.unref)(_tmagic_design.TMagicTooltip), { content: `删除 ${title.value}` }, {
+							default: (0, vue.withCtx)(() => [!__props.isCompare ? (0, vue.withDirectives)(((0, vue.openBlock)(), (0, vue.createBlock)((0, vue.unref)(_tmagic_design.TMagicButton), {
+								key: 0,
+								size: "default",
+								link: "",
+								class: "delete-button",
+								icon: (0, vue.unref)(_element_plus_icons_vue.Delete),
+								disabled: __props.disabled,
+								onClick: removeHandler
+							}, null, 8, ["icon", "disabled"])), [[vue.vShow, showDelete.value]]) : (0, vue.createCommentVNode)("v-if", true)]),
+							_: 1
+						}, 8, ["content"]),
 						copyable.value && !__props.isCompare ? ((0, vue.openBlock)(), (0, vue.createBlock)((0, vue.unref)(_tmagic_design.TMagicButton), {
-							key: 1,
+							key: 0,
 							link: "",
-							size: "small",
+							size: "default",
 							type: "primary",
 							icon: (0, vue.unref)(_element_plus_icons_vue.DocumentCopy),
 							disabled: __props.disabled,
@@ -5094,27 +6324,27 @@
 							default: (0, vue.withCtx)(() => [..._cache[6] || (_cache[6] = [(0, vue.createTextVNode)("复制", -1)])]),
 							_: 1
 						}, 8, ["icon", "disabled"])) : (0, vue.createCommentVNode)("v-if", true),
-						movable.value && !__props.isCompare ? ((0, vue.openBlock)(), (0, vue.createElementBlock)(vue.Fragment, { key: 2 }, [(0, vue.withDirectives)((0, vue.createVNode)((0, vue.unref)(_tmagic_design.TMagicButton), {
+						movable.value && !__props.isCompare ? ((0, vue.openBlock)(), (0, vue.createElementBlock)(vue.Fragment, { key: 1 }, [(0, vue.withDirectives)((0, vue.createVNode)((0, vue.unref)(_tmagic_design.TMagicButton), {
 							link: "",
-							size: "small",
+							size: "default",
 							disabled: __props.disabled,
-							icon: (0, vue.unref)(_element_plus_icons_vue.CaretTop),
+							icon: (0, vue.unref)(_element_plus_icons_vue.Top),
 							onClick: _cache[0] || (_cache[0] = ($event) => changeOrder(-1))
 						}, {
 							default: (0, vue.withCtx)(() => [..._cache[7] || (_cache[7] = [(0, vue.createTextVNode)("上移", -1)])]),
 							_: 1
 						}, 8, ["disabled", "icon"]), [[vue.vShow, __props.index !== 0]]), (0, vue.withDirectives)((0, vue.createVNode)((0, vue.unref)(_tmagic_design.TMagicButton), {
 							link: "",
-							size: "small",
+							size: "default",
 							disabled: __props.disabled,
-							icon: (0, vue.unref)(_element_plus_icons_vue.CaretBottom),
+							icon: (0, vue.unref)(_element_plus_icons_vue.Bottom),
 							onClick: _cache[1] || (_cache[1] = ($event) => changeOrder(1))
 						}, {
 							default: (0, vue.withCtx)(() => [..._cache[8] || (_cache[8] = [(0, vue.createTextVNode)("下移", -1)])]),
 							_: 1
 						}, 8, ["disabled", "icon"]), [[vue.vShow, __props.index !== length.value - 1]])], 64)) : (0, vue.createCommentVNode)("v-if", true),
 						__props.config.moveSpecifyLocation && !__props.isCompare ? ((0, vue.openBlock)(), (0, vue.createBlock)((0, vue.unref)(_tmagic_design.TMagicPopover), {
-							key: 3,
+							key: 2,
 							trigger: "click",
 							placement: "top",
 							width: "200",
@@ -5142,7 +6372,7 @@
 									disabled: __props.disabled
 								}, null, 8, ["modelValue", "disabled"]),
 								_cache[11] || (_cache[11] = (0, vue.createTextVNode)("行 ", -1))
-							]), (0, vue.createElementVNode)("div", _hoisted_2$4, [(0, vue.createVNode)((0, vue.unref)(_tmagic_design.TMagicButton), {
+							]), (0, vue.createElementVNode)("div", _hoisted_3$4, [(0, vue.createVNode)((0, vue.unref)(_tmagic_design.TMagicButton), {
 								size: "small",
 								text: "",
 								onClick: _cache[4] || (_cache[4] = ($event) => moveSpecifyLocationVisible.value = false)
@@ -5160,10 +6390,10 @@
 							_: 1
 						}, 8, ["visible"])) : (0, vue.createCommentVNode)("v-if", true),
 						itemExtra.value ? ((0, vue.openBlock)(), (0, vue.createElementBlock)("span", {
-							key: 4,
+							key: 3,
 							innerHTML: itemExtra.value,
 							class: "m-form-tip"
-						}, null, 8, _hoisted_3$3)) : (0, vue.createCommentVNode)("v-if", true)
+						}, null, 8, _hoisted_4$3)) : (0, vue.createCommentVNode)("v-if", true)
 					])]),
 					default: (0, vue.withCtx)(() => [expand.value ? ((0, vue.openBlock)(), (0, vue.createBlock)(Container_default, {
 						key: 0,
@@ -5188,23 +6418,24 @@
 						"disabled"
 					])) : (0, vue.createCommentVNode)("v-if", true)]),
 					_: 1
-				}, 8, ["body-style"]);
+				}, 8, ["flat", "body-style"]);
 			};
 		}
 	});
 	//#endregion
 	//#region packages/form/src/containers/GroupList.vue?vue&type=script&setup=true&lang.ts
 	var _hoisted_1$8 = { class: "m-fields-group-list" };
-	var _hoisted_2$3 = ["innerHTML"];
-	var _hoisted_3$2 = {
+	var _hoisted_2$4 = ["innerHTML"];
+	var _hoisted_3$3 = {
 		key: 1,
 		class: "el-table__empty-block"
 	};
-	var _hoisted_4$1 = {
+	var _hoisted_4$2 = { class: "el-table__empty-text t-table__empty" };
+	var _hoisted_5$1 = {
 		key: 3,
 		class: "m-fields-group-list-footer"
 	};
-	var _hoisted_5 = { style: {
+	var _hoisted_6$1 = { style: {
 		"display": "flex",
 		"justify-content": "flex-end",
 		"flex": "1"
@@ -5256,8 +6487,8 @@
 						key: 0,
 						innerHTML: __props.config.extra,
 						style: { "color": "rgba(0, 0, 0, 0.45)" }
-					}, null, 8, _hoisted_2$3)) : (0, vue.createCommentVNode)("v-if", true),
-					!__props.model[__props.name] || !__props.model[__props.name].length ? ((0, vue.openBlock)(), (0, vue.createElementBlock)("div", _hoisted_3$2, [..._cache[1] || (_cache[1] = [(0, vue.createElementVNode)("span", { class: "el-table__empty-text t-table__empty" }, "暂无数据", -1)])])) : ((0, vue.openBlock)(true), (0, vue.createElementBlock)(vue.Fragment, { key: 2 }, (0, vue.renderList)(__props.model[__props.name], (item, index) => {
+					}, null, 8, _hoisted_2$4)) : (0, vue.createCommentVNode)("v-if", true),
+					!__props.model[__props.name] || !__props.model[__props.name].length ? ((0, vue.openBlock)(), (0, vue.createElementBlock)("div", _hoisted_3$3, [(0, vue.createElementVNode)("span", _hoisted_4$2, "暂无" + (0, vue.toDisplayString)(__props.config.titlePrefix || "") + "数据", 1)])) : ((0, vue.openBlock)(true), (0, vue.createElementBlock)(vue.Fragment, { key: 2 }, (0, vue.renderList)(__props.model[__props.name], (item, index) => {
 						return (0, vue.openBlock)(), (0, vue.createBlock)(GroupListItem_default, {
 							key: index,
 							model: item,
@@ -5288,7 +6519,7 @@
 							"group-model"
 						]);
 					}), 128)),
-					!__props.isCompare ? ((0, vue.openBlock)(), (0, vue.createElementBlock)("div", _hoisted_4$1, [(0, vue.renderSlot)(_ctx.$slots, "toggle-button"), (0, vue.createElementVNode)("div", _hoisted_5, [(0, vue.renderSlot)(_ctx.$slots, "add-button")])])) : (0, vue.createCommentVNode)("v-if", true)
+					!__props.isCompare ? ((0, vue.openBlock)(), (0, vue.createElementBlock)("div", _hoisted_5$1, [(0, vue.renderSlot)(_ctx.$slots, "toggle-button"), (0, vue.createElementVNode)("div", _hoisted_6$1, [(0, vue.renderSlot)(_ctx.$slots, "add-button")])])) : (0, vue.createCommentVNode)("v-if", true)
 				]);
 			};
 		}
@@ -5450,7 +6681,8 @@
 			index: {},
 			row: {},
 			prop: {},
-			sortKey: {}
+			sortKey: {},
+			flat: { type: Boolean }
 		},
 		emits: ["change"],
 		setup(__props, { emit: __emit }) {
@@ -5521,19 +6753,25 @@
 						type: "danger",
 						link: "",
 						title: "删除",
-						icon: __props.config.deleteActionButtonIcon || (0, vue.unref)(_element_plus_icons_vue.Delete),
+						icon: __props.flat ? void 0 : __props.config.deleteActionButtonIcon || (0, vue.unref)(_element_plus_icons_vue.Delete),
 						onClick: _cache[0] || (_cache[0] = ($event) => removeHandler(__props.index + 1 + __props.currentPage * __props.pageSize - 1))
-					}, null, 8, ["icon"]), [[vue.vShow, showDelete(__props.index + 1 + __props.currentPage * __props.pageSize - 1)]]),
+					}, {
+						default: (0, vue.withCtx)(() => [__props.flat ? ((0, vue.openBlock)(), (0, vue.createElementBlock)(vue.Fragment, { key: 0 }, [(0, vue.createTextVNode)("删除")], 64)) : (0, vue.createCommentVNode)("v-if", true)]),
+						_: 1
+					}, 8, ["icon"]), [[vue.vShow, showDelete(__props.index + 1 + __props.currentPage * __props.pageSize - 1)]]),
 					copyable(__props.index + 1 + __props.currentPage * __props.pageSize - 1) ? ((0, vue.openBlock)(), (0, vue.createBlock)((0, vue.unref)(_tmagic_design.TMagicButton), {
 						key: 1,
 						link: "",
 						size: "small",
 						type: "primary",
 						title: "复制",
-						icon: __props.config.copyActionButtonIcon || (0, vue.unref)(_element_plus_icons_vue.DocumentCopy),
+						icon: __props.flat ? void 0 : __props.config.copyActionButtonIcon || (0, vue.unref)(_element_plus_icons_vue.DocumentCopy),
 						disabled: __props.disabled,
 						onClick: _cache[1] || (_cache[1] = ($event) => copyHandler(__props.index + 1 + __props.currentPage * __props.pageSize - 1))
-					}, null, 8, ["icon", "disabled"])) : (0, vue.createCommentVNode)("v-if", true)
+					}, {
+						default: (0, vue.withCtx)(() => [__props.flat ? ((0, vue.openBlock)(), (0, vue.createElementBlock)(vue.Fragment, { key: 0 }, [(0, vue.createTextVNode)("复制")], 64)) : (0, vue.createCommentVNode)("v-if", true)]),
+						_: 1
+					}, 8, ["icon", "disabled"])) : (0, vue.createCommentVNode)("v-if", true)
 				], 64);
 			};
 		}
@@ -5683,8 +6921,10 @@
 				type: "selection",
 				width: 45
 			} });
-			let actionFixed = props.config.fixed === false ? void 0 : "left";
+			const defaultFixed = isGlobalFlat.value ? "right" : "left";
+			let actionFixed = props.config.fixed === false ? void 0 : defaultFixed;
 			if (typeof props.config.fixed === "string" && ["left", "right"].includes(props.config.fixed)) actionFixed = props.config.fixed;
+			const actionFlat = props.config.flat === void 0 && isGlobalFlat.value ? true : props.config.flat;
 			const actionColumn = {
 				props: {
 					label: "操作",
@@ -5694,6 +6934,7 @@
 				},
 				cell: ({ row, $index }) => (0, vue.h)(ActionsColumn_default, {
 					row,
+					flat: actionFlat,
 					index: $index,
 					model: props.model,
 					config: props.config,
@@ -5776,13 +7017,13 @@
 	//#endregion
 	//#region packages/form/src/containers/table/Table.vue?vue&type=script&setup=true&lang.ts
 	var _hoisted_1$7 = ["innerHTML"];
-	var _hoisted_2$2 = { style: {
+	var _hoisted_2$3 = { style: {
 		"display": "flex",
 		"justify-content": "space-between",
 		"margin": "10px 0"
 	} };
-	var _hoisted_3$1 = { style: { "display": "flex" } };
-	var _hoisted_4 = {
+	var _hoisted_3$2 = { style: { "display": "flex" } };
+	var _hoisted_4$1 = {
 		key: 1,
 		class: "bottom",
 		style: { "text-align": "right" }
@@ -5867,20 +7108,22 @@
 							"default-expand-all": true,
 							key: updateKey.value,
 							onSelect: (0, vue.unref)(selectHandle),
-							onSortChange: sortChangeHandler
+							onSortChange: sortChangeHandler,
+							"empty-text": `暂无${__props.config.titlePrefix || ""}数据`
 						}, null, 8, [
 							"row-key",
 							"columns",
 							"data",
 							"border",
 							"max-height",
-							"onSelect"
+							"onSelect",
+							"empty-text"
 						])) : (0, vue.createCommentVNode)("v-if", true)]),
 						_: 1
 					}, 8, ["disabled"]),
 					(0, vue.renderSlot)(_ctx.$slots, "default"),
-					(0, vue.createElementVNode)("div", _hoisted_2$2, [(0, vue.createElementVNode)("div", _hoisted_3$1, [
-						!(0, vue.unref)(isFullscreen) ? (0, vue.renderSlot)(_ctx.$slots, "toggle-button", { key: 0 }) : (0, vue.createCommentVNode)("v-if", true),
+					(0, vue.createElementVNode)("div", _hoisted_2$3, [(0, vue.createElementVNode)("div", _hoisted_3$2, [
+						!(0, vue.unref)(isFullscreen) ? (0, vue.renderSlot)(_ctx.$slots, "toggle-button", {}, void 0, void 0, 0) : (0, vue.createCommentVNode)("v-if", true),
 						__props.config.enableFullscreen !== false ? ((0, vue.openBlock)(), (0, vue.createBlock)((0, vue.unref)(_tmagic_design.TMagicButton), {
 							key: 1,
 							icon: (0, vue.unref)(_element_plus_icons_vue.FullScreen),
@@ -5921,8 +7164,8 @@
 							default: (0, vue.withCtx)(() => [..._cache[1] || (_cache[1] = [(0, vue.createTextVNode)("清空", -1)])]),
 							_: 1
 						}, 8, ["disabled", "onClick"])) : (0, vue.createCommentVNode)("v-if", true)
-					]), !__props.isCompare ? (0, vue.renderSlot)(_ctx.$slots, "add-button", { key: 0 }) : (0, vue.createCommentVNode)("v-if", true)]),
-					__props.config.pagination ? ((0, vue.openBlock)(), (0, vue.createElementBlock)("div", _hoisted_4, [(0, vue.createVNode)((0, vue.unref)(_tmagic_design.TMagicPagination), {
+					]), !__props.isCompare ? (0, vue.renderSlot)(_ctx.$slots, "add-button", {}, void 0, void 0, 0) : (0, vue.createCommentVNode)("v-if", true)]),
+					__props.config.pagination ? ((0, vue.openBlock)(), (0, vue.createElementBlock)("div", _hoisted_4$1, [(0, vue.createVNode)((0, vue.unref)(_tmagic_design.TMagicPagination), {
 						layout: "total, sizes, prev, pager, next, jumper",
 						"hide-on-single-page": __props.model[modelName.value].length < (0, vue.unref)(pageSize),
 						"current-page": (0, vue.unref)(currentPage) + 1,
@@ -6142,9 +7385,10 @@
 						size: addButtonSize.value,
 						plain: displayMode.value === "table",
 						icon: (0, vue.unref)(_element_plus_icons_vue.Plus),
+						text: "",
 						disabled: __props.disabled
 					}, currentConfig.value.addButtonConfig?.props || { type: "primary" }, { onClick: (0, vue.unref)(newHandler) }), {
-						default: (0, vue.withCtx)(() => [(0, vue.createTextVNode)((0, vue.toDisplayString)(currentConfig.value.addButtonConfig?.text || (displayMode.value === "table" ? "新增一行" : "新增")), 1)]),
+						default: (0, vue.withCtx)(() => [(0, vue.createTextVNode)((0, vue.toDisplayString)(currentConfig.value.addButtonConfig?.text || (displayMode.value === "table" ? `新增一行${groupListConfig.value.titlePrefix || ""}` : `新增${groupListConfig.value.titlePrefix || ""}`)), 1)]),
 						_: 1
 					}, 16, [
 						"class",
@@ -6174,9 +7418,17 @@
 	});
 	//#endregion
 	//#region packages/form/src/fields/Text.vue?vue&type=script&setup=true&lang.ts
-	var _hoisted_1$6 = { class: "m-fields-text" };
-	var _hoisted_2$1 = { key: 1 };
-	var _hoisted_3 = { style: {
+	var _hoisted_1$6 = { key: 0 };
+	var _hoisted_2$2 = {
+		key: 0,
+		class: "m-fields-text__prepend"
+	};
+	var _hoisted_3$1 = { class: "m-fields-text__value" };
+	var _hoisted_4 = ["src"];
+	var _hoisted_5 = { key: 2 };
+	var _hoisted_6 = ["src"];
+	var _hoisted_7 = { key: 2 };
+	var _hoisted_8 = { style: {
 		"display": "flex",
 		"justify-content": "flex-end"
 	} };
@@ -6195,7 +7447,10 @@
 			disabled: { type: Boolean },
 			size: {},
 			lastValues: {},
-			isCompare: { type: Boolean }
+			isCompare: { type: Boolean },
+			text: {},
+			labelWidth: {},
+			labelPosition: {}
 		},
 		emits: ["change", "input"],
 		setup(__props, { emit: __emit }) {
@@ -6208,21 +7463,15 @@
 				value.value = v;
 			}, { immediate: true });
 			const appendConfig = (0, vue.computed)(() => {
-				if (typeof props.config.append === "string") return {
+				const { append } = props.config;
+				if (typeof append === "string") return {
 					type: "text",
-					text: props.config.append,
+					text: append,
 					handler: void 0
 				};
-				if (typeof props.config.append === "object") {
-					if (typeof props.config.append?.handler === "function") return {
-						type: "button",
-						text: props.config.append.text,
-						handler: props.config.append.handler
-					};
-					if (props.config.append) {
-						if (props.config.append.value === 0) return false;
-						return props.config.append;
-					}
+				if (typeof append === "object" && append) {
+					if (append.value === 0) return false;
+					return append;
 				}
 				return false;
 			});
@@ -6318,67 +7567,97 @@
 				instanceRef.value = void 0;
 			};
 			return (_ctx, _cache) => {
-				return (0, vue.openBlock)(), (0, vue.createElementBlock)("div", _hoisted_1$6, [(0, vue.createVNode)((0, vue.unref)(_tmagic_design.TMagicInput), {
-					modelValue: value.value,
-					"onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => value.value = $event),
-					ref_key: "input",
-					ref: input,
-					clearable: __props.config.clearable ?? true,
-					size: __props.size,
-					placeholder: __props.config.placeholder,
-					disabled: __props.disabled,
-					onChange: changeHandler,
-					onInput: inputHandler,
-					onKeyup: _cache[1] || (_cache[1] = ($event) => keyUpHandler($event))
-				}, (0, vue.createSlots)({ _: 2 }, [__props.config.prepend ? {
-					name: "prepend",
-					fn: (0, vue.withCtx)(() => [(0, vue.createElementVNode)("span", null, (0, vue.toDisplayString)(__props.config.prepend), 1)]),
-					key: "0"
-				} : void 0, appendConfig.value ? {
-					name: "append",
-					fn: (0, vue.withCtx)(() => [appendConfig.value.type === "button" ? ((0, vue.openBlock)(), (0, vue.createBlock)((0, vue.unref)(_tmagic_design.TMagicButton), {
-						key: 0,
-						style: { "color": "#409eff" },
+				return (0, vue.openBlock)(), (0, vue.createElementBlock)("div", { class: (0, vue.normalizeClass)(["m-fields-text", { "m-fields-text--static": __props.config.static }]) }, [
+					__props.config.disabled ? ((0, vue.openBlock)(), (0, vue.createElementBlock)("div", _hoisted_1$6)) : (0, vue.createCommentVNode)("v-if", true),
+					(0, vue.createCommentVNode)(" 新增静态展示文本样式 "),
+					__props.config.static ? ((0, vue.openBlock)(), (0, vue.createElementBlock)(vue.Fragment, { key: 1 }, [
+						__props.config.prepend ? ((0, vue.openBlock)(), (0, vue.createElementBlock)("span", _hoisted_2$2, (0, vue.toDisplayString)(__props.config.prepend), 1)) : (0, vue.createCommentVNode)("v-if", true),
+						(0, vue.createElementVNode)("span", _hoisted_3$1, (0, vue.toDisplayString)(value.value), 1),
+						appendConfig.value ? ((0, vue.openBlock)(), (0, vue.createElementBlock)(vue.Fragment, { key: 1 }, [appendConfig.value.type === "button" ? ((0, vue.openBlock)(), (0, vue.createBlock)((0, vue.unref)(_tmagic_design.TMagicButton), {
+							key: 0,
+							style: { "color": "#0056ea" },
+							size: __props.size,
+							onClick: (0, vue.withModifiers)(buttonClickHandler, ["prevent"])
+						}, {
+							default: (0, vue.withCtx)(() => [(0, vue.createTextVNode)((0, vue.toDisplayString)(appendConfig.value.text), 1)]),
+							_: 1
+						}, 8, ["size"])) : appendConfig.value.type === "icon" ? ((0, vue.openBlock)(), (0, vue.createElementBlock)("img", {
+							key: 1,
+							class: "m-fields-text__icon",
+							src: appendConfig.value.text,
+							onClick: buttonClickHandler
+						}, null, 8, _hoisted_4)) : ((0, vue.openBlock)(), (0, vue.createElementBlock)("span", _hoisted_5, (0, vue.toDisplayString)(appendConfig.value.text), 1))], 64)) : (0, vue.createCommentVNode)("v-if", true)
+					], 64)) : ((0, vue.openBlock)(), (0, vue.createBlock)((0, vue.unref)(_tmagic_design.TMagicInput), {
+						key: 2,
+						modelValue: value.value,
+						"onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => value.value = $event),
+						ref_key: "input",
+						ref: input,
+						clearable: __props.config.clearable ?? true,
 						size: __props.size,
-						onClick: (0, vue.withModifiers)(buttonClickHandler, ["prevent"])
-					}, {
-						default: (0, vue.withCtx)(() => [(0, vue.createTextVNode)((0, vue.toDisplayString)(appendConfig.value.text), 1)]),
-						_: 1
-					}, 8, ["size"])) : ((0, vue.openBlock)(), (0, vue.createElementBlock)("span", _hoisted_2$1, (0, vue.toDisplayString)(appendConfig.value.text), 1))]),
-					key: "1"
-				} : void 0]), 1032, [
-					"modelValue",
-					"clearable",
-					"size",
-					"placeholder",
-					"disabled"
-				]), ((0, vue.openBlock)(), (0, vue.createBlock)(vue.Teleport, { to: "body" }, [popoverVisible.value ? ((0, vue.openBlock)(), (0, vue.createElementBlock)("div", {
-					key: 0,
-					class: "tmagic-form-text-popper m-form-item__content",
-					ref_key: "popoverEl",
-					ref: popoverEl
-				}, [
-					_cache[5] || (_cache[5] = (0, vue.createElementVNode)("div", { class: "m-form-validate__warning" }, "输入内容前后有空格，是否移除空格？", -1)),
-					(0, vue.createElementVNode)("div", _hoisted_3, [(0, vue.createVNode)((0, vue.unref)(_tmagic_design.TMagicButton), {
-						link: "",
-						size: "small",
-						onClick: _cache[2] || (_cache[2] = ($event) => popoverVisible.value = false)
-					}, {
-						default: (0, vue.withCtx)(() => [..._cache[3] || (_cache[3] = [(0, vue.createTextVNode)("保持原样", -1)])]),
-						_: 1
-					}), (0, vue.createVNode)((0, vue.unref)(_tmagic_design.TMagicButton), {
-						type: "primary",
-						size: "small",
-						onClick: confirmTrimHandler
-					}, {
-						default: (0, vue.withCtx)(() => [..._cache[4] || (_cache[4] = [(0, vue.createTextVNode)("移除空格", -1)])]),
-						_: 1
-					})]),
-					_cache[6] || (_cache[6] = (0, vue.createElementVNode)("span", {
-						class: "tmagic-form-text-popper-arrow",
-						"data-popper-arrow": ""
-					}, null, -1))
-				], 512)) : (0, vue.createCommentVNode)("v-if", true)]))]);
+						placeholder: __props.config.placeholder,
+						disabled: __props.disabled,
+						onChange: changeHandler,
+						onInput: inputHandler,
+						onKeyup: _cache[1] || (_cache[1] = ($event) => keyUpHandler($event))
+					}, (0, vue.createSlots)({ _: 2 }, [__props.config.prepend ? {
+						name: "prepend",
+						fn: (0, vue.withCtx)(() => [(0, vue.createElementVNode)("span", null, (0, vue.toDisplayString)(__props.config.prepend), 1)]),
+						key: "0"
+					} : void 0, appendConfig.value ? {
+						name: "append",
+						fn: (0, vue.withCtx)(() => [appendConfig.value.type === "button" ? ((0, vue.openBlock)(), (0, vue.createBlock)((0, vue.unref)(_tmagic_design.TMagicButton), {
+							key: 0,
+							style: { "color": "#0056ea" },
+							size: __props.size,
+							onClick: (0, vue.withModifiers)(buttonClickHandler, ["prevent"])
+						}, {
+							default: (0, vue.withCtx)(() => [(0, vue.createTextVNode)((0, vue.toDisplayString)(appendConfig.value.text), 1)]),
+							_: 1
+						}, 8, ["size"])) : appendConfig.value.type === "icon" ? ((0, vue.openBlock)(), (0, vue.createElementBlock)("img", {
+							key: 1,
+							src: appendConfig.value.text,
+							onClick: buttonClickHandler
+						}, null, 8, _hoisted_6)) : ((0, vue.openBlock)(), (0, vue.createElementBlock)("span", _hoisted_7, (0, vue.toDisplayString)(appendConfig.value.text), 1))]),
+						key: "1"
+					} : void 0]), 1032, [
+						"modelValue",
+						"clearable",
+						"size",
+						"placeholder",
+						"disabled"
+					])),
+					!__props.config.static ? ((0, vue.openBlock)(), (0, vue.createBlock)(vue.Teleport, {
+						key: 3,
+						to: "body"
+					}, [popoverVisible.value ? ((0, vue.openBlock)(), (0, vue.createElementBlock)("div", {
+						key: 0,
+						class: "tmagic-form-text-popper m-form-item__content",
+						ref_key: "popoverEl",
+						ref: popoverEl
+					}, [
+						_cache[5] || (_cache[5] = (0, vue.createElementVNode)("div", { class: "m-form-validate__warning" }, "输入内容前后有空格，是否移除空格？", -1)),
+						(0, vue.createElementVNode)("div", _hoisted_8, [(0, vue.createVNode)((0, vue.unref)(_tmagic_design.TMagicButton), {
+							link: "",
+							size: "small",
+							onClick: _cache[2] || (_cache[2] = ($event) => popoverVisible.value = false)
+						}, {
+							default: (0, vue.withCtx)(() => [..._cache[3] || (_cache[3] = [(0, vue.createTextVNode)("保持原样", -1)])]),
+							_: 1
+						}), (0, vue.createVNode)((0, vue.unref)(_tmagic_design.TMagicButton), {
+							type: "primary",
+							size: "small",
+							onClick: confirmTrimHandler
+						}, {
+							default: (0, vue.withCtx)(() => [..._cache[4] || (_cache[4] = [(0, vue.createTextVNode)("移除空格", -1)])]),
+							_: 1
+						})]),
+						_cache[6] || (_cache[6] = (0, vue.createElementVNode)("span", {
+							class: "tmagic-form-text-popper-arrow",
+							"data-popper-arrow": ""
+						}, null, -1))
+					], 512)) : (0, vue.createCommentVNode)("v-if", true)])) : (0, vue.createCommentVNode)("v-if", true)
+				], 2);
 			};
 		}
 	});
@@ -6397,7 +7676,10 @@
 			disabled: { type: Boolean },
 			size: {},
 			lastValues: {},
-			isCompare: { type: Boolean }
+			isCompare: { type: Boolean },
+			text: {},
+			labelWidth: {},
+			labelPosition: {}
 		},
 		emits: ["change", "input"],
 		setup(__props, { emit: __emit }) {
@@ -6422,7 +7704,7 @@
 					modelValue: value.value,
 					"onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => value.value = $event),
 					clearable: "",
-					"controls-position": "right",
+					"controls-position": (0, vue.unref)(isGlobalFlat) ? "" : "right",
 					size: __props.size,
 					max: __props.config.max,
 					min: __props.config.min,
@@ -6433,6 +7715,7 @@
 					onInput: inputHandler
 				}, null, 8, [
 					"modelValue",
+					"controls-position",
 					"size",
 					"max",
 					"min",
@@ -6461,7 +7744,10 @@
 			disabled: { type: Boolean },
 			size: {},
 			lastValues: {},
-			isCompare: { type: Boolean }
+			isCompare: { type: Boolean },
+			text: {},
+			labelWidth: {},
+			labelPosition: {}
 		},
 		emits: ["change"],
 		setup(__props, { emit: __emit }) {
@@ -6532,7 +7818,10 @@
 			disabled: { type: Boolean },
 			size: {},
 			lastValues: {},
-			isCompare: { type: Boolean }
+			isCompare: { type: Boolean },
+			text: {},
+			labelWidth: {},
+			labelPosition: {}
 		},
 		emits: ["change", "input"],
 		setup(__props, { emit: __emit }) {
@@ -6588,7 +7877,10 @@
 			disabled: { type: Boolean },
 			size: {},
 			lastValues: {},
-			isCompare: { type: Boolean }
+			isCompare: { type: Boolean },
+			text: {},
+			labelWidth: {},
+			labelPosition: {}
 		},
 		emits: ["change"],
 		setup(__props, { emit: __emit }) {
@@ -6635,7 +7927,10 @@
 			disabled: { type: Boolean },
 			size: {},
 			lastValues: {},
-			isCompare: { type: Boolean }
+			isCompare: { type: Boolean },
+			text: {},
+			labelWidth: {},
+			labelPosition: {}
 		},
 		emits: ["change"],
 		setup(__props, { emit: __emit }) {
@@ -6687,7 +7982,10 @@
 			disabled: { type: Boolean },
 			size: {},
 			lastValues: {},
-			isCompare: { type: Boolean }
+			isCompare: { type: Boolean },
+			text: {},
+			labelWidth: {},
+			labelPosition: {}
 		},
 		emits: ["change"],
 		setup(__props, { emit: __emit }) {
@@ -6732,7 +8030,10 @@
 			disabled: { type: Boolean },
 			size: {},
 			lastValues: {},
-			isCompare: { type: Boolean }
+			isCompare: { type: Boolean },
+			text: {},
+			labelWidth: {},
+			labelPosition: {}
 		},
 		emits: ["change"],
 		setup(__props, { emit: __emit }) {
@@ -6789,7 +8090,10 @@
 			disabled: { type: Boolean },
 			size: {},
 			lastValues: {},
-			isCompare: { type: Boolean }
+			isCompare: { type: Boolean },
+			text: {},
+			labelWidth: {},
+			labelPosition: {}
 		},
 		emits: ["change"],
 		setup(__props, { emit: __emit }) {
@@ -6844,7 +8148,10 @@
 			disabled: { type: Boolean },
 			size: {},
 			lastValues: {},
-			isCompare: { type: Boolean }
+			isCompare: { type: Boolean },
+			text: {},
+			labelWidth: {},
+			labelPosition: {}
 		},
 		emits: ["change"],
 		setup(__props, { emit: __emit }) {
@@ -6938,7 +8245,10 @@
 			disabled: { type: Boolean },
 			size: {},
 			lastValues: {},
-			isCompare: { type: Boolean }
+			isCompare: { type: Boolean },
+			text: {},
+			labelWidth: {},
+			labelPosition: {}
 		},
 		emits: ["change"],
 		setup(__props, { emit: __emit }) {
@@ -7032,7 +8342,10 @@
 			disabled: { type: Boolean },
 			size: {},
 			lastValues: {},
-			isCompare: { type: Boolean }
+			isCompare: { type: Boolean },
+			text: {},
+			labelWidth: {},
+			labelPosition: {}
 		},
 		emits: ["change"],
 		setup(__props, { emit: __emit }) {
@@ -7070,7 +8383,10 @@
 			disabled: { type: Boolean },
 			size: {},
 			lastValues: {},
-			isCompare: { type: Boolean }
+			isCompare: { type: Boolean },
+			text: {},
+			labelWidth: {},
+			labelPosition: {}
 		},
 		emits: ["change"],
 		setup(__props, { emit: __emit }) {
@@ -7115,7 +8431,11 @@
 	});
 	//#endregion
 	//#region packages/form/src/fields/RadioGroup.vue?vue&type=script&setup=true&lang.ts
-	var _hoisted_1$4 = { key: 1 };
+	var _hoisted_1$4 = { class: "m-fields-radio-group__option" };
+	var _hoisted_2$1 = {
+		key: 1,
+		class: "m-fields-radio-group__text"
+	};
 	//#endregion
 	//#region packages/form/src/fields/RadioGroup.vue
 	var RadioGroup_default = /* @__PURE__ */ (0, vue.defineComponent)({
@@ -7131,7 +8451,10 @@
 			disabled: { type: Boolean },
 			size: {},
 			lastValues: {},
-			isCompare: { type: Boolean }
+			isCompare: { type: Boolean },
+			text: {},
+			labelWidth: {},
+			labelPosition: {}
 		},
 		emits: ["change"],
 		setup(__props, { emit: __emit }) {
@@ -7139,20 +8462,23 @@
 			const itemComponent = (0, vue.computed)(() => props.config.childType === "button" ? _tmagic_design.TMagicRadioButton : _tmagic_design.TMagicRadio);
 			const emit = __emit;
 			const clickHandler = (item) => {
+				if (props.disabled) return;
 				emit("change", props.model[props.name] === item ? "" : item);
 			};
 			useAddField(props.prop);
 			const iconSize = (0, vue.computed)(() => {
-				if (props.size === "small") return "12";
+				if (props.config.iconSize) return props.config.iconSize;
+				if (props.size === "small") return "14";
 				if (props.size === "large") return "16";
-				return "14";
+				return "16";
 			});
 			return (_ctx, _cache) => {
 				return __props.model ? ((0, vue.openBlock)(), (0, vue.createBlock)((0, vue.unref)(_tmagic_design.TMagicRadioGroup), {
 					key: 0,
 					"model-value": __props.model[__props.name],
 					size: __props.size,
-					disabled: __props.disabled
+					disabled: __props.disabled,
+					class: "icon-{{ iconSize }}"
 				}, {
 					default: (0, vue.withCtx)(() => [((0, vue.openBlock)(true), (0, vue.createElementBlock)(vue.Fragment, null, (0, vue.renderList)(__props.config.options, (option) => {
 						return (0, vue.openBlock)(), (0, vue.createBlock)((0, vue.resolveDynamicComponent)(itemComponent.value), {
@@ -7165,13 +8491,14 @@
 								placement: "top-start",
 								content: option.tooltip
 							}, {
-								default: (0, vue.withCtx)(() => [(0, vue.createElementVNode)("div", null, [option.icon ? ((0, vue.openBlock)(), (0, vue.createBlock)((0, vue.unref)(_tmagic_design.TMagicIcon), {
+								default: (0, vue.withCtx)(() => [(0, vue.createElementVNode)("div", _hoisted_1$4, [option.icon ? ((0, vue.openBlock)(), (0, vue.createBlock)((0, vue.unref)(_tmagic_design.TMagicIcon), {
 									key: 0,
-									size: iconSize.value
+									size: iconSize.value,
+									class: (0, vue.normalizeClass)({ "m-fields-radio-group__icon_with_text": !!option.text })
 								}, {
 									default: (0, vue.withCtx)(() => [((0, vue.openBlock)(), (0, vue.createBlock)((0, vue.resolveDynamicComponent)(option.icon)))]),
 									_: 2
-								}, 1032, ["size"])) : (0, vue.createCommentVNode)("v-if", true), option.text ? ((0, vue.openBlock)(), (0, vue.createElementBlock)("span", _hoisted_1$4, (0, vue.toDisplayString)(option.text), 1)) : (0, vue.createCommentVNode)("v-if", true)])]),
+								}, 1032, ["size", "class"])) : (0, vue.createCommentVNode)("v-if", true), option.text ? ((0, vue.openBlock)(), (0, vue.createElementBlock)("span", _hoisted_2$1, (0, vue.toDisplayString)(option.text), 1)) : (0, vue.createCommentVNode)("v-if", true)])]),
 								_: 2
 							}, 1032, ["disabled", "content"])]),
 							_: 2
@@ -7204,7 +8531,10 @@
 			disabled: { type: Boolean },
 			size: {},
 			lastValues: {},
-			isCompare: { type: Boolean }
+			isCompare: { type: Boolean },
+			text: {},
+			labelWidth: {},
+			labelPosition: {}
 		},
 		setup(__props) {
 			const props = __props;
@@ -7223,8 +8553,9 @@
 	//#endregion
 	//#region packages/form/src/fields/Link.vue?vue&type=script&setup=true&lang.ts
 	var _hoisted_1$2 = ["href"];
-	var _hoisted_2 = {
-		key: 2,
+	var _hoisted_2 = ["href"];
+	var _hoisted_3 = {
+		key: 3,
 		class: "m-fields-link"
 	};
 	//#endregion
@@ -7242,7 +8573,11 @@
 			disabled: { type: Boolean },
 			size: {},
 			lastValues: {},
-			isCompare: { type: Boolean }
+			isCompare: { type: Boolean },
+			text: {},
+			labelWidth: {},
+			labelPosition: {},
+			theme: {}
 		},
 		emits: ["change"],
 		setup(__props, { emit: __emit }) {
@@ -7285,15 +8620,30 @@
 				editor.value && (editor.value.dialogVisible = false);
 			};
 			return (_ctx, _cache) => {
-				return __props.config.href && !__props.disabled ? ((0, vue.openBlock)(), (0, vue.createElementBlock)("a", {
+				return (0, vue.unref)(isGlobalFlat) && __props.config.href && !__props.disabled ? ((0, vue.openBlock)(), (0, vue.createElementBlock)("a", {
 					key: 0,
 					target: "_blank",
 					href: href.value,
+					class: "magic-admin-link",
 					style: (0, vue.normalizeStyle)(__props.config.css || {})
-				}, (0, vue.toDisplayString)(displayText.value), 13, _hoisted_1$2)) : __props.config.href && __props.disabled ? ((0, vue.openBlock)(), (0, vue.createElementBlock)("span", {
+				}, [(0, vue.createVNode)((0, vue.unref)(_tmagic_design.TMagicButton), {
+					link: "",
+					type: "primary"
+				}, {
+					default: (0, vue.withCtx)(() => [(0, vue.createVNode)((0, vue.unref)(_tmagic_design.TMagicIcon), null, {
+						default: (0, vue.withCtx)(() => [(0, vue.createVNode)((0, vue.unref)(_element_plus_icons_vue.Notebook))]),
+						_: 1
+					}), (0, vue.createTextVNode)((0, vue.toDisplayString)(displayText.value), 1)]),
+					_: 1
+				})], 12, _hoisted_1$2)) : __props.config.href && !__props.disabled ? ((0, vue.openBlock)(), (0, vue.createElementBlock)("a", {
 					key: 1,
+					target: "_blank",
+					href: href.value,
+					style: (0, vue.normalizeStyle)(__props.config.css || {})
+				}, (0, vue.toDisplayString)(displayText.value), 13, _hoisted_2)) : __props.config.href && __props.disabled ? ((0, vue.openBlock)(), (0, vue.createElementBlock)("span", {
+					key: 2,
 					style: (0, vue.normalizeStyle)(__props.config.disabledCss || {})
-				}, (0, vue.toDisplayString)(displayText.value), 5)) : ((0, vue.openBlock)(), (0, vue.createElementBlock)("div", _hoisted_2, [(0, vue.createVNode)((0, vue.unref)(_tmagic_design.TMagicButton), {
+				}, (0, vue.toDisplayString)(displayText.value), 5)) : ((0, vue.openBlock)(), (0, vue.createElementBlock)("div", _hoisted_3, [(0, vue.createVNode)((0, vue.unref)(_tmagic_design.TMagicButton), {
 					link: "",
 					type: "primary",
 					onClick: editHandler
@@ -7339,7 +8689,10 @@
 			disabled: { type: Boolean },
 			size: {},
 			lastValues: {},
-			isCompare: { type: Boolean }
+			isCompare: { type: Boolean },
+			text: {},
+			labelWidth: {},
+			labelPosition: {}
 		},
 		emits: ["change"],
 		setup(__props, { expose: __expose, emit: __emit }) {
@@ -7548,7 +8901,8 @@
 					const v = props.model[props.name];
 					if (Array.isArray(v) ? !v.length : typeof v === "undefined") return;
 					if (typeof v === "undefined" || hasOption(v)) return;
-					setOptions(await getInitOption());
+					const data = await getInitOption();
+					setOptions(data);
 				};
 				(0, vue.watch)(() => props.model?.[props.name], () => {
 					initOption();
@@ -7687,7 +9041,10 @@
 			disabled: { type: Boolean },
 			size: {},
 			lastValues: {},
-			isCompare: { type: Boolean }
+			isCompare: { type: Boolean },
+			text: {},
+			labelWidth: {},
+			labelPosition: {}
 		},
 		emits: ["change"],
 		setup(__props, { emit: __emit }) {
@@ -7807,7 +9164,10 @@
 			disabled: { type: Boolean },
 			size: {},
 			lastValues: {},
-			isCompare: { type: Boolean }
+			isCompare: { type: Boolean },
+			text: {},
+			labelWidth: {},
+			labelPosition: {}
 		},
 		emits: ["change"],
 		setup(__props, { emit: __emit }) {
@@ -7965,8 +9325,10 @@
 		const option = Object.assign(defaultInstallOpt, opt);
 		app.config.globalProperties.$MAGIC_FORM = option;
 		setConfig(option);
+		if (option.typeMatchRules) registerTypeMatchRules(option.typeMatchRules);
 		app.component("m-form", Form_default);
 		app.component("m-form-dialog", FormDialog_default);
+		app.component("m-form-drawer", FormDrawer_default);
 		app.component("m-form-container", Container_default);
 		app.component("m-form-fieldset", Fieldset_default);
 		app.component("m-form-group-list", TableGroupList_default);
@@ -8001,6 +9363,8 @@
 	var createForm = (config) => config;
 	//#endregion
 	exports.FORM_DIFF_CONFIG_KEY = FORM_DIFF_CONFIG_KEY;
+	exports.FORM_SILENT_MODE_KEY = FORM_SILENT_MODE_KEY;
+	exports.FORM_TYPE_MATCH_VALID_KEY = FORM_TYPE_MATCH_VALID_KEY;
 	exports.MCascader = Cascader_default;
 	exports.MCheckbox = Checkbox_default;
 	exports.MCheckboxGroup = CheckboxGroup_default;
@@ -8034,23 +9398,33 @@
 	exports.MTextarea = Textarea_default;
 	exports.MTime = Time_default;
 	exports.MTimerange = Timerange_default;
+	exports.adaptFormValidator = adaptFormValidator;
+	exports.applyExtendState = applyExtendState;
+	exports.clearTypeMatchRules = clearTypeMatchRules;
 	exports.createForm = createForm;
 	exports.createObjectProp = createObjectProp;
 	exports.createValues = createValues;
 	exports.datetimeFormatter = datetimeFormatter;
 	exports.default = plugin_default;
 	exports.deleteFormField = deleteField;
+	exports.deleteTypeMatchRule = deleteTypeMatchRule;
 	exports.display = display;
 	exports.filterFunction = filterFunction;
 	exports.getDataByPage = getDataByPage;
 	exports.getFormField = getField;
 	exports.getRules = getRules;
+	exports.getTypeMatchRule = getTypeMatchRule;
 	exports.initValue = initValue;
 	exports.registerFormField = registerField;
+	exports.registerTypeMatchRule = registerTypeMatchRule;
+	exports.registerTypeMatchRules = registerTypeMatchRules;
 	exports.sortArray = sortArray;
 	exports.sortChange = sortChange;
+	exports.stripTabItemsLazy = stripTabItemsLazy;
 	exports.submitForm = submitForm;
 	exports.useAddField = useAddField;
+	exports.validateForm = validateForm;
+	exports.validateTypeMatch = validateTypeMatch;
 	var _tmagic_form_schema = require("@tmagic/form-schema");
 	Object.keys(_tmagic_form_schema).forEach(function(k) {
 		if (k !== "default" && !Object.prototype.hasOwnProperty.call(exports, k)) Object.defineProperty(exports, k, {