Merge branch 'master' of http://192.168.5.34:10101/r/YiYunJianZhuBeta

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,13 +2086,18 @@ export default {
       strFileOrFoldergroup: "", //右键菜单 移动/复制到其他工作 是文件还是文件分组标记
       draggableData: {}, //记录要移动的数据
       timer: {}, //文件计时器对象
+      isShowMenuFoldergroup:true,//右键分组菜单项-显隐
       /**新建文件分组 end*/
     };
   },
   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();
@@ -5286,7 +5291,6 @@ export default {
       } else {
         this.top = e.clientY; // fix 位置bug
       }
-      
       if (type == 2 || type == 3) {
         if (file.status == 2) {
           if (this.isClient) {
@@ -5294,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;