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

fix: array operator query error (#217)

Browse Source
This commit is contained in:
ChengLei Shao 2022-03-03 12:09:25 +08:00 committed by GitHub
parent 18b4feb104
commit 4e9baf3957
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 33 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
packages/database/src/__tests__/operator/array-operator.test.ts
View File

@ -152,6 +152,21 @@ describe('array field operator', function () {
expect(filter2[0].get('name')).toEqual(t2.get('name'));
});
test('$anyOf with $and', async () => {
const filter3 = await Test.repository.find({
filter: {
$and: [
{
'selected.$anyOf': ['aa'],
},
],
},
});
expect(filter3.length).toEqual(1);
expect(filter3[0].get('name')).toEqual(t2.get('name'));
});
test('$anyOf', async () => {
const filter3 = await Test.repository.find({
filter: {

20
packages/database/src/filter-parser.ts
View File

@ -121,10 +121,12 @@ export default class FilterParser {
} else if (typeof opKey === 'function') {
skipPrefix = origins.join('.');
value = opKey(lodash.get(unflatten(originalFiler), skipPrefix), {
const queryValue = lodash.get(unflatten(originalFiler), skipPrefix);
value = opKey(queryValue, {
db: this.database,
path: skipPrefix,
fieldName: skipPrefix.replace(`.${firstKey}`, ''),
fieldName: this.getFieldNameFromQueryPath(skipPrefix),
model: this.model,
});
break;
@ -220,4 +222,18 @@ export default class FilterParser {
debug('where %o, include %o', where, include);
return { where, include: toInclude(include) };
}
private getFieldNameFromQueryPath(queryPath: string) {
const paths = queryPath.split('.');
let fieldName;
for (const path of paths) {
if (path.startsWith('$') || !lodash.isNaN(parseInt(path))) {
continue;
}
fieldName = path;
}
return fieldName;
}
}