@tmagic/form 1.7.8-beta.1 → 1.7.8-beta.3

package/dist/es/Form.vue_vue_type_script_setup_true_lang.js

@@ -140,12 +140,12 @@ var Form_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ defineCom
 				for (const item of configs) {
 					if (item.name === currentPart) {
 						if (remainingParts.length === 0) return typeof item.text === "string" ? item.text : void 0;
-						if (item.items && Array.isArray(item.items)) {
+						if ("items" in item && Array.isArray(item.items)) {
 							const result = findInConfig(item.items, remainingParts);
 							if (result !== void 0) return result;
 						}
 					}
-					if (item.items && Array.isArray(item.items)) {
+					if ("items" in item && Array.isArray(item.items)) {
 						const result = findInConfig(item.items, parts);
 						if (result !== void 0) return result;
 					}

package/dist/es/FormDialog.vue_vue_type_script_setup_true_lang.js

@@ -57,13 +57,13 @@ var FormDialog_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ def
 		const stepActive = ref(1);
 		const bodyHeight = ref(`${document.body.clientHeight - 194}px`);
 		const stepCount = computed(() => {
-			const { length } = props.config;
-			for (let index = 0; index < length; index++) if (props.config[index].type === "step") return props.config[index].items.length;
+			if (!Array.isArray(props.config)) return 0;
+			for (const item of props.config) if ("type" in item && item.type === "step") return item.items.length;
 			return 0;
 		});
 		const hasStep = computed(() => {
-			const { length } = props.config;
-			for (let index = 0; index < length; index++) if (props.config[index].type === "step") return true;
+			if (!Array.isArray(props.config)) return false;
+			for (const item of props.config) if ("type" in item && item.type === "step") return true;
 			return false;
 		});
 		const closeHandler = () => {

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

@@ -52,7 +52,7 @@ var Col_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ defineComp
 					"disabled"
 				])]),
 				_: 1
-			}, 8, ["span"])), [[vShow, display$1.value && __props.config.type !== "hidden"]]);
+			}, 8, ["span"])), [[vShow, display$1.value && "type" in __props.config && __props.config.type !== "hidden"]]);
 		};
 	}
 });

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

@@ -60,7 +60,7 @@ var Container_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ defi
 			return `${n}`;
 		});
 		const type = computed(() => {
-			let { type } = props.config;
+			let type = "type" in props.config ? props.config.type : "";
 			type = type && filterFunction(mForm, type, props);
 			if (type === "form") return "";
 			if (type === "container") return "";
@@ -68,7 +68,6 @@ var Container_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ defi
 		});
 		const tagName = computed(() => {
 			if (type.value === "component" && props.config.component) return props.config.component;
-			if (!getField(type.value || "container")) console.log(type.value, "type.value");
 			return getField(type.value || "container") || `m-${items.value ? "form" : "fields"}-${type.value}`;
 		});
 		const disabled = computed(() => props.disabled || filterFunction(mForm, props.config.disabled, props));

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

@@ -2,6 +2,7 @@ import { useAddField } from "../utils/useAddField.js";
 import { Fragment, computed, createBlock, createCommentVNode, createElementBlock, createElementVNode, createVNode, defineComponent, openBlock, renderList, resolveDynamicComponent, toDisplayString, unref, withCtx } from "vue";
 import { TMagicIcon, TMagicRadio, TMagicRadioButton, TMagicRadioGroup, TMagicTooltip } from "@tmagic/design";
 //#region packages/form/src/fields/RadioGroup.vue?vue&type=script&setup=true&lang.ts
+var _hoisted_1 = { key: 1 };
 var RadioGroup_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ defineComponent({
 	name: "MFormRadioGroup",
 	__name: "RadioGroup",
@@ -55,7 +56,7 @@ var RadioGroup_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ def
 							}, {
 								default: withCtx(() => [(openBlock(), createBlock(resolveDynamicComponent(option.icon)))]),
 								_: 2
-							}, 1032, ["size"])) : createCommentVNode("v-if", true), createElementVNode("span", null, toDisplayString(option.text), 1)])]),
+							}, 1032, ["size"])) : createCommentVNode("v-if", true), option.text ? (openBlock(), createElementBlock("span", _hoisted_1, toDisplayString(option.text), 1)) : createCommentVNode("v-if", true)])]),
 							_: 2
 						}, 1032, ["disabled", "content"])]),
 						_: 2

package/dist/es/utils/form.js

@@ -42,7 +42,8 @@ var setValue = (mForm, value, initValue, item) => {
 var initValueItem = function(mForm, item, initValue, value) {
 	const { items } = item;
 	const { names } = item;
-	const { type, name } = item;
+	const type = "type" in item ? item.type : "";
+	const { name } = item;
 	if (isTableSelect(type) && name) {
 		value[name] = initValue[name] ?? "";
 		return value;
@@ -56,9 +57,10 @@ var initValueItem = function(mForm, item, initValue, value) {
 	if (!name) return createValues(mForm, items, initValue, value);
 	setValue(mForm, value, initValue, item);
 	if (type === "table") {
-		if (item.defautSort) sortChange(value[name], item.defautSort);
-		else if (item.defaultSort) sortChange(value[name], item.defaultSort);
-		if (item.sort && item.sortKey) value[name].sort((a, b) => b[item.sortKey] - a[item.sortKey]);
+		const tableConfig = item;
+		if (tableConfig.defautSort) sortChange(value[name], tableConfig.defautSort);
+		else if (tableConfig.defaultSort) sortChange(value[name], tableConfig.defaultSort);
+		if (tableConfig.sort && tableConfig.sortKey) value[name].sort((a, b) => b[tableConfig.sortKey] - a[tableConfig.sortKey]);
 	}
 	return value;
 };

package/dist/tmagic-form.umd.cjs

@@ -2655,7 +2655,8 @@
 	var initValueItem = function(mForm, item, initValue, value) {
 		const { items } = item;
 		const { names } = item;
-		const { type, name } = item;
+		const type = "type" in item ? item.type : "";
+		const { name } = item;
 		if (isTableSelect(type) && name) {
 			value[name] = initValue[name] ?? "";
 			return value;
@@ -2669,9 +2670,10 @@
 		if (!name) return createValues(mForm, items, initValue, value);
 		setValue(mForm, value, initValue, item);
 		if (type === "table") {
-			if (item.defautSort) sortChange(value[name], item.defautSort);
-			else if (item.defaultSort) sortChange(value[name], item.defaultSort);
-			if (item.sort && item.sortKey) value[name].sort((a, b) => b[item.sortKey] - a[item.sortKey]);
+			const tableConfig = item;
+			if (tableConfig.defautSort) sortChange(value[name], tableConfig.defautSort);
+			else if (tableConfig.defaultSort) sortChange(value[name], tableConfig.defaultSort);
+			if (tableConfig.sort && tableConfig.sortKey) value[name].sort((a, b) => b[tableConfig.sortKey] - a[tableConfig.sortKey]);
 		}
 		return value;
 	};
@@ -2830,7 +2832,7 @@
 	var deleteField = (tagName) => fieldRegistry.delete(tagName);
 	//#endregion
 	//#region packages/form/src/containers/FormLabel.vue?vue&type=script&setup=true&lang.ts
-	var _hoisted_1$14 = {
+	var _hoisted_1$15 = {
 		key: 0,
 		style: {
 			"display": "inline-flex",
@@ -2853,7 +2855,7 @@
 		},
 		setup(__props) {
 			return (_ctx, _cache) => {
-				return __props.tip ? ((0, vue.openBlock)(), (0, vue.createElementBlock)("span", _hoisted_1$14, [(0, vue.createElementVNode)("span", {
+				return __props.tip ? ((0, vue.openBlock)(), (0, vue.createElementBlock)("span", _hoisted_1$15, [(0, vue.createElementVNode)("span", {
 					innerHTML: __props.type === "checkbox" && !__props.useLabel ? "" : __props.text,
 					title: __props.labelTitle
 				}, null, 8, _hoisted_2$8), __props.tip && (__props.type !== "checkbox" || __props.useLabel) ? ((0, vue.openBlock)(), (0, vue.createBlock)((0, vue.unref)(_tmagic_design.TMagicTooltip), {
@@ -2879,7 +2881,7 @@
 	});
 	//#endregion
 	//#region packages/form/src/containers/Container.vue?vue&type=script&setup=true&lang.ts
-	var _hoisted_1$13 = ["data-tmagic-id", "data-tmagic-form-item-prop"];
+	var _hoisted_1$14 = ["data-tmagic-id", "data-tmagic-form-item-prop"];
 	var _hoisted_2$7 = ["innerHTML"];
 	var _hoisted_3$6 = ["innerHTML"];
 	var _hoisted_4$4 = ["innerHTML"];
@@ -2933,7 +2935,7 @@
 				return `${n}`;
 			});
 			const type = (0, vue.computed)(() => {
-				let { type } = props.config;
+				let type = "type" in props.config ? props.config.type : "";
 				type = type && filterFunction(mForm, type, props);
 				if (type === "form") return "";
 				if (type === "container") return "";
@@ -2941,7 +2943,6 @@
 			});
 			const tagName = (0, vue.computed)(() => {
 				if (type.value === "component" && props.config.component) return props.config.component;
-				if (!getField(type.value || "container")) console.log(type.value, "type.value");
 				return getField(type.value || "container") || `m-${items.value ? "form" : "fields"}-${type.value}`;
 			});
 			const disabled = (0, vue.computed)(() => props.disabled || filterFunction(mForm, props.config.disabled, props));
@@ -3304,7 +3305,7 @@
 				}, {
 					default: (0, vue.withCtx)(() => [(0, vue.createTextVNode)((0, vue.toDisplayString)(expand.value ? "收起配置" : "展开更多配置"), 1)]),
 					_: 1
-				})])) : (0, vue.createCommentVNode)("v-if", true)], 14, _hoisted_1$13);
+				})])) : (0, vue.createCommentVNode)("v-if", true)], 14, _hoisted_1$14);
 			};
 		}
 	});
@@ -3444,12 +3445,12 @@
 					for (const item of configs) {
 						if (item.name === currentPart) {
 							if (remainingParts.length === 0) return typeof item.text === "string" ? item.text : void 0;
-							if (item.items && Array.isArray(item.items)) {
+							if ("items" in item && Array.isArray(item.items)) {
 								const result = findInConfig(item.items, remainingParts);
 								if (result !== void 0) return result;
 							}
 						}
-						if (item.items && Array.isArray(item.items)) {
+						if ("items" in item && Array.isArray(item.items)) {
 							const result = findInConfig(item.items, parts);
 							if (result !== void 0) return result;
 						}
@@ -3536,7 +3537,7 @@
 	});
 	//#endregion
 	//#region packages/form/src/FormDialog.vue?vue&type=script&setup=true&lang.ts
-	var _hoisted_1$12 = { style: { "min-height": "1px" } };
+	var _hoisted_1$13 = { style: { "min-height": "1px" } };
 	//#endregion
 	//#region packages/form/src/FormDialog.vue
 	var FormDialog_default = /* @__PURE__ */ (0, vue.defineComponent)({
@@ -3593,13 +3594,13 @@
 			const stepActive = (0, vue.ref)(1);
 			const bodyHeight = (0, vue.ref)(`${document.body.clientHeight - 194}px`);
 			const stepCount = (0, vue.computed)(() => {
-				const { length } = props.config;
-				for (let index = 0; index < length; index++) if (props.config[index].type === "step") return props.config[index].items.length;
+				if (!Array.isArray(props.config)) return 0;
+				for (const item of props.config) if ("type" in item && item.type === "step") return item.items.length;
 				return 0;
 			});
 			const hasStep = (0, vue.computed)(() => {
-				const { length } = props.config;
-				for (let index = 0; index < length; index++) if (props.config[index].type === "step") return true;
+				if (!Array.isArray(props.config)) return false;
+				for (const item of props.config) if ("type" in item && item.type === "step") return true;
 				return false;
 			});
 			const closeHandler = () => {
@@ -3663,7 +3664,7 @@
 							span: 12,
 							style: { "text-align": "left" }
 						}, {
-							default: (0, vue.withCtx)(() => [(0, vue.createElementVNode)("div", _hoisted_1$12, [(0, vue.renderSlot)(_ctx.$slots, "left")])]),
+							default: (0, vue.withCtx)(() => [(0, vue.createElementVNode)("div", _hoisted_1$13, [(0, vue.renderSlot)(_ctx.$slots, "left")])]),
 							_: 3
 						}), (0, vue.createVNode)((0, vue.unref)(_tmagic_design.TMagicCol), { span: 12 }, {
 							default: (0, vue.withCtx)(() => [(0, vue.renderSlot)(_ctx.$slots, "footer", {}, () => [
@@ -3756,7 +3757,7 @@
 	});
 	//#endregion
 	//#region packages/form/src/FormDrawer.vue?vue&type=script&setup=true&lang.ts
-	var _hoisted_1$11 = { style: { "min-height": "1px" } };
+	var _hoisted_1$12 = { style: { "min-height": "1px" } };
 	//#endregion
 	//#region packages/form/src/FormDrawer.vue
 	var FormDrawer_default = /* @__PURE__ */ (0, vue.defineComponent)({
@@ -3868,7 +3869,7 @@
 							span: 12,
 							style: { "text-align": "left" }
 						}, {
-							default: (0, vue.withCtx)(() => [(0, vue.createElementVNode)("div", _hoisted_1$11, [(0, vue.renderSlot)(_ctx.$slots, "left")])]),
+							default: (0, vue.withCtx)(() => [(0, vue.createElementVNode)("div", _hoisted_1$12, [(0, vue.renderSlot)(_ctx.$slots, "left")])]),
 							_: 3
 						}), (0, vue.createVNode)((0, vue.unref)(_tmagic_design.TMagicCol), { span: 12 }, {
 							default: (0, vue.withCtx)(() => [(0, vue.renderSlot)(_ctx.$slots, "footer", {}, () => [(0, vue.createVNode)((0, vue.unref)(_tmagic_design.TMagicButton), { onClick: handleClose }, {
@@ -4045,7 +4046,7 @@
 	});
 	//#endregion
 	//#region packages/form/src/containers/Fieldset.vue?vue&type=script&setup=true&lang.ts
-	var _hoisted_1$10 = ["innerHTML"];
+	var _hoisted_1$11 = ["innerHTML"];
 	var _hoisted_2$6 = ["innerHTML"];
 	var _hoisted_3$5 = { key: 1 };
 	var _hoisted_4$3 = ["innerHTML"];
@@ -4120,7 +4121,7 @@
 						"false-value": checkboxFalseValue.value,
 						"onUpdate:modelValue": valueChangeHandler
 					}, {
-						default: (0, vue.withCtx)(() => [(0, vue.createElementVNode)("span", { innerHTML: __props.config.legend }, null, 8, _hoisted_1$10), __props.config.extra ? ((0, vue.openBlock)(), (0, vue.createElementBlock)("span", {
+						default: (0, vue.withCtx)(() => [(0, vue.createElementVNode)("span", { innerHTML: __props.config.legend }, null, 8, _hoisted_1$11), __props.config.extra ? ((0, vue.openBlock)(), (0, vue.createElementBlock)("span", {
 							key: 0,
 							innerHTML: __props.config.extra,
 							class: "m-form-tip"
@@ -4257,7 +4258,7 @@
 	});
 	//#endregion
 	//#region packages/form/src/containers/Panel.vue?vue&type=script&setup=true&lang.ts
-	var _hoisted_1$9 = { style: {
+	var _hoisted_1$10 = { style: {
 		"width": "100%",
 		"display": "flex",
 		"align-items": "center"
@@ -4309,7 +4310,7 @@
 					class: "box-card m-form-panel",
 					"body-style": { display: expand.value ? "block" : "none" }
 				}, {
-					header: (0, vue.withCtx)(() => [(0, vue.createElementVNode)("div", _hoisted_1$9, [
+					header: (0, vue.withCtx)(() => [(0, vue.createElementVNode)("div", _hoisted_1$10, [
 						(0, vue.createVNode)((0, vue.unref)(_tmagic_design.TMagicButton), {
 							style: { "padding": "0" },
 							link: "",
@@ -4432,7 +4433,7 @@
 						"disabled"
 					])]),
 					_: 1
-				}, 8, ["span"])), [[vue.vShow, display$2.value && __props.config.type !== "hidden"]]);
+				}, 8, ["span"])), [[vue.vShow, display$2.value && "type" in __props.config && __props.config.type !== "hidden"]]);
 			};
 		}
 	});
@@ -5230,7 +5231,7 @@
 	};
 	//#endregion
 	//#region packages/form/src/table/Table.vue?vue&type=script&setup=true&lang.ts
-	var _hoisted_1$8 = ["innerHTML"];
+	var _hoisted_1$9 = ["innerHTML"];
 	var _hoisted_2$4 = { style: {
 		"display": "flex",
 		"justify-content": "space-between",
@@ -5330,7 +5331,7 @@
 						key: 0,
 						style: { "color": "rgba(0, 0, 0, 0.45)" },
 						innerHTML: __props.config.extra
-					}, null, 8, _hoisted_1$8)) : (0, vue.createCommentVNode)("v-if", true),
+					}, null, 8, _hoisted_1$9)) : (0, vue.createCommentVNode)("v-if", true),
 					(0, vue.createVNode)((0, vue.unref)(_tmagic_design.TMagicTooltip), {
 						content: "拖拽可排序",
 						placement: "left-start",
@@ -5452,7 +5453,7 @@
 	});
 	//#endregion
 	//#region packages/form/src/containers/GroupListItem.vue?vue&type=script&setup=true&lang.ts
-	var _hoisted_1$7 = ["innerHTML"];
+	var _hoisted_1$8 = ["innerHTML"];
 	var _hoisted_2$3 = { style: {
 		"text-align": "right",
 		"margin-top": "20px"
@@ -5546,7 +5547,7 @@
 							default: (0, vue.withCtx)(() => [(0, vue.createVNode)((0, vue.unref)(_tmagic_design.TMagicIcon), null, {
 								default: (0, vue.withCtx)(() => [expand.value ? ((0, vue.openBlock)(), (0, vue.createBlock)((0, vue.unref)(_element_plus_icons_vue.CaretBottom), { key: 0 })) : ((0, vue.openBlock)(), (0, vue.createBlock)((0, vue.unref)(_element_plus_icons_vue.CaretRight), { key: 1 }))]),
 								_: 1
-							}), (0, vue.createElementVNode)("span", { innerHTML: title.value }, null, 8, _hoisted_1$7)]),
+							}), (0, vue.createElementVNode)("span", { innerHTML: title.value }, null, 8, _hoisted_1$8)]),
 							_: 1
 						}, 8, ["disabled"]),
 						(0, vue.withDirectives)((0, vue.createVNode)((0, vue.unref)(_tmagic_design.TMagicButton), {
@@ -5669,7 +5670,7 @@
 	});
 	//#endregion
 	//#region packages/form/src/containers/GroupList.vue?vue&type=script&setup=true&lang.ts
-	var _hoisted_1$6 = { class: "m-fields-group-list" };
+	var _hoisted_1$7 = { class: "m-fields-group-list" };
 	var _hoisted_2$2 = ["innerHTML"];
 	var _hoisted_3$1 = {
 		key: 1,
@@ -5762,7 +5763,7 @@
 			const onAddDiffCount = () => emit("addDiffCount");
 			const getLastValues = (item, index) => item?.[index] || {};
 			return (_ctx, _cache) => {
-				return (0, vue.openBlock)(), (0, vue.createElementBlock)("div", _hoisted_1$6, [
+				return (0, vue.openBlock)(), (0, vue.createElementBlock)("div", _hoisted_1$7, [
 					__props.config.extra ? ((0, vue.openBlock)(), (0, vue.createElementBlock)("div", {
 						key: 0,
 						innerHTML: __props.config.extra,
@@ -5828,7 +5829,7 @@
 	});
 	//#endregion
 	//#region packages/form/src/fields/Text.vue?vue&type=script&setup=true&lang.ts
-	var _hoisted_1$5 = { class: "m-fields-text" };
+	var _hoisted_1$6 = { class: "m-fields-text" };
 	var _hoisted_2$1 = { key: 1 };
 	var _hoisted_3 = { style: {
 		"display": "flex",
@@ -5972,7 +5973,7 @@
 				instanceRef.value = void 0;
 			};
 			return (_ctx, _cache) => {
-				return (0, vue.openBlock)(), (0, vue.createElementBlock)("div", _hoisted_1$5, [(0, vue.createVNode)((0, vue.unref)(_tmagic_design.TMagicInput), {
+				return (0, vue.openBlock)(), (0, vue.createElementBlock)("div", _hoisted_1$6, [(0, vue.createVNode)((0, vue.unref)(_tmagic_design.TMagicInput), {
 					modelValue: value.value,
 					"onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => value.value = $event),
 					ref_key: "input",
@@ -6099,7 +6100,7 @@
 	});
 	//#endregion
 	//#region packages/form/src/fields/NumberRange.vue?vue&type=script&setup=true&lang.ts
-	var _hoisted_1$4 = { class: "m-fields-number-range" };
+	var _hoisted_1$5 = { class: "m-fields-number-range" };
 	//#endregion
 	//#region packages/form/src/fields/NumberRange.vue
 	var NumberRange_default = /* @__PURE__ */ (0, vue.defineComponent)({
@@ -6139,7 +6140,7 @@
 				emit("change", [props.model[props.name][0], Number(v)]);
 			};
 			return (_ctx, _cache) => {
-				return (0, vue.openBlock)(), (0, vue.createElementBlock)("div", _hoisted_1$4, [
+				return (0, vue.openBlock)(), (0, vue.createElementBlock)("div", _hoisted_1$5, [
 					(0, vue.createVNode)((0, vue.unref)(_tmagic_design.TMagicInput), {
 						modelValue: firstValue.value,
 						"onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => firstValue.value = $event),
@@ -6768,6 +6769,9 @@
 		}
 	});
 	//#endregion
+	//#region packages/form/src/fields/RadioGroup.vue?vue&type=script&setup=true&lang.ts
+	var _hoisted_1$4 = { key: 1 };
+	//#endregion
 	//#region packages/form/src/fields/RadioGroup.vue
 	var RadioGroup_default = /* @__PURE__ */ (0, vue.defineComponent)({
 		name: "MFormRadioGroup",
@@ -6822,7 +6826,7 @@
 								}, {
 									default: (0, vue.withCtx)(() => [((0, vue.openBlock)(), (0, vue.createBlock)((0, vue.resolveDynamicComponent)(option.icon)))]),
 									_: 2
-								}, 1032, ["size"])) : (0, vue.createCommentVNode)("v-if", true), (0, vue.createElementVNode)("span", null, (0, vue.toDisplayString)(option.text), 1)])]),
+								}, 1032, ["size"])) : (0, vue.createCommentVNode)("v-if", true), option.text ? ((0, vue.openBlock)(), (0, vue.createElementBlock)("span", _hoisted_1$4, (0, vue.toDisplayString)(option.text), 1)) : (0, vue.createCommentVNode)("v-if", true)])]),
 								_: 2
 							}, 1032, ["disabled", "content"])]),
 							_: 2

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.7.8-beta.1",
+  "version": "1.7.8-beta.3",
   "name": "@tmagic/form",
   "type": "module",
   "sideEffects": [
@@ -52,9 +52,9 @@
   "peerDependencies": {
     "vue": "^3.5.24",
     "typescript": "^5.9.3",
-    "@tmagic/utils": "1.7.8-beta.1",
-    "@tmagic/form-schema": "1.7.8-beta.1",
-    "@tmagic/design": "1.7.8-beta.1"
+    "@tmagic/design": "1.7.8-beta.3",
+    "@tmagic/utils": "1.7.8-beta.3",
+    "@tmagic/form-schema": "1.7.8-beta.3"
   },
   "peerDependenciesMeta": {
     "typescript": {

package/src/Form.vue

@@ -218,13 +218,13 @@ const getTextByName = (name: string, config: FormConfig = props.config): string
           return typeof item.text === 'string' ? item.text : undefined;
         }
 
-        if (item.items && Array.isArray(item.items)) {
+        if ('items' in item && Array.isArray(item.items)) {
           const result = findInConfig(item.items, remainingParts);
           if (result !== undefined) return result;
         }
       }
 
-      if (item.items && Array.isArray(item.items)) {
+      if ('items' in item && Array.isArray(item.items)) {
         const result = findInConfig(item.items, parts);
         if (result !== undefined) return result;
       }

package/src/FormDialog.vue

@@ -117,19 +117,25 @@ const stepActive = ref(1);
 const bodyHeight = ref(`${document.body.clientHeight - 194}px`);
 
 const stepCount = computed(() => {
-  const { length } = props.config;
-  for (let index = 0; index < length; index++) {
-    if (props.config[index].type === 'step') {
-      return (props.config[index] as StepConfig).items.length;
+  if (!Array.isArray(props.config)) {
+    return 0;
+  }
+
+  for (const item of props.config) {
+    if ('type' in item && item.type === 'step') {
+      return (item as StepConfig).items.length;
     }
   }
   return 0;
 });
 
 const hasStep = computed(() => {
-  const { length } = props.config;
-  for (let index = 0; index < length; index++) {
-    if (props.config[index].type === 'step') {
+  if (!Array.isArray(props.config)) {
+    return false;
+  }
+
+  for (const item of props.config) {
+    if ('type' in item && item.type === 'step') {
       return true;
     }
   }

package/src/containers/Col.vue

@@ -1,5 +1,5 @@
 <template>
-  <TMagicCol v-show="display && config.type !== 'hidden'" :span="span">
+  <TMagicCol v-show="display && 'type' in config && config.type !== 'hidden'" :span="span">
     <Container
       :model="model"
       :lastValues="lastValues"
@@ -21,7 +21,7 @@ import { computed, inject } from 'vue';
 
 import { TMagicCol } from '@tmagic/design';
 
-import type { ChildConfig, ContainerChangeEventData, FormState } from '../schema';
+import type { ContainerChangeEventData, FormItemConfig, FormState } from '../schema';
 import { display as displayFunction } from '../utils/form';
 
 import Container from './Container.vue';
@@ -34,8 +34,8 @@ const props = defineProps<{
   model: any;
   lastValues?: any;
   isCompare?: boolean;
-  config: ChildConfig;
-  labelWidth?: string;
+  config: FormItemConfig;
+  labelWidth?: string | number;
   expandMore?: boolean;
   span?: number;
   size?: string;

package/src/containers/Container.vue

@@ -1,6 +1,6 @@
 <template>
   <div
-    :data-tmagic-id="config.id"
+    :data-tmagic-id="(config as Record<string, any>).id"
     :data-tmagic-form-item-prop="itemProp"
     :class="`m-form-container m-container-${type || ''} ${config.className || ''}${config.tip ? ' has-tip' : ''}`"
     :style="config.style"
@@ -28,7 +28,7 @@
           <FormLabel
             :tip="config.tip"
             :type="type"
-            :use-label="config.useLabel"
+            :use-label="(config as CheckboxConfig).useLabel"
             :label-title="config.labelTitle"
             :text="text"
           ></FormLabel>
@@ -61,7 +61,7 @@
         ></component>
       </TMagicFormItem>
 
-      <TMagicTooltip v-if="config.tip && type === 'checkbox' && !config.useLabel" placement="top">
+      <TMagicTooltip v-if="config.tip && type === 'checkbox' && !(config as CheckboxConfig).useLabel" placement="top">
         <TMagicIcon style="line-height: 40px; margin-left: 5px"><warning-filled /></TMagicIcon>
         <template #content>
           <div v-html="config.tip"></div>
@@ -80,7 +80,7 @@
           <FormLabel
             :tip="config.tip"
             :type="type"
-            :use-label="config.useLabel"
+            :use-label="(config as CheckboxConfig).useLabel"
             :label-title="config.labelTitle"
             :text="text"
           ></FormLabel>
@@ -95,7 +95,7 @@
         <component v-else v-bind="fieldsProps" :is="tagName" :model="lastValues" @change="onChangeHandler"></component>
       </TMagicFormItem>
 
-      <TMagicTooltip v-if="config.tip && type === 'checkbox' && !config.useLabel" placement="top">
+      <TMagicTooltip v-if="config.tip && type === 'checkbox' && !(config as CheckboxConfig).useLabel" placement="top">
         <TMagicIcon style="line-height: 40px; margin-left: 5px"><warning-filled /></TMagicIcon>
         <template #content>
           <div v-html="config.tip"></div>
@@ -112,7 +112,7 @@
           <FormLabel
             :tip="config.tip"
             :type="type"
-            :use-label="config.useLabel"
+            :use-label="(config as CheckboxConfig).useLabel"
             :label-title="config.labelTitle"
             :text="text"
           ></FormLabel>
@@ -127,7 +127,7 @@
         <component v-else v-bind="fieldsProps" :is="tagName" :model="model" @change="onChangeHandler"></component>
       </TMagicFormItem>
 
-      <TMagicTooltip v-if="config.tip && type === 'checkbox' && !config.useLabel" placement="top">
+      <TMagicTooltip v-if="config.tip && type === 'checkbox' && !(config as CheckboxConfig).useLabel" placement="top">
         <TMagicIcon style="line-height: 40px; margin-left: 5px"><warning-filled /></TMagicIcon>
         <template #content>
           <div v-html="config.tip"></div>
@@ -174,9 +174,11 @@ import { getValueByKeyPath } from '@tmagic/utils';
 
 import MHidden from '../fields/Hidden.vue';
 import type {
-  ChildConfig,
+  CheckboxConfig,
+  ComponentConfig,
   ContainerChangeEventData,
   ContainerCommonConfig,
+  FormItemConfig,
   FormState,
   FormValue,
   ToolTipConfigType,
@@ -196,10 +198,10 @@ const props = withDefaults(
     model: FormValue;
     /** 需对比的值（开启对比模式时传入） */
     lastValues?: FormValue;
-    config: ChildConfig;
+    config: FormItemConfig;
     prop?: string;
     disabled?: boolean;
-    labelWidth?: string;
+    labelWidth?: string | number;
     expandMore?: boolean;
     stepActive?: string | number;
     size?: string;
@@ -251,7 +253,7 @@ const itemProp = computed(() => {
 });
 
 const type = computed((): string => {
-  let { type } = props.config;
+  let type = 'type' in props.config ? props.config.type : '';
   type = type && filterFunction<string>(mForm, type, props);
   if (type === 'form') return '';
   if (type === 'container') return '';
@@ -259,13 +261,10 @@ const type = computed((): string => {
 });
 
 const tagName = computed(() => {
-  if (type.value === 'component' && props.config.component) {
-    return props.config.component;
+  if (type.value === 'component' && (props.config as ComponentConfig).component) {
+    return (props.config as ComponentConfig).component;
   }
 
-  if (!getField(type.value || 'container')) {
-    console.log(type.value, 'type.value');
-  }
   return getField(type.value || 'container') || `m-${items.value ? 'form' : 'fields'}-${type.value}`;
 });
 
@@ -305,7 +304,7 @@ const fieldsProps = computed(() => ({
   name: name.value,
   disabled: disabled.value,
   prop: itemProp.value,
-  key: props.config[mForm?.keyProps],
+  key: (props.config as Record<string, any>)[mForm?.keyProps],
   style: props.config.fieldStyle,
 }));
 

package/src/containers/GroupListItem.vue

@@ -144,7 +144,9 @@ const rowConfig = computed(() => ({
   span: props.config.span || 24,
   items: props.config.items,
   labelWidth: props.config.labelWidth,
-  [mForm?.keyProp || '__key']: `${props.config[mForm?.keyProp || '__key']}${String(props.index)}`,
+  [mForm?.keyProp || '__key']: `${(props.config as Record<string, any>)[mForm?.keyProp || '__key']}${String(
+    props.index,
+  )}`,
 }));
 
 const title = computed(() => {

package/src/fields/RadioGroup.vue

@@ -10,7 +10,7 @@
       <TMagicTooltip :disabled="!Boolean(option.tooltip)" placement="top-start" :content="option.tooltip">
         <div>
           <TMagicIcon v-if="option.icon" :size="iconSize"><component :is="option.icon"></component></TMagicIcon>
-          <span>{{ option.text }}</span>
+          <span v-if="option.text">{{ option.text }}</span>
         </div>
       </TMagicTooltip>
     </component>

package/src/fields/Timerange.vue

@@ -21,7 +21,7 @@ import dayjs from 'dayjs';
 
 import { TMagicTimePicker } from '@tmagic/design';
 
-import type { ChangeRecord, DaterangeConfig, FieldProps } from '../schema';
+import type { ChangeRecord, FieldProps, TimerangeConfig } from '../schema';
 import { datetimeFormatter } from '../utils/form';
 import { useAddField } from '../utils/useAddField';
 
@@ -29,7 +29,7 @@ defineOptions({
   name: 'MFormTimeRange',
 });
 
-const props = defineProps<FieldProps<DaterangeConfig>>();
+const props = defineProps<FieldProps<TimerangeConfig>>();
 
 const emit = defineEmits(['change']);
 

package/src/table/useAdd.ts

@@ -1,7 +1,7 @@
 import { computed, inject } from 'vue';
 
 import { tMagicMessage } from '@tmagic/design';
-import type { FormState } from '@tmagic/form-schema';
+import type { FormConfig, FormState } from '@tmagic/form-schema';
 
 import { initValue } from '../utils/form';
 
@@ -86,7 +86,7 @@ export const useAdd = (
       }
 
       inputs = await initValue(mForm, {
-        config: columns,
+        config: columns as FormConfig,
         initValues: inputs,
       });
     }

package/src/table/useTableColumns.ts

@@ -3,7 +3,7 @@ import { WarningFilled } from '@element-plus/icons-vue';
 import { cloneDeep } from 'lodash-es';
 
 import { type TableColumnOptions, TMagicIcon, TMagicTooltip } from '@tmagic/design';
-import type { FormState, TableColumnConfig } from '@tmagic/form-schema';
+import type { FormItemConfig, FormState, TableColumnConfig } from '@tmagic/form-schema';
 
 import Container from '../containers/Container.vue';
 import type { ContainerChangeEventData } from '../schema';
@@ -68,7 +68,7 @@ export const useTableColumns = (
     return `${props.prop}${props.prop ? '.' : ''}${index + 1 + currentPage.value * pageSize.value - 1}`;
   };
 
-  const makeConfig = (config: TableColumnConfig, row: any) => {
+  const makeConfig = (config: TableColumnConfig, row: any): TableColumnConfig => {
     const newConfig = cloneDeep(config);
     if (typeof config.itemsFunction === 'function') {
       newConfig.items = config.itemsFunction(row);
@@ -199,7 +199,7 @@ export const useTableColumns = (
               disabled: props.disabled,
               prop: getProp($index),
               rules: column.rules,
-              config: makeConfig(column, row),
+              config: makeConfig(column, row) as FormItemConfig,
               model: row,
               lastValues: lastData.value[$index],
               isCompare: props.isCompare,

package/src/utils/form.ts

@@ -23,7 +23,7 @@ import { cloneDeep } from 'lodash-es';
 
 import { getValueByKeyPath } from '@tmagic/utils';
 
-import {
+import type {
   ChildConfig,
   ContainerCommonConfig,
   DaterangeConfig,
@@ -34,6 +34,7 @@ import {
   HtmlField,
   Rule,
   SortProp,
+  TableConfig,
   TabPaneConfig,
   TypeFunction,
 } from '../schema';
@@ -118,7 +119,8 @@ const initValueItem = function (
 ) {
   const { items } = item as ContainerCommonConfig;
   const { names } = item as DaterangeConfig;
-  const { type, name } = item as ChildConfig;
+  const type = 'type' in item ? item.type : '';
+  const { name } = item;
 
   if (isTableSelect(type) && name) {
     value[name] = initValue[name] ?? '';
@@ -148,14 +150,15 @@ const initValueItem = function (
   setValue(mForm, value, initValue, item);
 
   if (type === 'table') {
-    if (item.defautSort) {
-      sortChange(value[name], item.defautSort);
-    } else if (item.defaultSort) {
-      sortChange(value[name], item.defaultSort);
+    const tableConfig = item as TableConfig;
+    if (tableConfig.defautSort) {
+      sortChange(value[name], tableConfig.defautSort);
+    } else if (tableConfig.defaultSort) {
+      sortChange(value[name], tableConfig.defaultSort);
     }
 
-    if (item.sort && item.sortKey) {
-      value[name].sort((a: any, b: any) => b[item.sortKey] - a[item.sortKey]);
+    if (tableConfig.sort && tableConfig.sortKey) {
+      value[name].sort((a: any, b: any) => b[tableConfig.sortKey!] - a[tableConfig.sortKey!]);
     }
   }
 
@@ -169,8 +172,8 @@ export const createValues = function (
   value: FormValue = {},
 ) {
   if (Array.isArray(config)) {
-    config.forEach((item: ChildConfig | TabPaneConfig) => {
-      initValueItem(mForm, item, initValue, value);
+    config.forEach((item) => {
+      initValueItem(mForm, item as ChildConfig | TabPaneConfig, initValue, value);
     });
   }
 

package/types/index.d.ts

@@ -917,10 +917,10 @@ type __VLS_WithSlots$2<T, S> = T & {
 type __VLS_Props$26 = {
   /** 表单值 */model: schema_d_exports.FormValue; /** 需对比的值（开启对比模式时传入） */
   lastValues?: schema_d_exports.FormValue;
-  config: schema_d_exports.ChildConfig;
+  config: schema_d_exports.FormItemConfig;
   prop?: string;
   disabled?: boolean;
-  labelWidth?: string;
+  labelWidth?: string | number;
   expandMore?: boolean;
   stepActive?: string | number;
   size?: string; /** 是否开启对比模式 */
@@ -1248,7 +1248,7 @@ declare const __VLS_export$9: _vue_runtime_core0.DefineComponent<__VLS_Props$9,
 declare const _default$7: typeof __VLS_export$9;
 //#endregion
 //#region temp/packages/form/src/fields/Timerange.vue.d.ts
-type __VLS_Props$8 = schema_d_exports.FieldProps<schema_d_exports.DaterangeConfig>;
+type __VLS_Props$8 = schema_d_exports.FieldProps<schema_d_exports.TimerangeConfig>;
 declare const __VLS_export$8: _vue_runtime_core0.DefineComponent<__VLS_Props$8, {}, {}, {}, {}, _vue_runtime_core0.ComponentOptionsMixin, _vue_runtime_core0.ComponentOptionsMixin, {
   change: (...args: any[]) => void;
 }, string, _vue_runtime_core0.PublicProps, Readonly<__VLS_Props$8> & Readonly<{