228bc72c by lihua

连接器IP和域名填写一个即可

1 parent e414f870
...@@ -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地址`));
......
...@@ -127,7 +127,7 @@ const baseInfoFormItems = ref([ ...@@ -127,7 +127,7 @@ const baseInfoFormItems = ref([
127 default: "", 127 default: "",
128 placeholder: "支持以逗号,分隔的多地址配置,格式IPv4/IPv6", 128 placeholder: "支持以逗号,分隔的多地址配置,格式IPv4/IPv6",
129 clearable: true, 129 clearable: true,
130 required: true, 130 required: false,
131 block: true, 131 block: true,
132 }, 132 },
133 { 133 {
...@@ -137,7 +137,7 @@ const baseInfoFormItems = ref([ ...@@ -137,7 +137,7 @@ const baseInfoFormItems = ref([
137 default: "", 137 default: "",
138 placeholder: "支持以逗号,分隔的多个域名配置", 138 placeholder: "支持以逗号,分隔的多个域名配置",
139 clearable: true, 139 clearable: true,
140 required: true, 140 required: false,
141 block: true, 141 block: true,
142 }, 142 },
143 ]); 143 ]);
...@@ -145,8 +145,8 @@ const baseInfoFormItems = ref([ ...@@ -145,8 +145,8 @@ const baseInfoFormItems = ref([
145 const baseInfoFormRules = ref({ 145 const baseInfoFormRules = ref({
146 connectorName: [required("请填写连接器名称")], 146 connectorName: [required("请填写连接器名称")],
147 accessMethod: [required("请选择接入方式")], 147 accessMethod: [required("请选择接入方式")],
148 ipAddressList: [required("请填写IP地址列表"), validateIPList()], //TODO,校验IP地址和域名 148 ipAddressList: [/*required("请填写IP地址列表"),*/validateIPList()], //TODO,校验IP地址和域名
149 domainList: [required("请填写域名信息"), validateDomainList()], 149 domainList: [/*required("请填写域名信息"),*/ validateDomainList()],
150 }); 150 });
151 151
152 /** 连接器附属信息表单配置 */ 152 /** 连接器附属信息表单配置 */
...@@ -499,6 +499,11 @@ const saveDraft = () => { ...@@ -499,6 +499,11 @@ const saveDraft = () => {
499 499
500 const submit = () => { 500 const submit = () => {
501 baseInfoFormRef.value.ruleFormRef.validate((valid1, errorItem1) => { 501 baseInfoFormRef.value.ruleFormRef.validate((valid1, errorItem1) => {
502 let baseForminline = baseInfoFormRef.value.formInline;
503 if (!baseForminline.ipAddressList && !baseForminline.domainList) {
504 proxy.$ElMessage.error('IP地址和域名信息请至少填写一个');
505 return;
506 }
502 if (valid1) { 507 if (valid1) {
503 addInfoFormRef.value.ruleFormRef.validate((valid2, errorItem2) => { 508 addInfoFormRef.value.ruleFormRef.validate((valid2, errorItem2) => {
504 if (valid2) { 509 if (valid2) {
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!