From 3f075e6f2491e84e1b3acf07a70760e1ca4fd82a Mon Sep 17 00:00:00 2001 From: jackhoo_98 Date: Fri, 24 Mar 2023 10:06:51 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E7=BD=91=E7=BB=9C?= =?UTF-8?q?=E7=BB=84=E4=BB=B6=20=E6=B5=81=E5=AA=92=E4=BD=93=E6=9C=8D?= =?UTF-8?q?=E5=8A=A1=20=E5=9F=9F=E5=90=8Dip=E6=A0=A1=E9=AA=8C=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/link/Type/data.ts | 12 ++++-------- src/views/media/Stream/Detail/index.vue | 2 +- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/src/views/link/Type/data.ts b/src/views/link/Type/data.ts index 46420ab7..0b54fc9b 100644 --- a/src/views/link/Type/data.ts +++ b/src/views/link/Type/data.ts @@ -113,8 +113,8 @@ export const Validator = { regOnlyNumber: new RegExp(/^\d+$/), }; -const validateAddress = (_rule: any, value: string): Promise => - new Promise(async (resolve, reject) => { +const validateAddress = (_rule: any, value: string): Promise => { + return new Promise(async (resolve, reject) => { if ( Validator.regIpv4.test(value) || Validator.regIPv6.test(value) || @@ -122,9 +122,10 @@ const validateAddress = (_rule: any, value: string): Promise => ) { return resolve(''); } else { - return reject('请输入正确的IP地址或者域名'); + return value ? reject('请输入正确的IP地址或者域名') : resolve(''); } }); +}; export const Rules = { name: [ @@ -176,11 +177,6 @@ export const Rules = { validator: validateAddress, message: '请输入正确的IP地址或者域名', }, - // { - // pattern: - // Validator.regIpv4 || Validator.regIPv6 || Validator.regDomain, - // message: '请输入正确格式的域名或ip', - // }, ], publicPort: [ { diff --git a/src/views/media/Stream/Detail/index.vue b/src/views/media/Stream/Detail/index.vue index ba13c1dd..e5620008 100644 --- a/src/views/media/Stream/Detail/index.vue +++ b/src/views/media/Stream/Detail/index.vue @@ -302,7 +302,7 @@ const validateAddress = (_rule: any, value: string): Promise => ) { return resolve(''); } else { - return reject('请输入正确的IP地址或者域名'); + return value ? reject('请输入正确的IP地址或者域名') : resolve(''); } });