@tmagic/form 1.7.11 → 1.7.12

package/dist/tmagic-form.umd.cjs

@@ -4689,75 +4689,342 @@
 		}
 	});
 	//#endregion
-	//#region packages/form/src/table/useAdd.ts
-	var useAdd = (props, emit) => {
-		const mForm = (0, vue.inject)("mForm");
-		const newHandler = async (row) => {
-			const modelName = props.name || props.config.name || "";
-			if (props.config.max && props.model[modelName].length >= props.config.max) {
-				_tmagic_design.tMagicMessage.error(`最多新增配置不能超过${props.config.max}条`);
-				return;
-			}
-			if (typeof props.config.beforeAddRow === "function") {
-				if (!await props.config.beforeAddRow(mForm, {
-					model: props.model[modelName],
-					formValue: mForm?.values,
-					prop: props.prop
-				})) return;
-			}
-			const columns = props.config.items;
-			const enumValues = props.config.enum || [];
-			let enumV = [];
-			const { length } = props.model[modelName];
-			const key = props.config.key || "id";
-			let inputs = {};
-			if (enumValues.length) {
-				if (length >= enumValues.length) return;
-				enumV = enumValues.filter((item) => {
-					let i = 0;
-					for (; i < length; i++) if (item[key] === props.model[modelName][i][key]) break;
-					return i === length;
-				});
-				if (enumV.length > 0) inputs = enumV[0];
-			} else if (Array.isArray(row)) columns.forEach((column, index) => {
-				column.name && (inputs[column.name] = row[index]);
+	//#region packages/form/src/containers/GroupListItem.vue?vue&type=script&setup=true&lang.ts
+	var _hoisted_1$9 = ["innerHTML"];
+	var _hoisted_2$4 = { style: {
+		"text-align": "right",
+		"margin-top": "20px"
+	} };
+	var _hoisted_3$3 = ["innerHTML"];
+	//#endregion
+	//#region packages/form/src/containers/GroupListItem.vue
+	var GroupListItem_default = /* @__PURE__ */ (0, vue.defineComponent)({
+		name: "MFormGroupListItem",
+		__name: "GroupListItem",
+		props: {
+			model: {},
+			lastValues: {},
+			isCompare: { type: Boolean },
+			groupModel: {},
+			config: {},
+			labelWidth: {},
+			prop: {},
+			size: {},
+			index: {},
+			disabled: { type: Boolean }
+		},
+		emits: [
+			"swap-item",
+			"remove-item",
+			"change",
+			"addDiffCount",
+			"copy-item"
+		],
+		setup(__props, { emit: __emit }) {
+			const props = __props;
+			const emit = __emit;
+			const mForm = (0, vue.inject)("mForm");
+			const defaultExpandQuantity = props.config.defaultExpandQuantity ?? 7;
+			const expand = (0, vue.ref)(props.config.expandAll || defaultExpandQuantity > props.index);
+			const rowConfig = (0, vue.computed)(() => ({
+				type: "row",
+				span: props.config.span || 24,
+				items: props.config.items,
+				labelWidth: props.config.labelWidth,
+				[mForm?.keyProp || "__key"]: `${props.config[mForm?.keyProp || "__key"]}${String(props.index)}`
+			}));
+			const title = (0, vue.computed)(() => {
+				if (props.config.titleKey && props.model[props.config.titleKey]) return props.model[props.config.titleKey];
+				if (props.config.title) return filterFunction(mForm, props.config.title, props);
+				return `${props.config.titlePrefix || "组"} ${String(props.index + 1)}`;
 			});
-			else {
-				if (typeof props.config.defaultAdd === "function") inputs = await props.config.defaultAdd(mForm, {
-					model: props.model[modelName],
-					prop: props.prop,
-					formValue: mForm?.values
-				});
-				else if (props.config.defaultAdd) inputs = props.config.defaultAdd;
-				inputs = await initValue(mForm, {
-					config: columns,
-					initValues: inputs
-				});
-			}
-			if (props.sortKey && length) inputs[props.sortKey] = props.model[modelName][length - 1][props.sortKey] - 1;
-			emit("change", [...props.model[modelName], inputs], { changeRecords: [{
-				propPath: `${props.prop}.${props.model[modelName].length}`,
-				value: inputs
-			}] });
-		};
-		return { newHandler };
+			const length = (0, vue.computed)(() => props.groupModel?.length || 0);
+			const itemExtra = (0, vue.computed)(() => filterFunction(mForm, props.config.itemExtra, props));
+			const removeHandler = () => emit("remove-item", props.index);
+			const changeHandler = (v, eventData) => {
+				emit("change", props.model, eventData);
+			};
+			const expandHandler = () => {
+				expand.value = !expand.value;
+			};
+			const showDelete = (0, vue.computed)(() => {
+				const deleteFunc = props.config.delete;
+				if (deleteFunc && typeof deleteFunc === "function") return deleteFunc(props.model, props.index, mForm?.values);
+				return true;
+			});
+			const changeOrder = (offset = 0) => emit("swap-item", props.index, props.index + offset);
+			const movable = (0, vue.computed)(() => {
+				const { movable } = props.config;
+				if (movable === void 0) return true;
+				if (typeof movable === "function") return movable(mForm, props.index || 0, props.model, props.groupModel);
+				return movable;
+			});
+			const copyable = (0, vue.computed)(() => filterFunction(mForm, props.config.copyable, props));
+			const onAddDiffCount = () => emit("addDiffCount");
+			const copyHandler = () => {
+				emit("copy-item", props.index);
+			};
+			const moveSpecifyLocationVisible = (0, vue.ref)(false);
+			const moveSpecifyLocationIndex = (0, vue.ref)(1);
+			const moveSpecifyLocationHandler = () => {
+				moveSpecifyLocationVisible.value = false;
+				emit("swap-item", props.index, moveSpecifyLocationIndex.value - 1);
+			};
+			return (_ctx, _cache) => {
+				return (0, vue.openBlock)(), (0, vue.createBlock)((0, vue.unref)(_tmagic_design.TMagicCard), {
+					class: "m-fields-group-list-item",
+					"body-style": { display: expand.value ? "block" : "none" }
+				}, {
+					header: (0, vue.withCtx)(() => [(0, vue.createElementVNode)("div", null, [
+						(0, vue.createVNode)((0, vue.unref)(_tmagic_design.TMagicButton), {
+							link: "",
+							disabled: __props.disabled,
+							onClick: expandHandler
+						}, {
+							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$9)]),
+							_: 1
+						}, 8, ["disabled"]),
+						(0, vue.withDirectives)((0, vue.createVNode)((0, vue.unref)(_tmagic_design.TMagicButton), {
+							type: "danger",
+							size: "small",
+							link: "",
+							icon: (0, vue.unref)(_element_plus_icons_vue.Delete),
+							disabled: __props.disabled,
+							onClick: removeHandler
+						}, null, 8, ["icon", "disabled"]), [[vue.vShow, showDelete.value]]),
+						copyable.value ? ((0, vue.openBlock)(), (0, vue.createBlock)((0, vue.unref)(_tmagic_design.TMagicButton), {
+							key: 0,
+							link: "",
+							size: "small",
+							type: "primary",
+							icon: (0, vue.unref)(_element_plus_icons_vue.DocumentCopy),
+							disabled: __props.disabled,
+							onClick: copyHandler
+						}, {
+							default: (0, vue.withCtx)(() => [..._cache[6] || (_cache[6] = [(0, vue.createTextVNode)("复制", -1)])]),
+							_: 1
+						}, 8, ["icon", "disabled"])) : (0, vue.createCommentVNode)("v-if", true),
+						movable.value ? ((0, vue.openBlock)(), (0, vue.createElementBlock)(vue.Fragment, { key: 1 }, [(0, vue.withDirectives)((0, vue.createVNode)((0, vue.unref)(_tmagic_design.TMagicButton), {
+							link: "",
+							size: "small",
+							disabled: __props.disabled,
+							icon: (0, vue.unref)(_element_plus_icons_vue.CaretTop),
+							onClick: _cache[0] || (_cache[0] = ($event) => changeOrder(-1))
+						}, {
+							default: (0, vue.withCtx)(() => [..._cache[7] || (_cache[7] = [(0, vue.createTextVNode)("上移", -1)])]),
+							_: 1
+						}, 8, ["disabled", "icon"]), [[vue.vShow, __props.index !== 0]]), (0, vue.withDirectives)((0, vue.createVNode)((0, vue.unref)(_tmagic_design.TMagicButton), {
+							link: "",
+							size: "small",
+							disabled: __props.disabled,
+							icon: (0, vue.unref)(_element_plus_icons_vue.CaretBottom),
+							onClick: _cache[1] || (_cache[1] = ($event) => changeOrder(1))
+						}, {
+							default: (0, vue.withCtx)(() => [..._cache[8] || (_cache[8] = [(0, vue.createTextVNode)("下移", -1)])]),
+							_: 1
+						}, 8, ["disabled", "icon"]), [[vue.vShow, __props.index !== length.value - 1]])], 64)) : (0, vue.createCommentVNode)("v-if", true),
+						__props.config.moveSpecifyLocation ? ((0, vue.openBlock)(), (0, vue.createBlock)((0, vue.unref)(_tmagic_design.TMagicPopover), {
+							key: 2,
+							trigger: "click",
+							placement: "top",
+							width: "200",
+							visible: moveSpecifyLocationVisible.value
+						}, {
+							reference: (0, vue.withCtx)(() => [(0, vue.createVNode)((0, vue.unref)(_tmagic_design.TMagicButton), {
+								link: "",
+								size: "small",
+								type: "primary",
+								icon: (0, vue.unref)(_element_plus_icons_vue.Position),
+								disabled: __props.disabled,
+								onClick: _cache[2] || (_cache[2] = ($event) => moveSpecifyLocationVisible.value = true)
+							}, {
+								default: (0, vue.withCtx)(() => [..._cache[9] || (_cache[9] = [(0, vue.createTextVNode)("移动至", -1)])]),
+								_: 1
+							}, 8, ["icon", "disabled"])]),
+							default: (0, vue.withCtx)(() => [(0, vue.createElementVNode)("div", null, [(0, vue.createElementVNode)("div", null, [
+								_cache[10] || (_cache[10] = (0, vue.createTextVNode)(" 第", -1)),
+								(0, vue.createVNode)((0, vue.unref)(_tmagic_design.TMagicInputNumber), {
+									style: { "margin": "0 5px" },
+									modelValue: moveSpecifyLocationIndex.value,
+									"onUpdate:modelValue": _cache[3] || (_cache[3] = ($event) => moveSpecifyLocationIndex.value = $event),
+									size: "small",
+									min: 1,
+									disabled: __props.disabled
+								}, null, 8, ["modelValue", "disabled"]),
+								_cache[11] || (_cache[11] = (0, vue.createTextVNode)("行 ", -1))
+							]), (0, vue.createElementVNode)("div", _hoisted_2$4, [(0, vue.createVNode)((0, vue.unref)(_tmagic_design.TMagicButton), {
+								size: "small",
+								text: "",
+								onClick: _cache[4] || (_cache[4] = ($event) => moveSpecifyLocationVisible.value = false)
+							}, {
+								default: (0, vue.withCtx)(() => [..._cache[12] || (_cache[12] = [(0, vue.createTextVNode)("取消", -1)])]),
+								_: 1
+							}), (0, vue.createVNode)((0, vue.unref)(_tmagic_design.TMagicButton), {
+								size: "small",
+								type: "primary",
+								onClick: moveSpecifyLocationHandler
+							}, {
+								default: (0, vue.withCtx)(() => [..._cache[13] || (_cache[13] = [(0, vue.createTextVNode)("确认", -1)])]),
+								_: 1
+							})])])]),
+							_: 1
+						}, 8, ["visible"])) : (0, vue.createCommentVNode)("v-if", true),
+						itemExtra.value ? ((0, vue.openBlock)(), (0, vue.createElementBlock)("span", {
+							key: 3,
+							innerHTML: itemExtra.value,
+							class: "m-form-tip"
+						}, null, 8, _hoisted_3$3)) : (0, vue.createCommentVNode)("v-if", true)
+					])]),
+					default: (0, vue.withCtx)(() => [expand.value ? ((0, vue.openBlock)(), (0, vue.createBlock)(Container_default, {
+						key: 0,
+						config: rowConfig.value,
+						model: __props.model,
+						lastValues: __props.lastValues,
+						"is-compare": __props.isCompare,
+						labelWidth: __props.labelWidth,
+						prop: `${__props.prop}${__props.prop ? "." : ""}${String(__props.index)}`,
+						size: __props.size,
+						disabled: __props.disabled,
+						onChange: changeHandler,
+						onAddDiffCount: _cache[5] || (_cache[5] = ($event) => onAddDiffCount())
+					}, null, 8, [
+						"config",
+						"model",
+						"lastValues",
+						"is-compare",
+						"labelWidth",
+						"prop",
+						"size",
+						"disabled"
+					])) : (0, vue.createCommentVNode)("v-if", true)]),
+					_: 1
+				}, 8, ["body-style"]);
+			};
+		}
+	});
+	//#endregion
+	//#region packages/form/src/containers/GroupList.vue?vue&type=script&setup=true&lang.ts
+	var _hoisted_1$8 = { class: "m-fields-group-list" };
+	var _hoisted_2$3 = ["innerHTML"];
+	var _hoisted_3$2 = {
+		key: 1,
+		class: "el-table__empty-block"
 	};
+	var _hoisted_4$1 = { class: "m-fields-group-list-footer" };
+	var _hoisted_5 = { style: {
+		"display": "flex",
+		"justify-content": "flex-end",
+		"flex": "1"
+	} };
+	//#endregion
+	//#region packages/form/src/containers/GroupList.vue
+	var GroupList_default = /* @__PURE__ */ (0, vue.defineComponent)({
+		name: "MFormGroupList",
+		__name: "GroupList",
+		props: {
+			model: {},
+			lastValues: {},
+			isCompare: { type: Boolean },
+			config: {},
+			name: {},
+			labelWidth: {},
+			prop: {},
+			size: {},
+			disabled: { type: Boolean },
+			showIndex: { type: Boolean }
+		},
+		emits: ["change", "addDiffCount"],
+		setup(__props, { emit: __emit }) {
+			const props = __props;
+			const emit = __emit;
+			const changeHandler = (v, eventData) => {
+				emit("change", props.model, eventData);
+			};
+			const removeHandler = (index) => {
+				if (!props.name) return false;
+				props.model[props.name].splice(index, 1);
+				emit("change", props.model[props.name]);
+			};
+			const copyHandler = (index) => {
+				props.model[props.name].push(cloneDeep(props.model[props.name][index]));
+			};
+			const swapHandler = (idx1, idx2) => {
+				if (!props.name) return false;
+				const { length } = props.model[props.name];
+				const [currRow] = props.model[props.name].splice(idx1, 1);
+				props.model[props.name].splice(Math.min(Math.max(idx2, 0), length - 1), 0, currRow);
+				emit("change", props.model[props.name]);
+			};
+			const onAddDiffCount = () => emit("addDiffCount");
+			const getLastValues = (item, index) => item?.[index] || {};
+			return (_ctx, _cache) => {
+				return (0, vue.openBlock)(), (0, vue.createElementBlock)("div", _hoisted_1$8, [
+					__props.config.extra ? ((0, vue.openBlock)(), (0, vue.createElementBlock)("div", {
+						key: 0,
+						innerHTML: __props.config.extra,
+						style: { "color": "rgba(0, 0, 0, 0.45)" }
+					}, null, 8, _hoisted_2$3)) : (0, vue.createCommentVNode)("v-if", true),
+					!__props.model[__props.name] || !__props.model[__props.name].length ? ((0, vue.openBlock)(), (0, vue.createElementBlock)("div", _hoisted_3$2, [..._cache[1] || (_cache[1] = [(0, vue.createElementVNode)("span", { class: "el-table__empty-text t-table__empty" }, "暂无数据", -1)])])) : ((0, vue.openBlock)(true), (0, vue.createElementBlock)(vue.Fragment, { key: 2 }, (0, vue.renderList)(__props.model[__props.name], (item, index) => {
+						return (0, vue.openBlock)(), (0, vue.createBlock)(GroupListItem_default, {
+							key: index,
+							model: item,
+							lastValues: getLastValues(__props.lastValues?.[__props.name], Number(index)),
+							"is-compare": __props.isCompare,
+							config: __props.config,
+							prop: __props.prop,
+							index: Number(index),
+							"label-width": __props.labelWidth,
+							size: __props.size,
+							disabled: __props.disabled,
+							"group-model": __props.model[__props.name],
+							onRemoveItem: removeHandler,
+							onCopyItem: copyHandler,
+							onSwapItem: swapHandler,
+							onChange: changeHandler,
+							onAddDiffCount: _cache[0] || (_cache[0] = ($event) => onAddDiffCount())
+						}, null, 8, [
+							"model",
+							"lastValues",
+							"is-compare",
+							"config",
+							"prop",
+							"index",
+							"label-width",
+							"size",
+							"disabled",
+							"group-model"
+						]);
+					}), 128)),
+					(0, vue.createElementVNode)("div", _hoisted_4$1, [(0, vue.renderSlot)(_ctx.$slots, "toggle-button"), (0, vue.createElementVNode)("div", _hoisted_5, [(0, vue.renderSlot)(_ctx.$slots, "add-button")])])
+				]);
+			};
+		}
+	});
 	//#endregion
-	//#region packages/form/src/table/useFullscreen.ts
+	//#region packages/form/src/containers/table/useFullscreen.ts
 	var useFullscreen = () => {
+		const { nextZIndex } = (0, _tmagic_design.useZIndex)();
+		const fullscreenZIndex = (0, vue.ref)(nextZIndex());
 		const isFullscreen = (0, vue.ref)(false);
 		const toggleFullscreen = () => {
 			if (isFullscreen.value) isFullscreen.value = false;
 			else isFullscreen.value = true;
 		};
+		(0, vue.watch)(isFullscreen, (value) => {
+			if (value) fullscreenZIndex.value = nextZIndex();
+		});
 		return {
 			isFullscreen,
+			fullscreenZIndex,
 			toggleFullscreen
 		};
 	};
 	//#endregion
-	//#region packages/form/src/table/useImport.ts
-	var useImport = (props, emit, newHandler) => {
+	//#region packages/form/src/containers/table/useImport.ts
+	var useImport = (props, emit) => {
 		const mForm = (0, vue.inject)("mForm");
 		const modelName = (0, vue.computed)(() => props.name || props.config.name || "");
 		const importable = (0, vue.computed)(() => {
@@ -4777,9 +5044,7 @@
 				const pdata = globalThis.XLSX.read(data, { type: "array" });
 				pdata.SheetNames.forEach((sheetName) => {
 					const arr = globalThis.XLSX.utils.sheet_to_json(pdata.Sheets[sheetName], { header: 1 });
-					if (arr?.[0]) arr.forEach((row) => {
-						newHandler(row);
-					});
+					if (arr?.[0]) emit("add", arr);
 					setTimeout(() => {
 						excelBtn.value?.clearFiles();
 					}, 300);
@@ -4799,7 +5064,7 @@
 		};
 	};
 	//#endregion
-	//#region packages/form/src/table/usePagination.ts
+	//#region packages/form/src/containers/table/usePagination.ts
 	var usePagination = (props, modelName) => {
 		const pageSize = (0, vue.ref)(10);
 		/**
@@ -4822,7 +5087,7 @@
 		};
 	};
 	//#endregion
-	//#region packages/form/src/table/useSelection.ts
+	//#region packages/form/src/containers/table/useSelection.ts
 	var useSelection = (props, emit, tMagicTableRef) => {
 		const mForm = (0, vue.inject)("mForm");
 		const selectHandle = (selection, row) => {
@@ -4846,7 +5111,7 @@
 		};
 	};
 	//#endregion
-	//#region packages/form/src/table/useSortable.ts
+	//#region packages/form/src/containers/table/useSortable.ts
 	var SortablePromise;
 	var loadSortable = () => SortablePromise ??= import("sortablejs").then((m) => m.default);
 	var useSortable = (props, emit, tMagicTableRef, modelName, updateKey) => {
@@ -4882,7 +5147,7 @@
 		});
 	};
 	//#endregion
-	//#region packages/form/src/table/ActionsColumn.vue
+	//#region packages/form/src/containers/table/ActionsColumn.vue
 	var ActionsColumn_default = /* @__PURE__ */ (0, vue.defineComponent)({
 		__name: "ActionsColumn",
 		props: {
@@ -4984,7 +5249,7 @@
 		}
 	});
 	//#endregion
-	//#region packages/form/src/table/SortColumn.vue
+	//#region packages/form/src/containers/table/SortColumn.vue
 	var SortColumn_default = /* @__PURE__ */ (0, vue.defineComponent)({
 		__name: "SortColumn",
 		props: {
@@ -5068,7 +5333,7 @@
 		}
 	});
 	//#endregion
-	//#region packages/form/src/table/useTableColumns.ts
+	//#region packages/form/src/containers/table/useTableColumns.ts
 	var useTableColumns = (props, emit, currentPage, pageSize, modelName) => {
 		const mForm = (0, vue.inject)("mForm");
 		const display$1 = (fuc) => display(mForm, fuc, props);
@@ -5185,7 +5450,7 @@
 				columns.push({
 					props: {
 						prop: column.name,
-						label: column.label,
+						label: column.label || column.text,
 						width: column.width,
 						sortable: column.sortable,
 						sortOrders: ["ascending", "descending"],
@@ -5209,7 +5474,7 @@
 							display: "inline-flex",
 							alignItems: "center",
 							gap: "5px"
-						} }, [(0, vue.h)("span", column.label), (0, vue.h)(_tmagic_design.TMagicIcon, {}, { default: () => (0, vue.h)(_element_plus_icons_vue.WarningFilled) })]),
+						} }, [(0, vue.h)("span", column.label || column.text), (0, vue.h)(_tmagic_design.TMagicIcon, {}, { default: () => (0, vue.h)(_element_plus_icons_vue.WarningFilled) })]),
 						content: () => (0, vue.h)("div", { innerHTML: titleTipValue })
 					}) : void 0
 				});
@@ -5219,21 +5484,21 @@
 		}) };
 	};
 	//#endregion
-	//#region packages/form/src/table/Table.vue?vue&type=script&setup=true&lang.ts
-	var _hoisted_1$9 = ["innerHTML"];
-	var _hoisted_2$4 = { style: {
+	//#region packages/form/src/containers/table/Table.vue?vue&type=script&setup=true&lang.ts
+	var _hoisted_1$7 = ["innerHTML"];
+	var _hoisted_2$2 = { style: {
 		"display": "flex",
 		"justify-content": "space-between",
 		"margin": "10px 0"
 	} };
-	var _hoisted_3$3 = { style: { "display": "flex" } };
-	var _hoisted_4$1 = {
+	var _hoisted_3$1 = { style: { "display": "flex" } };
+	var _hoisted_4 = {
 		key: 1,
 		class: "bottom",
 		style: { "text-align": "right" }
 	};
 	//#endregion
-	//#region packages/form/src/table/Table.vue
+	//#region packages/form/src/containers/table/Table.vue
 	var Table_default = /* @__PURE__ */ (0, vue.defineComponent)({
 		name: "MFormTable",
 		__name: "Table",
@@ -5261,7 +5526,8 @@
 		emits: [
 			"change",
 			"select",
-			"addDiffCount"
+			"addDiffCount",
+			"add"
 		],
 		setup(__props, { expose: __expose, emit: __emit }) {
 			const props = __props;
@@ -5269,17 +5535,11 @@
 			const modelName = (0, vue.computed)(() => props.name || props.config.name || "");
 			const tMagicTableRef = (0, vue.useTemplateRef)("tMagicTable");
 			const { pageSize, currentPage, paginationData, handleSizeChange, handleCurrentChange } = usePagination(props, modelName);
-			const { nextZIndex } = (0, _tmagic_design.useZIndex)();
 			const updateKey = (0, vue.ref)(1);
-			const fullscreenZIndex = (0, vue.ref)(nextZIndex());
-			const { newHandler } = useAdd(props, emit);
 			const { columns } = useTableColumns(props, emit, currentPage, pageSize, modelName);
 			useSortable(props, emit, tMagicTableRef, modelName, updateKey);
-			const { isFullscreen, toggleFullscreen } = useFullscreen();
-			(0, vue.watch)(isFullscreen, (value) => {
-				if (value) fullscreenZIndex.value = nextZIndex();
-			});
-			const { importable, excelHandler, clearHandler } = useImport(props, emit, newHandler);
+			const { isFullscreen, fullscreenZIndex, toggleFullscreen } = useFullscreen();
+			const { importable, excelHandler, clearHandler } = useImport(props, emit);
 			const { selectHandle, toggleRowSelection } = useSelection(props, emit, tMagicTableRef);
 			const data = (0, vue.computed)(() => props.config.pagination ? paginationData.value : props.model[modelName.value]);
 			const sortChangeHandler = (sortOptions) => {
@@ -5293,13 +5553,13 @@
 					disabled: !(0, vue.unref)(isFullscreen)
 				}, [(0, vue.createElementVNode)("div", (0, vue.mergeProps)(_ctx.$attrs, {
 					class: ["m-fields-table-wrap", { fixed: (0, vue.unref)(isFullscreen) }],
-					style: (0, vue.unref)(isFullscreen) ? `z-index: ${fullscreenZIndex.value}` : ""
+					style: (0, vue.unref)(isFullscreen) ? `z-index: ${(0, vue.unref)(fullscreenZIndex)}` : ""
 				}), [(0, vue.createElementVNode)("div", { class: (0, vue.normalizeClass)(["m-fields-table", { "m-fields-table-item-extra": __props.config.itemExtra }]) }, [
 					__props.config.extra ? ((0, vue.openBlock)(), (0, vue.createElementBlock)("span", {
 						key: 0,
 						style: { "color": "rgba(0, 0, 0, 0.45)" },
 						innerHTML: __props.config.extra
-					}, null, 8, _hoisted_1$9)) : (0, vue.createCommentVNode)("v-if", true),
+					}, null, 8, _hoisted_1$7)) : (0, vue.createCommentVNode)("v-if", true),
 					(0, vue.createVNode)((0, vue.unref)(_tmagic_design.TMagicTooltip), {
 						content: "拖拽可排序",
 						placement: "left-start",
@@ -5329,425 +5589,147 @@
 						_: 1
 					}, 8, ["disabled"]),
 					(0, vue.renderSlot)(_ctx.$slots, "default"),
-					(0, vue.createElementVNode)("div", _hoisted_2$4, [(0, vue.createElementVNode)("div", _hoisted_3$3, [
+					(0, vue.createElementVNode)("div", _hoisted_2$2, [(0, vue.createElementVNode)("div", _hoisted_3$1, [
 						!(0, vue.unref)(isFullscreen) ? (0, vue.renderSlot)(_ctx.$slots, "toggle-button", { key: 0 }) : (0, vue.createCommentVNode)("v-if", true),
 						__props.config.enableFullscreen !== false ? ((0, vue.openBlock)(), (0, vue.createBlock)((0, vue.unref)(_tmagic_design.TMagicButton), {
 							key: 1,
 							icon: (0, vue.unref)(_element_plus_icons_vue.FullScreen),
 							size: "small",
-							onClick: (0, vue.unref)(toggleFullscreen)
-						}, {
-							default: (0, vue.withCtx)(() => [(0, vue.createTextVNode)((0, vue.toDisplayString)((0, vue.unref)(isFullscreen) ? "退出全屏" : "全屏编辑"), 1)]),
-							_: 1
-						}, 8, ["icon", "onClick"])) : (0, vue.createCommentVNode)("v-if", true),
-						(0, vue.unref)(importable) ? ((0, vue.openBlock)(), (0, vue.createBlock)((0, vue.unref)(_tmagic_design.TMagicUpload), {
-							key: 2,
-							style: { "display": "inline-block" },
-							ref: "excelBtn",
-							action: "/noop",
-							disabled: __props.disabled,
-							"on-change": (0, vue.unref)(excelHandler),
-							"auto-upload": false
-						}, {
-							default: (0, vue.withCtx)(() => [(0, vue.createVNode)((0, vue.unref)(_tmagic_design.TMagicButton), {
-								size: "small",
-								type: "success",
-								disabled: __props.disabled,
-								plain: ""
-							}, {
-								default: (0, vue.withCtx)(() => [..._cache[0] || (_cache[0] = [(0, vue.createTextVNode)("导入EXCEL", -1)])]),
-								_: 1
-							}, 8, ["disabled"])]),
-							_: 1
-						}, 8, ["disabled", "on-change"])) : (0, vue.createCommentVNode)("v-if", true),
-						(0, vue.unref)(importable) ? ((0, vue.openBlock)(), (0, vue.createBlock)((0, vue.unref)(_tmagic_design.TMagicButton), {
-							key: 3,
-							size: "small",
-							type: "warning",
-							disabled: __props.disabled,
-							plain: "",
-							onClick: (0, vue.unref)(clearHandler)
-						}, {
-							default: (0, vue.withCtx)(() => [..._cache[1] || (_cache[1] = [(0, vue.createTextVNode)("清空", -1)])]),
-							_: 1
-						}, 8, ["disabled", "onClick"])) : (0, vue.createCommentVNode)("v-if", true)
-					]), (0, vue.renderSlot)(_ctx.$slots, "add-button", { trigger: (0, vue.unref)(newHandler) })]),
-					__props.config.pagination ? ((0, vue.openBlock)(), (0, vue.createElementBlock)("div", _hoisted_4$1, [(0, vue.createVNode)((0, vue.unref)(_tmagic_design.TMagicPagination), {
-						layout: "total, sizes, prev, pager, next, jumper",
-						"hide-on-single-page": __props.model[modelName.value].length < (0, vue.unref)(pageSize),
-						"current-page": (0, vue.unref)(currentPage) + 1,
-						"page-sizes": [
-							(0, vue.unref)(pageSize),
-							60,
-							120,
-							300
-						],
-						"page-size": (0, vue.unref)(pageSize),
-						total: __props.model[modelName.value].length,
-						onSizeChange: (0, vue.unref)(handleSizeChange),
-						onCurrentChange: (0, vue.unref)(handleCurrentChange)
-					}, null, 8, [
-						"hide-on-single-page",
-						"current-page",
-						"page-sizes",
-						"page-size",
-						"total",
-						"onSizeChange",
-						"onCurrentChange"
-					])])) : (0, vue.createCommentVNode)("v-if", true)
-				], 2)], 16)], 8, ["disabled"]);
-			};
-		}
-	});
-	//#endregion
-	//#region packages/form/src/containers/GroupListItem.vue?vue&type=script&setup=true&lang.ts
-	var _hoisted_1$8 = ["innerHTML"];
-	var _hoisted_2$3 = { style: {
-		"text-align": "right",
-		"margin-top": "20px"
-	} };
-	var _hoisted_3$2 = ["innerHTML"];
-	//#endregion
-	//#region packages/form/src/containers/GroupListItem.vue
-	var GroupListItem_default = /* @__PURE__ */ (0, vue.defineComponent)({
-		name: "MFormGroupListItem",
-		__name: "GroupListItem",
-		props: {
-			model: {},
-			lastValues: {},
-			isCompare: { type: Boolean },
-			groupModel: {},
-			config: {},
-			labelWidth: {},
-			prop: {},
-			size: {},
-			index: {},
-			disabled: { type: Boolean }
-		},
-		emits: [
-			"swap-item",
-			"remove-item",
-			"change",
-			"addDiffCount",
-			"copy-item"
-		],
-		setup(__props, { emit: __emit }) {
-			const props = __props;
-			const emit = __emit;
-			const mForm = (0, vue.inject)("mForm");
-			const defaultExpandQuantity = props.config.defaultExpandQuantity ?? 7;
-			const expand = (0, vue.ref)(props.config.expandAll || defaultExpandQuantity > props.index);
-			const rowConfig = (0, vue.computed)(() => ({
-				type: "row",
-				span: props.config.span || 24,
-				items: props.config.items,
-				labelWidth: props.config.labelWidth,
-				[mForm?.keyProp || "__key"]: `${props.config[mForm?.keyProp || "__key"]}${String(props.index)}`
-			}));
-			const title = (0, vue.computed)(() => {
-				if (props.config.titleKey && props.model[props.config.titleKey]) return props.model[props.config.titleKey];
-				if (props.config.title) return filterFunction(mForm, props.config.title, props);
-				return `${props.config.titlePrefix || "组"} ${String(props.index + 1)}`;
-			});
-			const length = (0, vue.computed)(() => props.groupModel?.length || 0);
-			const itemExtra = (0, vue.computed)(() => filterFunction(mForm, props.config.itemExtra, props));
-			const removeHandler = () => emit("remove-item", props.index);
-			const changeHandler = (v, eventData) => {
-				emit("change", props.model, eventData);
-			};
-			const expandHandler = () => {
-				expand.value = !expand.value;
-			};
-			const showDelete = (0, vue.computed)(() => {
-				const deleteFunc = props.config.delete;
-				if (deleteFunc && typeof deleteFunc === "function") return deleteFunc(props.model, props.index, mForm?.values);
-				return true;
-			});
-			const changeOrder = (offset = 0) => emit("swap-item", props.index, props.index + offset);
-			const movable = (0, vue.computed)(() => {
-				const { movable } = props.config;
-				if (movable === void 0) return true;
-				if (typeof movable === "function") return movable(mForm, props.index || 0, props.model, props.groupModel);
-				return movable;
-			});
-			const copyable = (0, vue.computed)(() => filterFunction(mForm, props.config.copyable, props));
-			const onAddDiffCount = () => emit("addDiffCount");
-			const copyHandler = () => {
-				emit("copy-item", props.index);
-			};
-			const moveSpecifyLocationVisible = (0, vue.ref)(false);
-			const moveSpecifyLocationIndex = (0, vue.ref)(1);
-			const moveSpecifyLocationHandler = () => {
-				moveSpecifyLocationVisible.value = false;
-				emit("swap-item", props.index, moveSpecifyLocationIndex.value - 1);
-			};
-			return (_ctx, _cache) => {
-				return (0, vue.openBlock)(), (0, vue.createBlock)((0, vue.unref)(_tmagic_design.TMagicCard), {
-					class: "m-fields-group-list-item",
-					"body-style": { display: expand.value ? "block" : "none" }
-				}, {
-					header: (0, vue.withCtx)(() => [(0, vue.createElementVNode)("div", null, [
-						(0, vue.createVNode)((0, vue.unref)(_tmagic_design.TMagicButton), {
-							link: "",
-							disabled: __props.disabled,
-							onClick: expandHandler
-						}, {
-							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$8)]),
-							_: 1
-						}, 8, ["disabled"]),
-						(0, vue.withDirectives)((0, vue.createVNode)((0, vue.unref)(_tmagic_design.TMagicButton), {
-							type: "danger",
-							size: "small",
-							link: "",
-							icon: (0, vue.unref)(_element_plus_icons_vue.Delete),
-							disabled: __props.disabled,
-							onClick: removeHandler
-						}, null, 8, ["icon", "disabled"]), [[vue.vShow, showDelete.value]]),
-						copyable.value ? ((0, vue.openBlock)(), (0, vue.createBlock)((0, vue.unref)(_tmagic_design.TMagicButton), {
-							key: 0,
-							link: "",
-							size: "small",
-							type: "primary",
-							icon: (0, vue.unref)(_element_plus_icons_vue.DocumentCopy),
-							disabled: __props.disabled,
-							onClick: copyHandler
-						}, {
-							default: (0, vue.withCtx)(() => [..._cache[6] || (_cache[6] = [(0, vue.createTextVNode)("复制", -1)])]),
-							_: 1
-						}, 8, ["icon", "disabled"])) : (0, vue.createCommentVNode)("v-if", true),
-						movable.value ? ((0, vue.openBlock)(), (0, vue.createElementBlock)(vue.Fragment, { key: 1 }, [(0, vue.withDirectives)((0, vue.createVNode)((0, vue.unref)(_tmagic_design.TMagicButton), {
-							link: "",
-							size: "small",
-							disabled: __props.disabled,
-							icon: (0, vue.unref)(_element_plus_icons_vue.CaretTop),
-							onClick: _cache[0] || (_cache[0] = ($event) => changeOrder(-1))
-						}, {
-							default: (0, vue.withCtx)(() => [..._cache[7] || (_cache[7] = [(0, vue.createTextVNode)("上移", -1)])]),
-							_: 1
-						}, 8, ["disabled", "icon"]), [[vue.vShow, __props.index !== 0]]), (0, vue.withDirectives)((0, vue.createVNode)((0, vue.unref)(_tmagic_design.TMagicButton), {
-							link: "",
-							size: "small",
-							disabled: __props.disabled,
-							icon: (0, vue.unref)(_element_plus_icons_vue.CaretBottom),
-							onClick: _cache[1] || (_cache[1] = ($event) => changeOrder(1))
-						}, {
-							default: (0, vue.withCtx)(() => [..._cache[8] || (_cache[8] = [(0, vue.createTextVNode)("下移", -1)])]),
-							_: 1
-						}, 8, ["disabled", "icon"]), [[vue.vShow, __props.index !== length.value - 1]])], 64)) : (0, vue.createCommentVNode)("v-if", true),
-						__props.config.moveSpecifyLocation ? ((0, vue.openBlock)(), (0, vue.createBlock)((0, vue.unref)(_tmagic_design.TMagicPopover), {
-							key: 2,
-							trigger: "click",
-							placement: "top",
-							width: "200",
-							visible: moveSpecifyLocationVisible.value
-						}, {
-							reference: (0, vue.withCtx)(() => [(0, vue.createVNode)((0, vue.unref)(_tmagic_design.TMagicButton), {
-								link: "",
-								size: "small",
-								type: "primary",
-								icon: (0, vue.unref)(_element_plus_icons_vue.Position),
-								disabled: __props.disabled,
-								onClick: _cache[2] || (_cache[2] = ($event) => moveSpecifyLocationVisible.value = true)
-							}, {
-								default: (0, vue.withCtx)(() => [..._cache[9] || (_cache[9] = [(0, vue.createTextVNode)("移动至", -1)])]),
-								_: 1
-							}, 8, ["icon", "disabled"])]),
-							default: (0, vue.withCtx)(() => [(0, vue.createElementVNode)("div", null, [(0, vue.createElementVNode)("div", null, [
-								_cache[10] || (_cache[10] = (0, vue.createTextVNode)(" 第", -1)),
-								(0, vue.createVNode)((0, vue.unref)(_tmagic_design.TMagicInputNumber), {
-									style: { "margin": "0 5px" },
-									modelValue: moveSpecifyLocationIndex.value,
-									"onUpdate:modelValue": _cache[3] || (_cache[3] = ($event) => moveSpecifyLocationIndex.value = $event),
-									size: "small",
-									min: 1,
-									disabled: __props.disabled
-								}, null, 8, ["modelValue", "disabled"]),
-								_cache[11] || (_cache[11] = (0, vue.createTextVNode)("行 ", -1))
-							]), (0, vue.createElementVNode)("div", _hoisted_2$3, [(0, vue.createVNode)((0, vue.unref)(_tmagic_design.TMagicButton), {
-								size: "small",
-								text: "",
-								onClick: _cache[4] || (_cache[4] = ($event) => moveSpecifyLocationVisible.value = false)
-							}, {
-								default: (0, vue.withCtx)(() => [..._cache[12] || (_cache[12] = [(0, vue.createTextVNode)("取消", -1)])]),
-								_: 1
-							}), (0, vue.createVNode)((0, vue.unref)(_tmagic_design.TMagicButton), {
+							onClick: (0, vue.unref)(toggleFullscreen)
+						}, {
+							default: (0, vue.withCtx)(() => [(0, vue.createTextVNode)((0, vue.toDisplayString)((0, vue.unref)(isFullscreen) ? "退出全屏" : "全屏编辑"), 1)]),
+							_: 1
+						}, 8, ["icon", "onClick"])) : (0, vue.createCommentVNode)("v-if", true),
+						(0, vue.unref)(importable) ? ((0, vue.openBlock)(), (0, vue.createBlock)((0, vue.unref)(_tmagic_design.TMagicUpload), {
+							key: 2,
+							style: { "display": "inline-block" },
+							ref: "excelBtn",
+							action: "/noop",
+							disabled: __props.disabled,
+							"on-change": (0, vue.unref)(excelHandler),
+							"auto-upload": false
+						}, {
+							default: (0, vue.withCtx)(() => [(0, vue.createVNode)((0, vue.unref)(_tmagic_design.TMagicButton), {
 								size: "small",
-								type: "primary",
-								onClick: moveSpecifyLocationHandler
+								type: "success",
+								disabled: __props.disabled,
+								plain: ""
 							}, {
-								default: (0, vue.withCtx)(() => [..._cache[13] || (_cache[13] = [(0, vue.createTextVNode)("确认", -1)])]),
+								default: (0, vue.withCtx)(() => [..._cache[0] || (_cache[0] = [(0, vue.createTextVNode)("导入EXCEL", -1)])]),
 								_: 1
-							})])])]),
+							}, 8, ["disabled"])]),
 							_: 1
-						}, 8, ["visible"])) : (0, vue.createCommentVNode)("v-if", true),
-						itemExtra.value ? ((0, vue.openBlock)(), (0, vue.createElementBlock)("span", {
+						}, 8, ["disabled", "on-change"])) : (0, vue.createCommentVNode)("v-if", true),
+						(0, vue.unref)(importable) ? ((0, vue.openBlock)(), (0, vue.createBlock)((0, vue.unref)(_tmagic_design.TMagicButton), {
 							key: 3,
-							innerHTML: itemExtra.value,
-							class: "m-form-tip"
-						}, null, 8, _hoisted_3$2)) : (0, vue.createCommentVNode)("v-if", true)
-					])]),
-					default: (0, vue.withCtx)(() => [expand.value ? ((0, vue.openBlock)(), (0, vue.createBlock)(Container_default, {
-						key: 0,
-						config: rowConfig.value,
-						model: __props.model,
-						lastValues: __props.lastValues,
-						"is-compare": __props.isCompare,
-						labelWidth: __props.labelWidth,
-						prop: `${__props.prop}${__props.prop ? "." : ""}${String(__props.index)}`,
-						size: __props.size,
-						disabled: __props.disabled,
-						onChange: changeHandler,
-						onAddDiffCount: _cache[5] || (_cache[5] = ($event) => onAddDiffCount())
+							size: "small",
+							type: "warning",
+							disabled: __props.disabled,
+							plain: "",
+							onClick: (0, vue.unref)(clearHandler)
+						}, {
+							default: (0, vue.withCtx)(() => [..._cache[1] || (_cache[1] = [(0, vue.createTextVNode)("清空", -1)])]),
+							_: 1
+						}, 8, ["disabled", "onClick"])) : (0, vue.createCommentVNode)("v-if", true)
+					]), (0, vue.renderSlot)(_ctx.$slots, "add-button")]),
+					__props.config.pagination ? ((0, vue.openBlock)(), (0, vue.createElementBlock)("div", _hoisted_4, [(0, vue.createVNode)((0, vue.unref)(_tmagic_design.TMagicPagination), {
+						layout: "total, sizes, prev, pager, next, jumper",
+						"hide-on-single-page": __props.model[modelName.value].length < (0, vue.unref)(pageSize),
+						"current-page": (0, vue.unref)(currentPage) + 1,
+						"page-sizes": [
+							(0, vue.unref)(pageSize),
+							60,
+							120,
+							300
+						],
+						"page-size": (0, vue.unref)(pageSize),
+						total: __props.model[modelName.value].length,
+						onSizeChange: (0, vue.unref)(handleSizeChange),
+						onCurrentChange: (0, vue.unref)(handleCurrentChange)
 					}, null, 8, [
-						"config",
-						"model",
-						"lastValues",
-						"is-compare",
-						"labelWidth",
-						"prop",
-						"size",
-						"disabled"
-					])) : (0, vue.createCommentVNode)("v-if", true)]),
-					_: 1
-				}, 8, ["body-style"]);
+						"hide-on-single-page",
+						"current-page",
+						"page-sizes",
+						"page-size",
+						"total",
+						"onSizeChange",
+						"onCurrentChange"
+					])])) : (0, vue.createCommentVNode)("v-if", true)
+				], 2)], 16)], 8, ["disabled"]);
 			};
 		}
 	});
 	//#endregion
-	//#region packages/form/src/containers/GroupList.vue?vue&type=script&setup=true&lang.ts
-	var _hoisted_1$7 = { class: "m-fields-group-list" };
-	var _hoisted_2$2 = ["innerHTML"];
-	var _hoisted_3$1 = {
-		key: 1,
-		class: "el-table__empty-block"
-	};
-	var _hoisted_4 = { class: "m-fields-group-list-footer" };
-	var _hoisted_5 = { style: {
-		"display": "flex",
-		"justify-content": "flex-end",
-		"flex": "1"
-	} };
-	//#endregion
-	//#region packages/form/src/containers/GroupList.vue
-	var GroupList_default = /* @__PURE__ */ (0, vue.defineComponent)({
-		name: "MFormGroupList",
-		__name: "GroupList",
-		props: {
-			model: {},
-			lastValues: {},
-			isCompare: { type: Boolean },
-			config: {},
-			name: {},
-			labelWidth: {},
-			prop: {},
-			size: {},
-			disabled: { type: Boolean },
-			showIndex: { type: Boolean }
-		},
-		emits: ["change", "addDiffCount"],
-		setup(__props, { emit: __emit }) {
-			const props = __props;
-			const emit = __emit;
-			const mForm = (0, vue.inject)("mForm");
-			const changeHandler = (v, eventData) => {
-				emit("change", props.model, eventData);
-			};
-			const addHandler = async () => {
-				if (!props.name) return false;
-				if (props.config.max && props.model[props.name].length >= props.config.max) {
-					_tmagic_design.tMagicMessage.error(`最多新增配置不能超过${props.config.max}条`);
-					return;
-				}
-				if (typeof props.config.beforeAddRow === "function") {
-					if (!await props.config.beforeAddRow(mForm, {
-						model: props.model[props.name],
-						formValue: mForm?.values,
-						prop: props.prop
-					})) return;
-				}
-				let initValues = {};
-				if (typeof props.config.defaultAdd === "function") initValues = await props.config.defaultAdd(mForm, {
-					model: props.model[props.name],
+	//#region packages/form/src/containers/table-group-list/useAdd.ts
+	var useAdd = (props, emit) => {
+		const mForm = (0, vue.inject)("mForm");
+		const addable = (0, vue.computed)(() => {
+			const modelName = props.name || props.config.name || "";
+			if (!modelName) return false;
+			if (!props.model[modelName].length) return true;
+			if (typeof props.config.addable === "function") return props.config.addable(mForm, {
+				model: props.model[modelName],
+				formValue: mForm?.values,
+				prop: props.prop,
+				config: props.config
+			});
+			return typeof props.config.addable === "undefined" ? true : props.config.addable;
+		});
+		const newHandler = async (row) => {
+			const modelName = props.name || props.config.name || "";
+			if (props.config.max && props.model[modelName].length >= props.config.max) {
+				_tmagic_design.tMagicMessage.error(`最多新增配置不能超过${props.config.max}条`);
+				return;
+			}
+			if (typeof props.config.beforeAddRow === "function") {
+				if (!await props.config.beforeAddRow(mForm, {
+					model: props.model[modelName],
 					formValue: mForm?.values,
+					prop: props.prop
+				})) return;
+			}
+			const columns = props.config.items;
+			const enumValues = props.config.enum || [];
+			let enumV = [];
+			const { length } = props.model[modelName];
+			const key = props.config.key || "id";
+			let inputs = {};
+			if (enumValues.length) {
+				if (length >= enumValues.length) return;
+				enumV = enumValues.filter((item) => {
+					let i = 0;
+					for (; i < length; i++) if (item[key] === props.model[modelName][i][key]) break;
+					return i === length;
+				});
+				if (enumV.length > 0) inputs = enumV[0];
+			} else if (Array.isArray(row)) columns.forEach((column, index) => {
+				column.name && (inputs[column.name] = row[index]);
+			});
+			else {
+				if (typeof props.config.defaultAdd === "function") inputs = await props.config.defaultAdd(mForm, {
+					model: props.model[modelName],
 					prop: props.prop,
-					config: props.config
+					formValue: mForm?.values
 				});
-				else if (props.config.defaultAdd) initValues = props.config.defaultAdd;
-				const groupValue = await initValue(mForm, {
-					config: props.config.items,
-					initValues
+				else if (props.config.defaultAdd) inputs = props.config.defaultAdd;
+				inputs = await initValue(mForm, {
+					config: columns,
+					initValues: inputs
 				});
-				props.model[props.name].push(groupValue);
-				emit("change", props.model[props.name], { changeRecords: [{
-					propPath: `${props.prop}.${props.model[props.name].length - 1}`,
-					value: groupValue
-				}] });
-			};
-			const removeHandler = (index) => {
-				if (!props.name) return false;
-				props.model[props.name].splice(index, 1);
-				emit("change", props.model[props.name]);
-			};
-			const copyHandler = (index) => {
-				props.model[props.name].push(cloneDeep(props.model[props.name][index]));
-			};
-			const swapHandler = (idx1, idx2) => {
-				if (!props.name) return false;
-				const { length } = props.model[props.name];
-				const [currRow] = props.model[props.name].splice(idx1, 1);
-				props.model[props.name].splice(Math.min(Math.max(idx2, 0), length - 1), 0, currRow);
-				emit("change", props.model[props.name]);
-			};
-			const onAddDiffCount = () => emit("addDiffCount");
-			const getLastValues = (item, index) => item?.[index] || {};
-			return (_ctx, _cache) => {
-				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,
-						style: { "color": "rgba(0, 0, 0, 0.45)" }
-					}, null, 8, _hoisted_2$2)) : (0, vue.createCommentVNode)("v-if", true),
-					!__props.model[__props.name] || !__props.model[__props.name].length ? ((0, vue.openBlock)(), (0, vue.createElementBlock)("div", _hoisted_3$1, [..._cache[1] || (_cache[1] = [(0, vue.createElementVNode)("span", { class: "el-table__empty-text t-table__empty" }, "暂无数据", -1)])])) : ((0, vue.openBlock)(true), (0, vue.createElementBlock)(vue.Fragment, { key: 2 }, (0, vue.renderList)(__props.model[__props.name], (item, index) => {
-						return (0, vue.openBlock)(), (0, vue.createBlock)(GroupListItem_default, {
-							key: index,
-							model: item,
-							lastValues: getLastValues(__props.lastValues?.[__props.name], Number(index)),
-							"is-compare": __props.isCompare,
-							config: __props.config,
-							prop: __props.prop,
-							index: Number(index),
-							"label-width": __props.labelWidth,
-							size: __props.size,
-							disabled: __props.disabled,
-							"group-model": __props.model[__props.name],
-							onRemoveItem: removeHandler,
-							onCopyItem: copyHandler,
-							onSwapItem: swapHandler,
-							onChange: changeHandler,
-							onAddDiffCount: _cache[0] || (_cache[0] = ($event) => onAddDiffCount())
-						}, null, 8, [
-							"model",
-							"lastValues",
-							"is-compare",
-							"config",
-							"prop",
-							"index",
-							"label-width",
-							"size",
-							"disabled",
-							"group-model"
-						]);
-					}), 128)),
-					(0, vue.createElementVNode)("div", _hoisted_4, [(0, vue.renderSlot)(_ctx.$slots, "toggle-button"), (0, vue.createElementVNode)("div", _hoisted_5, [(0, vue.renderSlot)(_ctx.$slots, "add-button", { trigger: addHandler })])])
-				]);
-			};
-		}
-	});
+			}
+			if (props.sortKey && length) inputs[props.sortKey] = props.model[modelName][length - 1][props.sortKey] - 1;
+			emit("change", [...props.model[modelName], inputs], { changeRecords: [{
+				propPath: `${props.prop}.${props.model[modelName].length}`,
+				value: inputs
+			}] });
+		};
+		return {
+			addable,
+			newHandler
+		};
+	};
 	//#endregion
-	//#region packages/form/src/containers/TableGroupList.vue
+	//#region packages/form/src/containers/table-group-list/TableGroupList.vue
 	var TableGroupList_default = /* @__PURE__ */ (0, vue.defineComponent)({
 		name: "MFormTableGroupList",
 		inheritAttrs: false,
@@ -5772,22 +5754,10 @@
 			"select",
 			"addDiffCount"
 		],
-		setup(__props, { emit: __emit }) {
+		setup(__props, { expose: __expose, emit: __emit }) {
 			const props = __props;
 			const emit = __emit;
-			const mForm = (0, vue.inject)("mForm");
-			const addable = (0, vue.computed)(() => {
-				const modelName = props.name || props.config.name || "";
-				if (!modelName) return false;
-				if (!props.model[modelName].length) return true;
-				if (typeof props.config.addable === "function") return props.config.addable(mForm, {
-					model: props.model[modelName],
-					formValue: mForm?.values,
-					prop: props.prop,
-					config: props.config
-				});
-				return typeof props.config.addable === "undefined" ? true : props.config.addable;
-			});
+			const { addable, newHandler } = useAdd(props, emit);
 			const isGroupListType = (type) => type === "groupList" || type === "group-list";
 			const displayMode = (0, vue.ref)(isGroupListType(props.config.type) ? "groupList" : "table");
 			const calcLabelWidth = (label) => {
@@ -5839,8 +5809,15 @@
 			const onChange = (v, eventData) => emit("change", v, eventData);
 			const onSelect = (...args) => emit("select", ...args);
 			const onAddDiffCount = () => emit("addDiffCount");
+			const onAdd = (rows) => {
+				rows.forEach((row) => {
+					newHandler(row);
+				});
+			};
+			const tableGroupListRef = (0, vue.useTemplateRef)("tableGroupList");
+			__expose({ toggleRowSelection: (row, selected) => tableGroupListRef.value?.toggleRowSelection?.(row, selected) });
 			return (_ctx, _cache) => {
-				return (0, vue.openBlock)(), (0, vue.createBlock)((0, vue.resolveDynamicComponent)(displayMode.value === "table" ? Table_default : GroupList_default), (0, vue.mergeProps)(_ctx.$attrs, {
+				return (0, vue.openBlock)(), (0, vue.createBlock)((0, vue.resolveDynamicComponent)(displayMode.value === "table" ? Table_default : GroupList_default), (0, vue.mergeProps)({ ref: "tableGroupList" }, _ctx.$attrs, {
 					model: __props.model,
 					name: `${__props.name}`,
 					config: currentConfig.value,
@@ -5855,8 +5832,9 @@
 					sort: __props.sort,
 					onChange,
 					onSelect,
-					onAddDiffCount
-				}), {
+					onAddDiffCount,
+					onAdd
+				}), (0, vue.createSlots)({
 					"toggle-button": (0, vue.withCtx)(() => [__props.config.enableToggleMode || __props.enableToggleMode ? ((0, vue.openBlock)(), (0, vue.createBlock)((0, vue.unref)(_tmagic_design.TMagicButton), {
 						key: 0,
 						icon: (0, vue.unref)(_element_plus_icons_vue.Grid),
@@ -5866,14 +5844,16 @@
 						default: (0, vue.withCtx)(() => [(0, vue.createTextVNode)((0, vue.toDisplayString)(displayMode.value === "table" ? "展开配置" : "切换为表格"), 1)]),
 						_: 1
 					}, 8, ["icon"])) : (0, vue.createCommentVNode)("v-if", true)]),
-					"add-button": (0, vue.withCtx)(({ trigger }) => [addable.value ? ((0, vue.openBlock)(), (0, vue.createBlock)((0, vue.unref)(_tmagic_design.TMagicButton), (0, vue.mergeProps)({
-						key: 0,
+					_: 2
+				}, [(0, vue.unref)(addable) ? {
+					name: "add-button",
+					fn: (0, vue.withCtx)(() => [(0, vue.createVNode)((0, vue.unref)(_tmagic_design.TMagicButton), (0, vue.mergeProps)({
 						class: displayMode.value === "table" ? "m-form-table-add-button" : "",
 						size: addButtonSize.value,
 						plain: displayMode.value === "table",
 						icon: (0, vue.unref)(_element_plus_icons_vue.Plus),
 						disabled: __props.disabled
-					}, currentConfig.value.addButtonConfig?.props || { type: "primary" }, { onClick: trigger }), {
+					}, currentConfig.value.addButtonConfig?.props || { type: "primary" }, { onClick: (0, vue.unref)(newHandler) }), {
 						default: (0, vue.withCtx)(() => [(0, vue.createTextVNode)((0, vue.toDisplayString)(currentConfig.value.addButtonConfig?.text || (displayMode.value === "table" ? "新增一行" : "新增")), 1)]),
 						_: 1
 					}, 16, [
@@ -5883,9 +5863,9 @@
 						"icon",
 						"disabled",
 						"onClick"
-					])) : (0, vue.createCommentVNode)("v-if", true)]),
-					_: 1
-				}, 16, [
+					])]),
+					key: "0"
+				} : void 0]), 1040, [
 					"model",
 					"name",
 					"config",