From b6fc1efd6a7e819d84041a1bdb1cef0fd8306d9f Mon Sep 17 00:00:00 2001 From: zhengkunwang <31820853+zhengkunwang223@users.noreply.github.com> Date: Tue, 31 Oct 2023 20:45:57 +0800 Subject: [PATCH] =?UTF-8?q?style:=20=E4=BF=AE=E6=94=B9=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E9=83=A8=E5=88=86=E6=A0=B7=E5=BC=8F=20(#2741?= =?UTF-8?q?)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/lang/modules/en.ts | 5 +- frontend/src/lang/modules/tw.ts | 5 +- frontend/src/lang/modules/zh.ts | 5 +- .../src/views/host/file-management/index.vue | 5 +- .../recycle-bin/delete/index.vue | 89 +++++++++++++++++++ .../file-management/recycle-bin/index.vue | 38 +++----- 6 files changed, 115 insertions(+), 32 deletions(-) create mode 100644 frontend/src/views/host/file-management/recycle-bin/delete/index.vue diff --git a/frontend/src/lang/modules/en.ts b/frontend/src/lang/modules/en.ts index e776d435d..0c528ce0e 100644 --- a/frontend/src/lang/modules/en.ts +++ b/frontend/src/lang/modules/en.ts @@ -966,20 +966,21 @@ const message = { unsupportType: 'Unsupported file type', deleteHelper: 'Are you sure you want to delete the following files? By default, it will enter the recycle bin after deletion', - fileHeper: 'Note: 1. Sorting is not supported after searching 2. Folders are not supported by size sorting', + fileHeper: 'Note: 1. Search results do not support sorting. 2. Folders cannot be sorted by size.', forceDeleteHelper: 'Permanently delete the file (without entering the recycle bin, delete it directly)', recycleBin: 'Recycle bin', sourcePath: 'Original path', deleteTime: 'Delete time', reduce: 'Reduction', reduceHelper: - 'Restore the file to its original path. If a file or directory with the same name exists at the original address of the file, it will be overwritten. Do you want to continue?', + 'If a file or directory with the same name exists in the original path, it will be overwritten. Do you want to continue?', clearRecycleBin: 'Clear the recycle bin', clearRecycleBinHelper: 'Do you want to clear the recycle bin?', favorite: 'favorites', removeFavorite: 'Remove from favorites?', addFavorite: 'Add to favorites', clearList: 'Clear list', + deleteRecycleHelper: 'Are you sure you want to permanently delete the following files?', }, ssh: { autoStart: 'Auto Start', diff --git a/frontend/src/lang/modules/tw.ts b/frontend/src/lang/modules/tw.ts index 30308f8b6..ec2442b29 100644 --- a/frontend/src/lang/modules/tw.ts +++ b/frontend/src/lang/modules/tw.ts @@ -927,19 +927,20 @@ const message = { currentSelect: '當前選中: ', unsupportType: '不支持的文件類型', deleteHelper: '確定刪除所選檔案？ 預設刪除之後將進入回收站？', - fileHeper: '注意：1.搜尋之後不支援排序 2.依大小排序不支援資料夾', + fileHeper: '注意：1. 搜尋結果不支援排序功能 2. 資料夾無法依大小排序。', forceDeleteHelper: '永久刪除檔案（不進入回收站，直接刪除）', recycleBin: '回收站', sourcePath: '原路徑', deleteTime: '刪除時間', reduce: '還原', - reduceHelper: '恢復檔案到原路徑，如果檔案原始位址，存在同名檔案或目錄，將會覆蓋，是否繼續？ ', + reduceHelper: '如果原路徑存在同名檔案或目錄，將會被覆蓋，是否繼續？', clearRecycleBin: '清空回收站', clearRecycleBinHelper: '是否清空回收站？', favorite: '收藏夾', removeFavorite: '是否從收藏夾移出？', addFavorite: '加入收藏夾', clearList: '清空列表', + deleteRecycleHelper: '確定永久刪除以下文件？', }, ssh: { autoStart: '開機自啟', diff --git a/frontend/src/lang/modules/zh.ts b/frontend/src/lang/modules/zh.ts index 5bdc0791d..92f06c3fd 100644 --- a/frontend/src/lang/modules/zh.ts +++ b/frontend/src/lang/modules/zh.ts @@ -928,19 +928,20 @@ const message = { currentSelect: '当前选中: ', unsupportType: '不支持的文件类型', deleteHelper: '确定删除所选文件？ 默认删除之后将进入回收站', - fileHeper: '注意：1.搜索之后不支持排序 2.按大小排序不支持文件夹', + fileHeper: '注意：1. 搜索结果不支持排序功能 2. 文件夹无法按大小排序。', forceDeleteHelper: '永久删除文件（不进入回收站，直接删除）', recycleBin: '回收站', sourcePath: '原路径', deleteTime: '删除时间', reduce: '还原', - reduceHelper: '恢复文件到原路径，如果文件原地址，存在同名文件或目录，将会覆盖，是否继续？', + reduceHelper: '如果原路径存在同名文件或目录，将会被覆盖，是否继续？', clearRecycleBin: '清空回收站', clearRecycleBinHelper: '是否清空回收站？', favorite: '收藏夹', removeFavorite: '是否从收藏夹移出？', addFavorite: '加入收藏夹子', clearList: '清空列表', + deleteRecycleHelper: '确定永久删除以下文件？', }, ssh: { autoStart: '开机自启', diff --git a/frontend/src/views/host/file-management/index.vue b/frontend/src/views/host/file-management/index.vue index 871f965b4..2e45a743d 100644 --- a/frontend/src/views/host/file-management/index.vue +++ b/frontend/src/views/host/file-management/index.vue @@ -195,7 +195,8 @@ v-if="row.favoriteID > 0" link type="warning" - :icon="Star" + size="large" + :icon="StarFilled" @click="removeFavorite(row.favoriteID)" >
@@ -293,7 +294,7 @@ import { SearchFavorite, } from '@/api/modules/files'; import { computeSize, dateFormat, downloadFile, getIcon, getRandomStr } from '@/utils/util'; -import { Delete, Star } from '@element-plus/icons-vue'; +import { Delete, StarFilled, Star } from '@element-plus/icons-vue'; import { File } from '@/api/interface/file'; import { Mimetypes, Languages } from '@/global/mimetype'; import { useRouter } from 'vue-router'; diff --git a/frontend/src/views/host/file-management/recycle-bin/delete/index.vue b/frontend/src/views/host/file-management/recycle-bin/delete/index.vue new file mode 100644 index 000000000..0998c2a98 --- /dev/null +++ b/frontend/src/views/host/file-management/recycle-bin/delete/index.vue @@ -0,0 +1,89 @@ + + + + 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 24453e395..40711a336 100644 --- a/frontend/src/views/host/file-management/recycle-bin/index.vue +++ b/frontend/src/views/host/file-management/recycle-bin/index.vue @@ -6,6 +6,9 @@ {{ $t('file.clearRecycleBin') }} + + {{ $t('commons.button.delete') }} + +