fm453/nocobase
1
0
Fork 0
mirror of https://gitee.com/nocobase/nocobase.git synced 2025-05-05 13:39:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: merge option with filter target key (#5558)

Browse Source
This commit is contained in:
ChengLei Shao 2024-10-31 21:41:10 +08:00 committed by GitHub
parent 809ae5c011
commit e818195dd1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
packages/core/database/src/collection.ts
View File

@ -653,9 +653,14 @@ export class Collection<
updateOptions(options: CollectionOptions, mergeOptions?: any) { updateOptions(options: CollectionOptions, mergeOptions?: any) {
let newOptions = lodash.cloneDeep(options); let newOptions = lodash.cloneDeep(options);
newOptions = merge(this.options, newOptions, mergeOptions); newOptions = merge(this.options, newOptions, mergeOptions);
this.context.database.emit('beforeUpdateCollection', this, newOptions);
this.options = newOptions;
if (options.filterTargetKey) {
newOptions.filterTargetKey = options.filterTargetKey;
}
this.context.database.emit('beforeUpdateCollection', this, newOptions);
this.options = newOptions;
this.setFields(options.fields, false); this.setFields(options.fields, false);
if (options.repository) { if (options.repository) {
this.setRepository(options.repository); this.setRepository(options.repository);