From e65329e7b3a2f1526ca654c30d548cb7bc03d730 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=98=AD?= <81747598+lan-yonghui@users.noreply.github.com>
Date: Tue, 12 Nov 2024 19:18:00 +0800
Subject: [PATCH] =?UTF-8?q?perf:=20=E4=BC=98=E5=8C=96=20docker=20=E4=BB=A3?=
 =?UTF-8?q?=E7=90=86=20(#7016)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/styles/element-dark.scss         | 26 -------------------
 frontend/src/styles/reset.scss                | 26 +++++++++++++++++++
 .../src/views/setting/panel/proxy/index.vue   | 14 +++++-----
 3 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/frontend/src/styles/element-dark.scss b/frontend/src/styles/element-dark.scss
index 659aac64c..75ebd8b7b 100644
--- a/frontend/src/styles/element-dark.scss
+++ b/frontend/src/styles/element-dark.scss
@@ -113,32 +113,6 @@ html.dark {
 
     --el-text-color-placeholder: var(--panel-main-bg-color-4);
 
-    .el-message {
-        --el-color-primary: #409eff;
-        --el-color-primary-light-5: #a0cfff;
-        --el-color-primary-light-8: #d9ecff;
-        --el-color-primary-light-9: #ecf5ff;
-        --el-color-success: #67c23a;
-        --el-color-success-light-5: #b3e19d;
-        --el-color-success-light-8: #e1f3d8;
-        --el-color-success-light-9: #f0f9eb;
-        --el-color-warning: #e6a23c;
-        --el-color-warning-light-5: #f3d19e;
-        --el-color-warning-light-8: #faecd8;
-        --el-color-warning-light-9: #fdf6ec;
-        --el-color-danger: #f56c6c;
-        --el-color-danger-light-5: #fab6b6;
-        --el-color-danger-light-8: #fde2e2;
-        --el-color-error: #f56c6c;
-        --el-color-error-light-5: #fab6b6;
-        --el-color-error-light-8: #fde2e2;
-        --el-color-error-light-9: #fef0f0;
-        --el-color-info: #909399;
-        --el-color-info-light-5: #c8c9cc;
-        --el-color-info-light-8: #e9e9eb;
-        --el-color-info-light-9: #f4f4f5;
-    }
-
     .el-descriptions__content:not(.is-bordered-label) {
         color: var(--panel-main-bg-color-3);
     }
diff --git a/frontend/src/styles/reset.scss b/frontend/src/styles/reset.scss
index 2dfafce4a..5ae89a87b 100644
--- a/frontend/src/styles/reset.scss
+++ b/frontend/src/styles/reset.scss
@@ -28,3 +28,29 @@ body,
     display: flex;
     align-items: center;
 }
+
+.el-message {
+    --el-color-primary: #409eff;
+    --el-color-primary-light-5: #a0cfff;
+    --el-color-primary-light-8: #d9ecff;
+    --el-color-primary-light-9: #ecf5ff;
+    --el-color-success: #67c23a;
+    --el-color-success-light-5: #b3e19d;
+    --el-color-success-light-8: #e1f3d8;
+    --el-color-success-light-9: #f0f9eb;
+    --el-color-warning: #e6a23c;
+    --el-color-warning-light-5: #f3d19e;
+    --el-color-warning-light-8: #faecd8;
+    --el-color-warning-light-9: #fdf6ec;
+    --el-color-danger: #f56c6c;
+    --el-color-danger-light-5: #fab6b6;
+    --el-color-danger-light-8: #fde2e2;
+    --el-color-error: #f56c6c;
+    --el-color-error-light-5: #fab6b6;
+    --el-color-error-light-8: #fde2e2;
+    --el-color-error-light-9: #fef0f0;
+    --el-color-info: #909399;
+    --el-color-info-light-5: #c8c9cc;
+    --el-color-info-light-8: #e9e9eb;
+    --el-color-info-light-9: #f4f4f5;
+}
diff --git a/frontend/src/views/setting/panel/proxy/index.vue b/frontend/src/views/setting/panel/proxy/index.vue
index ffc46069c..27c4606c9 100644
--- a/frontend/src/views/setting/panel/proxy/index.vue
+++ b/frontend/src/views/setting/panel/proxy/index.vue
@@ -17,9 +17,9 @@
                             <template #default>
                                 {{ $t('setting.proxyHelper') }}
                                 <ul style="margin-left: -20px">
-                                    <li v-if="isProductPro">{{ $t('setting.proxyHelper1') }}</li>
-                                    <li v-if="isProductPro">{{ $t('setting.proxyHelper2') }}</li>
-                                    <li v-if="isProductPro">{{ $t('setting.proxyHelper4') }}</li>
+                                    <li>{{ $t('setting.proxyHelper1') }}</li>
+                                    <li>{{ $t('setting.proxyHelper2') }}</li>
+                                    <li>{{ $t('setting.proxyHelper4') }}</li>
                                     <li>{{ $t('setting.proxyHelper3') }}</li>
                                 </ul>
                             </template>
@@ -183,9 +183,9 @@ const submitChangePassword = async (formEl: FormInstance | undefined) => {
                 (proxyDockerVisible.value && !params.proxyDocker))
         ) {
             let confirmParams = {
-                header: i18n.global.t('database.confChange'),
-                operationInfo: i18n.global.t('database.restartNowHelper'),
-                submitInputInfo: i18n.global.t('database.restartNow'),
+                header: i18n.global.t('setting.confDockerProxy'),
+                operationInfo: i18n.global.t('setting.restartNowHelper'),
+                submitInputInfo: i18n.global.t('setting.restartNow'),
             };
             confirmDialogRef.value!.acceptParams(confirmParams);
         } else {
@@ -233,7 +233,7 @@ const onSubmit = async () => {
         }
         await updateProxy(params);
         if (isClose || params.proxyDocker === false) {
-            params.proxyUrl = '';
+            proxyUrl = '';
         }
         await updateXpackSettingByKey('ProxyDocker', proxyUrl);
         await updateDaemonJson(`${form.proxyType}-proxy`, proxyUrl);