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

Merge branch 'dev-2.0' of https://git.mesalab.cn/nezha/nezha-fronted into dev-2.0

Browse Source
This commit is contained in:
zhangyu
2021-04-22 10:36:48 +08:00
parent 05cf68fe6e e6b61cefd7
commit c895d2da48
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
nezha-fronted/src/components/page/config/system.vue
View File

@@ -318,10 +318,8 @@ export default {
},
terminalCopy: null,
terminalRules: {
max_terminal_num: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' },
{ validator: positiveInteger, trigger: 'blur' }
]
terminal_timeout: [{ validator: positiveInteger, trigger: 'blur' }],
terminal_record_local_retention: [{ required: true, message: this.$t('validate.required'), trigger: 'blur' }, { validator: positiveInteger, trigger: 'blur' }],
},
ldap: {
ldap_address: '',
@@ -337,7 +335,8 @@ export default {
ldapRules: {
ldap_address: [{ required: true, message: this.$t('validate.required'), trigger: 'blur' }],
ldap_user_filter: [{ required: true, message: this.$t('validate.required'), trigger: 'blur' }],
ldap_mapping: [{ required: true, message: this.$t('validate.required'), trigger: 'blur' }]
ldap_mapping: [{ required: true, message: this.$t('validate.required'), trigger: 'blur' }],
ldap_timeout: [{ required: true, message: this.$t('validate.required'), trigger: 'blur' }, { validator: positiveInteger, trigger: 'blur' }],
},
reset: {
type: [],
@@ -790,7 +789,7 @@ export default {
let hour = offsetHour>0?(offsetHour<9?'+0'+offsetHour:'+'+offsetHour):(offsetHour == 0?(offsetMinute==0?'':'+00'):(offsetHour>-10?'-0'+Math.abs(offsetHour):offsetHour))
let minute = offsetHour==0&&offsetMinute == 0?'':(offsetMinute==0?':00':(offsetMinute>9?':'+offsetMinute:':0'+offsetMinute))
let minute = offsetHour==0&&offsetMinute == 0?'':(offsetMinute==0?':00':(Math.abs(offsetMinute)>9?':'+Math.abs(offsetMinute):':0'+Math.abs(offsetMinute)))
return 'UTC'+hour+minute
}