1
0
mirror of https://github.com/1Panel-dev/1Panel.git synced 2025-01-31 22:18:07 +08:00

fix: 部分界面样式调整 (#3213)

This commit is contained in:
ssongliu 2023-12-07 14:38:07 +08:00 committed by GitHub
parent cb6b9965ec
commit 40da8a7525
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 23 additions and 10 deletions

View File

@ -753,7 +753,8 @@ const message = {
startIn: ' to start', startIn: ' to start',
sockPath: 'Socket Path', sockPath: 'Socket Path',
sockPathHelper: 'Communication channel between Docker Daemon and the client', 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: sockPathMsg:
'Saving the Socket Path setting may result in Docker service being unavailable. Do you want to continue?', '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', sockPathErr: 'Please select or enter the correct Docker sock file path',
@ -917,6 +918,8 @@ const message = {
}, },
device: { device: {
dnsHelper: 'Server Address Domain Resolution', 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', hostsHelper: 'Hostname Resolution',
hosts: 'Domain', hosts: 'Domain',
toolbox: 'Toolbox', toolbox: 'Toolbox',

View File

@ -724,7 +724,8 @@ const message = {
startIn: '中開啟', startIn: '中開啟',
sockPath: 'Socket 路徑', sockPath: 'Socket 路徑',
sockPathHelper: 'Docker 守護進程Docker Daemon與客戶端之間的通信通道', sockPathHelper: 'Docker 守護進程Docker Daemon與客戶端之間的通信通道',
sockPathHelper1: '默認值為 unix:///var/run/docker-x.sock', sockPathHelper1: '默認路徑/var/run/docker-x.sock',
sockPathHelper2: '當前路徑{0}',
sockPathMsg: '保存設定 Socket 路徑可能導致 Docker 服務不可用是否繼續', sockPathMsg: '保存設定 Socket 路徑可能導致 Docker 服務不可用是否繼續',
sockPathErr: '請選擇或輸入正確的 Docker sock 文件路徑', sockPathErr: '請選擇或輸入正確的 Docker sock 文件路徑',
}, },
@ -873,6 +874,7 @@ const message = {
}, },
device: { device: {
dnsHelper: '伺服器地址域名解析', dnsHelper: '伺服器地址域名解析',
dnsHelper1: '當存在多個DNS時需換行顯示\n114.114.114.114\n8.8.8.8',
hostsHelper: '主機名解析', hostsHelper: '主機名解析',
hosts: '域名', hosts: '域名',
toolbox: '工具箱', toolbox: '工具箱',

View File

@ -725,7 +725,8 @@ const message = {
startIn: '中开启', startIn: '中开启',
sockPath: 'Socket 路径', sockPath: 'Socket 路径',
sockPathHelper: 'Docker 守护进程Docker Daemon与客户端之间的通信通道', sockPathHelper: 'Docker 守护进程Docker Daemon与客户端之间的通信通道',
sockPathHelper1: '默认值为 unix:///var/run/docker-x.sock', sockPathHelper1: '默认路径/var/run/docker.sock',
sockPathHelper2: '当前路径{0}',
sockPathMsg: '保存设置 Socket 路径可能导致 Docker 服务不可用是否继续', sockPathMsg: '保存设置 Socket 路径可能导致 Docker 服务不可用是否继续',
sockPathErr: '请选择或输入正确的 Docker sock 文件路径', sockPathErr: '请选择或输入正确的 Docker sock 文件路径',
}, },
@ -874,6 +875,7 @@ const message = {
}, },
device: { device: {
dnsHelper: '服务器地址域名解析', dnsHelper: '服务器地址域名解析',
dnsHelper1: '当存在多个DNS时需换行显示\n114.114.114.114\n8.8.8.8',
hostsHelper: '主机名解析', hostsHelper: '主机名解析',
hosts: '域名', hosts: '域名',
toolbox: '工具箱', toolbox: '工具箱',

View File

@ -15,12 +15,16 @@
<el-row type="flex" justify="center"> <el-row type="flex" justify="center">
<el-col :span="22"> <el-col :span="22">
<el-form-item :label="$t('container.sockPath')" prop="dockerSockPath"> <el-form-item :label="$t('container.sockPath')" prop="dockerSockPath">
<el-input placeholder="unix:///var/run/docker.sock" v-model="form.dockerSockPath"> <el-input v-model="form.dockerSockPath">
<template #prepend> <template #prepend>unix://</template>
<template #append>
<FileList @choose="loadBuildDir"></FileList> <FileList @choose="loadBuildDir"></FileList>
</template> </template>
</el-input> </el-input>
<span class="input-help">{{ $t('container.sockPathHelper1') }}</span> <span class="input-help">{{ $t('container.sockPathHelper1') }}</span>
<span class="input-help" style="margin-top: -12px">
{{ $t('container.sockPathHelper2', [form.currentPath]) }}
</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@ -54,6 +58,7 @@ const loading = ref();
const form = reactive({ const form = reactive({
dockerSockPath: '', dockerSockPath: '',
currentPath: '',
}); });
const formRef = ref<FormInstance>(); const formRef = ref<FormInstance>();
const rules = reactive({ const rules = reactive({
@ -68,7 +73,8 @@ function checkSockPath(rule: any, value: any, callback: any) {
} }
const acceptParams = (params: DialogProps): void => { const acceptParams = (params: DialogProps): void => {
form.dockerSockPath = params.dockerSockPath; form.dockerSockPath = params.dockerSockPath.replaceAll('unix://', '');
form.currentPath = params.dockerSockPath.replaceAll('unix://', '');
drawerVisible.value = true; drawerVisible.value = true;
}; };

View File

@ -171,7 +171,7 @@ const rules = reactive({
clientKey: [Rules.requiredInput], clientKey: [Rules.requiredInput],
clientCert: [Rules.requiredInput], clientCert: [Rules.requiredInput],
caCert: [Rules.requiredInput], rootCert: [Rules.requiredInput],
}); });
type FormInstance = InstanceType<typeof ElForm>; type FormInstance = InstanceType<typeof ElForm>;

View File

@ -5,7 +5,7 @@
:destroy-on-close="true" :destroy-on-close="true"
@close="handleClose" @close="handleClose"
:close-on-click-modal="false" :close-on-click-modal="false"
size="30%" size="50%"
> >
<template #header> <template #header>
<DrawerHeader :header="$t('setting.panelSSL')" :back="handleClose" /> <DrawerHeader :header="$t('setting.panelSSL')" :back="handleClose" />

View File

@ -124,7 +124,7 @@
</el-button> </el-button>
</div> </div>
</div> </div>
<el-collapse v-model="activeNames"> <el-collapse v-model="activeNames" class="mt-5">
<el-collapse-item :title="$t('clean.system')" name="system"> <el-collapse-item :title="$t('clean.system')" name="system">
<el-tree <el-tree
ref="systemRef" ref="systemRef"

View File

@ -23,7 +23,7 @@
<el-form-item label="DNS" prop="dns"> <el-form-item label="DNS" prop="dns">
<el-input <el-input
type="textarea" type="textarea"
:placeholder="$t('setting.allowIPEgs')" :placeholder="$t('toolbox.device.dnsHelper1')"
:autosize="{ minRows: 8, maxRows: 10 }" :autosize="{ minRows: 8, maxRows: 10 }"
v-model="form.dns" v-model="form.dns"
/> />