Showing
2 changed files
with
7 additions
and
7 deletions
| ... | @@ -51,10 +51,10 @@ const HideShow = computed(() => { | ... | @@ -51,10 +51,10 @@ const HideShow = computed(() => { |
| 51 | return !props.item.component_props.disabled | 51 | return !props.item.component_props.disabled |
| 52 | }) | 52 | }) |
| 53 | 53 | ||
| 54 | -// TODO: 等待数据结构更新,看看怎么判断必填 | ||
| 55 | // 校验函数返回 true 表示校验通过,false 表示不通过 | 54 | // 校验函数返回 true 表示校验通过,false 表示不通过 |
| 55 | +const required = props.item.component_props.required; | ||
| 56 | const validator = (val) => { | 56 | const validator = (val) => { |
| 57 | - if (!val) { | 57 | + if (required && !val) { |
| 58 | return false; | 58 | return false; |
| 59 | } else { | 59 | } else { |
| 60 | return true; | 60 | return true; |
| ... | @@ -62,7 +62,7 @@ const validator = (val) => { | ... | @@ -62,7 +62,7 @@ const validator = (val) => { |
| 62 | }; | 62 | }; |
| 63 | // 错误提示文案 | 63 | // 错误提示文案 |
| 64 | const validatorMessage = (val, rule) => { | 64 | const validatorMessage = (val, rule) => { |
| 65 | - if (!val) { | 65 | + if (required && !val) { |
| 66 | return "补充信息不能为空"; | 66 | return "补充信息不能为空"; |
| 67 | } | 67 | } |
| 68 | }; | 68 | }; | ... | ... |
| 1 | <!-- | 1 | <!-- |
| 2 | * @Date: 2022-08-30 11:34:19 | 2 | * @Date: 2022-08-30 11:34:19 |
| 3 | * @LastEditors: hookehuyr hookehuyr@gmail.com | 3 | * @LastEditors: hookehuyr hookehuyr@gmail.com |
| 4 | - * @LastEditTime: 2023-02-22 11:02:05 | 4 | + * @LastEditTime: 2023-03-28 16:19:08 |
| 5 | * @FilePath: /data-table/src/components/RadioField/index.vue | 5 | * @FilePath: /data-table/src/components/RadioField/index.vue |
| 6 | * @Description: 单项选择控件 | 6 | * @Description: 单项选择控件 |
| 7 | --> | 7 | --> |
| ... | @@ -67,10 +67,10 @@ const HideShow = computed(() => { | ... | @@ -67,10 +67,10 @@ const HideShow = computed(() => { |
| 67 | return !props.item.component_props.disabled | 67 | return !props.item.component_props.disabled |
| 68 | }) | 68 | }) |
| 69 | 69 | ||
| 70 | -// TODO: 等待数据结构更新,看看怎么判断必填 | ||
| 71 | // 校验函数返回 true 表示校验通过,false 表示不通过 | 70 | // 校验函数返回 true 表示校验通过,false 表示不通过 |
| 71 | +const required = props.item.component_props.required; | ||
| 72 | const validator = (val) => { | 72 | const validator = (val) => { |
| 73 | - if (!val) { | 73 | + if (required && !val) { |
| 74 | return false; | 74 | return false; |
| 75 | } else { | 75 | } else { |
| 76 | return true; | 76 | return true; |
| ... | @@ -78,7 +78,7 @@ const validator = (val) => { | ... | @@ -78,7 +78,7 @@ const validator = (val) => { |
| 78 | }; | 78 | }; |
| 79 | // 错误提示文案 | 79 | // 错误提示文案 |
| 80 | const validatorMessage = (val, rule) => { | 80 | const validatorMessage = (val, rule) => { |
| 81 | - if (!val) { | 81 | + if (required && !val) { |
| 82 | return "补充信息不能为空"; | 82 | return "补充信息不能为空"; |
| 83 | } | 83 | } |
| 84 | }; | 84 | }; | ... | ... |
-
Please register or login to post a comment