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

src/views/main_web/workspace.vue

@@ -1802,6 +1802,7 @@
             @click="showNewFiledialog"
           >
             <file-Uploader
+              v-if="isClient"
               :multiple="true"
               label="点击上传本地文件"
               :auto="true"
@@ -3873,7 +3874,7 @@ export default {
      * 协作文件点击文件事件：直接打开文件
      */
     fileClickColl: function (file) {
-      if (!this.isClient) {
+      if (this.isClient) {
         if (file.status == 1 || file.status == 0) {
           this.$confirm("对方正在工作中，请稍后查看", '', {
             confirmButtonText: "确定",
@@ -4109,6 +4110,35 @@ export default {
         });
       }
     },
+    /**
+     * 客户端下载方法
+     */
+    clientDownLoad:function(file){
+      if(this.isClient)
+      {
+          var archid = file.archID;
+            var filename = file.archName + "." + file.extension;
+            var folderID = file.folderID;
+            var folderName = this.listUserFolders[this.nowFolderIndex].folderName;
+            var projID = file.projID;
+            back.downloadFile(
+              archid,
+              filename,
+              folderID,
+              sessionStorage.projName,
+              folderName
+            );
+      }
+    },
+    /**
+     * 客户端上传文件
+     */
+    clientUpload(){
+      if(this.isClient)
+      {
+        back.uploadFile();
+      }
+    },
     /**
      * 重命名我的文件
      * file:源数据