From b44f15faafcdf7ee4cff7dd4226938212fdef9fc Mon Sep 17 00:00:00 2001 From: OrangeM21 Date: Fri, 8 May 2020 20:05:35 +0800 Subject: [PATCH 1/7] =?UTF-8?q?[update]=E4=BF=AE=E6=94=B9i18n=E6=A0=BC?= =?UTF-8?q?=E5=BC=8F=E4=B8=BAJson?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/i18n/langs/cn.js | 641 +---------------------------------------- src/i18n/langs/cn.json | 617 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 621 insertions(+), 637 deletions(-) create mode 100644 src/i18n/langs/cn.json diff --git a/src/i18n/langs/cn.js b/src/i18n/langs/cn.js index e682002a3..ee5c40dc5 100644 --- a/src/i18n/langs/cn.js +++ b/src/i18n/langs/cn.js @@ -1,642 +1,9 @@ import zhLocale from 'element-ui/lib/locale/lang/zh-CN' -const cn = { - message: { - 'hello': '你好, 世界', - 'login': '登录' - }, - header: { - 'language': '中文', - 'help': '帮助', - 'Documents': '文档', - 'CommercialSupport': '商业支持' - }, - action: { - 'update': '更新', - 'delete': '删除', - 'ExportRange': '导出范围', - 'ExportAll': '导出全部', - 'ExportOnlySelectedItems': '仅导出选中项', - 'DownloadTheImportedTemplateOrUseTheExportedCSVFormat': '下载导入的模板或使用导出的csv格式', - 'DownloadImportTemplate': '下载导入模板', - 'DownloadTheUpdatedTemplateOrUsTheExportedCSVFormat': '下载更新的模板或使用导出的csv格式', - 'DownloadUpdateTemplate': '下载更新模板', - 'Upload': '点击上传', - 'OnlyCSVFilesCanBeUploaded': '只能上传CSV文件' - }, - common: { - 'name': '名称', - 'Name': '名称', - 'action': '动作', - 'Action': '动作', - 'role': '角色', - 'username': '用户名', - 'Language': '语言', - 'Help': '帮助', - 'more': '更多', - 'Update': '更新', - 'update': '更新', - 'Delete': '删除', - 'delete': '删除', - 'Detail': '详情', - 'detail': '详情', - 'baseInfo': '基本信息', - 'Created by': '创建人', - 'Date Created': '创建日期', - 'Comment': '备注', - 'Create': '创建', - 'More actions': '更多操作', - 'Delete selected': '删除所选', - 'Update selected': '更新所选', - 'Delete success': '删除成功', - 'Delete failed': '删除失败', - 'Search': '搜索', - 'Source': '来源', - 'Status': '状态', - 'Actions': '动作', - 'Monitor': '监控', - 'Run': '执行', - 'Are you sure to delete': '你确定要删除', - 'Info': '提示', - 'More': '更多', - 'Submit': '提交', - 'Reset': '重置', - 'This field is required': '这个字段是必填项', - 'Validity': '有效性', - 'confirm': '确认', - 'Confirm': '确认', - 'Cancel': '取消', - 'cancel': '取消', - 'Import': '导入', - 'Export': '导出', - 'Other': '其它', - 'Create success': '创建成功', - 'Update success': '更新成功', - 'Update failed': '更新失败', - 'Deactive selected': '禁用所选', - 'Active selected': '激活所选', - 'rows': '行', - 'basic info': '基本信息', - 'Command filter': '命令过滤器', - 'Add': '添加', - 'Auth': '认证', - 'Others': '其他', - 'Members': '成员', - 'Username': '用户名', - 'Email': '邮件', - 'Role': '角色', - 'Date expired': '失效日期', - 'Quick update': '快速更新', - 'Send': '发送', - 'Unblock': '解锁', - 'Active': '激活中' - }, - route: { - 'dashboard': '仪表盘', - 'Users': '用户管理', - 'UserList': '用户列表', - 'UserDetail': '用户详情', - 'UserGroupList': '用户组', - 'UserGroupDetail': '用户组详情', - 'Assets': '资产管理', - 'AssetList': '资产列表', - 'DomainList': '网关列表', - 'AdminUserList': '管理用户', - 'SystemUserList': '系统用户', - 'LabelList': '标签管理', - 'CommandFilterList': '命令过滤', - 'PlatformList': '平台列表', - 'Applications': '应用管理', - 'RemoteApp': '远程应用', - 'DatabaseApp': '数据库应用', - 'Perms': '权限管理', - 'AssetPermission': '资产授权', - 'AssetPermissionDetail': '资产授权详情', - 'AssetPermissionCreate': '创建资产授权规则', - 'AssetPermissionUpdate': '更新资产授权规则', - 'RemoteAppPermission': '远程应用授权', - 'RemoteAppPermissionDetail': '远程应用授权详情', - 'RemoteAppPermissionCreate': '创建远程应用授权规则', - 'RemoteAppPermissionUpdate': '更新远程应用授权规则', - 'DatabaseAppPermission': '数据库应用授权', - 'DatabaseAppPermissionDetail': '数据库应用授权详情', - 'DatabaseAppPermissionCreate': '创建数据库应用授权规则', - 'DatabaseAppPermissionUpdate': '更新数据库应用授权规则', - 'Sessions': '会话管理', - 'SessionOnline': '在线会话', - 'SessionOffline': '历史会话', - 'SessionDetail': '会话详情', - 'Commands': '命令记录', - 'WebTerminal': 'Web终端', - 'FileManager': '文件管理', - 'Terminal': '终端管理', - 'JobCenter': '作业中心', - 'TaskList': '任务列表', - 'TaskDetail': '任务详情', - 'BatchCommand': '批量命令', - 'TaskMonitor': '任务监控', - 'Tickets': '工单管理', - 'Audits': '日志审计', - 'LoginLog': '登录日志', - 'FtpLog': 'FTP日志', - 'OperateLog': '操作日志', - 'PasswordChangeLog': '改密日志', - 'Settings': '系统设置', - 'UserCreate': '创建用户', - 'UserGroupCreate': '创建用户组', - 'UserUpdate': '更新用户', - 'AdminUserCreate': '创建管理用户', - 'PlatformCreate': '创建系统平台', - 'PlatformUpdate': '更新系统平台', - 'CommandFilterCreate': '创建命令过滤器', - 'CommandFilterUpdate': '更新命令过滤器', - 'CreateReplayStorage': '创建录像存储', - 'ReplayStorageUpdate': '更新录像存储', - 'CreateCommandStorage': '创建命令存储', - 'CommandStorageUpdate': '更新命令存储', - 'CommandFilterRulesCreate': ' 创建命令过滤器规则' - }, - auth: { - 'You have been logged out, Please log in again': '账号已退出，请重新登录', - 'Re-Login': '重新登录' - }, - // 用户模块翻译 - users: { - 'createUser': '创建用户', - 'updateUser': '更新用户', - 'userDetail': '用户详情', - 'name': '姓名', - 'username': '用户名', - 'Username': '用户名', - 'Role': '角色', - 'User groups': '用户组', - 'email': '邮箱', - 'userGroup': '用户组', - 'role': '角色', - 'Group members': '组下成员', - 'MFAcertification': 'MFA 认证', - 'source': '来源', - 'validity': '有效', - 'action': '操作', - 'update': '更新', - 'delete': '删除', - 'search': '搜索', - 'create_by': '创建者', - 'date_expired': '失效日期', - 'date_joined': '创建日期', - 'last_login': '最后登录', - 'last_password_updated': '最后更新密码', - 'usergrouplist': '用户组列表', - 'createusergroup': '创建用户组', - 'comment': '备注', - 'user': '用户', - 'User': '用户', - 'admin': '管理员', - 'auditor': '审计员', - 'off': 'OFF', - 'on': 'ON', - 'local': '数据库', - 'disable': '禁用', - 'enable': '启用', - 'force_enable': '强制启用', - 'quick_modify': '快速修改', - 'active': '激活中', - 'force_enabled_mfa': '强制启用多因子认证', - 'reset_maf': '重置多因子认证', - 'reset': '重置', - 'send_reset_password_mail': '发送重置密码邮件', - 'send_reset_ssh_key_mail': '发送重置密钥邮件', - 'send': '发送', - 'user_group': '用户组', - 'join_user_groups': '添加到用户组', - 'join': '加入', - 'login_confirm': '登录复核', - 'reviewers': '审批人', - 'confirm': '确认', - 'user_permissions': '用户授权', - 'asset_granted': '资产的授权', - 'asset_permission': '授权资产', - 'remote_app_granted': '授权的远程应用', - 'remote_app_permission': '远程应用授权', - 'database_app_granted': '授权的数据库应用', - 'database_app_permission': '数据库应用授权', - 'Account': '账户', - 'Authentication': '认证', - 'Secure': '安全', - 'Date last login': '最后登录日期', - 'Date password updated': '更新密码日期', - 'MFA': '多因子认证', - 'Source': '用户来源', - 'resetMFATitle': '重置多因子认证', - 'Send reset password mail': '发送重置密码邮件', - 'resetPublicKeyTitle': '发送重置密钥邮件', - 'resetPasswordTitle': '发送重置密码邮件', - 'Unblock user': '解除登录限制', - 'Force enabled MFA': '强制启用多因子认证', - 'resetPasswordWarningMsg': '将失效用户当前密码，并发送重设密码邮件到用户邮箱', - 'resetPasswordSuccessMsg': '已发送邮件到用户邮箱', - 'resetPublicKeyWarningMsg': '将会失效用户当前密钥，并发送重置邮件到用户邮箱', - 'resetPublicKeySuccessMsg': '已发送邮件到用户邮箱' - }, - // 用户组 - assets: { - // asset - 'asset_list': '资产列表', - 'asset_detail': '资产详情', - 'create_asset': '创建资产', - 'update_asset': '更新资产', - 'hostname': '主机名', - 'ip': 'IP', - 'hardware': '硬件', - 'reachable': '可连接', - 'action': '动作', - 'update': '更新', - 'delete': '删除', - 'search': '搜索', - 'delete_selected': '批量删除', - 'update_selected': '批量更新', - 'remove_from_this_node': '从节点移除', - 'deactive_selected': '禁用所选', - 'active_selected': '激活所选', - 'submit': '提交', - 'platform': '系统平台', - 'public_ip': '公网IP', - 'domain': '网域', - 'admin_user': '管理用户', - 'node': '节点', - 'label': '标签', - 'comment': '备注', - 'basic': '基本', - 'protocols': '协议组', - 'auth': '认证', - 'labels': '标签管理', - 'other': '其它', - 'vendor': '制造商', - 'model': '型号', - 'cpu': 'CPU', - 'memory': '内存', - 'disk': '硬盘', - 'os': '操作系统', - 'is_active': '激活', - 'serial_number': '序列号', - 'asset_number': '资产编号', - 'date_joined': '创建日期', - 'quick_modify': '快速修改', - 'active': '激活中', - 'refresh_hardware': '更新硬件信息', - 'test_connective': '测试可连接性', - 'refresh': '刷新', - 'test': '测试', - 'confirm': '确认', - 'asset_user_list': '资产用户列表', - // 网域 - 'domain_list': '网域列表', - 'domain_detail': '网域详情', - 'create_domain': '创建网域', - 'update_domain': '更新网域', - 'name': '名称', - 'asset': '资产', - 'gateway': '网关', - 'date_created': '创建日期', - 'port': '端口', - 'TestConnection': '测试连接', - // 管理用户 - 'AdminUserList': '管理用户列表', - 'AdminUserDetail': '管理用户详情', - 'AdminUserCreate': '创建管理用户', - 'AdminUserUpdate': '更新管理用户', - 'username': '用户名', - 'login_mode_display': '登录模式', - 'replace_node_assets_admin_user_with_this': '替换资产的管理员', - 'select_nodes': '选择节点', - // 系统用户 - 'SystemUserList': '系统用户列表', - 'SystemUserDetail': '系统用户详情', - 'SystemUserCreate': '创建系统用户', - 'SystemUserUpdate': '更新系统用户', - 'protocol': '协议', - 'assetlist': '资产列表', - 'loginMode': '登录模式', - 'quick_update': '快速更新', - 'auto_push': '自动更新', - // 标签 - 'label_list': '标签列表', - 'label_detail': '标签详情', - 'create_label': '创建标签', - 'update_label': '更新标签', - 'value': '值', - // 命令过滤 - 'command_filter_list': '命令过滤器列表', - 'create_command_filter': '创建命令过滤器', - 'update_command_filter': '更新命令过滤器', - 'commandFilterDetail': '命令过滤器详情', - 'rules': '规则', - 'systemUser': '系统用户', - 'date_updated': '更新日期', - 'detail': '详情', - 'type': '类型', - 'content': '内容', - 'priority': '优先级', - 'ruleaction': '策略', - 'binding_to_system_user': '绑定到系统用户', - 'created_by': '创建者', - // 系统平台 - 'platform_list': '平台列表', - 'create_platform': '创建系统平台', - 'update_platform': '更新系统平台', - 'platform_detail': '平台详情', - 'BasePlatform': '基础平台', - 'charset': '编码', - 'meta': '元数据' - }, - applications: { - 'applications': '应用管理', - 'remote_app_list': '远程应用列表', - 'create_remote_app': '创建远程应用', - 'remote_app_detail': '远程应用详情', - 'update_remote_app': '更新远程应用', - 'name': '名称', - 'appType': '应用类型', - 'asset': '资产', - 'action': '操作', - 'update': '更新', - 'delete': '删除', - 'comment': '备注', - 'database_app_list': '数据库应用列表', - 'database_app_detail': '数据库应用详情', - 'create_database_app': '创建数据库应用', - 'update_database_app': '更新数据库应用', - 'type': '类型', - 'host': '主机', - 'port': '端口', - 'database': '数据库', - 'search': '搜索', - 'date_created': '创建日期', - 'created_by': '创建者', - 'app_path': '应用路径' - }, - perms: { - 'Asset permissions': '资产授权', - 'RefreshPermissionCache': '刷新授权缓存', - 'ReFreshSuccess': '刷新成功', - 'ReFreshFail': '刷新失败', - 'IsValid': '有效', - 'IP': 'IP', - 'Hostname': '主机名', - 'All': '全部', - 'Connect': '连接', - 'UpDownload': '上传下载', - 'UploadFile': '上传文件', - 'DownloadFile': '下载文件', - 'Basic': '基本', - 'User': '用户', - 'Asset': '资产', - 'Actions': '动作', - 'UserGroups': '用户组', - 'Node': '节点', - 'SystemUser': '系统用户', - 'UserCount': '用户数量', - 'UserGroupCount': '用户组数量', - 'AssetCount': '资产数量', - 'NodeCount': '节点数量', - 'SystemUserCount': '系统用户数量', - 'DateStart': '开始日期', - 'DateExpired': '失效日期', - 'DateCreated': '创建日期', - 'CreatedBy': '创建者', - 'Comment': '备注', - 'QuickModify': '快速修改', - 'AssetPermissionDetail': '资产授权详情', - 'UsersAndUserGroups': '用户或用户组', - 'AssetAndNode': '资产或节点', - 'Active': '激活中', - 'Add user to this permission': '添加用户', - 'Add user group to this permission': '添加用户组', - 'Add asset to this permission': '添加资产', - 'Add node to this permission': '添加节点', - 'Add System User to this permission': '添加系统用户', - // - 'RemoteApp': '远程应用', - 'RemoteAppCount': '远程应用数量', - 'RemoteAppPermissionDetail': '远程应用授权详情', - 'Add RemoteApp to this permission': '添加远程应用', - // - 'DatabaseApp': '数据库应用', - 'DatabaseAppPermissionDetail': '数据库应用授权详情', - 'Add DatabaseApp to this permission': '添加数据库应用' - }, - sessions: { - 'id': 'ID', - 'user': '用户', - 'asset': '资产', - 'systemUser': '系统用户', - 'remoteAddr': '远端地址', - 'protocol': '协议', - 'loginFrom': '登录来源', - 'command': '命令', - 'dateStart': '开始日期', - 'duration': '时长', - 'terminate': '终断', - 'dateEnd': '结束日期', - 'commands': '命令记录', - 'replay': '回放', - 'download': '下载', - 'riskLevel': '风险等级', - 'session': '会话', - 'date': '日期', - 'addr': '地址', - 'active': '激活中', - 'alive': '在线', - 'StorageConfiguration': '存储配置', - 'join': '加入', - 'goto': '转到', - 'sessionDetail': '会话详情', - 'quickModify': '快速修改', - 'replaySession': '回放会话:', - 'downloadReplay': '下载录像:', - 'go': '执行', - 'terminalDetail': '终端详情', - 'name': '名称:', - 'sshPort': 'SSH端口:', - 'httpPort': 'HTTP端口:', - 'comment': '备注:', - 'dateCreated': '创建日期:', - 'info': '信息', - 'createCommand': '创建命令存储', - 'createReplay': '创建录像存储', - 'commandStorage': '命令存储', - 'replayStorage': '录像存储', - 'storage': '存储', - 'test': '测试', - 'createReplyStorage': '创建录像存储', - 'endPoint': '端点', - 'bucket': '桶名称', - 'type': '类型', - 'containerName': '容器名称', - 'accountName': '账户名称', - 'accountKey': '账户密钥', - 'endpointSuffix': '端点后缀', - 'docType': '文档类型', - 'index': '索引', - 'hosts': '主机' - }, - jobcenter: { - 'RunTimes': '执行次数', - 'Hosts': '主机', - 'Success': '成功', - 'Date': '日期', - 'Time': '时间', - 'run': '执行', - 'ID': 'ID', - 'TaskDetail': '任务详情', - 'TaskVersions': '任务各版本', - 'Execution': '执行历史', - 'LaskExecutionOutput': '最后执行输出', - 'DateCreated': '创建日期', - 'TotalVersions': '版本数量', - 'LatestVersion': '最新版本', - 'LastRun': '最后运行', - 'TimeDelta': '运行时间', - 'IsFinished': '是否完成', - 'IsSuccess': '成功', - 'Contents': '内容', - 'Last run failed hosts': '最后运行失败的主机', - 'Last run success hosts': '最后运行成功的主机', - 'Version': '版本', - 'Pattern': '模式', - 'RunAs': '运行用户', - 'Become': 'Become', - 'Datetime': '日期', - 'Stat': '成功/失败/总', - 'Ratio': '比例', - 'Yes': '是', - 'No': '否', - 'versionDetail': '版本详情', - 'VersionRunExecution': '执行历史', - 'SuccessHosts': '成功资产', - 'FailedHosts': '失败资产', - 'ExecutionDetail': '执行历史详情', - 'Output': '输出', - 'CreatedBy': '创建者', - 'Tasks': '任务', - 'Options': '选项', - 'TaskName': '任务名称', - 'DateStart': '开始日期' - }, - tickets: { - 'title': '标题', - 'user': '用户', - 'type': '类型', - 'status': '状态', - 'date': '日期', - 'MyTickets': '我的工单', - 'AssignedMe': '待处理' - }, - tree: { - 'AddNode': '添加节点', - 'RenameNode': '重命名节点', - 'DeleteNode': '删除节点' - }, - setting: { - 'setting': '系统设置', - 'Basic': '基本设置', - 'Email': '邮件设置', - 'EmailContent': '邮件内容设置', - 'Ldap': 'LDAP设置', - 'Terminal': '终端设置', - 'Security': '安全设置', - 'createUserSetting': '创建用户设置', - 'basicSetting': '基本设置', - 'SecuritySetting': '安全设置', - 'PasswordCheckRule': '密码校验规则', - 'siteUrl': '当前站点URL', - 'userGuideUrl': '用户向导URL', - 'emailSubjectPrefix': 'Email主题前缀', - 'emailHost': 'SMTP主机', - 'emailPort': 'SMTP端口', - 'emailHostUser': 'SMTP账号', - 'emailHostPassword': 'SMTP密码', - 'emailEmailFrom': '发送账号', - 'emailRecipient': '测试收件人', - 'emailUserSSL': '使用SSL', - 'emailUserTLS': '使用TLS', - 'emailCustomUserCreatedSubject': '创建用户邮件的主题', - 'emailCustomUserCreatedHonorific': '创建用户邮件的敬语', - 'emailCustomUserCreatedBody': '创建用户邮件的内容', - 'emailCustomUserCreatedSignature': '署名', - 'authLdapServerUri': 'LDAP地址', - 'authLdapBindDn': '绑定DN', - 'authLdapBindPassword': '密码', - 'authLdapSearchOu': '用户OU', - 'authLdapSearchFilter': '用户过滤器', - 'authLdapUserAttrMap': 'LDAP属性映射', - 'authLdap': '启用LDAP认证', - 'terminalPasswordAuth': '密码认证', - 'terminalPublicKeyAuth': '密钥认证', - 'terminalHeartbeatInterval': '心跳间隔', - 'terminalAssetListSortBy': '资产列表排序', - 'terminalAssetListPageSize': '资产分页每页数量', - 'terminalSessionKeepDuration': '会话保留时长', - 'terminalTelnetRegex': 'Telnet 成功正则表达式', - 'securityMfaAuth': '多因子认证', - 'securityCommandExecution': '批量命令', - 'securityServiceAccountRegistration': '终端注册', - 'securityLoginLimitCount': '限制登录失败次数', - 'securityLoginLimitTime': '禁止登录时间间隔', - 'securityMaxIdleTime': '连接最大空闲时间', - 'securityPasswordExpirationTime': '密码过期时间', - 'securityPasswordMinLength': '密码最小长度', - 'securityPasswordUpperCase': '必须包含大写字母', - 'securityPasswordLowerCase': '必须包含小写字母', - 'securityPasswordNumber': '必须包含数字字符', - 'securityPasswordSpecialChar': '必须包含特殊字符', - 'Hostname': '主机名', - 'emailTest': '测试连接', - 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': '开启后，用户密码修改、重置必须包含特殊字符' - } - }, - audits: { - 'username': '用户名', - 'type': '类型', - 'ip': 'IP', - 'city': '城市', - 'user_agent': 'Agent', - 'mfa': '多因子认证', - 'reason': '原因', - 'status': '状态', - 'datetime': '日期' - }, +import custom from './cn.json' + +const cn = { + ...custom, ...zhLocale } - export default cn diff --git a/src/i18n/langs/cn.json b/src/i18n/langs/cn.json new file mode 100644 index 000000000..1e0036480 --- /dev/null +++ b/src/i18n/langs/cn.json @@ -0,0 +1,617 @@ +{ + "message":{"hello":"你好, 世界","login":"登录"}, + "header":{"language":"中文","help":"帮助","Documents":"文档","CommercialSupport":"商业支持"}, + "action":{ + "update":"更新", + "delete":"删除", + "ExportRange":"导出范围", + "ExportAll":"导出全部", + "ExportOnlySelectedItems":"仅导出选中项", + "DownloadTheImportedTemplateOrUseTheExportedCSVFormat":"下载导入的模板或使用导出的csv格式", + "DownloadImportTemplate":"下载导入模板", + "DownloadTheUpdatedTemplateOrUsTheExportedCSVFormat":"下载更新的模板或使用导出的csv格式", + "DownloadUpdateTemplate":"下载更新模板", + "Upload":"点击上传", + "OnlyCSVFilesCanBeUploaded":"只能上传CSV文件" + }, + "common":{ + "name":"名称", + "Name":"名称", + "action":"动作", + "Action":"动作", + "role":"角色", + "username":"用户名", + "Language":"语言", + "Help":"帮助", + "more":"更多", + "Update":"更新", + "update":"更新", + "Delete":"删除", + "delete":"删除", + "Detail":"详情", + "detail":"详情", + "baseInfo":"基本信息", + "Created by":"创建人", + "Date Created":"创建日期", + "Comment":"备注", + "Create":"创建", + "More actions":"更多操作", + "Delete selected":"删除所选", + "Update selected":"更新所选", + "Delete success":"删除成功", + "Delete failed":"删除失败", + "Search":"搜索", + "Source":"来源", + "Status":"状态", + "Actions":"动作", + "Monitor":"监控", + "Run":"执行", + "Are you sure to delete":"你确定要删除", + "Info":"提示", + "More":"更多", + "Submit":"提交", + "Reset":"重置", + "This field is required":"这个字段是必填项", + "Validity":"有效性", + "confirm":"确认", + "Confirm":"确认", + "Cancel":"取消", + "cancel":"取消", + "Import":"导入", + "Export":"导出", + "Other":"其它", + "Create success":"创建成功", + "Update success":"更新成功", + "Update failed":"更新失败", + "Deactive selected":"禁用所选", + "Active selected":"激活所选", + "rows":"行", + "basic info":"基本信息", + "Command filter":"命令过滤器", + "Add":"添加", + "Auth":"认证", + "Others":"其他", + "Members":"成员", + "Username":"用户名", + "Email":"邮件", + "Role":"角色", + "Date expired":"失效日期", + "Quick update":"快速更新", + "Send":"发送", + "Unblock":"解锁", + "Active":"激活中" + }, + "route":{ + "dashboard":"仪表盘", + "Users":"用户管理", + "UserList":"用户列表", + "UserDetail":"用户详情", + "UserGroupList":"用户组", + "UserGroupDetail":"用户组详情", + "Assets":"资产管理", + "AssetList":"资产列表", + "DomainList":"网关列表", + "AdminUserList":"管理用户", + "SystemUserList":"系统用户", + "LabelList":"标签管理", + "CommandFilterList":"命令过滤", + "PlatformList":"平台列表", + "Applications":"应用管理", + "RemoteApp":"远程应用", + "DatabaseApp":"数据库应用", + "Perms":"权限管理", + "AssetPermission":"资产授权", + "AssetPermissionDetail":"资产授权详情", + "AssetPermissionCreate":"创建资产授权规则", + "AssetPermissionUpdate":"更新资产授权规则", + "RemoteAppPermission":"远程应用授权", + "RemoteAppPermissionDetail":"远程应用授权详情", + "RemoteAppPermissionCreate":"创建远程应用授权规则", + "RemoteAppPermissionUpdate":"更新远程应用授权规则", + "DatabaseAppPermission":"数据库应用授权", + "DatabaseAppPermissionDetail":"数据库应用授权详情", + "DatabaseAppPermissionCreate":"创建数据库应用授权规则", + "DatabaseAppPermissionUpdate":"更新数据库应用授权规则", + "Sessions":"会话管理", + "SessionOnline":"在线会话", + "SessionOffline":"历史会话", + "SessionDetail":"会话详情", + "Commands":"命令记录", + "WebTerminal":"Web终端", + "FileManager":"文件管理", + "Terminal":"终端管理", + "JobCenter":"作业中心", + "TaskList":"任务列表", + "TaskDetail":"任务详情", + "BatchCommand":"批量命令", + "TaskMonitor":"任务监控", + "Tickets":"工单管理", + "Audits":"日志审计", + "LoginLog":"登录日志", + "FtpLog":"FTP日志", + "OperateLog":"操作日志", + "PasswordChangeLog":"改密日志", + "Settings":"系统设置", + "UserCreate":"创建用户", + "UserGroupCreate":"创建用户组", + "UserUpdate":"更新用户", + "AdminUserCreate":"创建管理用户", + "PlatformCreate":"创建系统平台", + "PlatformUpdate":"更新系统平台", + "CommandFilterCreate":"创建命令过滤器", + "CommandFilterUpdate":"更新命令过滤器", + "CreateReplayStorage":"创建录像存储", + "ReplayStorageUpdate":"更新录像存储", + "CreateCommandStorage":"创建命令存储", + "CommandStorageUpdate":"更新命令存储", + "CommandFilterRulesCreate":" 创建命令过滤器规则", + "LabelCreate":"创建标签", + "LabelUpdate":"更新标签" + }, + "auth":{ + "You have been logged out, Please log in again":"账号已退出，请重新登录", + "Re-Login":"重新登录" + }, + "users":{ + "createUser":"创建用户", + "updateUser":"更新用户", + "userDetail":"用户详情", + "name":"姓名", + "username":"用户名", + "Username":"用户名", + "Role":"角色", + "User groups":"用户组", + "email":"邮箱", + "userGroup":"用户组", + "role":"角色", + "Group members":"组下成员", + "MFAcertification":"MFA 认证", + "source":"来源", + "validity":"有效", + "action":"操作", + "update":"更新", + "delete":"删除", + "search":"搜索", + "create_by":"创建者", + "date_expired":"失效日期", + "date_joined":"创建日期", + "last_login":"最后登录", + "last_password_updated":"最后更新密码", + "usergrouplist":"用户组列表", + "createusergroup":"创建用户组", + "comment":"备注", + "user":"用户", + "User":"用户", + "admin":"管理员", + "auditor":"审计员", + "off":"OFF", + "on":"ON", + "local":"数据库", + "disable":"禁用", + "enable":"启用", + "force_enable":"强制启用", + "quick_modify":"快速修改", + "active":"激活中", + "force_enabled_mfa":"强制启用多因子认证", + "reset_maf":"重置多因子认证", + "reset":"重置", + "send_reset_password_mail":"发送重置密码邮件", + "send_reset_ssh_key_mail":"发送重置密钥邮件", + "send":"发送", + "user_group":"用户组", + "join_user_groups":"添加到用户组", + "join":"加入", + "login_confirm":"登录复核", + "reviewers":"审批人", + "confirm":"确认", + "user_permissions":"用户授权", + "asset_granted":"资产的授权", + "asset_permission":"授权资产", + "remote_app_granted":"授权的远程应用", + "remote_app_permission":"远程应用授权", + "database_app_granted":"授权的数据库应用", + "database_app_permission":"数据库应用授权", + "Account":"账户", + "Authentication":"认证", + "Secure":"安全", + "Date last login":"最后登录日期", + "Date password updated":"更新密码日期", + "MFA":"多因子认证", + "Source":"用户来源", + "resetMFATitle":"重置多因子认证", + "Send reset password mail":"发送重置密码邮件", + "resetPublicKeyTitle":"发送重置密钥邮件", + "resetPasswordTitle":"发送重置密码邮件", + "Unblock user":"解除登录限制", + "Force enabled MFA":"强制启用多因子认证", + "resetPasswordWarningMsg":"将失效用户当前密码，并发送重设密码邮件到用户邮箱", + "resetPasswordSuccessMsg":"已发送邮件到用户邮箱", + "resetPublicKeyWarningMsg":"将会失效用户当前密钥，并发送重置邮件到用户邮箱", + "resetPublicKeySuccessMsg":"已发送邮件到用户邮箱" + }, + "assets":{ + "asset_list":"资产列表", + "asset_detail":"资产详情", + "create_asset":"创建资产", + "update_asset":"更新资产", + "hostname":"主机名", + "ip":"IP", + "hardware":"硬件", + "reachable":"可连接", + "action":"动作", + "update":"更新", + "delete":"删除", + "search":"搜索", + "delete_selected":"批量删除", + "update_selected":"批量更新", + "remove_from_this_node":"从节点移除", + "deactive_selected":"禁用所选", + "active_selected":"激活所选", + "submit":"提交", + "platform":"系统平台", + "public_ip":"公网IP", + "domain":"网域", + "admin_user":"管理用户", + "node":"节点", + "label":"标签", + "comment":"备注", + "basic":"基本", + "protocols":"协议组", + "auth":"认证", + "labels":"标签管理", + "other":"其它", + "vendor":"制造商", + "model":"型号", + "cpu":"CPU", + "memory":"内存", + "disk":"硬盘", + "os":"操作系统", + "is_active":"激活", + "serial_number":"序列号", + "asset_number":"资产编号", + "date_joined":"创建日期", + "quick_modify":"快速修改", + "active":"激活中", + "refresh_hardware":"更新硬件信息", + "test_connective":"测试可连接性", + "refresh":"刷新", + "test":"测试", + "confirm":"确认", + "asset_user_list":"资产用户列表", + "domain_list":"网域列表", + "domain_detail":"网域详情", + "create_domain":"创建网域", + "update_domain":"更新网域", + "name":"名称", + "asset":"资产", + "gateway":"网关", + "date_created":"创建日期", + "port":"端口", + "version":"版本", + "TestConnection":"测试连接", + "AdminUserList":"管理用户列表", + "AdminUserDetail":"管理用户详情", + "AdminUserCreate":"创建管理用户", + "AdminUserUpdate":"更新管理用户", + "username":"用户名", + "login_mode_display":"登录模式", + "replace_node_assets_admin_user_with_this":"替换资产的管理员", + "select_nodes":"选择节点", + "SystemUserList":"系统用户列表", + "SystemUserDetail":"系统用户详情", + "SystemUserCreate":"创建系统用户", + "SystemUserUpdate":"更新系统用户", + "protocol":"协议", + "assetlist":"资产列表", + "loginMode":"登录模式", + "quick_update":"快速更新", + "auto_push":"自动推送", + "label_list":"标签列表", + "label_detail":"标签详情", + "create_label":"创建标签", + "update_label":"更新标签", + "value":"值", + "command_filter_list":"命令过滤器列表", + "create_command_filter":"创建命令过滤器", + "update_command_filter":"更新命令过滤器", + "commandFilterDetail":"命令过滤器详情", + "rules":"规则", + "systemUser":"系统用户", + "date_updated":"更新日期", + "detail":"详情", + "type":"类型", + "content":"内容", + "priority":"优先级", + "ruleaction":"策略", + "binding_to_system_user":"绑定到系统用户", + "created_by":"创建者", + "platform_list":"平台列表", + "create_platform":"创建系统平台", + "update_platform":"更新系统平台", + "platform_detail":"平台详情", + "BasePlatform":"基础平台", + "charset":"编码", + "meta":"元数据" + }, + "applications":{ + "applications":"应用管理", + "remote_app_list":"远程应用列表", + "create_remote_app":"创建远程应用", + "remote_app_detail":"远程应用详情", + "update_remote_app":"更新远程应用", + "name":"名称", + "appType":"应用类型", + "asset":"资产", + "action":"操作", + "update":"更新", + "delete":"删除", + "comment":"备注", + "database_app_list":"数据库应用列表", + "database_app_detail":"数据库应用详情", + "create_database_app":"创建数据库应用", + "update_database_app":"更新数据库应用", + "type":"类型", + "host":"主机", + "port":"端口", + "database":"数据库", + "search":"搜索", + "date_created":"创建日期", + "created_by":"创建者", + "app_path":"应用路径" + }, + "perms":{ + "Asset permissions":"资产授权", + "RefreshPermissionCache":"刷新授权缓存", + "ReFreshSuccess":"刷新成功", + "ReFreshFail":"刷新失败", + "IsValid":"有效", + "IP":"IP", + "Hostname":"主机名", + "All":"全部", + "Connect":"连接", + "UpDownload":"上传下载", + "UploadFile":"上传文件", + "DownloadFile":"下载文件", + "Basic":"基本", + "User":"用户", + "Asset":"资产", + "Actions":"动作", + "UserGroups":"用户组", + "Node":"节点", + "SystemUser":"系统用户", + "UserCount":"用户数量", + "UserGroupCount":"用户组数量", + "AssetCount":"资产数量", + "NodeCount":"节点数量", + "SystemUserCount":"系统用户数量", + "DateStart":"开始日期", + "DateExpired":"失效日期", + "DateCreated":"创建日期", + "CreatedBy":"创建者", + "Comment":"备注", + "QuickModify":"快速修改", + "AssetPermissionDetail":"资产授权详情", + "UsersAndUserGroups":"用户或用户组", + "AssetAndNode":"资产或节点", + "Active":"激活中", + "Add user to this permission":"添加用户", + "Add user group to this permission":"添加用户组", + "Add asset to this permission":"添加资产", + "Add node to this permission":"添加节点", + "Add System User to this permission":"添加系统用户", + "RemoteApp":"远程应用", + "RemoteAppCount":"远程应用数量", + "RemoteAppPermissionDetail":"远程应用授权详情", + "Add RemoteApp to this permission":"添加远程应用", + "DatabaseApp":"数据库应用", + "DatabaseAppPermissionDetail":"数据库应用授权详情", + "Add DatabaseApp to this permission":"添加数据库应用" + }, + "sessions":{ + "id":"ID", + "user":"用户", + "asset":"资产", + "systemUser":"系统用户", + "remoteAddr":"远端地址", + "protocol":"协议", + "loginFrom":"登录来源", + "command":"命令", + "dateStart":"开始日期", + "duration":"时长", + "terminate":"终断", + "dateEnd":"结束日期", + "commands":"命令记录", + "replay":"回放", + "download":"下载", + "riskLevel":"风险等级", + "session":"会话", + "date":"日期", + "addr":"地址", + "active":"激活中", + "alive":"在线", + "StorageConfiguration":"存储配置", + "join":"加入", + "goto":"转到", + "sessionDetail":"会话详情", + "quickModify":"快速修改", + "replaySession":"回放会话:", + "downloadReplay":"下载录像:", + "go":"执行", + "terminalDetail":"终端详情", + "name":"名称:", + "sshPort":"SSH端口:", + "httpPort":"HTTP端口:", + "comment":"备注:", + "dateCreated":"创建日期:", + "info":"信息", + "createCommand":"创建命令存储", + "createReplay":"创建录像存储", + "commandStorage":"命令存储", + "replayStorage":"录像存储", + "storage":"存储", + "test":"测试", + "createReplyStorage":"创建录像存储", + "endPoint":"端点", + "bucket":"桶名称", + "type":"类型", + "containerName":"容器名称", + "accountName":"账户名称", + "accountKey":"账户密钥", + "endpointSuffix":"端点后缀", + "docType":"文档类型", + "index":"索引", + "hosts":"主机" + }, + "jobcenter":{ + "RunTimes":"执行次数", + "Hosts":"主机", + "Success":"成功", + "Date":"日期", + "Time":"时间", + "run":"执行", + "ID":"ID", + "TaskDetail":"任务详情", + "TaskVersions":"任务各版本", + "Execution":"执行历史", + "LaskExecutionOutput":"最后执行输出", + "DateCreated":"创建日期", + "TotalVersions":"版本数量", + "LatestVersion":"最新版本", + "LastRun":"最后运行", + "TimeDelta":"运行时间", + "IsFinished":"是否完成", + "IsSuccess":"成功", + "Contents":"内容", + "Last run failed hosts":"最后运行失败的主机", + "Last run success hosts":"最后运行成功的主机", + "Version":"版本", + "Pattern":"模式", + "RunAs":"运行用户", + "Become":"Become", + "Datetime":"日期", + "Stat":"成功/失败/总", + "Ratio":"比例", + "Yes":"是", + "No":"否", + "versionDetail":"版本详情", + "VersionRunExecution":"执行历史", + "SuccessHosts":"成功资产", + "FailedHosts":"失败资产", + "ExecutionDetail":"执行历史详情", + "Output":"输出", + "CreatedBy":"创建者", + "Tasks":"任务", + "Options":"选项", + "TaskName":"任务名称", + "DateStart":"开始日期" + }, + "tickets":{ + "title":"标题", + "user":"用户", + "type":"类型", + "status":"状态", + "date":"日期", + "MyTickets":"我的工单", + "AssignedMe":"待处理" + }, + "tree":{"AddNode":"添加节点","RenameNode":"重命名节点","DeleteNode":"删除节点"}, + "setting":{ + "setting":"系统设置", + "Basic":"基本设置", + "Email":"邮件设置", + "EmailContent":"邮件内容设置", + "Ldap":"LDAP设置", + "Terminal":"终端设置", + "Security":"安全设置", + "createUserSetting":"创建用户设置", + "basicSetting":"基本设置", + "SecuritySetting":"安全设置", + "PasswordCheckRule":"密码校验规则", + "siteUrl":"当前站点URL", + "userGuideUrl":"用户向导URL", + "emailSubjectPrefix":"Email主题前缀", + "emailHost":"SMTP主机", + "emailPort":"SMTP端口", + "emailHostUser":"SMTP账号", + "emailHostPassword":"SMTP密码", + "emailEmailFrom":"发送账号", + "emailRecipient":"测试收件人", + "emailUserSSL":"使用SSL", + "emailUserTLS":"使用TLS", + "emailCustomUserCreatedSubject":"创建用户邮件的主题", + "emailCustomUserCreatedHonorific":"创建用户邮件的敬语", + "emailCustomUserCreatedBody":"创建用户邮件的内容", + "emailCustomUserCreatedSignature":"署名", + "authLdapServerUri":"LDAP地址", + "authLdapBindDn":"绑定DN", + "authLdapBindPassword":"密码", + "authLdapSearchOu":"用户OU", + "authLdapSearchFilter":"用户过滤器", + "authLdapUserAttrMap":"LDAP属性映射", + "authLdap":"启用LDAP认证", + "terminalPasswordAuth":"密码认证", + "terminalPublicKeyAuth":"密钥认证", + "terminalHeartbeatInterval":"心跳间隔", + "terminalAssetListSortBy":"资产列表排序", + "terminalAssetListPageSize":"资产分页每页数量", + "terminalSessionKeepDuration":"会话保留时长", + "terminalTelnetRegex":"Telnet 成功正则表达式", + "securityMfaAuth":"多因子认证", + "securityCommandExecution":"批量命令", + "securityServiceAccountRegistration":"终端注册", + "securityLoginLimitCount":"限制登录失败次数", + "securityLoginLimitTime":"禁止登录时间间隔", + "securityMaxIdleTime":"连接最大空闲时间", + "securityPasswordExpirationTime":"密码过期时间", + "securityPasswordMinLength":"密码最小长度", + "securityPasswordUpperCase":"必须包含大写字母", + "securityPasswordLowerCase":"必须包含小写字母", + "securityPasswordNumber":"必须包含数字字符", + "securityPasswordSpecialChar":"必须包含特殊字符", + "Hostname":"主机名", + "emailTest":"测试连接", + "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":"开启后，用户密码修改、重置必须包含特殊字符" + } + }, + "audits":{ + "username":"用户名", + "type":"类型", + "ip":"IP", + "city":"城市", + "user_agent":"Agent", + "mfa":"多因子认证", + "reason":"原因", + "status":"状态", + "datetime":"日期" + } +} From cf08cb1db930e5c1108eba25f1e8ca6c0793c16b Mon Sep 17 00:00:00 2001 From: OrangeM21 Date: Sat, 9 May 2020 12:29:52 +0800 Subject: [PATCH 2/7] =?UTF-8?q?[update]=E4=BF=AE=E6=94=B9Tree=E7=BB=84?= =?UTF-8?q?=E4=BB=B6=E7=BB=93=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/AutoDataZTree/index.vue | 9 +++- .../DataZTree/components/ZTree/index.vue | 45 +++---------------- src/components/DataZTree/index.vue | 3 +- 3 files changed, 15 insertions(+), 42 deletions(-) diff --git a/src/components/AutoDataZTree/index.vue b/src/components/AutoDataZTree/index.vue index 73cb17fac..4a3cad684 100644 --- a/src/components/AutoDataZTree/index.vue +++ b/src/components/AutoDataZTree/index.vue @@ -37,7 +37,8 @@ export default { onRename: this.onRename.bind(this), onSelected: this.onSelected.bind(this), beforeDrop: this.beforeDrop.bind(this), - onDrop: this.onDrop.bind(this) + onDrop: this.onDrop.bind(this), + refresh: this.refresh.bind(this) // 尚未定义的函数 // beforeClick // beforeDrag @@ -214,6 +215,12 @@ export default { var node = this.zTree.getNodeByParam('id', newNode.id, parentNode) this.zTree.editName(node) }) + }, + refresh: function() { + this.$axios.post( + '/api/v1/assets/nodes/00000000-0000-0000-0000-000000000000/tasks/', + { action: 'refresh_cache' } + ) } } } diff --git a/src/components/DataZTree/components/ZTree/index.vue b/src/components/DataZTree/components/ZTree/index.vue index 1f7a2b166..6377976e7 100644 --- a/src/components/DataZTree/components/ZTree/index.vue +++ b/src/components/DataZTree/components/ZTree/index.vue @@ -18,13 +18,10 @@ import $ from '@/utils/jquery-vendor.js' import 'ztree' import '@/styles/ztree.css' -const merge = require('deepmerge') const defaultObject = { type: Object, - default: () => { - - } + default: () => {} } export default { name: 'ZTree', @@ -35,18 +32,13 @@ export default { }, data() { return { - defaultSetting: { - - }, zTree: '', rMenu: '' } }, computed: { treeSetting() { - const treeSetting = merge(this.defaultSetting, this.setting) - - return treeSetting + return this.setting } }, mounted() { @@ -60,15 +52,7 @@ export default { if (this.treeSetting.showRefresh) { this.rootNodeAddDom( this.zTree, - () => { - this.$axios.post( - '/api/v1/assets/nodes/00000000-0000-0000-0000-000000000000/tasks/', - { action: 'refresh_cache' } - ).then(res => { - this.initTree() - } - ) - } + this.treeSetting.callback.refresh ) } @@ -81,6 +65,7 @@ export default { }) }, rootNodeAddDom: function(ztree, callback) { + const vm = this var refreshIcon = "" var rootNode = ztree.getNodes()[0] if (rootNode) { @@ -94,28 +79,8 @@ export default { refreshIconRef.bind('click', function() { ztree.destroy() callback() + vm.initTree() }) - }, - setUrlParam: function(url, name, value) { - var urlArray = url.split('?') - if (urlArray.length === 1) { - url += '?' + name + '=' + value - } else { - var oriParam = urlArray[1].split('&') - var oriParamMap = {} - $.each(oriParam, function(index, value) { - var v = value.split('=') - oriParamMap[v[0]] = v[1] - }) - oriParamMap[name] = value - url = urlArray[0] + '?' - var newParam = [] - $.each(oriParamMap, function(index, value) { - newParam.push(index + '=' + value) - }) - url += newParam.join('&') - } - return url } } diff --git a/src/components/DataZTree/index.vue b/src/components/DataZTree/index.vue index 44708e80a..88ce54f17 100644 --- a/src/components/DataZTree/index.vue +++ b/src/components/DataZTree/index.vue @@ -50,7 +50,8 @@ export default { onDrag: this.defaultCallback.bind(this, 'onDrag'), beforeDrop: this.defaultCallback.bind(this, 'beforeDrop'), onDrop: this.defaultCallback.bind(this, 'onDrop'), - beforeAsync: this.defaultCallback.bind(this, 'beforeAsync') + beforeAsync: this.defaultCallback.bind(this, 'beforeAsync'), + refresh: this.defaultCallback.bind(this, 'refresh') } } } From dbe032f9ad1dfd868c3cdc459e56e8015b284fd5 Mon Sep 17 00:00:00 2001 From: OrangeM21 Date: Sat, 9 May 2020 14:21:17 +0800 Subject: [PATCH 3/7] =?UTF-8?q?[update]=E7=BF=BB=E8=AF=91=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E4=B8=BAJSon=E6=A0=BC=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/i18n/langs/cn.js | 9 - src/i18n/langs/cn.json | 4 +- src/i18n/langs/en.js | 445 ----------------------------------------- src/i18n/langs/en.json | 428 +++++++++++++++++++++++++++++++++++++++ 4 files changed, 431 insertions(+), 455 deletions(-) delete mode 100644 src/i18n/langs/cn.js delete mode 100644 src/i18n/langs/en.js create mode 100644 src/i18n/langs/en.json diff --git a/src/i18n/langs/cn.js b/src/i18n/langs/cn.js deleted file mode 100644 index ee5c40dc5..000000000 --- a/src/i18n/langs/cn.js +++ /dev/null @@ -1,9 +0,0 @@ -import zhLocale from 'element-ui/lib/locale/lang/zh-CN' - -import custom from './cn.json' - -const cn = { - ...custom, - ...zhLocale -} -export default cn diff --git a/src/i18n/langs/cn.json b/src/i18n/langs/cn.json index 1e0036480..c04011912 100644 --- a/src/i18n/langs/cn.json +++ b/src/i18n/langs/cn.json @@ -79,7 +79,9 @@ "Quick update":"快速更新", "Send":"发送", "Unblock":"解锁", - "Active":"激活中" + "Active":"激活中", + "Test": "测试", + "Push": "推送" }, "route":{ "dashboard":"仪表盘", diff --git a/src/i18n/langs/en.js b/src/i18n/langs/en.js deleted file mode 100644 index bdd3d9faf..000000000 --- a/src/i18n/langs/en.js +++ /dev/null @@ -1,445 +0,0 @@ -import enLocale from 'element-ui/lib/locale/lang/en' -const en = { - message: { - 'hello': 'hello, world', - 'login': 'Login' - }, - header: { - 'language': 'English', - 'help': 'help', - 'Documents': 'Documents', - 'CommercialSupport': 'Commercial Support' - }, - route: { - 'dashboard': 'Dashboard', - 'users': 'Users', - 'userList': 'User List', - 'usergroup': 'User Group', - 'assets': 'Assets', - 'applications': 'Applications', - 'perms': 'Perms', - 'Sessions': 'Sessions', - 'SessionOnline': 'Session Online', - 'SessionOffline': 'Session Offline', - 'SessionDetail': 'Session Detail', - 'Goto': 'Goto', - 'jobcenter': 'Job Center', - 'Terminal': 'Terminal', - 'CreateReplayStorage': 'Create replay storage', - 'ReplayStorageUpdate': 'Update replay storage', - 'CreateCommandStorage': 'Create command storage', - 'CommandStorageUpdate': 'Update command storage' - }, - users: { - 'createuser': 'Cerate User', - 'updateuser': 'Update User', - 'user_detail': 'User Detail', - 'name': 'Name', - 'username': 'Username', - 'email': 'Email', - 'usergroup': 'User Group', - 'role': 'Role', - 'MFAcertification': 'MFA certification', - 'source': 'Source', - 'validity': 'Validity', - 'action': 'Action', - 'update': 'Update', - 'delete': 'Delete', - 'search': 'Search', - 'create_by': 'Create by', - 'date_expired': 'Date expired', - 'date_joined': 'Date joined', - 'last_login': 'Last login', - 'last_password_updated': 'Last password updated', - 'usergrouplist': 'User Group List', - 'createusergroup': 'Create User Group', - 'comment': 'comment', - 'user': 'User', - 'admin': 'Admin', - 'auditor': 'Auditor', - 'off': 'OFF', - 'on': 'ON', - 'local': 'Local', - 'disable': 'Disable', - 'enable': 'Enable', - 'force_enable': 'Force enable', - 'quick_modify': 'Quick modify', - 'active': 'Active', - 'force_enabled_mfa': 'Force enabled MFA', - 'reset_maf': 'Reset MFA', - 'reset': 'Reset', - 'send_reset_password_mail': 'Send reset password mail', - 'send_reset_ssh_key_mail': 'Send reset ssh key mail', - 'send': 'Send', - 'user_group': 'User Group', - 'join_user_groups': 'Join user groups', - 'join': 'Join', - 'login_confirm': 'Login confirm', - 'reviewers': 'Reviewers', - 'confirm': 'Confirm', - 'user_permissions': 'User permissions', - 'asset_granted': 'Asset granted', - 'asset_permission': 'Asset permission', - 'remote_app_granted': 'RemoteApp granted', - 'remote_app_permission': 'RemoteApp permission', - 'database_app_granted': 'DatabaseApp granted', - 'database_app_permission': 'DatabaseApp permission', - 'resetPublicKeyTitle': 'Send reset ssh key mail', - 'resetPasswordTitle': 'Send reset password mail', - 'resetPasswordWarningMsg': 'This will reset the user password and send a reset mail', - 'resetPasswordSuccessMsg': 'An e-mail has been sent to the user`s mailbox', - 'resetPublicKeyWarningMsg': 'This will reset the user public key and send a reset mail', - 'resetPublicKeySuccessMsg': 'An e-mail has been sent to the user`s mailbox', - 'resetMFATitle': 'Reset MFA' - }, - usergroup: { - 'user_group_list': 'User group list', - 'user_group_detail': 'User group detail', - 'create_user_group': 'Create user group', - 'update_user_group': 'Update user group', - 'name': 'Name', - 'user': 'User', - 'comment': 'Comment', - 'action': 'Action', - 'update': 'Update', - 'delete': 'Delete', - 'created_by': 'Create by', - 'date_created': 'Date created', - 'asset_granted': 'Asset Granted', - 'add_user': 'Add user', - 'add': 'Add' - }, - assets: { - 'asset_list': 'Asset list', - 'asset_detail': 'Asset detail', - 'create_asset': 'Create asset', - 'update_asset': 'Update asset', - 'hostname': 'Hostname', - 'ip': 'IP', - 'hardware': 'Hardware', - 'reachable': 'Reachable', - 'action': 'Action', - 'update': 'Update', - 'delete': 'Delete', - 'search': 'Search', - 'delete_selected': 'Delete selected', - 'update_selected': 'Update selected', - 'remove_from_this_node': 'Remove from this node', - 'deactive_selected': 'Deactive selected', - 'active_selected': 'Active selected', - 'submit': 'Submit', - 'platform': 'Platform', - 'public_ip': 'Public Ip', - 'domain': 'Domain', - 'admin_user': 'Admin user', - 'node': 'Node', - 'label': 'Label', - 'comment': 'Comment', - 'basic': 'Basic', - 'protocols': 'Protocols', - 'auth': 'Auth', - 'labels': 'Labels', - 'other': 'Other', - 'vendor': 'Vendor', - 'model': 'Model', - 'cpu': 'CPU', - 'memory': 'Memory', - 'disk': 'Disk', - 'os': 'OS', - 'is_active': 'Is active', - 'serial_number': 'Serial number', - 'asset_number': 'Asset number', - 'created_by': 'Created by', - 'date_joined': 'Date joined', - 'quick_modify': 'Quick modify', - 'active': 'Active', - 'refresh_hardware': 'Refresh hardware', - 'test_connective': 'Test connective', - 'refresh': 'Refresh', - 'test': 'Test', - 'confirm': 'Confirm', - 'asset_user_list': 'Asset user list', - // 网域 - 'domain_list': 'Domain list', - 'domain_detail': 'Domain detail', - 'create_domain': 'Create domain', - 'update_domain': 'Update domain', - 'name': 'Name', - 'asset': 'Asset', - 'gateway': 'Gateway', - 'date_created': 'Date created', - // 管理用户 - 'admin_user_list': 'Admin user list', - 'admin_user_detail': 'Admin user detail', - 'create_admin_user': 'Create admin user', - 'update_admin_user': 'Update admin user', - 'username': 'Username', - 'replace_node_assets_admin_user_with_this': 'Replace node assets admin user with this', - 'select_nodes': 'Select nodes', - // 系统用户 - 'system_user_list': 'System user list', - 'create_system_user': 'Create system user', - 'update_system_user': 'Update system user', - 'system_user_detail': 'System user detail', - 'protocol': 'Protocol', - 'login_mode': 'Login mode', - 'quick_update': 'Quick update', - 'auto_push': 'Auto push', - // 标签 - 'label_list': 'Label list', - 'label_detail': 'Label detail', - 'create_label': 'Create label', - 'update_label': 'Update label', - 'value': 'Value', - // 命令过滤 - 'command_filter_list': 'Command filter list', - 'create_command_filter': 'Create command filter', - 'update_command_filter': 'Update command filter', - 'command_filter_detail': 'command filter detail', - 'rules': 'rules', - 'system_user': 'System user', - 'date_updated': 'Date updated', - 'binding_to_system_user': 'Binding to system user', - // 系统平台 - 'platform_list': 'Platform list', - 'create_platform': 'Create platform', - 'update_platform': 'Update platform', - 'platform_detail': 'Platform detail', - 'base_platform': 'Base platform', - 'charset': 'Charset', - 'meta': 'Meta' - }, - applications: { - 'applications': 'Applications', - 'remote_app_list': 'RemoteApp list', - 'create_remote_app': 'Create RemoteApp', - 'remote_app_detail': 'RemoteApp detail', - 'update_remote_app': 'Update RemoteApp', - 'name': 'Name', - 'app_type': 'App type', - 'action': 'Action', - 'update': 'Update', - 'delete': 'Detele', - 'comment': 'Comment', - 'database_app_list': 'DatabaseApp list', - 'database_app_detail': 'DatabaseApp detail', - 'create_database_app': 'Create DatabaseApp', - 'update_database_app': 'Update DatabaseApp', - 'type': 'Type', - 'host': 'Host', - 'port': 'Port', - 'database': 'Database', - 'search': 'Search', - 'date_created': 'Date created', - 'created_by': 'Created by', - 'app_path': 'App path' - }, - perms: { - 'asset_permission': 'Asset permission', - 'asset_permission_list': 'Asset permission list', - 'asset_permission_detail': 'Asset permission detail', - 'create_asset_permission': 'Create asset permission', - 'update_asset_permission': 'Update asset permission', - 'name': 'Name', - 'user': 'User', - 'user_group': 'User group', - 'asset': 'Asset', - 'node': 'Node', - 'system_user': 'System user', - 'validity': 'Validity', - 'action': 'Action', - 'update': 'Update', - 'delete': 'Detele', - 'search': 'Search', - 'user_count': 'User count', - 'user_group_count': 'User group count', - 'asset_count': 'Asset count', - 'node_count': 'Node count', - 'system_user_count': 'System user count', - 'date_start': 'Date start', - 'dateexpired': 'Date expired', - 'date_created': 'Date created', - 'created_by': 'Created by', - 'comment': 'Comment', - 'quick_update': 'Quick update', - 'active': 'Active', - 'users_and_user_groups': 'Users and user groups', - 'assets_and_node': 'Assets and node', - // - 'remote_app': 'RemoteApp', - 'remote_app_permission_list': ' RemoteApp permission list', - 'remote_app_permission_detail': 'RemoteApp permission detail', - 'create_remote_app_permission': 'Create RemoteApp permission', - 'update_remote_app_permission': 'Update RemoteApp permission', - 'remote_app_count': 'RemoteApp count', - // - 'database_app': 'DatabaseApp', - 'database_app_permission_list': 'DatabaseApp permission list', - 'database_app_permission_detail': 'DatabaseApp permission detail', - 'create_database_app_permission': 'Create DatabaseApp permission', - 'update_database_app_permission': 'Update DatabaseApp permission', - 'database_app_count': 'DatabaseApp count' - }, - sessions: { - 'id': '', - 'user': 'Use', - 'asset': 'Asset', - 'systemUser': 'System user', - 'remoteAddr': 'Remote addr', - 'protocol': 'Protocol', - 'loginFrom': 'Login from', - 'command': 'Command', - 'dateStart': 'Date start', - 'duration': 'Duration', - 'terminate': 'Terminate', - 'dateEnd': 'Date end', - 'commands': 'Commands', - 'replay': 'replay', - 'download': 'download', - 'riskLevel': 'Risk level', - 'session': 'session', - 'action': 'Action', - 'search': 'Search', - 'terminate_selected': 'Terminate selected', - 'confirm_finished': 'Confirm finished', - 'submit': 'Submit', - 'command_list': 'Command list', - 'quick_modify': 'Quick modify', - 'terminate_session': 'Terminate session', - 'confirm': 'Confirm', - 'join': 'join', - 'goto': 'Goto', - 'sessionDetail': 'Session Detail', - 'quickModify': 'Quick Modify', - 'replaySession': 'Replay session:', - 'downloadReplay': 'Download replay:', - 'go': 'Go', - 'terminalDetail': 'terminalDetail', - 'name': 'Name:', - 'sshPort': 'SSH port:', - 'httpPort': 'Http port:', - 'comment': 'Comment:', - 'dateCreated': 'Date created:', - 'createCommand': 'Create command storage', - 'createReplay': 'Create replay storage', - 'commandStorage': 'Command storage', - 'replayStorage': 'Replay Storage', - 'storage': 'Storage', - 'test': 'Test', - 'createReplayStorage': 'Create replay storage', - 'endPoint': 'Endpoint', - 'bucket': 'Bucket', - 'type': 'Type', - 'containerName': 'Container name', - 'accountName': 'Account name', - 'accountKey': 'Account key', - 'endpointSuffix': 'Endpoint suffix', - 'docType': 'Doc type', - 'index': 'Index', - 'hosts': 'Hosts' - }, - setting: { - 'setting': 'System Setting', - 'Basic': 'Basic setting', - 'Email': 'Email setting', - 'EmailContent': 'Email content setting', - 'Ldap': 'LDAP setting', - 'Terminal': 'Terminal setting', - 'Security': 'Security setting', - 'createUserSetting': 'Create User setting', - 'basicSetting': 'Basic setting', - 'SecuritySetting': 'Security setting', - 'PasswordCheckRule': 'Password check rule', - 'siteUrl': 'Current SITE URL', - 'userGuideUrl': 'User Guide URL', - 'emailSubjectPrefix': 'Email Subject Prefix', - 'emailHost': 'SMTP host', - 'emailPort': 'SMTP port', - 'emailHostUser': 'SMTP user', - 'emailHostPassword': 'SMTP password', - 'emailEmailFrom': 'Send user', - 'emailRecipient': 'Test recipient', - 'emailUserSSL': 'Use SSL', - 'emailUserTLS': 'Use TLS', - 'emailCustomUserCreatedSubject': 'Create user email subject', - 'emailCustomUserCreatedHonorific': 'Create user honorific', - 'emailCustomUserCreatedBody': 'Create user email content', - 'emailCustomUserCreatedSignature': 'Signature', - 'authLdapServerUri': 'LDAP server', - 'authLdapBindDn': 'Bind DN', - 'authLdapBindPassword': 'Password', - 'authLdapSearchOu': 'User OU', - 'authLdapSearchFilter': 'User search filter', - 'authLdapUserAttrMap': 'User attr map', - 'authLdap': 'Enable LDAP auth', - 'terminalPasswordAuth': 'Password auth', - 'terminalPublicKeyAuth': 'Public key auth', - 'terminalHeartbeatInterval': 'Heartbeat interval', - 'terminalAssetListSortBy': 'List sort by', - 'terminalAssetListPageSize': 'List page size', - 'terminalSessionKeepDuration': 'Session keep duration', - 'terminalTelnetRegex': 'Telnet login regex', - 'securityMfaAuth': 'MFA', - 'securityCommandExecution': 'Batch execute commands', - 'securityServiceAccountRegistration': 'Service account registration', - 'securityLoginLimitCount': 'Limit the number of login failures', - 'securityLoginLimitTime': 'No logon interval', - 'securityMaxIdleTime': 'Connection max idle time', - 'securityPasswordExpirationTime': 'Password expiration time', - 'securityPasswordMinLength': 'Password minimum length', - 'securityPasswordUpperCase': 'Must contain capital letters', - 'securityPasswordLowerCase': 'Must contain lowercase letters', - 'securityPasswordNumber': 'Must contain numeric characters', - 'securityPasswordSpecialChar': 'Must contain special characters', - 'Hostname': 'Hostname', - 'emailTest': 'Test connection', - 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': '开启后，用户密码修改、重置必须包含特殊字符' - } - }, - audits: { - 'username': 'Username', - 'type': 'Type', - 'ip': 'IP', - 'city': 'City', - 'user_agent': 'UA', - 'mfa': 'MFA', - 'reason': 'Reason', - 'status': 'Status', - 'datetime': 'Date' - }, - ...enLocale -} - -export default en diff --git a/src/i18n/langs/en.json b/src/i18n/langs/en.json new file mode 100644 index 000000000..6267c5afb --- /dev/null +++ b/src/i18n/langs/en.json @@ -0,0 +1,428 @@ +{ + "message":{"hello":"hello, world","login":"Login"}, + "header":{ + "language":"English", + "help":"help", + "Documents":"Documents", + "CommercialSupport":"Commercial Support" + }, + "route":{ + "dashboard":"Dashboard", + "users":"Users", + "userList":"User List", + "usergroup":"User Group", + "assets":"Assets", + "applications":"Applications", + "perms":"Perms", + "Sessions":"Sessions", + "SessionOnline":"Session Online", + "SessionOffline":"Session Offline", + "SessionDetail":"Session Detail", + "Goto":"Goto", + "jobcenter":"Job Center", + "Terminal":"Terminal", + "CreateReplayStorage":"Create replay storage", + "ReplayStorageUpdate":"Update replay storage", + "CreateCommandStorage":"Create command storage", + "CommandStorageUpdate":"Update command storage" + }, + "users":{ + "createuser":"Cerate User", + "updateuser":"Update User", + "user_detail":"User Detail", + "name":"Name", + "username":"Username", + "email":"Email", + "usergroup":"User Group", + "role":"Role", + "MFAcertification":"MFA certification", + "source":"Source", + "validity":"Validity", + "action":"Action", + "update":"Update", + "delete":"Delete", + "search":"Search", + "create_by":"Create by", + "date_expired":"Date expired", + "date_joined":"Date joined", + "last_login":"Last login", + "last_password_updated":"Last password updated", + "usergrouplist":"User Group List", + "createusergroup":"Create User Group", + "comment":"comment", + "user":"User", + "admin":"Admin", + "auditor":"Auditor", + "off":"OFF", + "on":"ON", + "local":"Local", + "disable":"Disable", + "enable":"Enable", + "force_enable":"Force enable", + "quick_modify":"Quick modify", + "active":"Active", + "force_enabled_mfa":"Force enabled MFA", + "reset_maf":"Reset MFA", + "reset":"Reset", + "send_reset_password_mail":"Send reset password mail", + "send_reset_ssh_key_mail":"Send reset ssh key mail", + "send":"Send", + "user_group":"User Group", + "join_user_groups":"Join user groups", + "join":"Join", + "login_confirm":"Login confirm", + "reviewers":"Reviewers", + "confirm":"Confirm", + "user_permissions":"User permissions", + "asset_granted":"Asset granted", + "asset_permission":"Asset permission", + "remote_app_granted":"RemoteApp granted", + "remote_app_permission":"RemoteApp permission", + "database_app_granted":"DatabaseApp granted", + "database_app_permission":"DatabaseApp permission", + "resetPublicKeyTitle":"Send reset ssh key mail", + "resetPasswordTitle":"Send reset password mail", + "resetPasswordWarningMsg":"This will reset the user password and send a reset mail", + "resetPasswordSuccessMsg":"An e-mail has been sent to the user`s mailbox", + "resetPublicKeyWarningMsg":"This will reset the user public key and send a reset mail", + "resetPublicKeySuccessMsg":"An e-mail has been sent to the user`s mailbox", + "resetMFATitle":"Reset MFA" + }, + "usergroup":{ + "user_group_list":"User group list", + "user_group_detail":"User group detail", + "create_user_group":"Create user group", + "update_user_group":"Update user group", + "name":"Name", + "user":"User", + "comment":"Comment", + "action":"Action", + "update":"Update", + "delete":"Delete", + "created_by":"Create by", + "date_created":"Date created", + "asset_granted":"Asset Granted", + "add_user":"Add user", + "add":"Add" + }, + "assets":{ + "asset_list":"Asset list", + "asset_detail":"Asset detail", + "create_asset":"Create asset", + "update_asset":"Update asset", + "hostname":"Hostname", + "ip":"IP", + "hardware":"Hardware", + "reachable":"Reachable", + "action":"Action", + "update":"Update", + "delete":"Delete", + "search":"Search", + "delete_selected":"Delete selected", + "update_selected":"Update selected", + "remove_from_this_node":"Remove from this node", + "deactive_selected":"Deactive selected", + "active_selected":"Active selected", + "submit":"Submit", + "platform":"Platform", + "public_ip":"Public Ip", + "domain":"Domain", + "admin_user":"Admin user", + "node":"Node", + "label":"Label", + "comment":"Comment", + "basic":"Basic", + "protocols":"Protocols", + "auth":"Auth", + "labels":"Labels", + "other":"Other", + "vendor":"Vendor", + "model":"Model", + "cpu":"CPU", + "memory":"Memory", + "disk":"Disk", + "os":"OS", + "is_active":"Is active", + "serial_number":"Serial number", + "asset_number":"Asset number", + "created_by":"Created by", + "date_joined":"Date joined", + "quick_modify":"Quick modify", + "active":"Active", + "refresh_hardware":"Refresh hardware", + "test_connective":"Test connective", + "refresh":"Refresh", + "test":"Test", + "confirm":"Confirm", + "asset_user_list":"Asset user list", + "domain_list":"Domain list", + "domain_detail":"Domain detail", + "create_domain":"Create domain", + "update_domain":"Update domain", + "name":"Name", + "asset":"Asset", + "gateway":"Gateway", + "date_created":"Date created", + "admin_user_list":"Admin user list", + "admin_user_detail":"Admin user detail", + "create_admin_user":"Create admin user", + "update_admin_user":"Update admin user", + "username":"Username", + "replace_node_assets_admin_user_with_this":"Replace node assets admin user with this", + "select_nodes":"Select nodes", + "system_user_list":"System user list", + "create_system_user":"Create system user", + "update_system_user":"Update system user", + "system_user_detail":"System user detail", + "protocol":"Protocol", + "login_mode":"Login mode", + "quick_update":"Quick update", + "auto_push":"Auto push", + "label_list":"Label list", + "label_detail":"Label detail", + "create_label":"Create label", + "update_label":"Update label", + "value":"Value", + "command_filter_list":"Command filter list", + "create_command_filter":"Create command filter", + "update_command_filter":"Update command filter", + "command_filter_detail":"command filter detail", + "rules":"rules", + "system_user":"System user", + "date_updated":"Date updated", + "binding_to_system_user":"Binding to system user", + "platform_list":"Platform list", + "create_platform":"Create platform", + "update_platform":"Update platform", + "platform_detail":"Platform detail", + "base_platform":"Base platform", + "charset":"Charset", + "meta":"Meta" + }, + "applications":{ + "applications":"Applications", + "remote_app_list":"RemoteApp list", + "create_remote_app":"Create RemoteApp", + "remote_app_detail":"RemoteApp detail", + "update_remote_app":"Update RemoteApp", + "name":"Name", + "app_type":"App type", + "action":"Action", + "update":"Update", + "delete":"Detele", + "comment":"Comment", + "database_app_list":"DatabaseApp list", + "database_app_detail":"DatabaseApp detail", + "create_database_app":"Create DatabaseApp", + "update_database_app":"Update DatabaseApp", + "type":"Type", + "host":"Host", + "port":"Port", + "database":"Database", + "search":"Search", + "date_created":"Date created", + "created_by":"Created by", + "app_path":"App path" + }, + "perms":{ + "asset_permission":"Asset permission", + "asset_permission_list":"Asset permission list", + "asset_permission_detail":"Asset permission detail", + "create_asset_permission":"Create asset permission", + "update_asset_permission":"Update asset permission", + "name":"Name", + "user":"User", + "user_group":"User group", + "asset":"Asset", + "node":"Node", + "system_user":"System user", + "validity":"Validity", + "action":"Action", + "update":"Update", + "delete":"Detele", + "search":"Search", + "user_count":"User count", + "user_group_count":"User group count", + "asset_count":"Asset count", + "node_count":"Node count", + "system_user_count":"System user count", + "date_start":"Date start", + "dateexpired":"Date expired", + "date_created":"Date created", + "created_by":"Created by", + "comment":"Comment", + "quick_update":"Quick update", + "active":"Active", + "users_and_user_groups":"Users and user groups", + "assets_and_node":"Assets and node", + "remote_app":"RemoteApp", + "remote_app_permission_list":" RemoteApp permission list", + "remote_app_permission_detail":"RemoteApp permission detail", + "create_remote_app_permission":"Create RemoteApp permission", + "update_remote_app_permission":"Update RemoteApp permission", + "remote_app_count":"RemoteApp count", + "database_app":"DatabaseApp", + "database_app_permission_list":"DatabaseApp permission list", + "database_app_permission_detail":"DatabaseApp permission detail", + "create_database_app_permission":"Create DatabaseApp permission", + "update_database_app_permission":"Update DatabaseApp permission", + "database_app_count":"DatabaseApp count" + }, + "sessions":{ + "id":"", + "user":"Use", + "asset":"Asset", + "systemUser":"System user", + "remoteAddr":"Remote addr", + "protocol":"Protocol", + "loginFrom":"Login from", + "command":"Command", + "dateStart":"Date start", + "duration":"Duration", + "terminate":"Terminate", + "dateEnd":"Date end", + "commands":"Commands", + "replay":"replay", + "download":"download", + "riskLevel":"Risk level", + "session":"session", + "action":"Action", + "search":"Search", + "terminate_selected":"Terminate selected", + "confirm_finished":"Confirm finished", + "submit":"Submit", + "command_list":"Command list", + "quick_modify":"Quick modify", + "terminate_session":"Terminate session", + "confirm":"Confirm", + "join":"join", + "goto":"Goto", + "sessionDetail":"Session Detail", + "quickModify":"Quick Modify", + "replaySession":"Replay session:", + "downloadReplay":"Download replay:", + "go":"Go", + "terminalDetail":"terminalDetail", + "name":"Name:", + "sshPort":"SSH port:", + "httpPort":"Http port:", + "comment":"Comment:", + "dateCreated":"Date created:", + "createCommand":"Create command storage", + "createReplay":"Create replay storage", + "commandStorage":"Command storage", + "replayStorage":"Replay Storage", + "storage":"Storage", + "test":"Test", + "createReplayStorage":"Create replay storage", + "endPoint":"Endpoint", + "bucket":"Bucket", + "type":"Type", + "containerName":"Container name", + "accountName":"Account name", + "accountKey":"Account key", + "endpointSuffix":"Endpoint suffix", + "docType":"Doc type", + "index":"Index", + "hosts":"Hosts" + }, + "setting":{ + "setting":"System Setting", + "Basic":"Basic setting", + "Email":"Email setting", + "EmailContent":"Email content setting", + "Ldap":"LDAP setting", + "Terminal":"Terminal setting", + "Security":"Security setting", + "createUserSetting":"Create User setting", + "basicSetting":"Basic setting", + "SecuritySetting":"Security setting", + "PasswordCheckRule":"Password check rule", + "siteUrl":"Current SITE URL", + "userGuideUrl":"User Guide URL", + "emailSubjectPrefix":"Email Subject Prefix", + "emailHost":"SMTP host", + "emailPort":"SMTP port", + "emailHostUser":"SMTP user", + "emailHostPassword":"SMTP password", + "emailEmailFrom":"Send user", + "emailRecipient":"Test recipient", + "emailUserSSL":"Use SSL", + "emailUserTLS":"Use TLS", + "emailCustomUserCreatedSubject":"Create user email subject", + "emailCustomUserCreatedHonorific":"Create user honorific", + "emailCustomUserCreatedBody":"Create user email content", + "emailCustomUserCreatedSignature":"Signature", + "authLdapServerUri":"LDAP server", + "authLdapBindDn":"Bind DN", + "authLdapBindPassword":"Password", + "authLdapSearchOu":"User OU", + "authLdapSearchFilter":"User search filter", + "authLdapUserAttrMap":"User attr map", + "authLdap":"Enable LDAP auth", + "terminalPasswordAuth":"Password auth", + "terminalPublicKeyAuth":"Public key auth", + "terminalHeartbeatInterval":"Heartbeat interval", + "terminalAssetListSortBy":"List sort by", + "terminalAssetListPageSize":"List page size", + "terminalSessionKeepDuration":"Session keep duration", + "terminalTelnetRegex":"Telnet login regex", + "securityMfaAuth":"MFA", + "securityCommandExecution":"Batch execute commands", + "securityServiceAccountRegistration":"Service account registration", + "securityLoginLimitCount":"Limit the number of login failures", + "securityLoginLimitTime":"No logon interval", + "securityMaxIdleTime":"Connection max idle time", + "securityPasswordExpirationTime":"Password expiration time", + "securityPasswordMinLength":"Password minimum length", + "securityPasswordUpperCase":"Must contain capital letters", + "securityPasswordLowerCase":"Must contain lowercase letters", + "securityPasswordNumber":"Must contain numeric characters", + "securityPasswordSpecialChar":"Must contain special characters", + "Hostname":"Hostname", + "emailTest":"Test connection", + "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":"开启后，用户密码修改、重置必须包含特殊字符" + } + }, + "audits":{ + "username":"Username", + "type":"Type", + "ip":"IP", + "city":"City", + "user_agent":"UA", + "mfa":"MFA", + "reason":"Reason", + "status":"Status", + "datetime":"Date" + } +} From b49340b6d08cb13dee3e3498e79e80370cb6d999 Mon Sep 17 00:00:00 2001 From: OrangeM21 Date: Sat, 9 May 2020 18:05:12 +0800 Subject: [PATCH 4/7] =?UTF-8?q?[update]=E5=AE=8C=E6=88=90=E8=AF=A6?= =?UTF-8?q?=E6=83=85=E9=A1=B5=E8=AE=BE=E7=BD=AE=EF=BC=8C=E4=BF=AE=E6=94=B9?= =?UTF-8?q?tree=E7=BB=93=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../formatters/CustomActionsFormatter.vue | 2 +- .../ListTable/formatters/DateFormatter.vue | 27 ++++ src/components/ListTable/formatters/index.js | 7 +- src/components/RelationCard/index.vue | 2 +- src/i18n/index.js | 15 +- src/i18n/langs/cn.json | 6 +- src/i18n/langs/index.js | 15 +- .../assets/AdminUser/AdminUserDetail.vue | 13 -- .../AdminUser/AdminUserDetail/AssetsList.vue | 126 +++++++++++++++ .../AdminUser/AdminUserDetail/Detail.vue | 91 +++++++++++ .../AdminUser/AdminUserDetail/index.vue | 45 ++++++ .../SystemUser/SystemUserDetail/AssetList.vue | 152 +++++++++++++++--- .../SystemUser/SystemUserDetail/Detail.vue | 30 ---- .../SystemUser/SystemUserDetail/index.vue | 2 +- src/views/assets/index.js | 2 +- 15 files changed, 459 insertions(+), 76 deletions(-) create mode 100644 src/components/ListTable/formatters/DateFormatter.vue delete mode 100644 src/views/assets/AdminUser/AdminUserDetail.vue create mode 100644 src/views/assets/AdminUser/AdminUserDetail/AssetsList.vue create mode 100644 src/views/assets/AdminUser/AdminUserDetail/Detail.vue create mode 100644 src/views/assets/AdminUser/AdminUserDetail/index.vue diff --git a/src/components/ListTable/formatters/CustomActionsFormatter.vue b/src/components/ListTable/formatters/CustomActionsFormatter.vue index abdd07573..e7408f29c 100644 --- a/src/components/ListTable/formatters/CustomActionsFormatter.vue +++ b/src/components/ListTable/formatters/CustomActionsFormatter.vue @@ -1,5 +1,5 @@ + + diff --git a/src/components/ListTable/formatters/index.js b/src/components/ListTable/formatters/index.js index 66ca66727..5f86e1ed8 100644 --- a/src/components/ListTable/formatters/index.js +++ b/src/components/ListTable/formatters/index.js @@ -9,6 +9,7 @@ import OutputExpandFormatter from './OutputExpandFormatter' import ExpandAssetPermissionFormatter from './ExpandAssetPermissionFormatter' import CustomActionsFormatter from './CustomActionsFormatter' import DeleteActionFormatter from './DeleteActionFormatter' +import DateFormatter from '@/components/ListTable/formatters/DateFormatter' export default { DetailFormatter, @@ -21,7 +22,8 @@ export default { OutputExpandFormatter, ExpandAssetPermissionFormatter, CustomActionsFormatter, - DeleteActionFormatter + DeleteActionFormatter, + DateFormatter } export { @@ -35,5 +37,6 @@ export { OutputExpandFormatter, ExpandAssetPermissionFormatter, CustomActionsFormatter, - DeleteActionFormatter + DeleteActionFormatter, + DateFormatter } diff --git a/src/components/RelationCard/index.vue b/src/components/RelationCard/index.vue index 567b279e7..0d60f22cf 100644 --- a/src/components/RelationCard/index.vue +++ b/src/components/RelationCard/index.vue @@ -190,7 +190,7 @@ export default { data = this.iAjax.processResults.bind(this)(data) data.results.forEach((v) => { if (!this.hasObjects.find((item) => item.value === v.value)) { - this.hasObjects.push(v) + this.HasObjects.push(v) } }) // 如果还有其它页，继续获取, 如果没有就停止 diff --git a/src/i18n/index.js b/src/i18n/index.js index 2dd220a3c..9718eab2b 100644 --- a/src/i18n/index.js +++ b/src/i18n/index.js @@ -1,5 +1,16 @@ -import en from './langs/en' -import cn from './langs/cn' +import zhLocale from 'element-ui/lib/locale/lang/zh-CN' +import enLocale from 'element-ui/lib/locale/lang/en' +import customCN from './cn.json' +import customEN from './en.json' + +const cn = { + ...customCN, + ...zhLocale +} +const en = { + ...customEN, + ...enLocale +} export default { en, cn diff --git a/src/i18n/langs/cn.json b/src/i18n/langs/cn.json index c04011912..e1f854f2c 100644 --- a/src/i18n/langs/cn.json +++ b/src/i18n/langs/cn.json @@ -333,7 +333,11 @@ "platform_detail":"平台详情", "BasePlatform":"基础平台", "charset":"编码", - "meta":"元数据" + "meta":"元数据", + "TestAssetsConnective": "测试资产可连接性", + "PushSystemUserNow": "立刻推送系统", + "Replace node assets admin user with this":"替换资产节点的管理员" + }, "applications":{ "applications":"应用管理", diff --git a/src/i18n/langs/index.js b/src/i18n/langs/index.js index 6cd8b42ce..9718eab2b 100644 --- a/src/i18n/langs/index.js +++ b/src/i18n/langs/index.js @@ -1,5 +1,16 @@ -import en from './en' -import cn from './cn' +import zhLocale from 'element-ui/lib/locale/lang/zh-CN' +import enLocale from 'element-ui/lib/locale/lang/en' +import customCN from './cn.json' +import customEN from './en.json' + +const cn = { + ...customCN, + ...zhLocale +} +const en = { + ...customEN, + ...enLocale +} export default { en, cn diff --git a/src/views/assets/AdminUser/AdminUserDetail.vue b/src/views/assets/AdminUser/AdminUserDetail.vue deleted file mode 100644 index 25abbf6ab..000000000 --- a/src/views/assets/AdminUser/AdminUserDetail.vue +++ /dev/null @@ -1,13 +0,0 @@ - - - - - diff --git a/src/views/assets/AdminUser/AdminUserDetail/AssetsList.vue b/src/views/assets/AdminUser/AdminUserDetail/AssetsList.vue new file mode 100644 index 000000000..6b6eb2ca4 --- /dev/null +++ b/src/views/assets/AdminUser/AdminUserDetail/AssetsList.vue @@ -0,0 +1,126 @@ + + + + + diff --git a/src/views/assets/AdminUser/AdminUserDetail/Detail.vue b/src/views/assets/AdminUser/AdminUserDetail/Detail.vue new file mode 100644 index 000000000..70ae26380 --- /dev/null +++ b/src/views/assets/AdminUser/AdminUserDetail/Detail.vue @@ -0,0 +1,91 @@ + + + + + diff --git a/src/views/assets/AdminUser/AdminUserDetail/index.vue b/src/views/assets/AdminUser/AdminUserDetail/index.vue new file mode 100644 index 000000000..31a8dc308 --- /dev/null +++ b/src/views/assets/AdminUser/AdminUserDetail/index.vue @@ -0,0 +1,45 @@ + + + + + diff --git a/src/views/assets/SystemUser/SystemUserDetail/AssetList.vue b/src/views/assets/SystemUser/SystemUserDetail/AssetList.vue index 28b603628..1d6515b96 100644 --- a/src/views/assets/SystemUser/SystemUserDetail/AssetList.vue +++ b/src/views/assets/SystemUser/SystemUserDetail/AssetList.vue @@ -1,28 +1,27 @@ a + @@ -130,4 +239,3 @@ export default { -d diff --git a/src/views/assets/SystemUser/SystemUserDetail/Detail.vue b/src/views/assets/SystemUser/SystemUserDetail/Detail.vue index 3ae3ec9a8..4b9551f28 100644 --- a/src/views/assets/SystemUser/SystemUserDetail/Detail.vue +++ b/src/views/assets/SystemUser/SystemUserDetail/Detail.vue @@ -5,21 +5,18 @@ - a - - From fe7c3bb1f9a135206adeedcd1f0a7df20f4e1662 Mon Sep 17 00:00:00 2001 From: OrangeM21 Date: Sat, 9 May 2020 19:01:05 +0800 Subject: [PATCH 7/7] =?UTF-8?q?Revert=20"[update]=E5=AE=8C=E6=88=90?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E9=A1=B5=E8=AE=BE=E7=BD=AE=EF=BC=8C=E4=BF=AE?= =?UTF-8?q?=E6=94=B9tree=E7=BB=93=E6=9E=84"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 1ba5fae9 --- src/components/formGroupHeader/index.vue | 31 ++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 src/components/formGroupHeader/index.vue diff --git a/src/components/formGroupHeader/index.vue b/src/components/formGroupHeader/index.vue new file mode 100644 index 000000000..044159382 --- /dev/null +++ b/src/components/formGroupHeader/index.vue @@ -0,0 +1,31 @@ + + + + +