fm453/nocobase
1
0
Fork 0
mirror of https://gitee.com/nocobase/nocobase.git synced 2025-07-01 18:52:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: datetime parser of YYYYMMDD format (#5891)

Browse Source 
* fix: parse number format in date only field

* chore: test

* chore: build
This commit is contained in:
ChengLei Shao 2024-12-16 09:26:03 +08:00 committed by GitHub
parent fbe63b1712
commit fef379d9bf
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
packages/core/database/src/interfaces/datetime-interface.ts
View File

@ -66,6 +66,14 @@ export class DatetimeInterface extends BaseInterface {
return null;
}
if (typeof value === 'number') {
const valueStr = value.toString();
const dateOnlyMatch = /^(\d{4})[-/]?(\d{2})[-/]?(\d{2})$/.exec(valueStr);
if (dateOnlyMatch) {
value = valueStr;
}
}
if (typeof value === 'string') {
const dateInfo = this.parseDateString(value);
if (dateInfo) {

14
packages/plugins/@nocobase/plugin-action-import/src/server/__tests__/xlsx-importer.test.ts
View File

@ -105,6 +105,7 @@ describe('xlsx importer', () => {
[
['test', 77383],
['test2', '2021-10-18'],
['test3', 20241112],
],
{ origin: 'A2' },
);
@ -121,6 +122,7 @@ describe('xlsx importer', () => {
const users = (await User.repository.find()).map((user) => user.toJSON());
expect(users[0]['dateOnly']).toBe('2111-11-12');
expect(users[1]['dateOnly']).toBe('2021-10-18');
expect(users[2]['dateOnly']).toBe('2024-11-12');
});
it.skipIf(process.env['DB_DIALECT'] === 'sqlite')('should import with datetimeNoTz', async () => {
@ -190,7 +192,15 @@ describe('xlsx importer', () => {
const worksheet = template.Sheets[template.SheetNames[0]];
XLSX.utils.sheet_add_aoa(worksheet, [['test', 77383]], { origin: 'A2' });
XLSX.utils.sheet_add_aoa(
worksheet,
[
['test', 77383],
['test2', 20241112],
['test3', '2024-11-12'],
],
{ origin: 'A2' },
);
const importer = new XlsxImporter({
collectionManager: app.mainDataSource.collectionManager,
@ -203,6 +213,8 @@ describe('xlsx importer', () => {
const users = (await User.repository.find()).map((user) => user.toJSON());
expect(moment(users[0]['unixTimestamp']).toISOString()).toEqual('2111-11-12T00:00:00.000Z');
expect(moment(users[1]['unixTimestamp'])).toBeDefined();
expect(moment(users[2]['unixTimestamp'])).toBeDefined();
});
it('should import with datetimeTz', async () => {