[Version] V.3.8

[Adds]
1.冲突解决

src/views/main_web/workspace.vue

@@ -198,7 +198,7 @@
         @hideWorklinkPage="hideWorklinkPage"
       ></WorkLine>
       <div class="layout_content2" v-show="!isShowworklink" v-loading="loading">
-        <section :class="closepageH + ' layerout_H2'">
+        <section :class="closepageH + ' layerout_H2'" @contextmenu.prevent="rightShowMenu($event, '新建文件夹', 4)">
           <!-- 文件大box -->
           <section class="yiyun_section_warp">
             <div class="yinyong_warpBox hidescollbar">
@@ -319,11 +319,11 @@
                 <!-- 右侧操作栏 -->
                 <div class="section_item section_item_aside_fr">
                   <div class="fr ml-10">
-                    <el-button
+                    <!-- <el-button
                       v-if="nowFolder.folderPerm == 0"
                       type="primary"
                       @click="newCreateFolderGroup"
-                    >新建文件夹</el-button>
+                    >新建文件夹</el-button> -->
                     <!-- <span class="yiyun_tishibtn yiyun_text-wenben"><i class="yiyun_icon icon_topnav_listicon" title="列表显示" v-show="isShowMyFileList == true"
 											 @click="showMyFilelist"></i></span>
 										<span class="yiyun_tishibtn yiyun_text-wenben"><i class="yiyun_icon icon_topnav_cardicon" title="显示缩略图"
@@ -354,8 +354,7 @@
                   :list="myFilesList"
                   group="group"
                   :move="draggableMove"
-                  @end="draggableEnd"
-                >
+                  @end="draggableEnd">
                   <div
                     class="lisy-group-item"
                     v-for="file in myFilesList"
@@ -373,8 +372,8 @@
                             file.extension != 'png' &&
                             file.extension != 'bmp' &&
                             file.extension != 'gif' &&
-                            file.extension != 'jpeg' + (file.extension!='map'&&file.extension!='svfzip'&&file.extension!='supermap'&&isClient && !file.isDownload && (file.status == 0 || file.status == 2))?'toumin':''"
-                          @contextmenu.prevent="rightShowMenu($event, file, 1)"
+                            file.extension != 'jpeg' + (isClient && !file.isDownload && (file.status == 0 || file.status == 2))?'toumin':''"
+                          @contextmenu.prevent.stop="rightShowMenu($event, file, 1)"
                         ></div>
                         <div
                           class="defultImage-mid img_bg-mid"
@@ -383,8 +382,8 @@
                             file.extension == 'png' ||
                             file.extension == 'bmp' ||
                             file.extension == 'gif' ||
-                            file.extension == 'jpeg'+ (file.extension!='map'&&file.extension!='svfzip'&&file.extension!='supermap'&&isClient && !file.isDownload && (file.status == 0 || file.status == 2))?'toumin':''"
-                          @contextmenu.prevent="rightShowMenu($event, file, 1)"
+                            file.extension == 'jpeg'+ (isClient && !file.isDownload && (file.status == 0 || file.status == 2))?'toumin':''"
+                          @contextmenu.prevent.stop="rightShowMenu($event, file, 1)"
                         >
                           <div class="file_Im gbox-mid">
                             <img v-lazy="imgSrc + file.alias" alt class="file_Img" />
@@ -587,8 +586,7 @@
                   :list="myListFolderGroups"
                   group="group"
                   :move="draggableMove"
-                  @end="draggableEnd"
-                >
+                  @end="draggableEnd">
                   <div
                     class="yiyun_wenjian_list lisy-group-item"
                     v-for="foldergroup in myListFolderGroups"
@@ -597,7 +595,7 @@
                   >
                     <div
                       class="defultImage-mid foldernew-mid"
-                      @contextmenu.prevent="rightShowMenu($event, foldergroup, 4)"
+                      @contextmenu.prevent.stop="rightShowMenu($event, foldergroup, 4)"
                     ></div>
                     <strong
                       class="yiyunwenjian_name"
@@ -662,7 +660,7 @@
           </section>
         </section>
 
-        <div :class="neibianju" ref="outBox">
+        <div :class="neibianju">
           <div class="titleBox">
             <div class="title_warp">
               <div class="yiyun_section_top orginoverflow" id="bignav">
@@ -713,7 +711,7 @@
               <div class="clear"></div>
             </div>
           </div>
-          <div class="fifleBox" ref="inBox">
+          <div class="fifleBox">
             <div class="yiyun_section_warp layerout_H3">
               <!-- 文件大box -->
               <div class="yinyong_warpBox">
@@ -742,7 +740,7 @@
                               file.extension != 'gif' &&
                               file.extension != 'jpeg'
                           "
-                          @contextmenu.prevent="rightShowMenu($event, file, 2)"
+                          @contextmenu.prevent.stop="rightShowMenu($event, file, 2)"
                         ></div>
                         <div
                           class="defultImage-mid img_bg-mid"
@@ -754,7 +752,7 @@
                               file.extension == 'gif' ||
                               file.extension == 'jpeg'
                           "
-                          @contextmenu.prevent="rightShowMenu($event, file, 2)"
+                          @contextmenu.prevent.stop="rightShowMenu($event, file, 2)"
                         >
                           <div class="file_Imgbox-mid">
                             <img v-lazy="imgSrc + file.alias" alt class="file_Img" />
@@ -887,7 +885,7 @@
                               file.extension != 'gif' &&
                               file.extension != 'jpeg'
                           "
-                          @contextmenu.prevent="rightShowMenu($event, file, 3)"
+                          @contextmenu.prevent.stop="rightShowMenu($event, file, 3)"
                         ></div>
                         <div
                           class="defultImage-mid img_bg-mid"
@@ -899,7 +897,7 @@
                               file.extension == 'gif' ||
                               file.extension == 'jpeg'
                           "
-                          @contextmenu.prevent="rightShowMenu($event, file, 3)"
+                          @contextmenu.prevent.stop="rightShowMenu($event, file, 3)"
                         >
                           <div class="file_Imgbox-mid">
                             <img v-lazy="imgSrc + file.alias" alt class="file_Img" />
@@ -1025,7 +1023,7 @@
                               file.extension != 'gif' &&
                               file.extension != 'jpeg'
                           "
-                          @contextmenu.prevent="rightShowMenu($event, file, 3)"
+                          @contextmenu.prevent.stop="rightShowMenu($event, file, 3)"
                         ></div>
                         <div
                           class="defultImage-mid img_bg-mid"
@@ -1037,7 +1035,7 @@
                               file.extension == 'gif' ||
                               file.extension == 'jpeg'
                           "
-                          @contextmenu.prevent="rightShowMenu($event, file, 3)"
+                          @contextmenu.prevent.stop="rightShowMenu($event, file, 3)"
                         >
                           <div class="file_Imgbox-mid">
                             <img v-lazy="imgSrc + file.alias" alt class="file_Img" />
@@ -1191,8 +1189,7 @@
         <div
           v-show="rightMenuvisible"
           :style="{ left: left + 'px', top: top + 'px' }"
-          class="contextmenu"
-        >
+          class="contextmenu">
           <ul class="rightMenu" v-if="showType == 1">
             <li
               @click="openOffice(BtnRightFile)"
@@ -1315,8 +1312,9 @@
               v-if="BtnRightFile.status == 2 && BtnRightFile.extension !='map' && BtnRightFile.extension!='supermap'"
             >下载至本地</li>
           </ul>
-          <!--新建文件夹-->
+          <!--新建文件分组-->
           <ul class="rightMenu" v-if="showType == 4">
+            <li @click="newCreateFolderGroup">新建文件夹</li>
             <li @click="intoFoldergroup(btnRightFoldergoup)">打开</li>
             <li @click="copyAndMoveFoldergroup(btnRightFoldergoup,'move')">转移至其他工作</li>
             <li @click="copyAndMoveFoldergroup(btnRightFoldergoup,'copy')">复制至其它工作</li>
@@ -2061,9 +2059,9 @@ export default {
       mapAddress: "北京天安门",
       isClient: false, // 是否是客户端
 
-      /**新建文件夹 start*/
-      dialogNewFolderGroup: false, //新建文件夹组弹窗
-      //文件夹组数据
+      /**新建文件分组 start*/
+      dialogNewFolderGroup: false, //新建文件分组组弹窗
+      //文件分组数据
       folderGroupData: {
         folderGroupID: "",
         folderID: "",
@@ -2076,8 +2074,8 @@ export default {
         modifyUserID: "",
         modifyTime: ""
       },
-      myListFolderGroups: [], // 我的文件夹组数据
-      dbClickSelectedFolderGroupData: {}, //双击选中的当前文件夹组对象
+      myListFolderGroups: [], // 我的文件分组数据
+      dbClickSelectedFolderGroupData: {}, //双击选中的当前文件夹分组对象
       isShowWorkt: true, //是否显示我的文件和工作文件
       isShowBread: false, //是否显示面包屑
       folderGroupBreads: [], //文件分组面包屑集合
@@ -2085,8 +2083,8 @@ export default {
       strFoldergroupCopyOrMove: "", //右键菜单 文件分组 是复制还是移动标记
       strFileOrFoldergroup: "", //右键菜单 移动/复制到其他工作 是文件还是文件分组标记
       draggableData: {}, //记录要移动的数据
-      timer: {} //文件计时器对象
-      /**新建文件夹 end*/
+      timer: {}, //文件计时器对象
+      /**新建文件分组 end*/
     };
   },
   mounted: function() {
@@ -5214,7 +5212,7 @@ export default {
       } else {
         this.top = e.clientY; // fix 位置bug
       }
-
+      
       if (type == 2 || type == 3) {
         if (file.status == 2) {
           if (this.isClient) {
@@ -5223,6 +5221,7 @@ export default {
             this.top = this.top - 50;
           }
         } else if (type == 4) {
+          //显示分组菜单的位置
           if (this.isClient) {
             this.top = this.top - 100;
           } else {
@@ -5239,7 +5238,12 @@ export default {
       this.rightMenuvisible = true;
       this.showType = type;
       this.BtnRightFile = file; //鼠标右击的文件
-      this.btnRightFoldergoup = file; //zxm+ 鼠标右击的文件分组
+      //this.btnRightFoldergoup = file; //zxm+ 鼠标右击的文件分组
+      if(file=="新建文件夹"){
+        this.btnRightFoldergoup={}
+      }else{
+        this.btnRightFoldergoup = file; //zxm+ 鼠标右击的文件分组
+      }
     },
     /**
      * 关闭
@@ -5393,6 +5397,16 @@ export default {
      * 双击文件夹组名称 进入文件夹
      */
     intoFoldergroup: function(foldergroup) {
+      if(foldergroup==null || JSON.stringify(foldergroup)=='{}'){
+        this.$notify({
+          title: "温馨提示",
+          message: "请选中文件或新建文件夹",
+          type: "info",
+          offset: 100,
+          duration: 2500
+        });
+        return
+      }
       this.dbClickSelectedFolderGroupData = foldergroup;
       this.isShowWorkt = false;
       this.isShowBread = true;
@@ -5462,6 +5476,16 @@ export default {
      */
     renameFoldergroup: function(btnRightFoldergoup) {
       var thisApp = this;
+      if(thisApp.btnRightFoldergoup==null || JSON.stringify(thisApp.btnRightFoldergoup)=='{}'){
+        thisApp.$notify({
+          title: "温馨提示",
+          message: "请选中文件或新建文件夹",
+          type: "info",
+          offset: 100,
+          duration: 2500
+        });
+        return
+      }
       this.$prompt(
         "当前文件夹名称:  " + btnRightFoldergoup.folderGroupName,
         "重命名",
@@ -5512,6 +5536,16 @@ export default {
      */
     copyAndMoveFoldergroup: function(btnRightFoldergoup, strCopyOrMove) {
       var thisApp = this;
+      if(thisApp.btnRightFoldergoup==null || JSON.stringify(thisApp.btnRightFoldergoup)=='{}'){
+        thisApp.$notify({
+          title: "温馨提示",
+          message: "请选中文件或新建文件夹",
+          type: "info",
+          offset: 100,
+          duration: 2500
+        });
+        return
+      }
       if (strCopyOrMove == "move") {
         thisApp.dialogTtile = "移动到其它文件夹";
       }
@@ -5600,6 +5634,16 @@ export default {
      */
     removeRecycle: function(btnRightFoldergoup) {
       var thisApp = this;
+      if(thisApp.btnRightFoldergoup==null || JSON.stringify(thisApp.btnRightFoldergoup)=='{}'){
+        thisApp.$notify({
+          title: "温馨提示",
+          message: "请选中文件或新建文件夹",
+          type: "info",
+          offset: 100,
+          duration: 2500
+        });
+        return
+      }
       thisApp
         .$axios({
           method: "get",