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

config/index.js

@@ -20,7 +20,7 @@ module.exports = {
         assetsPublicPath: '/',
         proxyTable: {
             '/api/**': {
-                target: 'http://192.168.5.32:9003',
+                target: 'http://192.168.5.25:9003',
                 changeOrigin: true,
                 secure: false,
             }

src/views/login.vue

@@ -250,7 +250,7 @@ export default {
       checkPwdTip: "", //检测提示
       phoneCode: "", //手机验证码
       isRemember: false, //记住密码
-      isClient: true //是否是客户端
+      isClient: false //是否是客户端
     };
   },
   beforeRouteLeave(to, from, next) {

src/views/main_web/cloud.vue

@@ -44,7 +44,7 @@
         <!-- 云盘文件list -->
         <div class="yiyun_file_box mt-20">
           <ul class="yiyun_cloud_fileList middle-icon">
-            <li v-for="item in listFolderArch" v-bind:key="item.folderId" @dblclick="fileClick(item)">
+            <li v-for="item in listFolderArch" v-bind:key="item.folderId">  <!--@dblclick="fileClick(item)"-->
               <div class="bghover-mid" @contextmenu.prevent="rightShowMenu($event, item)">
                 <div :class="'defultImage-mid ' + item.extension +'-mid'" v-if="
                     item.extension != 'jpg' &&
@@ -413,7 +413,7 @@
         mapAddress:'北京天安门',
         showImage:false,
         imageUrl:'',
-        isClient:true, //是否是客户端
+        isClient:false, //是否是客户端
         //结束
         // end
       };

src/views/main_web/projnotice.vue

@@ -29,7 +29,7 @@
             <div class="clear"></div>
             <!-- 应用列表（缩略图） -->
             <div class="yiyun_row_recyle_warp">
-              <div v-for="(file, fileIndex) in folder.listNotice" :key="fileIndex" @dblclick="fileClick(file)">
+              <div v-for="(file, fileIndex) in folder.listNotice" :key="fileIndex">  <!--@dblclick="fileClick(file)"-->
                 <div class="yiyun_wenjian_list">
                   <div :class="'defultImage ' + file.extension" v-if="
                       file.extension != 'jpg' &&
@@ -85,7 +85,7 @@
         showOffice: false, // 预览Office文件
         officeUrl: "", // PDF URL
         isShowDefault:false,
-        isClient: true,//是否是客户端
+        isClient: false,//是否是客户端
       };
     },
     mounted: function () {

src/views/main_web/workspace.vue

@@ -243,8 +243,7 @@
                       class="list-group"
                       :list="folderGroupBreads"
                       group="group"
-                      id="bread1"
-                    >
+                      id="bread1">
                       <a
                         class="list-group-item yywenjiantitle-text"
                         v-for="item in folderGroupBreads"
@@ -279,8 +278,7 @@
                       class="list-group"
                       :list="folderGroupBreads"
                       group="group"
-                      id="bread2"
-                    >
+                      id="bread2">
                       <a
                         class="yywenjiantitle-text"
                         v-for="item in folderGroupBreads"
@@ -295,19 +293,20 @@
                   </span>
                 </div>
                 <div class="section_item section_item_aside_fl" v-if="isCommonPage">
+                 <draggable group="group" id="bread3-0" :list="myComFileBreadNodeData">
                   <span
                     class="yywenjiantitle fl"
                     :class="{yyactive:true}"
                     @click="breadNodeClickEvent(currentPageType,true)"
                   >公共文件</span>
+                  </draggable>
                   <span v-if="isShowBread" class="yiyun_text-title-workspace mr-20">
                     <i class="el-icon-arrow-left first-leftarrow fl"></i>
                     <draggable
                       class="list-group"
                       :list="folderGroupBreads"
                       group="group"
-                      id="bread3"
-                    >
+                      id="bread3">
                       <a
                         class="list-group-item yywenjiantitle-text"
                         v-for="item in folderGroupBreads"
@@ -2128,7 +2127,7 @@ export default {
       dialogNewSuperMapVisible: false,
       newSuperMap: { showName: "", description: "" },
       mapAddress: "北京天安门",
-      isClient: true, // 是否是客户端
+      isClient: false, // 是否是客户端
 
       /**新建文件分组 start*/
       dialogNewFolderGroup: false, //新建文件分组组弹窗
@@ -2173,6 +2172,22 @@ export default {
           modifyUserID: "",
           superID: ""
         }
+      ],
+      myComFileBreadNodeData: [
+        {
+          archID: null,
+          childCount: 0,
+          createTime: "",
+          createUserID: "",
+          deleted: 0,
+          folderGroupID: "myComFile",
+          folderGroupName: "公共文件",
+          folderID: "",
+          levelID: "",
+          modifyTime: "",
+          modifyUserID: "",
+          superID: ""
+        }
       ]
       /**新建文件分组 end*/
     };
@@ -5854,7 +5869,7 @@ export default {
       var thisApp = this;
       var sourceData = evt.draggedContext.element;
       var targetData = evt.relatedContext.element;
-      if (targetData.folderGroupID == "myFile") {
+      if (targetData.folderGroupID == "myFile" || targetData.folderGroupID == "myComFile") {
         targetData.folderID = this.nowFolder.folderID;
       }
       var draggableData = {};