From 8834202215b819cef3fd779752ef37df22482cbf Mon Sep 17 00:00:00 2001
From: unknown <zheng_z@azut.cn>
Date: Fri, 13 Nov 2020 18:22:54 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=B8=8A=E4=BC=A0/=E4=B8=8B?=
 =?UTF-8?q?=E8=BD=BD=E6=97=B6=E7=9A=84=E9=94=99=E8=AF=AF=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/services/system.js                        | 34 ++++++++++++++++++-
 .../main_web/workspace/workspace.new.vue      |  2 --
 2 files changed, 33 insertions(+), 3 deletions(-)

diff --git a/src/services/system.js b/src/services/system.js
index ced58ca6..2286ab1e 100644
--- a/src/services/system.js
+++ b/src/services/system.js
@@ -83,7 +83,19 @@ const system = {
     socket.on('open', () => {
       socket.send([fileIpfsId, projectName, fileName, dirName].join('|'));
     });
-    socket.on('message', (e) => { onProcessHandler(e, socket); });
+    socket.on('message', (e) => {
+      if(e.data === '-1') {
+        notify.error('文件下载失败');
+        onErrorHandler(e);
+        return;
+      }
+      if(e.data === '-2') {
+        notify.error('请先关闭本地文件后再下载');
+        onErrorHandler(e);
+        return;
+      }
+      onProcessHandler(e, socket);
+    });
     socket.on('error', e => {
       onErrorHandler(e);
     });
@@ -161,6 +173,16 @@ const system = {
 
     socket.on('message', async (e) => {
       console.log('receive download file message:', e);
+      if(e.data === '-1') {
+        notify.error('文件上传失败');
+        onErrorHandler(e);
+        return;
+      }
+      if(e.data === '-2') {
+        notify.error('请先关闭本地文件后再上传');
+        onErrorHandler(e);
+        return;
+      }
       try {
         const progressData = JSON.parse(e.data);
         const { size, process, hash } = progressData;
@@ -203,6 +225,16 @@ const system = {
       socket.send(data);
     });
     socket.on('message', async (e) => {
+      if(e.data === '-1') {
+        notify.error('文件上传失败');
+        onErrorHandler(e);
+        return;
+      }
+      if(e.data === '-2') {
+        notify.error('请先关闭本地文件后再上传');
+        onErrorHandler(e);
+        return;
+      }
       try {
         const progressData = JSON.parse(e.data);
         const { size, process, hash } = progressData;
diff --git a/src/views/main_web/workspace/workspace.new.vue b/src/views/main_web/workspace/workspace.new.vue
index b7fad1c4..aa30ac0f 100644
--- a/src/views/main_web/workspace/workspace.new.vue
+++ b/src/views/main_web/workspace/workspace.new.vue
@@ -704,7 +704,6 @@ export default {
       const extensionedFileName = `${fileName}${extension ? `.${extension}`:''}`;
       const fileStoreKey = `${nodeFolderName}\\${extensionedFileName}`;
       const errorHandler = () => {
-        notify.error('文件下载失败');
         this.removeFileLoadingState(file.id);
       }
       this.updateFileLoadState(file.id, DOWNLOADING, 0);
@@ -713,7 +712,6 @@ export default {
         // {"size":"11","currentSize":"11","unit":"B","process":100,"hash":""}
         try {
           const { process, hash } = JSON.parse(resMessage.data);
-          if(resMessage.data === '-1') { throw 'download failed'; }
           this.updateFileLoadState(file.id, DOWNLOADING, process);
           if(process !== 100) return;
           this.addLocalFileRecord(fileStoreKey, ipfsCid);