Browse Source

查询节点文件接口去掉公共文件夹的传参

dev
zhengzhou 4 years ago
parent
commit
7a8f156d1c
5 changed files with 6 additions and 9 deletions
  1. +1
    -1
      src/views/main_web/workspace/components/archive-view/index.vue
  2. +2
    -2
      src/views/main_web/workspace/components/file-explorer/index.vue
  3. +0
    -3
      src/views/main_web/workspace/index.vue
  4. +2
    -2
      src/views/main_web/workspace/service.js
  5. +1
    -1
      src/views/main_web/workspace/workspace.new.vue

+ 1
- 1
src/views/main_web/workspace/components/archive-view/index.vue View File

@@ -301,7 +301,7 @@ export default {
const folderResInfo = await services.fetchFolderFileList(
nodeFolder.id,
userId,
nodeFolder.id
// nodeFolder.id
);

if (!folderResInfo) return;


+ 2
- 2
src/views/main_web/workspace/components/file-explorer/index.vue View File

@@ -674,7 +674,7 @@ export default {
searchContent: String,
nodeFolders: Array,
currentNodeFolder: Object,
publicFolder: Object,
// publicFolder: Object,
},
data() {
return {
@@ -1820,7 +1820,7 @@ export default {
const folderResInfo = await services.fetchFolderFileList(
nodeFolder.id,
userId,
this.publicFolder.id
// this.publicFolder.id
);
if (!folderResInfo) return;
// 快速切换节点的时候


+ 0
- 3
src/views/main_web/workspace/index.vue View File

@@ -50,7 +50,6 @@
:currentNodeFolder="currentNodeFolder"
:searchContent="searchKeywords"
:nodeFolders="nodeFolders"
:publicFolder="publicFolder"
@showAchieveView="viewType = 'archive-view'"
/>
<archive-view
@@ -84,7 +83,6 @@ export default {
projectName: sessionStorage.projName, // 当前项目名称
nodeFolders: [], // 节点文件夹
currentNodeFolder: null, // 当前节点文件夹
publicFolder: null,
// currentFolder: {}, // 当前文件夹,可以是节点文件夹,可以是子文件夹
workFlowVisible: false, // 工作链页面显示开关
viewType: 'file-explorer', // computed: file-explorer || archive-view
@@ -140,7 +138,6 @@ export default {
folder.nodeId !== folder.templateId
// && folder.folderName !== "公共文件夹"
);
this.publicFolder = folderList.find(folder => folder.isPublic);
this.nodeFolders = folderList;
this.folderMap = folderList.reduce((h, f) => ((h[f.id] = f), h), {});
if (!folderList.length) return;


+ 2
- 2
src/views/main_web/workspace/service.js View File

@@ -45,8 +45,8 @@ export async function removeFromRecycleBin(id){
* @param {*} folderId
* @param {*} userId
*/
export async function fetchFolderFileList(folderId, userId, commonFolderId) {
const res = await fetchApi('folder/queryFileListByFolderIdAndUserId', { folderId, userId, publicFolderId: commonFolderId });
export async function fetchFolderFileList(folderId, userId) {
const res = await fetchApi('folder/queryFileListByFolderIdAndUserId', { folderId, userId });
wrapErrorHint(res);
if (res.Code !== 0) return null;
const data = res.Data || {};


+ 1
- 1
src/views/main_web/workspace/workspace.new.vue View File

@@ -1504,7 +1504,7 @@ export default {
// this.workSubFolderList = [];
// this.cooperationFileList = [];
// todo 接口去除公共文件夹配置
const folderResInfo = await services.fetchFolderFileList(nodeFolder.id, userId, nodeFolder.id);
const folderResInfo = await services.fetchFolderFileList(nodeFolder.id, userId);
if(!folderResInfo) return;
// 快速切换节点的时候
if(this.currentNodeFolder.id !== nodeFolder.id) return;


Loading…
Cancel
Save