Showing
1 changed file
with
7 additions
and
6 deletions
| 1 | <!-- | 1 | <!-- |
| 2 | * @Date: 2022-09-02 10:46:03 | 2 | * @Date: 2022-09-02 10:46:03 |
| 3 | * @LastEditors: hookehuyr hookehuyr@gmail.com | 3 | * @LastEditors: hookehuyr hookehuyr@gmail.com |
| 4 | - * @LastEditTime: 2022-12-09 13:34:21 | 4 | + * @LastEditTime: 2022-12-22 11:14:12 |
| 5 | * @FilePath: /data-table/src/components/PhoneField/index.vue | 5 | * @FilePath: /data-table/src/components/PhoneField/index.vue |
| 6 | * @Description: 手机输入框 | 6 | * @Description: 手机输入框 |
| 7 | --> | 7 | --> |
| ... | @@ -65,16 +65,17 @@ const is_sms = ref(false); | ... | @@ -65,16 +65,17 @@ const is_sms = ref(false); |
| 65 | 65 | ||
| 66 | // 校验函数返回 true 表示校验通过,false 表示不通过 | 66 | // 校验函数返回 true 表示校验通过,false 表示不通过 |
| 67 | const validator = (val) => { | 67 | const validator = (val) => { |
| 68 | - if (!props.item.component_props.required) { | 68 | + if (props.item.component_props.required && !val) { |
| 69 | - // 非必填 | 69 | + return false; |
| 70 | - return true; | 70 | + } else if (!/1\d{10}/.test(val)) { |
| 71 | + return false; | ||
| 71 | } else { | 72 | } else { |
| 72 | - return /1\d{10}/.test(val); | 73 | + return true; |
| 73 | } | 74 | } |
| 74 | }; | 75 | }; |
| 75 | // 错误提示文案 | 76 | // 错误提示文案 |
| 76 | const validatorMessage = (val, rule) => { | 77 | const validatorMessage = (val, rule) => { |
| 77 | - if (!val) { | 78 | + if (props.item.component_props.required && !val) { |
| 78 | return "手机号码不能为空"; | 79 | return "手机号码不能为空"; |
| 79 | } else if (!/1\d{10}/.test(val)) { | 80 | } else if (!/1\d{10}/.test(val)) { |
| 80 | return "请输入正确手机号码"; | 81 | return "请输入正确手机号码"; | ... | ... |
-
Please register or login to post a comment