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

src/views/main_web/workspace.vue

@@ -636,12 +636,10 @@
                 <draggable
                   id="draggleFiles"
                   class="list-group"
-                  group="group"
-                  dorceFallback=false
-                  fallbackClass="draggingStyle"
                   :list="myFilesList"
+                  group="group"
                   :move="draggableMove"
-                   @end="draggableEnd">
+                  @end="draggableEnd">
                   <div
                     class="lisy-group-item"
                     v-for="file in myFilesList"
@@ -884,21 +882,15 @@
                 <draggable
                   id="draggletFolderGroups"
                   class="list-group"
-                  group="group"
-                  dorceFallback=false
-                  fallbackClass="draggingStyle"
                   :list="myListFolderGroups"
+                   group="group"
                   :move="draggableMove"
-                   @end="draggableEnd">
+                  @end="draggableEnd">
                   <div
-                    class="lisy-group-item"
+                    class="yiyun_wenjian_list lisy-group-item"
                     v-for="foldergroup in myListFolderGroups"
                     :key="foldergroup.folderGroupID"
-                    @mouseover="isShowIcon"
-                    @mouseout="ishideIcon">
-                    <div
-                      class="yiyun_wenjian_list"
-                      @dblclick="intoFoldergroup(foldergroup)">
+                    @dblclick="intoFoldergroup(foldergroup)">
                       <div
                         class="defultImage-mid foldernew-mid"
                         @contextmenu.prevent="rightShowMenu($event, foldergroup, 4)">
@@ -910,11 +902,8 @@
                         {{ foldergroup.folderGroupName}}
                       </strong>
                       <strong class="yiyunwenjian_name">{{foldergroup.childCount}}个项目</strong>
-                    </div>
                   </div>
                 </draggable>
-                <!-- <rawDisplayer :value="myFilesList" tile="myFilesList" />
-                <rawDisplayer :value="myListFolderGroups" tile="myListFolderGroups" /> -->
                 <!-- zxm修改托拽 end -->
                 <div></div>
               </div>
@@ -6059,7 +6048,7 @@ export default {
         }
       }
       thisApp.draggableData = draggableData      
-    },  
+    },      
     /**
      * 拖拽完成发送请求
      */