Skip to content

fix(Form): fix date rule rejecting YYYY-MM-DD values #4667

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kwy404 wants to merge 1 commit into
base: develop
Choose a base branch
from
+12 −2
Open

fix(Form): fix date rule rejecting YYYY-MM-DD values #4667

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion packages/components/common/validator.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,9 @@ export function isDate(
const delimiter = opts.delimiters.find((d) => opts.format.includes(d));
if (!delimiter) return false;

const dateDelimiter = opts.strictMode ? delimiter : opts.delimiters.find((d) => (input as string).includes(d));
const formatParts = opts.format.split(delimiter);
const dateParts = input.split(delimiter);
const dateParts = input.split(dateDelimiter);
if (formatParts.length !== dateParts.length) return false;

let year = '';
Expand Down
8 changes: 8 additions & 0 deletions packages/components/form-item/__test__/form-model.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
import { validateOneRule } from '../form-model';

describe('form-model', () => {
it(': date rule accepts any allowed delimiter', async () => {
expect((await validateOneRule('2024/01/31', { date: true })).result).toBe(true);
expect((await validateOneRule('2024-01-31', { date: true })).result).toBe(true);
});
});
3 changes: 2 additions & 1 deletion packages/uniapp-components/common/validator.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,8 +84,9 @@ export function isDate(input: string | Date, options?: IsDateOptions): boolean {
const delimiter = opts.delimiters.find((d) => opts.format.includes(d));
if (!delimiter) return false;

const dateDelimiter = opts.strictMode ? delimiter : opts.delimiters.find((d) => (input as string).includes(d));
const formatParts = opts.format.split(delimiter);
const dateParts = input.split(delimiter);
const dateParts = input.split(dateDelimiter);
if (formatParts.length !== dateParts.length) return false;

let year = '';
Expand Down
Loading