连接器IP和域名填写一个即可
Showing
2 changed files
with
17 additions
and
4 deletions
| ... | @@ -220,6 +220,10 @@ export const useValidator = () => { | ... | @@ -220,6 +220,10 @@ export const useValidator = () => { |
| 220 | const validateIPList = (): FormItemRule => { | 220 | const validateIPList = (): FormItemRule => { |
| 221 | return { | 221 | return { |
| 222 | validator: (rule: any, value: any, callback: any) => { | 222 | validator: (rule: any, value: any, callback: any) => { |
| 223 | if (!value) { | ||
| 224 | callback(); | ||
| 225 | return; | ||
| 226 | } | ||
| 223 | let ips = value?.split(","); | 227 | let ips = value?.split(","); |
| 224 | if (!ips) { | 228 | if (!ips) { |
| 225 | callback(new Error(`请填写合法的IP地址`)); | 229 | callback(new Error(`请填写合法的IP地址`)); |
| ... | @@ -242,6 +246,10 @@ export const useValidator = () => { | ... | @@ -242,6 +246,10 @@ export const useValidator = () => { |
| 242 | const validateDomainList = (): FormItemRule => { | 246 | const validateDomainList = (): FormItemRule => { |
| 243 | return { | 247 | return { |
| 244 | validator: (rule: any, value: any, callback: any) => { | 248 | validator: (rule: any, value: any, callback: any) => { |
| 249 | if (!value) { | ||
| 250 | callback(); | ||
| 251 | return; | ||
| 252 | } | ||
| 245 | let domains = value?.split(","); | 253 | let domains = value?.split(","); |
| 246 | if (!domains) { | 254 | if (!domains) { |
| 247 | callback(new Error(`请填写合法的IP地址`)); | 255 | callback(new Error(`请填写合法的IP地址`)); | ... | ... |
| ... | @@ -128,7 +128,7 @@ const baseInfoFormItems = ref([ | ... | @@ -128,7 +128,7 @@ const baseInfoFormItems = ref([ |
| 128 | default: "", | 128 | default: "", |
| 129 | placeholder: "支持以逗号,分隔的多地址配置,格式IPv4/IPv6", | 129 | placeholder: "支持以逗号,分隔的多地址配置,格式IPv4/IPv6", |
| 130 | clearable: true, | 130 | clearable: true, |
| 131 | required: true, | 131 | required: false, |
| 132 | block: true, | 132 | block: true, |
| 133 | }, | 133 | }, |
| 134 | { | 134 | { |
| ... | @@ -138,7 +138,7 @@ const baseInfoFormItems = ref([ | ... | @@ -138,7 +138,7 @@ const baseInfoFormItems = ref([ |
| 138 | default: "", | 138 | default: "", |
| 139 | placeholder: "支持以逗号,分隔的多个域名配置", | 139 | placeholder: "支持以逗号,分隔的多个域名配置", |
| 140 | clearable: true, | 140 | clearable: true, |
| 141 | required: true, | 141 | required: false, |
| 142 | block: true, | 142 | block: true, |
| 143 | }, | 143 | }, |
| 144 | ]); | 144 | ]); |
| ... | @@ -146,8 +146,8 @@ const baseInfoFormItems = ref([ | ... | @@ -146,8 +146,8 @@ const baseInfoFormItems = ref([ |
| 146 | const baseInfoFormRules = ref({ | 146 | const baseInfoFormRules = ref({ |
| 147 | connectorName: [required("请填写连接器名称")], | 147 | connectorName: [required("请填写连接器名称")], |
| 148 | accessMethod: [required("请选择接入方式")], | 148 | accessMethod: [required("请选择接入方式")], |
| 149 | ipAddressList: [required("请填写IP地址列表"), validateIPList()], //TODO,校验IP地址和域名 | 149 | ipAddressList: [/*required("请填写IP地址列表"),*/validateIPList()], //TODO,校验IP地址和域名 |
| 150 | domainList: [required("请填写域名信息"), validateDomainList()], | 150 | domainList: [/*required("请填写域名信息"),*/ validateDomainList()], |
| 151 | }); | 151 | }); |
| 152 | 152 | ||
| 153 | /** 连接器附属信息表单配置 */ | 153 | /** 连接器附属信息表单配置 */ |
| ... | @@ -500,6 +500,11 @@ const saveDraft = () => { | ... | @@ -500,6 +500,11 @@ const saveDraft = () => { |
| 500 | 500 | ||
| 501 | const submit = () => { | 501 | const submit = () => { |
| 502 | baseInfoFormRef.value.ruleFormRef.validate((valid1, errorItem1) => { | 502 | baseInfoFormRef.value.ruleFormRef.validate((valid1, errorItem1) => { |
| 503 | let baseForminline = baseInfoFormRef.value.formInline; | ||
| 504 | if (!baseForminline.ipAddressList && !baseForminline.domainList) { | ||
| 505 | proxy.$ElMessage.error('IP地址和域名信息请至少填写一个'); | ||
| 506 | return; | ||
| 507 | } | ||
| 503 | if (valid1) { | 508 | if (valid1) { |
| 504 | addInfoFormRef.value.ruleFormRef.validate((valid2, errorItem2) => { | 509 | addInfoFormRef.value.ruleFormRef.validate((valid2, errorItem2) => { |
| 505 | if (valid2) { | 510 | if (valid2) { | ... | ... |
-
Please register or sign in to post a comment