1Panel-dev/1Panel
1
1
Fork 0
mirror of https://github.com/1Panel-dev/1Panel.git synced 2025-10-14 01:17:26 +08:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: 解决 PostgreSQL 页面切换的样式问题 (#5332)
Some checks failed
Build Test / build-linux-binary (push) Failing after -5m4s
Details
Build / SonarCloud (push) Failing after 3s
Details
sync2gitee / repo-sync (push) Failing after 1s
Details

Browse source
This commit is contained in:
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;