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

src/views/main_web/workspace.vue

@@ -360,7 +360,6 @@
                   :move="draggableMove"
                   @end="draggableEnd" 
                 >
-                  <!-- @remove="draggableRemove"-->
                   <div
                     class="lisy-group-item"
                     v-for="file in myFilesList"
@@ -479,13 +478,25 @@
                                 </el-dropdown-item>
                                 <el-dropdown-item
                                   @click.native="fileClick(file)"
-                                  v-if="isClient && file.downloadStatus == 2"
+                                  v-if="isClient && file.downloadStatus == 2 && isShowMenuFile==true"
+                                >
+                                  <span>打开</span>
+                                </el-dropdown-item>
+                                 <el-dropdown-item
+                                  @click.native="fileClick(file)"
+                                  v-else-if="isClient && file.downloadStatus == 2 && !isShowMenuFile==true"
                                 >
                                   <span>打开</span>
                                 </el-dropdown-item>
                                 <el-dropdown-item
                                   @click.native="fileClickSelect(file)"
-                                  v-if="isClient && file.downloadStatus == 2"
+                                  v-if="isClient && file.downloadStatus == 2 && isShowMenuFile==true"
+                                >
+                                  <span>打开方式</span>
+                                </el-dropdown-item>
+                                 <el-dropdown-item
+                                  @click.native="fileClickSelect(file)"
+                                  v-else-if="isClient && file.downloadStatus == 2 && !isShowMenuFile==true"
                                 >
                                   <span>打开方式</span>
                                 </el-dropdown-item>
@@ -498,40 +509,53 @@
                                 </el-dropdown-item>
                                 <el-dropdown-item
                                   @click.native="setFileStatus(file, 0, '已开启文件协同',2)"
-                                  v-if="isUseShare && file.status == 3"
+                                  v-if="isUseShare && file.status == 3 && isShowMenuFile==true"
+                                >
+                                  <span>开启协同</span>
+                                </el-dropdown-item>
+                                  <el-dropdown-item
+                                  @click.native="setFileStatus(file, 0, '已开启文件协同',2)"
+                                  v-else-if="isUseShare && file.status == 3 && !isShowMenuFile==true"
                                 >
                                   <span>开启协同</span>
                                 </el-dropdown-item>
                                 <el-dropdown-item
                                   @click.native="setFileStatus(file, 3, '文件已取消协同',1)"
-                                  v-if="isUseShare && file.status != 3"
+                                  v-if="isUseShare && file.status != 3 && isShowMenuFile==true"
                                 >
                                   <span>取消协同</span>
                                 </el-dropdown-item>
-                                <el-dropdown-item @click.native="createMilestone(file)" divided>
+                                <el-dropdown-item
+                                  @click.native="setFileStatus(file, 3, '文件已取消协同',1)"
+                                  v-else-if="isUseShare && file.status != 3 && !isShowMenuFile==true"
+                                >
+                                  <span>取消协同</span>
+                                </el-dropdown-item>
+                                <el-dropdown-item @click.native="createMilestone(file)" divided v-if="!isShowMenuFile==true">
                                   <span>保存历史文件</span>
                                 </el-dropdown-item>
-                                <el-dropdown-item @click.native="showFileMilestone(file)">
+                                <el-dropdown-item @click.native="showFileMilestone(file)" v-if="!isShowMenuFile==true">
                                   <span>选择历史文件</span>
                                 </el-dropdown-item>
                                 <el-dropdown-item @click.native="copyFile(file)" divided>
                                   <span>建立副本</span>
                                 </el-dropdown-item>
                                 <el-dropdown-item
-                                  v-if="isUseCommon && file.commonStatus == 0 && nowFolderName != '公共文件夹'"
+                                  v-if="isUseCommon && file.commonStatus == 0 && nowFolderName != '公共文件夹'
+                                    && !isShowMenuFile==true"
                                   @click.native="updateToPublicFile(file,0)"
                                   divided
                                 >
                                   <span>提交至项目公共文件夹</span>
                                 </el-dropdown-item>
                                 <el-dropdown-item
-                                  v-if="isUseCommon && file.commonStatus == 1"
+                                  v-if="isUseCommon && file.commonStatus == 1 && !isShowMenuFile==true"
                                   @click.native="updateToPublicFile(file,1)"
                                   divided
                                 >
                                   <span>取消至项目公共文件夹</span>
                                 </el-dropdown-item>
-                                <el-dropdown-item @click.native="copyAndMoveFolder(file, 'move')">
+                                <el-dropdown-item @click.native="copyAndMoveFolder(file, 'move')" v-if="!isShowMenuFile==true">
                                   <span>转移至其他工作</span>
                                 </el-dropdown-item>
                                 <el-dropdown-item @click.native="copyAndMoveFolder(file, 'copy')">
@@ -545,15 +569,15 @@
                                   <span>下载至本地</span>
                                 </el-dropdown-item>
                                 <el-dropdown-item
-                                  v-if="file.extension == 'svfzip' "
+                                  v-if="file.extension == 'svfzip' && !isShowMenuFile==true"
                                   @click.native="shareMyFile(file)"
                                 >
                                   <span>分享</span>
                                 </el-dropdown-item>
-                                <el-dropdown-item @click.native="reNameyMyFile(file)">
+                                <el-dropdown-item @click.native="reNameyMyFile(file)" v-if="!isShowMenuFile==true">
                                   <span>重命名</span>
                                 </el-dropdown-item>
-                                <el-dropdown-item @click.native="delMyFile(file)">
+                                <el-dropdown-item @click.native="delMyFile(file)" v-if="!isShowMenuFile==true">
                                   <span>移到回收站</span>
                                 </el-dropdown-item>
                               </el-dropdown-menu>
@@ -1243,11 +1267,19 @@
             >在线查看</li>
             <li
               @click="fileClick(BtnRightFile)"
-              v-if="isClient && BtnRightFile.downloadStatus == 2 && isShowMenuFile"
+              v-if="isClient && BtnRightFile.downloadStatus == 2 && isShowMenuFile==true"
+            >打开</li>
+            <li
+              @click="fileClick(BtnRightFile)"
+              v-else-if="isClient && BtnRightFile.downloadStatus == 2 && !isShowMenuFile==true"
             >打开</li>
             <li
               @click="fileClickSelect(BtnRightFile)"
-              v-if="isClient && BtnRightFile.downloadStatus == 2 && !isShowMenuFile"
+              v-if="isClient && BtnRightFile.downloadStatus == 2 && isShowMenuFile==true"
+            >打开方式</li>
+            <li
+              @click="fileClickSelect(BtnRightFile)"
+              v-else-if="isClient && BtnRightFile.downloadStatus == 2 && !isShowMenuFile==true"
             >打开方式</li>
             <div class="line" v-if="isClient"></div>
             <li
@@ -1295,10 +1327,7 @@
             >取消至项目公共文件夹</li>
             <li @click="copyAndMoveFolder(BtnRightFile, 'move')" v-if="!isShowMenuFile">转移至其他工作</li>
             <li @click="copyAndMoveFolder(BtnRightFile, 'copy')" v-if="isShowMenuFile==true">复制至其他工作</li>
-            <li
-              @click="copyAndMoveFolder(BtnRightFile, 'copy')"
-              v-else-if="!isShowMenuFile==true"
-            >复制至其他工作</li>
+            <li @click="copyAndMoveFolder(BtnRightFile, 'copy')" v-else-if="!isShowMenuFile==true">复制至其他工作</li>
             <div class="line"></div>
             <li
               @click="downLoadMyFile(BtnRightFile)"
@@ -2279,7 +2308,6 @@ export default {
   methods: {
     downLoadStatus:function(){
       var data =back.getProgress();
-      console.log(data);
     },
     listenBottomHeight(){
       let oDivH= document.getElementById("bottomBox").offsetHeight;
@@ -5542,6 +5570,7 @@ export default {
           this.top = this.top - 50;
         }
       }
+
       this.rightMenuvisible = true;
       this.showType = type;
       this.BtnRightFile = file; //鼠标右击的文件