From ac98d63fcdb5f5a89bcd46566c261aae79b2817f Mon Sep 17 00:00:00 2001
From: "xin.yang" <mx2913@foxmail.com>
Date: Mon, 18 Sep 2023 10:16:19 +0800
Subject: [PATCH] =?UTF-8?q?redis=20=E5=A2=9E=E5=8A=A0=E8=AF=A6=E7=BB=86?=
 =?UTF-8?q?=E7=9A=84=E8=BF=9C=E7=A8=8B=E8=BF=9E=E6=8E=A5=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=EF=BC=8C=E5=B9=B6=E6=B7=BB=E5=8A=A0=E5=A4=8D=E5=88=B6=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE=20(#2328)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* redis 增加详细的远程连接信息，并添加复制按钮

* 优化数据加载流程，避免出现 systemIP 被覆盖的问题
---
 frontend/src/api/interface/app.ts             |  1 +
 .../views/database/redis/password/index.vue   | 19 ++++++++++++-------
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/frontend/src/api/interface/app.ts b/frontend/src/api/interface/app.ts
index 4d7ae2696..589908798 100644
--- a/frontend/src/api/interface/app.ts
+++ b/frontend/src/api/interface/app.ts
@@ -142,6 +142,7 @@ export namespace App {
         password: string;
         privilege: boolean;
         serviceName: string;
+        systemIP: string;
         port: number;
     }
     export interface AppInstallResource {
diff --git a/frontend/src/views/database/redis/password/index.vue b/frontend/src/views/database/redis/password/index.vue
index 0f857bd08..eca94f5d9 100644
--- a/frontend/src/views/database/redis/password/index.vue
+++ b/frontend/src/views/database/redis/password/index.vue
@@ -1,5 +1,5 @@
 <template>
-    <el-drawer v-model="dialogVisiable" :destroy-on-close="true" :close-on-click-modal="false" size="30%">
+    <el-drawer v-model="dialogVisible" :destroy-on-close="true" :close-on-click-modal="false" size="30%">
         <template #header>
             <DrawerHeader :header="$t('database.databaseConnInfo')" :back="handleClose" />
         </template>
@@ -32,7 +32,8 @@
                         </span>
                     </el-form-item>
                     <el-form-item :label="$t('database.remoteConn')">
-                        <el-tag>{{ $t('database.localIP') + ':' + form.port }}</el-tag>
+                        <el-tag>{{ form.systemIP + ':' + form.port }}</el-tag>
+                        <el-button @click="onCopy(form.systemIP + ':6379')" icon="DocumentCopy" link></el-button>
                         <span class="input-help">{{ $t('database.remoteConnHelper2') }}</span>
                     </el-form-item>
                 </el-col>
@@ -43,7 +44,7 @@
 
         <template #footer>
             <span class="dialog-footer">
-                <el-button :disabled="loading" @click="dialogVisiable = false">
+                <el-button :disabled="loading" @click="dialogVisible = false">
                     {{ $t('commons.button.cancel') }}
                 </el-button>
                 <el-button :disabled="loading" type="primary" @click="onSave(formRef)">
@@ -67,15 +68,17 @@ import DrawerHeader from '@/components/drawer-header/index.vue';
 import { App } from '@/api/interface/app';
 import { getRandomStr } from '@/utils/util';
 import useClipboard from 'vue-clipboard3';
+import { getSettingInfo } from '@/api/modules/setting';
 const { toClipboard } = useClipboard();
 
 const loading = ref(false);
 
-const dialogVisiable = ref(false);
+const dialogVisible = ref(false);
 const form = ref<App.DatabaseConnInfo>({
     privilege: false,
     password: '',
     serviceName: '',
+    systemIP: '',
     port: 0,
 });
 
@@ -89,10 +92,10 @@ const formRef = ref<FormInstance>();
 const acceptParams = (): void => {
     form.value.password = '';
     loadPassword();
-    dialogVisiable.value = true;
+    dialogVisible.value = true;
 };
 const handleClose = () => {
-    dialogVisiable.value = false;
+    dialogVisible.value = false;
 };
 
 const random = async () => {
@@ -110,7 +113,9 @@ const onCopy = async (value: string) => {
 
 const loadPassword = async () => {
     const res = await GetAppConnInfo('redis', '');
+    const settingInfoRes = await getSettingInfo();
     form.value = res.data;
+    form.value.systemIP = settingInfoRes.data.systemIP || i18n.global.t('database.localIP');
 };
 
 const onSubmit = async () => {
@@ -120,7 +125,7 @@ const onSubmit = async () => {
         .then(() => {
             loading.value = false;
             MsgSuccess(i18n.global.t('commons.msg.operationSuccess'));
-            dialogVisiable.value = false;
+            dialogVisible.value = false;
             emit('checkExist');
         })
         .catch(() => {