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

fix: init scope value when all data is null value (#3674)

Browse Source
This commit is contained in:
ChengLei Shao 2024-03-11 19:37:48 +08:00 committed by GitHub
parent f9567d711b
commit 3da2a8af92
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 48 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
packages/core/database/src/__tests__/fields/sort-field.test.ts
View File

@ -90,6 +90,41 @@ describe('string field', () => {
console.log(end - begin);
});
it('should init sorted value with null scopeValue', async () => {
const Test = db.collection({
name: 'tests',
fields: [
{
type: 'string',
name: 'name',
},
{
type: 'string',
name: 'group',
},
],
});
await db.sync();
await Test.repository.create({
values: [
{
group: null,
name: 'r5',
},
{
group: null,
name: 'r6',
},
],
});
Test.setField('sort', { type: 'sort', scopeKey: 'group' });
await db.sync();
});
it('should init sorted value with scopeKey', async () => {
const Test = db.collection({
name: 'tests',

18
packages/core/database/src/fields/sort-field.ts
View File

@ -99,11 +99,19 @@ export class SortField extends Field {
const whereClause =
scopeKey && scopeValue
? `
WHERE ${queryInterface.quoteIdentifier(scopeKey)} IN (${scopeValue
.filter((v) => v !== null)
.map((v) => `'${v}'`)
.join(', ')})${scopeValue.includes(null) ? ` OR ${queryInterface.quoteIdentifier(scopeKey)} IS NULL` : ''}`
? (() => {
const filteredScopeValue = scopeValue.filter((v) => v !== null);
if (filteredScopeValue.length === 0) {
return '';
}
const initialClause = `
WHERE ${queryInterface.quoteIdentifier(scopeKey)} IN (${filteredScopeValue.map((v) => `'${v}'`).join(', ')})`;
const nullCheck = scopeValue.includes(null)
? ` OR ${queryInterface.quoteIdentifier(scopeKey)} IS NULL`
: '';
return initialClause + nullCheck;
})()
: '';
if (this.collection.db.inDialect('postgres')) {