From 37de6aae66469b1dc90e49eee1494658add05fcd Mon Sep 17 00:00:00 2001
From: ssongliu <73214554+ssongliu@users.noreply.github.com>
Date: Thu, 6 Jun 2024 11:18:12 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=B0=83=E6=95=B4=20Redis=20=E7=A9=BA?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81=E6=A0=B7=E5=BC=8F=20(#5315)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/utils/http/request.go                 |  2 +-
 frontend/src/views/database/redis/index.vue   |  1 +
 .../src/views/setting/panel/proxy/index.vue   | 55 +++++++++++--------
 3 files changed, 33 insertions(+), 25 deletions(-)

diff --git a/backend/utils/http/request.go b/backend/utils/http/request.go
index 0f6850330..5adaa46c5 100644
--- a/backend/utils/http/request.go
+++ b/backend/utils/http/request.go
@@ -22,7 +22,7 @@ func HandleGet(url, method string) (int, []byte, error) {
 func HandleGetWithTransport(url, method string, transport *http.Transport) (int, []byte, error) {
 	defer func() {
 		if r := recover(); r != nil {
-			global.LOG.Errorf(" A panic occurred during handle request, error message: %v", r)
+			global.LOG.Errorf("handle request failed, error message: %v", r)
 			return
 		}
 	}()
diff --git a/frontend/src/views/database/redis/index.vue b/frontend/src/views/database/redis/index.vue
index 3ea238010..8f229b080 100644
--- a/frontend/src/views/database/redis/index.vue
+++ b/frontend/src/views/database/redis/index.vue
@@ -69,6 +69,7 @@
             />
             <el-empty
                 v-if="redisStatus !== 'Running' || (currentDB.from === 'remote' && !redisCliExist)"
+                :image-size="80"
                 :style="{ height: `calc(100vh - ${loadHeight()})`, 'background-color': '#000' }"
                 :description="loadErrMsg()"
             >
diff --git a/frontend/src/views/setting/panel/proxy/index.vue b/frontend/src/views/setting/panel/proxy/index.vue
index eac65204b..d379a07c2 100644
--- a/frontend/src/views/setting/panel/proxy/index.vue
+++ b/frontend/src/views/setting/panel/proxy/index.vue
@@ -31,30 +31,35 @@
                                 <el-option value="https" label="HTTPS" />
                             </el-select>
                         </el-form-item>
-                        <el-form-item :label="$t('setting.proxyUrl')" prop="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" />
-                        </el-form-item>
-                        <el-form-item :label="$t('commons.login.username')" prop="proxyUser">
-                            <el-input clearable v-model.trim="form.proxyUser" />
-                        </el-form-item>
-                        <el-form-item :label="$t('commons.login.password')" prop="proxyPasswd">
-                            <el-input type="password" show-password clearable v-model.trim="form.proxyPasswd" />
-                        </el-form-item>
-                        <el-form-item>
-                            <el-checkbox v-model="form.proxyPasswdKeepItem" :label="$t('setting.proxyPasswdKeep')" />
-                        </el-form-item>
+                        <div v-if="form.proxyType !== 'close'">
+                            <el-form-item :label="$t('setting.proxyUrl')" prop="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" />
+                            </el-form-item>
+                            <el-form-item :label="$t('commons.login.username')" prop="proxyUser">
+                                <el-input clearable v-model.trim="form.proxyUser" />
+                            </el-form-item>
+                            <el-form-item :label="$t('commons.login.password')" prop="proxyPasswd">
+                                <el-input type="password" show-password clearable v-model.trim="form.proxyPasswd" />
+                            </el-form-item>
+                            <el-form-item>
+                                <el-checkbox
+                                    v-model="form.proxyPasswdKeepItem"
+                                    :label="$t('setting.proxyPasswdKeep')"
+                                />
+                            </el-form-item>
+                        </div>
                     </el-col>
                 </el-row>
             </el-form>
@@ -119,6 +124,8 @@ const acceptParams = (params: DialogProps): void => {
     if (params.url) {
         if (params.type === 'http' || params.type === 'https') {
             form.proxyUrl = params.url.replaceAll(params.type + '://', '');
+        } else {
+            form.proxyUrl = params.url;
         }
     } else {
         form.proxyUrl = '127.0.0.1';