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

Merge branch 'main' into next

Browse Source
This commit is contained in:
nocobase[bot] 2025-04-28 13:17:32 +00:00
commit 973038a2e9
4 changed files with 70 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
packages/core/database/src/__tests__/fields/string-field.test.ts
View File

@ -119,4 +119,32 @@ describe('string field', () => {
name: 'n1',
});
});
it('trim when value is null should be null', async () => {
const collection = db.collection({
name: 'tests',
fields: [{ type: 'string', name: 'name', trim: true }],
});
await db.sync();
const model = await collection.model.create({
name: null,
});
expect(model.toJSON()).toMatchObject({
name: null,
});
});
it('when value is number should be convert to string', async () => {
const collection = db.collection({
name: 'tests',
fields: [{ type: 'string', name: 'name', trim: true }],
});
await db.sync();
const model = await collection.model.create({
name: 123,
});
expect(model.toJSON()).toMatchObject({
name: '123',
});
});
});

28
packages/core/database/src/__tests__/fields/text-field.test.ts
View File

@ -66,4 +66,32 @@ describe('text field', () => {
name: 'n1',
});
});
it('trim when value is null should be null', async () => {
const collection = db.collection({
name: 'tests',
fields: [{ type: 'string', name: 'name', trim: true }],
});
await db.sync();
const model = await collection.model.create({
name: null,
});
expect(model.toJSON()).toMatchObject({
name: null,
});
});
it('when value is number should be convert to string', async () => {
const collection = db.collection({
name: 'tests',
fields: [{ type: 'string', name: 'name', trim: true }],
});
await db.sync();
const model = await collection.model.create({
name: 123,
});
expect(model.toJSON()).toMatchObject({
name: '123',
});
});
});

8
packages/core/database/src/fields/string-field.ts
View File

@ -24,7 +24,13 @@ export class StringField extends Field {
return {
set(value) {
this.setDataValue(name, trim ? value?.trim() : value);
if (value == null) {
return value;
}
if (typeof value !== 'string') {
value = value.toString();
}
this.setDataValue(name, trim ? value.trim() : value);
},
};
}

8
packages/core/database/src/fields/text-field.ts
View File

@ -29,7 +29,13 @@ export class TextField extends Field {
return {
set(value) {
this.setDataValue(name, trim ? value?.trim() : value);
if (value == null) {
return value;
}
if (typeof value !== 'string') {
value = value.toString();
}
this.setDataValue(name, trim ? value.trim() : value);
},
};
}