From cc39e820867890a1d91ba86b306f622a253291cf Mon Sep 17 00:00:00 2001
From: zxm <zxm@tsz.com>
Date: Tue, 30 Jun 2020 15:20:19 +0800
Subject: [PATCH] [VersionBeta] V.1.0.0.0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[Adds]
1.修改点击公共文件闪跳回协作文件
---
 src/views/main_web/workspace.vue | 30 ++++++------------------------
 1 file changed, 6 insertions(+), 24 deletions(-)

diff --git a/src/views/main_web/workspace.vue b/src/views/main_web/workspace.vue
index b051bb37..e9b225d9 100644
--- a/src/views/main_web/workspace.vue
+++ b/src/views/main_web/workspace.vue
@@ -2921,8 +2921,6 @@ export default {
             console.log(error);
           });
       } else {
-        this.fileindex = 0;
-        this.curactive = 0;
         this.$axios({
           method: "get",
           url: encodeURI(
@@ -2936,26 +2934,6 @@ export default {
         })
           .then(response => {
             thisApp.folderFileList = response.data;
-            // if (folderPerm == 0) {
-            //   thisApp.myFilesList = thisApp.folderFileList.listAllFiles;
-            //   // 加载我的文件夹 zxm+
-            //   thisApp.myListFolderGroups =
-            //     thisApp.folderFileList.listFolderGroups;
-            // } else {
-            //   if (this.currentPageType == 0) {
-            //     // 加载我的文件
-            //     thisApp.myFilesList = thisApp.folderFileList.listMyFiles;
-            //     // 加载我的文件夹 zxm+
-            //     thisApp.myListFolderGroups =
-            //       thisApp.folderFileList.listFolderGroups;
-            //   } else {
-            //     //  加载工作文件
-            //     thisApp.myFilesList = thisApp.folderFileList.listOtherFiles;
-            //     // 加载工作文件分组 zxm+
-            //     thisApp.myListFolderGroups =
-            //       thisApp.folderFileList.listOtherFolderGroups;
-            //   }
-            // }
             if (this.currentPageType == 0) {
               // 加载我的文件
               thisApp.myFilesList = thisApp.folderFileList.listMyFiles;
@@ -2968,8 +2946,12 @@ export default {
               // 加载工作文件分组 zxm+
               thisApp.myListFolderGroups =
                 thisApp.folderFileList.listOtherFolderGroups;
+            }             
+            if(thisApp.curactive==0){
+              thisApp.listCollaborationFiles();
+            }else if(thisApp.curactive==1){
+               thisApp.loadListCommonFiles();
             }
-            thisApp.listCollaborationFiles();
           })
           .catch(error => {
             console.log(error);
@@ -3028,7 +3010,7 @@ export default {
      */
     loadListCommonFiles: function() {
       var thisApp = this;
-      thisApp.myPublicFilesList = [];
+       //thisApp.myPublicFilesList = [];
       this.$axios({
         method: "get",
         url: encodeURI(