32090b35 by lihua

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

1 parent 76e845e7
......@@ -220,6 +220,10 @@ export const useValidator = () => {
const validateIPList = (): FormItemRule => {
return {
validator: (rule: any, value: any, callback: any) => {
if (!value) {
callback();
return;
}
let ips = value?.split(",");
if (!ips) {
callback(new Error(`请填写合法的IP地址`));
......@@ -242,6 +246,10 @@ export const useValidator = () => {
const validateDomainList = (): FormItemRule => {
return {
validator: (rule: any, value: any, callback: any) => {
if (!value) {
callback();
return;
}
let domains = value?.split(",");
if (!domains) {
callback(new Error(`请填写合法的IP地址`));
......
......@@ -128,7 +128,7 @@ const baseInfoFormItems = ref([
default: "",
placeholder: "支持以逗号,分隔的多地址配置,格式IPv4/IPv6",
clearable: true,
required: true,
required: false,
block: true,
},
{
......@@ -138,7 +138,7 @@ const baseInfoFormItems = ref([
default: "",
placeholder: "支持以逗号,分隔的多个域名配置",
clearable: true,
required: true,
required: false,
block: true,
},
]);
......@@ -146,8 +146,8 @@ const baseInfoFormItems = ref([
const baseInfoFormRules = ref({
connectorName: [required("请填写连接器名称")],
accessMethod: [required("请选择接入方式")],
ipAddressList: [required("请填写IP地址列表"), validateIPList()], //TODO,校验IP地址和域名
domainList: [required("请填写域名信息"), validateDomainList()],
ipAddressList: [/*required("请填写IP地址列表"),*/validateIPList()], //TODO,校验IP地址和域名
domainList: [/*required("请填写域名信息"),*/ validateDomainList()],
});
/** 连接器附属信息表单配置 */
......@@ -500,6 +500,11 @@ const saveDraft = () => {
const submit = () => {
baseInfoFormRef.value.ruleFormRef.validate((valid1, errorItem1) => {
let baseForminline = baseInfoFormRef.value.formInline;
if (!baseForminline.ipAddressList && !baseForminline.domainList) {
proxy.$ElMessage.error('IP地址和域名信息请至少填写一个');
return;
}
if (valid1) {
addInfoFormRef.value.ruleFormRef.validate((valid2, errorItem2) => {
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!