merge

src/views/system/recycleBin/index.vue

@@ -1,18 +1,22 @@
 <template>
   <div class="gl-page-content setting-page">
-    <BaseTable
+    <FileTable
       tableName="RECYCLE_BIN_FILE"
       ref="baseTableRef"
       fullHeight
       showCheckbox
       :api="listRecycleBinApi"
       :actionList="actionList"
+      :default-actions="[]"
       @checkbox-all="checkboxChangeFun"
       @checkbox-change="checkboxChangeFun"
     >
       <template #objectKey="{ row }">
         {{ formatObjectKey(row.objectKey) }}
       </template>
+      <template #fileSize="{ row }">
+        {{ row.fileSize ? formatFileSize(row.fileSize) : '--' }}
+      </template>
       <template #leftOptions>
         <el-button type="default" :loading="deleteAllLoading" icon="delete" @click="clearAll"
           >清空回收站</el-button
@@ -34,14 +38,15 @@
           还原选定文件</el-button
         >
       </template>
-    </BaseTable>
+    </FileTable>
   </div>
 </template>
 
 <script setup lang="ts">
 import { ref } from 'vue';
 import BaseTable from '@/components/common/table/baseTable.vue';
-// import FileTable from '@/components/common/fileTable/index.vue';
+import FileTable from '@/components/common/fileTable/index.vue';
+import { formatFileSize } from '@/utils/file';
 import {
   listRecycleBinApi,
   restoreFromRecycleApi,