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

fix: default sort with multi filter target keys (#5404)

Browse Source
This commit is contained in:
ChengLei Shao 2024-10-13 12:58:38 +08:00 committed by GitHub
parent 22ab8f1e78
commit 5d11c3cb74
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
packages/core/database/src/options-parser.ts
View File

@ -138,10 +138,10 @@ export class OptionsParser {
sort = sort.split(','); sort = sort.split(',');
} }
let defaultSortField = this.model.primaryKeyAttribute; let defaultSortField: Array<string> | string = this.model.primaryKeyAttribute;
if (Array.isArray(this.collection.filterTargetKey) && this.collection.filterTargetKey.length == 1) { if (Array.isArray(this.collection.filterTargetKey)) {
defaultSortField = this.collection.filterTargetKey[0]; defaultSortField = this.collection.filterTargetKey;
} }
if (!defaultSortField && this.collection.filterTargetKey && !Array.isArray(this.collection.filterTargetKey)) { if (!defaultSortField && this.collection.filterTargetKey && !Array.isArray(this.collection.filterTargetKey)) {
@ -149,8 +149,11 @@ export class OptionsParser {
} }
if (defaultSortField && !this.options?.group) { if (defaultSortField && !this.options?.group) {
if (!sort.includes(defaultSortField)) { defaultSortField = lodash.castArray(defaultSortField);
sort.push(defaultSortField); for (const key of defaultSortField) {
if (!sort.includes(key)) {
sort.push(key);
}
} }
} }