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

src/views/main_web/workspace.vue

@@ -2138,18 +2138,12 @@ export default {
       // 监听浏览器拖入事件
       appbox.addEventListener("drop", this.enentDrop, false);
       appbox.addEventListener("dragleave", function(e) {
-        // e.stopPropagation();
-        // e.preventDefault();
         _this.isHasDropevent = false;
       });
       appbox.addEventListener("dragenter", function(e) {
-        // e.stopPropagation();
-        // e.preventDefault();
         _this.isHasDropevent = true;
       });
       appbox.addEventListener("dragover", function(e) {
-        // e.stopPropagation();
-        // e.preventDefault();
         _this.isHasDropevent = true;
       });
 
@@ -2158,19 +2152,16 @@ export default {
       dropbox.addEventListener("dragleave", function(e) {
         e.stopPropagation();
         e.preventDefault();
-        console.log("1.你的文件已离开我的领域");
         _this.borderhover = false;
       });
       dropbox.addEventListener("dragenter", function(e) {
         e.stopPropagation();
         e.preventDefault();
-        console.log("2.你的文件已进进入我的领域");
         _this.borderhover = true;
       });
       dropbox.addEventListener("dragover", function(e) {
         e.stopPropagation();
         e.preventDefault();
-        console.log("3.你的文件已进进入我的领域并在盘旋");
         _this.borderhover = true;
       });
     },
@@ -3900,7 +3891,6 @@ export default {
             });
             this.dialogNewAppInstanceVisible = false;
             this.isShowNewFiledialog = false;
-            // thisApp.loadMyAppInstanceList();
             thisApp.newAppInstance = {
               appID: "",
               folderID: "",
@@ -4666,7 +4656,6 @@ export default {
         this.isShowWorkt = true; //zxm+ 点击工作链节点时 显示我的文件和工作文件
         this.isShowBread = false; //zxm+ 点击工作链节点时 隐藏面包屑
         this.listFiles();
-        // this.loadMyAppInstanceList();
       } else {
         this.$notify({
           title: "温馨提示",
@@ -5298,7 +5287,6 @@ export default {
      * 关闭文件交换设置窗体
      */
     closeFileShareSet: function(data) {
-      //   this.closeAppManagePain();
       this.showAllAppManagement();
     },
     /****协作空间 拖拽功能方法  start*/
@@ -5564,7 +5552,6 @@ export default {
               duration: 2500
             });
             thisApp.dialogCopyAndMove = false;
-            //thisApp.listFiles();
             if (
               thisApp.dbClickSelectedFolderGroupData == null ||
               JSON.stringify(thisApp.dbClickSelectedFolderGroupData) == "{}"