From 90b120c68ab8f0b761d435423846164526f55971 Mon Sep 17 00:00:00 2001 From: zhengzhou Date: Fri, 21 May 2021 16:36:16 +0800 Subject: [PATCH] update --- src/router.js | 2 +- .../recycle/components/collapse-unit.vue | 136 ++++++ .../main_web/recycle/components/item-list.vue | 46 ++ .../recycle/components/list-file-item.vue | 122 +++++ .../recycle/components/list-folder-item.vue | 187 ++++++++ src/views/main_web/recycle/index.vue | 442 ++++++++++++++++++ src/views/main_web/recycle/service.js | 23 + ...e-file.vue => recycle-file.deprecated.vue} | 0 ...cyclebin.vue => recyclebin.deprecated.vue} | 0 src/views/main_web/workspace/service.js | 20 - 10 files changed, 957 insertions(+), 21 deletions(-) create mode 100644 src/views/main_web/recycle/components/collapse-unit.vue create mode 100644 src/views/main_web/recycle/components/item-list.vue create mode 100644 src/views/main_web/recycle/components/list-file-item.vue create mode 100644 src/views/main_web/recycle/components/list-folder-item.vue create mode 100644 src/views/main_web/recycle/index.vue create mode 100644 src/views/main_web/recycle/service.js rename src/views/main_web/workspace/components/{recycle-file.vue => recycle-file.deprecated.vue} (100%) rename src/views/main_web/workspace/{recyclebin.vue => recyclebin.deprecated.vue} (100%) diff --git a/src/router.js b/src/router.js index 1eb5b309..dc03833e 100644 --- a/src/router.js +++ b/src/router.js @@ -83,7 +83,7 @@ const router = new Router({ { path: '/recycle', name: 'recycle', - component: () => import('@/views/main_web/workspace/recyclebin'), + component: () => import('@/views/main_web/recycle'), }, { path: '/history', diff --git a/src/views/main_web/recycle/components/collapse-unit.vue b/src/views/main_web/recycle/components/collapse-unit.vue new file mode 100644 index 00000000..3f968c17 --- /dev/null +++ b/src/views/main_web/recycle/components/collapse-unit.vue @@ -0,0 +1,136 @@ + + + + + \ No newline at end of file diff --git a/src/views/main_web/recycle/components/item-list.vue b/src/views/main_web/recycle/components/item-list.vue new file mode 100644 index 00000000..8135bd91 --- /dev/null +++ b/src/views/main_web/recycle/components/item-list.vue @@ -0,0 +1,46 @@ + + \ No newline at end of file diff --git a/src/views/main_web/recycle/components/list-file-item.vue b/src/views/main_web/recycle/components/list-file-item.vue new file mode 100644 index 00000000..485da967 --- /dev/null +++ b/src/views/main_web/recycle/components/list-file-item.vue @@ -0,0 +1,122 @@ + + + + + \ No newline at end of file diff --git a/src/views/main_web/recycle/components/list-folder-item.vue b/src/views/main_web/recycle/components/list-folder-item.vue new file mode 100644 index 00000000..1cf66eea --- /dev/null +++ b/src/views/main_web/recycle/components/list-folder-item.vue @@ -0,0 +1,187 @@ + + + + + \ No newline at end of file diff --git a/src/views/main_web/recycle/index.vue b/src/views/main_web/recycle/index.vue new file mode 100644 index 00000000..cc3e82fb --- /dev/null +++ b/src/views/main_web/recycle/index.vue @@ -0,0 +1,442 @@ + + + + \ No newline at end of file diff --git a/src/views/main_web/recycle/service.js b/src/views/main_web/recycle/service.js new file mode 100644 index 00000000..791ddf6e --- /dev/null +++ b/src/views/main_web/recycle/service.js @@ -0,0 +1,23 @@ +import { fetchApi, wrapErrorHint } from "@/utils/request"; +import { firstCharToLowerCase } from "@/utils/tool"; + +/** + * 查询删除的文件 + */ +export async function queryFilesFromRecycleBin() { + const res = await fetchApi('file/queryFilesFromRecycleBin'); + wrapErrorHint(res); + if (res.Code !== 0) return null; + const fileList = (res.Data || []).map(file => { + const lower = firstCharToLowerCase(file); + return lower; + }); + return fileList; +} +/** + * 文件放回原处 + */ +export async function removeFromRecycleBin(id) { + const res = await fetchApi('file/removeFromRecycleBin', { fileId: id }); + return wrapErrorHint(res); +} diff --git a/src/views/main_web/workspace/components/recycle-file.vue b/src/views/main_web/workspace/components/recycle-file.deprecated.vue similarity index 100% rename from src/views/main_web/workspace/components/recycle-file.vue rename to src/views/main_web/workspace/components/recycle-file.deprecated.vue diff --git a/src/views/main_web/workspace/recyclebin.vue b/src/views/main_web/workspace/recyclebin.deprecated.vue similarity index 100% rename from src/views/main_web/workspace/recyclebin.vue rename to src/views/main_web/workspace/recyclebin.deprecated.vue diff --git a/src/views/main_web/workspace/service.js b/src/views/main_web/workspace/service.js index 1fa06c5b..175ed226 100644 --- a/src/views/main_web/workspace/service.js +++ b/src/views/main_web/workspace/service.js @@ -19,26 +19,6 @@ export async function fetchWorkFlow(projectId, userId) { }, []); return list; } -/** - * 查询删除的文件 - */ -export async function queryFilesFromRecycleBin() { - const res = await fetchApi('file/queryFilesFromRecycleBin'); - wrapErrorHint(res); - if (res.Code !== 0) return null; - const fileList = (res.Data || []).map(file => { - const lower = firstCharToLowerCase (file); - return lower; - }); - return fileList; -} -/** - * 文件放回原处 - */ -export async function removeFromRecycleBin(id){ - const res = await fetchApi('file/removeFromRecycleBin',{fileId:id}); - return wrapErrorHint(res); -} /** * 查询文件夹下边的文件(包含子文件夹以及协同文件)