From 5e27aa04dd1857ddae735d8fa306d43d149657cd Mon Sep 17 00:00:00 2001
From: ssongliu <73214554+ssongliu@users.noreply.github.com>
Date: Sat, 28 Oct 2023 11:11:31 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E7=BB=9F=E4=B8=80=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA=E6=A1=86=20(#2711)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/app/service/setting_clean.go          |  2 +-
 frontend/src/components/backup/index.vue      | 20 ++++++++++++++++---
 frontend/src/components/upload/index.vue      | 20 ++++++++++++++++---
 .../redis/setting/persistence/index.vue       | 19 +++++++++++++++---
 .../views/setting/backup-account/index.vue    | 18 ++++++++++++++---
 5 files changed, 66 insertions(+), 13 deletions(-)

diff --git a/backend/app/service/setting_clean.go b/backend/app/service/setting_clean.go
index be557615d..06b3884bf 100644
--- a/backend/app/service/setting_clean.go
+++ b/backend/app/service/setting_clean.go
@@ -327,8 +327,8 @@ func (u *SettingService) SystemCleanForCronjob() (string, error) {
 		}
 	}
 	timeNow := time.Now().Format("2006-01-02 15:04:05")
-	logs += fmt.Sprintf("%s: total clean: %s, total count: %d", timeNow, common.LoadSizeUnit2F(float64(size)), fileCount)
 	dropFileOrDirWithLog(path.Join(global.CONF.System.BaseDir, dockerLogPath), &logs, &size, &fileCount)
+	logs += fmt.Sprintf("\n%s: total clean: %s, total count: %d", timeNow, common.LoadSizeUnit2F(float64(size)), fileCount)
 
 	_ = settingRepo.Update("LastCleanTime", timeNow)
 	_ = settingRepo.Update("LastCleanSize", fmt.Sprintf("%v", size))
diff --git a/frontend/src/components/backup/index.vue b/frontend/src/components/backup/index.vue
index b510f1885..1d563b1da 100644
--- a/frontend/src/components/backup/index.vue
+++ b/frontend/src/components/backup/index.vue
@@ -44,13 +44,15 @@
                 <fu-table-operations width="230px" :buttons="buttons" :label="$t('commons.table.operate')" fix />
             </ComplexTable>
         </el-drawer>
+
+        <OpDialog ref="opRef" @search="search" />
     </div>
 </template>
 
 <script lang="ts" setup>
 import { reactive, ref } from 'vue';
+import OpDialog from '@/components/del-dialog/index.vue';
 import { dateFormat, downloadFile } from '@/utils/util';
-import { useDeleteData } from '@/hooks/use-delete-data';
 import { handleBackup, handleRecover } from '@/api/modules/setting';
 import i18n from '@/lang';
 import DrawerHeader from '@/components/drawer-header/index.vue';
@@ -60,6 +62,7 @@ import { MsgSuccess } from '@/utils/message';
 
 const selects = ref<any>([]);
 const loading = ref();
+const opRef = ref();
 
 const data = ref();
 const paginationConfig = reactive({
@@ -153,15 +156,26 @@ const onDownload = async (row: Backup.RecordInfo) => {
 
 const onBatchDelete = async (row: Backup.RecordInfo | null) => {
     let ids: Array<number> = [];
+    let names = [];
     if (row) {
         ids.push(row.id);
+        names.push(row.fileName);
     } else {
         selects.value.forEach((item: Backup.RecordInfo) => {
             ids.push(item.id);
+            names.push(item.fileName);
         });
     }
-    await useDeleteData(deleteBackupRecord, { ids: ids }, 'commons.msg.delete');
-    search();
+    opRef.value.acceptParams({
+        names: names,
+        title: i18n.global.t('commons.button.delete'),
+        api: deleteBackupRecord,
+        msg: i18n.global.t('commons.msg.operatorHelper', [
+            i18n.global.t('commons.button.backup'),
+            i18n.global.t('commons.button.delete'),
+        ]),
+        params: { ids: ids },
+    });
 };
 
 const buttons = [
diff --git a/frontend/src/components/upload/index.vue b/frontend/src/components/upload/index.vue
index c7c400f90..89fb73954 100644
--- a/frontend/src/components/upload/index.vue
+++ b/frontend/src/components/upload/index.vue
@@ -78,13 +78,15 @@
                 </ComplexTable>
             </div>
         </el-drawer>
+
+        <OpDialog ref="opRef" @search="search" />
     </div>
 </template>
 
 <script lang="ts" setup>
 import { reactive, ref } from 'vue';
 import { computeSize } from '@/utils/util';
-import { useDeleteData } from '@/hooks/use-delete-data';
+import OpDialog from '@/components/del-dialog/index.vue';
 import { handleRecoverByUpload } from '@/api/modules/setting';
 import i18n from '@/lang';
 import { UploadFile, UploadFiles, UploadInstance } from 'element-plus';
@@ -99,6 +101,7 @@ const isUpload = ref();
 const uploadPercent = ref<number>(0);
 const selects = ref<any>([]);
 const baseDir = ref();
+const opRef = ref();
 
 const data = ref();
 const title = ref();
@@ -279,15 +282,26 @@ const submitUpload = async (file: any) => {
 
 const onBatchDelete = async (row: File.File | null) => {
     let files: Array<string> = [];
+    let names: Array<string> = [];
     if (row) {
         files.push(baseDir.value + row.name);
+        names.push(row.name);
     } else {
         selects.value.forEach((item: File.File) => {
             files.push(baseDir.value + item.name);
+            names.push(item.name);
         });
     }
-    await useDeleteData(BatchDeleteFile, { paths: files, isDir: false }, 'commons.msg.delete');
-    search();
+    opRef.value.acceptParams({
+        title: i18n.global.t('commons.button.delete'),
+        names: names,
+        msg: i18n.global.t('commons.msg.operatorHelper', [
+            i18n.global.t('commons.button.import'),
+            i18n.global.t('commons.button.delete'),
+        ]),
+        api: BatchDeleteFile,
+        params: { paths: files, isDir: false },
+    });
 };
 
 const buttons = [
diff --git a/frontend/src/views/database/redis/setting/persistence/index.vue b/frontend/src/views/database/redis/setting/persistence/index.vue
index 636049c63..972b2cba9 100644
--- a/frontend/src/views/database/redis/setting/persistence/index.vue
+++ b/frontend/src/views/database/redis/setting/persistence/index.vue
@@ -107,11 +107,13 @@
             </ComplexTable>
         </el-card>
 
+        <OpDialog ref="opRef" @search="search" />
         <ConfirmDialog ref="confirmDialogRef" @confirm="onRecover"></ConfirmDialog>
     </div>
 </template>
 
 <script lang="ts" setup>
+import OpDialog from '@/components/del-dialog/index.vue';
 import ConfirmDialog from '@/components/confirm-dialog/index.vue';
 import { Database } from '@/api/interface/database';
 import { redisPersistenceConf, updateRedisPersistenceConf } from '@/api/modules/database';
@@ -121,7 +123,6 @@ import { dateFormat } from '@/utils/util';
 import i18n from '@/lang';
 import { FormInstance } from 'element-plus';
 import { reactive, ref } from 'vue';
-import { useDeleteData } from '@/hooks/use-delete-data';
 import { MsgInfo, MsgSuccess } from '@/utils/message';
 import { Backup } from '@/api/interface/backup';
 
@@ -139,6 +140,7 @@ const rules = reactive({
     appendfsync: [Rules.requiredSelect],
 });
 const formRef = ref<FormInstance>();
+const opRef = ref();
 
 interface DialogProps {
     status: string;
@@ -220,15 +222,26 @@ const onRecover = async () => {
 
 const onBatchDelete = async (row: Backup.RecordInfo | null) => {
     let ids: Array<number> = [];
+    let names: Array<string> = [];
     if (row) {
         ids.push(row.id);
+        names.push(row.fileName);
     } else {
         selects.value.forEach((item: Backup.RecordInfo) => {
             ids.push(item.id);
+            names.push(item.fileName);
         });
     }
-    await useDeleteData(deleteBackupRecord, { ids: ids }, 'commons.msg.delete');
-    search();
+    opRef.value.acceptParams({
+        title: i18n.global.t('commons.button.delete'),
+        names: names,
+        msg: i18n.global.t('commons.msg.operatorHelper', [
+            i18n.global.t('commons.button.backup'),
+            i18n.global.t('commons.button.delete'),
+        ]),
+        api: deleteBackupRecord,
+        params: { ids: ids },
+    });
 };
 
 const buttons = [
diff --git a/frontend/src/views/setting/backup-account/index.vue b/frontend/src/views/setting/backup-account/index.vue
index 496c7f32a..f0b508abe 100644
--- a/frontend/src/views/setting/backup-account/index.vue
+++ b/frontend/src/views/setting/backup-account/index.vue
@@ -368,19 +368,23 @@
                 </el-row>
             </template>
         </LayoutContent>
+
+        <OpDialog ref="opRef" @search="search" />
         <DialogOperate ref="dialogRef" @search="search" />
     </div>
 </template>
 <script setup lang="ts">
 import { dateFormat } from '@/utils/util';
 import { onMounted, ref } from 'vue';
+import OpDialog from '@/components/del-dialog/index.vue';
 import { getBackupList, deleteBackup } from '@/api/modules/setting';
 import DialogOperate from '@/views/setting/backup-account/operate/index.vue';
 import { Backup } from '@/api/interface/backup';
 import { ElForm } from 'element-plus';
-import { useDeleteData } from '@/hooks/use-delete-data';
+import i18n from '@/lang';
 
 const data = ref();
+const opRef = ref();
 const reflash = ref(false);
 const localData = ref<Backup.BackupInfo>({
     id: 0,
@@ -531,8 +535,16 @@ const search = async () => {
 };
 
 const onDelete = async (row: Backup.BackupInfo) => {
-    await useDeleteData(deleteBackup, { id: row.id }, 'commons.msg.delete');
-    search();
+    opRef.value.acceptParams({
+        title: i18n.global.t('commons.button.delete'),
+        names: [row.type],
+        msg: i18n.global.t('commons.msg.operatorHelper', [
+            i18n.global.t('setting.backupAccount'),
+            i18n.global.t('commons.button.delete'),
+        ]),
+        api: deleteBackup,
+        params: { id: row.id },
+    });
 };
 
 const dialogRef = ref();