@tmagic/form 1.8.0-beta.27 → 1.8.0-beta.29

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

@@ -1,15 +1,15 @@
+import { getGroupListHeaderVars } from "../utils/tableGroupList.js";
 import GroupListItem_default from "./GroupListItem.js";
-import { Fragment, computed, createBlock, createCommentVNode, createElementBlock, createElementVNode, createSlots, defineComponent, mergeProps, normalizeClass, openBlock, renderList, renderSlot, toDisplayString, withCtx } from "vue";
+import { Fragment, computed, createBlock, createCommentVNode, createElementBlock, createElementVNode, createSlots, defineComponent, mergeProps, normalizeClass, normalizeStyle, openBlock, renderList, renderSlot, toDisplayString, withCtx } from "vue";
 import { cloneDeep } from "lodash-es";
 //#region packages/form/src/containers/GroupList.vue?vue&type=script&setup=true&lang.ts
-var _hoisted_1 = { class: "m-fields-group-list" };
-var _hoisted_2 = ["innerHTML"];
-var _hoisted_3 = {
+var _hoisted_1 = ["innerHTML"];
+var _hoisted_2 = {
 	key: 1,
 	class: "el-table__empty-block"
 };
-var _hoisted_4 = { class: "el-table__empty-text t-table__empty" };
-var _hoisted_5 = { style: {
+var _hoisted_3 = { class: "el-table__empty-text t-table__empty" };
+var _hoisted_4 = { style: {
 	"display": "flex",
 	"justify-content": "flex-end",
 	"flex": "1"
@@ -54,6 +54,14 @@ var GroupList_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ define
 		};
 		const onAddDiffCount = () => emit("addDiffCount");
 		const asList = (value) => Array.isArray(value) ? value : [];
+		const headerVars = computed(() => getGroupListHeaderVars(props.config.header));
+		/**
+		* 取 `$slots` 而不是 `useSlots()`：宿主切换 `addable` 时插槽会增删，
+		* computed 缓存不随插槽变化失效，只有在渲染期读才拿得到最新的。
+		*/
+		const hasFooter = (slots) => !props.isCompare && Boolean(slots["toggle-button"] || slots["add-button"]);
+		/** 只有真的渲染出吸底 footer，内层列表才需要为它让位 */
+		const isFooterSticky = (slots) => hasFooter(slots) && Boolean(props.config.addButtonConfig?.sticky);
 		const currentList = computed(() => asList(props.model[props.name]));
 		/** 对比时按当前/历史较长一侧对齐，已删除的项也能渲染出来 */
 		const displayItems = computed(() => {
@@ -71,13 +79,19 @@ var GroupList_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ define
 			}));
 		});
 		return (_ctx, _cache) => {
-			return openBlock(), createElementBlock("div", _hoisted_1, [
+			return openBlock(), createElementBlock("div", {
+				class: normalizeClass(["m-fields-group-list", {
+					"is-header-sticky": Boolean(__props.config.header?.sticky),
+					"is-footer-sticky": isFooterSticky(_ctx.$slots)
+				}]),
+				style: normalizeStyle(headerVars.value)
+			}, [
 				__props.config.extra ? (openBlock(), createElementBlock("div", {
 					key: 0,
 					innerHTML: __props.config.extra,
 					style: { "color": "rgba(0, 0, 0, 0.45)" }
-				}, null, 8, _hoisted_2)) : createCommentVNode("v-if", true),
-				!displayItems.value.length ? (openBlock(), createElementBlock("div", _hoisted_3, [createElementVNode("span", _hoisted_4, "暂无" + toDisplayString(__props.config.titlePrefix || "") + "数据", 1)])) : (openBlock(true), createElementBlock(Fragment, { key: 2 }, renderList(displayItems.value, (entry) => {
+				}, null, 8, _hoisted_1)) : createCommentVNode("v-if", true),
+				!displayItems.value.length ? (openBlock(), createElementBlock("div", _hoisted_2, [createElementVNode("span", _hoisted_3, "暂无" + toDisplayString(__props.config.titlePrefix || "") + "数据", 1)])) : (openBlock(true), createElementBlock(Fragment, { key: 2 }, renderList(displayItems.value, (entry) => {
 					return openBlock(), createBlock(GroupListItem_default, {
 						key: entry.index,
 						model: entry.item,
@@ -114,11 +128,11 @@ var GroupList_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ define
 						"group-model"
 					]);
 				}), 128)),
-				!__props.isCompare && (_ctx.$slots["toggle-button"] || _ctx.$slots["add-button"]) ? (openBlock(), createElementBlock("div", {
+				hasFooter(_ctx.$slots) ? (openBlock(), createElementBlock("div", {
 					key: 3,
 					class: normalizeClass(["m-fields-group-list-footer", { "is-sticky-full": Boolean(__props.config.addButtonConfig?.sticky) }])
-				}, [renderSlot(_ctx.$slots, "toggle-button"), createElementVNode("div", _hoisted_5, [renderSlot(_ctx.$slots, "add-button")])], 2)) : createCommentVNode("v-if", true)
-			]);
+				}, [renderSlot(_ctx.$slots, "toggle-button"), createElementVNode("div", _hoisted_4, [renderSlot(_ctx.$slots, "add-button")])], 2)) : createCommentVNode("v-if", true)
+			], 6);
 		};
 	}
 });

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

@@ -120,14 +120,17 @@ var Text_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defineCompo
 			const ctrl = navigator.platform.match("Mac") ? $event.metaKey : $event.ctrlKey;
 			const shift = $event.shiftKey;
 			const alt = $event.altKey;
-			if (arrowUp) if (ctrl) num += 100;
-			else if (alt) num = (num * 1e4 + 1e3) / 1e4;
-			else if (shift) num = num + 10;
-			else num += 1;
-			else if (arrowDown) if (ctrl) num -= 100;
-			else if (alt) num = (num * 1e4 - 1e3) / 1e4;
-			else if (shift) num -= 10;
-			else num -= 1;
+			if (arrowUp) {
+				if (ctrl) num += 100;
+				else if (alt) num = (num * 1e4 + 1e3) / 1e4;
+				else if (shift) num = num + 10;
+				else num += 1;
+			} else if (arrowDown) {
+				if (ctrl) num -= 100;
+				else if (alt) num = (num * 1e4 - 1e3) / 1e4;
+				else if (shift) num -= 10;
+				else num -= 1;
+			}
 			props.model[props.name] = `${num}${unit || ""}`;
 			emit("change", props.model[props.name]);
 		};

package/dist/es/style.css

@@ -333,18 +333,48 @@ fieldset.m-fieldset .m-form-tip {
   flex-shrink: 0;
   gap: 8px;
 }
-.m-fields-group-list .m-fields-group-list-item > .el-card__header,
-.m-fields-group-list .m-fields-group-list-item > .t-card__header {
+.m-fields-group-list > .m-fields-group-list-item {
+  --m-group-list-item-footer-bottom: var(
+    --m-group-list-nested-footer-bottom,
+    0px
+  );
+}
+.m-fields-group-list.is-footer-sticky > .m-fields-group-list-item {
+  --m-group-list-item-footer-bottom: calc(
+    var(--m-group-list-nested-footer-bottom, 0px) +
+      var(--m-group-list-footer-height)
+  );
+}
+.m-fields-group-list .m-fields-group-list-item .m-fields-group-list {
+  --m-group-list-nested-footer-bottom: var(
+    --m-group-list-item-footer-bottom,
+    0px
+  );
+}
+.m-fields-group-list.is-header-sticky {
+  --m-group-list-nested-sticky-top: var(--m-group-list-child-list-sticky-top);
+  --m-group-list-nested-header-z: var(--m-group-list-child-list-header-z);
+}
+.m-fields-group-list.is-header-sticky > .m-fields-group-list-item {
+  --m-group-list-item-sticky-top: var(
+    --m-group-list-nested-sticky-top,
+    var(--m-group-list-header-sticky-top, 0px)
+  );
+  --m-group-list-item-header-z: var(--m-group-list-nested-header-z, 7);
+  --m-group-list-child-list-sticky-top: calc(
+    var(--m-group-list-item-sticky-top) + var(--m-group-list-header-height)
+  );
+  --m-group-list-child-list-header-z: calc(
+    var(--m-group-list-item-header-z) - 1
+  );
+}
+.m-fields-group-list.is-header-sticky > .m-fields-group-list-item > .el-card__header,
+.m-fields-group-list.is-header-sticky > .m-fields-group-list-item > .t-card__header {
   position: sticky;
-  top: var(--m-group-list-header-sticky-top, 0px);
-  z-index: 7;
+  top: var(--m-group-list-item-sticky-top);
+  z-index: var(--m-group-list-item-header-z);
   background-color: var(--m-group-list-header-bg, #fff);
 }
-.m-fields-group-list .m-fields-group-list-item .m-fields-group-list-item > .el-card__header,
-.m-fields-group-list .m-fields-group-list-item .m-fields-group-list-item > .t-card__header {
-  top: calc(var(--m-group-list-header-sticky-top, 0px) + var(--m-group-list-header-height));
-  z-index: 6;
-}
 .m-fields-group-list .el-table__empty-block {
   width: 100%;
   min-height: 0;
@@ -362,7 +392,7 @@ fieldset.m-fieldset .m-form-tip {
 }
 .m-fields-group-list > .m-fields-group-list-footer.is-sticky-full {
   position: sticky;
-  bottom: 0;
+  bottom: var(--m-group-list-nested-footer-bottom, 0px);
   z-index: 7;
   margin-bottom: 0;
   padding: var(--m-group-list-footer-padding-top) 0 var(--m-group-list-footer-padding-bottom);
@@ -376,10 +406,6 @@ fieldset.m-fieldset .m-form-tip {
   width: 100%;
   height: var(--m-group-list-footer-button-height);
 }
-.m-fields-group-list .m-fields-group-list-item .m-fields-group-list > .m-fields-group-list-footer.is-sticky-full {
-  bottom: var(--m-group-list-footer-height);
-  z-index: 7;
-}
 
 /** 最外层的groupList需要每个item需要增加空白区域界限时，增加outer-gorup_list可以实现 */
 .m-container-group-list.outer-gorup_list > .m-fields-group-list > .m-fields-group-list-item {

package/dist/es/utils/form.js

@@ -192,16 +192,20 @@ var resolveItemType = (mForm, config, props) => {
 	return type?.replace(/([A-Z])/g, "-$1").toLowerCase() || (config?.items ? "" : "text");
 };
 var filterFunction = (mForm, config, props) => {
-	if (typeof config === "function") return config(mForm, {
-		values: readonly(mForm?.initValues || {}),
-		model: readonly(props.model),
-		parent: readonly(mForm?.parentValues || {}),
-		formValue: readonly(mForm?.values || props.model),
-		prop: props.prop,
-		config: props.config,
-		index: props.index,
-		getFormValue: (prop) => getValueByKeyPath(prop, mForm?.values || props.model)
-	});
+	if (typeof config === "function") {
+		const formValue = readonly(mForm?.values || props.model);
+		return config(mForm, {
+			values: readonly(mForm?.initValues || {}),
+			model: readonly(props.model),
+			parent: readonly(mForm?.parentValues || {}),
+			formValue,
+			formValues: formValue,
+			prop: props.prop,
+			config: props.config,
+			index: props.index,
+			getFormValue: (prop) => getValueByKeyPath(prop, mForm?.values || props.model)
+		});
+	}
 	return config;
 };
 var display = function(mForm, config, props) {

package/dist/es/utils/tableGroupList.js

@@ -1,4 +1,5 @@
 import { cloneDeep } from "lodash-es";
+import { isNumber } from "@tmagic/utils";
 //#region packages/form/src/utils/tableGroupList.ts
 /**
 * table / group-list 是同一份配置的两种展示形态，可以互相切换（`TableGroupList.vue`）。
@@ -9,6 +10,24 @@ import { cloneDeep } from "lodash-es";
 */
 /** group-list 形态的 type（兼容驼峰与中划线两种写法） */
 var isGroupListType = (type) => type === "groupList" || type === "group-list";
+/**
+* 归一成带单位的 CSS 长度。
+*
+* 配置常常来自 JSON 或表单输入，`'48'` 这类无单位数字串很常见；直接写进 CSS 变量会让
+* 嵌套层的 `calc()` 整体失效、吸顶静默失灵，所以纯数字一律补 `px`。
+*/
+var toCssLength = (height) => {
+	const value = `${height ?? ""}`.trim();
+	if (!value) return void 0;
+	if (isNumber(value)) return `${value}px`;
+	return typeof height === "number" ? void 0 : value;
+};
+/** header.sticky 开启时把 height 写成 CSS 变量，给嵌套吸顶偏移用 */
+var getGroupListHeaderVars = (header) => {
+	if (!header?.sticky) return void 0;
+	const height = toCssLength(header.height);
+	return height ? { "--m-group-list-header-height": height } : void 0;
+};
 /** 按 label 文案长度估算 label 宽度（中文按 20px、其他按 8px，最小 80px） */
 var calcLabelWidth = (label) => {
 	if (!label) return "0px";
@@ -82,4 +101,4 @@ var makeTableColumnConfig = (column, row) => {
 	return newConfig;
 };
 //#endregion
-export { calcLabelWidth, getGroupListRowConfig, isGroupListType, isTableColumnRendered, makeTableColumnConfig, toGroupListConfig, toTableConfig };
+export { calcLabelWidth, getGroupListHeaderVars, getGroupListRowConfig, isGroupListType, isTableColumnRendered, makeTableColumnConfig, toGroupListConfig, toTableConfig };

package/dist/es/utils/typeMatch.js

@@ -8,6 +8,14 @@ dayjs.extend(customParseFormat);
 var extraTypeMatchRules = /* @__PURE__ */ new Map();
 var builtInTypeMatchRules = /* @__PURE__ */ new Map();
 var isPromise = (value) => typeof value === "object" && value !== null && typeof value.then === "function";
+/**
+* 同步校验无法等待 Promise。调用方会丢掉返回值，这里挂上空 handler，避免变成未捕获 rejection。
+*/
+var ignorePromise = (value) => {
+	if (!isPromise(value)) return false;
+	value.then(() => {}, () => {});
+	return true;
+};
 /** 注册或覆盖某个字段 type 的 typeMatch 校验规则。`builtIn` 登记不受 `clearTypeMatchRules` / `deleteTypeMatchRule` 影响。 */
 var registerTypeMatchRule = (type, validator, builtIn = false) => {
 	(builtIn ? builtInTypeMatchRules : extraTypeMatchRules).set(toLine(type), validator);
@@ -25,16 +33,20 @@ var clearTypeMatchRules = () => {
 };
 /** 本地解析配置函数，避免与 form.ts 循环依赖 */
 var resolveConfig = (mForm, config, props) => {
-	if (typeof config === "function") return config(mForm, {
-		values: readonly(mForm?.initValues || {}),
-		model: readonly(props.model),
-		parent: readonly(mForm?.parentValues || {}),
-		formValue: readonly(mForm?.values || props.model),
-		prop: props.prop,
-		config: props.config,
-		index: props.index,
-		getFormValue: (prop) => getValueByKeyPath(prop, mForm?.values || props.model)
-	});
+	if (typeof config === "function") {
+		const formValue = readonly(mForm?.values || props.model);
+		return config(mForm, {
+			values: readonly(mForm?.initValues || {}),
+			model: readonly(props.model),
+			parent: readonly(mForm?.parentValues || {}),
+			formValue,
+			formValues: formValue,
+			prop: props.prop,
+			config: props.config,
+			index: props.index,
+			getFormValue: (prop) => getValueByKeyPath(prop, mForm?.values || props.model)
+		});
+	}
 	return config;
 };
 var SKIP_TYPES = /* @__PURE__ */ new Set([
@@ -126,7 +138,7 @@ var resolveFieldDefaultValue = (mForm, props) => {
 	const { defaultValue } = props.config || {};
 	if (typeof defaultValue === "undefined" || defaultValue === "undefined") return void 0;
 	const resolvedDefaultValue = resolveConfig(mForm, defaultValue, props);
-	if (isPromise(resolvedDefaultValue)) return;
+	if (ignorePromise(resolvedDefaultValue)) return;
 	return resolvedDefaultValue;
 };
 var isNumberValue = (value) => typeof value === "number" && !Number.isNaN(value);
@@ -203,9 +215,21 @@ var flattenSelectOptions = (options) => {
 	});
 	return values;
 };
-var resolveOptions = (props) => {
-	const { options } = props.config || {};
-	return Array.isArray(options) ? options : [];
+/**
+* 解析字段 options：静态数组原样返回；函数型与 `display` / `type` 一样当场求值。
+*
+* 函数返回 Promise、非数组或抛错时当作「还没有可选项」，交由调用方按空 options 跳过枚举。
+* `remote` / `allowCreate` 仍由 `validateSelectValue` 单独放行，不在这里区分。
+*/
+var resolveOptions = (mForm, props) => {
+	let resolved;
+	try {
+		resolved = resolveConfig(mForm, props.config?.options, props);
+	} catch {
+		return [];
+	}
+	if (ignorePromise(resolved) || !Array.isArray(resolved)) return [];
+	return resolved;
 };
 var includesOptionValue = (optionValues, value) => optionValues.some((item) => Object.is(item, value));
 var collectCascaderLeafValues = (options, result = []) => {
@@ -267,19 +291,18 @@ var validateSelectValue = (value, config, optionValues, message) => {
 		if (typeof value === "object") return defaultMessage(message, `${value} 类型不合法`, optionExampleSuggestion(optionValues, "\"文本内容\" 或 123", false));
 		return;
 	}
-	const isStaticOptions = Array.isArray(config.options);
 	if (config.multiple) {
 		if (!Array.isArray(value)) return defaultMessage(message, `${value} 类型应为数组`, optionExampleSuggestion(optionValues, "[\"选项1\", \"选项2\"]", true));
-		if (isStaticOptions && value.some((item) => !includesOptionValue(optionValues, item))) return defaultMessage(message, `${value} 不在可选项中`, optionSuggestion(optionValues));
+		if (value.some((item) => !includesOptionValue(optionValues, item))) return defaultMessage(message, `${value} 不在可选项中`, optionSuggestion(optionValues));
 		return;
 	}
-	if (isStaticOptions && !includesOptionValue(optionValues, value)) return defaultMessage(message, `${value} 不在可选项中`, optionSuggestion(optionValues));
+	if (!includesOptionValue(optionValues, value)) return defaultMessage(message, `${value} 不在可选项中`, optionSuggestion(optionValues));
 };
 var validateCascaderValue = (value, config, props, mForm, message) => {
-	const options = resolveOptions(props);
+	const options = resolveOptions(mForm, props);
 	if (!options.length) return;
 	const valueSeparator = resolveConfig(mForm, config.valueSeparator, props);
-	if (isPromise(valueSeparator)) return;
+	if (ignorePromise(valueSeparator)) return;
 	const emitPath = config.emitPath !== false;
 	const multiple = Boolean(config.multiple);
 	const cascaderExample = (fallbackExample) => cascaderExampleSuggestion(options, config, valueSeparator, fallbackExample);
@@ -336,15 +359,15 @@ 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(props)), message);
+	if (fieldType === "select") return validateSelectValue(value, config, flattenSelectOptions(resolveOptions(mForm, props)), message);
 	if (fieldType === "radio-group") {
-		const optionValues = flattenSelectOptions(resolveOptions(props));
+		const optionValues = flattenSelectOptions(resolveOptions(mForm, 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(props));
+		const optionValues = flattenSelectOptions(resolveOptions(mForm, 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));
@@ -371,8 +394,14 @@ var validateTypeMatch = (value, mForm, props, message) => {
 	if (isEmptyValue(value) || isEmptyArray(value)) return;
 	if (!props.config?.name) return;
 	const rawFieldType = "type" in (props.config || {}) ? props.config.type : "";
-	if (typeof rawFieldType !== "string" || !rawFieldType) return;
-	const fieldType = toLine(rawFieldType);
+	let resolvedType;
+	try {
+		resolvedType = resolveConfig(mForm, rawFieldType, props);
+	} catch {
+		return;
+	}
+	if (ignorePromise(resolvedType) || typeof resolvedType !== "string" || !resolvedType) return;
+	const fieldType = toLine(resolvedType);
 	const customValidator = getTypeMatchRule(fieldType);
 	if (customValidator) return customValidator(value, {
 		fieldType,

package/dist/style.css

@@ -333,18 +333,48 @@ fieldset.m-fieldset .m-form-tip {
   flex-shrink: 0;
   gap: 8px;
 }
-.m-fields-group-list .m-fields-group-list-item > .el-card__header,
-.m-fields-group-list .m-fields-group-list-item > .t-card__header {
+.m-fields-group-list > .m-fields-group-list-item {
+  --m-group-list-item-footer-bottom: var(
+    --m-group-list-nested-footer-bottom,
+    0px
+  );
+}
+.m-fields-group-list.is-footer-sticky > .m-fields-group-list-item {
+  --m-group-list-item-footer-bottom: calc(
+    var(--m-group-list-nested-footer-bottom, 0px) +
+      var(--m-group-list-footer-height)
+  );
+}
+.m-fields-group-list .m-fields-group-list-item .m-fields-group-list {
+  --m-group-list-nested-footer-bottom: var(
+    --m-group-list-item-footer-bottom,
+    0px
+  );
+}
+.m-fields-group-list.is-header-sticky {
+  --m-group-list-nested-sticky-top: var(--m-group-list-child-list-sticky-top);
+  --m-group-list-nested-header-z: var(--m-group-list-child-list-header-z);
+}
+.m-fields-group-list.is-header-sticky > .m-fields-group-list-item {
+  --m-group-list-item-sticky-top: var(
+    --m-group-list-nested-sticky-top,
+    var(--m-group-list-header-sticky-top, 0px)
+  );
+  --m-group-list-item-header-z: var(--m-group-list-nested-header-z, 7);
+  --m-group-list-child-list-sticky-top: calc(
+    var(--m-group-list-item-sticky-top) + var(--m-group-list-header-height)
+  );
+  --m-group-list-child-list-header-z: calc(
+    var(--m-group-list-item-header-z) - 1
+  );
+}
+.m-fields-group-list.is-header-sticky > .m-fields-group-list-item > .el-card__header,
+.m-fields-group-list.is-header-sticky > .m-fields-group-list-item > .t-card__header {
   position: sticky;
-  top: var(--m-group-list-header-sticky-top, 0px);
-  z-index: 7;
+  top: var(--m-group-list-item-sticky-top);
+  z-index: var(--m-group-list-item-header-z);
   background-color: var(--m-group-list-header-bg, #fff);
 }
-.m-fields-group-list .m-fields-group-list-item .m-fields-group-list-item > .el-card__header,
-.m-fields-group-list .m-fields-group-list-item .m-fields-group-list-item > .t-card__header {
-  top: calc(var(--m-group-list-header-sticky-top, 0px) + var(--m-group-list-header-height));
-  z-index: 6;
-}
 .m-fields-group-list .el-table__empty-block {
   width: 100%;
   min-height: 0;
@@ -362,7 +392,7 @@ fieldset.m-fieldset .m-form-tip {
 }
 .m-fields-group-list > .m-fields-group-list-footer.is-sticky-full {
   position: sticky;
-  bottom: 0;
+  bottom: var(--m-group-list-nested-footer-bottom, 0px);
   z-index: 7;
   margin-bottom: 0;
   padding: var(--m-group-list-footer-padding-top) 0 var(--m-group-list-footer-padding-bottom);
@@ -376,10 +406,6 @@ fieldset.m-fieldset .m-form-tip {
   width: 100%;
   height: var(--m-group-list-footer-button-height);
 }
-.m-fields-group-list .m-fields-group-list-item .m-fields-group-list > .m-fields-group-list-footer.is-sticky-full {
-  bottom: var(--m-group-list-footer-height);
-  z-index: 7;
-}
 
 /** 最外层的groupList需要每个item需要增加空白区域界限时，增加outer-gorup_list可以实现 */
 .m-container-group-list.outer-gorup_list > .m-fields-group-list > .m-fields-group-list-item {

package/dist/themes/magic-admin.css

@@ -333,18 +333,48 @@ fieldset.m-fieldset .m-form-tip {
   flex-shrink: 0;
   gap: 8px;
 }
-.m-fields-group-list .m-fields-group-list-item > .el-card__header,
-.m-fields-group-list .m-fields-group-list-item > .t-card__header {
+.m-fields-group-list > .m-fields-group-list-item {
+  --m-group-list-item-footer-bottom: var(
+    --m-group-list-nested-footer-bottom,
+    0px
+  );
+}
+.m-fields-group-list.is-footer-sticky > .m-fields-group-list-item {
+  --m-group-list-item-footer-bottom: calc(
+    var(--m-group-list-nested-footer-bottom, 0px) +
+      var(--m-group-list-footer-height)
+  );
+}
+.m-fields-group-list .m-fields-group-list-item .m-fields-group-list {
+  --m-group-list-nested-footer-bottom: var(
+    --m-group-list-item-footer-bottom,
+    0px
+  );
+}
+.m-fields-group-list.is-header-sticky {
+  --m-group-list-nested-sticky-top: var(--m-group-list-child-list-sticky-top);
+  --m-group-list-nested-header-z: var(--m-group-list-child-list-header-z);
+}
+.m-fields-group-list.is-header-sticky > .m-fields-group-list-item {
+  --m-group-list-item-sticky-top: var(
+    --m-group-list-nested-sticky-top,
+    var(--m-group-list-header-sticky-top, 0px)
+  );
+  --m-group-list-item-header-z: var(--m-group-list-nested-header-z, 7);
+  --m-group-list-child-list-sticky-top: calc(
+    var(--m-group-list-item-sticky-top) + var(--m-group-list-header-height)
+  );
+  --m-group-list-child-list-header-z: calc(
+    var(--m-group-list-item-header-z) - 1
+  );
+}
+.m-fields-group-list.is-header-sticky > .m-fields-group-list-item > .el-card__header,
+.m-fields-group-list.is-header-sticky > .m-fields-group-list-item > .t-card__header {
   position: sticky;
-  top: var(--m-group-list-header-sticky-top, 0px);
-  z-index: 7;
+  top: var(--m-group-list-item-sticky-top);
+  z-index: var(--m-group-list-item-header-z);
   background-color: var(--m-group-list-header-bg, #fff);
 }
-.m-fields-group-list .m-fields-group-list-item .m-fields-group-list-item > .el-card__header,
-.m-fields-group-list .m-fields-group-list-item .m-fields-group-list-item > .t-card__header {
-  top: calc(var(--m-group-list-header-sticky-top, 0px) + var(--m-group-list-header-height));
-  z-index: 6;
-}
 .m-fields-group-list .el-table__empty-block {
   width: 100%;
   min-height: 0;
@@ -362,7 +392,7 @@ fieldset.m-fieldset .m-form-tip {
 }
 .m-fields-group-list > .m-fields-group-list-footer.is-sticky-full {
   position: sticky;
-  bottom: 0;
+  bottom: var(--m-group-list-nested-footer-bottom, 0px);
   z-index: 7;
   margin-bottom: 0;
   padding: var(--m-group-list-footer-padding-top) 0 var(--m-group-list-footer-padding-bottom);
@@ -376,10 +406,6 @@ fieldset.m-fieldset .m-form-tip {
   width: 100%;
   height: var(--m-group-list-footer-button-height);
 }
-.m-fields-group-list .m-fields-group-list-item .m-fields-group-list > .m-fields-group-list-footer.is-sticky-full {
-  bottom: var(--m-group-list-footer-height);
-  z-index: 7;
-}
 
 /** 最外层的groupList需要每个item需要增加空白区域界限时，增加outer-gorup_list可以实现 */
 .m-container-group-list.outer-gorup_list > .m-fields-group-list > .m-fields-group-list-item {