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

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

@@ -255,16 +255,18 @@ var Container_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ define
 				"data-tmagic-form-item-prop": itemProp.value,
 				class: normalizeClass(`m-form-container m-container-${type.value || ""} ${__props.config.className || ""}${__props.config.tip ? " has-tip" : ""}`),
 				style: normalizeStyle(__props.config.style)
-			}, [type.value === "hidden" ? (openBlock(), createBlock(Hidden_default, {
-				key: 0,
-				name: `${name.value}`,
-				prop: itemProp.value,
-				model: __props.model
-			}, null, 8, [
-				"name",
-				"prop",
-				"model"
-			])) : items.value && !text.value && type.value && display$1.value ? (openBlock(), createBlock(resolveDynamicComponent(tagName.value), mergeProps({ key: 1 }, fieldsProps.value, {
+			}, [type.value === "hidden" ? (openBlock(), createBlock(unref(TMagicFormItem), mergeProps({ key: 0 }, formItemProps.value, { style: { "display": "none" } }), {
+				default: withCtx(() => [createVNode(Hidden_default, {
+					name: `${name.value}`,
+					prop: itemProp.value,
+					model: __props.model
+				}, null, 8, [
+					"name",
+					"prop",
+					"model"
+				])]),
+				_: 1
+			}, 16)) : items.value && !text.value && type.value && display$1.value ? (openBlock(), createBlock(resolveDynamicComponent(tagName.value), mergeProps({ key: 1 }, fieldsProps.value, {
 				model: __props.model,
 				"last-values": __props.lastValues,
 				"is-compare": __props.isCompare,

package/dist/es/index.js

@@ -7,7 +7,7 @@ import { clearTypeMatchRules, deleteTypeMatchRule, getTypeMatchRule, registerTyp
 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 { submitForm, validateForm } from "./submitForm.js";
+import { stripTabItemsLazy, submitForm, validateForm } from "./submitForm.js";
 import FormDialog_default from "./FormDialog.js";
 import FormDrawer_default from "./FormDrawer.js";
 import FormBox_default from "./FormBox.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, 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, 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/submitForm.js

@@ -419,4 +419,4 @@ var validateForm = (options) => {
 	});
 };
 //#endregion
-export { submitForm, validateForm };
+export { stripTabItemsLazy, submitForm, validateForm };

package/dist/es/utils/typeMatch.js

@@ -1,15 +1,15 @@
 import { readonly } from "vue";
 import { appendValidateSuggestion } from "@tmagic/design";
-import { getValueByKeyPath } from "@tmagic/utils";
+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);
 var typeMatchRuleRegistry = /* @__PURE__ */ new Map();
-var normalizeType = (type) => type.replace(/([A-Z])/g, "-$1").toLowerCase();
+var isPromise = (value) => typeof value === "object" && value !== null && typeof value.then === "function";
 /** 注册或覆盖某个字段 type 的 typeMatch 校验规则 */
 var registerTypeMatchRule = (type, validator) => {
-	typeMatchRuleRegistry.set(normalizeType(type), validator);
+	typeMatchRuleRegistry.set(toLine(type), validator);
 };
 /** 批量注册 typeMatch 校验规则 */
 var registerTypeMatchRules = (rules) => {
@@ -18,9 +18,9 @@ var registerTypeMatchRules = (rules) => {
 	});
 };
 /** 获取某个字段 type 的自定义 typeMatch 校验规则 */
-var getTypeMatchRule = (type) => typeMatchRuleRegistry.get(normalizeType(type));
+var getTypeMatchRule = (type) => typeMatchRuleRegistry.get(toLine(type));
 /** 删除某个字段 type 的自定义 typeMatch 校验规则 */
-var deleteTypeMatchRule = (type) => typeMatchRuleRegistry.delete(normalizeType(type));
+var deleteTypeMatchRule = (type) => typeMatchRuleRegistry.delete(toLine(type));
 /** 清空所有自定义 typeMatch 校验规则 */
 var clearTypeMatchRules = () => {
 	typeMatchRuleRegistry.clear();
@@ -124,7 +124,9 @@ var toggleSuggestion = (activeValue, inactiveValue) => `请使用以下某一个
 var resolveFieldDefaultValue = (mForm, props) => {
 	const { defaultValue } = props.config || {};
 	if (typeof defaultValue === "undefined" || defaultValue === "undefined") return void 0;
-	return resolveConfig(mForm, defaultValue, props);
+	const resolvedDefaultValue = resolveConfig(mForm, defaultValue, props);
+	if (isPromise(resolvedDefaultValue)) return;
+	return resolvedDefaultValue;
 };
 var isNumberValue = (value) => typeof value === "number" && !Number.isNaN(value);
 var isStringValue = (value) => typeof value === "string";
@@ -175,12 +177,6 @@ var dateRangeSuggestion = (valueFormat) => {
 	return `请参考以下示例值：["${example}", "${example}"]`;
 };
 var dateValueFormatErrorMessage = (message, valueFormat) => defaultMessage(message, isTimestampValueFormat(valueFormat) ? "值类型应为时间戳数字" : `值格式应为 ${valueFormat}`, dateSuggestion(valueFormat));
-var resolveFieldType = (mForm, props) => {
-	let type = "type" in (props.config || {}) ? props.config.type : "";
-	type = type ? resolveConfig(mForm, type, props) || "" : "";
-	if (type === "form" || type === "container") return "";
-	return normalizeType(type || "") || (props.config?.items ? "" : "text");
-};
 var resolveToggleValues = (config) => {
 	const filterIsNumber = config.filter === "number";
 	const { activeValue: configActiveValue, inactiveValue: configInactiveValue } = config;
@@ -206,11 +202,9 @@ var flattenSelectOptions = (options) => {
 	});
 	return values;
 };
-var resolveOptions = (mForm, props) => {
+var resolveOptions = (props) => {
 	const { options } = props.config || {};
-	if (Array.isArray(options)) return options;
-	if (typeof options === "function") return resolveConfig(mForm, options, props) || [];
-	return [];
+	return Array.isArray(options) ? options : [];
 };
 var includesOptionValue = (optionValues, value) => optionValues.some((item) => Object.is(item, value));
 var collectCascaderLeafValues = (options, result = []) => {
@@ -263,6 +257,7 @@ var cascaderExampleSuggestion = (options, config, valueSeparator, fallbackExampl
 	return `请参考以下示例值：${stringifyExampleValue(example)}`;
 };
 var validateSelectValue = (value, config, optionValues, message) => {
+	if (optionValues.length === 0) return;
 	if (config.allowCreate || config.remote) {
 		if (config.multiple) {
 			if (!Array.isArray(value)) return defaultMessage(message, `${value} 类型应为数组`, optionExampleSuggestion(optionValues, "[\"选项1\", \"选项2\"]", true));
@@ -280,10 +275,12 @@ var validateSelectValue = (value, config, optionValues, message) => {
 	if (isStaticOptions && !includesOptionValue(optionValues, value)) return defaultMessage(message, `${value} 不在可选项中`, optionSuggestion(optionValues));
 };
 var validateCascaderValue = (value, config, props, mForm, message) => {
+	const options = resolveOptions(props);
+	if (!options.length) return;
 	const valueSeparator = resolveConfig(mForm, config.valueSeparator, props);
+	if (isPromise(valueSeparator)) return;
 	const emitPath = config.emitPath !== false;
 	const multiple = Boolean(config.multiple);
-	const options = resolveOptions(mForm, props);
 	const cascaderExample = (fallbackExample) => cascaderExampleSuggestion(options, config, valueSeparator, fallbackExample);
 	if (valueSeparator) {
 		if (typeof value !== "string" && !Array.isArray(value)) return defaultMessage(message, `${value} 类型应为字符串或数组`, cascaderExample("\"选项1,选项2\" 或 [\"选项1\", \"选项2\"]"));
@@ -337,14 +334,16 @@ var validateBuiltinTypeMatch = (value, fieldType, mForm, props, message) => {
 		if (!Object.is(value, activeValue) && !Object.is(value, inactiveValue)) return defaultMessage(message, `${value} 不在合法开关值中`, toggleSuggestion(activeValue, inactiveValue));
 		return;
 	}
-	if (fieldType === "select") return validateSelectValue(value, config, flattenSelectOptions(resolveOptions(mForm, props)), message);
+	if (fieldType === "select") return validateSelectValue(value, config, flattenSelectOptions(resolveOptions(props)), message);
 	if (fieldType === "radio-group") {
-		const optionValues = flattenSelectOptions(resolveOptions(mForm, props));
+		const optionValues = flattenSelectOptions(resolveOptions(props));
+		if (optionValues.length === 0) return;
 		if (!includesOptionValue(optionValues, value)) return defaultMessage(message, `${value} 不在可选项中`, optionSuggestion(optionValues));
 		return;
 	}
 	if (fieldType === "checkbox-group") {
-		const optionValues = flattenSelectOptions(resolveOptions(mForm, props));
+		const optionValues = flattenSelectOptions(resolveOptions(props));
+		if (optionValues.length === 0) return;
 		if (!Array.isArray(value)) return defaultMessage(message, `${value} 类型应为数组`, optionExampleSuggestion(optionValues, "[\"选项1\", \"选项2\"]", true));
 		if (value.some((item) => !includesOptionValue(optionValues, item))) return defaultMessage(message, `${value} 不在可选项中`, optionSuggestion(optionValues));
 		return;
@@ -363,7 +362,9 @@ var validateBuiltinTypeMatch = (value, fieldType, mForm, props, message) => {
 };
 var validateTypeMatch = (value, mForm, props, message) => {
 	if (isEmptyValue(value) || isEmptyArray(value)) return;
-	const fieldType = resolveFieldType(mForm, props);
+	const rawFieldType = "type" in (props.config || {}) ? props.config.type : "";
+	if (typeof rawFieldType !== "string" || !rawFieldType) return;
+	const fieldType = toLine(rawFieldType);
 	const customValidator = getTypeMatchRule(fieldType);
 	if (customValidator) return customValidator(value, {
 		fieldType,
@@ -377,10 +378,14 @@ var createTypeMatchValidator = (mForm, props, rule) => {
 	const originalValidator = typeof rule.validator === "function" ? rule.validator : void 0;
 	return (asyncValidatorRule, value, callback, source, options) => {
 		const actualValue = props.config?.names ? props.model : value;
-		const error = validateTypeMatch(actualValue, mForm, props, rule.message);
-		if (error) {
-			callback(new Error(error));
-			return;
+		try {
+			const error = validateTypeMatch(actualValue, mForm, props, rule.message);
+			if (error) {
+				callback(new Error(error));
+				return;
+			}
+		} catch (error) {
+			console.error(error);
 		}
 		if (originalValidator) return originalValidator({
 			rule: asyncValidatorRule,

package/dist/tmagic-form.umd.cjs

@@ -2769,10 +2769,10 @@
 	//#region packages/form/src/utils/typeMatch.ts
 	dayjs.default.extend(dayjs_plugin_customParseFormat.default);
 	var typeMatchRuleRegistry = /* @__PURE__ */ new Map();
-	var normalizeType = (type) => type.replace(/([A-Z])/g, "-$1").toLowerCase();
+	var isPromise = (value) => typeof value === "object" && value !== null && typeof value.then === "function";
 	/** 注册或覆盖某个字段 type 的 typeMatch 校验规则 */
 	var registerTypeMatchRule = (type, validator) => {
-		typeMatchRuleRegistry.set(normalizeType(type), validator);
+		typeMatchRuleRegistry.set((0, _tmagic_utils.toLine)(type), validator);
 	};
 	/** 批量注册 typeMatch 校验规则 */
 	var registerTypeMatchRules = (rules) => {
@@ -2781,9 +2781,9 @@
 		});
 	};
 	/** 获取某个字段 type 的自定义 typeMatch 校验规则 */
-	var getTypeMatchRule = (type) => typeMatchRuleRegistry.get(normalizeType(type));
+	var getTypeMatchRule = (type) => typeMatchRuleRegistry.get((0, _tmagic_utils.toLine)(type));
 	/** 删除某个字段 type 的自定义 typeMatch 校验规则 */
-	var deleteTypeMatchRule = (type) => typeMatchRuleRegistry.delete(normalizeType(type));
+	var deleteTypeMatchRule = (type) => typeMatchRuleRegistry.delete((0, _tmagic_utils.toLine)(type));
 	/** 清空所有自定义 typeMatch 校验规则 */
 	var clearTypeMatchRules = () => {
 		typeMatchRuleRegistry.clear();
@@ -2887,7 +2887,9 @@
 	var resolveFieldDefaultValue = (mForm, props) => {
 		const { defaultValue } = props.config || {};
 		if (typeof defaultValue === "undefined" || defaultValue === "undefined") return void 0;
-		return resolveConfig(mForm, defaultValue, props);
+		const resolvedDefaultValue = resolveConfig(mForm, defaultValue, props);
+		if (isPromise(resolvedDefaultValue)) return;
+		return resolvedDefaultValue;
 	};
 	var isNumberValue = (value) => typeof value === "number" && !Number.isNaN(value);
 	var isStringValue = (value) => typeof value === "string";
@@ -2938,12 +2940,6 @@
 		return `请参考以下示例值：["${example}", "${example}"]`;
 	};
 	var dateValueFormatErrorMessage = (message, valueFormat) => defaultMessage(message, isTimestampValueFormat(valueFormat) ? "值类型应为时间戳数字" : `值格式应为 ${valueFormat}`, dateSuggestion(valueFormat));
-	var resolveFieldType = (mForm, props) => {
-		let type = "type" in (props.config || {}) ? props.config.type : "";
-		type = type ? resolveConfig(mForm, type, props) || "" : "";
-		if (type === "form" || type === "container") return "";
-		return normalizeType(type || "") || (props.config?.items ? "" : "text");
-	};
 	var resolveToggleValues = (config) => {
 		const filterIsNumber = config.filter === "number";
 		const { activeValue: configActiveValue, inactiveValue: configInactiveValue } = config;
@@ -2969,11 +2965,9 @@
 		});
 		return values;
 	};
-	var resolveOptions = (mForm, props) => {
+	var resolveOptions = (props) => {
 		const { options } = props.config || {};
-		if (Array.isArray(options)) return options;
-		if (typeof options === "function") return resolveConfig(mForm, options, props) || [];
-		return [];
+		return Array.isArray(options) ? options : [];
 	};
 	var includesOptionValue = (optionValues, value) => optionValues.some((item) => Object.is(item, value));
 	var collectCascaderLeafValues = (options, result = []) => {
@@ -3026,6 +3020,7 @@
 		return `请参考以下示例值：${stringifyExampleValue(example)}`;
 	};
 	var validateSelectValue = (value, config, optionValues, message) => {
+		if (optionValues.length === 0) return;
 		if (config.allowCreate || config.remote) {
 			if (config.multiple) {
 				if (!Array.isArray(value)) return defaultMessage(message, `${value} 类型应为数组`, optionExampleSuggestion(optionValues, "[\"选项1\", \"选项2\"]", true));
@@ -3043,10 +3038,12 @@
 		if (isStaticOptions && !includesOptionValue(optionValues, value)) return defaultMessage(message, `${value} 不在可选项中`, optionSuggestion(optionValues));
 	};
 	var validateCascaderValue = (value, config, props, mForm, message) => {
+		const options = resolveOptions(props);
+		if (!options.length) return;
 		const valueSeparator = resolveConfig(mForm, config.valueSeparator, props);
+		if (isPromise(valueSeparator)) return;
 		const emitPath = config.emitPath !== false;
 		const multiple = Boolean(config.multiple);
-		const options = resolveOptions(mForm, props);
 		const cascaderExample = (fallbackExample) => cascaderExampleSuggestion(options, config, valueSeparator, fallbackExample);
 		if (valueSeparator) {
 			if (typeof value !== "string" && !Array.isArray(value)) return defaultMessage(message, `${value} 类型应为字符串或数组`, cascaderExample("\"选项1,选项2\" 或 [\"选项1\", \"选项2\"]"));
@@ -3100,14 +3097,16 @@
 			if (!Object.is(value, activeValue) && !Object.is(value, inactiveValue)) return defaultMessage(message, `${value} 不在合法开关值中`, toggleSuggestion(activeValue, inactiveValue));
 			return;
 		}
-		if (fieldType === "select") return validateSelectValue(value, config, flattenSelectOptions(resolveOptions(mForm, props)), message);
+		if (fieldType === "select") return validateSelectValue(value, config, flattenSelectOptions(resolveOptions(props)), message);
 		if (fieldType === "radio-group") {
-			const optionValues = flattenSelectOptions(resolveOptions(mForm, props));
+			const optionValues = flattenSelectOptions(resolveOptions(props));
+			if (optionValues.length === 0) return;
 			if (!includesOptionValue(optionValues, value)) return defaultMessage(message, `${value} 不在可选项中`, optionSuggestion(optionValues));
 			return;
 		}
 		if (fieldType === "checkbox-group") {
-			const optionValues = flattenSelectOptions(resolveOptions(mForm, props));
+			const optionValues = flattenSelectOptions(resolveOptions(props));
+			if (optionValues.length === 0) return;
 			if (!Array.isArray(value)) return defaultMessage(message, `${value} 类型应为数组`, optionExampleSuggestion(optionValues, "[\"选项1\", \"选项2\"]", true));
 			if (value.some((item) => !includesOptionValue(optionValues, item))) return defaultMessage(message, `${value} 不在可选项中`, optionSuggestion(optionValues));
 			return;
@@ -3126,7 +3125,9 @@
 	};
 	var validateTypeMatch = (value, mForm, props, message) => {
 		if (isEmptyValue(value) || isEmptyArray(value)) return;
-		const fieldType = resolveFieldType(mForm, props);
+		const rawFieldType = "type" in (props.config || {}) ? props.config.type : "";
+		if (typeof rawFieldType !== "string" || !rawFieldType) return;
+		const fieldType = (0, _tmagic_utils.toLine)(rawFieldType);
 		const customValidator = getTypeMatchRule(fieldType);
 		if (customValidator) return customValidator(value, {
 			fieldType,
@@ -3140,10 +3141,14 @@
 		const originalValidator = typeof rule.validator === "function" ? rule.validator : void 0;
 		return (asyncValidatorRule, value, callback, source, options) => {
 			const actualValue = props.config?.names ? props.model : value;
-			const error = validateTypeMatch(actualValue, mForm, props, rule.message);
-			if (error) {
-				callback(new Error(error));
-				return;
+			try {
+				const error = validateTypeMatch(actualValue, mForm, props, rule.message);
+				if (error) {
+					callback(new Error(error));
+					return;
+				}
+			} catch (error) {
+				console.error(error);
 			}
 			if (originalValidator) return originalValidator({
 				rule: asyncValidatorRule,
@@ -3668,16 +3673,18 @@
 					"data-tmagic-form-item-prop": itemProp.value,
 					class: (0, vue.normalizeClass)(`m-form-container m-container-${type.value || ""} ${__props.config.className || ""}${__props.config.tip ? " has-tip" : ""}`),
 					style: (0, vue.normalizeStyle)(__props.config.style)
-				}, [type.value === "hidden" ? ((0, vue.openBlock)(), (0, vue.createBlock)(Hidden_default, {
-					key: 0,
-					name: `${name.value}`,
-					prop: itemProp.value,
-					model: __props.model
-				}, null, 8, [
-					"name",
-					"prop",
-					"model"
-				])) : items.value && !text.value && type.value && display$3.value ? ((0, vue.openBlock)(), (0, vue.createBlock)((0, vue.resolveDynamicComponent)(tagName.value), (0, vue.mergeProps)({ key: 1 }, fieldsProps.value, {
+				}, [type.value === "hidden" ? ((0, vue.openBlock)(), (0, vue.createBlock)((0, vue.unref)(_tmagic_design.TMagicFormItem), (0, vue.mergeProps)({ key: 0 }, formItemProps.value, { style: { "display": "none" } }), {
+					default: (0, vue.withCtx)(() => [(0, vue.createVNode)(Hidden_default, {
+						name: `${name.value}`,
+						prop: itemProp.value,
+						model: __props.model
+					}, null, 8, [
+						"name",
+						"prop",
+						"model"
+					])]),
+					_: 1
+				}, 16)) : items.value && !text.value && type.value && display$3.value ? ((0, vue.openBlock)(), (0, vue.createBlock)((0, vue.resolveDynamicComponent)(tagName.value), (0, vue.mergeProps)({ key: 1 }, fieldsProps.value, {
 					model: __props.model,
 					"last-values": __props.lastValues,
 					"is-compare": __props.isCompare,
@@ -9008,6 +9015,7 @@
 	exports.registerTypeMatchRules = registerTypeMatchRules;
 	exports.sortArray = sortArray;
 	exports.sortChange = sortChange;
+	exports.stripTabItemsLazy = stripTabItemsLazy;
 	exports.submitForm = submitForm;
 	exports.useAddField = useAddField;
 	exports.validateForm = validateForm;

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.8.0-beta.12",
+  "version": "1.8.0-beta.13",
   "name": "@tmagic/form",
   "type": "module",
   "sideEffects": [
@@ -52,9 +52,9 @@
   "peerDependencies": {
     "vue": "^3.5.40",
     "typescript": "^6.0.3",
-    "@tmagic/design": "1.8.0-beta.12",
-    "@tmagic/utils": "1.8.0-beta.12",
-    "@tmagic/form-schema": "1.8.0-beta.12"
+    "@tmagic/form-schema": "1.8.0-beta.13",
+    "@tmagic/utils": "1.8.0-beta.13",
+    "@tmagic/design": "1.8.0-beta.13"
   },
   "peerDependenciesMeta": {
     "typescript": {

package/src/containers/Container.vue

@@ -5,7 +5,9 @@
     :class="`m-form-container m-container-${type || ''} ${config.className || ''}${config.tip ? ' has-tip' : ''}`"
     :style="config.style"
   >
-    <MHidden v-if="type === 'hidden'" :name="`${name}`" :prop="itemProp" :model="model"></MHidden>
+    <TMagicFormItem v-if="type === 'hidden'" v-bind="formItemProps" style="display: none">
+      <MHidden :name="`${name}`" :prop="itemProp" :model="model"></MHidden>
+    </TMagicFormItem>
 
     <component
       v-else-if="items && !text && type && display"

package/src/submitForm.ts

@@ -590,7 +590,7 @@ const removeTabItemsLazy = (node: any): void => {
  * 无法校验到这些标签页内的字段。校验场景需要一次性渲染全部字段，故在此统一去除 lazy。
  * 处理基于深拷贝，不会污染调用方传入的原始 config。
  */
-const stripTabItemsLazy = (config: FormConfig): FormConfig => {
+export const stripTabItemsLazy = (config: FormConfig): FormConfig => {
   const cloned = cloneConfigValue(config);
   removeTabItemsLazy(cloned);
   return cloned;

package/src/utils/typeMatch.ts

@@ -21,7 +21,7 @@ import dayjs from 'dayjs';
 import customParseFormat from 'dayjs/plugin/customParseFormat';
 
 import { appendValidateSuggestion } from '@tmagic/design';
-import { getValueByKeyPath } from '@tmagic/utils';
+import { getValueByKeyPath, toLine } from '@tmagic/utils';
 
 import type { CascaderOption, FormState, Rule } from '../schema';
 
@@ -44,11 +44,12 @@ export type TypeMatchValidator = (value: any, context: TypeMatchValidateContext)
 
 const typeMatchRuleRegistry = new Map<string, TypeMatchValidator>();
 
-const normalizeType = (type: string) => type.replace(/([A-Z])/g, '-$1').toLowerCase();
+const isPromise = (value: any): value is Promise<unknown> =>
+  typeof value === 'object' && value !== null && typeof value.then === 'function';
 
 /** 注册或覆盖某个字段 type 的 typeMatch 校验规则 */
 export const registerTypeMatchRule = (type: string, validator: TypeMatchValidator): void => {
-  typeMatchRuleRegistry.set(normalizeType(type), validator);
+  typeMatchRuleRegistry.set(toLine(type), validator);
 };
 
 /** 批量注册 typeMatch 校验规则 */
@@ -60,10 +61,10 @@ export const registerTypeMatchRules = (rules: Record<string, TypeMatchValidator>
 
 /** 获取某个字段 type 的自定义 typeMatch 校验规则 */
 export const getTypeMatchRule = (type: string): TypeMatchValidator | undefined =>
-  typeMatchRuleRegistry.get(normalizeType(type));
+  typeMatchRuleRegistry.get(toLine(type));
 
 /** 删除某个字段 type 的自定义 typeMatch 校验规则 */
-export const deleteTypeMatchRule = (type: string): boolean => typeMatchRuleRegistry.delete(normalizeType(type));
+export const deleteTypeMatchRule = (type: string): boolean => typeMatchRuleRegistry.delete(toLine(type));
 
 /** 清空所有自定义 typeMatch 校验规则 */
 export const clearTypeMatchRules = (): void => {
@@ -182,7 +183,12 @@ const toggleSuggestion = (activeValue: any, inactiveValue: any): string =>
 const resolveFieldDefaultValue = (mForm: FormState | undefined, props: any): any => {
   const { defaultValue } = props.config || {};
   if (typeof defaultValue === 'undefined' || defaultValue === 'undefined') return undefined;
-  return resolveConfig(mForm, defaultValue, props);
+  const resolvedDefaultValue = resolveConfig(mForm, defaultValue, props);
+  // resolveConfig 返回 Promise（如 defaultValue 为异步函数）时无法同步获取默认值，回退到通用示例
+  if (isPromise(resolvedDefaultValue)) {
+    return undefined;
+  }
+  return resolvedDefaultValue;
 };
 
 const isNumberValue = (value: any) => typeof value === 'number' && !Number.isNaN(value);
@@ -271,13 +277,6 @@ const dateValueFormatErrorMessage = (message: string | undefined, valueFormat: s
     dateSuggestion(valueFormat),
   );
 
-const resolveFieldType = (mForm: FormState | undefined, props: any): string => {
-  let type = 'type' in (props.config || {}) ? props.config.type : '';
-  type = type ? resolveConfig<string>(mForm, type, props) || '' : '';
-  if (type === 'form' || type === 'container') return '';
-  return normalizeType(type || '') || (props.config?.items ? '' : 'text');
-};
-
 const resolveToggleValues = (config: any) => {
   const filterIsNumber = config.filter === 'number';
   const { activeValue: configActiveValue, inactiveValue: configInactiveValue } = config;
@@ -317,13 +316,9 @@ const flattenSelectOptions = (options: any[]): any[] => {
   return values;
 };
 
-const resolveOptions = (mForm: FormState | undefined, props: any): any[] => {
+const resolveOptions = (props: any): any[] => {
   const { options } = props.config || {};
-  if (Array.isArray(options)) return options;
-  if (typeof options === 'function') {
-    return resolveConfig(mForm, options, props) || [];
-  }
-  return [];
+  return Array.isArray(options) ? options : [];
 };
 
 const includesOptionValue = (optionValues: any[], value: any) => optionValues.some((item) => Object.is(item, value));
@@ -404,6 +399,10 @@ const validateSelectValue = (
   optionValues: any[],
   message: string | undefined,
 ): string | undefined => {
+  if (optionValues.length === 0) {
+    return undefined;
+  }
+
   if (config.allowCreate || config.remote) {
     if (config.multiple) {
       if (!Array.isArray(value)) {
@@ -456,10 +455,19 @@ const validateCascaderValue = (
   mForm: FormState | undefined,
   message: string | undefined,
 ): string | undefined => {
+  const options = resolveOptions(props) as CascaderOption[];
+
+  if (!options.length) {
+    return;
+  }
+
   const valueSeparator = resolveConfig<string | undefined>(mForm, config.valueSeparator, props);
+  // resolveConfig 返回 Promise（如 valueSeparator 为异步函数）时无法同步确定分隔符，跳过校验
+  if (isPromise(valueSeparator)) {
+    return undefined;
+  }
   const emitPath = config.emitPath !== false;
   const multiple = Boolean(config.multiple);
-  const options = resolveOptions(mForm, props) as CascaderOption[];
   const cascaderExample = (fallbackExample: string) =>
     cascaderExampleSuggestion(options, config, valueSeparator, fallbackExample);
 
@@ -603,12 +611,17 @@ const validateBuiltinTypeMatch = (
   }
 
   if (fieldType === 'select') {
-    const optionValues = flattenSelectOptions(resolveOptions(mForm, props));
+    const optionValues = flattenSelectOptions(resolveOptions(props));
     return validateSelectValue(value, config, optionValues, message);
   }
 
   if (fieldType === 'radio-group') {
-    const optionValues = flattenSelectOptions(resolveOptions(mForm, props));
+    const optionValues = flattenSelectOptions(resolveOptions(props));
+
+    if (optionValues.length === 0) {
+      return undefined;
+    }
+
     if (!includesOptionValue(optionValues, value)) {
       return defaultMessage(message, `${value} 不在可选项中`, optionSuggestion(optionValues));
     }
@@ -616,7 +629,12 @@ const validateBuiltinTypeMatch = (
   }
 
   if (fieldType === 'checkbox-group') {
-    const optionValues = flattenSelectOptions(resolveOptions(mForm, props));
+    const optionValues = flattenSelectOptions(resolveOptions(props));
+
+    if (optionValues.length === 0) {
+      return undefined;
+    }
+
     if (!Array.isArray(value)) {
       return defaultMessage(
         message,
@@ -679,7 +697,14 @@ export const validateTypeMatch = (
     return undefined;
   }
 
-  const fieldType = resolveFieldType(mForm, props);
+  const rawFieldType = 'type' in (props.config || {}) ? props.config.type : '';
+  if (typeof rawFieldType !== 'string' || !rawFieldType) {
+    return;
+  }
+
+  // 统一将驼峰形式（如 radioGroup）归一化为连字符形式（radio-group），与内置规则的 key 保持一致
+  const fieldType = toLine(rawFieldType);
+
   const customValidator = getTypeMatchRule(fieldType);
 
   // 自定义规则优先：可覆盖内置规则，也可为业务自定义字段 type 扩展校验
@@ -695,11 +720,15 @@ export const createTypeMatchValidator = (mForm: FormState | undefined, props: an
 
   return (asyncValidatorRule: any, value: any, callback: Function, source: any, options: any) => {
     const actualValue = props.config?.names ? props.model : value;
-    const error = validateTypeMatch(actualValue, mForm, props, rule.message);
+    try {
+      const error = validateTypeMatch(actualValue, mForm, props, rule.message);
 
-    if (error) {
-      callback(new Error(error));
-      return;
+      if (error) {
+        callback(new Error(error));
+        return;
+      }
+    } catch (error) {
+      console.error(error);
     }
 
     if (originalValidator) {

package/types/index.d.ts

@@ -200,6 +200,14 @@ interface ValidateFormOptions {
   debug?: boolean;
   typeMatchValid?: boolean;
 }
+/**
+ * 返回一份去除了 tab 标签页 lazy 的配置副本。
+ *
+ * tab 容器开启 lazy 时，非激活标签页的内容不会渲染，导致 validateForm 静默挂载后
+ * 无法校验到这些标签页内的字段。校验场景需要一次性渲染全部字段，故在此统一去除 lazy。
+ * 处理基于深拷贝，不会污染调用方传入的原始 config。
+ */
+declare const stripTabItemsLazy: (config: schema_d_exports.FormConfig) => schema_d_exports.FormConfig;
 /**
  * 以命令式方式对一份「表单配置 + 值」做一次静默校验，**不依赖也不影响任何已渲染的表单**。
  *
@@ -2138,8 +2146,8 @@ declare const _default$31: {
   install(app: App, opt?: FormInstallOptions): void;
 };
 declare namespace index_d_exports {
-  export { ChangeRecord, ContainerChangeEventData, FORM_DIFF_CONFIG_KEY, FORM_TYPE_MATCH_VALID_KEY, FormDiffConfig, FormInstallOptions, FormLabelSlotProps, FormSlots, _default as MCascader, _default$1 as MCheckbox, _default$2 as MCheckboxGroup, _default$3 as MColorPicker, _default$4 as MContainer, _default$5 as MDate, _default$6 as MDateTime, _default$7 as MDaterange, _default$8 as MDisplay, _default$9 as MDynamicField, _default$10 as MFieldset, _default$11 as MFlexLayout, _default$12 as MForm, _default$13 as MFormBox, _default$14 as MFormDialog, _default$15 as MFormDrawer, _default$16 as MGroupList, _default$17 as MHidden, _default$18 as MLink, _default$19 as MNumber, _default$20 as MNumberRange, _default$21 as MPanel, _default$22 as MRadioGroup, _default$23 as MRow, _default$24 as MSelect, _default$25 as MSwitch, _default$16 as MTable, _default$16 as MTableGroupList, _default$26 as MTabs, _default$27 as MText, _default$28 as MTextarea, _default$29 as MTime, _default$30 as MTimerange, SubmitFormOptions, SubmitFormResult, TypeMatchValidateContext, TypeMatchValidator, ValidateError, ValidateFormOptions, adaptFormValidator, clearTypeMatchRules, createForm, createObjectProp, createValues, datetimeFormatter, _default$31 as default, deleteField as deleteFormField, deleteTypeMatchRule, display, filterFunction, getDataByPage, getField as getFormField, getRules, getTypeMatchRule, initValue, registerField as registerFormField, registerTypeMatchRule, registerTypeMatchRules, sortArray, sortChange, submitForm, useAddField, validateForm, validateTypeMatch };
+  export { ChangeRecord, ContainerChangeEventData, FORM_DIFF_CONFIG_KEY, FORM_TYPE_MATCH_VALID_KEY, FormDiffConfig, FormInstallOptions, FormLabelSlotProps, FormSlots, _default as MCascader, _default$1 as MCheckbox, _default$2 as MCheckboxGroup, _default$3 as MColorPicker, _default$4 as MContainer, _default$5 as MDate, _default$6 as MDateTime, _default$7 as MDaterange, _default$8 as MDisplay, _default$9 as MDynamicField, _default$10 as MFieldset, _default$11 as MFlexLayout, _default$12 as MForm, _default$13 as MFormBox, _default$14 as MFormDialog, _default$15 as MFormDrawer, _default$16 as MGroupList, _default$17 as MHidden, _default$18 as MLink, _default$19 as MNumber, _default$20 as MNumberRange, _default$21 as MPanel, _default$22 as MRadioGroup, _default$23 as MRow, _default$24 as MSelect, _default$25 as MSwitch, _default$16 as MTable, _default$16 as MTableGroupList, _default$26 as MTabs, _default$27 as MText, _default$28 as MTextarea, _default$29 as MTime, _default$30 as MTimerange, SubmitFormOptions, SubmitFormResult, TypeMatchValidateContext, TypeMatchValidator, ValidateError, ValidateFormOptions, adaptFormValidator, clearTypeMatchRules, createForm, createObjectProp, createValues, datetimeFormatter, _default$31 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 };
 }
 declare const createForm: <T extends [] = []>(config: schema_d_exports.FormConfig | T) => schema_d_exports.FormConfig | T;
 //#endregion
-export { ChangeRecord, ContainerChangeEventData, FORM_DIFF_CONFIG_KEY, FORM_TYPE_MATCH_VALID_KEY, FormDiffConfig, type FormInstallOptions, FormLabelSlotProps, FormSlots, _default as MCascader, _default$1 as MCheckbox, _default$2 as MCheckboxGroup, _default$3 as MColorPicker, _default$4 as MContainer, _default$5 as MDate, _default$6 as MDateTime, _default$7 as MDaterange, _default$8 as MDisplay, _default$9 as MDynamicField, _default$10 as MFieldset, _default$11 as MFlexLayout, _default$12 as MForm, _default$13 as MFormBox, _default$14 as MFormDialog, _default$15 as MFormDrawer, _default$16 as MGroupList, _default$16 as MTable, _default$16 as MTableGroupList, _default$17 as MHidden, _default$18 as MLink, _default$19 as MNumber, _default$20 as MNumberRange, _default$21 as MPanel, _default$22 as MRadioGroup, _default$23 as MRow, _default$24 as MSelect, _default$25 as MSwitch, _default$26 as MTabs, _default$27 as MText, _default$28 as MTextarea, _default$29 as MTime, _default$30 as MTimerange, SubmitFormOptions, SubmitFormResult, type TypeMatchValidateContext, type TypeMatchValidator, ValidateError, ValidateFormOptions, adaptFormValidator, clearTypeMatchRules, createForm, createObjectProp, createValues, datetimeFormatter, _default$31 as default, deleteField as deleteFormField, deleteTypeMatchRule, display, filterFunction, getDataByPage, getField as getFormField, getRules, getTypeMatchRule, initValue, registerField as registerFormField, registerTypeMatchRule, registerTypeMatchRules, sortArray, sortChange, submitForm, useAddField, validateForm, validateTypeMatch };
+export { ChangeRecord, ContainerChangeEventData, FORM_DIFF_CONFIG_KEY, FORM_TYPE_MATCH_VALID_KEY, FormDiffConfig, type FormInstallOptions, FormLabelSlotProps, FormSlots, _default as MCascader, _default$1 as MCheckbox, _default$2 as MCheckboxGroup, _default$3 as MColorPicker, _default$4 as MContainer, _default$5 as MDate, _default$6 as MDateTime, _default$7 as MDaterange, _default$8 as MDisplay, _default$9 as MDynamicField, _default$10 as MFieldset, _default$11 as MFlexLayout, _default$12 as MForm, _default$13 as MFormBox, _default$14 as MFormDialog, _default$15 as MFormDrawer, _default$16 as MGroupList, _default$16 as MTable, _default$16 as MTableGroupList, _default$17 as MHidden, _default$18 as MLink, _default$19 as MNumber, _default$20 as MNumberRange, _default$21 as MPanel, _default$22 as MRadioGroup, _default$23 as MRow, _default$24 as MSelect, _default$25 as MSwitch, _default$26 as MTabs, _default$27 as MText, _default$28 as MTextarea, _default$29 as MTime, _default$30 as MTimerange, SubmitFormOptions, SubmitFormResult, type TypeMatchValidateContext, type TypeMatchValidator, ValidateError, ValidateFormOptions, adaptFormValidator, clearTypeMatchRules, createForm, createObjectProp, createValues, datetimeFormatter, _default$31 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 };