@tmagic/form 1.8.0-beta.13 → 1.8.0-beta.14

package/dist/tmagic-form.umd.cjs

@@ -1,16 +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("dayjs/plugin/customParseFormat"), 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",
-		"@tmagic/design",
-		"@tmagic/utils",
-		"@element-plus/icons-vue",
 		"dayjs",
 		"dayjs/plugin/utc",
+		"@tmagic/design",
+		"@tmagic/utils",
 		"dayjs/plugin/customParseFormat",
+		"@element-plus/icons-vue",
 		"@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.dayjs_plugin_customParseFormat, global._popperjs_core));
-})(this, function(exports, vue, _tmagic_design, _tmagic_utils, _element_plus_icons_vue, dayjs, dayjs_plugin_utc, dayjs_plugin_customParseFormat, _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" }
@@ -2720,52 +2720,6 @@
 		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 });
-	};
-	//#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 setConfig = (option) => {
-		$MAGIC_FORM = option;
-	};
-	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/utils/typeMatch.ts
 	dayjs.default.extend(dayjs_plugin_customParseFormat.default);
 	var typeMatchRuleRegistry = /* @__PURE__ */ new Map();
@@ -3366,6 +3320,36 @@
 		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。
+	*
+	* 注意：formState 上由 props 派生的字段（keyProp / popperClass / config / initValues /
+	* isCompare / lastValues / parentValues）是只读 getter（无 setter），extendState 若以
+	* 普通字段形式返回同名 key，直接赋值会让 proxy 的 set trap 失败并抛出
+	* `TypeError: 'set' on proxy: trap returned falsish`，这里统一跳过并告警；
+	* 如确需覆盖，可在 extendState 中以 get 访问器形式返回。
+	*/
+	var applyExtendState = (formState, state) => {
+		if (!state) return;
+		for (const [key, descriptor] of Object.entries(Object.getOwnPropertyDescriptors(state))) {
+			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(".");
@@ -3375,6 +3359,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,
@@ -3383,9 +3415,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)({
@@ -3402,11 +3434,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"
@@ -3419,23 +3451,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
@@ -3563,7 +3599,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)(() => {
@@ -3721,12 +3758,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,
@@ -3755,7 +3792,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"
@@ -3794,7 +3831,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,
@@ -3847,7 +3884,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
@@ -3863,7 +3900,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"
@@ -3904,7 +3941,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
@@ -3920,7 +3957,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"
@@ -3962,16 +3999,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);
 			};
 		}
 	});
@@ -4012,7 +4050,8 @@
 			},
 			extendState: {},
 			showDiff: {},
-			selfDiffFieldTypes: {}
+			selfDiffFieldTypes: {},
+			theme: {}
 		},
 		emits: [
 			"change",
@@ -4032,6 +4071,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 /
@@ -4047,13 +4105,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;
@@ -4101,11 +4167,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;
@@ -4122,13 +4187,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);
 			});
 			(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;
@@ -4269,7 +4337,11 @@
 			});
 			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,
@@ -4307,6 +4379,7 @@
 					}), 128)) : (0, vue.createCommentVNode)("v-if", true)]),
 					_: 3
 				}, 8, [
+					"class",
 					"model",
 					"label-width",
 					"style",
@@ -4369,14 +4442,7 @@
 							console.error("[MForm] extendState failed:", e);
 							return;
 						}
-						const apply = (state) => {
-							if (!state) return;
-							for (const [key, descriptor] of Object.entries(Object.getOwnPropertyDescriptors(state))) if ("value" in descriptor) form.formState[key] = state[key];
-							else {
-								descriptor.configurable = true;
-								Object.defineProperty(form.formState, key, descriptor);
-							}
-						};
+						const apply = (state) => applyExtendState(form.formState, state);
 						if (result && typeof result.then === "function") result.then(apply, (e) => console.error("[MForm] extendState failed:", e));
 						else apply(result);
 					}, {
@@ -4783,7 +4849,8 @@
 				type: Boolean,
 				default: true
 			},
-			extendState: {}
+			extendState: {},
+			theme: {}
 		},
 		emits: [
 			"close",
@@ -4793,6 +4860,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);
@@ -4853,7 +4923,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,
@@ -4937,6 +5007,7 @@
 						"use-field-text-in-error": __props.useFieldTextInError,
 						"type-match-valid": __props.typeMatchValid,
 						"extend-state": __props.extendState,
+						theme: effectiveTheme.value,
 						onChange: changeHandler
 					}, null, 8, [
 						"modelValue",
@@ -4951,11 +5022,13 @@
 						"prevent-submit-default",
 						"use-field-text-in-error",
 						"type-match-valid",
-						"extend-state"
+						"extend-state",
+						"theme"
 					]), (0, vue.renderSlot)(_ctx.$slots, "default")], 4)) : (0, vue.createCommentVNode)("v-if", true)]),
 					_: 3
 				}, 8, [
 					"modelValue",
+					"class",
 					"title",
 					"width",
 					"zIndex",
@@ -4974,7 +5047,7 @@
 	//#endregion
 	//#region packages/form/src/FormDrawer.vue
 	var FormDrawer_default = /* @__PURE__ */ (0, vue.defineComponent)({
-		name: "MFormDialog",
+		name: "MFormDrawer",
 		__name: "FormDrawer",
 		props: {
 			config: { default: () => [] },
@@ -5000,7 +5073,8 @@
 				default: true
 			},
 			beforeClose: {},
-			extendState: {}
+			extendState: {},
+			theme: {}
 		},
 		emits: [
 			"close",
@@ -5012,11 +5086,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)(() => {
@@ -5047,30 +5125,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,
@@ -5108,7 +5204,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,
@@ -5128,6 +5224,7 @@
 						"use-field-text-in-error": __props.useFieldTextInError,
 						"type-match-valid": __props.typeMatchValid,
 						"extend-state": __props.extendState,
+						theme: effectiveTheme.value,
 						onChange: changeHandler
 					}, null, 8, [
 						"size",
@@ -5141,10 +5238,12 @@
 						"prevent-submit-default",
 						"use-field-text-in-error",
 						"type-match-valid",
-						"extend-state"
+						"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",
@@ -5286,16 +5385,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)({
@@ -5365,7 +5464,7 @@
 							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",
@@ -5374,11 +5473,11 @@
 						"false-value"
 					])]),
 					_: 1
-				})) : ((0, vue.openBlock)(), (0, vue.createElementBlock)("legend", _hoisted_3$5, [(0, vue.createElementVNode)("span", { innerHTML: legend.value }, 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,
@@ -5406,7 +5505,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,
@@ -5503,13 +5602,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)({
@@ -5524,7 +5623,8 @@
 			labelWidth: {},
 			prop: {},
 			size: {},
-			disabled: { type: Boolean }
+			disabled: { type: Boolean },
+			hideExpand: { type: Boolean }
 		},
 		emits: ["change", "addDiffCount"],
 		setup(__props, { expose: __expose, emit: __emit }) {
@@ -5548,26 +5648,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,
@@ -5593,7 +5698,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,
@@ -5618,7 +5723,7 @@
 						]);
 					}), 128))])]),
 					_: 3
-				}, 8, ["body-style"])) : (0, vue.createCommentVNode)("v-if", true);
+				}, 8, ["body-style", "flat"])) : (0, vue.createCommentVNode)("v-if", true);
 			};
 		}
 	});
@@ -5932,12 +6037,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)({
@@ -5976,7 +6082,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)}`;
 			});
@@ -6015,33 +6124,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,
@@ -6050,27 +6165,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",
@@ -6098,7 +6213,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)
@@ -6116,10 +6231,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,
@@ -6144,23 +6259,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"
@@ -6212,8 +6328,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,
@@ -6244,7 +6360,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)
 				]);
 			};
 		}
@@ -6406,7 +6522,8 @@
 			index: {},
 			row: {},
 			prop: {},
-			sortKey: {}
+			sortKey: {},
+			flat: { type: Boolean }
 		},
 		emits: ["change"],
 		setup(__props, { emit: __emit }) {
@@ -6477,19 +6594,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);
 			};
 		}
@@ -6639,8 +6762,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: "操作",
@@ -6650,6 +6775,7 @@
 				},
 				cell: ({ row, $index }) => (0, vue.h)(ActionsColumn_default, {
 					row,
+					flat: actionFlat,
 					index: $index,
 					model: props.model,
 					config: props.config,
@@ -6732,13 +6858,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" }
@@ -6823,19 +6949,21 @@
 							"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.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,
@@ -6878,7 +7006,7 @@
 							_: 1
 						}, 8, ["disabled", "onClick"])) : (0, vue.createCommentVNode)("v-if", true)
 					]), !__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, [(0, vue.createVNode)((0, vue.unref)(_tmagic_design.TMagicPagination), {
+					__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,
@@ -7098,9 +7226,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",
@@ -7130,9 +7259,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"
 	} };
@@ -7151,7 +7288,10 @@
 			disabled: { type: Boolean },
 			size: {},
 			lastValues: {},
-			isCompare: { type: Boolean }
+			isCompare: { type: Boolean },
+			text: {},
+			labelWidth: {},
+			labelPosition: {}
 		},
 		emits: ["change", "input"],
 		setup(__props, { emit: __emit }) {
@@ -7164,21 +7304,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;
 			});
@@ -7274,67 +7408,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);
 			};
 		}
 	});
@@ -7353,7 +7517,10 @@
 			disabled: { type: Boolean },
 			size: {},
 			lastValues: {},
-			isCompare: { type: Boolean }
+			isCompare: { type: Boolean },
+			text: {},
+			labelWidth: {},
+			labelPosition: {}
 		},
 		emits: ["change", "input"],
 		setup(__props, { emit: __emit }) {
@@ -7378,7 +7545,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,
@@ -7389,6 +7556,7 @@
 					onInput: inputHandler
 				}, null, 8, [
 					"modelValue",
+					"controls-position",
 					"size",
 					"max",
 					"min",
@@ -7417,7 +7585,10 @@
 			disabled: { type: Boolean },
 			size: {},
 			lastValues: {},
-			isCompare: { type: Boolean }
+			isCompare: { type: Boolean },
+			text: {},
+			labelWidth: {},
+			labelPosition: {}
 		},
 		emits: ["change"],
 		setup(__props, { emit: __emit }) {
@@ -7488,7 +7659,10 @@
 			disabled: { type: Boolean },
 			size: {},
 			lastValues: {},
-			isCompare: { type: Boolean }
+			isCompare: { type: Boolean },
+			text: {},
+			labelWidth: {},
+			labelPosition: {}
 		},
 		emits: ["change", "input"],
 		setup(__props, { emit: __emit }) {
@@ -7544,7 +7718,10 @@
 			disabled: { type: Boolean },
 			size: {},
 			lastValues: {},
-			isCompare: { type: Boolean }
+			isCompare: { type: Boolean },
+			text: {},
+			labelWidth: {},
+			labelPosition: {}
 		},
 		emits: ["change"],
 		setup(__props, { emit: __emit }) {
@@ -7591,7 +7768,10 @@
 			disabled: { type: Boolean },
 			size: {},
 			lastValues: {},
-			isCompare: { type: Boolean }
+			isCompare: { type: Boolean },
+			text: {},
+			labelWidth: {},
+			labelPosition: {}
 		},
 		emits: ["change"],
 		setup(__props, { emit: __emit }) {
@@ -7643,7 +7823,10 @@
 			disabled: { type: Boolean },
 			size: {},
 			lastValues: {},
-			isCompare: { type: Boolean }
+			isCompare: { type: Boolean },
+			text: {},
+			labelWidth: {},
+			labelPosition: {}
 		},
 		emits: ["change"],
 		setup(__props, { emit: __emit }) {
@@ -7688,7 +7871,10 @@
 			disabled: { type: Boolean },
 			size: {},
 			lastValues: {},
-			isCompare: { type: Boolean }
+			isCompare: { type: Boolean },
+			text: {},
+			labelWidth: {},
+			labelPosition: {}
 		},
 		emits: ["change"],
 		setup(__props, { emit: __emit }) {
@@ -7745,7 +7931,10 @@
 			disabled: { type: Boolean },
 			size: {},
 			lastValues: {},
-			isCompare: { type: Boolean }
+			isCompare: { type: Boolean },
+			text: {},
+			labelWidth: {},
+			labelPosition: {}
 		},
 		emits: ["change"],
 		setup(__props, { emit: __emit }) {
@@ -7800,7 +7989,10 @@
 			disabled: { type: Boolean },
 			size: {},
 			lastValues: {},
-			isCompare: { type: Boolean }
+			isCompare: { type: Boolean },
+			text: {},
+			labelWidth: {},
+			labelPosition: {}
 		},
 		emits: ["change"],
 		setup(__props, { emit: __emit }) {
@@ -7894,7 +8086,10 @@
 			disabled: { type: Boolean },
 			size: {},
 			lastValues: {},
-			isCompare: { type: Boolean }
+			isCompare: { type: Boolean },
+			text: {},
+			labelWidth: {},
+			labelPosition: {}
 		},
 		emits: ["change"],
 		setup(__props, { emit: __emit }) {
@@ -7988,7 +8183,10 @@
 			disabled: { type: Boolean },
 			size: {},
 			lastValues: {},
-			isCompare: { type: Boolean }
+			isCompare: { type: Boolean },
+			text: {},
+			labelWidth: {},
+			labelPosition: {}
 		},
 		emits: ["change"],
 		setup(__props, { emit: __emit }) {
@@ -8026,7 +8224,10 @@
 			disabled: { type: Boolean },
 			size: {},
 			lastValues: {},
-			isCompare: { type: Boolean }
+			isCompare: { type: Boolean },
+			text: {},
+			labelWidth: {},
+			labelPosition: {}
 		},
 		emits: ["change"],
 		setup(__props, { emit: __emit }) {
@@ -8071,7 +8272,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)({
@@ -8087,7 +8292,10 @@
 			disabled: { type: Boolean },
 			size: {},
 			lastValues: {},
-			isCompare: { type: Boolean }
+			isCompare: { type: Boolean },
+			text: {},
+			labelWidth: {},
+			labelPosition: {}
 		},
 		emits: ["change"],
 		setup(__props, { emit: __emit }) {
@@ -8100,16 +8308,18 @@
 			};
 			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), {
@@ -8122,13 +8332,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
@@ -8161,7 +8372,10 @@
 			disabled: { type: Boolean },
 			size: {},
 			lastValues: {},
-			isCompare: { type: Boolean }
+			isCompare: { type: Boolean },
+			text: {},
+			labelWidth: {},
+			labelPosition: {}
 		},
 		setup(__props) {
 			const props = __props;
@@ -8180,8 +8394,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
@@ -8199,7 +8414,11 @@
 			disabled: { type: Boolean },
 			size: {},
 			lastValues: {},
-			isCompare: { type: Boolean }
+			isCompare: { type: Boolean },
+			text: {},
+			labelWidth: {},
+			labelPosition: {},
+			theme: {}
 		},
 		emits: ["change"],
 		setup(__props, { emit: __emit }) {
@@ -8242,15 +8461,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
@@ -8296,7 +8530,10 @@
 			disabled: { type: Boolean },
 			size: {},
 			lastValues: {},
-			isCompare: { type: Boolean }
+			isCompare: { type: Boolean },
+			text: {},
+			labelWidth: {},
+			labelPosition: {}
 		},
 		emits: ["change"],
 		setup(__props, { expose: __expose, emit: __emit }) {
@@ -8645,7 +8882,10 @@
 			disabled: { type: Boolean },
 			size: {},
 			lastValues: {},
-			isCompare: { type: Boolean }
+			isCompare: { type: Boolean },
+			text: {},
+			labelWidth: {},
+			labelPosition: {}
 		},
 		emits: ["change"],
 		setup(__props, { emit: __emit }) {
@@ -8765,7 +9005,10 @@
 			disabled: { type: Boolean },
 			size: {},
 			lastValues: {},
-			isCompare: { type: Boolean }
+			isCompare: { type: Boolean },
+			text: {},
+			labelWidth: {},
+			labelPosition: {}
 		},
 		emits: ["change"],
 		setup(__props, { emit: __emit }) {
@@ -8926,6 +9169,7 @@
 		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);
@@ -8995,6 +9239,7 @@
 	exports.MTime = Time_default;
 	exports.MTimerange = Timerange_default;
 	exports.adaptFormValidator = adaptFormValidator;
+	exports.applyExtendState = applyExtendState;
 	exports.clearTypeMatchRules = clearTypeMatchRules;
 	exports.createForm = createForm;
 	exports.createObjectProp = createObjectProp;