gfwleak/nezha-nezha-fronted
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev-3.1' into dev-3.1.1_theme

Browse Source 
# Conflicts:
#	nezha-fronted/src/components/cli/webSSH.vue
#	nezha-fronted/src/components/common/alert/alertLabel2.vue
#	nezha-fronted/src/components/common/detailView/list/asset/assetDetail.vue
#	nezha-fronted/src/components/common/popBox/topToolMoreOptions.vue
#	nezha-fronted/src/components/common/rightBox/editEndpointBoxNew.vue
#	nezha-fronted/src/components/common/rightBox/moduleBox.vue
#	nezha-fronted/src/components/page/config/system.vue
#	nezha-fronted/src/components/page/monitor/project/index.vue
This commit is contained in:
chenjinsong
2021-11-11 11:28:19 +08:00
parent e7273d0be0 6abf76db08
commit a0dcb8d877
10076 changed files with 1357 additions and 604 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
nezha-fronted/src/components/common/js/constants.js
View File

@@ -17,7 +17,7 @@ export const agent = {
label: 'Per-datacenter',
value: 2,
text: 'Per-datacenter'
},
}
// {
// label: 'Loki',
// value: 11,

15
nezha-fronted/src/components/common/js/validate.js
View File

@@ -86,6 +86,21 @@ export function noSpecialChar (rule, value, callback) {
}, 100)
}
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})$/
setTimeout(() => {
const lnglat = value.split(',')
if (!lnglat || lnglat.length !== 2) {
callback(new Error(vm.$t('tip.lnglatError')))
} else if (!lngReg.test(lnglat[0]) || !latReg.test(lnglat[1])) {
callback(new Error(vm.$t('tip.lnglatError')))
} else {
callback()
}
}, 100)
}
export function integer (rule, value, callback) {
setTimeout(() => {
if (isNaN(Number(value))) {