From a0c8098af01b483f099b231052d3f45a47ba7a58 Mon Sep 17 00:00:00 2001 From: huangkairan Date: Wed, 23 Nov 2022 11:01:54 +0800 Subject: [PATCH 1/2] fix(generate): `dayjs.parse` default strict mode --- src/generate/dayjs.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/generate/dayjs.ts b/src/generate/dayjs.ts index 55deb9e2b..d17aa3a42 100644 --- a/src/generate/dayjs.ts +++ b/src/generate/dayjs.ts @@ -162,7 +162,7 @@ const generateConfig: GenerateConfig = { parseNoMatchNotice(); return null; } - const date = dayjs(formatText, format).locale(localeStr); + const date = dayjs(formatText, format, true).locale(localeStr); if (date.isValid()) { return date; } From fccba0c5dc57d7c2d45523092c72ef19fe3cefdd Mon Sep 17 00:00:00 2001 From: huangkairan Date: Wed, 23 Nov 2022 13:53:21 +0800 Subject: [PATCH 2/2] test(generate): add `parse` test case --- tests/generate.spec.tsx | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/tests/generate.spec.tsx b/tests/generate.spec.tsx index d4f420547..b36732d72 100644 --- a/tests/generate.spec.tsx +++ b/tests/generate.spec.tsx @@ -255,4 +255,13 @@ describe('Generate:dayjs', () => { expect(timea.isValid()).toBeTruthy(); expect(timea.valueOf()).toEqual(timeb.valueOf()); }); + + it('parse', () => { + const timea = dayjsGenerateConfig.locale.parse('en_US', '2022-11-23 13:5' ,['YYYY-MM-DD HH:mm']); + expect(timea).toEqual(null); + + const timeb = dayjsGenerateConfig.locale.parse('en_US', '2022-11-23 13:05' ,['YYYY-MM-DD HH:mm']); + const dateb = dayjsGenerateConfig.locale.format('en_US', timeb, 'YYYY-MM-DD HH:mm'); + expect(dateb).toEqual('2022-11-23 13:05'); + }) });