Merge branch 'main' into next

This commit is contained in:
nocobase[bot] 2024-12-12 08:35:12 +00:00
commit 1cd24dfe18

View File

@ -172,12 +172,19 @@ const InternalFileManager = (props) => {
if (designable) { if (designable) {
insertSelector(schema.Selector); insertSelector(schema.Selector);
} else { } else {
fieldSchema.addProperty('selector', schema.Selector); const selectSchema = fieldSchema.reduceProperties((buf, s) => {
if (s['x-component'] === 'AssociationField.Selector') {
return s;
}
return buf;
}, null);
if (!selectSchema) {
fieldSchema.addProperty('selector', schema.Selector);
}
} }
setVisibleSelector(true); setVisibleSelector(true);
setSelectedRows([]); setSelectedRows([]);
}; };
useEffect(() => { useEffect(() => {
if (value && Object.keys(value).length > 0) { if (value && Object.keys(value).length > 0) {
const opts = (Array.isArray(value) ? value : value ? [value] : []).filter(Boolean).map((option) => { const opts = (Array.isArray(value) ? value : value ? [value] : []).filter(Boolean).map((option) => {