From 75130a6c2b66d43ad1330aaff4f8e2319fc242a3 Mon Sep 17 00:00:00 2001
From: kim131 <1035828775@qq.com>
Date: Fri, 29 Jan 2021 16:03:54 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=B7=B2=E7=BB=8F=E5=A4=84?=
 =?UTF-8?q?=E4=BA=8E=E4=BF=AE=E6=94=B9=E7=8A=B6=E6=80=81=E5=B0=B1=E4=B8=8D?=
 =?UTF-8?q?=E5=86=8D=E5=8F=91=E9=80=81=E8=AF=B7=E6=B1=82=E6=9B=B4=E6=94=B9?=
 =?UTF-8?q?=E4=B8=BA=E4=BF=AE=E6=94=B9=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/request.js                           |  2 +-
 src/views/main_web/workspace/workspace.new.vue | 15 +++++++++------
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/utils/request.js b/src/utils/request.js
index bd999705..e75d3859 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -80,7 +80,7 @@ export async function fetchApi(path, params, config) {
 export function wrapErrorHint(response) {
   if (response.Code !== 0) {
     // notify.error(response.Msg);
-    var title = (response.Code).toString();
+    var title = response.Code ? (response.Code).toString() : '';
     var type ="error";
     if(response.Code === 404){
       type = "warning";
diff --git a/src/views/main_web/workspace/workspace.new.vue b/src/views/main_web/workspace/workspace.new.vue
index 79b3f864..37ad2867 100644
--- a/src/views/main_web/workspace/workspace.new.vue
+++ b/src/views/main_web/workspace/workspace.new.vue
@@ -165,7 +165,7 @@
                         :selectSystemFolders="selectSystemFolders"
                       />
                       <!-- 文件上传队列 -->
-                      <div class="list-group">
+                      <div class="list-group" v-if="uploadFileList && uploadFileList.length > 0">
                         <FileItem
                           class="lisy-group-item"
                           v-for="file in filterFiles(uploadFileList)"
@@ -179,7 +179,7 @@
                           :loadingState="localFileLoadStateMap[file.id]"
                         />
                       </div>
-                      <div class="list-group">
+                      <div class="list-group" v-if="workFileList && workFileList.length > 0">
                         <FileItem
                           class="lisy-group-item"
                           v-for="file in filterFiles(workFileList)"
@@ -1666,7 +1666,6 @@ export default {
      * 点击文件事件：直接打开文件
      */
     fileClick: async function (file) {
-
       //debugger;
       if(!this.isClient) return;
       const { archName, extension, id: fileId, nodeName } = file;
@@ -1691,9 +1690,13 @@ export default {
       // 若文件在协作文件中，则不更改状态
       if(isCooperationFile) { system.openFile(filePath); return; }
       // 将文件状态设置为编辑中
-      const flagRes = await services.changeFileWorkStatus(fileId, 2);
-      if(flagRes.Code !== 0) return;
-      file.workStatus = 2;
+
+      if(file.workStatus !== 2) {
+          file.workStatus = 2;
+          const flagRes = await services.changeFileWorkStatus(fileId, 2);
+          if(flagRes.Code !== 0) return;
+      }
+   
       file.modifyUserId = sessionStorage.userId;
       system.openFile(filePath);
       this.fetchFolderFiles();