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

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

@@ -1,13 +1,21 @@
 import { useAddField } from "../utils/useAddField.js";
-import { Teleport, computed, createBlock, createCommentVNode, createElementBlock, createElementVNode, createSlots, createTextVNode, createVNode, defineComponent, inject, openBlock, readonly, ref, shallowRef, toDisplayString, unref, watch, withCtx, withModifiers } from "vue";
+import { Fragment, Teleport, computed, createBlock, createCommentVNode, createElementBlock, createElementVNode, createSlots, createTextVNode, createVNode, defineComponent, inject, normalizeClass, openBlock, readonly, ref, shallowRef, toDisplayString, unref, watch, withCtx, withModifiers } from "vue";
 import { debounce } from "lodash-es";
 import { TMagicButton, TMagicInput } from "@tmagic/design";
 import { isNumber } from "@tmagic/utils";
 import { createPopper } from "@popperjs/core";
 //#region packages/form/src/fields/Text.vue?vue&type=script&setup=true&lang.ts
-var _hoisted_1 = { class: "m-fields-text" };
-var _hoisted_2 = { key: 1 };
-var _hoisted_3 = { style: {
+var _hoisted_1 = { key: 0 };
+var _hoisted_2 = {
+	key: 0,
+	class: "m-fields-text__prepend"
+};
+var _hoisted_3 = { 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"
 } };
@@ -24,7 +32,10 @@ var Text_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defineCompo
 		disabled: { type: Boolean },
 		size: {},
 		lastValues: {},
-		isCompare: { type: Boolean }
+		isCompare: { type: Boolean },
+		text: {},
+		labelWidth: {},
+		labelPosition: {}
 	},
 	emits: ["change", "input"],
 	setup(__props, { emit: __emit }) {
@@ -37,21 +48,15 @@ var Text_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defineCompo
 			value.value = v;
 		}, { immediate: true });
 		const appendConfig = 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;
 		});
@@ -147,67 +152,97 @@ var Text_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defineCompo
 			instanceRef.value = void 0;
 		};
 		return (_ctx, _cache) => {
-			return openBlock(), createElementBlock("div", _hoisted_1, [createVNode(unref(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))
-			}, createSlots({ _: 2 }, [__props.config.prepend ? {
-				name: "prepend",
-				fn: withCtx(() => [createElementVNode("span", null, toDisplayString(__props.config.prepend), 1)]),
-				key: "0"
-			} : void 0, appendConfig.value ? {
-				name: "append",
-				fn: withCtx(() => [appendConfig.value.type === "button" ? (openBlock(), createBlock(unref(TMagicButton), {
-					key: 0,
-					style: { "color": "#409eff" },
+			return openBlock(), createElementBlock("div", { class: normalizeClass(["m-fields-text", { "m-fields-text--static": __props.config.static }]) }, [
+				__props.config.disabled ? (openBlock(), createElementBlock("div", _hoisted_1)) : createCommentVNode("v-if", true),
+				createCommentVNode(" 新增静态展示文本样式 "),
+				__props.config.static ? (openBlock(), createElementBlock(Fragment, { key: 1 }, [
+					__props.config.prepend ? (openBlock(), createElementBlock("span", _hoisted_2, toDisplayString(__props.config.prepend), 1)) : createCommentVNode("v-if", true),
+					createElementVNode("span", _hoisted_3, toDisplayString(value.value), 1),
+					appendConfig.value ? (openBlock(), createElementBlock(Fragment, { key: 1 }, [appendConfig.value.type === "button" ? (openBlock(), createBlock(unref(TMagicButton), {
+						key: 0,
+						style: { "color": "#0056ea" },
+						size: __props.size,
+						onClick: withModifiers(buttonClickHandler, ["prevent"])
+					}, {
+						default: withCtx(() => [createTextVNode(toDisplayString(appendConfig.value.text), 1)]),
+						_: 1
+					}, 8, ["size"])) : appendConfig.value.type === "icon" ? (openBlock(), createElementBlock("img", {
+						key: 1,
+						class: "m-fields-text__icon",
+						src: appendConfig.value.text,
+						onClick: buttonClickHandler
+					}, null, 8, _hoisted_4)) : (openBlock(), createElementBlock("span", _hoisted_5, toDisplayString(appendConfig.value.text), 1))], 64)) : createCommentVNode("v-if", true)
+				], 64)) : (openBlock(), createBlock(unref(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: withModifiers(buttonClickHandler, ["prevent"])
-				}, {
-					default: withCtx(() => [createTextVNode(toDisplayString(appendConfig.value.text), 1)]),
-					_: 1
-				}, 8, ["size"])) : (openBlock(), createElementBlock("span", _hoisted_2, toDisplayString(appendConfig.value.text), 1))]),
-				key: "1"
-			} : void 0]), 1032, [
-				"modelValue",
-				"clearable",
-				"size",
-				"placeholder",
-				"disabled"
-			]), (openBlock(), createBlock(Teleport, { to: "body" }, [popoverVisible.value ? (openBlock(), createElementBlock("div", {
-				key: 0,
-				class: "tmagic-form-text-popper m-form-item__content",
-				ref_key: "popoverEl",
-				ref: popoverEl
-			}, [
-				_cache[5] || (_cache[5] = createElementVNode("div", { class: "m-form-validate__warning" }, "输入内容前后有空格，是否移除空格？", -1)),
-				createElementVNode("div", _hoisted_3, [createVNode(unref(TMagicButton), {
-					link: "",
-					size: "small",
-					onClick: _cache[2] || (_cache[2] = ($event) => popoverVisible.value = false)
-				}, {
-					default: withCtx(() => [..._cache[3] || (_cache[3] = [createTextVNode("保持原样", -1)])]),
-					_: 1
-				}), createVNode(unref(TMagicButton), {
-					type: "primary",
-					size: "small",
-					onClick: confirmTrimHandler
-				}, {
-					default: withCtx(() => [..._cache[4] || (_cache[4] = [createTextVNode("移除空格", -1)])]),
-					_: 1
-				})]),
-				_cache[6] || (_cache[6] = createElementVNode("span", {
-					class: "tmagic-form-text-popper-arrow",
-					"data-popper-arrow": ""
-				}, null, -1))
-			], 512)) : createCommentVNode("v-if", true)]))]);
+					placeholder: __props.config.placeholder,
+					disabled: __props.disabled,
+					onChange: changeHandler,
+					onInput: inputHandler,
+					onKeyup: _cache[1] || (_cache[1] = ($event) => keyUpHandler($event))
+				}, createSlots({ _: 2 }, [__props.config.prepend ? {
+					name: "prepend",
+					fn: withCtx(() => [createElementVNode("span", null, toDisplayString(__props.config.prepend), 1)]),
+					key: "0"
+				} : void 0, appendConfig.value ? {
+					name: "append",
+					fn: withCtx(() => [appendConfig.value.type === "button" ? (openBlock(), createBlock(unref(TMagicButton), {
+						key: 0,
+						style: { "color": "#0056ea" },
+						size: __props.size,
+						onClick: withModifiers(buttonClickHandler, ["prevent"])
+					}, {
+						default: withCtx(() => [createTextVNode(toDisplayString(appendConfig.value.text), 1)]),
+						_: 1
+					}, 8, ["size"])) : appendConfig.value.type === "icon" ? (openBlock(), createElementBlock("img", {
+						key: 1,
+						src: appendConfig.value.text,
+						onClick: buttonClickHandler
+					}, null, 8, _hoisted_6)) : (openBlock(), createElementBlock("span", _hoisted_7, toDisplayString(appendConfig.value.text), 1))]),
+					key: "1"
+				} : void 0]), 1032, [
+					"modelValue",
+					"clearable",
+					"size",
+					"placeholder",
+					"disabled"
+				])),
+				!__props.config.static ? (openBlock(), createBlock(Teleport, {
+					key: 3,
+					to: "body"
+				}, [popoverVisible.value ? (openBlock(), createElementBlock("div", {
+					key: 0,
+					class: "tmagic-form-text-popper m-form-item__content",
+					ref_key: "popoverEl",
+					ref: popoverEl
+				}, [
+					_cache[5] || (_cache[5] = createElementVNode("div", { class: "m-form-validate__warning" }, "输入内容前后有空格，是否移除空格？", -1)),
+					createElementVNode("div", _hoisted_8, [createVNode(unref(TMagicButton), {
+						link: "",
+						size: "small",
+						onClick: _cache[2] || (_cache[2] = ($event) => popoverVisible.value = false)
+					}, {
+						default: withCtx(() => [..._cache[3] || (_cache[3] = [createTextVNode("保持原样", -1)])]),
+						_: 1
+					}), createVNode(unref(TMagicButton), {
+						type: "primary",
+						size: "small",
+						onClick: confirmTrimHandler
+					}, {
+						default: withCtx(() => [..._cache[4] || (_cache[4] = [createTextVNode("移除空格", -1)])]),
+						_: 1
+					})]),
+					_cache[6] || (_cache[6] = createElementVNode("span", {
+						class: "tmagic-form-text-popper-arrow",
+						"data-popper-arrow": ""
+					}, null, -1))
+				], 512)) : createCommentVNode("v-if", true)])) : createCommentVNode("v-if", true)
+			], 2);
 		};
 	}
 });

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

@@ -15,7 +15,10 @@ var Textarea_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defineC
 		disabled: { type: Boolean },
 		size: {},
 		lastValues: {},
-		isCompare: { type: Boolean }
+		isCompare: { type: Boolean },
+		text: {},
+		labelWidth: {},
+		labelPosition: {}
 	},
 	emits: ["change", "input"],
 	setup(__props, { emit: __emit }) {

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

@@ -15,7 +15,10 @@ var Time_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defineCompo
 		disabled: { type: Boolean },
 		size: {},
 		lastValues: {},
-		isCompare: { type: Boolean }
+		isCompare: { type: Boolean },
+		text: {},
+		labelWidth: {},
+		labelPosition: {}
 	},
 	emits: ["change"],
 	setup(__props, { emit: __emit }) {

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

@@ -1,8 +1,8 @@
-import { useAddField } from "../utils/useAddField.js";
 import { datetimeFormatter } from "../utils/form.js";
+import { useAddField } from "../utils/useAddField.js";
 import { createBlock, defineComponent, onUnmounted, openBlock, ref, unref, watch } from "vue";
-import { TMagicTimePicker } from "@tmagic/design";
 import dayjs from "dayjs";
+import { TMagicTimePicker } from "@tmagic/design";
 //#region packages/form/src/fields/Timerange.vue?vue&type=script&setup=true&lang.ts
 var Timerange_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defineComponent({
 	name: "MFormTimeRange",
@@ -17,7 +17,10 @@ var Timerange_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ define
 		disabled: { type: Boolean },
 		size: {},
 		lastValues: {},
-		isCompare: { type: Boolean }
+		isCompare: { type: Boolean },
+		text: {},
+		labelWidth: {},
+		labelPosition: {}
 	},
 	emits: ["change"],
 	setup(__props, { emit: __emit }) {

package/dist/es/index.js

@@ -1,10 +1,10 @@
 import "./_virtual/_rolldown/runtime.js";
 import { FORM_DIFF_CONFIG_KEY, FORM_TYPE_MATCH_VALID_KEY } from "./schema.js";
+import { clearTypeMatchRules, deleteTypeMatchRule, getTypeMatchRule, registerTypeMatchRule, registerTypeMatchRules, validateTypeMatch } from "./utils/typeMatch.js";
+import { adaptFormValidator, applyExtendState, createObjectProp, createValues, datetimeFormatter, display, filterFunction, getDataByPage, getRules, initValue, sortArray, sortChange } from "./utils/form.js";
 import { useAddField } from "./utils/useAddField.js";
 import Hidden_default from "./fields/Hidden.js";
 import { deleteField, getField, registerField } from "./utils/config.js";
-import { clearTypeMatchRules, deleteTypeMatchRule, getTypeMatchRule, registerTypeMatchRule, registerTypeMatchRules, validateTypeMatch } from "./utils/typeMatch.js";
-import { adaptFormValidator, createObjectProp, createValues, datetimeFormatter, display, filterFunction, getDataByPage, getRules, initValue, sortArray, sortChange } from "./utils/form.js";
 import Container_default from "./containers/Container.js";
 import Form_default from "./Form.js";
 import { stripTabItemsLazy, submitForm, validateForm } from "./submitForm.js";
@@ -40,4 +40,4 @@ import plugin_default from "./plugin.js";
 export * from "@tmagic/form-schema";
 var createForm = (config) => config;
 //#endregion
-export { FORM_DIFF_CONFIG_KEY, FORM_TYPE_MATCH_VALID_KEY, Cascader_default as MCascader, Checkbox_default as MCheckbox, CheckboxGroup_default as MCheckboxGroup, ColorPicker_default as MColorPicker, Container_default as MContainer, Date_default as MDate, DateTime_default as MDateTime, Daterange_default as MDaterange, Display_default as MDisplay, DynamicField_default as MDynamicField, Fieldset_default as MFieldset, FlexLayout_default as MFlexLayout, Form_default as MForm, FormBox_default as MFormBox, FormDialog_default as MFormDialog, FormDrawer_default as MFormDrawer, TableGroupList_default as MGroupList, Hidden_default as MHidden, Link_default as MLink, Number_default as MNumber, NumberRange_default as MNumberRange, Panel_default as MPanel, RadioGroup_default as MRadioGroup, Row_default as MRow, Select_default as MSelect, Switch_default as MSwitch, TableGroupList_default as MTable, TableGroupList_default as MTableGroupList, Tabs_default as MTabs, Text_default as MText, Textarea_default as MTextarea, Time_default as MTime, Timerange_default as MTimerange, adaptFormValidator, clearTypeMatchRules, createForm, createObjectProp, createValues, datetimeFormatter, plugin_default as default, deleteField as deleteFormField, deleteTypeMatchRule, display, filterFunction, getDataByPage, getField as getFormField, getRules, getTypeMatchRule, initValue, registerField as registerFormField, registerTypeMatchRule, registerTypeMatchRules, sortArray, sortChange, stripTabItemsLazy, submitForm, useAddField, validateForm, validateTypeMatch };
+export { FORM_DIFF_CONFIG_KEY, FORM_TYPE_MATCH_VALID_KEY, Cascader_default as MCascader, Checkbox_default as MCheckbox, CheckboxGroup_default as MCheckboxGroup, ColorPicker_default as MColorPicker, Container_default as MContainer, Date_default as MDate, DateTime_default as MDateTime, Daterange_default as MDaterange, Display_default as MDisplay, DynamicField_default as MDynamicField, Fieldset_default as MFieldset, FlexLayout_default as MFlexLayout, Form_default as MForm, FormBox_default as MFormBox, FormDialog_default as MFormDialog, FormDrawer_default as MFormDrawer, TableGroupList_default as MGroupList, Hidden_default as MHidden, Link_default as MLink, Number_default as MNumber, NumberRange_default as MNumberRange, Panel_default as MPanel, RadioGroup_default as MRadioGroup, Row_default as MRow, Select_default as MSelect, Switch_default as MSwitch, TableGroupList_default as MTable, TableGroupList_default as MTableGroupList, Tabs_default as MTabs, Text_default as MText, Textarea_default as MTextarea, Time_default as MTime, Timerange_default as MTimerange, adaptFormValidator, applyExtendState, clearTypeMatchRules, createForm, createObjectProp, createValues, datetimeFormatter, plugin_default as default, deleteField as deleteFormField, deleteTypeMatchRule, display, filterFunction, getDataByPage, getField as getFormField, getRules, getTypeMatchRule, initValue, registerField as registerFormField, registerTypeMatchRule, registerTypeMatchRules, sortArray, sortChange, stripTabItemsLazy, submitForm, useAddField, validateForm, validateTypeMatch };

package/dist/es/plugin.js

@@ -1,9 +1,10 @@
+import { registerTypeMatchRules } from "./utils/typeMatch.js";
 import Hidden_default from "./fields/Hidden.js";
 import { setConfig } from "./utils/config.js";
-import { registerTypeMatchRules } from "./utils/typeMatch.js";
 import Container_default from "./containers/Container.js";
 import Form_default from "./Form.js";
 import FormDialog_default from "./FormDialog.js";
+import FormDrawer_default from "./FormDrawer.js";
 import Fieldset_default from "./containers/Fieldset.js";
 import FlexLayout_default from "./containers/FlexLayout.js";
 import Panel_default from "./containers/Panel.js";
@@ -40,6 +41,7 @@ var plugin_default = { install(app, opt = {}) {
 	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);

package/dist/es/style.css

@@ -16,6 +16,9 @@
 .m-form-container .tmagic-design-form-item.show-before-diff {
   background: #f7dadd;
 }
+.m-form-container .m-form-title-extra {
+  margin-left: 8px;
+}
 
 .m-form-dialog .el-dialog__body {
   padding: 0 !important;
@@ -76,6 +79,10 @@
   margin-bottom: var(--td-comp-margin-xxl);
 }
 
+.m-form-container .m-form-container-expand {
+  text-align: center;
+}
+
 .magic-datetime-picker-popper .el-picker-panel__footer button:first-child {
   display: none;
 }
@@ -85,6 +92,24 @@
   align-items: center;
   width: 100%;
 }
+.m-fields-text--static {
+  gap: 6px;
+  min-height: 32px;
+}
+.m-fields-text--static .m-fields-text__prepend {
+  color: var(--el-text-color-secondary, #909399);
+}
+.m-fields-text--static .m-fields-text__value {
+  color: var(--el-text-color-regular, #606266);
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+.m-fields-text--static .m-fields-text__icon {
+  width: 16px;
+  height: 16px;
+  cursor: pointer;
+}
 
 .m-form-validate__warning {
   color: var(--el-color-warning);
@@ -110,6 +135,16 @@
   outline: none;
 }
 
+.m-container-text.m-fields-title-container .tmagic-design-form-item .el-form-item__label {
+  color: #0f1113;
+  font-weight: 500;
+  font-size: 16px;
+}
+.m-container-text.m-fields-title-container .tmagic-design-form-item {
+  line-height: 24px;
+  margin-bottom: 16px;
+}
+
 .tmagic-form-text-popper[data-popper-placement^=top] > .tmagic-form-text-popper-arrow {
   bottom: -4px;
 }
@@ -148,6 +183,66 @@ div.m-fields-link {
   width: fit-content;
 }
 
+a.magic-admin-link {
+  width: 100%;
+  box-sizing: border-box;
+  border-radius: 4px;
+  border: 1px solid #e6e6e6;
+  background-color: #fafafa;
+  padding: 0 8px;
+  height: 28px;
+  display: inline-flex;
+  gap: 4px;
+  align-items: center;
+  text-decoration: none;
+}
+a.magic-admin-link i {
+  margin-right: 4px;
+}
+
+.m-container-fieldset.no-border-fieldset.fieldset-in-row > fieldset.m-fieldset legend {
+  left: 0;
+}
+.m-container-fieldset.no-border-fieldset > fieldset.m-fieldset {
+  border: 0;
+}
+.m-container-fieldset.no-border-fieldset > fieldset.m-fieldset legend {
+  position: relative;
+  left: -5px;
+  font-size: 16px;
+  font-weight: 500;
+  line-height: 24px;
+  padding: 0;
+}
+.m-container-fieldset.fieldset-in-card-fit {
+  border-bottom: 1px solid #e6e6e6;
+}
+.m-container-fieldset.fieldset-in-card-fit > fieldset.m-fieldset {
+  padding: 16px 0 16px 0 !important;
+  border: 0;
+  margin-top: 0;
+  margin-bottom: 0;
+}
+.m-container-fieldset.fieldset-in-card-fit > fieldset.m-fieldset legend {
+  position: relative;
+  top: 10px;
+  background-color: transparent;
+}
+.m-container-fieldset.fieldset-in-card-fit.fieldset-in-card-fit-last {
+  padding-bottom: 0 !important;
+  border-bottom: 0;
+}
+.m-container-fieldset.fieldset-in-card-fit.fieldset-in-card-fit-first {
+  padding-top: 0 !important;
+}
+.m-container-fieldset.fieldset-in-card-fit:last-child {
+  padding-bottom: 0 !important;
+  border-bottom: 0;
+}
+.m-container-fieldset.fieldset-in-card-fit:first {
+  padding-top: 0 !important;
+}
+
 fieldset.m-fieldset {
   position: relative;
   border: 1px solid rgb(229, 229, 229);
@@ -174,6 +269,9 @@ fieldset.m-fieldset .m-form-tip {
   margin-left: 5px;
 }
 
+.m-fields-group-list .m-fields-group-list-item.tmagic-design-card--flat:last-child {
+  border: 0;
+}
 .m-fields-group-list .el-button--text {
   padding: 0;
   margin-bottom: 7px;
@@ -192,23 +290,23 @@ fieldset.m-fieldset .m-form-tip {
 .m-fields-group-list .m-fields-group-list-item:last-of-type {
   border-bottom: 0;
 }
-.m-fields-group-list .tmagic-design-card .el-card__header {
-  padding: 5px 20px;
-}
-.m-fields-group-list .tmagic-design-card .t-card__header {
-  padding: 5px 0;
+.m-fields-group-list .m-fields-group-list-item .m-fields-group-list-item-header {
+  display: flex;
+  align-items: center;
+  gap: 8px;
 }
 .m-fields-group-list .m-fields-group-list-footer {
   display: flex;
   justify-content: space-between;
   margin-top: 10px;
+  margin-bottom: 16px;
 }
 
 .m-form-panel .el-card__header:hover {
   background: #f2f6fc;
 }
 .m-form-panel .el-card__header a {
-  color: #409eff;
+  color: var(--el-color-primary, #409eff);
 }
 .m-form-panel .el-card__body {
   padding: 10px;
@@ -291,8 +389,8 @@ fieldset.m-fieldset .m-form-tip {
   margin-right: auto;
   min-width: 50px;
   outline: none;
-  border-color: #409eff;
-  color: #409eff;
+  border-color: var(--el-color-primary, #409eff);
+  color: var(--el-color-primary, #409eff);
   width: 10px;
 }
 .magic-form-dynamic-tab .el-tabs__header.is-top .el-tabs__new-tab::before {
@@ -329,4 +427,20 @@ fieldset.m-fieldset .m-form-tip {
   display: flex;
   align-items: center;
   justify-content: space-between;
+}
+
+.m-fields-radio-group__option {
+  display: flex;
+  align-items: center;
+}
+
+.m-fields-radio-group__text {
+  display: inline-block;
+  vertical-align: middle;
+  white-space: pre-line;
+  line-height: 20px;
+}
+
+.m-fields-radio-group__icon_with_text {
+  margin-right: 8px;
 }/*$vite$:1*/

package/dist/es/submitForm.js

@@ -1,3 +1,4 @@
+import { applyExtendState } from "./utils/form.js";
 import Form_default from "./Form.js";
 import { createApp, defineComponent, h, nextTick, ref, watch } from "vue";
 //#region packages/form/src/submitForm.ts
@@ -52,14 +53,7 @@ var mountFormInstance = (options) => {
 						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);
 				}, {

package/dist/es/utils/config.js

@@ -1,7 +1,10 @@
+import { ref } from "vue";
 //#region packages/form/src/utils/config.ts
 var $MAGIC_FORM = {};
+var isGlobalFlat = ref(false);
 var setConfig = (option) => {
 	$MAGIC_FORM = option;
+	isGlobalFlat.value = option.flat ?? false;
 };
 var getConfig = (key) => $MAGIC_FORM[key];
 var fieldRegistry = /* @__PURE__ */ new Map();
@@ -12,4 +15,4 @@ var registerField = (tagName, component) => {
 var getField = (tagName) => fieldRegistry.get(tagName);
 var deleteField = (tagName) => fieldRegistry.delete(tagName);
 //#endregion
-export { deleteField, getConfig, getField, registerField, setConfig };
+export { deleteField, getConfig, getField, isGlobalFlat, registerField, setConfig };

package/dist/es/utils/form.js

@@ -1,10 +1,10 @@
 import { createTypeMatchValidator } from "./typeMatch.js";
 import { readonly } from "vue";
+import dayjs from "dayjs";
+import utc from "dayjs/plugin/utc";
 import { cloneDeep } from "lodash-es";
 import { getDesignConfig } from "@tmagic/design";
 import { getValueByKeyPath } from "@tmagic/utils";
-import dayjs from "dayjs";
-import utc from "dayjs/plugin/utc";
 //#region packages/form/src/utils/form.ts
 var isTDesignAdapter = () => getDesignConfig("adapterType") === "tdesign-vue-next";
 /**
@@ -203,6 +203,36 @@ var sortChange = (data, { prop, order }) => {
 	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(".");
@@ -212,4 +242,4 @@ var createObjectProp = (prop, key, name) => {
 	return `${[...itemPath, key].join(".")}`;
 };
 //#endregion
-export { adaptFormValidator, createObjectProp, createValues, datetimeFormatter, display, filterFunction, getDataByPage, getRules, initValue, sortArray, sortChange };
+export { adaptFormValidator, applyExtendState, createObjectProp, createValues, datetimeFormatter, display, filterFunction, getDataByPage, getRules, initValue, sortArray, sortChange };

package/dist/es/utils/typeMatch.js

@@ -1,7 +1,7 @@
 import { readonly } from "vue";
+import dayjs from "dayjs";
 import { appendValidateSuggestion } from "@tmagic/design";
 import { getValueByKeyPath, toLine } from "@tmagic/utils";
-import dayjs from "dayjs";
 import customParseFormat from "dayjs/plugin/customParseFormat";
 //#region packages/form/src/utils/typeMatch.ts
 dayjs.extend(customParseFormat);