github
/
1Panel
mirror of https://github.com/1Panel-dev/1Panel
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix: 解决 PostgreSQL 页面切换的样式问题 (#5332)

pull/5335/head
ssongliu 2024-06-06 22:41:38 +08:00 committed by GitHub
parent 859ace71df
commit c394efa2ec
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend/app/service/database_mysql.go
View File

@ -240,7 +240,7 @@ func (u *MysqlService) DeleteCheck(req dto.MysqlDBDeleteCheck) ([]string, error)
}
}
} else {
apps, _ := appInstallResourceRepo.GetBy(appInstallResourceRepo.WithResourceId(db.ID))
apps, _ := appInstallResourceRepo.GetBy(appInstallResourceRepo.WithResourceId(db.ID), appRepo.WithKey(req.Type))
for _, app := range apps {
appInstall, _ := appInstallRepo.GetFirst(commonRepo.WithByID(app.AppInstallId))
if appInstall.ID != 0 {

2
backend/app/service/database_postgresql.go
View File

@ -266,7 +266,7 @@ func (u *PostgresqlService) DeleteCheck(req dto.PostgresqlDBDeleteCheck) ([]stri
}
}
} else {
apps, _ := appInstallResourceRepo.GetBy(appInstallResourceRepo.WithResourceId(db.ID))
apps, _ := appInstallResourceRepo.GetBy(appInstallResourceRepo.WithResourceId(db.ID), appRepo.WithKey(req.Type))
for _, app := range apps {
appInstall, _ := appInstallRepo.GetFirst(commonRepo.WithByID(app.AppInstallId))
if appInstall.ID != 0 {

3
frontend/src/views/database/mysql/index.vue
View File

@ -512,6 +512,9 @@ const loadDBOptions = async () => {
}
}
if (currentDB.value) {
if (currentDB.value.from === 'remote') {
maskShow.value = false;
}
globalStore.setCurrentDB('');
search();
return;

3
frontend/src/views/database/postgresql/index.vue
View File

@ -469,6 +469,9 @@ const loadDBOptions = async () => {
}
}
if (currentDB.value) {
if (currentDB.value.from === 'remote') {
maskShow.value = false;
}
globalStore.setCurrentDB('');
search();
return;