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')) diff --git a/nezha-fronted/src/components/common/rightBox/dcBox.vue b/nezha-fronted/src/components/common/rightBox/dcBox.vue index 58944dd31..ac63c8dcc 100644 --- a/nezha-fronted/src/components/common/rightBox/dcBox.vue +++ b/nezha-fronted/src/components/common/rightBox/dcBox.vue @@ -70,7 +70,8 @@ import latlngPicker from '../latlngPicker' import editRigthBox from '../mixin/editRigthBox' import { noSpecialChar, latlng } from '@/components/common/js/validate' -const regNum = /^[0-9]+.?[0-9]*/ +const latitudeNum = /^[\-\+]?([1-8]?\d{1}\.\d{1,7}|90\.0{1,7}|[1-8]?\d{1}|90)$/ // 纬度正则验证 +const longitudeNum = /^[\-\+]?(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)$/ // 经度正则验证 export default { name: 'dcBox', @@ -139,10 +140,10 @@ export default { const attr = this.$refs.latlngPicker.getAttribute() param.latitude = attr.latitude param.longitude = attr.longitude - if (!regNum.test(param.longitude)) { + if (!longitudeNum.test(param.longitude)) { param.longitude = null } - if (!regNum.test(param.latitude)) { + if (!latitudeNum.test(param.latitude)) { param.latitude = null } this.$post('/dc', param).then(response => { diff --git a/nezha-fronted/src/components/page/config/profileChangePin.vue b/nezha-fronted/src/components/page/config/profileChangePin.vue index 6a189bcf7..c6576aad5 100644 --- a/nezha-fronted/src/components/page/config/profileChangePin.vue +++ b/nezha-fronted/src/components/page/config/profileChangePin.vue @@ -32,10 +32,6 @@