diff --git a/agent/app/service/file.go b/agent/app/service/file.go
index bc2b99b10..7abef06dd 100644
--- a/agent/app/service/file.go
+++ b/agent/app/service/file.go
@@ -223,7 +223,7 @@ func (f *FileService) Delete(op request.FileDelete) error {
}
fo := files.NewFileOp()
recycleBinStatus, _ := settingRepo.Get(settingRepo.WithByKey("FileRecycleBin"))
- if recycleBinStatus.Value == "disable" {
+ if recycleBinStatus.Value == "Disable" {
op.ForceDelete = true
}
if op.ForceDelete {
diff --git a/frontend/src/views/host/file-management/delete/index.vue b/frontend/src/views/host/file-management/delete/index.vue
index bdadf5735..a8034ab53 100644
--- a/frontend/src/views/host/file-management/delete/index.vue
+++ b/frontend/src/views/host/file-management/delete/index.vue
@@ -6,15 +6,15 @@
- {{ $t('file.deleteHelper') }}
+ {{ $t('file.deleteHelper') }}
{{ $t('file.deleteHelper2') }}
-
+
{{ $t('file.forceDeleteHelper') }}
@@ -67,7 +67,7 @@ const files = ref();
const loading = ref(false);
const em = defineEmits(['close']);
const forceDelete = ref(false);
-const recycleStatus = ref('enable');
+const recycleStatus = ref('Enable');
const acceptParams = (props: File.File[]) => {
getStatus();
@@ -80,7 +80,7 @@ const getStatus = async () => {
try {
const res = await getRecycleStatus();
recycleStatus.value = res.data;
- if (recycleStatus.value === 'disable') {
+ if (recycleStatus.value === 'Disable') {
forceDelete.value = true;
}
} catch (error) {}
diff --git a/frontend/src/views/host/file-management/detail/index.vue b/frontend/src/views/host/file-management/detail/index.vue
index 8b3723f4a..27dab26ac 100644
--- a/frontend/src/views/host/file-management/detail/index.vue
+++ b/frontend/src/views/host/file-management/detail/index.vue
@@ -29,10 +29,10 @@
{{ data.mode }}
- {{ data.user }}
+ {{ data.user ? data.user : '-' }} ({{ data.uid }})
- {{ data.group }}
+ {{ data.group ? data.group : '-' }} ({{ data.gid }})
{{ dateFormatSimple(data.modTime) }}
diff --git a/frontend/src/views/host/file-management/index.vue b/frontend/src/views/host/file-management/index.vue
index 6b32cbf40..daad858a2 100644
--- a/frontend/src/views/host/file-management/index.vue
+++ b/frontend/src/views/host/file-management/index.vue
@@ -1026,7 +1026,7 @@ onMounted(() => {
}
.favorite-item {
- max-height: 650px;
+ height: 50vh;
overflow: auto;
}
diff --git a/frontend/src/views/host/file-management/recycle-bin/index.vue b/frontend/src/views/host/file-management/recycle-bin/index.vue
index a16ebbd48..adbef7d83 100644
--- a/frontend/src/views/host/file-management/recycle-bin/index.vue
+++ b/frontend/src/views/host/file-management/recycle-bin/index.vue
@@ -115,7 +115,9 @@ const changeStatus = async () => {
try {
loading.value = true;
await updateAgentSetting({ key: 'FileRecycleBin', value: status.value });
- MsgSuccess(i18n.global.t('file.fileRecycleBinMsg', [i18n.global.t('commons.button.' + status.value)]));
+ MsgSuccess(
+ i18n.global.t('file.fileRecycleBinMsg', [i18n.global.t('commons.button.' + status.value.toLowerCase())]),
+ );
loading.value = false;
} catch (error) {}
};