diff --git a/frontend/src/components/system-upgrade/index.vue b/frontend/src/components/system-upgrade/index.vue index 245b1c8b6..badc52627 100644 --- a/frontend/src/components/system-upgrade/index.vue +++ b/frontend/src/components/system-upgrade/index.vue @@ -38,11 +38,11 @@
- {{ $t('setting.versionHelper') }} -
  • {{ $t('setting.versionHelper1') }}
    • -
  • {{ $t('setting.versionHelper2') }}
    • + {{ $t('setting.versionHelper') }} +
  • {{ $t('setting.versionHelper1') }}
    • +
  • {{ $t('setting.versionHelper2') }}
    •  -
    +

    {{ $t('app.version') }}

    @@ -158,18 +158,21 @@ onMounted(() => { text-decoration: none; letter-spacing: 0.5px; } +.line-heigth { + line-height: 25px; +} .panel-MdEditor { height: calc(100vh - 330px); - margin-left: 70px; .tag { margin-top: -6px; + margin-left: 20px; vertical-align: middle; } :deep(.md-editor-preview) { font-size: 14px; } :deep(.default-theme h2) { - margin: 13px 0; + margin: 13px, 0; padding: 0; font-size: 16px; } diff --git a/frontend/src/lang/modules/en.ts b/frontend/src/lang/modules/en.ts index 8082f46c8..b9a29aba0 100644 --- a/frontend/src/lang/modules/en.ts +++ b/frontend/src/lang/modules/en.ts @@ -354,7 +354,6 @@ const message = { localDB: 'Local DB', address: 'DB address', version: 'DB version', - versionHelper: 'Currently, only versions {0} are supported', userHelper: 'The root user or a database user with root privileges can access the remote database.', selectFile: 'Select file', @@ -963,10 +962,11 @@ const message = { panel: 'Panel', userChange: 'Change username', userChangeHelper: 'Change the user name to log out. Do you want to continue?', + user: 'User Name', passwd: 'Password', emailHelper: 'For password retrieval', - title: 'Panel alias', - panelPort: 'Panel port', + title: 'Panel Alias', + panelPort: 'Panel Port', portHelper: 'The recommended port range is 8888 to 65535. Note: If the server has a security group, permit the new port from the security group in advance', portChange: 'Port change', @@ -983,7 +983,7 @@ const message = { 'If you do not operate the panel for more than {0} seconds, the panel automatically logs out', systemIP: 'System Address', systemIPWarning: 'The server address is not currently set. Please set it in the control panel first!', - syncTime: 'Server time', + syncTime: 'Server Time', timeZone: 'Time Zone', timeZoneChangeHelper: 'Changing the time zone requires restarting the service. Do you want to continue?', timeZoneHelper: @@ -1060,11 +1060,11 @@ const message = { expiredHelper: 'The current password has expired. Please change the password again.', timeoutHelper: '[ {0} days ] The panel password is about to expire. After the expiration, you need to reset the password', - complexity: 'Complexity verification', + complexity: 'Complexity Verification', complexityHelper: 'The password must contain at least eight characters and contain at least three uppercase letters, lowercase letters, digits, and special characters', - bindDomain: 'Bind domain', + bindDomain: 'Bind Domain', unBindDomain: 'Unbind domain', unBindDomainHelper: 'The action of unbinding a domain name may cause system insecurity. Do you want to continue?', diff --git a/frontend/src/lang/modules/tw.ts b/frontend/src/lang/modules/tw.ts index a09350df4..5a4e462f7 100644 --- a/frontend/src/lang/modules/tw.ts +++ b/frontend/src/lang/modules/tw.ts @@ -346,7 +346,6 @@ const message = { localDB: '本地數據庫', address: '數據庫地址', version: '數據庫版本', - versionHelper: '當前僅支持 {0} 三個版本', userHelper: 'root 用戶或者擁有 root 權限的數據庫用戶', selectFile: '選擇文件', diff --git a/frontend/src/lang/modules/zh.ts b/frontend/src/lang/modules/zh.ts index 4ec338785..590fbd8f7 100644 --- a/frontend/src/lang/modules/zh.ts +++ b/frontend/src/lang/modules/zh.ts @@ -346,7 +346,6 @@ const message = { localDB: '本地数据库', address: '数据库地址', version: '数据库版本', - versionHelper: '当前仅支持 {0} 版本', userHelper: 'root 用户或者拥有 root 权限的数据库用户', selectFile: '选择文件', diff --git a/frontend/src/styles/common.scss b/frontend/src/styles/common.scss index 1f38a3103..4a4902e85 100644 --- a/frontend/src/styles/common.scss +++ b/frontend/src/styles/common.scss @@ -351,3 +351,17 @@ html { .pre-select { width: 85px !important; } + + +.el-input-group__append { + border-left: 0; + &:hover { + color: var(--el-color-primary); + background-color: var(--el-color-primary-light-9) !important; + } + background-color: #ffffff !important; + border-top-left-radius: 0; + border-bottom-left-radius: 0; + box-shadow: 0 1px 0 0 var(--el-input-border-color) inset, 0 -1px 0 0 var(--el-input-border-color) inset, + -1px 0 0 0 var(--el-input-border-color) inset; +} \ No newline at end of file diff --git a/frontend/src/views/database/mysql/create/index.vue b/frontend/src/views/database/mysql/create/index.vue index 5fa477dba..767b0273f 100644 --- a/frontend/src/views/database/mysql/create/index.vue +++ b/frontend/src/views/database/mysql/create/index.vue @@ -51,8 +51,8 @@ {{ $t('database.remoteHelper') }} - - {{ loadLabel(form.from) }} + + {{ form.database + ' [' + form.type + ']' }} @@ -91,6 +91,7 @@ const createVisiable = ref(false); const form = reactive({ name: '', from: 'local', + type: '', database: '', format: '', username: '', @@ -111,11 +112,13 @@ const formRef = ref(); interface DialogProps { from: string; + type: string; database: string; } const acceptParams = (params: DialogProps): void => { form.name = ''; form.from = params.from; + form.type = params.type; form.database = params.database; form.format = 'utf8mb4'; form.username = ''; @@ -129,10 +132,6 @@ const handleClose = () => { createVisiable.value = false; }; -function loadLabel(from: any) { - return from === 'local' ? i18n.global.t('database.localDB') : from; -} - const random = async () => { form.password = getRandomStr(16); }; diff --git a/frontend/src/views/database/mysql/index.vue b/frontend/src/views/database/mysql/index.vue index c0427de33..c729d4f62 100644 --- a/frontend/src/views/database/mysql/index.vue +++ b/frontend/src/views/database/mysql/index.vue @@ -30,7 +30,7 @@
    @@ -39,7 +39,7 @@
    @@ -267,6 +267,7 @@ const dialogRef = ref(); const onOpenDialog = async () => { let params = { from: currentDB.value.from, + type: currentDB.value.type, database: currentDBName.value, }; dialogRef.value!.acceptParams(params); diff --git a/frontend/src/views/database/mysql/remote/index.vue b/frontend/src/views/database/mysql/remote/index.vue index 6720d877b..d1a77641f 100644 --- a/frontend/src/views/database/mysql/remote/index.vue +++ b/frontend/src/views/database/mysql/remote/index.vue @@ -135,7 +135,7 @@ const onOpenDialog = async ( rowData: Partial = { name: '', type: 'mysql', - version: '5.6', + version: '8.x', address: '', port: 3306, username: 'root', diff --git a/frontend/src/views/database/mysql/remote/operate/index.vue b/frontend/src/views/database/mysql/remote/operate/index.vue index 8c4c244e0..485541e23 100644 --- a/frontend/src/views/database/mysql/remote/operate/index.vue +++ b/frontend/src/views/database/mysql/remote/operate/index.vue @@ -20,28 +20,20 @@ {{ dialogData.rowData!.name }} - -
    - - -
    -     + + MySQL + MariaDB +     - +
    - - - + + +
    - -     - - {{ $t('database.versionHelper', ['5.6 5.7 8.x']) }} - - - {{ $t('database.versionHelper', ['10.x']) }} - + +     @@ -118,6 +110,7 @@ const handleClose = () => { const rules = reactive({ name: [Rules.requiredInput], + type: [Rules.requiredSelect], version: [Rules.requiredSelect], address: [Rules.host], port: [Rules.port], diff --git a/frontend/src/views/setting/panel/index.vue b/frontend/src/views/setting/panel/index.vue index cbc3217d6..1b68472dd 100644 --- a/frontend/src/views/setting/panel/index.vue +++ b/frontend/src/views/setting/panel/index.vue @@ -6,7 +6,7 @@
    - +