From 4504a8b18848d7d0d1afa1dd456cf211b149f5c4 Mon Sep 17 00:00:00 2001
From: John Bro <42930107+john1298308460@users.noreply.github.com>
Date: Fri, 28 Jun 2024 13:44:58 +0800
Subject: [PATCH] =?UTF-8?q?fit:=20=E4=BF=AE=E5=A4=8D=E6=A6=82=E8=A7=88?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93=E6=95=B0=E9=87=8F=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF=E9=97=AE=E9=A2=98=20(#5598)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Refs #5280
---
 backend/app/service/dashboard.go  | 8 ++++++--
 frontend/src/lang/modules/en.ts   | 1 +
 frontend/src/lang/modules/tw.ts   | 1 +
 frontend/src/lang/modules/zh.ts   | 1 +
 frontend/src/views/home/index.vue | 2 +-
 5 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/backend/app/service/dashboard.go b/backend/app/service/dashboard.go
index c7bebff30..092ea8060 100644
--- a/backend/app/service/dashboard.go
+++ b/backend/app/service/dashboard.go
@@ -99,11 +99,15 @@ func (u *DashboardService) LoadBaseInfo(ioOption string, netOption string) (*dto
 		return nil, err
 	}
 	baseInfo.AppInstalledNumber = len(appInstall)
-	dbs, err := mysqlRepo.List()
+	postgresqlDbs, err := postgresqlRepo.List()
 	if err != nil {
 		return nil, err
 	}
-	baseInfo.DatabaseNumber = len(dbs)
+	mysqlDbs, err := mysqlRepo.List()
+	if err != nil {
+		return nil, err
+	}
+	baseInfo.DatabaseNumber = len(mysqlDbs) + len(postgresqlDbs)
 	website, err := websiteRepo.GetBy()
 	if err != nil {
 		return nil, err
diff --git a/frontend/src/lang/modules/en.ts b/frontend/src/lang/modules/en.ts
index d6f35cdaf..7fe1850e8 100644
--- a/frontend/src/lang/modules/en.ts
+++ b/frontend/src/lang/modules/en.ts
@@ -377,6 +377,7 @@ const message = {
         logout: 'Logout',
     },
     database: {
+        all: 'All',
         manage: 'Management',
         database: 'database',
         deleteBackupHelper: 'Delete database backups simultaneously',
diff --git a/frontend/src/lang/modules/tw.ts b/frontend/src/lang/modules/tw.ts
index d4a04cdbb..d91d9141e 100644
--- a/frontend/src/lang/modules/tw.ts
+++ b/frontend/src/lang/modules/tw.ts
@@ -370,6 +370,7 @@ const message = {
         logout: '退出登錄',
     },
     database: {
+        all: '全部',
         manage: '管理',
         database: '數據庫',
         deleteBackupHelper: '同時刪除數據庫備份',
diff --git a/frontend/src/lang/modules/zh.ts b/frontend/src/lang/modules/zh.ts
index f16581ec9..1d382b60c 100644
--- a/frontend/src/lang/modules/zh.ts
+++ b/frontend/src/lang/modules/zh.ts
@@ -371,6 +371,7 @@ const message = {
         logout: '退出登录',
     },
     database: {
+        all: '全部',
         manage: '管理',
         database: '数据库',
         deleteBackupHelper: '同时删除数据库备份',
diff --git a/frontend/src/views/home/index.vue b/frontend/src/views/home/index.vue
index 91a3ce63c..3e71bdedb 100644
--- a/frontend/src/views/home/index.vue
+++ b/frontend/src/views/home/index.vue
@@ -53,7 +53,7 @@
                                     </div>
                                 </el-col>
                                 <el-col :span="6">
-                                    <span>{{ $t('menu.database') }}</span>
+                                    <span>{{ $t('menu.database') }} - {{ $t('database.all') }}</span>
                                     <div class="count">
                                         <span @click="goRouter('/databases')">{{ baseInfo?.databaseNumber }}</span>
                                     </div>