mirrors/1Panel
1
0
Fork 0
mirror of https://github.com/1Panel-dev/1Panel synced 2024-11-21 23:29:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: 面板代理地址自动增加 http 或者 https (#5302)

Browse Source
This commit is contained in:
ssongliu 2024-06-05 16:52:09 +08:00 committed by GitHub
parent 0118fbb944
commit 752e2ec17e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 25 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
frontend/src/views/setting/panel/proxy/index.vue
View File

@ -32,7 +32,16 @@
</el-select>
</el-form-item>
<el-form-item :label="$t('setting.proxyUrl')" prop="proxyUrl">
<el-input clearable v-model.trim="form.proxyUrl" />
<el-input
clearable
v-model.trim="form.proxyUrl"
v-if="form.proxyType == 'http' || form.proxyType === 'https'"
>
<template #prepend>
<span>{{ form.proxyType }}</span>
</template>
</el-input>
<el-input clearable v-model.trim="form.proxyUrl" v-else />
</el-form-item>
<el-form-item :label="$t('setting.proxyPort')" prop="proxyPortItem">
<el-input clearable type="number" v-model.number="form.proxyPortItem" />
@ -120,18 +129,23 @@ const submitChangePassword = async (formEl: FormInstance | undefined) => {
if (!formEl) return;
formEl.validate(async (valid) => {
if (!valid) return;
if (form.proxyType === '' || form.proxyType === 'close') {
form.proxyUrl = '';
form.proxyPort = '';
form.proxyUser = '';
form.proxyPasswd = '';
form.proxyPasswdKeep = '';
} else {
form.proxyPort = form.proxyPortItem + '';
form.proxyPasswdKeep = form.proxyPasswdKeepItem ? 'Enable' : 'Disable';
let isClose = form.proxyType === '' || form.proxyType === 'close';
let params = {
proxyType: isClose ? '' : form.proxyType,
proxyUrl: isClose ? '' : form.proxyUrl,
proxyPort: isClose ? '' : form.proxyPortItem + '',
proxyUser: isClose ? '' : form.proxyUser,
proxyPasswd: isClose ? '' : form.proxyPasswd,
proxyPasswdKeep: '',
};
if (!isClose) {
params.proxyPasswdKeep = form.proxyPasswdKeepItem ? 'Enable' : 'Disable';
}
if (form.proxyType === 'http' || form.proxyType === 'https') {
params.proxyUrl = form.proxyType + '://' + form.proxyUrl;
}
loading.value = true;
await updateProxy(form)
await updateProxy(params)
.then(async () => {
loading.value = false;
emit('search');