Skip to content
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

feat(Form): 添加内置校验方法whitespace #1110

Merged
merged 1 commit into from
Jun 30, 2022
Merged

feat(Form): 添加内置校验方法whitespace #1110

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
1 change: 1 addition & 0 deletions examples/form/demos/validator.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ const rules = {
account: [
{ required: true, message: '姓名必填', type: 'error', trigger: 'blur' },
{ required: true, message: '姓名必填', type: 'error', trigger: 'change' },
{ whitespace: true, message: '姓名不能为空' },
{ min: 3, message: '输入字数应在3到6之间', type: 'error', trigger: 'blur' },
{ max: 6, message: '输入字数应在3到6之间', type: 'error', trigger: 'blur' },
],
Expand Down
1 change: 1 addition & 0 deletions examples/form/form.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ min | Number / Boolean | - | 内置校验方法，校验值最小长度，如：
number | Boolean | - | 内置校验方法，校验值是否为数字（1.2 、 1e5 都算数字），示例：`{ number: true, message: '请输入数字' }` | N
pattern | Object | - | 内置校验方法，校验值是否符合正则表达式匹配结果，示例：`{ pattern: /@qq.com/, message: '请输入 QQ 邮箱' }`。TS 类型：`RegExp` | N
required | Boolean | - | 内置校验方法，校验值是否已经填写。该值为 true，默认显示必填标记，可通过设置 `requiredMark: false` 隐藏必填标记 | N
whitespace | Boolean | - | 内置校验方法，校验值是否为空格。示例：`{ whitespace: true, message: '值不能为空' }` | N
telnumber | Boolean | - | 内置校验方法，校验值是否为手机号码，校验正则为 `/^1[3-9]\d{9}$/`，示例：`{ telnumber: true, message: '请输入正确的手机号码' }` | N
trigger | String | change | 校验触发方式。可选项：change/blur | N
type | String | error | 校验未通过时呈现的错误信息类型，有 告警信息提示 和 错误信息提示 等两种。可选项：error/warning | N
Expand Down
1 change: 1 addition & 0 deletions src/form/form-model.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ const VALIDATE_MAP = {
url: isURL,
email: isEmail,
required: (val: ValueType): boolean => !isValueEmpty(val),
whitespace: (val: ValueType): boolean => !(/^\s+$/.test(val) || val === ''),
boolean: (val: ValueType): boolean => typeof val === 'boolean',
max: (val: ValueType, num: number): boolean => (isNumber(val) ? val <= num : getCharacterLength(val) <= num),
min: (val: ValueType, num: number): boolean => (isNumber(val) ? val >= num : getCharacterLength(val) >= num),
Expand Down