gh_mirrors/1Panel
1
0
Fork 0
mirror of https://github.com/1Panel-dev/1Panel.git synced 2025-02-28 19:14:13 +08:00
Code

fix: Fixed the issue with incorrect routing for quick jump during app… (#7916)

Browse Source
This commit is contained in:
zhengkunwang 2025-02-19 18:16:35 +08:00 committed by GitHub
parent 736200bd57
commit 48abf71b29
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
agent/app/service/file.go
View File

@ -466,7 +466,7 @@ func (f *FileService) ReadLogByLine(req request.FileReadByLineReq) (*response.Fi
if req.TaskID != "" { if req.TaskID != "" {
opts = append(opts, taskRepo.WithByID(req.TaskID)) opts = append(opts, taskRepo.WithByID(req.TaskID))
} else { } else {
opts = append(opts, repo.WithByType(req.TaskType), taskRepo.WithOperate(req.TaskOperate), taskRepo.WithResourceID(req.ID)) opts = append(opts, repo.WithByType(req.TaskType), taskRepo.WithOperate(req.TaskOperate), taskRepo.WithResourceID(req.ResourceID))
} }
taskModel, err := taskRepo.GetFirst(opts...) taskModel, err := taskRepo.GetFirst(opts...)
if err != nil { if err != nil {

5
frontend/src/routers/index.ts
View File

@ -39,9 +39,12 @@ router.beforeEach((to, from, next) => {
return; return;
} }
if (to.path === '/apps/all' && to.query.install != undefined) {
return next();
}
const activeMenuKey = 'cachedRoute' + (to.meta.activeMenu || ''); const activeMenuKey = 'cachedRoute' + (to.meta.activeMenu || '');
const cachedRoute = localStorage.getItem(activeMenuKey); const cachedRoute = localStorage.getItem(activeMenuKey);
if ( if (
to.meta.activeMenu && to.meta.activeMenu &&
to.meta.activeMenu != from.meta.activeMenu && to.meta.activeMenu != from.meta.activeMenu &&