mirrors/nocobase
1
0
Fork 0
mirror of https://github.com/nocobase/nocobase synced 2024-11-15 11:36:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

chore: displayInAssociation

Browse Source
This commit is contained in:
Chareice 2024-10-24 15:26:53 +08:00
parent 29ab715daa
commit 0289d9bdfd
No known key found for this signature in database
1 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
packages/plugins/@nocobase/plugin-data-source-main/src/server/server.ts
View File

@ -432,6 +432,21 @@ export class PluginDataSourceMainServer extends Plugin {
} }
}); });
// set final options
field.set('options', newOptions);
} else {
const collectionField = this.app.db.getCollection(field.get('collectionName'))?.getField(field.get('name'));
const newOptions: any = {};
// merge with current field options
lodash.mergeWith(newOptions, field.get(), (objValue, srcValue) => {
if (srcValue === null) {
return objValue;
}
});
if (collectionField.options.displayInAssociation !== undefined) {
newOptions.displayInAssociation = collectionField.options.displayInAssociation;
}
// set final options // set final options
field.set('options', newOptions); field.set('options', newOptions);
} }
@ -448,10 +463,8 @@ export class PluginDataSourceMainServer extends Plugin {
ctx.action.params?.paginate == 'false' ctx.action.params?.paginate == 'false'
) { ) {
for (const collection of ctx.body) { for (const collection of ctx.body) {
if (collection.get('view')) { const fields = collection.fields;
const fields = collection.fields; handleFieldSource(fields);
handleFieldSource(fields);
}
} }
} }