完成回收站页面

src/api/recycleBin.js

@@ -1,21 +1,13 @@
 import { getAction, deleteAction, putAction, postAction, httpAction,uploadAction } from '@/api/manage'
 
 //上传文件目录管理
-const downloadFile = (params)=>httpAction("/file/downloadFile",params);
-const filePreview = (params)=>getAction("/file/filePreview",params);
-const logicDeleteFile = (params)=>deleteAction("/file/logicDeleteFile",params);
-const pageList = (params)=>getAction("/file/pageList",params);
-const uoloadFile = (params)=>uploadAction("/file/uoloadFile",params);
-const verifyFileExist = (params)=>getAction("/file/verifyFileExist",params);
-const fullTextSearching = (params)=>getAction("/file/fullTextSearching",params);
+const getlist = (params)=>getAction("/recycleBin/list",params);
+const deleteFile = (params)=>deleteAction("/recycleBin/deleteFile",params);
+const recoverFile = (params)=>putAction("/recycleBin/recoverFile",params);
 
 
 export {
-    downloadFile,
-    filePreview,
-    logicDeleteFile,
-    pageList,
-    uoloadFile,
-    verifyFileExist,
-    fullTextSearching
+    getlist,
+    deleteFile,
+    recoverFile
 }

src/views/fileManage/recycling.vue

@@ -6,13 +6,8 @@
       <a-form layout="inline" @keyup.enter.native="searchQuery">
         <a-row :gutter="24">
           <a-col :md="6" :sm="8">
-            <a-form-item label="模式名称">
-              <a-input placeholder="请输入搜索关键词" v-model="queryParam.schemaName"></a-input>
-            </a-form-item>
-          </a-col>
-          <a-col :md="6" :sm="8">
-            <a-form-item label="表名">
-              <a-input placeholder="请输入搜索关键词" v-model="queryParam.tableName"></a-input>
+            <a-form-item label="文件名称">
+              <a-input placeholder="请输入搜索关键词" v-model="queryParam.fileName"></a-input>
             </a-form-item>
           </a-col>
           <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
@@ -42,10 +37,12 @@
 
         <!-- 字符串超长截取省略号显示-->
         <span slot="action" slot-scope="text, record">
-          <a @click="processFile(record)" v-has="'cont:btn'" >解析</a>
+          <a-popconfirm title="确定恢复吗?" @confirm="() => processFile(record.id)">
+            <a>恢复文件</a>
+          </a-popconfirm>
           <a-divider type="vertical" v-has="'cont:btn'" />
           <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
-            <a>删除</a>
+            <a>删除文件</a>
           </a-popconfirm>
         </span>
       </a-table>
@@ -59,7 +56,9 @@
 
 <script>
   import uploadModal from './modules/uploadModal'
-  import { getFileLinkInfo,processFile,fileDataLinkDelete,isDataLinkFileParsed } from '@/api/fileDataLink'
+  import { getlist,
+    deleteFile,
+    recoverFile } from '@/api/recycleBin'
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
   import JEllipsis from "@/components/jeecg/JEllipsis";
   import {deleteAction, postAction} from '@/api/manage'
@@ -81,62 +80,44 @@
         queryParam: {
           pageNum :1,
           pageSize:20,
-          schemaName:'',
-          tableName:'',
-          dataLinkType:'1'
+          fileName:'',
         },
         columns: [
         {
-            title: '#',
-            dataIndex: '',
-            key:'id',
-            width:60,
-            align:"id",
-            customRender:function (t,r,index) {
-              return parseInt(index)+1;
-            }
+            title: "序号",
+            width: 70,
+            customRender: (text, record, index) => `${index + 1}`,
         },
         {
             title: '文件名称',
-            align:"fileName",
-            dataIndex: 'fileName',
-          },
-          {
-            title: '创建时间',
-            align:"createTime",
-            dataIndex: 'createTime'
-          },
-          {
-            title: '模式名称',
-            align:"schemaName",
-            dataIndex: 'schemaName'
-          },
-          {
-            title: '表名',
-            align:"tableName",
-            dataIndex: 'tableName',
-          },
-          {
-            title: '解析进度',
             align: "center",
-            dataIndex: 'percent',
+            dataIndex: 'fileName',
+            width: 120
         },
         {
-            title: '解析时间开始',
-            align:"analyzeStartTime",
-            dataIndex: 'analyzeStartTime',
+            title: '文件后缀',
+            align: "center",
+            width: 100,
+            dataIndex: 'fileSuffix',
         },
         {
-            title: '解析时间完成',
-            align:"analyzeEndTime",
-            dataIndex: 'analyzeEndTime',
+            title: '文件大小',
+            align: "center",
+            width: 120,
+            dataIndex: 'fileSize'
+        },
+        {
+            title: '删除时间',
+            align: "center",
+            width: 100,
+            dataIndex: 'createTime'
         },
         {
             title: '操作',
             dataIndex: 'action',
-            align:"center",
-            width:180,
             scopedSlots: { customRender: 'action' },
+            align: "center",
+            width: 170
         }
         ]
       }
@@ -159,7 +140,7 @@
         this.loadData();
       },
       loadData() {
-        getFileLinkInfo(this.queryParam).then((res) => {
+        getlist(this.queryParam).then((res) => {
             if (res.success) {
                 this.dataSource = res.result.records;
                 if(res.result.total)
@@ -173,7 +154,7 @@
       },
       handleDelete: function (id) {
         var that = this;
-        deleteAction("/fileDataLink/delete?id="+id,{}).then((res) => {
+        deleteFile({id:id}).then((res) => {
             if (res.success) {
                 this.$message.success(res.message);
                 that.loadData();
@@ -184,7 +165,7 @@
       },
       processFile: function (record) {
         var that = this;
-        postAction("/fileDataLink/processFile?dataLinkId="+record.id,{}).then((res) => {
+        recoverFile({id:record.id}).then((res) => {
             if (res.success) {
                 this.$message.success(res.message);
                 that.loadData();