From c4433592f44b565fb63fa69455c2034f3ab09eef Mon Sep 17 00:00:00 2001 From: Bai Date: Fri, 24 May 2024 14:41:39 +0800 Subject: [PATCH] perf: i18n System Settings End --- src/components/Table/AutoDataTable/index.vue | 11 +++++++-- src/views/settings/Auth/DingTalk.vue | 9 ++------ src/views/settings/Auth/FeiShu.vue | 7 +----- src/views/settings/Auth/OAuth2.vue | 13 ++++++----- src/views/settings/Auth/Radius.vue | 2 +- src/views/settings/Auth/SAML2.vue | 23 ++++++++++--------- src/views/settings/Auth/Slack.vue | 7 +----- src/views/settings/Auth/WeCom.vue | 7 +----- src/views/settings/Security/AuthLimit.vue | 4 ++-- src/views/settings/Storage/CommandStorage.vue | 3 +-- .../Storage/CommandStorageCreateUpdate.vue | 3 --- src/views/settings/Storage/ReplayStorage.vue | 5 ++-- .../Storage/ReplayStorageCreateUpdate.vue | 1 - src/views/settings/Terminal/Base.vue | 14 +++-------- .../Terminal/Component/TerminalList.vue | 2 -- .../Endpoint/EndpointCreateUpdate.vue | 4 ++-- 16 files changed, 44 insertions(+), 71 deletions(-) diff --git a/src/components/Table/AutoDataTable/index.vue b/src/components/Table/AutoDataTable/index.vue index 88d8dee0c..cbd64d198 100644 --- a/src/components/Table/AutoDataTable/index.vue +++ b/src/components/Table/AutoDataTable/index.vue @@ -166,7 +166,7 @@ export default { break case 'boolean': col.formatter = ChoicesFormatter - col.width = '80px' + // col.width = '80px' break case 'datetime': col.formatter = DateFormatter @@ -272,8 +272,15 @@ export default { if (lang === 'zh') { factor = 20 } + let [sortable, filters] = [0, 0] + if (col && col?.sortable === 'custom') { + sortable = 10 + } + if (col && col?.filters?.length > 0) { + filters = 12 + } if (col && !col.width && col.label && !col.minWidth) { - col.minWidth = `${col.label.length * factor + 30}px` + col.minWidth = `${col.label.length * factor + sortable + filters + 30}px` } return col }, diff --git a/src/views/settings/Auth/DingTalk.vue b/src/views/settings/Auth/DingTalk.vue index 58b6e461e..35758b2af 100644 --- a/src/views/settings/Auth/DingTalk.vue +++ b/src/views/settings/Auth/DingTalk.vue @@ -39,13 +39,8 @@ export default { ], encryptedFields: ['DINGTALK_APPSECRET'], fields: [ - [ - this.$t('BasicInfo'), - [ - 'AUTH_DINGTALK', 'DINGTALK_AGENTID', - 'DINGTALK_APPKEY', 'DINGTALK_APPSECRET' - ] - ] + 'AUTH_DINGTALK', 'DINGTALK_AGENTID', + 'DINGTALK_APPKEY', 'DINGTALK_APPSECRET' ], fieldsMeta: { DINGTALK_APPSECRET: { diff --git a/src/views/settings/Auth/FeiShu.vue b/src/views/settings/Auth/FeiShu.vue index 5a9247a5b..d0c2ba4c1 100644 --- a/src/views/settings/Auth/FeiShu.vue +++ b/src/views/settings/Auth/FeiShu.vue @@ -64,12 +64,7 @@ export default { } ], encryptedFields: this.encryptedFields, - fields: [ - [ - this.$t('BasicInfo'), - this.formFields - ] - ], + fields: this.formFields, // 不清理的话，编辑secret，在删除提交会报错 cleanFormValue(data) { this.encryptedFields.forEach(field => { diff --git a/src/views/settings/Auth/OAuth2.vue b/src/views/settings/Auth/OAuth2.vue index 63abaed92..ecc8cb54f 100644 --- a/src/views/settings/Auth/OAuth2.vue +++ b/src/views/settings/Auth/OAuth2.vue @@ -32,17 +32,19 @@ export default { 'AUTH_OAUTH2_CLIENT_ID', 'AUTH_OAUTH2_CLIENT_SECRET', 'AUTH_OAUTH2_ACCESS_TOKEN_METHOD' ]], - [this.$t('Params'), [ + [this.$t('Server'), [ 'AUTH_OAUTH2_SCOPE', 'AUTH_OAUTH2_PROVIDER_AUTHORIZATION_ENDPOINT', 'AUTH_OAUTH2_ACCESS_TOKEN_ENDPOINT', 'AUTH_OAUTH2_PROVIDER_USERINFO_ENDPOINT', 'AUTH_OAUTH2_PROVIDER_END_SESSION_ENDPOINT' ]], - [this.$t('Other'), [ - 'AUTH_OAUTH2_LOGOUT_COMPLETELY', - 'AUTH_OAUTH2_ALWAYS_UPDATE_USER', + [this.$t('Search'), [ 'AUTH_OAUTH2_USER_ATTR_MAP' + ]], + [this.$t('Other'), [ + 'AUTH_OAUTH2_ALWAYS_UPDATE_USER', + 'AUTH_OAUTH2_LOGOUT_COMPLETELY' ]] ], fieldsMeta: { @@ -61,8 +63,7 @@ export default { }, AUTH_OAUTH2_USER_ATTR_MAP: { component: JsonEditor, - rules: [JsonRequired], - helpText: this.$t('AuthUserAttrMapHelpText') + rules: [JsonRequired] }, AUTH_OAUTH2_ACCESS_TOKEN_METHOD: { } diff --git a/src/views/settings/Auth/Radius.vue b/src/views/settings/Auth/Radius.vue index 01188a3ec..6588f8998 100644 --- a/src/views/settings/Auth/Radius.vue +++ b/src/views/settings/Auth/Radius.vue @@ -22,7 +22,7 @@ export default { encryptedFields: ['RADIUS_SECRET'], fields: [ [this.$t('Basic'), ['AUTH_RADIUS', 'RADIUS_SERVER', 'RADIUS_PORT', 'RADIUS_SECRET']], - [this.$t('Other'), ['OTP_IN_RADIUS']] + [this.$t('MFA'), ['OTP_IN_RADIUS']] ], fieldsMeta: { RADIUS_SECRET: { diff --git a/src/views/settings/Auth/SAML2.vue b/src/views/settings/Auth/SAML2.vue index 12efc1cdf..9887c552e 100644 --- a/src/views/settings/Auth/SAML2.vue +++ b/src/views/settings/Auth/SAML2.vue @@ -23,18 +23,20 @@ export default { settings: { url: '/api/v1/settings/setting/?category=saml2', fields: [ - [this.$t('Basic'), ['AUTH_SAML2']], - [this.$t('Certificate'), [ + [this.$t('Basic'), [ + 'AUTH_SAML2', 'SAML2_SP_KEY_CONTENT', - 'SAML2_SP_CERT_CONTENT' - ]], - [this.$t('Params'), [ - 'SAML2_IDP_METADATA_URL', 'SAML2_IDP_METADATA_XML', + 'SAML2_SP_CERT_CONTENT', + 'SAML2_IDP_METADATA_URL', + 'SAML2_IDP_METADATA_XML', 'SAML2_SP_ADVANCED_SETTINGS' + + ]], + [this.$t('Search'), [ + 'SAML2_RENAME_ATTRIBUTES' ]], [this.$t('Other'), [ - 'SAML2_LOGOUT_COMPLETELY', 'AUTH_SAML2_ALWAYS_UPDATE_USER', - 'SAML2_RENAME_ATTRIBUTES' + 'AUTH_SAML2_ALWAYS_UPDATE_USER', 'SAML2_LOGOUT_COMPLETELY' ]] ], fieldsMeta: { @@ -60,12 +62,11 @@ export default { }, SAML2_SP_CERT_CONTENT: { component: UploadKey, - helpText: this.$t('AuthSAMLCertHelpText') + ' 查看' + helpText: this.$t('AuthSAMLCertHelpText') + ` ${this.$t('View')}` }, SAML2_RENAME_ATTRIBUTES: { component: JsonEditor, - rules: [JsonRequired], - helpText: this.$t('AuthSaml2UserAttrMapHelpText') + rules: [JsonRequired] } }, submitMethod: () => 'patch', diff --git a/src/views/settings/Auth/Slack.vue b/src/views/settings/Auth/Slack.vue index c7bb0e1ac..ac487b344 100644 --- a/src/views/settings/Auth/Slack.vue +++ b/src/views/settings/Auth/Slack.vue @@ -41,12 +41,7 @@ export default { ], encryptedFields: ['SLACK_SECRET'], fields: [ - [ - this.$t('BasicInfo'), - [ - 'AUTH_SLACK', 'SLACK_CLIENT_ID', 'SLACK_CLIENT_SECRET', 'SLACK_BOT_TOKEN' - ] - ] + 'AUTH_SLACK', 'SLACK_CLIENT_ID', 'SLACK_CLIENT_SECRET', 'SLACK_BOT_TOKEN' ], fieldsMeta: { SLACK_APP_SECRET: { diff --git a/src/views/settings/Auth/WeCom.vue b/src/views/settings/Auth/WeCom.vue index 4868539df..120a95cb1 100644 --- a/src/views/settings/Auth/WeCom.vue +++ b/src/views/settings/Auth/WeCom.vue @@ -40,12 +40,7 @@ export default { ], encryptedFields: ['WECOM_SECRET'], fields: [ - [ - this.$t('BasicInfo'), - [ - 'AUTH_WECOM', 'WECOM_CORPID', 'WECOM_AGENTID', 'WECOM_SECRET' - ] - ] + 'AUTH_WECOM', 'WECOM_CORPID', 'WECOM_AGENTID', 'WECOM_SECRET' ], fieldsMeta: { WECOM_SECRET: { diff --git a/src/views/settings/Security/AuthLimit.vue b/src/views/settings/Security/AuthLimit.vue index f30560170..ae22dbd49 100644 --- a/src/views/settings/Security/AuthLimit.vue +++ b/src/views/settings/Security/AuthLimit.vue @@ -30,14 +30,14 @@ export default { visible: false, fields: [ [ - this.$t('UserLoginLimit'), + this.$t('User'), [ 'SECURITY_LOGIN_LIMIT_COUNT', 'SECURITY_LOGIN_LIMIT_TIME' ] ], [ - this.$t('IPLoginLimit'), + this.$t('IP'), [ 'SECURITY_LOGIN_IP_LIMIT_COUNT', 'SECURITY_LOGIN_IP_LIMIT_TIME', diff --git a/src/views/settings/Storage/CommandStorage.vue b/src/views/settings/Storage/CommandStorage.vue index 8cb177747..15edfcaca 100644 --- a/src/views/settings/Storage/CommandStorage.vue +++ b/src/views/settings/Storage/CommandStorage.vue @@ -66,8 +66,7 @@ export default { showFalse: false, showText: false }, - align: 'center', - width: '150px' + align: 'center' }, actions: { formatterArgs: { diff --git a/src/views/settings/Storage/CommandStorageCreateUpdate.vue b/src/views/settings/Storage/CommandStorageCreateUpdate.vue index 6860b6a23..cb6f0d5b3 100644 --- a/src/views/settings/Storage/CommandStorageCreateUpdate.vue +++ b/src/views/settings/Storage/CommandStorageCreateUpdate.vue @@ -38,9 +38,6 @@ export default { type: 'select', disabled: true }, - is_default: { - helpText: this.$t('SetToDefaultStorage') - }, meta: { fields: ['HOSTS', 'INDEX_BY_DATE', 'INDEX', 'IGNORE_VERIFY_CERTS'], fieldsMeta: { diff --git a/src/views/settings/Storage/ReplayStorage.vue b/src/views/settings/Storage/ReplayStorage.vue index aa2293f2f..d7f7f282d 100644 --- a/src/views/settings/Storage/ReplayStorage.vue +++ b/src/views/settings/Storage/ReplayStorage.vue @@ -36,7 +36,7 @@ export default { }, columnsExclude: ['meta'], columns: [ - 'id', 'name', 'type', 'comment', 'is_default', 'actions' + 'id', 'name', 'type', 'is_default', 'comment', 'actions' ], columnsShow: { min: ['name', 'type', 'actions'] @@ -52,8 +52,7 @@ export default { showFalse: false, showText: false }, - align: 'center', - width: '150px' + align: 'center' }, comment: { sortable: 'custom' diff --git a/src/views/settings/Storage/ReplayStorageCreateUpdate.vue b/src/views/settings/Storage/ReplayStorageCreateUpdate.vue index 8d6fd524c..f9c682c24 100644 --- a/src/views/settings/Storage/ReplayStorageCreateUpdate.vue +++ b/src/views/settings/Storage/ReplayStorageCreateUpdate.vue @@ -63,7 +63,6 @@ export default { } }, is_default: { - helpText: this.$t('SetToDefaultStorage'), hidden: (formValue) => formValue.type === 'sftp' } }, diff --git a/src/views/settings/Terminal/Base.vue b/src/views/settings/Terminal/Base.vue index 92252c9e1..ce0d037a1 100644 --- a/src/views/settings/Terminal/Base.vue +++ b/src/views/settings/Terminal/Base.vue @@ -14,7 +14,6 @@ export default { GenericCreateUpdateForm }, data() { - const comp = this.$t('Component') return { fields: [ [ @@ -24,7 +23,7 @@ export default { ] ], [ - `SSH ${comp}(KoKo)`, + `SSH & KoKo`, [ 'TERMINAL_KOKO_SSH_ENABLED', 'TERMINAL_PASSWORD_AUTH', 'TERMINAL_PUBLIC_KEY_AUTH', @@ -33,33 +32,26 @@ export default { ] ], [ - `RDP ${comp}(Razor)`, + `RDP & Razor`, [ 'TERMINAL_RAZOR_ENABLED' ] ], [ - `DB ${comp}(Magnus)`, + `DB & Magnus`, [ 'TERMINAL_MAGNUS_ENABLED' ] ] ], fieldsMeta: { - TERMINAL_KOKO_SSH_ENABLED: { - helpText: this.$i18n.t('Info') + ': ' + this.$i18n.t('EnableKoKoSSHHelpText') - }, TERMINAL_RAZOR_ENABLED: { - helpText: this.$i18n.t('Info') + ': ' + this.$i18n.t('SettingInEndpointHelpText'), hidden: () => { return !this.$store.getters.hasValidLicense }, el: { hiddenGroup: true } - }, - TERMINAL_MAGNUS_ENABLED: { - helpText: this.$i18n.t('Info') + ': ' + this.$i18n.t('SettingInEndpointHelpText') } }, getUrl: () => '/api/v1/settings/setting/?category=terminal', diff --git a/src/views/settings/Terminal/Component/TerminalList.vue b/src/views/settings/Terminal/Component/TerminalList.vue index d74e19d23..c18b1cd3e 100644 --- a/src/views/settings/Terminal/Component/TerminalList.vue +++ b/src/views/settings/Terminal/Component/TerminalList.vue @@ -139,13 +139,11 @@ export default { sortable: 'custom' }, is_active: { - width: '80px', align: 'center' }, is_alive: { }, session_online: { - width: '120px' }, actions: { formatterArgs: { diff --git a/src/views/settings/Terminal/Endpoint/EndpointCreateUpdate.vue b/src/views/settings/Terminal/Endpoint/EndpointCreateUpdate.vue index 1a2174e1b..8c93fdd85 100644 --- a/src/views/settings/Terminal/Endpoint/EndpointCreateUpdate.vue +++ b/src/views/settings/Terminal/Endpoint/EndpointCreateUpdate.vue @@ -21,13 +21,13 @@ export default { fields: [ [this.$t('Basic'), ['name', 'host']], [ - this.$t('BasePort'), + this.$t('Port'), [ 'http_port', 'https_port', 'ssh_port', 'rdp_port' ] ], [ - this.$t('DatabasePort'), + '', [ 'mysql_port', 'mariadb_port', 'postgresql_port', 'redis_port', 'sqlserver_port', 'oracle_port_range'