From e0b238f590835cff92c9ae8f9060d164ebd25f99 Mon Sep 17 00:00:00 2001
From: zxm <zxm@tsz.com>
Date: Mon, 29 Jun 2020 09:58:57 +0800
Subject: [PATCH 1/2] [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 | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/views/main_web/workspace.vue b/src/views/main_web/workspace.vue
index 6f7647a8..c55b5344 100644
--- a/src/views/main_web/workspace.vue
+++ b/src/views/main_web/workspace.vue
@@ -2091,8 +2091,12 @@ export default {
   },
   mounted: function() {
     window["refreshFiles"]=()=>{
-          this.listFiles();
-        }
+      if(this.dbClickSelectedFolderGroupData!=null && JSON.stringify(this.dbClickSelectedFolderGroupData)!='{}'){
+        this.intoFoldergroup();
+      }else{
+        this.listFiles();
+      }
+    }
     window.addEventListener("scroll", this.onscroll, true);
     this.loadProjManager();
     this.loadSettings();

From 35792ff5387e7d0f8b75942bf5eac39b209196a6 Mon Sep 17 00:00:00 2001
From: zxm <zxm@tsz.com>
Date: Mon, 29 Jun 2020 12:22:44 +0800
Subject: [PATCH 2/2] [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 | 28 +++++++++++++++++-----------
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/src/views/main_web/workspace.vue b/src/views/main_web/workspace.vue
index c55b5344..321e76e7 100644
--- a/src/views/main_web/workspace.vue
+++ b/src/views/main_web/workspace.vue
@@ -1315,11 +1315,11 @@
             >下载至本地</li>
           </ul>
           <!--新建文件分组-->
-          <ul class="rightMenu" v-if="showType == 4">
+          <ul class="rightMenu" v-if="showType == 4 && isShowMenuFoldergroup==true">
             <li @click="newCreateFolderGroup">新建文件夹</li>
             <li @click="intoFoldergroup(btnRightFoldergoup)">打开</li>
-            <li @click="copyAndMoveFoldergroup(btnRightFoldergoup,'move')">转移至其他工作</li>
-            <li @click="copyAndMoveFoldergroup(btnRightFoldergoup,'copy')">复制至其它工作</li>
+            <!-- <li @click="copyAndMoveFoldergroup(btnRightFoldergoup,'move')">转移至其他工作</li>
+            <li @click="copyAndMoveFoldergroup(btnRightFoldergoup,'copy')">复制至其它工作</li> -->
             <li @click="renameFoldergroup(btnRightFoldergoup)">重命名</li>
             <li @click="removeRecycle(btnRightFoldergoup)">移到回收站</li>
           </ul>
@@ -2086,6 +2086,7 @@ export default {
       strFileOrFoldergroup: "", //右键菜单 移动/复制到其他工作 是文件还是文件分组标记
       draggableData: {}, //记录要移动的数据
       timer: {}, //文件计时器对象
+      isShowMenuFoldergroup:true,//右键分组菜单项-显隐
       /**新建文件分组 end*/
     };
   },
@@ -5290,7 +5291,6 @@ export default {
       } else {
         this.top = e.clientY; // fix 位置bug
       }
-      
       if (type == 2 || type == 3) {
         if (file.status == 2) {
           if (this.isClient) {
@@ -5298,19 +5298,25 @@ export default {
           } else {
             this.top = this.top - 50;
           }
-        } else if (type == 4) {
-          //显示分组菜单的位置
+        }  else {
           if (this.isClient) {
             this.top = this.top - 100;
           } else {
             this.top = this.top - 50;
           }
+        }
+      }else if (type == 4) {
+        //工作文件下 不显示“新建文件夹”菜单项
+        if(this.currentPageType==1){
+          this.isShowMenuFoldergroup = false
+        }else{
+          this.isShowMenuFoldergroup = true
+        }
+        //显示分组菜单的位置
+        if (this.isClient) {
+          this.top = this.top - 100;
         } else {
-          if (this.isClient) {
-            this.top = this.top - 100;
-          } else {
-            this.top = this.top - 50;
-          }
+          this.top = this.top - 50;
         }
       }
       this.rightMenuvisible = true;