From ac33f5461d4858cd11d235fffb7217c639d6828a Mon Sep 17 00:00:00 2001
From: ssongliu <73214554+ssongliu@users.noreply.github.com>
Date: Fri, 31 May 2024 14:12:42 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96=20Redis=20=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E5=BA=93=E6=A0=B7=E5=BC=8F=20(#5229)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/views/database/mysql/index.vue   |  5 ++-
 .../src/views/database/postgresql/index.vue   |  5 ++-
 frontend/src/views/database/redis/index.vue   | 32 ++++++++++++-------
 frontend/src/views/setting/snapshot/index.vue |  2 +-
 frontend/src/views/toolbox/ftp/index.vue      |  6 +++-
 5 files changed, 34 insertions(+), 16 deletions(-)

diff --git a/frontend/src/views/database/mysql/index.vue b/frontend/src/views/database/mysql/index.vue
index 0147e857a..7651b2d6d 100644
--- a/frontend/src/views/database/mysql/index.vue
+++ b/frontend/src/views/database/mysql/index.vue
@@ -189,7 +189,7 @@
                             </div>
                         </template>
                     </el-table-column>
-                    <el-table-column :label="$t('commons.table.description')" prop="description">
+                    <el-table-column :label="$t('commons.table.description')" prop="description" show-overflow-tooltip>
                         <template #default="{ row }">
                             <fu-input-rw-switch v-model="row.description" @blur="onChange(row)" />
                         </template>
@@ -527,6 +527,9 @@ const loadDBOptions = async () => {
     if (currentDB.value) {
         search();
     }
+    if (currentDB.value.from === 'remote') {
+        maskShow.value = false;
+    }
 };
 const onDelete = async (row: Database.MysqlDBInfo) => {
     let param = {
diff --git a/frontend/src/views/database/postgresql/index.vue b/frontend/src/views/database/postgresql/index.vue
index 4b70e2d20..edbe33d3b 100644
--- a/frontend/src/views/database/postgresql/index.vue
+++ b/frontend/src/views/database/postgresql/index.vue
@@ -155,7 +155,7 @@
                             </div>
                         </template>
                     </el-table-column>
-                    <el-table-column :label="$t('commons.table.description')" prop="description">
+                    <el-table-column :label="$t('commons.table.description')" prop="description" show-overflow-tooltip>
                         <template #default="{ row }">
                             <fu-input-rw-switch v-model="row.description" @blur="onChange(row)" />
                         </template>
@@ -486,6 +486,9 @@ const loadDBOptions = async () => {
     if (currentDB.value) {
         search();
     }
+    if (currentDB.value.from === 'remote') {
+        maskShow.value = false;
+    }
 };
 const onDelete = async (row: Database.PostgresqlDBInfo) => {
     let param = {
diff --git a/frontend/src/views/database/redis/index.vue b/frontend/src/views/database/redis/index.vue
index 7793b0936..fb5ae7d59 100644
--- a/frontend/src/views/database/redis/index.vue
+++ b/frontend/src/views/database/redis/index.vue
@@ -1,6 +1,6 @@
 <template>
     <div v-loading="loading">
-        <div class="app-status" style="margin-top: 20px" v-if="currentDB?.from === 'remote'">
+        <div class="app-status" style="margin-top: 20px" v-if="currentDB && currentDB.from === 'remote'">
             <el-card>
                 <div>
                     <el-tag style="float: left" effect="dark" type="success">Redis</el-tag>
@@ -14,13 +14,12 @@
                     :app-key="'redis'"
                     :app-name="appName"
                     v-model:loading="loading"
-                    v-model:mask-show="maskShow"
                     @before="onBefore"
                     @after="onAfter"
                     @setting="onSetting"
                 ></AppStatus>
             </template>
-            <template #search v-if="!isOnSetting && redisIsExist">
+            <template #search v-if="!isOnSetting && currentDB">
                 <el-select v-model="currentDBName" @change="changeDatabase()" class="p-w-200">
                     <template #prefix>{{ $t('commons.table.type') }}</template>
                     <el-option-group :label="$t('database.local')">
@@ -69,7 +68,6 @@
                 v-show="redisStatus === 'Running' && terminalShow"
             />
             <el-empty
-                :class="{ mask: maskShow }"
                 v-if="redisStatus !== 'Running' || (currentDB.from === 'remote' && !redisCliExist)"
                 :style="{ height: `calc(100vh - ${loadHeight()})`, 'background-color': '#000' }"
                 :description="loadErrMsg()"
@@ -89,12 +87,24 @@
             </div>
         </div>
 
-        <el-card
-            v-if="redisStatus != 'Running' && currentDB && !loading && maskShow && currentDB?.from === 'local'"
-            class="mask-prompt"
-        >
-            <span>{{ $t('commons.service.serviceNotStarted', ['Redis']) }}</span>
-        </el-card>
+        <div v-if="dbOptionsLocal.length === 0 && dbOptionsRemote.length === 0">
+            <LayoutContent :title="'Redis ' + $t('menu.database')" :divider="true">
+                <template #main>
+                    <div class="app-warn">
+                        <div>
+                            <span>{{ $t('app.checkInstalledWarn', ['Redis']) }}</span>
+                            <span @click="goRouter('app')">
+                                <el-icon class="ml-2"><Position /></el-icon>
+                                {{ $t('database.goInstall') }}
+                            </span>
+                            <div>
+                                <img src="@/assets/images/no_app.svg" />
+                            </div>
+                        </div>
+                    </div>
+                </template>
+            </LayoutContent>
+        </div>
 
         <Setting ref="settingRef" style="margin-top: 30px" />
         <Conn ref="connRef" @check-exist="reOpenTerminal" @close-terminal="closeTerminal(true)" />
@@ -139,7 +149,6 @@ import { getRedisCommandList } from '@/api/modules/host';
 const globalStore = GlobalStore();
 
 const loading = ref(false);
-const maskShow = ref(true);
 
 const terminalRef = ref<InstanceType<typeof Terminal> | null>(null);
 const settingRef = ref();
@@ -215,7 +224,6 @@ const changeDatabase = async () => {
     }
     for (const item of dbOptionsRemote.value) {
         if (item.database == currentDBName.value) {
-            maskShow.value = false;
             currentDB.value = item;
             break;
         }
diff --git a/frontend/src/views/setting/snapshot/index.vue b/frontend/src/views/setting/snapshot/index.vue
index cae3138b7..e4752bf06 100644
--- a/frontend/src/views/setting/snapshot/index.vue
+++ b/frontend/src/views/setting/snapshot/index.vue
@@ -89,7 +89,7 @@
                             </el-tag>
                         </template>
                     </el-table-column>
-                    <el-table-column :label="$t('commons.table.description')" prop="description">
+                    <el-table-column :label="$t('commons.table.description')" prop="description" show-overflow-tooltip>
                         <template #default="{ row }">
                             <fu-input-rw-switch v-model="row.description" @blur="onChange(row)" />
                         </template>
diff --git a/frontend/src/views/toolbox/ftp/index.vue b/frontend/src/views/toolbox/ftp/index.vue
index 3b28e5a48..00b269712 100644
--- a/frontend/src/views/toolbox/ftp/index.vue
+++ b/frontend/src/views/toolbox/ftp/index.vue
@@ -122,7 +122,11 @@
                                 <Tooltip @click="toFolder(row.path)" :text="row.path" />
                             </template>
                         </el-table-column>
-                        <el-table-column :label="$t('commons.table.description')" prop="description">
+                        <el-table-column
+                            :label="$t('commons.table.description')"
+                            prop="description"
+                            show-overflow-tooltip
+                        >
                             <template #default="{ row }">
                                 <fu-input-rw-switch v-model="row.description" @blur="onChange(row)" />
                             </template>