From 40da8a7525533a6cef59d1018f485f1256d20264 Mon Sep 17 00:00:00 2001
From: ssongliu <73214554+ssongliu@users.noreply.github.com>
Date: Thu, 7 Dec 2023 14:38:07 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E9=83=A8=E5=88=86=E7=95=8C=E9=9D=A2?=
=?UTF-8?q?=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4=20(#3213)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
frontend/src/lang/modules/en.ts | 5 ++++-
frontend/src/lang/modules/tw.ts | 4 +++-
frontend/src/lang/modules/zh.ts | 4 +++-
.../src/views/container/setting/sock-path/index.vue | 12 +++++++++---
.../views/database/mysql/remote/operate/index.vue | 2 +-
frontend/src/views/setting/safe/ssl/index.vue | 2 +-
frontend/src/views/toolbox/clean/index.vue | 2 +-
frontend/src/views/toolbox/device/dns/index.vue | 2 +-
8 files changed, 23 insertions(+), 10 deletions(-)
diff --git a/frontend/src/lang/modules/en.ts b/frontend/src/lang/modules/en.ts
index f5f28cb2c..604dc7861 100644
--- a/frontend/src/lang/modules/en.ts
+++ b/frontend/src/lang/modules/en.ts
@@ -753,7 +753,8 @@ const message = {
startIn: ' to start',
sockPath: 'Socket Path',
sockPathHelper: 'Communication channel between Docker Daemon and the client',
- sockPathHelper1: 'Default value is unix:///var/run/docker-x.sock',
+ sockPathHelper1: 'Default Path: /var/run/docker-x.sock',
+ sockPathHelper2: 'CurrentPath: {0}',
sockPathMsg:
'Saving the Socket Path setting may result in Docker service being unavailable. Do you want to continue?',
sockPathErr: 'Please select or enter the correct Docker sock file path',
@@ -917,6 +918,8 @@ const message = {
},
device: {
dnsHelper: 'Server Address Domain Resolution',
+ dnsHelper1:
+ 'When there are multiple DNS entries, they should be displayed on new lines. e.g.\n114.114.114.114\n8.8.8.8',
hostsHelper: 'Hostname Resolution',
hosts: 'Domain',
toolbox: 'Toolbox',
diff --git a/frontend/src/lang/modules/tw.ts b/frontend/src/lang/modules/tw.ts
index 8739efddc..a90bb246a 100644
--- a/frontend/src/lang/modules/tw.ts
+++ b/frontend/src/lang/modules/tw.ts
@@ -724,7 +724,8 @@ const message = {
startIn: '中開啟',
sockPath: 'Socket 路徑',
sockPathHelper: 'Docker 守護進程(Docker Daemon)與客戶端之間的通信通道',
- sockPathHelper1: '默認值為 unix:///var/run/docker-x.sock',
+ sockPathHelper1: '默認路徑:/var/run/docker-x.sock',
+ sockPathHelper2: '當前路徑:{0}',
sockPathMsg: '保存設定 Socket 路徑可能導致 Docker 服務不可用,是否繼續?',
sockPathErr: '請選擇或輸入正確的 Docker sock 文件路徑',
},
@@ -873,6 +874,7 @@ const message = {
},
device: {
dnsHelper: '伺服器地址域名解析',
+ dnsHelper1: '當存在多個DNS時,需換行顯示,例:\n114.114.114.114\n8.8.8.8',
hostsHelper: '主機名解析',
hosts: '域名',
toolbox: '工具箱',
diff --git a/frontend/src/lang/modules/zh.ts b/frontend/src/lang/modules/zh.ts
index df98a36d5..a6376ebea 100644
--- a/frontend/src/lang/modules/zh.ts
+++ b/frontend/src/lang/modules/zh.ts
@@ -725,7 +725,8 @@ const message = {
startIn: '中开启',
sockPath: 'Socket 路径',
sockPathHelper: 'Docker 守护进程(Docker Daemon)与客户端之间的通信通道',
- sockPathHelper1: '默认值为 unix:///var/run/docker-x.sock',
+ sockPathHelper1: '默认路径:/var/run/docker.sock',
+ sockPathHelper2: '当前路径:{0}',
sockPathMsg: '保存设置 Socket 路径可能导致 Docker 服务不可用,是否继续?',
sockPathErr: '请选择或输入正确的 Docker sock 文件路径',
},
@@ -874,6 +875,7 @@ const message = {
},
device: {
dnsHelper: '服务器地址域名解析',
+ dnsHelper1: '当存在多个DNS时,需换行显示,例:\n114.114.114.114\n8.8.8.8',
hostsHelper: '主机名解析',
hosts: '域名',
toolbox: '工具箱',
diff --git a/frontend/src/views/container/setting/sock-path/index.vue b/frontend/src/views/container/setting/sock-path/index.vue
index 0338f1292..5b2e3ad47 100644
--- a/frontend/src/views/container/setting/sock-path/index.vue
+++ b/frontend/src/views/container/setting/sock-path/index.vue
@@ -15,12 +15,16 @@
-
-
+
+ unix://
+
{{ $t('container.sockPathHelper1') }}
+
+ {{ $t('container.sockPathHelper2', [form.currentPath]) }}
+
@@ -54,6 +58,7 @@ const loading = ref();
const form = reactive({
dockerSockPath: '',
+ currentPath: '',
});
const formRef = ref();
const rules = reactive({
@@ -68,7 +73,8 @@ function checkSockPath(rule: any, value: any, callback: any) {
}
const acceptParams = (params: DialogProps): void => {
- form.dockerSockPath = params.dockerSockPath;
+ form.dockerSockPath = params.dockerSockPath.replaceAll('unix://', '');
+ form.currentPath = params.dockerSockPath.replaceAll('unix://', '');
drawerVisible.value = true;
};
diff --git a/frontend/src/views/database/mysql/remote/operate/index.vue b/frontend/src/views/database/mysql/remote/operate/index.vue
index cc8ca3da6..df62b7708 100644
--- a/frontend/src/views/database/mysql/remote/operate/index.vue
+++ b/frontend/src/views/database/mysql/remote/operate/index.vue
@@ -171,7 +171,7 @@ const rules = reactive({
clientKey: [Rules.requiredInput],
clientCert: [Rules.requiredInput],
- caCert: [Rules.requiredInput],
+ rootCert: [Rules.requiredInput],
});
type FormInstance = InstanceType;
diff --git a/frontend/src/views/setting/safe/ssl/index.vue b/frontend/src/views/setting/safe/ssl/index.vue
index f929b1aaa..b110ec287 100644
--- a/frontend/src/views/setting/safe/ssl/index.vue
+++ b/frontend/src/views/setting/safe/ssl/index.vue
@@ -5,7 +5,7 @@
:destroy-on-close="true"
@close="handleClose"
:close-on-click-modal="false"
- size="30%"
+ size="50%"
>
diff --git a/frontend/src/views/toolbox/clean/index.vue b/frontend/src/views/toolbox/clean/index.vue
index 026dd999b..140310c8e 100644
--- a/frontend/src/views/toolbox/clean/index.vue
+++ b/frontend/src/views/toolbox/clean/index.vue
@@ -124,7 +124,7 @@
-
+