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

fix(file): fix issue with file recycle bin delete failed (#8152)

Browse source
This commit is contained in:
zhengkunwang 2025-03-14 14:49:08 +08:00 • committed by GitHub
parent 35f384a0f6
commit 7eeca73337
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -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 {

10
frontend/src/views/host/file-management/delete/index.vue
View file

@ -6,15 +6,15 @@
<el-alert
class="mt-2"
:show-icon="true"
:type="recycleStatus === 'enable' ? 'warning' : 'error'"
:type="recycleStatus === 'Enable' ? 'warning' : 'error'"
:closable="false"
>
<div class="delete-warn">
<span v-if="recycleStatus === 'enable'">{{ $t('file.deleteHelper') }}</span>
<span v-if="recycleStatus === 'Enable'">{{ $t('file.deleteHelper') }}</span>
<span v-else>{{ $t('file.deleteHelper2') }}</span>
</div>
</el-alert>
<div class="mt-4" v-if="recycleStatus === 'enable'">
<div class="mt-4" v-if="recycleStatus === 'Enable'">
<el-checkbox v-model="forceDelete" class="force-delete">
<span>{{ $t('file.forceDeleteHelper') }}</span>
</el-checkbox>
@ -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) {}

4
frontend/src/views/host/file-management/detail/index.vue
View file

@ -29,10 +29,10 @@
{{ data.mode }}
</el-descriptions-item>
<el-descriptions-item label-class-name="detail-label" :label="$t('commons.table.user')">
{{ data.user }}
{{ data.user ? data.user : '-' }} ({{ data.uid }})
</el-descriptions-item>
<el-descriptions-item label-class-name="detail-label" :label="$t('file.group')">
{{ data.group }}
{{ data.group ? data.group : '-' }} ({{ data.gid }})
</el-descriptions-item>
<el-descriptions-item label-class-name="detail-label" :label="$t('commons.table.updatedAt')">
{{ dateFormatSimple(data.modTime) }}

2
frontend/src/views/host/file-management/index.vue
View file

@ -1026,7 +1026,7 @@ onMounted(() => {
}
.favorite-item {
max-height: 650px;
height: 50vh;
overflow: auto;
}

4
frontend/src/views/host/file-management/recycle-bin/index.vue
View file

@ -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) {}
};