Merge branch 'main' into next

This commit is contained in:
nocobase[bot] 2025-04-17 04:19:18 +00:00
commit 1c343cad66

View File

@ -768,7 +768,7 @@ export const findSchema = (schema: Schema, key: string, action: string, name?: s
if (s[key] === action && (!name || s.name === name)) {
return s;
}
if (s['x-component'] !== 'Action.Container' && !s['x-component'].includes('AssociationField')) {
if (s['x-component'] && s['x-component'] !== 'Action.Container' && !s['x-component'].includes('AssociationField')) {
const c = findSchema(s, key, action, name);
if (c) {
return c;