From 68983fe6486205e1fc786ff35933dbbd175c9365 Mon Sep 17 00:00:00 2001
From: xzx <xzx@tsz.com>
Date: Sun, 16 Aug 2020 17:27:50 +0800
Subject: [PATCH] [VersionBeta] V.2.1.0.5
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[Adds]
1.菜单功能调整
---
 src/views/main_web/workspace.vue | 122 +++++++++++++++++++++----------
 1 file changed, 82 insertions(+), 40 deletions(-)

diff --git a/src/views/main_web/workspace.vue b/src/views/main_web/workspace.vue
index ed8038a4..8e3f179f 100644
--- a/src/views/main_web/workspace.vue
+++ b/src/views/main_web/workspace.vue
@@ -409,7 +409,7 @@
                           <div v-if="file.status == 0" class="yijianxietong isonselect_defual">
                             <i
                               class="icon font_family icon-icon_status_wenjianbiaojiwancheng yijianIcon"
-                              title="工作中"
+                              title="点击启用协同"
                               @click="setFileStatus(file, 2, '更新为已完成',1)"
                             ></i>
                           </div>
@@ -419,21 +419,21 @@
                           >
                             <i
                               class="icon font_family icon-icon_status_wenjianbiaojigengxin yijianIcon"
-                              title="已更新"
+                              title="点击重启此文件共同编辑"
                               @click="setFileStatus(file, 0, '文件已更新',1)"
                             ></i>
                           </div>
                           <div v-if="file.status == 2" class="yijianxietong isonselect">
                             <i
                               class="icon font_family icon-icon_status_wenjianbiaojiwancheng yijianIcon"
-                              title="已完成"
+                              title="点击暂停协同"
                               @click="setFileStatus(file, 0, '更新为工作中',1)"
                             ></i>
                           </div>
                           <div v-if="file.status == 3" class="yijianxietong isonselect_err">
                             <i
                               class="icon font_family icon-icon_status_wenjianbiaojiquxiao yijianIcon"
-                              title="已取消协同"
+                              title="点击重新启用协同"
                               @click="setFileStatus(file, 0, '已开启文件协同',2)"
                             ></i>
                           </div>
@@ -504,33 +504,35 @@
                                 <el-dropdown-item
                                   @click.native="setFileStatus(file, 2, '更新为已完成',1)"
                                   divided
-                                  v-if="file.status == 1 || file.status == 0"
+                                  v-if="file.status == 0"
                                 >
-                                  <span>搞定</span>
+                                  <span>启用协同</span>
                                 </el-dropdown-item>
                                 <el-dropdown-item
-                                  @click.native="setFileStatus(file, 0, '已开启文件协同',2)"
-                                  v-if="isUseShare && file.status == 3 && isShowMenuFile==true"
+                                  @click.native="setFileStatus(file, 0, '更新为工作中',1)"
+                                  divided
+                                  v-if="file.status == 1"
                                 >
-                                  <span>开启协同</span>
+                                  <span>重启文件共同编辑</span>
                                 </el-dropdown-item>
-                                  <el-dropdown-item
-                                  @click.native="setFileStatus(file, 0, '已开启文件协同',2)"
-                                  v-else-if="isUseShare && file.status == 3 && !isShowMenuFile==true"
+                                <el-dropdown-item
+                                  @click.native="setFileStatus(file, 0, '更新为工作中',1)"
+                                  divided
+                                  v-if="file.status == 2"
                                 >
-                                  <span>开启协同</span>
+                                  <span>暂停协同</span>
                                 </el-dropdown-item>
                                 <el-dropdown-item
-                                  @click.native="setFileStatus(file, 3, '文件已取消协同',1)"
-                                  v-if="isUseShare && file.status != 3 && isShowMenuFile==true"
+                                  @click.native="setFileStatus(file, 0, '已开启文件协同',2)"
+                                  v-if="isUseShare && file.status == 3 && isShowMenuFile==true"
                                 >
-                                  <span>取消协同</span>
+                                  <span>启用协同</span>
                                 </el-dropdown-item>
-                                <el-dropdown-item
-                                  @click.native="setFileStatus(file, 3, '文件已取消协同',1)"
-                                  v-else-if="isUseShare && file.status != 3 && !isShowMenuFile==true"
+                                  <el-dropdown-item
+                                  @click.native="setFileStatus(file, 0, '已开启文件协同',2)"
+                                  v-else-if="isUseShare && file.status == 3 && !isShowMenuFile==true"
                                 >
-                                  <span>取消协同</span>
+                                  <span>启用协同</span>
                                 </el-dropdown-item>
                                 <el-dropdown-item @click.native="createMilestone(file)" divided v-if="!isShowMenuFile==true">
                                   <span>保存历史文件</span>
@@ -581,6 +583,20 @@
                                 <el-dropdown-item @click.native="delMyFile(file)" v-if="!isShowMenuFile==true">
                                   <span>移到回收站</span>
                                 </el-dropdown-item>
+                                 <el-dropdown-item
+                                 divided
+                                  @click.native="setFileStatus(file, 3, '文件已取消协同',1)"
+                                  v-if="isUseShare && file.status != 3 && isShowMenuFile==true"
+                                >
+                                  <span>取消协同</span>
+                                </el-dropdown-item>
+                                <el-dropdown-item
+                                divided
+                                  @click.native="setFileStatus(file, 3, '文件已取消协同',1)"
+                                  v-else-if="isUseShare && file.status != 3 && !isShowMenuFile==true"
+                                >
+                                  <span>取消协同</span>
+                                </el-dropdown-item>
                               </el-dropdown-menu>
                             </el-dropdown>
                           </div>
@@ -1017,6 +1033,13 @@
                                 v-if="isClient && file.downloadStatus == 2"
                               >
                                 <span>打开方式</span>
+                              </el-dropdown-item>
+                               <el-dropdown-item
+                                divided
+                                @click.native="openNativeFolder(file)"
+                                v-if="isClient"
+                              >
+                                <span>在文件夹中浏览</span>
                               </el-dropdown-item>
                               <el-dropdown-item
                                 divided
@@ -1273,7 +1296,7 @@
               @click="fileClickSelect(BtnRightFile)"
               v-else-if="isClient && BtnRightFile.downloadStatus == 2 && !isShowMenuFile==true"
             >打开方式</li>
-            <div class="line" v-if="isClient"></div>
+            <div class="line"></div>
             <li
               @click="setFileStatus(BtnRightFile, 2, '更新为已完成',1)"
               v-if="(BtnRightFile.status == 1 || BtnRightFile.status == 0) && isShowMenuFile==true"
@@ -1281,23 +1304,23 @@
             <li
               @click="setFileStatus(BtnRightFile, 2, '更新为已完成',1)"
               v-else-if="(BtnRightFile.status == 1 || BtnRightFile.status == 0)"
-            >搞定</li>
+            >启用协同</li>
+            <li
+              @click="setFileStatus(BtnRightFile, 0, '更新为工作中',1)"
+              v-else-if="(BtnRightFile.status == 2)"
+            >暂停协同</li>
+            <li
+              @click="setFileStatus(BtnRightFile, 0, '更新为工作中',1)"
+              v-else-if="(BtnRightFile.status == 1)"
+            >重启此文件共同编辑</li>
             <li
               @click="setFileStatus(BtnRightFile, 0, '已开启文件协同',2)"
               v-if="isUseShare && BtnRightFile.status == 3 && !isShowMenuFile"
-            >开启协同</li>
+            >启用协同</li>
             <li
               @click="setFileStatus(BtnRightFile, 0, '已开启文件协同',2)"
               v-else-if="isUseShare && BtnRightFile.status == 3"
-            >开启协同</li>
-            <li
-              @click="setFileStatus(BtnRightFile, 3, '文件已取消协同',1)"
-              v-if="isUseShare && BtnRightFile.status != 3 && isShowMenuFile==true"
-            >取消协同</li>
-            <li
-              @click="setFileStatus(BtnRightFile, 3, '文件已取消协同',1)"
-              v-else-if="isUseShare && BtnRightFile.status != 3"
-            >取消协同</li>
+            >启用协同</li>
             <div class="line"></div>
             <li @click="createMilestone(BtnRightFile)" v-if="!isShowMenuFile">保存历史文件</li>
             <li @click="showFileMilestone(BtnRightFile)" v-if="!isShowMenuFile">选择历史文件</li>
@@ -1332,6 +1355,15 @@
             <li @click="shareMyFile(BtnRightFile)" v-if="BtnRightFile.extension == 'svfzip' ">分享</li>
             <li @click="reNameyMyFile(BtnRightFile)" v-if="!isShowMenuFile">重命名</li>
             <li @click="delMyFile(BtnRightFile)" v-if="!isShowMenuFile">移到回收站</li>
+            <div class="line" v-if="BtnRightFile.status != 3"></div>
+            <li
+              @click="setFileStatus(BtnRightFile, 3, '文件已取消协同',1)"
+              v-if="isUseShare && BtnRightFile.status != 3 && isShowMenuFile==true"
+            >取消协同</li>
+            <li
+              @click="setFileStatus(BtnRightFile, 3, '文件已取消协同',1)"
+              v-else-if="isUseShare && BtnRightFile.status != 3"
+            >取消协同</li>
           </ul>
           <!-- 协作文件 -->
           <ul class="rightMenu" v-if="showType == 2">
@@ -1390,6 +1422,10 @@
               v-if="isClient &&  BtnRightFile.downloadStatus == 2"
             >打开方式</li>
             <div class="line" v-if="BtnRightFile.status == 2"></div>
+            <li
+              @click="openNativeFolder(BtnRightFile)"
+              v-if="isClient"
+            >在文件夹中浏览</li>
             <li
               @click="downLoadMyFile(BtnRightFile)"
               v-if=" BtnRightFile.extension !='map' && BtnRightFile.extension!='supermap'"
@@ -2695,7 +2731,7 @@ export default {
             } else {
               thisApp
                 .$confirm(
-                  "是否重新开启文件【" + file.archName + "】的协同？",
+                  "文件" + file.archName + "是否重新启用协同？",
                   "文件提示",
                   {
                     confirmButtonText: "开启协同",
@@ -2805,7 +2841,7 @@ export default {
             } else {
               thisApp
                 .$confirm(
-                  "是否重新开启文件【" + file.archName + "】的协同？",
+                  "文件" + file.archName + "是否重新开启协同？",
                   "文件提示",
                   {
                     confirmButtonText: "开启协同",
@@ -3353,7 +3389,12 @@ export default {
           this.mapAddress = file.alias;
           this.appInstanceTitle = "应用查看-" + file.archName;
         } else if (file.extension == "svfzip") {
+          alert(file.archName);
           window.open(file.showUrl, file.archName);
+          //  this.showApp = true;
+          // this.instanceType = 2;
+          // this.forgeShowUrl = file.showUrl;
+          // this.appInstanceTitle = "应用查看-" + file.archName;
         } else if (file.extension == "supermap") {
           this.instanceType = 3;
           this.showApp = true;
@@ -3563,9 +3604,7 @@ export default {
      * 协作文件点击文件事件：直接打开文件
      */
     fileClickColl: function(file) {
-      if (file.downloadStatus ==0 || file.downloadStatus == 1) {
-        return;
-      }
+      
       if (this.isClient) {
           if (file.extension == "map") {
             this.instanceType = 1;
@@ -3592,6 +3631,9 @@ export default {
             this.showImage = true;
             this.imageUrl = this.imgSrc + file.alias;
           } else {
+            if (file.downloadStatus ==0 || file.downloadStatus == 1) {
+              return;
+            }
             // 客户端打开文件
             var archid = file.archID;
             var filename = file.archName + "." + file.extension;
@@ -3620,9 +3662,6 @@ export default {
      * 协作文件点击文件事件：打开文件并选择打开方式
      */
     fileClickSelectColl: function(file) {
-      if (file.downloadStatus ==0 || file.downloadStatus == 1) {
-        return;
-      }
       if (this.isClient) {
           if (file.extension == "map") {
             this.instanceType = 1;
@@ -3646,6 +3685,9 @@ export default {
             this.showImage = true;
             this.imageUrl = this.imgSrc + file.alias;
           } else {
+            if (file.downloadStatus ==0 || file.downloadStatus == 1) {
+                  return;
+                }
             // 客户端打开文件
             var archid = file.archID;
             var filename = file.archName + "." + file.extension;