From 7e81fcde6661b844de443da33761b1a8ca5d55c2 Mon Sep 17 00:00:00 2001 From: "@changcode" Date: Mon, 15 Nov 2021 14:28:44 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20latlngPicker=20=E8=B0=83=E6=95=B4?= =?UTF-8?q?=E7=BB=8F=E7=BA=AC=E5=BA=A6=E9=AA=8C=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nezha-fronted/src/components/common/js/validate.js | 4 ++-- nezha-fronted/src/components/common/latlngPicker.vue | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/nezha-fronted/src/components/common/js/validate.js b/nezha-fronted/src/components/common/js/validate.js index 4433fd9f6..24f1af46b 100644 --- a/nezha-fronted/src/components/common/js/validate.js +++ b/nezha-fronted/src/components/common/js/validate.js @@ -87,8 +87,8 @@ export function noSpecialChar (rule, value, callback) { } export function latlng (rule, value, callback) { - const lngReg = /^[\-\+]?(0?\d{1,2}\.\d{1,7}|1[0-7]?\d{1}\.\d{1,7}|180\.0{1,7})$/ - const latReg = /^[\-\+]?([1-8]?\d{1}\.\d{1,7}|90\.0{1,7})$/ + const lngReg = /^[\-\+]?(0?\d{1,2}\.\d{1,7}|1[0-7]?\d{1}\.\d{1,7}|180\.0{1,7}|0?\d{1,2}|1[0-7]?\d{1}|180)$/ // 经度正则验证 + const latReg = /^[\-\+]?([1-8]?\d{1}\.\d{1,7}|90\.0{1,7}|[1-8]?\d{1}|90)$/ // 纬度正则验证 setTimeout(() => { const lnglat = value.split(',') if (!lnglat || lnglat.length !== 2) { diff --git a/nezha-fronted/src/components/common/latlngPicker.vue b/nezha-fronted/src/components/common/latlngPicker.vue index 8f188d9f5..224599a5e 100644 --- a/nezha-fronted/src/components/common/latlngPicker.vue +++ b/nezha-fronted/src/components/common/latlngPicker.vue @@ -136,8 +136,8 @@ export default { this.$message.error(this.$t('tip.lnglatError')) return false } - const lngReg = /^[\-\+]?(0?\d{1,2}\.\d{0,7}|1[0-7]?\d{1}\.\d{1,7}|180\.0{0,7})$/ - const latReg = /^[\-\+]?([0-8]?\d{1}\.\d{0,7}|90\.0{0,7})$/ + const lngReg = /^[\-\+]?(0?\d{1,2}\.\d{1,7}|1[0-7]?\d{1}\.\d{1,7}|180\.0{1,7}|0?\d{1,2}|1[0-7]?\d{1}|180)$/ // 经度正则验证 + const latReg = /^[\-\+]?([1-8]?\d{1}\.\d{1,7}|90\.0{1,7}|[1-8]?\d{1}|90)$/ // 纬度正则验证 if (!lngReg.test(lnglat[0]) || !latReg.test(lnglat[1])) { // this.lnglat = this.oldlnglat this.$message.error(this.$t('tip.lnglatError'))