From eac9f08f4a99274c53fcef79f459be6b1eac6c17 Mon Sep 17 00:00:00 2001 From: wangwenrui Date: Wed, 21 Apr 2021 19:30:17 +0800 Subject: [PATCH 1/2] =?UTF-8?q?feat:system=20=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nezha-fronted/src/components/page/config/system.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nezha-fronted/src/components/page/config/system.vue b/nezha-fronted/src/components/page/config/system.vue index b36e8e24b..0d930b9a0 100644 --- a/nezha-fronted/src/components/page/config/system.vue +++ b/nezha-fronted/src/components/page/config/system.vue @@ -790,7 +790,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 } From e6b61cefd7916c41c5e94d30a81f88e4eb3a8a2d Mon Sep 17 00:00:00 2001 From: wangwenrui Date: Wed, 21 Apr 2021 19:43:44 +0800 Subject: [PATCH 2/2] =?UTF-8?q?feat:system=20=E9=83=A8=E5=88=86=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E6=B7=BB=E5=8A=A0=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nezha-fronted/src/components/page/config/system.vue | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/nezha-fronted/src/components/page/config/system.vue b/nezha-fronted/src/components/page/config/system.vue index 0d930b9a0..cc19cdb9c 100644 --- a/nezha-fronted/src/components/page/config/system.vue +++ b/nezha-fronted/src/components/page/config/system.vue @@ -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: [],