diff --git a/backend/app/service/file.go b/backend/app/service/file.go index 2d7b20264..ecefd04c8 100644 --- a/backend/app/service/file.go +++ b/backend/app/service/file.go @@ -140,7 +140,10 @@ func (f *FileService) Delete(op request.FileDelete) error { return fo.DeleteFile(op.Path) } } - return NewIRecycleBinService().Create(request.RecycleBinCreate{SourcePath: op.Path}) + if err := NewIRecycleBinService().Create(request.RecycleBinCreate{SourcePath: op.Path}); err != nil { + return err + } + return favoriteRepo.Delete(favoriteRepo.WithByPath(op.Path)) } func (f *FileService) BatchDelete(op request.FileBatchDelete) error { diff --git a/frontend/src/api/interface/file.ts b/frontend/src/api/interface/file.ts index e22d73ae0..768ce5e34 100644 --- a/frontend/src/api/interface/file.ts +++ b/frontend/src/api/interface/file.ts @@ -168,5 +168,6 @@ export namespace File { path: string; isDir: boolean; isTxt: boolean; + name: string; } } diff --git a/frontend/src/components/compose-log/index.vue b/frontend/src/components/compose-log/index.vue index be2541b96..b4dc6d141 100644 --- a/frontend/src/components/compose-log/index.vue +++ b/frontend/src/components/compose-log/index.vue @@ -37,7 +37,7 @@ :placeholder="$t('commons.msg.noneData')" :indent-with-tab="true" :tabSize="4" - style="margin-top: 10px; height: calc(100vh - 375px)" + style="margin-top: 10px; height: calc(100vh - 200px)" :lineWrapping="true" :matchBrackets="true" theme="cobalt" diff --git a/frontend/src/views/host/file-management/index.vue b/frontend/src/views/host/file-management/index.vue index b40c4c807..81e28ebfe 100644 --- a/frontend/src/views/host/file-management/index.vue +++ b/frontend/src/views/host/file-management/index.vue @@ -98,9 +98,35 @@