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

package/dist/es/Form.vue_vue_type_script_setup_true_lang.js

@@ -1,10 +1,10 @@
 import { FORM_DIFF_CONFIG_KEY, FORM_TYPE_MATCH_VALID_KEY } from "./schema.js";
+import { applyExtendState, initValue } from "./utils/form.js";
 import { getConfig } from "./utils/config.js";
-import { initValue } from "./utils/form.js";
 import Container_default from "./containers/Container.js";
-import { Fragment, computed, createBlock, createCommentVNode, createElementBlock, createSlots, defineComponent, mergeProps, nextTick, normalizeStyle, openBlock, provide, reactive, ref, renderList, renderSlot, shallowRef, toRaw, unref, useTemplateRef, watch, watchEffect, withCtx } from "vue";
+import { Fragment, computed, createBlock, createCommentVNode, createElementBlock, createSlots, defineComponent, inject, mergeProps, nextTick, normalizeClass, normalizeStyle, openBlock, provide, reactive, ref, renderList, renderSlot, shallowRef, toRaw, unref, useTemplateRef, watch, watchEffect, withCtx } from "vue";
 import { cloneDeep, isEqual } from "lodash-es";
-import { TMagicForm, tMagicMessage, tMagicMessageBox } from "@tmagic/design";
+import { M_THEME_KEY, TMagicForm, tMagicMessage, tMagicMessageBox } from "@tmagic/design";
 import { setValueByKeyPath } from "@tmagic/utils";
 //#region packages/form/src/Form.vue?vue&type=script&setup=true&lang.ts
 var Form_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defineComponent({
@@ -42,7 +42,8 @@ var Form_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defineCompo
 		},
 		extendState: {},
 		showDiff: {},
-		selfDiffFieldTypes: {}
+		selfDiffFieldTypes: {},
+		theme: {}
 	},
 	emits: [
 		"change",
@@ -62,6 +63,25 @@ var Form_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defineCompo
 		const fields = /* @__PURE__ */ new Map();
 		const requestFuc = getConfig("request");
 		/**
+		* 当前表单生效的主题名称：
+		* - 优先用本组件自己的 `props.theme`；
+		* - 没设置时回退到最近祖先 `<MEditor>` / `<MForm>` provide 的主题，便于内嵌于编辑器
+		*   时自动跟随外层主题，无需在每个 `MForm` 上重复传 `theme`。
+		*
+		* 同时把合并后的值再 provide 出去（见下方 `provide(M_THEME_KEY, ...)`），让 form 子树
+		* 里再嵌套的 portal 组件（`TMagicPopover` 等）依然能拿到非空主题。
+		*/
+		const ancestorTheme = inject(M_THEME_KEY, null);
+		const effectiveTheme = computed(() => props.theme || ancestorTheme?.value || "");
+		/**
+		* 拼到 `formState.popperClass` 上的主题修饰类（仅 `m-theme--<theme>`，
+		* 不带 `m-form` / `m-editor` 前缀，因为 Element Plus 弹层节点本身既不是 form 也不是 editor）。
+		*
+		* 这条类会随所有读 `mForm.popperClass` 的字段（Select / DateTime / Cascader 等）下发到
+		* Element Plus 的 `popper-class`，让 portal 节点也命中 `m-theme--<theme>` 上的 CSS 变量。
+		*/
+		const themeClass = computed(() => effectiveTheme.value ? `m-theme--${effectiveTheme.value}` : "");
+		/**
 		* formState 实现说明：
 		*
 		* 1. 与 props 直接对应的字段（config / initValues / lastValues / isCompare / parentValues /
@@ -77,13 +97,21 @@ var Form_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defineCompo
 		*      把最新值刷进 formState。
 		*    - accessor 描述符（`{ get stage() { return ... } }`）按原样写入，调用方可以控制
 		*      读时求值，每次读取都会重新执行 getter。
+		*
+		* 4. `popperClass` 会自动拼接 `themeClass`：调用方传入的 `popperClass` + 当前主题
+		*    修饰类（含祖先 `<MEditor>` provide 的主题）。这样所有透传到 Element Plus 弹层
+		*    `popper-class` 的字段（Select / DateTime / Cascader 等）能自带主题作用域。
 		*/
 		const formState = reactive({
 			get keyProp() {
 				return props.keyProp;
 			},
 			get popperClass() {
-				return props.popperClass;
+				const userClass = props.popperClass ?? "";
+				const tc = themeClass.value;
+				if (!userClass) return tc;
+				if (!tc) return userClass;
+				return `${userClass} ${tc}`;
 			},
 			get config() {
 				return props.config;
@@ -131,11 +159,10 @@ var Form_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defineCompo
 		* 这里不再重复同步；因此 `props.initValues` 这类高频变化也不会再触发
 		* `extendState` 重跑（旧版的性能问题修复点）。
 		*
-		* 实现细节：
-		* - data 描述符：通过 `formState[key] = value` 走 reactive proxy 的 set，
-		*   触发依赖通知；与旧版「逐项赋值」语义完全等价。
-		* - accessor 描述符（`{ get stage() {...} }`）按原样写入 formState，调用方
-		*   可以自行控制读时求值；强制 `configurable: true` 以便下一次重跑可再 define。
+		* 实现细节：合并逻辑统一收口在 `applyExtendState`（utils/form）——
+		* data 描述符走 reactive proxy 的 set 触发依赖通知（与旧版「逐项赋值」语义等价），
+		* accessor 描述符按原样 defineProperty 支持读时求值；
+		* props 派生的只读 getter 字段（keyProp 等）以普通字段形式返回时会被跳过并告警。
 		*/
 		watchEffect(async (onCleanup) => {
 			const { extendState } = props;
@@ -152,13 +179,16 @@ var Form_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defineCompo
 				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);
 		});
 		provide("mForm", formState);
+		/**
+		* 把生效主题（自身或祖先）再 provide 出去，供 form 子树内含 `Teleport` 的组件
+		* （如 `TMagicPopover`）在传送目标上挂 `m-theme--<theme>` 类。
+		* 详见 `@tmagic/design/theme.ts`。
+		*/
+		provide(M_THEME_KEY, effectiveTheme);
+		provide("formInline", props.inline);
 		provide(FORM_DIFF_CONFIG_KEY, {
 			get showDiff() {
 				return props.showDiff;
@@ -299,7 +329,11 @@ var Form_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defineCompo
 		});
 		return (_ctx, _cache) => {
 			return openBlock(), createBlock(unref(TMagicForm), {
-				class: "m-form",
+				class: normalizeClass([
+					"m-form",
+					effectiveTheme.value ? `m-form--${effectiveTheme.value}` : "",
+					effectiveTheme.value ? `m-theme--${effectiveTheme.value}` : ""
+				]),
 				ref: "tMagicForm",
 				model: values.value,
 				"label-width": __props.labelWidth,
@@ -337,6 +371,7 @@ var Form_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defineCompo
 				}), 128)) : createCommentVNode("v-if", true)]),
 				_: 3
 			}, 8, [
+				"class",
 				"model",
 				"label-width",
 				"style",

package/dist/es/FormDialog.vue_vue_type_script_setup_true_lang.js

@@ -1,6 +1,6 @@
 import Form_default from "./Form.js";
-import { computed, createBlock, createCommentVNode, createElementBlock, createElementVNode, createTextVNode, createVNode, defineComponent, normalizeStyle, openBlock, ref, renderSlot, toDisplayString, unref, withCtx } from "vue";
-import { TMagicButton, TMagicCol, TMagicDialog, TMagicRow } from "@tmagic/design";
+import { computed, createBlock, createCommentVNode, createElementBlock, createElementVNode, createTextVNode, createVNode, defineComponent, inject, normalizeClass, normalizeStyle, openBlock, provide, ref, renderSlot, toDisplayString, unref, withCtx } from "vue";
+import { M_THEME_KEY, TMagicButton, TMagicCol, TMagicDialog, TMagicRow } from "@tmagic/design";
 //#region packages/form/src/FormDialog.vue?vue&type=script&setup=true&lang.ts
 var _hoisted_1 = { style: { "min-height": "1px" } };
 var FormDialog_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defineComponent({
@@ -46,7 +46,8 @@ var FormDialog_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defin
 			type: Boolean,
 			default: true
 		},
-		extendState: {}
+		extendState: {},
+		theme: {}
 	},
 	emits: [
 		"close",
@@ -56,6 +57,9 @@ var FormDialog_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defin
 	],
 	setup(__props, { expose: __expose, emit: __emit }) {
 		const props = __props;
+		const ancestorTheme = inject(M_THEME_KEY, null);
+		const effectiveTheme = computed(() => props.theme || ancestorTheme?.value || "");
+		provide(M_THEME_KEY, effectiveTheme);
 		const emit = __emit;
 		const form = ref();
 		const dialogVisible = ref(false);
@@ -116,7 +120,7 @@ var FormDialog_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defin
 			return openBlock(), createBlock(unref(TMagicDialog), {
 				modelValue: dialogVisible.value,
 				"onUpdate:modelValue": _cache[1] || (_cache[1] = ($event) => dialogVisible.value = $event),
-				class: "m-form-dialog",
+				class: normalizeClass(["m-form-dialog", effectiveTheme.value ? `m-theme--${effectiveTheme.value}` : ""]),
 				top: "20px",
 				"append-to-body": "",
 				title: __props.title,
@@ -200,6 +204,7 @@ var FormDialog_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defin
 					"use-field-text-in-error": __props.useFieldTextInError,
 					"type-match-valid": __props.typeMatchValid,
 					"extend-state": __props.extendState,
+					theme: effectiveTheme.value,
 					onChange: changeHandler
 				}, null, 8, [
 					"modelValue",
@@ -214,11 +219,13 @@ var FormDialog_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defin
 					"prevent-submit-default",
 					"use-field-text-in-error",
 					"type-match-valid",
-					"extend-state"
+					"extend-state",
+					"theme"
 				]), renderSlot(_ctx.$slots, "default")], 4)) : createCommentVNode("v-if", true)]),
 				_: 3
 			}, 8, [
 				"modelValue",
+				"class",
 				"title",
 				"width",
 				"zIndex",

package/dist/es/FormDrawer.vue_vue_type_script_setup_true_lang.js

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

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

@@ -1,25 +1,29 @@
 import { FORM_DIFF_CONFIG_KEY, FORM_TYPE_MATCH_VALID_KEY } from "../schema.js";
+import { createObjectProp, display, filterFunction, getRules } from "../utils/form.js";
 import Hidden_default from "../fields/Hidden.js";
 import { getField } from "../utils/config.js";
-import { createObjectProp, display, filterFunction, getRules } from "../utils/form.js";
 import FormLabel_default from "./FormLabel.js";
 import { Fragment, computed, createBlock, createCommentVNode, createElementBlock, createElementVNode, createSlots, createTextVNode, createVNode, defineComponent, inject, mergeProps, normalizeClass, normalizeStyle, openBlock, readonly, ref, renderList, renderSlot, resolveComponent, resolveDynamicComponent, toDisplayString, toRaw, unref, watch, watchEffect, withCtx } from "vue";
 import { isEqual } from "lodash-es";
 import { TMagicButton, TMagicFormItem, TMagicIcon, TMagicTooltip } from "@tmagic/design";
 import { getValueByKeyPath } from "@tmagic/utils";
-import { WarningFilled } from "@element-plus/icons-vue";
+import { ArrowDown, ArrowUp, WarningFilled } from "@element-plus/icons-vue";
 //#region packages/form/src/containers/Container.vue?vue&type=script&setup=true&lang.ts
 var _hoisted_1 = ["data-tmagic-id", "data-tmagic-form-item-prop"];
-var _hoisted_2 = ["innerHTML"];
+var _hoisted_2 = {
+	key: 0,
+	class: "m-form-tip m-form-title-extra"
+};
 var _hoisted_3 = ["innerHTML"];
 var _hoisted_4 = ["innerHTML"];
 var _hoisted_5 = ["innerHTML"];
 var _hoisted_6 = ["innerHTML"];
 var _hoisted_7 = ["innerHTML"];
 var _hoisted_8 = ["innerHTML"];
-var _hoisted_9 = {
+var _hoisted_9 = ["innerHTML"];
+var _hoisted_10 = {
 	key: 5,
-	style: { "text-align": "center" }
+	class: "m-form-container-expand"
 };
 var Container_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defineComponent({
 	name: "MFormContainer",
@@ -145,7 +149,8 @@ var Container_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ define
 			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 = computed(() => props.config.labelWidth ?? props.labelWidth);
 		watchEffect(() => {
@@ -303,12 +308,12 @@ var Container_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ define
 					"use-label",
 					"label-title",
 					"text"
-				])])]),
+				]), __props.config.titleExtra && __props.config.labelPosition === "top" ? (openBlock(), createElementBlock("span", _hoisted_2, toDisplayString(__props.config.titleExtra), 1)) : createCommentVNode("v-if", true)])]),
 				default: withCtx(() => [tooltip.value.text ? (openBlock(), createBlock(unref(TMagicTooltip), {
 					key: 0,
 					placement: tooltip.value.placement
 				}, {
-					content: withCtx(() => [createElementVNode("div", { innerHTML: tooltip.value.text }, null, 8, _hoisted_2)]),
+					content: withCtx(() => [createElementVNode("div", { innerHTML: tooltip.value.text }, null, 8, _hoisted_3)]),
 					default: withCtx(() => [(openBlock(), createBlock(resolveDynamicComponent(tagName.value), mergeProps(fieldsProps.value, {
 						model: __props.model,
 						"last-values": __props.lastValues,
@@ -337,7 +342,7 @@ var Container_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ define
 				key: 0,
 				placement: "top"
 			}, {
-				content: withCtx(() => [createElementVNode("div", { innerHTML: __props.config.tip }, null, 8, _hoisted_3)]),
+				content: withCtx(() => [createElementVNode("div", { innerHTML: __props.config.tip }, null, 8, _hoisted_4)]),
 				default: withCtx(() => [createVNode(unref(TMagicIcon), { style: {
 					"line-height": "40px",
 					"margin-left": "5px"
@@ -376,7 +381,7 @@ var Container_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ define
 						key: 0,
 						placement: tooltip.value.placement
 					}, {
-						content: withCtx(() => [createElementVNode("div", { innerHTML: tooltip.value.text }, null, 8, _hoisted_4)]),
+						content: withCtx(() => [createElementVNode("div", { innerHTML: tooltip.value.text }, null, 8, _hoisted_5)]),
 						default: withCtx(() => [(openBlock(), createBlock(resolveDynamicComponent(tagName.value), mergeProps(fieldsProps.value, {
 							model: __props.model,
 							"last-values": __props.lastValues,
@@ -429,7 +434,7 @@ var Container_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ define
 							key: 0,
 							placement: tooltip.value.placement
 						}, {
-							content: withCtx(() => [createElementVNode("div", { innerHTML: tooltip.value.text }, null, 8, _hoisted_5)]),
+							content: withCtx(() => [createElementVNode("div", { innerHTML: tooltip.value.text }, null, 8, _hoisted_6)]),
 							default: withCtx(() => [(openBlock(), createBlock(resolveDynamicComponent(tagName.value), mergeProps(fieldsProps.value, {
 								model: __props.lastValues,
 								onChange: onChangeHandler
@@ -445,7 +450,7 @@ var Container_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ define
 						key: 0,
 						placement: "top"
 					}, {
-						content: withCtx(() => [createElementVNode("div", { innerHTML: __props.config.tip }, null, 8, _hoisted_6)]),
+						content: withCtx(() => [createElementVNode("div", { innerHTML: __props.config.tip }, null, 8, _hoisted_7)]),
 						default: withCtx(() => [createVNode(unref(TMagicIcon), { style: {
 							"line-height": "40px",
 							"margin-left": "5px"
@@ -486,7 +491,7 @@ var Container_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ define
 							key: 0,
 							placement: tooltip.value.placement
 						}, {
-							content: withCtx(() => [createElementVNode("div", { innerHTML: tooltip.value.text }, null, 8, _hoisted_7)]),
+							content: withCtx(() => [createElementVNode("div", { innerHTML: tooltip.value.text }, null, 8, _hoisted_8)]),
 							default: withCtx(() => [(openBlock(), createBlock(resolveDynamicComponent(tagName.value), mergeProps(fieldsProps.value, {
 								model: __props.model,
 								onChange: onChangeHandler
@@ -502,7 +507,7 @@ var Container_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ define
 						key: 1,
 						placement: "top"
 					}, {
-						content: withCtx(() => [createElementVNode("div", { innerHTML: __props.config.tip }, null, 8, _hoisted_8)]),
+						content: withCtx(() => [createElementVNode("div", { innerHTML: __props.config.tip }, null, 8, _hoisted_9)]),
 						default: withCtx(() => [createVNode(unref(TMagicIcon), { style: {
 							"line-height": "40px",
 							"margin-left": "5px"
@@ -544,16 +549,17 @@ var Container_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ define
 					"label-width",
 					"prop"
 				]);
-			}), 128)) : createCommentVNode("v-if", true)], 64)) : createCommentVNode("v-if", true), __props.config.expand && type.value !== "fieldset" ? (openBlock(), createElementBlock("div", _hoisted_9, [createVNode(unref(TMagicButton), {
+			}), 128)) : createCommentVNode("v-if", true)], 64)) : createCommentVNode("v-if", true), __props.config.expand && type.value !== "fieldset" ? (openBlock(), createElementBlock("div", _hoisted_10, [createVNode(unref(TMagicButton), {
 				type: "primary",
 				size: "small",
 				disabled: false,
 				link: "",
-				onClick: expandHandler
+				onClick: expandHandler,
+				icon: expand.value ? unref(ArrowUp) : unref(ArrowDown)
 			}, {
 				default: withCtx(() => [createTextVNode(toDisplayString(expand.value ? "收起配置" : "展开更多配置"), 1)]),
 				_: 1
-			})])) : createCommentVNode("v-if", true)], 14, _hoisted_1);
+			}, 8, ["icon"])])) : createCommentVNode("v-if", true)], 14, _hoisted_1);
 		};
 	}
 });

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

@@ -1,5 +1,5 @@
 import GroupListItem_default from "./GroupListItem.js";
-import { Fragment, createBlock, createCommentVNode, createElementBlock, createElementVNode, defineComponent, openBlock, renderList, renderSlot } from "vue";
+import { Fragment, createBlock, createCommentVNode, createElementBlock, createElementVNode, defineComponent, openBlock, renderList, renderSlot, toDisplayString } from "vue";
 import { cloneDeep } from "lodash-es";
 //#region packages/form/src/containers/GroupList.vue?vue&type=script&setup=true&lang.ts
 var _hoisted_1 = { class: "m-fields-group-list" };
@@ -8,11 +8,12 @@ var _hoisted_3 = {
 	key: 1,
 	class: "el-table__empty-block"
 };
-var _hoisted_4 = {
+var _hoisted_4 = { class: "el-table__empty-text t-table__empty" };
+var _hoisted_5 = {
 	key: 3,
 	class: "m-fields-group-list-footer"
 };
-var _hoisted_5 = { style: {
+var _hoisted_6 = { style: {
 	"display": "flex",
 	"justify-content": "flex-end",
 	"flex": "1"
@@ -63,7 +64,7 @@ var GroupList_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ define
 					innerHTML: __props.config.extra,
 					style: { "color": "rgba(0, 0, 0, 0.45)" }
 				}, null, 8, _hoisted_2)) : createCommentVNode("v-if", true),
-				!__props.model[__props.name] || !__props.model[__props.name].length ? (openBlock(), createElementBlock("div", _hoisted_3, [..._cache[1] || (_cache[1] = [createElementVNode("span", { class: "el-table__empty-text t-table__empty" }, "暂无数据", -1)])])) : (openBlock(true), createElementBlock(Fragment, { key: 2 }, renderList(__props.model[__props.name], (item, index) => {
+				!__props.model[__props.name] || !__props.model[__props.name].length ? (openBlock(), createElementBlock("div", _hoisted_3, [createElementVNode("span", _hoisted_4, "暂无" + toDisplayString(__props.config.titlePrefix || "") + "数据", 1)])) : (openBlock(true), createElementBlock(Fragment, { key: 2 }, renderList(__props.model[__props.name], (item, index) => {
 					return openBlock(), createBlock(GroupListItem_default, {
 						key: index,
 						model: item,
@@ -94,7 +95,7 @@ var GroupList_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ define
 						"group-model"
 					]);
 				}), 128)),
-				!__props.isCompare ? (openBlock(), createElementBlock("div", _hoisted_4, [renderSlot(_ctx.$slots, "toggle-button"), createElementVNode("div", _hoisted_5, [renderSlot(_ctx.$slots, "add-button")])])) : createCommentVNode("v-if", true)
+				!__props.isCompare ? (openBlock(), createElementBlock("div", _hoisted_5, [renderSlot(_ctx.$slots, "toggle-button"), createElementVNode("div", _hoisted_6, [renderSlot(_ctx.$slots, "add-button")])])) : createCommentVNode("v-if", true)
 			]);
 		};
 	}

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

@@ -1,15 +1,16 @@
 import { filterFunction } from "../utils/form.js";
 import Container_default from "./Container.js";
 import { Fragment, computed, createBlock, createCommentVNode, createElementBlock, createElementVNode, createTextVNode, createVNode, defineComponent, inject, openBlock, ref, unref, vShow, withCtx, withDirectives } from "vue";
-import { TMagicButton, TMagicCard, TMagicIcon, TMagicInputNumber, TMagicPopover } from "@tmagic/design";
-import { CaretBottom, CaretRight, CaretTop, Delete, DocumentCopy, Position } from "@element-plus/icons-vue";
+import { TMagicButton, TMagicCard, TMagicIcon, TMagicInputNumber, TMagicPopover, TMagicTooltip } from "@tmagic/design";
+import { ArrowDown, ArrowRight, Bottom, Delete, DocumentCopy, Position, Top } from "@element-plus/icons-vue";
 //#region packages/form/src/containers/GroupListItem.vue?vue&type=script&setup=true&lang.ts
-var _hoisted_1 = ["innerHTML"];
-var _hoisted_2 = { style: {
+var _hoisted_1 = { class: "m-fields-group-list-item-header" };
+var _hoisted_2 = ["innerHTML"];
+var _hoisted_3 = { style: {
 	"text-align": "right",
 	"margin-top": "20px"
 } };
-var _hoisted_3 = ["innerHTML"];
+var _hoisted_4 = ["innerHTML"];
 var GroupListItem_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defineComponent({
 	name: "MFormGroupListItem",
 	__name: "GroupListItem",
@@ -46,7 +47,10 @@ var GroupListItem_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ de
 			[mForm?.keyProp || "__key"]: `${props.config[mForm?.keyProp || "__key"]}${String(props.index)}`
 		}));
 		const title = 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)}`;
 		});
@@ -85,33 +89,39 @@ var GroupListItem_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ de
 		return (_ctx, _cache) => {
 			return openBlock(), createBlock(unref(TMagicCard), {
 				class: "m-fields-group-list-item",
+				flat: __props.config.flat,
 				"body-style": { display: expand.value ? "block" : "none" }
 			}, {
-				header: withCtx(() => [createElementVNode("div", null, [
+				header: withCtx(() => [createElementVNode("div", _hoisted_1, [
 					createVNode(unref(TMagicButton), {
 						link: "",
 						disabled: __props.disabled,
-						onClick: expandHandler
+						onClick: expandHandler,
+						class: "expand-button"
 					}, {
 						default: withCtx(() => [createVNode(unref(TMagicIcon), null, {
-							default: withCtx(() => [expand.value ? (openBlock(), createBlock(unref(CaretBottom), { key: 0 })) : (openBlock(), createBlock(unref(CaretRight), { key: 1 }))]),
+							default: withCtx(() => [expand.value ? (openBlock(), createBlock(unref(ArrowDown), { key: 0 })) : (openBlock(), createBlock(unref(ArrowRight), { key: 1 }))]),
 							_: 1
-						}), createElementVNode("span", { innerHTML: title.value }, null, 8, _hoisted_1)]),
+						})]),
 						_: 1
 					}, 8, ["disabled"]),
-					!__props.isCompare ? withDirectives((openBlock(), createBlock(unref(TMagicButton), {
-						key: 0,
-						type: "danger",
-						size: "small",
-						link: "",
-						icon: unref(Delete),
-						disabled: __props.disabled,
-						onClick: removeHandler
-					}, null, 8, ["icon", "disabled"])), [[vShow, showDelete.value]]) : createCommentVNode("v-if", true),
+					createElementVNode("span", { innerHTML: title.value }, null, 8, _hoisted_2),
+					createVNode(unref(TMagicTooltip), { content: `删除 ${title.value}` }, {
+						default: withCtx(() => [!__props.isCompare ? withDirectives((openBlock(), createBlock(unref(TMagicButton), {
+							key: 0,
+							size: "default",
+							link: "",
+							class: "delete-button",
+							icon: unref(Delete),
+							disabled: __props.disabled,
+							onClick: removeHandler
+						}, null, 8, ["icon", "disabled"])), [[vShow, showDelete.value]]) : createCommentVNode("v-if", true)]),
+						_: 1
+					}, 8, ["content"]),
 					copyable.value && !__props.isCompare ? (openBlock(), createBlock(unref(TMagicButton), {
-						key: 1,
+						key: 0,
 						link: "",
-						size: "small",
+						size: "default",
 						type: "primary",
 						icon: unref(DocumentCopy),
 						disabled: __props.disabled,
@@ -120,27 +130,27 @@ var GroupListItem_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ de
 						default: withCtx(() => [..._cache[6] || (_cache[6] = [createTextVNode("复制", -1)])]),
 						_: 1
 					}, 8, ["icon", "disabled"])) : createCommentVNode("v-if", true),
-					movable.value && !__props.isCompare ? (openBlock(), createElementBlock(Fragment, { key: 2 }, [withDirectives(createVNode(unref(TMagicButton), {
+					movable.value && !__props.isCompare ? (openBlock(), createElementBlock(Fragment, { key: 1 }, [withDirectives(createVNode(unref(TMagicButton), {
 						link: "",
-						size: "small",
+						size: "default",
 						disabled: __props.disabled,
-						icon: unref(CaretTop),
+						icon: unref(Top),
 						onClick: _cache[0] || (_cache[0] = ($event) => changeOrder(-1))
 					}, {
 						default: withCtx(() => [..._cache[7] || (_cache[7] = [createTextVNode("上移", -1)])]),
 						_: 1
 					}, 8, ["disabled", "icon"]), [[vShow, __props.index !== 0]]), withDirectives(createVNode(unref(TMagicButton), {
 						link: "",
-						size: "small",
+						size: "default",
 						disabled: __props.disabled,
-						icon: unref(CaretBottom),
+						icon: unref(Bottom),
 						onClick: _cache[1] || (_cache[1] = ($event) => changeOrder(1))
 					}, {
 						default: withCtx(() => [..._cache[8] || (_cache[8] = [createTextVNode("下移", -1)])]),
 						_: 1
 					}, 8, ["disabled", "icon"]), [[vShow, __props.index !== length.value - 1]])], 64)) : createCommentVNode("v-if", true),
 					__props.config.moveSpecifyLocation && !__props.isCompare ? (openBlock(), createBlock(unref(TMagicPopover), {
-						key: 3,
+						key: 2,
 						trigger: "click",
 						placement: "top",
 						width: "200",
@@ -168,7 +178,7 @@ var GroupListItem_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ de
 								disabled: __props.disabled
 							}, null, 8, ["modelValue", "disabled"]),
 							_cache[11] || (_cache[11] = createTextVNode("行 ", -1))
-						]), createElementVNode("div", _hoisted_2, [createVNode(unref(TMagicButton), {
+						]), createElementVNode("div", _hoisted_3, [createVNode(unref(TMagicButton), {
 							size: "small",
 							text: "",
 							onClick: _cache[4] || (_cache[4] = ($event) => moveSpecifyLocationVisible.value = false)
@@ -186,10 +196,10 @@ var GroupListItem_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ de
 						_: 1
 					}, 8, ["visible"])) : createCommentVNode("v-if", true),
 					itemExtra.value ? (openBlock(), createElementBlock("span", {
-						key: 4,
+						key: 3,
 						innerHTML: itemExtra.value,
 						class: "m-form-tip"
-					}, null, 8, _hoisted_3)) : createCommentVNode("v-if", true)
+					}, null, 8, _hoisted_4)) : createCommentVNode("v-if", true)
 				])]),
 				default: withCtx(() => [expand.value ? (openBlock(), createBlock(Container_default, {
 					key: 0,
@@ -214,7 +224,7 @@ var GroupListItem_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ de
 					"disabled"
 				])) : createCommentVNode("v-if", true)]),
 				_: 1
-			}, 8, ["body-style"]);
+			}, 8, ["flat", "body-style"]);
 		};
 	}
 });