Merge branch 'main' into next

This commit is contained in:
nocobase[bot] 2025-04-22 03:36:16 +00:00
commit 75aede8ef5

View File

@ -48,6 +48,7 @@ import {
SchemaSettingsItemType,
SchemaToolbarVisibleContext,
VariablesContext,
getZIndex,
useCollection,
useCollectionManager,
useZIndexContext,
@ -697,7 +698,7 @@ export const SchemaSettingsActionModalItem: FC<SchemaSettingsActionModalItemProp
const upLevelActiveFields = useFormActiveFields();
const parentZIndex = useZIndexContext();
const zIndex = parentZIndex + 10;
const zIndex = getZIndex('modal', parentZIndex + 10, 0);
const form = useMemo(
() =>