From 752e2ec17e59e123e165746c3d495e5a5808e954 Mon Sep 17 00:00:00 2001
From: ssongliu <73214554+ssongliu@users.noreply.github.com>
Date: Wed, 5 Jun 2024 16:52:09 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E9=9D=A2=E6=9D=BF=E4=BB=A3=E7=90=86?=
 =?UTF-8?q?=E5=9C=B0=E5=9D=80=E8=87=AA=E5=8A=A8=E5=A2=9E=E5=8A=A0=20http?=
 =?UTF-8?q?=20=E6=88=96=E8=80=85=20=20=20https=20(#5302)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/setting/panel/proxy/index.vue   | 36 +++++++++++++------
 1 file changed, 25 insertions(+), 11 deletions(-)

diff --git a/frontend/src/views/setting/panel/proxy/index.vue b/frontend/src/views/setting/panel/proxy/index.vue
index 4c17bd1b8..0f60d3049 100644
--- a/frontend/src/views/setting/panel/proxy/index.vue
+++ b/frontend/src/views/setting/panel/proxy/index.vue
@@ -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');