From 882452e60d45fa52b611fc73f24090fcbcda6487 Mon Sep 17 00:00:00 2001
From: xzx <xzx@tsz.com>
Date: Thu, 9 Jul 2020 16:35:00 +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.获取文件公共文件切换到普通工作时切换fileindex
---
 src/views/main_web/workspace.vue | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/views/main_web/workspace.vue b/src/views/main_web/workspace.vue
index fa5aa211..c59a6413 100644
--- a/src/views/main_web/workspace.vue
+++ b/src/views/main_web/workspace.vue
@@ -2041,7 +2041,7 @@ export default {
           label: "公共文件"
         }
       ],
-      fileindex: 0, //	协作文件与公共文件默认切换状态
+      fileindex: 0, //	协作文件与公共文件默认切换状态 0 协作文件 1 公共文件  2 由工作提交的文件
       curactive: 0, //	协作文件与公共文件默认样式切换状态
       isShowpageIcon: true, //	协作空间折叠按钮状态
       closepageH: "", //	底部协作文件展开高度   默认为空，展开后高度为closepageH
@@ -2910,6 +2910,10 @@ export default {
             console.log(error);
           });
       } else {
+        if( this.fileindex ==2 )
+        {
+          this.fileindex = 0;
+        }
         this.$axios({
           method: "get",
           url: encodeURI(
@@ -2945,7 +2949,6 @@ export default {
      * 获取协作文件
      */
     listCollaborationFiles: function() {
-      console.log("我在获取协作文件......"+"-----");
       var thisApp = this;
       thisApp.nowFolderId =
         thisApp.listUserFolders[thisApp.nowFolderIndex].folderID; // 设置当前打开工作文件夹ID
@@ -2973,7 +2976,6 @@ export default {
           if(response.data.data!=null && response.data.data.length > 0){   
               thisApp.myCollFilesList = response.data.data;
           }
-          console.log(thisApp.myCollFilesList);
           if (thisApp.myCollFilesList.length > 0) {
             thisApp.scrollIndex = 7;
               thisApp.scrollLoad();
@@ -5111,6 +5113,10 @@ export default {
         ) {
           foldergroupId = this.dbClickSelectedFolderGroupData.folderGroupID;
         }
+        if(sessionStorage.comFolderId  == openFolderId)
+        {
+          console.log(123);
+        }
         // 文件上传成功时，保存文件数据到DB
         this.$axios({
           method: "post",