diff --git a/src/components/AutoDataForm/index.vue b/src/components/AutoDataForm/index.vue
index 2b5a49663..76736a0cc 100644
--- a/src/components/AutoDataForm/index.vue
+++ b/src/components/AutoDataForm/index.vue
@@ -1,6 +1,12 @@
+
+
+
+
+
+
diff --git a/src/i18n/langs/cn.js b/src/i18n/langs/cn.js
index 4e4f0bbd8..cefad0d3b 100644
--- a/src/i18n/langs/cn.js
+++ b/src/i18n/langs/cn.js
@@ -572,39 +572,39 @@ const cn = {
'securityPasswordLowerCase': '必须包含小写字母',
'securityPasswordNumber': '必须包含数字字符',
'securityPasswordSpecialChar': '必须包含特殊字符',
- 'Hostname': '主机名'
- },
- helpText: {
- 'siteUrl': 'eg: http://jumpserver.abc.com:8080',
- 'userGuideUrl': '用户第一次登录,修改profile后重定向到地址',
- 'emailSubjectPrefix': '提示: 一些关键字可能会被邮件提供商拦截,如 跳板机、JumpServer',
- 'emailHostPassword': '提示:一些邮件提供商需要输入的是Token',
- 'emailEmailFrom': '提示:发送邮件账号,默认使用SMTP账号作为发送账号',
- 'emailRecipient': '提示:仅用来作为测试邮件收件人',
- 'emailCustomUserCreatedSubject': '提示: 创建用户时,发送设置密码邮件的主题 (例如: 创建用户成功)',
- 'emailCustomUserCreatedHonorific': '提示: 创建用户时,发送设置密码邮件的敬语 (例如: 您好)',
- 'emailCustomUserCreatedBody': '提示: 创建用户时,发送设置密码邮件的内容',
- 'emailCustomUserCreatedSignature': '提示: 邮件的署名 (例如: jumpserver)',
- 'authLdapSearchOu': '使用|分隔各OU',
- 'authLdapSearchFilter': '可能的选项是(cn或uid或sAMAccountName=%(user)s)',
- 'authLdapUserAttrMap': '用户属性映射代表怎样将LDAP中用户属性映射到jumpserver用户上,username, name,email 是jumpserver的属性',
- 'terminalHeartbeatInterval': '单位: 秒',
- 'terminalSessionKeepDuration': '单位:天。 会话、录像、命令记录超过该时长将会被删除(仅影响数据库存储, oss等不受影响)',
- 'terminalTelnetRegex': '登录telnet服务器成功后的提示正则表达式,如: Last\\s*login|success|成功',
- 'securityLoginLimitTime': '提示:(单位:分)当用户登录失败次数达到限制后,那么在此时间间隔内禁止登录',
- 'securityMaxIdleTime': '提示:如果超过该配置没有操作,连接会被断开 (单位:分)',
- 'securityPasswordExpirationTime': '提示:(单位:天)如果用户在此期间没有更新密码,用户密码将过期失效; 密码过期提醒邮件将在密码过期前5天内由系统(每天)自动发送给用户'
- },
- helpTip: {
- 'emailUserSSL': '如果SMTP端口是465,通常需要启用SSL',
- 'emailUserTLS': '如果SMTP端口是587,通常需要启用TLS',
- 'securityMfaAuth': '开启后,所有用户登录必须使用多因子认证(对所有用户有效,包括管理员)',
- 'securityCommandExecution': '允许用户批量执行命令',
- 'securityServiceAccountRegistration': '允许使用bootstrap token注册终端, 当终端注册成功后可以禁止',
- 'securityPasswordUpperCase': '开启后,用户密码修改、重置必须包含大写字母',
- 'securityPasswordLowerCase': '开启后,用户密码修改、重置必须包含小写字母',
- 'securityPasswordNumber': '开启后,用户密码修改、重置必须包含数字字符',
- 'securityPasswordSpecialChar': '开启后,用户密码修改、重置必须包含特殊字符'
+ 'Hostname': '主机名',
+ helpText: {
+ 'siteUrl': 'eg: http://jumpserver.abc.com:8080',
+ 'userGuideUrl': '用户第一次登录,修改profile后重定向到地址',
+ 'emailSubjectPrefix': '提示: 一些关键字可能会被邮件提供商拦截,如 跳板机、JumpServer',
+ 'emailHostPassword': '提示:一些邮件提供商需要输入的是Token',
+ 'emailEmailFrom': '提示:发送邮件账号,默认使用SMTP账号作为发送账号',
+ 'emailRecipient': '提示:仅用来作为测试邮件收件人',
+ 'emailCustomUserCreatedSubject': '提示: 创建用户时,发送设置密码邮件的主题 (例如: 创建用户成功)',
+ 'emailCustomUserCreatedHonorific': '提示: 创建用户时,发送设置密码邮件的敬语 (例如: 您好)',
+ 'emailCustomUserCreatedBody': '提示: 创建用户时,发送设置密码邮件的内容',
+ 'emailCustomUserCreatedSignature': '提示: 邮件的署名 (例如: jumpserver)',
+ 'authLdapSearchOu': '使用|分隔各OU',
+ 'authLdapSearchFilter': '可能的选项是(cn或uid或sAMAccountName=%(user)s)',
+ 'authLdapUserAttrMap': '用户属性映射代表怎样将LDAP中用户属性映射到jumpserver用户上,username, name,email 是jumpserver的属性',
+ 'terminalHeartbeatInterval': '单位: 秒',
+ 'terminalSessionKeepDuration': '单位:天。 会话、录像、命令记录超过该时长将会被删除(仅影响数据库存储, oss等不受影响)',
+ 'terminalTelnetRegex': '登录telnet服务器成功后的提示正则表达式,如: Last\\s*login|success|成功',
+ 'securityLoginLimitTime': '提示:(单位:分)当用户登录失败次数达到限制后,那么在此时间间隔内禁止登录',
+ 'securityMaxIdleTime': '提示:如果超过该配置没有操作,连接会被断开 (单位:分)',
+ 'securityPasswordExpirationTime': '提示:(单位:天)如果用户在此期间没有更新密码,用户密码将过期失效; 密码过期提醒邮件将在密码过期前5天内由系统(每天)自动发送给用户'
+ },
+ helpTip: {
+ 'emailUserSSL': '如果SMTP端口是465,通常需要启用SSL',
+ 'emailUserTLS': '如果SMTP端口是587,通常需要启用TLS',
+ 'securityMfaAuth': '开启后,所有用户登录必须使用多因子认证(对所有用户有效,包括管理员)',
+ 'securityCommandExecution': '允许用户批量执行命令',
+ 'securityServiceAccountRegistration': '允许使用bootstrap token注册终端, 当终端注册成功后可以禁止',
+ 'securityPasswordUpperCase': '开启后,用户密码修改、重置必须包含大写字母',
+ 'securityPasswordLowerCase': '开启后,用户密码修改、重置必须包含小写字母',
+ 'securityPasswordNumber': '开启后,用户密码修改、重置必须包含数字字符',
+ 'securityPasswordSpecialChar': '开启后,用户密码修改、重置必须包含特殊字符'
+ }
},
...zhLocale
}
diff --git a/src/i18n/langs/en.js b/src/i18n/langs/en.js
index 9d4f1e3dc..6c0362252 100644
--- a/src/i18n/langs/en.js
+++ b/src/i18n/langs/en.js
@@ -384,41 +384,41 @@ const en = {
'securityPasswordLowerCase': 'Must contain lowercase letters',
'securityPasswordNumber': 'Must contain numeric characters',
'securityPasswordSpecialChar': 'Must contain special characters',
- 'Hostname': 'Hostname'
- },
- helpText: {
- 'siteUrl': 'eg: http://jumpserver.abc.com:8080',
- 'userGuideUrl': 'User first login update profile done redirect to it',
- 'emailSubjectPrefix': 'Tips: Some word will be intercept by mail provider',
- 'emailHostPassword': 'Tips: Some provider use token except password',
- 'emailEmailFrom': 'Tips: Send mail account, default SMTP account as the send account',
- 'emailRecipient': 'Tips: Used only as a test mail recipient',
- 'emailCustomUserCreatedSubject': 'Tips: When creating a user, send the subject of the email (eg:Create account successfully)',
- 'emailCustomUserCreatedHonorific': 'Tips: When creating a user, send the honorific of the email (eg:Hello)',
- 'emailCustomUserCreatedBody': 'Tips:When creating a user, send the content of the email',
- 'emailCustomUserCreatedSignature': 'Tips: Email signature (eg:jumpserver)',
- 'authLdapSearchOu': 'Use | split User OUs',
- 'authLdapSearchFilter': 'Choice may be (cn|uid|sAMAccountName)=%(user)s)',
- 'authLdapUserAttrMap': 'User attr map present how to map LDAP user attr to jumpserver, username,name,email is jumpserver attr',
- 'terminalHeartbeatInterval': 'Units: seconds',
- 'terminalSessionKeepDuration': 'Units: days, Session, record, command will be delete if more than duration, only in database',
- 'terminalTelnetRegex': 'ex: Last\\s*login|success|成功',
- 'securityLoginLimitTime': 'Tip: (unit/minute) if the user has failed to log in for a limited number of times, no login is allowed during this time interval.',
- 'securityMaxIdleTime': 'If idle time more than it, disconnect connection Unit: minute',
- 'securityPasswordExpirationTime': 'Tip: (unit: day) If the user does not update the password during the time, ' +
+ 'Hostname': 'Hostname',
+ helpText: {
+ 'siteUrl': 'eg: http://jumpserver.abc.com:8080',
+ 'userGuideUrl': 'User first login update profile done redirect to it',
+ 'emailSubjectPrefix': 'Tips: Some word will be intercept by mail provider',
+ 'emailHostPassword': 'Tips: Some provider use token except password',
+ 'emailEmailFrom': 'Tips: Send mail account, default SMTP account as the send account',
+ 'emailRecipient': 'Tips: Used only as a test mail recipient',
+ 'emailCustomUserCreatedSubject': 'Tips: When creating a user, send the subject of the email (eg:Create account successfully)',
+ 'emailCustomUserCreatedHonorific': 'Tips: When creating a user, send the honorific of the email (eg:Hello)',
+ 'emailCustomUserCreatedBody': 'Tips:When creating a user, send the content of the email',
+ 'emailCustomUserCreatedSignature': 'Tips: Email signature (eg:jumpserver)',
+ 'authLdapSearchOu': 'Use | split User OUs',
+ 'authLdapSearchFilter': 'Choice may be (cn|uid|sAMAccountName)=%(user)s)',
+ 'authLdapUserAttrMap': 'User attr map present how to map LDAP user attr to jumpserver, username,name,email is jumpserver attr',
+ 'terminalHeartbeatInterval': 'Units: seconds',
+ 'terminalSessionKeepDuration': 'Units: days, Session, record, command will be delete if more than duration, only in database',
+ 'terminalTelnetRegex': 'ex: Last\\s*login|success|成功',
+ 'securityLoginLimitTime': 'Tip: (unit/minute) if the user has failed to log in for a limited number of times, no login is allowed during this time interval.',
+ 'securityMaxIdleTime': 'If idle time more than it, disconnect connection Unit: minute',
+ 'securityPasswordExpirationTime': 'Tip: (unit: day) If the user does not update the password during the time, ' +
'the user password will expire failure;The password expiration reminder' +
' mail will be automatic sent to the user by system within 5 days (daily) before the password expires'
- },
- helpTip: {
- 'emailUserSSL': 'If SMTP port is 465, may be select',
- 'emailUserTLS': 'If SMTP port is 587, may be select',
- 'securityMfaAuth': 'After opening, all user login must use MFA(valid for all users, including administrators)',
- 'securityCommandExecution': 'Allow user batch execute commands',
- 'securityServiceAccountRegistration': 'Allow using bootstrap token register service account, when terminal setup, can disable it',
- 'securityPasswordUpperCase': '开启后,用户密码修改、重置必须包含大写字母',
- 'securityPasswordLowerCase': '开启后,用户密码修改、重置必须包含小写字母',
- 'securityPasswordNumber': '开启后,用户密码修改、重置必须包含数字字符',
- 'securityPasswordSpecialChar': '开启后,用户密码修改、重置必须包含特殊字符'
+ },
+ helpTip: {
+ 'emailUserSSL': 'If SMTP port is 465, may be select',
+ 'emailUserTLS': 'If SMTP port is 587, may be select',
+ 'securityMfaAuth': 'After opening, all user login must use MFA(valid for all users, including administrators)',
+ 'securityCommandExecution': 'Allow user batch execute commands',
+ 'securityServiceAccountRegistration': 'Allow using bootstrap token register service account, when terminal setup, can disable it',
+ 'securityPasswordUpperCase': '开启后,用户密码修改、重置必须包含大写字母',
+ 'securityPasswordLowerCase': '开启后,用户密码修改、重置必须包含小写字母',
+ 'securityPasswordNumber': '开启后,用户密码修改、重置必须包含数字字符',
+ 'securityPasswordSpecialChar': '开启后,用户密码修改、重置必须包含特殊字符'
+ }
},
...enLocale
}
diff --git a/src/layout/components/GenericCreateUpdateForm/index.vue b/src/layout/components/GenericCreateUpdateForm/index.vue
index f2d95374c..06678ff9f 100644
--- a/src/layout/components/GenericCreateUpdateForm/index.vue
+++ b/src/layout/components/GenericCreateUpdateForm/index.vue
@@ -9,7 +9,14 @@
v-bind="$attrs"
v-on="$listeners"
@submit="handleSubmit"
- />
+ >
+
+
+
+
+
+
+