From 8668f84ee79b33a9ee1dbe6cfc533aeee685fad5 Mon Sep 17 00:00:00 2001
From: zhengzhou <wzszhengzhou@hotmail.com>
Date: Fri, 27 Nov 2020 19:33:12 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=96=87=E4=BB=B6=E5=BD=93?=
 =?UTF-8?q?=E5=89=8D=E6=93=8D=E4=BD=9C=E4=BA=BA=E7=9A=84=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/main_web/workspace/components/file-item.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/views/main_web/workspace/components/file-item.vue b/src/views/main_web/workspace/components/file-item.vue
index 08acbd72..42b0e936 100644
--- a/src/views/main_web/workspace/components/file-item.vue
+++ b/src/views/main_web/workspace/components/file-item.vue
@@ -1,8 +1,8 @@
 <template>
   <div>
     <el-tooltip 
-      :content="file.strToolTip"
-      :disabled="!file.strToolTip"
+      :content="`${file.modifyName} 正在编辑中`"
+      :disabled="!(isInWorkFolder && otherUserIsWorking)"
       placement="right"
       effect="light"
     >
@@ -31,7 +31,7 @@
           <!-- 标签 -->
           <div
             class="eidtTip"
-            v-if="isInWorkFolder && isWorking && file.modifyUserId !== currentUserId"
+            v-if="isInWorkFolder && otherUserIsWorking"
           >
             工作中
           </div>